Cleaned a bit mouse button shown names, added names for button 4 and 5.

diff --git a/Source/Menu/Menu.cpp b/Source/Menu/Menu.cpp
index 54f6fc519478c0c23d3074d0810e794fd65ececf..4c4abfaa32bd55f8557ce62ad1d95477210ac7b3 100644 (file)
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -543,7 +543,7 @@ void Menu::Tick()
     }
     if (mainmenu == 10)
         endgame = 2;
-    if (mainmenu == 18 && Input::isKeyPressed(MOUSEBUTTON2) && selected == 1) {
+    if (mainmenu == 18 && Input::isKeyPressed(MOUSEBUTTON_RIGHT) && selected == 1) {
         stereoseparation -= 0.001;
         updateStereoConfigMenu();
     }

diff --git a/Source/Tutorial.cpp b/Source/Tutorial.cpp
index 675d3e8755acacc4216ce77271c9f132b7ff0714..3a134ff01172101f69bf0b101e2468e0d20bdb8c 100644 (file)
--- a/Source/Tutorial.cpp
+++ b/Source/Tutorial.cpp
@@ -584,11 +584,7 @@ void Tutorial::DrawTextInfo()
             string2 = "in the middle of the training area.";
             break;
         case 15:
-            if (Game::attackkey == MOUSEBUTTON1) {
-                string = "Click to attack when you are near an enemy.";
-            } else {
-                string = std::string("Press ") + Input::keyToChar(Game::attackkey) + " to attack when you are near an enemy.";
-            }
+            string = std::string("Press ") + Input::keyToChar(Game::attackkey) + " to attack when you are near an enemy.";
             string2 = "You can punch by standing still near an enemy and attacking.";
             break;
         case 16:
@@ -610,11 +606,7 @@ void Tutorial::DrawTextInfo()
             break;
         case 20:
             string = "Your most powerful individual attack is the rabbit kick.";
-            if (Game::attackkey == MOUSEBUTTON1) {
-                string2 = "Run at the enemy while holding the mouse button, and press";
-            } else {
-                string2 = std::string("Run at the enemy while holding ") + Input::keyToChar(Game::attackkey) + ", and press";
-            }
+            string2 = std::string("Run at the enemy while holding ") + Input::keyToChar(Game::attackkey) + ", and press";
             string3 = std::string("the jump key (") + Input::keyToChar(Game::jumpkey) + ") to attack.";
             break;
         case 21:
@@ -638,11 +630,7 @@ void Tutorial::DrawTextInfo()
             break;
         case 24:
             string = "You can tackle enemies by running at them animal-style";
-            if (Game::attackkey == MOUSEBUTTON1) {
-                string2 = std::string("and pressing jump (") + Input::keyToChar(Game::jumpkey) + ") or attack(mouse button).";
-            } else {
-                string2 = std::string("and pressing jump (") + Input::keyToChar(Game::jumpkey) + ") or attack(" + Input::keyToChar(Game::attackkey) + ").";
-            }
+            string2 = std::string("and pressing jump (") + Input::keyToChar(Game::jumpkey) + ") or attack (" + Input::keyToChar(Game::attackkey) + ").";
             string3 = "This is especially useful when they are running away.";
             break;
         case 25:

diff --git a/Source/User/Settings.cpp b/Source/User/Settings.cpp
index 5f7909ef20c3e8a60f465df80237a374c016e31e..42b719bed187199b742e98d73d8b95ac1f91e0aa 100644 (file)
--- a/Source/User/Settings.cpp
+++ b/Source/User/Settings.cpp
@@ -62,7 +62,7 @@ void DefaultSettings()
     rightkey = SDL_SCANCODE_D;
     drawkey = SDL_SCANCODE_E;
     throwkey = SDL_SCANCODE_Q;
-    attackkey = MOUSEBUTTON1;
+    attackkey = MOUSEBUTTON_LEFT;
     consolekey = SDL_SCANCODE_GRAVE;
 
     newdetail = detail;

diff --git a/Source/Utils/Input.cpp b/Source/Utils/Input.cpp
index 04efb4b4a1da68a6716b062ff9486da53d971709..06a7b74e649c9f68b513345e2df8f6f98817076b 100644 (file)
--- 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);
 }

diff --git a/Source/Utils/Input.hpp b/Source/Utils/Input.hpp
index 66a896d6e2e4ac79e6dc662d0541b4575da971e2..1a77b58e32c2c3f1c77d604535b5922e218c80f6 100644 (file)
--- a/Source/Utils/Input.hpp
+++ b/Source/Utils/Input.hpp
@@ -26,9 +26,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include <SDL.h>
 
 /**> CONSTANT DECLARATIONS <**/
-#define MOUSEBUTTON1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
-#define MOUSEBUTTON2 (SDL_NUM_SCANCODES + SDL_BUTTON_RIGHT)
-#define MOUSEBUTTON3 (SDL_NUM_SCANCODES + SDL_BUTTON_MIDDLE)
+#define MOUSEBUTTON_LEFT (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
+#define MOUSEBUTTON_RIGHT (SDL_NUM_SCANCODES + SDL_BUTTON_RIGHT)
+#define MOUSEBUTTON_MIDDLE (SDL_NUM_SCANCODES + SDL_BUTTON_MIDDLE)
+#define MOUSEBUTTON_X1 (SDL_NUM_SCANCODES + SDL_BUTTON_X1)
+#define MOUSEBUTTON_X2 (SDL_NUM_SCANCODES + SDL_BUTTON_X2)
 
 /**> FUNCTION PROTOTYPES <**/
 class Input