X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FInput.cpp;h=b18ec6ee50e26740a88654a56fee5749ee73e320;hb=cc92cb7b7f9b87cb791c504bf930d622d74db368;hp=6080516a86d684165ee3e5c53eabe5e54f89ba41;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git diff --git a/Source/Input.cpp b/Source/Input.cpp index 6080516..b18ec6e 100644 --- a/Source/Input.cpp +++ b/Source/Input.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010 - Côme 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 . /**> 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); }