Finally fixed problems with demo mode.

[stargem2] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
old mode 100755 (executable)
new mode 100644 (file)
index 1fcca61..4fb12fa
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,7 +1,6 @@
 //
 // SETTINGS.H: Header file
 //
-
 #ifndef __SETTINGS_H__
 #define __SETTINGS_H__
 
@@ -10,28 +9,34 @@
 #include <limits.h>
 #define MAX_PATH               _POSIX_PATH_MAX
 #else
-#include <stdlib.h>                                                            // for MAX_PATH on MinGW/Darwin
+#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,
+       S_KEY_CENTER_COIN, S_KEY_RIGHT_COIN, S_KEY_AUTO_UP, S_KEY_ADVANCE, S_KEY_HS_RESET,
+       S_KEY_SLAM_SWITCH };
 
 // Settings struct
 
 struct Settings
 {
        bool useJoystick;
-       int32 joyport;                                                          // Joystick port
-       bool hardwareTypeNTSC;                                          // Set to false for PAL
+       int32_t joyport;                                // Joystick port
+       bool hardwareTypeNTSC;                  // Set to false for PAL
        bool fullscreen;
        bool useOpenGL;
-       uint32 glFilter;
-       uint32 frameSkip;
-       uint32 renderType;
-       bool autoStateSaving;                                           // Auto-state loading/saving on entry/exit
-       
-       // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
+       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 p1KeyBindings[21];
-       uint16 p2KeyBindings[21];
+       uint16_t keyBindings[21];
 
        // Paths
 
@@ -40,14 +45,8 @@ struct Settings
        char diskImagePath1[MAX_PATH];
        char diskImagePath2[MAX_PATH];
        char autoStatePath[MAX_PATH];
-//     char CDBootPath[MAX_PATH];
-//     char EEPROMPath[MAX_PATH];
 };
 
-// Render types
-
-//enum { RT_NORMAL = 0, RT_TV = 1 };
-
 // Exported functions
 
 void LoadSettings(void);