X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.cpp;h=ac6483212f954dccdf91fa3db868d26621ee3cf1;hb=47b31991c3d7575e48c2ef35fc0884a6a4bb6d53;hp=6bd628b49427dc7b0162f5bb4795897248d19605;hpb=b377f9d31da7d2233d04e56beb2d2002220ebd98;p=virtualjaguar

diff --git a/src/settings.cpp b/src/settings.cpp
index 6bd628b..ac64832 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string>
 #include "SDL.h"
-#include "types.h"
 #include "sdlemu_config.h"
 #include "log.h"
 #include "settings.h"
@@ -27,17 +26,23 @@ void CheckForTrailingSlash(char * path);
 //
 void LoadVJSettings(void)
 {
-	sdlemu_init_config("vj.cfg");
+	if (sdlemu_init_config("./vj.cfg") == 0			// CWD
+		&& sdlemu_init_config("~/vj.cfg") == 0		// Home
+		&& sdlemu_init_config("~/.vj/vj.cfg") == 0	// Home under .vj directory
+		&& sdlemu_init_config("vj.cfg") == 0)		// Somewhere in the path
+		WriteLog("Settings: Couldn't find VJ configuration file. Using defaults...\n");
 
 	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);
@@ -84,10 +89,10 @@ void LoadVJSettings(void)
 	vjs.p2KeyBindings[19] = sdlemu_getval_int("p2k_pound", SDLK_KP_DIVIDE);
 	vjs.p2KeyBindings[20] = sdlemu_getval_int("p2k_star", SDLK_KP_MULTIPLY);
 
-	strcpy(vjs.jagBootPath, sdlemu_getval_string("JagBootROM", "./bios/jagboot.rom"));
-	strcpy(vjs.CDBootPath, sdlemu_getval_string("CDBootROM", "./bios/jagcd.rom"));
-	strcpy(vjs.EEPROMPath, sdlemu_getval_string("EEPROMs", "./eeproms/"));
-	strcpy(vjs.ROMPath, sdlemu_getval_string("ROMs", "./"));
+	strcpy(vjs.jagBootPath, sdlemu_getval_string("JagBootROM", "./BIOS/jagboot.rom"));
+	strcpy(vjs.CDBootPath, sdlemu_getval_string("CDBootROM", "./BIOS/jagcd.rom"));
+	strcpy(vjs.EEPROMPath, sdlemu_getval_string("EEPROMs", "./EEPROMs"));
+	strcpy(vjs.ROMPath, sdlemu_getval_string("ROMs", "./ROMs"));
 	CheckForTrailingSlash(vjs.EEPROMPath);
 	CheckForTrailingSlash(vjs.ROMPath);