From a49f78b66bc6cc035d4a3a7964e660ccc5ec8127 Mon Sep 17 00:00:00 2001 From: Jakob Fries Date: Wed, 15 Aug 2007 10:18:01 +0000 Subject: improved emoticon selector --- src/game/client/game_client.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/game/client/game_client.cpp') diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index a04ccf34..8479f4a7 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -1586,13 +1586,16 @@ void render_game() // center at char but can be moved when mouse is far away float offx = 0, offy = 0; - int deadzone = 300; - if(mouse_pos.x > deadzone) offx = mouse_pos.x-deadzone; - if(mouse_pos.x <-deadzone) offx = mouse_pos.x+deadzone; - if(mouse_pos.y > deadzone) offy = mouse_pos.y-deadzone; - if(mouse_pos.y <-deadzone) offy = mouse_pos.y+deadzone; - offx = offx*2/3; - offy = offy*2/3; + if (config.dynamic_camera) + { + int deadzone = 300; + if(mouse_pos.x > deadzone) offx = mouse_pos.x-deadzone; + if(mouse_pos.x <-deadzone) offx = mouse_pos.x+deadzone; + if(mouse_pos.y > deadzone) offy = mouse_pos.y-deadzone; + if(mouse_pos.y <-deadzone) offy = mouse_pos.y+deadzone; + offx = offx*2/3; + offy = offy*2/3; + } screen_x = local_player_pos.x+offx; screen_y = local_player_pos.y+offy; @@ -1855,7 +1858,7 @@ void render_game() return; } - if (inp_key_pressed('E')) + if (inp_key_pressed(config.key_emoticon)) { if (!emoticon_selector_active) { -- cgit 1.4.1