Console: Return gracefully when loading missing level

[lugaru.git] / Source / Menu / Menu.cpp

diff --git a/Source/Menu/Menu.cpp b/Source/Menu/Menu.cpp
index 201d7dfdfc9ace84e7ab7d449280875db4969029..91dd2ed7efa6c0336062989809d964ccb38c5691 100644 (file)
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -706,15 +706,16 @@ void Menu::Tick()
                 loading = 2;
                 loadtime = 0;
                 targetlevel = 7;
-                if (firstload)
+                if (firstLoadDone) {
                     TickOnceAfter();
-                else
+                } else {
                     LoadStuff();
+                }
                 whichchoice = selected - NB_CAMPAIGN_MENU_ITEM - Account::active().getCampaignChoicesMade();
                 actuallevel = (Account::active().getCampaignChoicesMade() > 0 ? campaignlevels[Account::active().getCampaignChoicesMade() - 1].nextlevel[whichchoice] : 0);
                 visibleloading = true;
                 stillloading = 1;
-                Loadlevel(campaignlevels[actuallevel].mapname.c_str());
+                LoadLevel(campaignlevels[actuallevel].mapname.c_str());
                 campaign = 1;
                 mainmenu = 0;
                 gameon = 1;
@@ -727,11 +728,12 @@ void Menu::Tick()
                 loading = 2;
                 loadtime = 0;
                 targetlevel = -1;
-                if (firstload) {
+                if (firstLoadDone) {
                     TickOnceAfter();
-                } else
+                } else {
                     LoadStuff();
-                Loadlevel(-1);
+                }
+                LoadLevel(-1);
 
                 mainmenu = 0;
                 gameon = 1;
@@ -813,11 +815,12 @@ void Menu::Tick()
                 loading = 2;
                 loadtime = 0;
                 targetlevel = selected;
-                if (firstload)
+                if (firstLoadDone) {
                     TickOnceAfter();
-                else
+                } else {
                     LoadStuff();
-                Loadlevel(selected);
+                }
+                LoadLevel(selected);
                 campaign = 0;
 
                 mainmenu = 0;