X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FInput.cpp;h=88970f90bbb32cf2c37a371bf341e9e0a8c8d2a8;hb=1c7d28a2fc93699ab955ea66203d0c36bba9d977;hp=3cf1b1ce99657b9d466589834047025056e680e0;hpb=dc03d60e08bdc0b97ea7b07e8973ed42450c9482;p=lugaru.git

diff --git a/Source/Input.cpp b/Source/Input.cpp
index 3cf1b1c..88970f9 100644
--- a/Source/Input.cpp
+++ b/Source/Input.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010 - MCMic
+Copyright (C) 2010 - Côme <MCMic> BERNIGAUD
 
 This file is part of Lugaru.
 
@@ -11,7 +11,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -25,44 +25,72 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern bool keyboardfrozen;
 
-bool Input::isKeyDown(int k) {
-	if(keyboardfrozen)return 0; // vraiment utile? à vérifier
-	Uint8 *keystate = SDL_GetKeyState(NULL);
-	if(k<SDLK_LAST)
-		return keystate[k];
-	else
-		return SDL_GetMouseState(NULL,NULL)&SDL_BUTTON(k-SDLK_LAST);
+bool keyDown[SDL_NUM_SCANCODES + 6];
+bool keyPressed[SDL_NUM_SCANCODES + 6];
+
+void Input::Tick()
+{
+    SDL_PumpEvents();
+    int numkeys;
+    const Uint8 *keyState = SDL_GetKeyboardState(&numkeys);
+    for (int i = 0; i < numkeys; i++) {
+        keyPressed[i] = !keyDown[i] && keyState[i];
+        keyDown[i] = keyState[i];
+    }
+    Uint8 mb = SDL_GetMouseState(NULL, NULL);
+    for (int i = 1; i < 6; i++) {
+        keyPressed[SDL_NUM_SCANCODES + i] = !keyDown[SDL_NUM_SCANCODES + i] && (mb & SDL_BUTTON(i));
+        keyDown[SDL_NUM_SCANCODES + i] = (mb & SDL_BUTTON(i));
+    }
+}
+
+bool Input::isKeyDown(int k)
+{
+    if (keyboardfrozen || k >= SDL_NUM_SCANCODES + 6) // really useful? check that.
+        return false;
+    return keyDown[k];
 }
 
-const char* Input::keyToChar(unsigned short i) {
-	if(i<SDLK_LAST)
-		return SDL_GetKeyName(SDLKey(i));
-	else if(i==SDLK_LAST+SDL_BUTTON_LEFT)
-		return "mouse1";
-	else if(i==SDLK_LAST+SDL_BUTTON_RIGHT)
-		return "mouse2";
-	else if(i==SDLK_LAST+SDL_BUTTON_MIDDLE)
-		return "mouse3";
-	else
-		return "unknown";
+bool Input::isKeyPressed(int k)
+{
+    if (keyboardfrozen || k >= SDL_NUM_SCANCODES + 6)
+        return false;
+    return keyPressed[k];
+}
+
+const char* Input::keyToChar(unsigned short i)
+{
+    if (i < SDL_NUM_SCANCODES)
+        return SDL_GetScancodeName(SDL_Scancode(i));
+    else if (i == MOUSEBUTTON1)
+        return "mouse1";
+    else if (i == MOUSEBUTTON2)
+        return "mouse2";
+    else if (i == MOUSEBUTTON3)
+        return "mouse3";
+    else
+        return "unknown";
 }
 
-unsigned short 	Input::CharToKey(const char* which)
+unsigned short Input::CharToKey(const char* which)
 {
-	for(unsigned short i=0;i<SDLK_LAST;i++) {
-		if(!strcasecmp(which,SDL_GetKeyName(SDLKey(i))))
-			return i;
-	}
-	if(!strcasecmp(which,"mouse1")){
-		return MOUSEBUTTON1;
-	}
-	if(!strcasecmp(which,"mouse2")){
-		return MOUSEBUTTON2;
-	}
-	return SDLK_LAST;
+    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;
 }
 
-Boolean Input::Button()
+Boolean Input::MouseClicked()
 {
-    return SDL_GetMouseState(NULL,NULL)&SDL_BUTTON(SDL_BUTTON_LEFT);
+    return isKeyPressed(SDL_NUM_SCANCODES + SDL_BUTTON_LEFT);
 }