Added config file key bindings, general code cleanup

[stargem2] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index 888c083c2ab72ed8414d82286eaed46546a2c9ef..f1c2cc2bc900a8c9454c82e44814c98026cbaa0a 100755 (executable)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -50,50 +50,30 @@ void LoadSettings(void)
        settings.renderType = sdlemu_getval_int("renderType", 0);
        settings.autoStateSaving = sdlemu_getval_bool("autoSaveState", true);
 
-       // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
-       settings.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDLK_UP);
-       settings.p1KeyBindings[1] = sdlemu_getval_int("p1k_down", SDLK_DOWN);
-       settings.p1KeyBindings[2] = sdlemu_getval_int("p1k_left", SDLK_LEFT);
-       settings.p1KeyBindings[3] = sdlemu_getval_int("p1k_right", SDLK_RIGHT);
-       settings.p1KeyBindings[4] = sdlemu_getval_int("p1k_c", SDLK_z);
-       settings.p1KeyBindings[5] = sdlemu_getval_int("p1k_b", SDLK_x);
-       settings.p1KeyBindings[6] = sdlemu_getval_int("p1k_a", SDLK_c);
-       settings.p1KeyBindings[7] = sdlemu_getval_int("p1k_option", SDLK_QUOTE);
-       settings.p1KeyBindings[8] = sdlemu_getval_int("p1k_pause", SDLK_RETURN);
-       settings.p1KeyBindings[9] = sdlemu_getval_int("p1k_0", SDLK_KP0);
-       settings.p1KeyBindings[10] = sdlemu_getval_int("p1k_1", SDLK_KP1);
-       settings.p1KeyBindings[11] = sdlemu_getval_int("p1k_2", SDLK_KP2);
-       settings.p1KeyBindings[12] = sdlemu_getval_int("p1k_3", SDLK_KP3);
-       settings.p1KeyBindings[13] = sdlemu_getval_int("p1k_4", SDLK_KP4);
-       settings.p1KeyBindings[14] = sdlemu_getval_int("p1k_5", SDLK_KP5);
-       settings.p1KeyBindings[15] = sdlemu_getval_int("p1k_6", SDLK_KP6);
-       settings.p1KeyBindings[16] = sdlemu_getval_int("p1k_7", SDLK_KP7);
-       settings.p1KeyBindings[17] = sdlemu_getval_int("p1k_8", SDLK_KP8);
-       settings.p1KeyBindings[18] = sdlemu_getval_int("p1k_9", SDLK_KP9);
-       settings.p1KeyBindings[19] = sdlemu_getval_int("p1k_pound", SDLK_KP_DIVIDE);
-       settings.p1KeyBindings[20] = sdlemu_getval_int("p1k_star", SDLK_KP_MULTIPLY);
-
-       settings.p2KeyBindings[0] = sdlemu_getval_int("p2k_up", SDLK_UP);
-       settings.p2KeyBindings[1] = sdlemu_getval_int("p2k_down", SDLK_DOWN);
-       settings.p2KeyBindings[2] = sdlemu_getval_int("p2k_left", SDLK_LEFT);
-       settings.p2KeyBindings[3] = sdlemu_getval_int("p2k_right", SDLK_RIGHT);
-       settings.p2KeyBindings[4] = sdlemu_getval_int("p2k_c", SDLK_z);
-       settings.p2KeyBindings[5] = sdlemu_getval_int("p2k_b", SDLK_x);
-       settings.p2KeyBindings[6] = sdlemu_getval_int("p2k_a", SDLK_c);
-       settings.p2KeyBindings[7] = sdlemu_getval_int("p2k_option", SDLK_QUOTE);
-       settings.p2KeyBindings[8] = sdlemu_getval_int("p2k_pause", SDLK_RETURN);
-       settings.p2KeyBindings[9] = sdlemu_getval_int("p2k_0", SDLK_KP0);
-       settings.p2KeyBindings[10] = sdlemu_getval_int("p2k_1", SDLK_KP1);
-       settings.p2KeyBindings[11] = sdlemu_getval_int("p2k_2", SDLK_KP2);
-       settings.p2KeyBindings[12] = sdlemu_getval_int("p2k_3", SDLK_KP3);
-       settings.p2KeyBindings[13] = sdlemu_getval_int("p2k_4", SDLK_KP4);
-       settings.p2KeyBindings[14] = sdlemu_getval_int("p2k_5", SDLK_KP5);
-       settings.p2KeyBindings[15] = sdlemu_getval_int("p2k_6", SDLK_KP6);
-       settings.p2KeyBindings[16] = sdlemu_getval_int("p2k_7", SDLK_KP7);
-       settings.p2KeyBindings[17] = sdlemu_getval_int("p2k_8", SDLK_KP8);
-       settings.p2KeyBindings[18] = sdlemu_getval_int("p2k_9", SDLK_KP9);
-       settings.p2KeyBindings[19] = sdlemu_getval_int("p2k_pound", SDLK_KP_DIVIDE);
-       settings.p2KeyBindings[20] = sdlemu_getval_int("p2k_star", SDLK_KP_MULTIPLY);
+       // Keybindings in order of fire, thrust, smartbomb, hyperspace, reverse, up, down, inviso,
+       // 1 player start, 2 player start, left coin, center coin, right coin, auto up, advance,
+       // high score reset, slam switch
+       settings.keyBindings[S_KEY_FIRE]        = sdlemu_getval_int("k_fire", SDLK_SEMICOLON);
+       settings.keyBindings[S_KEY_THRUST]      = sdlemu_getval_int("k_thrust", SDLK_l);
+       settings.keyBindings[S_KEY_SMARTBOMB]   = sdlemu_getval_int("k_smartbomb", SDLK_SPACE);
+       settings.keyBindings[S_KEY_HYPERSPACE]  = sdlemu_getval_int("k_hyperspace", SDLK_BACKSPACE);
+       settings.keyBindings[S_KEY_REVERSE]     = sdlemu_getval_int("k_reverse", SDLK_RETURN);
+       settings.keyBindings[S_KEY_UP]          = sdlemu_getval_int("k_up", SDLK_r);
+       settings.keyBindings[S_KEY_DOWN]        = sdlemu_getval_int("k_down", SDLK_f);
+       settings.keyBindings[S_KEY_INVISO]      = sdlemu_getval_int("k_inviso", SDLK_a);
+       settings.keyBindings[S_KEY_1P_START]    = sdlemu_getval_int("k_1p_start", SDLK_1);
+       settings.keyBindings[S_KEY_2P_START]    = sdlemu_getval_int("k_2p_start", SDLK_2);
+       settings.keyBindings[S_KEY_LEFT_COIN]   = sdlemu_getval_int("k_left_coin", SDLK_3);
+       settings.keyBindings[S_KEY_CENTER_COIN] = sdlemu_getval_int("k_center_coin", SDLK_4);
+       settings.keyBindings[S_KEY_RIGHT_COIN]  = sdlemu_getval_int("k_right_coin", SDLK_5);
+       settings.keyBindings[S_KEY_AUTO_UP]     = sdlemu_getval_int("k_auto_up", SDLK_F1);
+       settings.keyBindings[S_KEY_ADVANCE]     = sdlemu_getval_int("k_advance", SDLK_F2);
+       settings.keyBindings[S_KEY_HS_RESET]    = sdlemu_getval_int("k_high_score_reset", SDLK_F3);
+       settings.keyBindings[S_KEY_SLAM_SWITCH] = sdlemu_getval_int("k_slam_switch", SDLK_F4);
+//     settings.keyBindings[17] = sdlemu_getval_int("k_8", SDLK_KP8);
+//     settings.keyBindings[18] = sdlemu_getval_int("k_9", SDLK_KP9);
+//     settings.keyBindings[19] = sdlemu_getval_int("k_pound", SDLK_KP_DIVIDE);
+//     settings.keyBindings[20] = sdlemu_getval_int("k_star", SDLK_KP_MULTIPLY);
 
        strcpy(settings.BIOSPath, sdlemu_getval_string("BIOSROM", "./ROMs/"));
        strcpy(settings.disksPath, sdlemu_getval_string("disks", "./disks/"));