Capitalize Makefiles.

[quix0rs-blobwars.git] / src / CKeyboard.cpp

diff --git a/src/CKeyboard.cpp b/src/CKeyboard.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1874317..89e6e0e
--- a/src/CKeyboard.cpp
+++ b/src/CKeyboard.cpp
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -27,21 +28,21 @@ 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)
 {
        static char keyName[50];
-       strcpy(keyName, "");
+       keyName[0] = 0;
        keyName[0] = '\0';
        
        if (key <= 0)
@@ -49,7 +50,7 @@ const char *Keyboard::translateKey(int key)
                return "...";
        }
        
-       strcpy(keyName, _(SDL_GetKeyName((SDLKey)key)));
+       strlcpy(keyName, _(SDL_GetKeyName(key)), sizeof keyName);
        
        /*
        This is not really neccessary, but it just makes
@@ -63,7 +64,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 +72,7 @@ const char *Keyboard::translateKey(int key)
                                uppercase = false;
                        }
                }
-               else if (*c == SDLK_SPACE)
+               else if (*c == SDL_SCANCODE_SPACE)
                {
                        uppercase = true;
                }