add include guard to Texture.h

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index eb55bb39fb04c548dda355eba633d036fd4bf40c..f6fd203517442763d32dc74fb8f882b589aa5f48 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -60,7 +60,6 @@ extern TGAImageRec texture;
 extern short vRefNum;
 extern long dirID;
 extern int mainmenu;
-extern int oldmainmenu;
 extern bool visibleloading;
 extern float flashamount,flashr,flashg,flashb;
 extern int flashdelay;
@@ -646,8 +645,8 @@ void Game::InitGame()
 
        int temptexdetail=texdetail;
        texdetail=1;
-       text.LoadFontTexture(":Data:Textures:Font.png");
-       text.BuildFont();
+       text->LoadFontTexture(":Data:Textures:Font.png");
+       text->BuildFont();
        texdetail=temptexdetail;
 
        FadeLoadingScreen(10);
@@ -733,11 +732,12 @@ void Game::InitGame()
 
        stillloading=0;
        firstload=0;
-       oldmainmenu=0;
 
        newdetail=detail;
        newscreenwidth=screenwidth;
        newscreenheight=screenheight;
+
+    LoadMenu();
 }
 
 
@@ -786,8 +786,8 @@ void Game::LoadStuff()
 
        temptexdetail=texdetail;
        texdetail=1;
-       text.LoadFontTexture(":Data:Textures:Font.png");
-       text.BuildFont();
+       text->LoadFontTexture(":Data:Textures:Font.png");
+       text->BuildFont();
        texdetail=temptexdetail;
 
        numsounds=71;