merge

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 6031cf5f21a8387db64c7a7079562adefa1f807d..dd74893d7a9e80aa6b0b1f43e3247113f7eb3f02 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2021,6 +2021,14 @@ vector<string> Game::ListCampaigns() {
 void Game::LoadCampaign() {
        if(!accountactive)
                return;
+       if(!Mainmenuitems[7]) {
+               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);
+               }
+       }
        ifstream ipstream(ConvertFileName((":Data:Campaigns:"+accountactive->getCurrentCampaign()+".txt").c_str()));
        ipstream.ignore(256,':');
        ipstream >> campaignnumlevels;
@@ -2396,7 +2404,7 @@ void Game::DrawMenu()
                        endy[5]=starty[5]+20;
                        
                        sprintf (menustring[6], "Campaign : %s", accountactive->getCurrentCampaign().c_str());
-                       startx[6]=100;
+                       startx[6]=200;
                        endx[6]=startx[6]+strlen(menustring[6])*10;
                        starty[6]=420;
                        endy[6]=starty[6]+20;