Replaced all uses of Account::active outside of Account by call to active() method

[lugaru.git] / Source / Input.h

diff --git a/Source/Input.h b/Source/Input.h
index f78437c39bbdc10d9e3784f40ea3047c87759bb2..3bf8d796609e5220c781abaa7c5bd67a49542db5 100644 (file)
--- a/Source/Input.h
+++ b/Source/Input.h
@@ -1,23 +1,21 @@
 /*
 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 <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _Input_H_
@@ -28,17 +26,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Game.h"
 
 /**> CONSTANT DECLARATIONS <**/
-#define MOUSEBUTTON1           SDLK_LAST+SDL_BUTTON_LEFT
-#define MOUSEBUTTON2           SDLK_LAST+SDL_BUTTON_RIGHT
+#define MOUSEBUTTON1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
+#define MOUSEBUTTON2 (SDL_NUM_SCANCODES + SDL_BUTTON_RIGHT)
+#define MOUSEBUTTON3 (SDL_NUM_SCANCODES + SDL_BUTTON_MIDDLE)
 
 /**> FUNCTION PROTOTYPES <**/
-class Input {
-       public:
-               static bool isKeyDown(int k);
-               static const char* keyToChar(unsigned short which);
-               static void setKeyFor(Game* g);
-               static unsigned short   CharToKey(const char* which);
-               static Boolean Button();
+class Input
+{
+public:
+    static void Tick();
+    static bool isKeyDown(int k);
+    static bool isKeyPressed(int k);
+    static const char* keyToChar(unsigned short which);
+    static unsigned short CharToKey(const char* which);
+    static bool MouseClicked();
 };
 
 #endif