diff --git a/Adventures in Lestoria/DeathMenu.cpp b/Adventures in Lestoria/DeathMenu.cpp index 5ba808fa..b6d1bde1 100644 --- a/Adventures in Lestoria/DeathMenu.cpp +++ b/Adventures in Lestoria/DeathMenu.cpp @@ -55,11 +55,7 @@ void Menu::InitializeDeathWindow(){ return true; },ButtonAttr::FIT_TO_LABEL)END; deathWindow->ADD("Return to Camp Button",MenuComponent)(geom2d::rect{{6.f,28.f},{84.f,24.f}},"Return to Camp",[](MenuFuncData data){ - if(!Unlock::IsUnlocked("STORY_1_1")){ - GameState::ChangeState(States::OVERWORLD_MAP); - }else{ - GameState::ChangeState(States::GAME_HUB); - } + Component(MenuType::PAUSE,"Return to Camp Button")->Click(); return true; },ButtonAttr::FIT_TO_LABEL)END; diff --git a/Adventures in Lestoria/State_LevelComplete.cpp b/Adventures in Lestoria/State_LevelComplete.cpp index b285558d..4099cdab 100644 --- a/Adventures in Lestoria/State_LevelComplete.cpp +++ b/Adventures in Lestoria/State_LevelComplete.cpp @@ -106,9 +106,13 @@ void State_LevelComplete::OnUserUpdate(AiL*game){ Audio::Engine().SetVolume(xpGainSound,Audio::GetCalculatedSFXVolume(0.6f)); if(lastXPGain<=0.f){ int incrementAmt=gainRate*(1/60.f)+1; - accumulatedXP=std::max(0,accumulatedXP-incrementAmt); auto progressBar=Component(MenuType::LEVEL_COMPLETE,"XP Bar"); - progressBar->UpdateProgressBar(progressBar->GetCurrentProgress()+incrementAmt); + if(accumulatedXP-incrementAmt<0){ + progressBar->UpdateProgressBar(progressBar->GetCurrentProgress()+accumulatedXP); + }else{ + progressBar->UpdateProgressBar(progressBar->GetCurrentProgress()+incrementAmt); + } + accumulatedXP=std::max(0,accumulatedXP-incrementAmt); if(progressBar->GetCurrentProgress()>=progressBar->GetFinalProgress()){ levelUpTextPos=Menu::menus[LEVEL_COMPLETE]->pos+Component(LEVEL_COMPLETE,"Level Display")->GetPos()+Component(LEVEL_COMPLETE,"Level Display")->GetSize(); levelUpTimer="Interface.HUD Level Up Timer"_F; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index f3be767a..385cc9bb 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 5 -#define VERSION_BUILD 7967 +#define VERSION_BUILD 7969 #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 2b6fbfd4..d1f5dcd5 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ