X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=1297fbdc4f6c016076c7bdbe308e563b2a53b5d7;hb=decb00e82a2e65e25dbcdd8f16fff5a6a07d31d6;hp=cbd70906449774cd5e7b5b5fa9b6ea72a18290da;hpb=9a5f2758e538d9216d255b4797f042a1b6874272;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index cbd7090..1297fbd 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _GAME_H_ #define _GAME_H_ +#include "SDL.h" + #if (defined(__APPLE__) && defined(__MACH__)) # ifdef PLATFORM_MACOSX # error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build. @@ -38,10 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "TGALoader.h" -#if USE_SDL -#include "SDL.h" -#endif - #if !PLATFORM_MACOSX #include "WinInput.h" #else @@ -55,7 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Lights.h" #include "Person.h" #include "Constants.h" -#include "fmod.h" #include "Sprites.h" //#include #include "Text.h" @@ -65,6 +62,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "binio.h" #include #include "gamegl.h" +#include "Stereo.h" extern GLuint rabbittexture; @@ -106,7 +104,6 @@ public: int loaddistrib; int keyselect; int indemo; - int registered; bool won; @@ -241,16 +238,16 @@ public: bool oldattackkey; long long MD5_string (char *string); - static void LoadTexture(char *fileName, GLuint *textureid,int mipmap, bool hasalpha); - static void LoadTextureSave(char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize); - void LoadSave(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize); - bool AddClothes(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize); + 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); + bool AddClothes(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize); void InitGame(); void LoadStuff(); void LoadingScreen(); void FadeLoadingScreen(float howmuch); void Dispose(); - int DrawGLScene(void); + int DrawGLScene(StereoSide side); void Tick(); void TickOnce(); void TickOnceAfter(); @@ -308,17 +305,9 @@ public: static __forceinline void swap_gl_buffers(void) { -#ifdef WIN32 - extern HDC hDC; - SwapBuffers( hDC); -#elif USE_SDL + SDL_GL_SwapBuffers(); -#elif PLATFORM_MACOSX - extern AGLContext gaglContext; - aglSwapBuffers(gaglContext); -#else - #error define your platform. -#endif + } #ifdef __GNUC__