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 54f6fc519478c0c23d3074d0810e794fd65ececf..91dd2ed7efa6c0336062989809d964ccb38c5691 100644 (file)
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -300,7 +300,7 @@ void Menu::updateSettingsMenu()
     if (bloodtoggle == 1) setText(2, "Blood: On, low detail");
     if (bloodtoggle == 2) setText(2, "Blood: On, high detail (slower)");
     setText(4, ismotionblur ? "Blur Effects: Enabled (less compatible)" : "Blur Effects: Disabled (more compatible)");
-    setText(5, decals ? "Decals: Enabled (slower)" : "Decals: Disabled");
+    setText(5, decalstoggle ? "Decals: Enabled (slower)" : "Decals: Disabled");
     setText(6, musictoggle ? "Music: Enabled" : "Music: Disabled");
     setText(9, invertmouse ? "Invert mouse: Yes" : "Invert mouse: No");
     setText(10, std::string("Mouse Speed: ") + to_string(int(usermousesensitivity * 5)));
@@ -543,7 +543,7 @@ void Menu::Tick()
     }
     if (mainmenu == 10)
         endgame = 2;
-    if (mainmenu == 18 && Input::isKeyPressed(MOUSEBUTTON2) && selected == 1) {
+    if (mainmenu == 18 && Input::isKeyPressed(MOUSEBUTTON_RIGHT) && selected == 1) {
         stereoseparation -= 0.001;
         updateStereoConfigMenu();
     }
@@ -626,7 +626,7 @@ void Menu::Tick()
                 ismotionblur = !ismotionblur;
                 break;
             case 5:
-                decals = !decals;
+                decalstoggle = !decalstoggle;
                 break;
             case 6:
                 musictoggle = !musictoggle;
@@ -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;
@@ -905,7 +908,7 @@ void Menu::Tick()
 
 }
 
-int setKeySelected_thread(void* data)
+int setKeySelected_thread(void*)
 {
     using namespace Game;
     int scancode = -1;