diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-09 20:55:37 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-09 20:55:37 +0000 |
| commit | 20680df032daed0d3ac9c598d2a47db5b3dd4781 (patch) | |
| tree | 5a2f6dec8e78b257e03b08f3d53209d5584dbfd0 /src/game | |
| parent | 3cf3a3ceb32cca714bcbaeddb20d7a9c13b612b1 (diff) | |
| download | zcatch-20680df032daed0d3ac9c598d2a47db5b3dd4781.tar.gz zcatch-20680df032daed0d3ac9c598d2a47db5b3dd4781.zip | |
fixed emoticon activation. rebinded zoom to m
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/game_client.cpp | 4 |
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) { |