Fixes #62 fixed button names display

Note that this cause problem because of the incomplete font we use:
I mapped the key «é» to draw weapon and it can’t be shown in the menu.
We should switch to a more complete font

diff --git a/Source/Utils/Input.cpp b/Source/Utils/Input.cpp
index 30667c786e37e28ce4d32dc082892b113d899d19..04efb4b4a1da68a6716b062ff9486da53d971709 100644 (file)
--- a/Source/Utils/Input.cpp
+++ b/Source/Utils/Input.cpp
@@ -56,7 +56,7 @@ bool Input::isKeyPressed(int k)
 const char* Input::keyToChar(unsigned short i)
 {
     if (i < SDL_NUM_SCANCODES)
-        return SDL_GetScancodeName(SDL_Scancode(i));
+        return SDL_GetKeyName(SDL_GetKeyFromScancode(SDL_Scancode(i)));
     else if (i == MOUSEBUTTON1)
         return "mouse1";
     else if (i == MOUSEBUTTON2)
@@ -67,24 +67,6 @@ const char* Input::keyToChar(unsigned short i)
         return "unknown";
 }
 
-unsigned short Input::CharToKey(const char* which)
-{
-    for (unsigned short i = 0; i < SDL_NUM_SCANCODES; i++) {
-        if (!strcasecmp(which, SDL_GetScancodeName(SDL_Scancode(i))))
-            return i;
-    }
-    if (!strcasecmp(which, "mouse1")) {
-        return MOUSEBUTTON1;
-    }
-    if (!strcasecmp(which, "mouse2")) {
-        return MOUSEBUTTON2;
-    }
-    if (!strcasecmp(which, "mouse3")) {
-        return MOUSEBUTTON3;
-    }
-    return SDL_NUM_SCANCODES;
-}
-
 bool Input::MouseClicked()
 {
     return isKeyPressed(SDL_NUM_SCANCODES + SDL_BUTTON_LEFT);

diff --git a/Source/Utils/Input.hpp b/Source/Utils/Input.hpp
index af83cb1b06b0158367418242e4793df3bfed88b4..66a896d6e2e4ac79e6dc662d0541b4575da971e2 100644 (file)
--- a/Source/Utils/Input.hpp
+++ b/Source/Utils/Input.hpp
@@ -38,7 +38,6 @@ public:
     static bool isKeyDown(int k);
     static bool isKeyPressed(int k);
     static const char* keyToChar(unsigned short which);
-    static unsigned short CharToKey(const char* which);
     static bool MouseClicked();
 };