about summary refs log tree commit diff
path: root/src/game/client
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-08-15 15:31:22 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-08-15 15:31:22 +0000
commit3f2071b23bf6d15438b175e715e9ba32a6651ce2 (patch)
treeff47637eec1e587193e8e0922eeaa2bdcd1cf948 /src/game/client
parent1eecd590d0f9789c9932f6c3460415300bf5fa17 (diff)
downloadzcatch-3f2071b23bf6d15438b175e715e9ba32a6651ce2.tar.gz
zcatch-3f2071b23bf6d15438b175e715e9ba32a6651ce2.zip
don't draw weapon crosshair when selecting emoticon
Diffstat (limited to 'src/game/client')
-rw-r--r--src/game/client/game_client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 0e2e439d..5bb166ff 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1720,7 +1720,7 @@ void render_game()
 		gfx_quads_begin();
 		
 		// render cursor
-		if (!menu_active)
+		if (!menu_active && (!emoticon_selector_active || emoticon_selector_inactive_override))
 		{
 			select_sprite(data->weapons[local_player->weapon%data->num_weapons].sprite_cursor);
 			float cursorsize = 64;