Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / CEngine.h

diff --git a/src/CEngine.h b/src/CEngine.h
old mode 100755 (executable)
new mode 100644 (file)
index 4fe6876..e8ab558
--- a/src/CEngine.h
+++ b/src/CEngine.h
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -44,10 +45,13 @@ class Engine {
                
                int extremeAvailable;
 
-               char keyState[350];
+               char keyState[SDL_NUM_SCANCODES];
                char mouseLeft, mouseRight;
                
                int joyX, joyY;
+               int joyprevX, joyprevY;
+               int joykeyX, joykeyY;
+               bool joykeyFire;
                int joystickState[32]; // hopefully no one has a joystick with this many buttons(!)
                bool waitForButton;
                bool waitForKey;
@@ -100,7 +104,7 @@ class Engine {
        int getMouseX() const;
        int getMouseY() const;
 
-       void setMouse(int x, int y);
+       void moveMouse(int dx, int dy);
        bool userAccepts();
        
        void clearCheatVars();