X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.h;h=a768a75ac61caaa7414b5ca1a1a2207d3ad5b877;hb=00f99074bf49f4d52d17a534dd3d4e451f4bbc59;hp=1fcca6132c4c8392b30a481dfccf6ac5c7861ef9;hpb=2879315d07ce59a7996bc8a137c3b66ae018013a;p=stargem2

diff --git a/src/settings.h b/src/settings.h
index 1fcca61..a768a75 100755
--- a/src/settings.h
+++ b/src/settings.h
@@ -14,6 +14,11 @@
 #endif
 #include "types.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
@@ -27,11 +32,12 @@ struct Settings
 	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, #, *
 
-	uint16 p1KeyBindings[21];
-	uint16 p2KeyBindings[21];
+	// 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];
 
 	// Paths
 
@@ -40,8 +46,6 @@ struct Settings
 	char diskImagePath1[MAX_PATH];
 	char diskImagePath2[MAX_PATH];
 	char autoStatePath[MAX_PATH];
-//	char CDBootPath[MAX_PATH];
-//	char EEPROMPath[MAX_PATH];
 };
 
 // Render types