Converted to SDL 2, added fullscreen support (F12 to toggle).

[stargem2] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index a768a75ac61caaa7414b5ca1a1a2207d3ad5b877..b1c4caecb83360180a444fd678ea7f3c9b4c93f2 100755 (executable)
--- a/src/settings.h
+++ b/src/settings.h
@@ -12,7 +12,7 @@
 #else
 #include <stdlib.h>                                                            // for MAX_PATH on MinGW/Darwin
 #endif
-#include "types.h"
+#include <stdint.h>
 
 enum { S_KEY_FIRE = 0, S_KEY_THRUST, S_KEY_SMARTBOMB, S_KEY_HYPERSPACE, S_KEY_REVERSE,
        S_KEY_UP, S_KEY_DOWN, S_KEY_INVISO, S_KEY_1P_START, S_KEY_2P_START, S_KEY_LEFT_COIN,
@@ -24,20 +24,20 @@ enum { S_KEY_FIRE = 0, S_KEY_THRUST, S_KEY_SMARTBOMB, S_KEY_HYPERSPACE, S_KEY_RE
 struct Settings
 {
        bool useJoystick;
-       int32 joyport;                                                          // Joystick port
+       int32_t joyport;                                                                // Joystick port
        bool hardwareTypeNTSC;                                          // Set to false for PAL
        bool fullscreen;
        bool useOpenGL;
-       uint32 glFilter;
-       uint32 frameSkip;
-       uint32 renderType;
+       uint32_t glFilter;
+       uint32_t frameSkip;
+       uint32_t renderType;
        bool autoStateSaving;                                           // Auto-state loading/saving on entry/exit
 
        // Keybindings in order of fire, thrust, smartbomb, hyperspace, reverse, up, down, inviso,
        // 1 player start, 2 player start, left coin, center coin, right coin, auto up, advance,
        // high score reset, slam switch
 
-       uint16 keyBindings[21];
+       uint16_t keyBindings[21];
 
        // Paths
 
@@ -62,3 +62,4 @@ void SaveSettings(void);
 extern Settings settings;
 
 #endif // __SETTINGS_H__
+