Updated hero menu

This commit is contained in:
Eddoursul 2024-01-31 01:57:20 +01:00
parent e09ea8123d
commit 305090cc91
3 changed files with 4 additions and 3 deletions

View File

@ -50,7 +50,7 @@ auto EventListener::ProcessEvent(
DialogueMenuPatch::BlockTab(false); DialogueMenuPatch::BlockTab(false);
} else if (a_event->menuName == "CustomMenu") { } else if (a_event->menuName == "CustomMenu") {
auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu"); auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu");
if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "00e_heromenu.swf") != NULL) { if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "_heromenu.swf") != NULL) {
if (RE::UI::GetSingleton()->IsMenuOpen(RE::TweenMenu::MENU_NAME)) { if (RE::UI::GetSingleton()->IsMenuOpen(RE::TweenMenu::MENU_NAME)) {
CloseTweenMenu(); CloseTweenMenu();
} }

View File

@ -30,7 +30,8 @@ private:
// Escape triggers a kTab event, added kEscape just in case // Escape triggers a kTab event, added kEscape just in case
&& (key->keyCode == RE::GFxKey::kTab || key->keyCode == RE::GFxKey::kEscape) && (key->keyCode == RE::GFxKey::kTab || key->keyCode == RE::GFxKey::kEscape)
// Covers inventory and barter // Covers inventory and barter
&& !RE::UI::GetSingleton()->GameIsPaused()) { && !RE::UI::GetSingleton()->GameIsPaused()
&& RE::UI::GetSingleton()->IsMenuOpen(MENU_NAME)) {
OpenJournal(false); OpenJournal(false);
return RE::UI_MESSAGE_RESULTS::kIgnore; return RE::UI_MESSAGE_RESULTS::kIgnore;
} }

View File

@ -11,7 +11,7 @@ RE::BSEventNotifyControl HeroMenuPatch::ProcessEvent_Hook(RE::InputEvent** a_eve
if (eventName == userEvents->cancel || eventName == userEvents->quickStats) { if (eventName == userEvents->cancel || eventName == userEvents->quickStats) {
auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu"); auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu");
if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "00e_heromenu.swf") != NULL) { if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "_heromenu.swf") != NULL) {
RE::UIMessageQueue::GetSingleton()->AddMessage("CustomMenu", RE::UI_MESSAGE_TYPE::kHide, nullptr); RE::UIMessageQueue::GetSingleton()->AddMessage("CustomMenu", RE::UI_MESSAGE_TYPE::kHide, nullptr);
} }
} }