Made a few more filepaths use ConvertFileName(), so it works on Windows compiled...

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index ddd7b222c462666bbed0524c5ceecca3114858c0..faa4f0316a1e792184627cd10e3f612f26ac6d87 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -58,7 +58,6 @@ extern int numplayers;
 extern int environment;
 extern bool ambientsound;
 extern float multiplier;
-extern int newnetmessages;
 extern int netdatanew;
 extern float mapinfo;
 extern bool stillloading;
@@ -139,10 +138,10 @@ void Game::Dispose()
        }
 
 
-       sprintf (mapname, ":Data:Users");
+       sprintf (ConvertFileName(mapname), ":Data:Users");
 
        FILE                    *tfile;
-       tfile=fopen( mapname, "wb" );
+       tfile=fopen( ConvertFileName(mapname), "wb" );
        if (tfile)
        {
                fpackf(tfile, "Bi", numaccounts);
@@ -428,8 +427,11 @@ void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool
 
        LOG(std::string("Loading texture...") + fileName);
 
+       // Fix filename so that is os appropreate
+       char * fixedFN = ConvertFileName(fileName);
+
        unsigned char fileNamep[256];
-       CopyCStringToPascal(fileName,fileNamep);
+       CopyCStringToPascal(fixedFN, fileNamep);
        //Load Image
        upload_image( fileNamep ,hasalpha);
 
@@ -485,7 +487,7 @@ void Game::LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GL
 
        //Load Image
        unsigned char fileNamep[256];
-       CopyCStringToPascal(fileName,fileNamep);
+       CopyCStringToPascal(ConvertFileName(fileName), fileNamep);
        //Load Image
        upload_image( fileNamep ,0);
        //LoadTGA( fileName );
@@ -551,9 +553,13 @@ void Game::LoadSave(const char *fileName, GLuint *textureid,bool mipmap,GLubyte
        texdetail=1;
        //upload_image( fileName );
        //LoadTGA( fileName );
+
+       // Converting file to something os specific
+       char * fixedFN = ConvertFileName(fileName);
+
        //Load Image
        unsigned char fileNamep[256];
-       CopyCStringToPascal(fileName,fileNamep);
+       CopyCStringToPascal(fixedFN, fileNamep);
        //Load Image
        upload_image( fileNamep ,0);
        texdetail=temptexdetail;
@@ -990,8 +996,6 @@ void Game::InitGame()
 
        numchallengelevels=14;
 
-       registered=0;
-
        /*char tempstring[256];
        sprintf (tempstring, "%s", registrationname);
        long num1;
@@ -1007,56 +1011,11 @@ void Game::InitGame()
        */
 
        FILE                    *tfile;
-       tfile=fopen( ":Data:Sounds:flame.ogg", "rb" );
-       if(tfile)
-       {
-               long num1;
-               long num2;
-               long long longnum;
-               long long longnuma;
-               long num1a;
-               long num2a;
-
-               int numchars;
-               funpackf(tfile, "Bb", &registered);
-               if(registered)
-               {
-                       funpackf(tfile, "Bi", &numchars);
-                       if(numchars>0)
-                       {
-                               for(j=0;j<numchars;j++)
-                               {
-                                       funpackf(tfile, "Bb",  &registrationname[j]);
-                               }
-                               registrationname[numchars]='\0';
-                               funpackf(tfile, "Bi", &num1);
-                               funpackf(tfile, "Bi", &num2);
-                               longnum=num2+num1*100000000;
-
-                               char tempstring[256];
-                               #if defined(__APPLE__)
-                               sprintf (tempstring, "%s", registrationname);
-                               #elif defined(_WIN32) || defined(__linux__)
-                               sprintf (tempstring, "%s-windows", registrationname);
-                               #else
-                               #error Please make sure you have the right registration key stuff here!
-                               #endif
-                               longnuma = MD5_string ( tempstring);
-                               num1a = longnuma/100000000;
-                               num2a = longnuma%100000000;
-                               //if(num1a==num1&&num2a==num2)registered=1;
-                               if(numchars>2)registered=1;
-                               else registered=0;
-                       }
-               }
-               fclose(tfile);
-       }
-       else registered=0;
 
        accountactive=-1;
 
-       sprintf (mapname, ":Data:Users");
-       tfile=fopen( mapname, "rb" );
+       sprintf (ConvertFileName(mapname), ":Data:Users");
+       tfile=fopen( ConvertFileName(mapname), "rb" );
        if(tfile)
        {
                funpackf(tfile, "Bi", &numaccounts);
@@ -1294,7 +1253,7 @@ void Game::InitGame()
        samp[firestartsound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:firestart.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
        OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
 
-       strm[stream_firesound] = OPENAL_Stream_Open(":Data:Sounds:fire.ogg", OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
+       strm[stream_firesound] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:fire.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
 //     OPENAL_Sample_SetMinMaxDistance(strm[stream_firesound], 8.0f, 2000.0f);
        OPENAL_Stream_SetMode(strm[stream_firesound], OPENAL_LOOP_NORMAL);
 
@@ -1406,8 +1365,6 @@ void Game::LoadStuff()
 
        //texture.data = ( GLubyte* )malloc( 1024*1024*4 );
 
-       newnetmessages=0;
-
        for(i=0;i<maxplayers;i++)
        {
                if (glIsTexture(player[i].skeleton.drawmodel.textureptr))
@@ -1910,7 +1867,6 @@ Game::Game()
        loaddistrib = 0;
        keyselect = 0;
        indemo = 0;
-       registered = 0;
 
        won = 0;