Finally fixed problems with demo mode.

[stargem2] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
old mode 100755 (executable)
new mode 100644 (file)
index c448e12..1c0c550
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,10 +1,10 @@
 //
 // SETTINGS.CPP: Game configuration loading/saving support
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2005 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  ------------------------------------------------------------
@@ -15,7 +15,6 @@
 
 #include <stdlib.h>
 #include <string>
-//#include "SDL.h"
 #include <SDL2/SDL.h>
 #include "sdlemu_config.h"
 #include "log.h"
@@ -51,9 +50,9 @@ void LoadSettings(void)
        settings.renderType = sdlemu_getval_int("renderType", 0);
        settings.autoStateSaving = sdlemu_getval_bool("autoSaveState", true);
 
-       // 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
+       // 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", SDL_SCANCODE_SEMICOLON);
        settings.keyBindings[S_KEY_THRUST]      = sdlemu_getval_int("k_thrust", SDL_SCANCODE_L);
        settings.keyBindings[S_KEY_SMARTBOMB]   = sdlemu_getval_int("k_smartbomb", SDL_SCANCODE_SPACE);
@@ -71,10 +70,6 @@ void LoadSettings(void)
        settings.keyBindings[S_KEY_ADVANCE]     = sdlemu_getval_int("k_advance", SDL_SCANCODE_F2);
        settings.keyBindings[S_KEY_HS_RESET]    = sdlemu_getval_int("k_high_score_reset", SDL_SCANCODE_F3);
        settings.keyBindings[S_KEY_SLAM_SWITCH] = sdlemu_getval_int("k_slam_switch", SDL_SCANCODE_F4);
-//     settings.keyBindings[17] = sdlemu_getval_int("k_8", SDL_SCANCODE_KP8);
-//     settings.keyBindings[18] = sdlemu_getval_int("k_9", SDL_SCANCODE_KP9);
-//     settings.keyBindings[19] = sdlemu_getval_int("k_pound", SDL_SCANCODE_KP_DIVIDE);
-//     settings.keyBindings[20] = sdlemu_getval_int("k_star", SDL_SCANCODE_KP_MULTIPLY);
 
        strcpy(settings.BIOSPath, sdlemu_getval_string("BIOSROM", "./ROMs/"));
        strcpy(settings.disksPath, sdlemu_getval_string("disks", "./disks/"));