X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCKeyboard.cpp;h=ddc0eca70b55a271c66b884a4fc8a6a6b23dd2ea;hb=ba027fd5579c333f6ff7049995f712c1237e9e07;hp=8f2287a0732a6b91dd9bbec67e4b0f303f85155a;hpb=79a76e9c954759649d270f49d831e2cb9c2f40a2;p=quix0rs-blobwars.git

diff --git a/src/CKeyboard.cpp b/src/CKeyboard.cpp
index 8f2287a..ddc0eca 100644
--- a/src/CKeyboard.cpp
+++ b/src/CKeyboard.cpp
@@ -27,15 +27,15 @@ Keyboard::Keyboard()
 
 void Keyboard::setDefaultKeys()
 {
-	control[CONTROL::LEFT] = SDLK_LEFT;
-	control[CONTROL::RIGHT] = SDLK_RIGHT;
-	control[CONTROL::DOWN] = SDLK_DOWN;
-	control[CONTROL::JUMP] = SDLK_UP;
+	control[CONTROL::LEFT] = SDL_SCANCODE_LEFT;
+	control[CONTROL::RIGHT] = SDL_SCANCODE_RIGHT;
+	control[CONTROL::DOWN] = SDL_SCANCODE_DOWN;
+	control[CONTROL::JUMP] = SDL_SCANCODE_UP;
 	control[CONTROL::UP] = 0;
-	control[CONTROL::FIRE] = SDLK_LCTRL;
-	control[CONTROL::JETPACK] = SDLK_SPACE;
-	control[CONTROL::PAUSE] = SDLK_p;
-	control[CONTROL::MAP] = SDLK_TAB;
+	control[CONTROL::FIRE] = SDL_SCANCODE_LCTRL;
+	control[CONTROL::JETPACK] = SDL_SCANCODE_SPACE;
+	control[CONTROL::PAUSE] = SDL_SCANCODE_P;
+	control[CONTROL::MAP] = SDL_SCANCODE_TAB;
 }
 
 const char *Keyboard::translateKey(int key)
@@ -49,7 +49,7 @@ const char *Keyboard::translateKey(int key)
 		return "...";
 	}
 	
-	strlcpy(keyName, _(SDL_GetKeyName((SDLKey)key)), sizeof keyName);
+	strlcpy(keyName, _(SDL_GetKeyName(key)), sizeof keyName);
 	
 	/*
 	This is not really neccessary, but it just makes
@@ -63,7 +63,7 @@ const char *Keyboard::translateKey(int key)
 	
 	while (*c != '\0')
 	{
-		if ((*c >= SDLK_a) && (*c <= SDLK_z))
+		if ((*c >= SDL_SCANCODE_A) && (*c <= SDL_SCANCODE_Z))
 		{
 			if (uppercase)
 			{
@@ -71,7 +71,7 @@ const char *Keyboard::translateKey(int key)
 				uppercase = false;
 			}
 		}
-		else if (*c == SDLK_SPACE)
+		else if (*c == SDL_SCANCODE_SPACE)
 		{
 			uppercase = true;
 		}