about summary refs log tree commit diff
path: root/src/game/server/srv_ctf.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-18 22:20:35 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-18 22:20:35 +0000
commitd66a2a46efd9369d918a60d5483c23ed39e8dd58 (patch)
tree4e3e1ef791cd3f73d2a2a333aeb3608c130ea92d /src/game/server/srv_ctf.cpp
parentb44a3edfe9363163ab129594cba51a989c042644 (diff)
downloadzcatch-d66a2a46efd9369d918a60d5483c23ed39e8dd58.tar.gz
zcatch-d66a2a46efd9369d918a60d5483c23ed39e8dd58.zip
fixed menu switching problems and some compile errors
Diffstat (limited to 'src/game/server/srv_ctf.cpp')
-rw-r--r--src/game/server/srv_ctf.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/server/srv_ctf.cpp b/src/game/server/srv_ctf.cpp
index c4cbd574..42061a5c 100644
--- a/src/game/server/srv_ctf.cpp
+++ b/src/game/server/srv_ctf.cpp
@@ -129,9 +129,8 @@ void flag::snap(int snapping_client)
 	flag->x = (int)pos.x;
 	flag->y = (int)pos.y;
 	flag->team = team;
+	flag->carried_by = -1;
 	
-	if(carrying_player && carrying_player->client_id == snapping_client)
-		flag->local_carry = 1;
-	else
-		flag->local_carry = 0;
+	if(carrying_player)
+		flag->carried_by = carrying_player->client_id;
 }