about summary refs log tree commit diff
path: root/src/game/server/game_server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server/game_server.cpp')
-rw-r--r--src/game/server/game_server.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 6ba83980..a28719c7 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -1488,15 +1488,15 @@ void player::snap(int snaping_client)
 	if(dead)
 		player->health = -1;
 	
-	if(length(vel) > 15.0f)
-		player->emote = EMOTE_HAPPY;
+	//if(length(vel) > 15.0f)
+	//	player->emote = EMOTE_HAPPY;
 	
 	//if(damage_taken_tick+50 > server_tick())
 	//	player->emote = EMOTE_PAIN;
 	
 	if(player->emote == EMOTE_NORMAL)
 	{
-		if((server_tick()%(50*5)) < 10)
+		if((server_tick()%(50*5)) < 5)
 			player->emote = EMOTE_BLINK;
 	}