diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 361ef938..99389875 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -2981,7 +2981,9 @@ void AiL::RenderMenu(){ if(Menu::alreadyClicked){ //Do not run a click event for this round. Menu::alreadyClicked=false; }else{ - Menu::stack.back()->Update(this); + if(!MenuClicksDeactivated()){ + Menu::stack.back()->Update(this); + } } for(Menu*menu:Menu::stack){ if(menu->cover)FillRectDecal({0,0},WINDOW_SIZE,{0,0,0,uint8_t(255*0.4)}); @@ -3369,6 +3371,10 @@ void AiL::RenderFadeout(){ #endif } +bool AiL::MenuClicksDeactivated()const{ + return fadeOutDuration>0||disableFadeIn||LoadingScreen::loading; +} + bool AiL::GamePaused(){ return fadeOutDuration>0||disableFadeIn||paused||LoadingScreen::loading; } diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index 34651c92..16f93f11 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -205,6 +205,7 @@ public: void RenderWorld(float fElapsedTime); void RenderHud(); void RenderMenu(); + bool MenuClicksDeactivated()const; void AddEffect(std::unique_ptrforeground,std::unique_ptrbackground); //If back is true, places the effect in the background void AddEffect(std::unique_ptrforeground,bool back=false); diff --git a/Adventures in Lestoria/Menu.cpp b/Adventures in Lestoria/Menu.cpp index 647d0c96..60810250 100644 --- a/Adventures in Lestoria/Menu.cpp +++ b/Adventures in Lestoria/Menu.cpp @@ -46,6 +46,7 @@ All rights reserved. #include "MenuItemItemButton.h" #include #include "SoundEffect.h" +#include "LoadingScreen.h" INCLUDE_ITEM_CATEGORIES INCLUDE_DATA diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index b85a5f0a..f1d36d55 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 4 #define VERSION_PATCH 4 -#define VERSION_BUILD 7902 +#define VERSION_BUILD 7905 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index d786eebf..2d624103 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ