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.cpp19
1 files changed, 11 insertions, 8 deletions
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)
 		{