sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Close leftover open equip window if it was opened when leaving the character equip menu. Fix censored text input being uncensored for emscripten build. Release Build 7850.

Browse Source
This commit is contained in:
sigonasr2 2024-02-29 06:09:00 -06:00
parent aa4d35d754
commit a51d3bc898
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Adventures in Lestoria/OverworldMenuWindow.cpp
View File

@ -52,6 +52,7 @@ void Menu::InitializeOverworldMenuWindow(){
overworldMenuWindow->ADD("Character Button",MenuComponent)(geom2d::rect<float>{{4,12+28*1},{88,24}},"Character",
[](MenuFuncData data){
Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal());
Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click();
Menu::OpenMenu(CHARACTER_MENU);
return true;
})END;

1
Adventures in Lestoria/PauseMenu.cpp
View File

@ -57,6 +57,7 @@ void Menu::InitializePauseWindow(){
},ButtonAttr::FIT_TO_LABEL)END;
pauseWindow->ADD("Character Button",MenuComponent)(geom2d::rect<float>{{6.f,28.f},{84.f,24.f}},"Character",[](MenuFuncData data){
Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal());
Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click();
Menu::OpenMenu(CHARACTER_MENU);
return true;
},ButtonAttr::FIT_TO_LABEL)END;

4
Adventures in Lestoria/TextEntryLabel.h
View File

@ -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<<censoredTextEntry<<std::endl;
std::string_view finalLabel=censored?censoredTextEntry:textEntry;
if(game->IsTextEntryEnabled()){
@ -84,7 +84,7 @@ public:
}
inline const std::string&GetLabel()const override{
if(censored){
if(!censored){
return game->TextEntryGetString();
}else{
return MenuLabel::GetLabel();

2
Adventures in Lestoria/Version.h
View File

@ -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

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.