about summary refs log tree commit diff
path: root/src/game/client/game_client.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-27 06:54:27 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-27 06:54:27 +0000
commit9a8c0809c78782a1bcd038fe29277c12dbe781b8 (patch)
tree90e8ef42cb35d9b89d62ae03bf9381ef1af2c93c /src/game/client/game_client.cpp
parentb36dee3ec0c28c9cfb84960a48fb5a544fa4eca5 (diff)
downloadzcatch-9a8c0809c78782a1bcd038fe29277c12dbe781b8.tar.gz
zcatch-9a8c0809c78782a1bcd038fe29277c12dbe781b8.zip
fixed jittering of character on round end
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index be1cd63a..d4a0ced9 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1296,10 +1296,16 @@ static void render_player(
 
 	if(info.local && config.cl_predict)
 	{
-		// apply predicted results
-		predicted_player.write(&player);
-		predicted_prev_player.write(&prev);
-		intratick = client_intrapredtick();
+		if(!local_character || (local_character->health < 0) || (gameobj && gameobj->game_over))
+		{
+		}
+		else
+		{
+			// apply predicted results
+			predicted_player.write(&player);
+			predicted_prev_player.write(&prev);
+			intratick = client_intrapredtick();
+		}
 	}
 
 	// TODO: proper skin selection