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 88970f90bbb32cf2c37a371bf341e9e0a8c8d2a8..b18ec6ee50e26740a88654a56fee5749ee73e320 100644 (file)
--- a/Source/Input.cpp
+++ b/Source/Input.cpp
@@ -1,30 +1,26 @@
 /*
 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.
 
-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 <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];
 
@@ -46,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];
 }
@@ -90,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);
 }