about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohan Althoff <teetow@gmail.com>2007-12-13 22:56:33 +0000
committerJohan Althoff <teetow@gmail.com>2007-12-13 22:56:33 +0000
commitb3e4d67131e34d928713766fa217ea24a5b1209d (patch)
tree8c2d9ebaaa2149fb5d7aa934f564e8efd60e7c13
parentc1685679f94170022585c0937179b219d2e3a6e7 (diff)
downloadzcatch-b3e4d67131e34d928713766fa217ea24a5b1209d.tar.gz
zcatch-b3e4d67131e34d928713766fa217ea24a5b1209d.zip
crash/hang fix. flag velocity isn't set to zero when the game starts.
-rw-r--r--src/game/server/srv_ctf.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/server/srv_ctf.cpp b/src/game/server/srv_ctf.cpp
index 0046b83e..2ff4e2df 100644
--- a/src/game/server/srv_ctf.cpp
+++ b/src/game/server/srv_ctf.cpp
@@ -47,6 +47,7 @@ int gameobject_ctf::on_player_death(class player *victim, class player *killer,
 			create_sound_global(SOUND_CTF_DROP);
 			f->drop_tick = server_tick();
 			f->carrying_player = 0;
+			f->vel = vec2(0,0);
 			
 			if(killer && killer->team != victim->team)
 				killer->score++;
@@ -159,6 +160,7 @@ void flag::reset()
 	carrying_player = 0;
 	at_stand = 1;
 	pos = stand_pos;
+	vel = vec2(0,0);
 }
 
 void flag::snap(int snapping_client)