Remove some extra declarations of "channels"

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 8846493e07be874e29a4c9a3a83d09c8cfa8de53..d7714c3fccea40ff1bdc37ff00a9593f58ceb016 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"
@@ -64,6 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "gamegl.h"
 #include "Stereo.h"
 #include "Account.h"
+#include "Sounds.h"
 
 extern GLuint rabbittexture;
 
@@ -229,15 +224,14 @@ class Game
                float consoleblinkdelay;
                bool consoleblink;
                int consoleselected;
-               int togglekey[140];
-               float togglekeydelay[140];
+               //int togglekey[140];
+               //float togglekeydelay[140];
                bool registernow;
                bool autocam;
 
                unsigned short crouchkey,jumpkey,forwardkey,chatkey,backkey,leftkey,rightkey,drawkey,throwkey,attackkey;
                bool oldattackkey;
 
-               long long MD5_string (char *string);
                static void LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha);
                static void LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize);
                void LoadSave(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
@@ -248,13 +242,13 @@ class Game
                void FadeLoadingScreen(float howmuch);
                void Dispose();
                int DrawGLScene(StereoSide side);
+               void DrawGL();
                void Tick();
                void TickOnce();
                void TickOnceAfter();
                void SetUpLighting();
                void Loadlevel(int which);
                void Loadlevel(char *name);
-               void LoadSounds();
                void Setenvironment(int which);
                GLvoid ReSizeGLScene(float fov, float near);
                int findPathDist(int start,int end);
@@ -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;
@@ -318,20 +311,13 @@ class Game
 
 static __forceinline void swap_gl_buffers(void)
 {
-
     SDL_GL_SwapBuffers();
-
 }
 
-#ifdef __GNUC__
-#define LONGLONGCONST(x) (x##ll)
-#else
-#define LONGLONGCONST(x) (x)
-#endif
-
 extern "C" { void UndefinedSymbolToExposeStubbedCode(void); }
 //#define STUBBED(x) UndefinedSymbolToExposeStubbedCode();
 #define STUBBED(x) { static bool seen = false; if (!seen) { seen = true; fprintf(stderr, "STUBBED: %s at %s:%d\n", x, __FILE__, __LINE__); } }
 //#define STUBBED(x)
 
+extern int numplayers;
 #endif