about summary refs log tree commit diff
path: root/src/game/server/game_server.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-09 16:10:12 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-09 16:10:12 +0000
commitd689bd3c836a3d1b78c4a7a87c1bd01ff3f7664f (patch)
tree00b5b900141da102227b20b173ffc655077d250a /src/game/server/game_server.cpp
parent7f95a8d4a69640ad7c38fe743a08e637b97b034c (diff)
downloadzcatch-d689bd3c836a3d1b78c4a7a87c1bd01ff3f7664f.tar.gz
zcatch-d689bd3c836a3d1b78c4a7a87c1bd01ff3f7664f.zip
fixed the initial input crappiness that makes a bullet fire when the map is restarted
Diffstat (limited to 'src/game/server/game_server.cpp')
-rw-r--r--src/game/server/game_server.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index eba15f2b..ebd5dff3 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -383,6 +383,7 @@ void player::reset()
 
 	mem_zero(&input, sizeof(input));
 	mem_zero(&previnput, sizeof(previnput));
+	num_inputs = 0;
 
 	last_action = -1;
 
@@ -913,6 +914,11 @@ int player::handle_weapons()
 
 void player::tick()
 {
+	// check if we have enough input
+	// this is to prevent initial weird clicks
+	if(num_inputs < 2)
+		previnput = input;
+	
 	// do latency stuff
 	{
 		CLIENT_INFO info;
@@ -1540,6 +1546,7 @@ void mods_client_input(int client_id, void *input)
 
 		//players[client_id].previnput = players[client_id].input;
 		players[client_id].input = *(player_input*)input;
+		players[client_id].num_inputs++;
 	}
 }