From 20680df032daed0d3ac9c598d2a47db5b3dd4781 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Tue, 9 Oct 2007 20:55:37 +0000 Subject: fixed emoticon activation. rebinded zoom to m --- src/game/client/game_client.cpp | 4 ++-- 1 file 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) { -- cgit 1.4.1