X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FUtils%2FInput.cpp;h=06a7b74e649c9f68b513345e2df8f6f98817076b;hb=d3f16728298e0639a3b2e916386f4e8cea4018ff;hp=04efb4b4a1da68a6716b062ff9486da53d971709;hpb=31191d0c0118f6abfccd7bf3ecc13bbfef3fa335;p=lugaru.git

diff --git a/Source/Utils/Input.cpp b/Source/Utils/Input.cpp
index 04efb4b..06a7b74 100644
--- a/Source/Utils/Input.cpp
+++ b/Source/Utils/Input.cpp
@@ -41,33 +41,40 @@ void Input::Tick()
 
 bool Input::isKeyDown(int k)
 {
-    if (k >= SDL_NUM_SCANCODES + 6) // really useful? check that.
+    if (k >= SDL_NUM_SCANCODES + 6) {
         return false;
+    }
     return keyDown[k];
 }
 
 bool Input::isKeyPressed(int k)
 {
-    if (k >= SDL_NUM_SCANCODES + 6)
+    if (k >= SDL_NUM_SCANCODES + 6) {
         return false;
+    }
     return keyPressed[k];
 }
 
 const char* Input::keyToChar(unsigned short i)
 {
-    if (i < SDL_NUM_SCANCODES)
+    if (i < SDL_NUM_SCANCODES) {
         return SDL_GetKeyName(SDL_GetKeyFromScancode(SDL_Scancode(i)));
-    else if (i == MOUSEBUTTON1)
-        return "mouse1";
-    else if (i == MOUSEBUTTON2)
-        return "mouse2";
-    else if (i == MOUSEBUTTON3)
-        return "mouse3";
-    else
+    } else if (i == MOUSEBUTTON_LEFT) {
+        return "mouse left button";
+    } else if (i == MOUSEBUTTON_RIGHT) {
+        return "mouse right button";
+    } else if (i == MOUSEBUTTON_MIDDLE) {
+        return "mouse middle button";
+    } else if (i == MOUSEBUTTON_X1) {
+        return "mouse button 4";
+    } else if (i == MOUSEBUTTON_X2) {
+        return "mouse button 5";
+    } else {
         return "unknown";
+    }
 }
 
 bool Input::MouseClicked()
 {
-    return isKeyPressed(SDL_NUM_SCANCODES + SDL_BUTTON_LEFT);
+    return isKeyPressed(MOUSEBUTTON_LEFT);
 }