about summary refs log tree commit diff
path: root/src/game/server/gs_game_ctf.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-02-24 16:03:58 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-02-24 16:03:58 +0000
commit4739966e14ca2df24d4f44fb814b6275b9bf2a3c (patch)
tree2398dee3380dfa48582a71a4f2d4278448fa6cb8 /src/game/server/gs_game_ctf.cpp
parent1ea859c431b33a384727c0016917dde15bceeff3 (diff)
downloadzcatch-4739966e14ca2df24d4f44fb814b6275b9bf2a3c.tar.gz
zcatch-4739966e14ca2df24d4f44fb814b6275b9bf2a3c.zip
larger restructure to improve security
Diffstat (limited to 'src/game/server/gs_game_ctf.cpp')
-rw-r--r--src/game/server/gs_game_ctf.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/gs_game_ctf.cpp b/src/game/server/gs_game_ctf.cpp
index 37e2baba..a703e6b6 100644
--- a/src/game/server/gs_game_ctf.cpp
+++ b/src/game/server/gs_game_ctf.cpp
@@ -99,7 +99,7 @@ void gameobject_ctf::tick()
 		else
 		{
 			player *close_players[MAX_CLIENTS];
-			int types[] = {OBJTYPE_PLAYER_CHARACTER};
+			int types[] = {NETOBJTYPE_PLAYER_CHARACTER};
 			int num = world->find_entities(f->pos, 32.0f, (entity**)close_players, MAX_CLIENTS, types, 1);
 			for(int i = 0; i < num; i++)
 			{
@@ -161,7 +161,7 @@ void gameobject_ctf::tick()
 
 // Flag
 flag::flag(int _team)
-: entity(OBJTYPE_FLAG)
+: entity(NETOBJTYPE_FLAG)
 {
 	team = _team;
 	proximity_radius = phys_size;
@@ -183,7 +183,7 @@ void flag::reset()
 
 void flag::snap(int snapping_client)
 {
-	obj_flag *flag = (obj_flag *)snap_new_item(OBJTYPE_FLAG, team, sizeof(obj_flag));
+	NETOBJ_FLAG *flag = (NETOBJ_FLAG *)snap_new_item(NETOBJTYPE_FLAG, team, sizeof(NETOBJ_FLAG));
 	flag->x = (int)pos.x;
 	flag->y = (int)pos.y;
 	flag->team = team;