X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FInput.cpp;h=b18ec6ee50e26740a88654a56fee5749ee73e320;hb=20e924d;hp=811ab0151889f9693c9bf1f67969862b8ce6105e;hpb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;p=lugaru.git
diff --git a/Source/Input.cpp b/Source/Input.cpp
index 811ab01..b18ec6e 100644
--- a/Source/Input.cpp
+++ b/Source/Input.cpp
@@ -1,86 +1,92 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010 - MCMic
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+Lugaru 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.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
/**> HEADER FILES <**/
#include "Input.h"
-extern bool keyboardfrozen;
-
-bool keyDown[SDLK_LAST+6];
-bool keyPressed[SDLK_LAST+6];
+bool keyDown[SDL_NUM_SCANCODES + 6];
+bool keyPressed[SDL_NUM_SCANCODES + 6];
-void Input::Tick(){
+void Input::Tick()
+{
SDL_PumpEvents();
- Uint8 *keyState = SDL_GetKeyState(NULL);
- for(int i=0;i=SDLK_LAST+6) // vraiment utile? à vérifier
+bool Input::isKeyDown(int k)
+{
+ if (k >= SDL_NUM_SCANCODES + 6) // really useful? check that.
return false;
return keyDown[k];
}
-bool Input::isKeyPressed(int k) {
- if(keyboardfrozen||k>=SDLK_LAST+6)
+bool Input::isKeyPressed(int k)
+{
+ if (k >= SDL_NUM_SCANCODES + 6)
return false;
return keyPressed[k];
}
-const char* Input::keyToChar(unsigned short i) {
- if(i