X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsettings.cpp;fp=src%2Fsettings.cpp;h=c448e12d52c89cda2b59bdac09be5952acf5ec22;hb=e3ad811139308bfe8a818cf5e42e7553785fea82;hp=f1c2cc2bc900a8c9454c82e44814c98026cbaa0a;hpb=0c6f353827a94eb52c21e677658000f98452b247;p=stargem2

diff --git a/src/settings.cpp b/src/settings.cpp
index f1c2cc2..c448e12 100755
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -15,7 +15,8 @@
 
 #include <stdlib.h>
 #include <string>
-#include "SDL.h"
+//#include "SDL.h"
+#include <SDL2/SDL.h>
 #include "sdlemu_config.h"
 #include "log.h"
 
@@ -53,27 +54,27 @@ void LoadSettings(void)
 	// 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
-	settings.keyBindings[S_KEY_FIRE]        = sdlemu_getval_int("k_fire", SDLK_SEMICOLON);
-	settings.keyBindings[S_KEY_THRUST]      = sdlemu_getval_int("k_thrust", SDLK_l);
-	settings.keyBindings[S_KEY_SMARTBOMB]   = sdlemu_getval_int("k_smartbomb", SDLK_SPACE);
-	settings.keyBindings[S_KEY_HYPERSPACE]  = sdlemu_getval_int("k_hyperspace", SDLK_BACKSPACE);
-	settings.keyBindings[S_KEY_REVERSE]     = sdlemu_getval_int("k_reverse", SDLK_RETURN);
-	settings.keyBindings[S_KEY_UP]          = sdlemu_getval_int("k_up", SDLK_r);
-	settings.keyBindings[S_KEY_DOWN]        = sdlemu_getval_int("k_down", SDLK_f);
-	settings.keyBindings[S_KEY_INVISO]      = sdlemu_getval_int("k_inviso", SDLK_a);
-	settings.keyBindings[S_KEY_1P_START]    = sdlemu_getval_int("k_1p_start", SDLK_1);
-	settings.keyBindings[S_KEY_2P_START]    = sdlemu_getval_int("k_2p_start", SDLK_2);
-	settings.keyBindings[S_KEY_LEFT_COIN]   = sdlemu_getval_int("k_left_coin", SDLK_3);
-	settings.keyBindings[S_KEY_CENTER_COIN] = sdlemu_getval_int("k_center_coin", SDLK_4);
-	settings.keyBindings[S_KEY_RIGHT_COIN]  = sdlemu_getval_int("k_right_coin", SDLK_5);
-	settings.keyBindings[S_KEY_AUTO_UP]     = sdlemu_getval_int("k_auto_up", SDLK_F1);
-	settings.keyBindings[S_KEY_ADVANCE]     = sdlemu_getval_int("k_advance", SDLK_F2);
-	settings.keyBindings[S_KEY_HS_RESET]    = sdlemu_getval_int("k_high_score_reset", SDLK_F3);
-	settings.keyBindings[S_KEY_SLAM_SWITCH] = sdlemu_getval_int("k_slam_switch", SDLK_F4);
-//	settings.keyBindings[17] = sdlemu_getval_int("k_8", SDLK_KP8);
-//	settings.keyBindings[18] = sdlemu_getval_int("k_9", SDLK_KP9);
-//	settings.keyBindings[19] = sdlemu_getval_int("k_pound", SDLK_KP_DIVIDE);
-//	settings.keyBindings[20] = sdlemu_getval_int("k_star", SDLK_KP_MULTIPLY);
+	settings.keyBindings[S_KEY_FIRE]        = sdlemu_getval_int("k_fire", SDL_SCANCODE_SEMICOLON);
+	settings.keyBindings[S_KEY_THRUST]      = sdlemu_getval_int("k_thrust", SDL_SCANCODE_L);
+	settings.keyBindings[S_KEY_SMARTBOMB]   = sdlemu_getval_int("k_smartbomb", SDL_SCANCODE_SPACE);
+	settings.keyBindings[S_KEY_HYPERSPACE]  = sdlemu_getval_int("k_hyperspace", SDL_SCANCODE_BACKSPACE);
+	settings.keyBindings[S_KEY_REVERSE]     = sdlemu_getval_int("k_reverse", SDL_SCANCODE_RETURN);
+	settings.keyBindings[S_KEY_UP]          = sdlemu_getval_int("k_up", SDL_SCANCODE_R);
+	settings.keyBindings[S_KEY_DOWN]        = sdlemu_getval_int("k_down", SDL_SCANCODE_F);
+	settings.keyBindings[S_KEY_INVISO]      = sdlemu_getval_int("k_inviso", SDL_SCANCODE_A);
+	settings.keyBindings[S_KEY_1P_START]    = sdlemu_getval_int("k_1p_start", SDL_SCANCODE_1);
+	settings.keyBindings[S_KEY_2P_START]    = sdlemu_getval_int("k_2p_start", SDL_SCANCODE_2);
+	settings.keyBindings[S_KEY_LEFT_COIN]   = sdlemu_getval_int("k_left_coin", SDL_SCANCODE_3);
+	settings.keyBindings[S_KEY_CENTER_COIN] = sdlemu_getval_int("k_center_coin", SDL_SCANCODE_4);
+	settings.keyBindings[S_KEY_RIGHT_COIN]  = sdlemu_getval_int("k_right_coin", SDL_SCANCODE_5);
+	settings.keyBindings[S_KEY_AUTO_UP]     = sdlemu_getval_int("k_auto_up", SDL_SCANCODE_F1);
+	settings.keyBindings[S_KEY_ADVANCE]     = sdlemu_getval_int("k_advance", SDL_SCANCODE_F2);
+	settings.keyBindings[S_KEY_HS_RESET]    = sdlemu_getval_int("k_high_score_reset", SDL_SCANCODE_F3);
+	settings.keyBindings[S_KEY_SLAM_SWITCH] = sdlemu_getval_int("k_slam_switch", SDL_SCANCODE_F4);
+//	settings.keyBindings[17] = sdlemu_getval_int("k_8", SDL_SCANCODE_KP8);
+//	settings.keyBindings[18] = sdlemu_getval_int("k_9", SDL_SCANCODE_KP9);
+//	settings.keyBindings[19] = sdlemu_getval_int("k_pound", SDL_SCANCODE_KP_DIVIDE);
+//	settings.keyBindings[20] = sdlemu_getval_int("k_star", SDL_SCANCODE_KP_MULTIPLY);
 
 	strcpy(settings.BIOSPath, sdlemu_getval_string("BIOSROM", "./ROMs/"));
 	strcpy(settings.disksPath, sdlemu_getval_string("disks", "./disks/"));