Merge.

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index cbd70906449774cd5e7b5b5fa9b6ea72a18290da..45d9eb8c442cfd92702408a85d632254dac6f97c 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -22,6 +22,10 @@ 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
 #    error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build.
@@ -38,10 +42,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
@@ -241,10 +241,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();