Removed some cruft and nonstandard int/uint types, added M series BIOS.

[virtualjaguar] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index 28aa2b9c4205c71613e079e783b730df71149c82..bb160d5e9ee4c777f9f323a4b3d611b275dbe20e 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 //
-// SETTINGS.H: Header file
+// settings.h: Header file
 //
 
 #ifndef __SETTINGS_H__
@@ -12,14 +12,14 @@
 #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;
@@ -27,17 +27,18 @@ struct VJSettings
        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
 
@@ -53,6 +54,10 @@ struct VJSettings
 
 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);