Fixed a bug loading all persons with the same ID. I hope it will fix weapon problems

[lugaru.git] / Source / Input.cpp

diff --git a/Source/Input.cpp b/Source/Input.cpp
index 6080516a86d684165ee3e5c53eabe5e54f89ba41..b18ec6ee50e26740a88654a56fee5749ee73e320 100644 (file)
--- a/Source/Input.cpp
+++ b/Source/Input.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010 - Côme <MCMic> BERNIGAUD
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -21,8 +21,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 /**> HEADER FILES <**/
 #include "Input.h"
 
-extern bool keyboardfrozen;
-
 bool keyDown[SDL_NUM_SCANCODES + 6];
 bool keyPressed[SDL_NUM_SCANCODES + 6];
 
@@ -44,14 +42,14 @@ void Input::Tick()
 
 bool Input::isKeyDown(int k)
 {
-    if (keyboardfrozen || k >= SDL_NUM_SCANCODES + 6) // really useful? check that.
+    if (k >= SDL_NUM_SCANCODES + 6) // really useful? check that.
         return false;
     return keyDown[k];
 }
 
 bool Input::isKeyPressed(int k)
 {
-    if (keyboardfrozen || k >= SDL_NUM_SCANCODES + 6)
+    if (k >= SDL_NUM_SCANCODES + 6)
         return false;
     return keyPressed[k];
 }
@@ -88,7 +86,7 @@ unsigned short Input::CharToKey(const char* which)
     return SDL_NUM_SCANCODES;
 }
 
-Boolean Input::MouseClicked()
+bool Input::MouseClicked()
 {
     return isKeyPressed(SDL_NUM_SCANCODES + SDL_BUTTON_LEFT);
 }