diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 9f05ec28..460cd863 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -3163,6 +3163,9 @@ void AiL::GetAnyKeyRelease(Key key){ if(InputGroup::menuNamesToInputGroups.count(Menu::menus[NEW_INPUT]->S(A::KEYBIND))){ InputGroup::menuNamesToInputGroups[Menu::menus[NEW_INPUT]->S(A::KEYBIND)]->SetNewPrimaryKeybind(Input{KEY,key}); Menu::alreadyClicked=true; + for(auto&[menuType,menu]:Menu::menus){ + menu->helpDisplay.Initialize(menu->inputGroups); + } Menu::CloseMenu(); } } @@ -3207,6 +3210,9 @@ void AiL::GetAnyMouseRelease(int32_t mouseButton){ if(InputGroup::menuNamesToInputGroups.count(Menu::menus[NEW_INPUT]->S(A::KEYBIND))){ InputGroup::menuNamesToInputGroups[Menu::menus[NEW_INPUT]->S(A::KEYBIND)]->AddKeybind(Input{MOUSE,mouseButton}); Menu::alreadyClicked=true; + for(auto&[menuType,menu]:Menu::menus){ + menu->helpDisplay.Initialize(menu->inputGroups); + } Menu::CloseMenu(); } } diff --git a/Adventures in Lestoria/InputHelper.cpp b/Adventures in Lestoria/InputHelper.cpp index 65258d42..c31195b4 100644 --- a/Adventures in Lestoria/InputHelper.cpp +++ b/Adventures in Lestoria/InputHelper.cpp @@ -47,6 +47,7 @@ INCLUDE_WINDOW_SIZE InputHelper::InputHelper(){} void InputHelper::Initialize(MenuInputGroups&inputGroups){ + this->inputGroups.clear(); for(auto&data:inputGroups){ if(data.first.GetLabelVisible()){ //If the label is not visible, we don't care to include it in our list. this->inputGroups[data.first.GetGroup()]=data.second.first; diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp index 9602085d..3ba40bfe 100644 --- a/Adventures in Lestoria/Key.cpp +++ b/Adventures in Lestoria/Key.cpp @@ -654,6 +654,9 @@ void InputListener::Update(){ GPButtons releasedButton=olc::GPButtons(button); if(gamepad->getButton(releasedButton).bReleased){ InputGroup::menuNamesToInputGroups[Menu::menus[NEW_INPUT]->S(A::KEYBIND)]->SetNewPrimaryKeybind(Input{CONTROLLER,int(button)}); + for(auto&[menuType,menu]:Menu::menus){ + menu->helpDisplay.Initialize(menu->inputGroups); + } Menu::alreadyClicked=true; Menu::CloseMenu(); return; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 8e534975..f713e37c 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 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 7198 +#define VERSION_BUILD 7202 #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 7675d210..a631ec4f 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ