diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 4810fb5e..611fff53 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -478,10 +478,7 @@ void AiL::HandleUserInput(float fElapsedTime){ animationSpd=controllerAmt; } moveAmt*=controllerAmt; - }else - if(!Input::UsingGamepad()){ - animationSpd=1.f; - } + }else animationSpd=1.f; player->SetX(player->GetX()+fElapsedTime*moveAmt*player->GetMoveSpdMult()); player->movementVelocity.x=moveAmt*fElapsedTime*player->GetMoveSpdMult(); if(staircaseDirection=="RIGHT"){ @@ -508,10 +505,7 @@ void AiL::HandleUserInput(float fElapsedTime){ animationSpd=controllerAmt; } moveAmt*=abs(KEY_SCROLLHORZ_L.Analog()); - }else - if(!Input::UsingGamepad()){ - animationSpd=1.f; - } + }else animationSpd=1.f; player->SetX(player->GetX()-fElapsedTime*moveAmt*player->GetMoveSpdMult()); player->movementVelocity.x=-moveAmt*fElapsedTime*player->GetMoveSpdMult(); if(staircaseDirection=="RIGHT"){ @@ -537,10 +531,7 @@ void AiL::HandleUserInput(float fElapsedTime){ animationSpd=controllerAmt; } moveAmt*=abs(KEY_SCROLLVERT_L.Analog()); - }else - if(!Input::UsingGamepad()){ - animationSpd=1.f; - } + }else animationSpd=1.f; player->SetY(player->GetY()-fElapsedTime*moveAmt*player->GetMoveSpdMult()); player->movementVelocity.y=-moveAmt*fElapsedTime*player->GetMoveSpdMult(); @@ -558,10 +549,7 @@ void AiL::HandleUserInput(float fElapsedTime){ animationSpd=controllerAmt; } moveAmt*=abs(KEY_SCROLLVERT_L.Analog()); - }else - if(!Input::UsingGamepad()){ - animationSpd=1.f; - } + }else animationSpd=1.f; player->SetY(player->GetY()+fElapsedTime*moveAmt*player->GetMoveSpdMult()); player->movementVelocity.y=moveAmt*fElapsedTime*player->GetMoveSpdMult(); diff --git a/Adventures in Lestoria/LevelCompleteWindow.cpp b/Adventures in Lestoria/LevelCompleteWindow.cpp index 36707f03..ae987e50 100644 --- a/Adventures in Lestoria/LevelCompleteWindow.cpp +++ b/Adventures in Lestoria/LevelCompleteWindow.cpp @@ -79,8 +79,10 @@ void Menu::InitializeLevelCompleteWindow(){ }; auto nextButtonAction=[](MenuFuncData data){ - Unlock::UnlockArea(State_OverworldMap::GetCurrentConnectionPoint().map); - Merchant::RandomizeTravelingMerchant(); + if(Component(LEVEL_COMPLETE,"Stage Complete Label")->GetLabel()!="Stage Summary"){ //If the label says stage summary, we didn't actually complete the level. Don't unlock anything new for the player. + Unlock::UnlockArea(State_OverworldMap::GetCurrentConnectionPoint().map); + Merchant::RandomizeTravelingMerchant(); + } State_LevelComplete::TurnOffXPSound(); GameState::ChangeState(States::GAME_HUB,0.25f); return true; diff --git a/Adventures in Lestoria/SteamStatsReceivedHandler.cpp b/Adventures in Lestoria/SteamStatsReceivedHandler.cpp index 7766c564..e2a55c30 100644 --- a/Adventures in Lestoria/SteamStatsReceivedHandler.cpp +++ b/Adventures in Lestoria/SteamStatsReceivedHandler.cpp @@ -48,7 +48,7 @@ INCLUDE_DATA void SteamStatsReceivedHandler::SteamStatsReceived( UserStatsReceived_t* pCallback ){ if(pCallback->m_eResult==k_EResultOK){ SteamUserStats()->GetStat("Achievement.Kill Unlocks.Total Kill API Name"_S.c_str(),&Unlock::monsterKillCount); - LOG(std::format("Retrived monster kill count: {}",Unlock::monsterKillCount)); + LOG(std::format("Retrieved monster kill count: {}",Unlock::monsterKillCount)); } } #endif \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 9fed3cf1..a5dbf462 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_BUILD 8582 +#define VERSION_BUILD 8585 #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 e360ee1b..9a78a38c 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ