X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.h;h=4fb12fa2be4bb1ebe2f47de8cac3733e856fad27;hb=8dafbf94c7bc84dae635f9dabfc9be5424e49e68;hp=b1c4caecb83360180a444fd678ea7f3c9b4c93f2;hpb=e3ad811139308bfe8a818cf5e42e7553785fea82;p=stargem2 diff --git a/src/settings.h b/src/settings.h old mode 100755 new mode 100644 index b1c4cae..4fb12fa --- a/src/settings.h +++ b/src/settings.h @@ -1,7 +1,6 @@ // // SETTINGS.H: Header file // - #ifndef __SETTINGS_H__ #define __SETTINGS_H__ @@ -10,7 +9,7 @@ #include #define MAX_PATH _POSIX_PATH_MAX #else -#include // for MAX_PATH on MinGW/Darwin +#include // for MAX_PATH on MinGW/Darwin #endif #include @@ -24,18 +23,18 @@ enum { S_KEY_FIRE = 0, S_KEY_THRUST, S_KEY_SMARTBOMB, S_KEY_HYPERSPACE, S_KEY_RE struct Settings { bool useJoystick; - int32_t 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_t glFilter; uint32_t frameSkip; uint32_t renderType; - bool autoStateSaving; // Auto-state loading/saving on entry/exit + 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 + // 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_t keyBindings[21]; @@ -48,10 +47,6 @@ struct Settings char autoStatePath[MAX_PATH]; }; -// Render types - -//enum { RT_NORMAL = 0, RT_TV = 1 }; - // Exported functions void LoadSettings(void); @@ -62,4 +57,3 @@ void SaveSettings(void); extern Settings settings; #endif // __SETTINGS_H__ -