about summary refs log tree commit diff
path: root/src/game/server/entities/character.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-25 14:04:02 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-25 14:04:02 +0000
commit6d44adb7114a0be6ecb1b0fabc6fe69d308cad1c (patch)
treecc8a72be53f461ca06dda2f15cc0b56679a9e417 /src/game/server/entities/character.cpp
parentf96be4eb0ed4430013c8ecfcb043c049d5103479 (diff)
downloadzcatch-6d44adb7114a0be6ecb1b0fabc6fe69d308cad1c.tar.gz
zcatch-6d44adb7114a0be6ecb1b0fabc6fe69d308cad1c.zip
fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud.
Diffstat (limited to 'src/game/server/entities/character.cpp')
-rw-r--r--src/game/server/entities/character.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index c04be833..df3e7666 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -682,7 +682,8 @@ void CHARACTER::tick_defered()
 		reckoningcore.write(&predicted);
 		core.write(&current);
 		
-		if(mem_comp(&predicted, &current, sizeof(NETOBJ_CHARACTER)) != 0)
+		// only allow dead reackoning for a top of 3 seconds
+		if(reckoning_tick+server_tickspeed()*3 < server_tick() || mem_comp(&predicted, &current, sizeof(NETOBJ_CHARACTER)) != 0)
 		{
 			reckoning_tick = server_tick();
 			sendcore = core;