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

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index c766332..4a700b3 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.
 
@@ -21,19 +22,16 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "openal_wrapper.h"
 #include "Animation.h"
 #include "Texture.h"
+#include "Utils/Folders.h"
 
 extern float screenwidth, screenheight;
 extern float viewdistance;
 extern XYZ viewer;
-extern XYZ lightlocation;
 extern float fadestart;
 extern float texscale;
 extern float gravity;
 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 +43,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,9 +50,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;
 extern bool visibleloading;
 extern float flashamount, flashr, flashg, flashb;
@@ -63,25 +57,9 @@ 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;
 
-extern int numdialogues;
-extern int numdialogueboxes[20];
-extern int dialoguetype[20];
-extern int dialogueboxlocation[20][20];
-extern float dialogueboxcolor[20][20][3];
-extern int dialogueboxsound[20][20];
-extern char dialoguetext[20][20][128];
-extern char dialoguename[20][20][64];
-extern XYZ dialoguecamera[20][20];
-extern float dialoguecamerayaw[20][20];
-extern float dialoguecamerapitch[20][20];
-extern int indialogue;
-extern int whichdialogue;
-extern float dialoguetime;
-
 extern float accountcampaignhighscore[10];
 extern float accountcampaignfasttime[10];
 extern float accountcampaignscore[10];
@@ -104,7 +82,7 @@ void Dispose()
         Game::endgame = 0;
     }
 
-    Account::saveFile(":Data:Users", Game::accountactive);
+    Account::saveFile(Folders::getUserDataPath()+"/users", Game::accountactive);
 
     //textures.clear();
 
@@ -121,10 +99,6 @@ void Dispose()
     }
 
     OPENAL_Close();
-    if (texture.data) {
-        free(texture.data);
-    }
-    texture.data = 0;
 #endif
 }
 
@@ -170,14 +144,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(Folders::getResourcePath(fileName).c_str(), texture);
     texdetail = temptexdetail;
 
     int bytesPerPixel = texture.bpp / 8;
@@ -479,20 +448,13 @@ void FadeLoadingScreen(float howmuch)
     swap_gl_buffers();
 }
 
-
-extern bool cmdline(const char *cmd);
-
 void Game::InitGame()
 {
     LOGFUNC;
 
     numchallengelevels = 14;
 
-    accountactive = Account::loadFile(":Data:Users");
-
-    tintr = 1;
-    tintg = 1;
-    tintb = 1;
+    accountactive = Account::loadFile(Folders::getUserDataPath()+"/users");
 
     whichjointstartarray[0] = righthip;
     whichjointendarray[0] = rightfoot;
@@ -576,11 +538,9 @@ void Game::InitGame()
 
     stillloading = 1;
 
-    texture.data = ( GLubyte* )malloc( 1024 * 1024 * 4 );
-
     int temptexdetail = texdetail;
     texdetail = 1;
-    text->LoadFontTexture(":Data:Textures:Font.png");
+    text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
     texdetail = temptexdetail;
 
@@ -601,15 +561,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);
@@ -633,25 +592,23 @@ void Game::InitGame()
     if (musictoggle)
         emit_stream_np(stream_menutheme);
 
-    cursortexture.load(":Data:Textures:Cursor.png", 0, 1);
+    cursortexture.load("Textures/Cursor.png", 0);
 
-    Mapcircletexture.load(":Data:Textures:MapCircle.png", 0, 1);
-    Mapboxtexture.load(":Data:Textures:MapBox.png", 0, 1);
-    Maparrowtexture.load(":Data:Textures:MapArrow.png", 0, 1);
+    Mapcircletexture.load("Textures/MapCircle.png", 0);
+    Mapboxtexture.load("Textures/MapBox.png", 0);
+    Maparrowtexture.load("Textures/MapArrow.png", 0);
 
     temptexdetail = texdetail;
     if (texdetail > 2)
         texdetail = 2;
-    Mainmenuitems[0].load(":Data:Textures:Lugaru.png", 0, 0);
-    Mainmenuitems[1].load(":Data:Textures:Newgame.png", 0, 0);
-    Mainmenuitems[2].load(":Data:Textures:Options.png", 0, 0);
-    Mainmenuitems[3].load(":Data:Textures:Quit.png", 0, 0);
-    Mainmenuitems[4].load(":Data:Textures:Eyelid.png", 0, 1);
-    Mainmenuitems[5].load(":Data:Textures:Resume.png", 0, 0);
-    Mainmenuitems[6].load(":Data:Textures:Endgame.png", 0, 0);
-
-    //LoadTexture(":Data:Textures:Eye.jpg",&Mainmenuitems[5],0,1);
-    //~ LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0); // LoadCampaign will take care of that
+    Mainmenuitems[0].load("Textures/Lugaru.png", 0);
+    Mainmenuitems[1].load("Textures/NewGame.png", 0);
+    Mainmenuitems[2].load("Textures/Options.png", 0);
+    Mainmenuitems[3].load("Textures/Quit.png", 0);
+    Mainmenuitems[4].load("Textures/Eyelid.png", 0);
+    Mainmenuitems[5].load("Textures/Resume.png", 0);
+    Mainmenuitems[6].load("Textures/EndGame.png", 0);
+
     texdetail = temptexdetail;
 
     FadeLoadingScreen(95);
@@ -708,17 +665,15 @@ void Game::LoadStuff()
 
     i = abs(Random() % 4);
     visibleloading = 0; //don't use loadscreentexture yet
-    loadscreentexture.load(":Data:Textures:fire.jpg", 1, 0);
+    loadscreentexture.load("Textures/Fire.jpg", 1);
     visibleloading = 1;
 
     temptexdetail = texdetail;
     texdetail = 1;
-    text->LoadFontTexture(":Data:Textures:Font.png");
+    text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
     texdetail = temptexdetail;
 
-    numsounds = 71;
-
     viewdistdetail = 2;
     viewdistance = 50 * megascale * viewdistdetail;
 
@@ -736,65 +691,59 @@ void Game::LoadStuff()
 
     LOG("Loading weapon data...");
 
-    Weapon::knifetextureptr.load(":Data:Textures:knife.png", 0, 1);
-    Weapon::bloodknifetextureptr.load(":Data:Textures:bloodknife.png", 0, 1);
-    Weapon::lightbloodknifetextureptr.load(":Data:Textures:lightbloodknife.png", 0, 1);
-    Weapon::swordtextureptr.load(":Data:Textures:sword.jpg", 1, 0);
-    Weapon::bloodswordtextureptr.load(":Data:Textures:Swordblood.jpg", 1, 0);
-    Weapon::lightbloodswordtextureptr.load(":Data:Textures:Swordbloodlight.jpg", 1, 0);
-    Weapon::stafftextureptr.load(":Data:Textures:Staff.jpg", 1, 0);
+    Weapon::knifetextureptr.load("Textures/Knife.png", 0);
+    Weapon::bloodknifetextureptr.load("Textures/BloodKnife.png", 0);
+    Weapon::lightbloodknifetextureptr.load("Textures/BloodKnifeLight.png", 0);
+    Weapon::swordtextureptr.load("Textures/Sword.jpg", 1);
+    Weapon::bloodswordtextureptr.load("Textures/SwordBlood.jpg", 1);
+    Weapon::lightbloodswordtextureptr.load("Textures/SwordBloodLight.jpg", 1);
+    Weapon::stafftextureptr.load("Textures/Staff.jpg", 1);
 
-    Weapon::throwingknifemodel.load((char *)":Data:Models:throwingknife.solid", 1);
+    Weapon::throwingknifemodel.load((char *)"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.load((char *)"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.load((char *)"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);
-    terrain.breaktexture.load(":Data:Textures:break.png", 0, 1);
-    terrain.bloodtexture2.load(":Data:Textures:blood.png", 0, 1);
+    terrain.shadowtexture.load("Textures/Shadow.png", 0);
+    terrain.bloodtexture.load("Textures/Blood.png", 0);
+    terrain.breaktexture.load("Textures/Break.png", 0);
+    terrain.bloodtexture2.load("Textures/Blood.png", 0);
 
 
-    terrain.footprinttexture.load(":Data:Textures:footprint.png", 0, 1);
-    terrain.bodyprinttexture.load(":Data:Textures:bodyprint.png", 0, 1);
-    hawktexture.load(":Data:Textures:hawk.png", 0, 1);
+    terrain.footprinttexture.load("Textures/Footprint.png", 0);
+    terrain.bodyprinttexture.load("Textures/Bodyprint.png", 0);
+    hawktexture.load("Textures/Hawk.png", 0);
 
 
-    Sprite::cloudtexture.load(":Data:Textures:cloud.png", 1, 1);
-    Sprite::cloudimpacttexture.load(":Data:Textures:cloudimpact.png", 1, 1);
-    Sprite::bloodtexture.load(":Data:Textures:bloodparticle.png", 1, 1);
-    Sprite::snowflaketexture.load(":Data:Textures:snowflake.png", 1, 1);
-    Sprite::flametexture.load(":Data:Textures:flame.png", 1, 1);
-    Sprite::bloodflametexture.load(":Data:Textures:bloodflame.png", 1, 1);
-    Sprite::smoketexture.load(":Data:Textures:smoke.png", 1, 1);
-    Sprite::shinetexture.load(":Data:Textures:shine.png", 1, 0);
-    Sprite::splintertexture.load(":Data:Textures:splinter.png", 1, 1);
-    Sprite::leaftexture.load(":Data:Textures:leaf.png", 1, 1);
-    Sprite::toothtexture.load(":Data:Textures:tooth.png", 1, 1);
+    Sprite::cloudtexture.load("Textures/Cloud.png", 1);
+    Sprite::cloudimpacttexture.load("Textures/CloudImpact.png", 1);
+    Sprite::bloodtexture.load("Textures/BloodParticle.png", 1);
+    Sprite::snowflaketexture.load("Textures/SnowFlake.png", 1);
+    Sprite::flametexture.load("Textures/Flame.png", 1);
+    Sprite::bloodflametexture.load("Textures/BloodFlame.png", 1);
+    Sprite::smoketexture.load("Textures/Smoke.png", 1);
+    Sprite::shinetexture.load("Textures/Shine.png", 1);
+    Sprite::splintertexture.load("Textures/Splinter.png", 1);
+    Sprite::leaftexture.load("Textures/Leaf.png", 1);
+    Sprite::toothtexture.load("Textures/Tooth.png", 1);
 
     yaw = 0;
     pitch = 0;
@@ -836,7 +785,7 @@ void Game::LoadStuff()
     viewer.x = terrain.size / 2 * terrain.scale;
     viewer.z = terrain.size / 2 * terrain.scale;
 
-    hawk.load((char *)":Data:Models:hawk.solid", 1);
+    hawk.load((char *)"Models/Hawk.solid", 1);
     hawk.Scale(.03, .03, .03);
     hawk.Rotate(90, 1, 1);
     hawk.CalculateNormals(0);
@@ -845,20 +794,20 @@ void Game::LoadStuff()
     hawkcoords.z = terrain.size / 2 * terrain.scale - 5 - 7;
     hawkcoords.y = terrain.getHeight(hawkcoords.x, hawkcoords.z) + 25;
 
-    eye.load((char *)":Data:Models:eye.solid", 1);
+    eye.load((char *)"Models/Eye.solid", 1);
     eye.Scale(.03, .03, .03);
     eye.CalculateNormals(0);
 
-    cornea.load((char *)":Data:Models:cornea.solid", 1);
+    cornea.load((char *)"Models/Cornea.solid", 1);
     cornea.Scale(.03, .03, .03);
     cornea.CalculateNormals(0);
 
-    iris.load((char *)":Data:Models:iris.solid", 1);
+    iris.load((char *)"Models/Iris.solid", 1);
     iris.Scale(.03, .03, .03);
     iris.CalculateNormals(0);
 
-    LoadSave(":Data:Textures:Bloodfur.png", 0, 1, &bloodText[0], 0);
-    LoadSave(":Data:Textures:Wolfbloodfur.png", 0, 1, &wolfbloodText[0], 0);
+    LoadSave("Textures/BloodFur.png", 0, 1, &bloodText[0], 0);
+    LoadSave("Textures/WolfBloodFur.png", 0, 1, &wolfbloodText[0], 0);
 
     oldenvironment = -4;