MT-CTF/ctf_pvp_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ctf.area namespace

Browse Source
This commit is contained in:
rubenwardy 2015-07-13 13:05:42 +01:00
parent f44e0903c4
commit 9db50cfd3d
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mods/capturetheflag/ctf/core.lua
View File

@ -162,8 +162,7 @@ function ctf.save()
end end
end end
ctf.area = {} function ctf.get_territory_owner(pos)
function ctf.area.get_territory_owner(pos)
local largest = nil local largest = nil
local largest_weight = 0 local largest_weight = 0
for i = 1, #ctf.registered_on_territory_query do for i = 1, #ctf.registered_on_territory_query do

4
mods/capturetheflag/ctf/teams.lua
View File

@ -271,7 +271,7 @@ minetest.register_on_newplayer(function(player)
end) end)
-- updates the spawn position for a team -- updates the spawn position for a team
function ctf.area.get_spawn(team) function ctf.get_spawn(team)
ctf_flag.asset_flags(team) ctf_flag.asset_flags(team)
if not ctf.team(team) then if not ctf.team(team) then
@ -304,7 +304,7 @@ minetest.register_on_respawnplayer(function(player)
if player and ctf.player(player:get_player_name()) then if player and ctf.player(player:get_player_name()) then
local team = ctf.player(player:get_player_name()).team local team = ctf.player(player:get_player_name()).team
if ctf.team(team) then if ctf.team(team) then
local spawn = ctf.area.get_spawn(team) local spawn = ctf.get_spawn(team)
player:moveto(spawn, false) player:moveto(spawn, false)
return true return true
end end

2
mods/capturetheflag/ctf_flag/flag_func.lua
View File

@ -193,7 +193,7 @@ ctf_flag = {
ctf.team(team).spawn = pos ctf.team(team).spawn = pos
end end
else else
ctf.area.get_spawn(team) ctf.get_spawn(team)
end end
ctf.save() ctf.save()

2
mods/capturetheflag/ctf_protect/init.lua
View File

@ -2,7 +2,7 @@
local old_is_protected = minetest.is_protected local old_is_protected = minetest.is_protected
function minetest.is_protected(pos, name) function minetest.is_protected(pos, name)
local team = ctf.area.get_territory_owner(pos) local team = ctf.get_territory_owner(pos)
if not team or not ctf.team(team) then if not team or not ctf.team(team) then
return old_is_protected(pos, name) return old_is_protected(pos, name)

2
mods/capturetheflag/ctf_turret/init.lua
View File

@ -60,7 +60,7 @@ if ctf.setting("turrets") then
return return
end end
local app = ctf.area.get_territory_owner(pos) local app = ctf.get_territory_owner(pos)
if app and app~=team then if app and app~=team then
team = app team = app
meta:set_string("team",team) meta:set_string("team",team)