X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=d7714c3fccea40ff1bdc37ff00a9593f58ceb016;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=389db5aea69f8d8f8871d71b6549eb8e22569c12;hpb=735daf95aba0eef54d151daae01285f0959825d0;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index 389db5a..d7714c3 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -40,10 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "TGALoader.h"
 
-#if PLATFORM_MACOSX
-#include "Macinput.h"
-#endif
-
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
@@ -51,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"
@@ -62,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;
 
@@ -235,7 +232,6 @@ class Game
 		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);
@@ -246,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);
@@ -315,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