about summary refs log tree commit diff
path: root/src/game/client/game_client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 85180372..301a1166 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -2042,7 +2042,7 @@ void render_game()
 		render_world(local_player_pos.x+offx, local_player_pos.y+offy, 1.0f);
 
 	// DEBUG TESTING
-	if(inp_key_pressed('F'))
+	if(inp_key_pressed('M'))
 	{
 		gfx_clear_mask(0);
 
@@ -2355,7 +2355,7 @@ void render_game()
 		return;
 	}
 
-	if (inp_key_pressed(config.key_emoticon))
+	if(chat_mode == CHATMODE_NONE && !menu_active && inp_key_pressed(config.key_emoticon))
 	{
 		if (!emoticon_selector_active)
 		{