Refactor of the texture system

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 0f3dd8cd07e277e8473b41ddd5bbcdd9d82c78bd..522681bc781434e18e23a23e21d4274ebc963956 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2034,13 +2034,11 @@ void Game::LoadCampaign() {
        }
        ipstream.close();
 
-       if(!Mainmenuitems[7]) {
-               ifstream test(ConvertFileName((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str()));
-               if(test.good()) {
-                       LoadTextureData((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str(),&Mainmenuitems[7],0,0);
-               } else {
-                       LoadTextureData(":Data:Textures:World.png",&Mainmenuitems[7],0,0);
-               }
+       ifstream test(ConvertFileName((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str()));
+       if(test.good()) {
+               LoadTexture((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str(),&Mainmenuitems[7],0,0);
+       } else {
+               LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0);
        }
 
        if(accountactive->getCampaignChoicesMade()==0) {