]> git.jsancho.org Git - lugaru.git/blobdiff - Source/GameTick.cpp
removing a debug cout
[lugaru.git] / Source / GameTick.cpp
index 58baac80451814c9bc9fd1f2340febe891a10f97..b1f3ecc93e9496b582877b3b2a37a4c2fe81fc79 100644 (file)
@@ -1408,7 +1408,7 @@ void Game::Loadlevel(int which){
            Loadlevel("tutorial");
        }else if(which >= 0 && which <= 15){
            char buf[32];
-           snprintf(buf, 32, "map%d", which + 1);
+           snprintf(buf, 32, "map%d", which + 1); // challenges
            Loadlevel(buf);
        }else
            Loadlevel("mapsave");
@@ -5739,15 +5739,10 @@ void Game::MenuTick(){
                                                                c=campaigns.begin();
                                                        accountactive->setCurrentCampaign(*c);
                                                }
-                                               LoadCampaign();
                                                if(Mainmenuitems[7])
-                                                       glDeleteTextures(1,&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);
-                                               }
+                                                       glDeleteTextures(1,&Mainmenuitems[7]); // we delete the world texture so load campaign will reload it
+                                               Mainmenuitems[7] = 0;
+                                               LoadCampaign();
                                                break;
                                }
                                break;