Fixed IMASK access in DSP & GPU, more CPU browser refinements.

[virtualjaguar] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index a3f6dff6c31fe05ff03e7c6114138b46196806e9..b1f864fbdea01179801e0920f706b853a4de1ca7 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,22 +1,31 @@
 //
 // SETTINGS.CPP: Virtual Jaguar configuration loading/saving support
 //
-// by James L. Hammons
+// by James Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log
 //
 
-#include <stdlib.h>
-#include <string>
-#include "SDL.h"
-#include "sdlemu_config.h"
-#include "log.h"
 #include "settings.h"
 
+//#include <stdlib.h>
+//#include <string>
+//#include "SDL.h"
+//#include "sdlemu_config.h"
+//#include "log.h"
+
 using namespace std;
 
 // Global variables
 
 VJSettings vjs;
 
+#if 0
 // Private function prototypes
 
 void CheckForTrailingSlash(char * path);
@@ -35,12 +44,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);
@@ -113,3 +124,4 @@ void CheckForTrailingSlash(char * path)
                if (path[strlen(path) - 1] != '/')
                        strcat(path, "/");      // NOTE: Possible buffer overflow
 }
+#endif