X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=935b69d0541af59df7623f0606b74620a451f611;hb=ff29f47f799d99cec7c2a6aa2cf818da2b931fc5;hp=c7663322b195a7f016aa6670fe86b3a0f88a44d2;hpb=6aeefd781d62a9b5b8cf2f4d3a7ba4abaf82f54f;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index c766332..935b69d 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -33,7 +34,6 @@ extern Light light;
 extern Skeleton testskeleton;
 extern int numsounds;
 extern Terrain terrain;
-//extern Sprites sprites;
 extern int kTextureSize;
 extern float texdetail;
 extern float realtexdetail;
@@ -45,7 +45,6 @@ extern GLubyte bloodText[512 * 512 * 3];
 extern GLubyte wolfbloodText[512 * 512 * 3];
 extern bool ismotionblur;
 extern bool trilinear;
-extern bool osx;
 extern bool musictoggle;
 extern int environment;
 extern bool ambientsound;
@@ -53,7 +52,6 @@ extern float multiplier;
 extern int netdatanew;
 extern float mapinfo;
 extern bool stillloading;
-extern TGAImageRec texture;
 extern short vRefNum;
 extern long dirID;
 extern int mainmenu;
@@ -63,7 +61,6 @@ extern int flashdelay;
 extern int whichjointstartarray[26];
 extern int whichjointendarray[26];
 extern int difficulty;
-extern float tintr, tintg, tintb;
 extern float slomospeed;
 extern bool gamestarted;
 
@@ -121,10 +118,6 @@ void Dispose()
     }
 
     OPENAL_Close();
-    if (texture.data) {
-        free(texture.data);
-    }
-    texture.data = 0;
 #endif
 }
 
@@ -170,14 +163,9 @@ void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *arr
     float temptexdetail = texdetail;
     texdetail = 1;
 
-    // Converting file to something os specific
-    char * fixedFN = ConvertFileName(fileName);
-
     //Load Image
-    unsigned char fileNamep[256];
-    CopyCStringToPascal(fixedFN, fileNamep);
-    //Load Image
-    upload_image( fileNamep , 0);
+    ImageRec texture;
+    load_image(ConvertFileName(fileName), texture);
     texdetail = temptexdetail;
 
     int bytesPerPixel = texture.bpp / 8;
@@ -479,9 +467,6 @@ void FadeLoadingScreen(float howmuch)
     swap_gl_buffers();
 }
 
-
-extern bool cmdline(const char *cmd);
-
 void Game::InitGame()
 {
     LOGFUNC;
@@ -490,10 +475,6 @@ void Game::InitGame()
 
     accountactive = Account::loadFile(":Data:Users");
 
-    tintr = 1;
-    tintg = 1;
-    tintb = 1;
-
     whichjointstartarray[0] = righthip;
     whichjointendarray[0] = rightfoot;
 
@@ -576,8 +557,6 @@ void Game::InitGame()
 
     stillloading = 1;
 
-    texture.data = ( GLubyte* )malloc( 1024 * 1024 * 4 );
-
     int temptexdetail = texdetail;
     texdetail = 1;
     text->LoadFontTexture(":Data:Textures:Font.png");
@@ -601,15 +580,14 @@ void Game::InitGame()
 #if PLATFORM_LINUX
     unsigned char rc = 0;
     int output = OPENAL_OUTPUT_ALSA;  // Try alsa first...
-    if (cmdline("forceoss"))      //  ...but let user override that.
-        output = OPENAL_OUTPUT_OSS;
-    else if (cmdline("nosound"))
-        output = OPENAL_OUTPUT_NOSOUND;
+    if (commandLineOptions[SOUND]) {
+        output = commandLineOptions[SOUND].last()->type(); //  ...but let user override that.
+    }
 
     OPENAL_SetOutput(output);
     if ((rc = OPENAL_Init(44100, 32, 0)) == false) {
         // if we tried ALSA and failed, fall back to OSS.
-        if ( (output == OPENAL_OUTPUT_ALSA) && (!cmdline("forcealsa")) ) {
+        if ( (output == OPENAL_OUTPUT_ALSA) && (commandLineOptions[SOUND].last()->type() != OPENAL_OUTPUT_ALSA) ) {
             OPENAL_Close();
             output = OPENAL_OUTPUT_OSS;
             OPENAL_SetOutput(output);
@@ -746,32 +724,26 @@ void Game::LoadStuff()
 
     Weapon::throwingknifemodel.load((char *)":Data:Models:throwingknife.solid", 1);
     Weapon::throwingknifemodel.Scale(.001, .001, .001);
-    //Weapon::throwingknifemodel.Rotate(0,0,-90);
     Weapon::throwingknifemodel.Rotate(90, 0, 0);
     Weapon::throwingknifemodel.Rotate(0, 90, 0);
     Weapon::throwingknifemodel.flat = 0;
     Weapon::throwingknifemodel.CalculateNormals(1);
-    //Weapon::throwingknifemodel.ScaleNormals(-1,-1,-1);
 
     Weapon::swordmodel.load((char *)":Data:Models:sword.solid", 1);
     Weapon::swordmodel.Scale(.001, .001, .001);
-    //Weapon::swordmodel.Rotate(0,0,-90);
     Weapon::swordmodel.Rotate(90, 0, 0);
     Weapon::swordmodel.Rotate(0, 90, 0);
     Weapon::swordmodel.Rotate(0, 0, 90);
     Weapon::swordmodel.flat = 1;
     Weapon::swordmodel.CalculateNormals(1);
-    //Weapon::swordmodel.ScaleNormals(-1,-1,-1);
 
     Weapon::staffmodel.load((char *)":Data:Models:staff.solid", 1);
     Weapon::staffmodel.Scale(.005, .005, .005);
-    //Weapon::staffmodel.Rotate(0,0,-90);
     Weapon::staffmodel.Rotate(90, 0, 0);
     Weapon::staffmodel.Rotate(0, 90, 0);
     Weapon::staffmodel.Rotate(0, 0, 90);
     Weapon::staffmodel.flat = 1;
     Weapon::staffmodel.CalculateNormals(1);
-    //Weapon::staffmodel.ScaleNormals(-1,-1,-1);
 
     terrain.shadowtexture.load(":Data:Textures:shadow.png", 0, 1);
     terrain.bloodtexture.load(":Data:Textures:blood.png", 0, 1);