Extensive changes to remove gcc 4.x warnings, general code cleanup

[virtualjaguar] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index a3f6dff6c31fe05ff03e7c6114138b46196806e9..40d417e3a7d276d4a66efb7127eb4ac4fec0e4a3 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -4,12 +4,13 @@
 // by James L. Hammons
 //
 
+#include "settings.h"
+
 #include <stdlib.h>
 #include <string>
 #include "SDL.h"
 #include "sdlemu_config.h"
 #include "log.h"
-#include "settings.h"
 
 using namespace std;
 
@@ -35,12 +36,14 @@ void LoadVJSettings(void)
        vjs.useJoystick = sdlemu_getval_bool("useJoystick", false);
        vjs.joyport = sdlemu_getval_int("joyport", 0);
        vjs.hardwareTypeNTSC = sdlemu_getval_bool("hardwareTypeNTSC", true);
+       vjs.frameSkip = sdlemu_getval_int("frameSkip", 0);
        vjs.useJaguarBIOS = sdlemu_getval_bool("useJaguarBIOS", false);
        vjs.DSPEnabled = sdlemu_getval_bool("DSPEnabled", false);
-       vjs.usePipelinedDSP = sdlemu_getval_bool("usePipelinedDSP", true);
+       vjs.usePipelinedDSP = sdlemu_getval_bool("usePipelinedDSP", false);
        vjs.fullscreen = sdlemu_getval_bool("fullscreen", false);
        vjs.useOpenGL = sdlemu_getval_bool("useOpenGL", true);
        vjs.glFilter = sdlemu_getval_int("glFilterType", 0);
+       vjs.renderType = sdlemu_getval_int("renderType", 0);
 
        // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
        vjs.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDLK_UP);