Fixed some SDL2 Key not showing properly in Config screen (some may still need a fix)

Author: ptitSeb

FrontEnd.cpp

@@ -1,4 +1,9 @@
 #include "Engine.h"
+
+#ifndef USE_SDL2
+#define SDLK_SCANCODE_MASK 0
+#endif
+
 void Engine::StartFadeIn()
 {
 //	gLog.OutPut("StartFadeIn Called\n");
@@ -583,10 +588,10 @@ void Engine::RenderConfig(const float interp)
 		mFont1.Print(mKeys[n].KeyName,110,168 + (40*(float)n));
 		iOption==n?
 			(bConfigureKey? mFont1.SetColor(0,1,1,1): mFont1.SetColor(1,1,0,1)): mFont1.SetColor(1,1,1,1);
-		mFont1.Print(SDLKeyStrings[mKeys[n].PrimaryKey],280,168 + (40*(float)n));
+		mFont1.Print(SDLKeyStrings[mKeys[n].PrimaryKey & ~SDLK_SCANCODE_MASK],280,168 + (40*(float)n));
 		iOption==(n+6)?
 			(bConfigureKey? mFont1.SetColor(0,1,1,1): mFont1.SetColor(1,1,0,1)): mFont1.SetColor(1,1,1,1);
-		mFont1.Print(SDLKeyStrings[mKeys[n].SecondaryKey],420,168 + (40*(float)n));
+		mFont1.Print(SDLKeyStrings[mKeys[n].SecondaryKey & ~SDLK_SCANCODE_MASK],420,168 + (40*(float)n));
 	}
 
 	mFont1.SetAlignment(ALIGN_CENTER);

SDL_KeyMap.h

@@ -72,7 +72,22 @@ static char* SDLKeyStrings[] = {
 	"GREATER",					//62
 	"QUESTION",					//63
 	"AT",						//64
+#ifdef USE_SDL2
+	"","","","","","","","",
+	"INSERT",					//73
+	"HOME",						//74
+	"PAGE UP",					//75
+	"DELETE",					//76
+	"END",						//77
+	"PAGE DOWN",				//78
+	"RIGHT",					//79
+	"LEFT",						//80
+	"DOWN",						//81
+	"UP",						//82
+	"",	"","","","","","","",
+#else
 	"","","","","","","","","","","","","","","","","","","","","","","","","","",
+#endif
 	"LEFTBRACKET",				//91
 	"BACKSLASH",				//92
 	"RIGHTBRACKET",				//93
@@ -172,12 +187,21 @@ static char* SDLKeyStrings[] = {
 	"WORLD_61",					//221
 	"WORLD_62",					//222
 	"WORLD_63",					//223
+#ifdef USE_SDL2
+	"L CTRL",					//224
+	"L SHIFT",					//225
+	"L ALT",					//226
+	"R ALT",					//227
+	"R SHIFT",					//228
+	"R CTRL",					//229
+#else
 	"WORLD_64",					//224
 	"WORLD_65",					//225
 	"WORLD_66",					//226
 	"WORLD_67",					//227
 	"WORLD_68",					//228
 	"WORLD_69",					//229
+#endif
 	"WORLD_70",					//230
 	"WORLD_71",					//231
 	"WORLD_72",					//232