Use const char * for string arguments to avoid deprecated conversion warnings.

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 118a7b5f2006829bd23fdc09d458843b6e567ef3..037828229b98294c3d534f33d2c05bf37391441c 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -115,6 +115,12 @@ extern FSOUND_STREAM * strm[20];
 extern "C"     void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
 extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
 
+void LOG(const std::string &fmt, ...)
+{
+    // !!! FIXME: write me.
+}
+
+
 Game::TextureList Game::textures;
 
 void Game::Dispose()
@@ -415,7 +421,7 @@ void Game::LoadSounds()
 
 }
 
-void Game::LoadTexture(char *fileName, GLuint *textureid,int mipmap, bool hasalpha)
+void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha)
 {
        GLuint          type;
 
@@ -468,7 +474,7 @@ void Game::LoadTexture(char *fileName, GLuint *textureid,int mipmap, bool hasalp
 //     }
 }
 
-void Game::LoadTextureSave(char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize)
+void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize)
 {
        GLuint          type;
        int i;
@@ -532,7 +538,7 @@ void Game::LoadTextureSave(char *fileName, GLuint *textureid,int mipmap,GLubyte
 //     }
 }
 
-void Game::LoadSave(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize)
+void Game::LoadSave(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize)
 {
        int i;
        int bytesPerPixel;
@@ -567,7 +573,7 @@ void Game::LoadSave(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array
        }
 }
 
-bool Game::AddClothes(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize)
+bool Game::AddClothes(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize)
 {
        int i;
        int bytesPerPixel;
@@ -1031,7 +1037,7 @@ void Game::InitGame()
                                char tempstring[256];
                                #if defined(__APPLE__)
                                sprintf (tempstring, "%s", registrationname);
-                               #elif defined(_MSC_VER) || defined(__linux__)
+                               #elif defined(_WIN32) || defined(__linux__)
                                sprintf (tempstring, "%s-windows", registrationname);
                                #else
                                #error Please make sure you have the right registration key stuff here!