about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-19 22:36:54 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-19 22:36:54 +0000
commitcec98e52832e514bbf2b34c08d6679849db74887 (patch)
tree0a80c0adf260cb3259eee977d926e9f487420630 /src/game/server
parent8de75caffce5bcff7a9c54d199571b01eb3b47c2 (diff)
downloadzcatch-cec98e52832e514bbf2b34c08d6679849db74887.tar.gz
zcatch-cec98e52832e514bbf2b34c08d6679849db74887.zip
fixed more responsive respawn
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/gs_server.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index c969de1a..a4bb63fb 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -1213,10 +1213,12 @@ void player::tick()
 	// TODO: rework the input to be more robust
 	if(dead)
 	{
+		if(server_tick()-die_tick >= server_tickspeed()/2 && count_input(previnput.fire, input.fire).presses)
+			die_tick = -1;
 		if(server_tick()-die_tick >= server_tickspeed()*5) // auto respawn after 3 sec
 			respawn();
-		if((input.fire&1) && server_tick()-die_tick >= server_tickspeed()/2) // auto respawn after 0.5 sec
-			respawn();
+		//if((input.fire&1) && server_tick()-die_tick >= server_tickspeed()/2) // auto respawn after 0.5 sec
+			//respawn();
 		return;
 	}