Team/gun screen select bug fix (#122)

xtreme8000 · May 3, 2021 · db811ff · db811ff
1 parent 8c0b277
commit db811ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/config.c b/src/config.c
@@ -326,6 +326,9 @@ void config_reload() {
 	config_register_key(WINDOW_KEY_LASTTOOL, SDLK_q, "last_tool", 0, "Last tool", "Tools & Weapons");
 	config_register_key(WINDOW_KEY_NETWORKSTATS, SDLK_F12, "network_stats", 1, "Network stats", "Information");
 	config_register_key(WINDOW_KEY_SAVE_MAP, SDLK_F9, "save_map", 0, "Save map", "Game");
+	config_register_key(WINDOW_KEY_SELECT1, SDLK_1, NULL, 0, NULL, NULL);
+	config_register_key(WINDOW_KEY_SELECT2, SDLK_2, NULL, 0, NULL, NULL);
+	config_register_key(WINDOW_KEY_SELECT3, SDLK_3, NULL, 0, NULL, NULL);
 #endif
 
 #ifdef USE_GLFW
@@ -373,6 +376,9 @@ void config_reload() {
 	config_register_key(WINDOW_KEY_LASTTOOL, GLFW_KEY_Q, "last_tool", 0, "Last tool", "Tools & Weapons");
 	config_register_key(WINDOW_KEY_NETWORKSTATS, GLFW_KEY_F12, "network_stats", 1, "Network stats", "Information");
 	config_register_key(WINDOW_KEY_SAVE_MAP, GLFW_KEY_F9, "save_map", 0, "Save map", "Game");
+	config_register_key(WINDOW_KEY_SELECT1, GLFW_KEY_1, NULL, 0, NULL, NULL);
+	config_register_key(WINDOW_KEY_SELECT2, GLFW_KEY_2, NULL, 0, NULL, NULL);
+	config_register_key(WINDOW_KEY_SELECT3, GLFW_KEY_3, NULL, 0, NULL, NULL);
 #endif
 
 	list_sort(&config_keys, config_key_cmp);

diff --git a/src/hud.c b/src/hud.c
@@ -1682,9 +1682,9 @@ static void hud_ingame_keyboard(int key, int action, int mods, int internal) {
 			if(screen_current == SCREEN_TEAM_SELECT) {
 				int new_team = 256;
 				switch(key) {
-					case WINDOW_KEY_TOOL1: new_team = TEAM_1; break;
-					case WINDOW_KEY_TOOL2: new_team = TEAM_2; break;
-					case WINDOW_KEY_TOOL3: new_team = TEAM_SPECTATOR; break;
+					case WINDOW_KEY_SELECT1: new_team = TEAM_1; break;
+					case WINDOW_KEY_SELECT2: new_team = TEAM_2; break;
+					case WINDOW_KEY_SELECT3: new_team = TEAM_SPECTATOR; break;
 				}
 				if(new_team <= 255) {
 					if(network_logged_in) {
@@ -1725,9 +1725,9 @@ static void hud_ingame_keyboard(int key, int action, int mods, int internal) {
 			if(screen_current == SCREEN_GUN_SELECT) {
 				int new_gun = 255;
 				switch(key) {
-					case WINDOW_KEY_TOOL1: new_gun = WEAPON_RIFLE; break;
-					case WINDOW_KEY_TOOL2: new_gun = WEAPON_SMG; break;
-					case WINDOW_KEY_TOOL3: new_gun = WEAPON_SHOTGUN; break;
+					case WINDOW_KEY_SELECT1: new_gun = WEAPON_RIFLE; break;
+					case WINDOW_KEY_SELECT2: new_gun = WEAPON_SMG; break;
+					case WINDOW_KEY_SELECT3: new_gun = WEAPON_SHOTGUN; break;
 				}
 				if(new_gun < 255) {
 					if(network_logged_in) {

diff --git a/src/window.h b/src/window.h
@@ -84,6 +84,9 @@ enum window_keys {
 	WINDOW_KEY_NETWORKSTATS,
 	WINDOW_KEY_SHIFT,
 	WINDOW_KEY_SAVE_MAP,
+	WINDOW_KEY_SELECT1,
+	WINDOW_KEY_SELECT2,
+	WINDOW_KEY_SELECT3,
 };
 
 enum {