X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstargem2.cpp;fp=src%2Fstargem2.cpp;h=d1b7431a5bd092e45230c190f6d8c6dbee176f4f;hb=00f99074bf49f4d52d17a534dd3d4e451f4bbc59;hp=8ad9c3632ab33e31a5e602b544beaeeb4aa6f22c;hpb=2879315d07ce59a7996bc8a137c3b66ae018013a;p=stargem2

diff --git a/src/stargem2.cpp b/src/stargem2.cpp
index 8ad9c36..d1b7431 100755
--- a/src/stargem2.cpp
+++ b/src/stargem2.cpp
@@ -447,43 +447,25 @@ static void FrameCallback(void)
 	if (keys[SDLK_ESCAPE])
 		running = false;						// ESC to exit...
 
-//Convert this stuff to use the settings module... !!! FIX !!!
-	if (keys[SDLK_SEMICOLON])
-		gram[0xC804] |= 0x01;					// Fire (;)
-	if (keys[SDLK_l])
-		gram[0xC804] |= 0x02;					// Thrust (L)
-	if (keys[SDLK_SPACE])
-		gram[0xC804] |= 0x04;					// Smart Bomb (space)
-	if (keys[SDLK_BACKSPACE])
-		gram[0xC804] |= 0x08;					// Hyperspace (BkSp)
-	if (keys[SDLK_2])
-		gram[0xC804] |= 0x10;					// Two Player Start (2)
-	if (keys[SDLK_1])
-		gram[0xC804] |= 0x20;					// One Player Start (1)
-	if (keys[SDLK_RETURN])
-		gram[0xC804] |= 0x40;					// Reverse (Enter)
-	if (keys[SDLK_f])
-		gram[0xC804] |= 0x80;					// Down (F)
-
-	if (keys[SDLK_r])
-		gram[0xC806] |= 0x01;					// Up (R)
-	if (keys[SDLK_a])
-		gram[0xC806] |= 0x02;					// Inviso (A)
-
-	if (keys[SDLK_F1])
-		gram[0xC80C] |= 0x01;					// Auto up (F1)
-	if (keys[SDLK_F2])
-		gram[0xC80C] |= 0x02;					// Advance (F2)
-	if (keys[SDLK_5])
-		gram[0xC80C] |= 0x04;					// Right Coin (5)
-	if (keys[SDLK_F3])
-		gram[0xC80C] |= 0x08;					// High Score Reset (F3)
-	if (keys[SDLK_3])
-		gram[0xC80C] |= 0x10;					// Left Coin (3)
-	if (keys[SDLK_4])
-		gram[0xC80C] |= 0x20;					// Center Coin (4)
-	if (keys[SDLK_F4])
-		gram[0xC80C] |= 0x40;					// Slam Switch (F4)
+	if (keys[settings.keyBindings[S_KEY_FIRE]])			gram[0xC804] |= 0x01;
+	if (keys[settings.keyBindings[S_KEY_THRUST]])		gram[0xC804] |= 0x02;
+	if (keys[settings.keyBindings[S_KEY_SMARTBOMB]])	gram[0xC804] |= 0x04;
+	if (keys[settings.keyBindings[S_KEY_HYPERSPACE]])	gram[0xC804] |= 0x08;
+	if (keys[settings.keyBindings[S_KEY_2P_START]])		gram[0xC804] |= 0x10;
+	if (keys[settings.keyBindings[S_KEY_1P_START]])		gram[0xC804] |= 0x20;
+	if (keys[settings.keyBindings[S_KEY_REVERSE]])		gram[0xC804] |= 0x40;
+	if (keys[settings.keyBindings[S_KEY_DOWN]])			gram[0xC804] |= 0x80;
+
+	if (keys[settings.keyBindings[S_KEY_UP]])			gram[0xC806] |= 0x01;
+	if (keys[settings.keyBindings[S_KEY_INVISO]])		gram[0xC806] |= 0x02;
+
+	if (keys[settings.keyBindings[S_KEY_AUTO_UP]])		gram[0xC80C] |= 0x01;
+	if (keys[settings.keyBindings[S_KEY_ADVANCE]])		gram[0xC80C] |= 0x02;
+	if (keys[settings.keyBindings[S_KEY_RIGHT_COIN]])	gram[0xC80C] |= 0x04;
+	if (keys[settings.keyBindings[S_KEY_HS_RESET]])		gram[0xC80C] |= 0x08;
+	if (keys[settings.keyBindings[S_KEY_LEFT_COIN]])	gram[0xC80C] |= 0x10;
+	if (keys[settings.keyBindings[S_KEY_CENTER_COIN]])	gram[0xC80C] |= 0x20;
+	if (keys[settings.keyBindings[S_KEY_SLAM_SWITCH]])	gram[0xC80C] |= 0x40;
 
 	if (keys[SDLK_F5])							// Sound CPU self-test (F5)
 		soundCPU.cpuFlags |= V6808_ASSERT_LINE_NMI;