most keys work

2 files changed, 11 insertions, 11 deletions

diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 282e4c06..bab7a496 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <engine/config.h>
 #include "../game.h"
 #include "mapres_image.h"
 #include "mapres_tilemap.h"
@@ -1733,13 +1734,13 @@ void modc_render()
 	// snap input
 	{
 		player_input input;
-		input.left = inp_key_pressed('A');
-		input.right = inp_key_pressed('D');
+		input.left = inp_key_pressed(config.key_move_left);
+		input.right = inp_key_pressed(config.key_move_right);
 		float a = atan((float)mouse_pos.y/(float)mouse_pos.x);
 		if(mouse_pos.x < 0)
 			a = a+pi;
 		input.angle = (int)(a*256.0f);
-		input.jump = inp_key_pressed(baselib::keys::space) || inp_key_pressed('W');
+		input.jump = inp_key_pressed(config.key_jump);
 		
 		input.fire = inp_mouse_button_pressed(0);// | (oldinput.fire << 16);
 		//oldinput.fire = input.fire & 0x0000ffff;
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
index e110ebc5..bcdb740c 100644
--- a/src/game/client/menu.cpp
+++ b/src/game/client/menu.cpp
@@ -452,8 +452,7 @@ int ui_do_key_reader(void *id, float x, float y, float w, float h, int key)
 	gui_composite_box_enum box_style = screen_info_box;	
 	draw_box(box_style, tileset_regular, x, y, w, h);
 	
-	char str[16];
-	sprintf(str, "%i", key);
+	const char *str = keys::key_name(key);
 	ui_do_label(x + 10, y, str, 36);
 	if (ui_active_item() == id)
 	{
@@ -852,15 +851,15 @@ static int settings_screen_render()
 	// KEYS
 	ui_do_label(column1_x, keys_y, "Keys:", 36);
 	ui_do_label(column2_x, keys_y + 0, "Move Left:", 36);
-	config_set_key_move_left(&config_copy, ui_do_key_reader(&config_copy.key_move_left, column3_x, keys_y + 0, 70, 40, config_copy.key_move_left));
+	config_set_key_move_left(&config_copy, ui_do_key_reader(&config_copy.key_move_left, column3_x, keys_y + 0, 150, 40, config_copy.key_move_left));
 	ui_do_label(column2_x, keys_y + 40, "Move Right:", 36);
-	config_set_key_move_right(&config_copy, ui_do_key_reader(&config_copy.key_move_right, column3_x, keys_y + 40, 70, 40, config_copy.key_move_right));
+	config_set_key_move_right(&config_copy, ui_do_key_reader(&config_copy.key_move_right, column3_x, keys_y + 40, 150, 40, config_copy.key_move_right));
 	ui_do_label(column2_x, keys_y + 80, "Jump:", 36);
-	config_set_key_jump(&config_copy, ui_do_key_reader(&config_copy.key_jump, column3_x, keys_y + 80, 70, 40, config_copy.key_jump));
+	config_set_key_jump(&config_copy, ui_do_key_reader(&config_copy.key_jump, column3_x, keys_y + 80, 150, 40, config_copy.key_jump));
 	ui_do_label(column2_x, keys_y + 120, "Fire:", 36);
-	config_set_key_fire(&config_copy, ui_do_key_reader(&config_copy.key_fire, column3_x, keys_y + 120, 70, 40, config_copy.key_fire));
+	config_set_key_fire(&config_copy, ui_do_key_reader(&config_copy.key_fire, column3_x, keys_y + 120, 150, 40, config_copy.key_fire));
 	ui_do_label(column2_x, keys_y + 160, "Hook:", 36);
-	config_set_key_hook(&config_copy, ui_do_key_reader(&config_copy.key_hook, column3_x, keys_y + 160, 70, 40, config_copy.key_hook));
+	config_set_key_hook(&config_copy, ui_do_key_reader(&config_copy.key_hook, column3_x, keys_y + 160, 150, 40, config_copy.key_hook));
 
 	// RESOLUTION
 	static char resolutions[][128] =
@@ -881,7 +880,7 @@ static int settings_screen_render()
 	};
 	static int selected_index = 0;
 	ui_do_label(column1_x, resolution_y, "Resolution:", 36);
-	selected_index = ui_do_combo_box(&selected_index, column2_x, resolution_y, 170, (char **)resolutions, 5, selected_index);
+	selected_index = ui_do_combo_box(&selected_index, column2_x, resolution_y, 180, (char **)resolutions, 5, selected_index);
 
 	config_set_screen_width(&config_copy, res[selected_index][0]);
 	config_set_screen_height(&config_copy, res[selected_index][1]);