Cleanning up Sprite class. More can be done, but it's already prettier.

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 8846493e07be874e29a4c9a3a83d09c8cfa8de53..edf867a1d40a05082bc8a10dc646c281c56badc0 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -40,12 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "TGALoader.h"
 
-#if !PLATFORM_MACOSX
-#include "WinInput.h"
-#else
-#include "Macinput.h"
-#endif
-
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
@@ -53,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Lights.h"
 #include "Person.h"
 #include "Constants.h"
-#include "Sprites.h"
+#include "Sprite.h"
 //#include <agl.h>
 #include "Text.h"
 #include "Objects.h"
@@ -229,8 +223,8 @@ class Game
                float consoleblinkdelay;
                bool consoleblink;
                int consoleselected;
-               int togglekey[140];
-               float togglekeydelay[140];
+               //int togglekey[140];
+               //float togglekeydelay[140];
                bool registernow;
                bool autocam;
 
@@ -301,8 +295,7 @@ class Game
        private:
                void setKeySelected_thread();
                static int thread(void *data);
-               void inputText();
-               void inputText_thread();
+               void inputText(char* str, int* charselected, int* nb_chars);
                void flash();
                bool waiting;
                bool mainmenutogglekeydown;