diff --git a/Adventures in Lestoria/OverworldMenuWindow.cpp b/Adventures in Lestoria/OverworldMenuWindow.cpp index ec9fd5a9..765b37ec 100644 --- a/Adventures in Lestoria/OverworldMenuWindow.cpp +++ b/Adventures in Lestoria/OverworldMenuWindow.cpp @@ -52,6 +52,7 @@ void Menu::InitializeOverworldMenuWindow(){ overworldMenuWindow->ADD("Character Button",MenuComponent)(geom2d::rect{{4,12+28*1},{88,24}},"Character", [](MenuFuncData data){ Component(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal()); + Component(CHARACTER_MENU,"Equip Selection Select Button")->Click(); Menu::OpenMenu(CHARACTER_MENU); return true; })END; diff --git a/Adventures in Lestoria/PauseMenu.cpp b/Adventures in Lestoria/PauseMenu.cpp index d82ab139..36f226e7 100644 --- a/Adventures in Lestoria/PauseMenu.cpp +++ b/Adventures in Lestoria/PauseMenu.cpp @@ -57,6 +57,7 @@ void Menu::InitializePauseWindow(){ },ButtonAttr::FIT_TO_LABEL)END; pauseWindow->ADD("Character Button",MenuComponent)(geom2d::rect{{6.f,28.f},{84.f,24.f}},"Character",[](MenuFuncData data){ Component(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal()); + Component(CHARACTER_MENU,"Equip Selection Select Button")->Click(); Menu::OpenMenu(CHARACTER_MENU); return true; },ButtonAttr::FIT_TO_LABEL)END; diff --git a/Adventures in Lestoria/TextEntryLabel.h b/Adventures in Lestoria/TextEntryLabel.h index 30415fba..d1d8b57e 100644 --- a/Adventures in Lestoria/TextEntryLabel.h +++ b/Adventures in Lestoria/TextEntryLabel.h @@ -65,7 +65,7 @@ public: onTextChangeCallbackFunc(lastTextEntryStr); } censoredTextEntry=std::accumulate(textEntry.begin(),textEntry.end(),""s,[](std::string currentStr,const char&c){return std::move(currentStr)+'*';}); - + std::cout<IsTextEntryEnabled()){ @@ -84,7 +84,7 @@ public: } inline const std::string&GetLabel()const override{ - if(censored){ + if(!censored){ return game->TextEntryGetString(); }else{ return MenuLabel::GetLabel(); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index b0708b17..fbb4aa4e 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 0 -#define VERSION_BUILD 7848 +#define VERSION_BUILD 7850 #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 04c8cb24..681bdd75 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ