X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.h;h=bb160d5e9ee4c777f9f323a4b3d611b275dbe20e;hb=10d7ab1fb217c01030a0b637f9a571c1faf61ede;hp=91ef9f320e308377e65c70d6ebf8b0a82c1eb79e;hpb=2ae315f25e623cc8279d3c9012a3a166d86684c2;p=virtualjaguar

diff --git a/src/settings.h b/src/settings.h
index 91ef9f3..bb160d5 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 //
-// SETTINGS.H: Header file
+// settings.h: Header file
 //
 
 #ifndef __SETTINGS_H__
@@ -12,45 +12,56 @@
 #else
 #include <stdlib.h>								// for MAX_PATH on MinGW/Darwin
 #endif
-#include "types.h"
+#include <stdint.h>
 
 // Settings struct
 
 struct VJSettings
 {
 	bool useJoystick;
-	int32 joyport;								// Joystick port
+	int32_t joyport;								// Joystick port
 	bool hardwareTypeNTSC;						// Set to false for PAL
 	bool useJaguarBIOS;
+	bool GPUEnabled;
 	bool DSPEnabled;
 	bool usePipelinedDSP;
 	bool fullscreen;
 	bool useOpenGL;
-	uint32 glFilter;
+	uint32_t glFilter;
 	bool hardwareTypeAlpine;
-	uint32 frameSkip;
+	bool audioEnabled;
+	uint32_t frameSkip;
+	uint32_t renderType;
+	bool allowWritesToROM;
+	uint32_t biosType;
 
 	// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
-	uint16 p1KeyBindings[21];
-	uint16 p2KeyBindings[21];
+
+	uint32_t p1KeyBindings[21];
+	uint32_t p2KeyBindings[21];
 
 	// Paths
+
 	char ROMPath[MAX_PATH];
 	char jagBootPath[MAX_PATH];
 	char CDBootPath[MAX_PATH];
 	char EEPROMPath[MAX_PATH];
-
-	// Internal global stuff
-//	uint32 ROMType;
+	char alpineROMPath[MAX_PATH];
+	char absROMPath[MAX_PATH];
 };
 
-// ROM Types
-//enum { RT_CARTRIDGE, RT_
+// Render types
+
+enum { RT_NORMAL = 0, RT_TV = 1 };
+
+// BIOS types
+
+enum { BT_K_SERIES, BT_M_SERIES, BT_STUBULATOR_1, BT_STUBULATOR_2 };
 
 // Exported functions
 
-void LoadVJSettings(void);
-void SaveVJSettings(void);
+//void LoadVJSettings(void);
+//void SaveVJSettings(void);
 
 // Exported variables