X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.h;h=9824e40a983c07e5c5afd13ac4b1a94440b982cf;hb=9d399cea8466c7e4a6a1336dafdc830c4680d977;hp=a8f5aa3658d3e8a4b5bb4ebad21bc9162f628d66;hpb=4333fdb4f2f297db8272d2ebc8323028df8c105f;p=virtualjaguar

diff --git a/src/settings.h b/src/settings.h
index a8f5aa3..9824e40 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,31 +12,33 @@
 #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;
 	bool audioEnabled;
-	uint32 frameSkip;
-	uint32 renderType;
+	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, #, *
 
-	uint32 p1KeyBindings[21];
-	uint32 p2KeyBindings[21];
+	uint32_t p1KeyBindings[21];
+	uint32_t p2KeyBindings[21];
 
 	// Paths
 
@@ -52,10 +54,9 @@ struct VJSettings
 
 enum { RT_NORMAL = 0, RT_TV = 1 };
 
-// Exported functions
+// BIOS types
 
-//void LoadVJSettings(void);
-//void SaveVJSettings(void);
+enum { BT_K_SERIES, BT_M_SERIES, BT_STUBULATOR_1, BT_STUBULATOR_2 };
 
 // Exported variables