X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=bda4324218e65af58dd42ad4b6109e2e8f3ad6cb;hb=24fc7ebc577b3452614208238bc3dd424fff14ad;hp=b915f81b0b3bbf3720c11829f0d8ecee62e449a8;hpb=d435148bf0fd538f3b69a8232253618e10249ffa;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index b915f81..bda4324 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -22,9 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _GAME_H_ #define _GAME_H_ -#if USE_SDL #include "SDL.h" -#endif #if (defined(__APPLE__) && defined(__MACH__)) # ifdef PLATFORM_MACOSX @@ -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" @@ -106,7 +103,6 @@ public: int loaddistrib; int keyselect; int indemo; - int registered; bool won; @@ -241,10 +237,10 @@ 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(); @@ -308,17 +304,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__