mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-25 14:56:37 +00:00
Code Issues Releases Wiki Activity

Swap some controller button assignments

Browse source
This commit is contained in:
Andrew Lanzone 2025-05-25 22:51:43 -07:00
parent 25fa9484d3
commit cd745c7df3
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/container.cpp
View file

@ -360,7 +360,7 @@ namespace MWGui
ControllerButtonStr* ContainerWindow::getControllerButtons() ControllerButtonStr* ContainerWindow::getControllerButtons()
{ {
mControllerButtons.l1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : ""; mControllerButtons.r1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : "";
return &mControllerButtons; return &mControllerButtons;
} }
@ -380,7 +380,7 @@ namespace MWGui
{ {
onTakeAllButtonClicked(mTakeButton); onTakeAllButtonClicked(mTakeButton);
} }
else if (arg.button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER) else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
{ {
if (mDisposeCorpseButton->getVisible()) if (mDisposeCorpseButton->getVisible())
onDisposeCorpseButtonClicked(mDisposeCorpseButton); onDisposeCorpseButtonClicked(mDisposeCorpseButton);

14
apps/openmw/mwgui/journalwindow.cpp
View file

@ -281,6 +281,8 @@ namespace
updateShowingPages(); updateShowingPages();
updateCloseJournalButton(); updateCloseJournalButton();
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
void setOptionsMode() void setOptionsMode()
@ -480,6 +482,7 @@ namespace
popBook(); popBook();
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page")); MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
void addControllerButtons(Gui::MWList* _list, int _selectedIndex) void addControllerButtons(Gui::MWList* _list, int _selectedIndex)
@ -518,6 +521,7 @@ namespace
addControllerButtons(list, mSelectedQuest); addControllerButtons(list, mSelectedQuest);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page")); MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
void notifyTopics(MyGUI::Widget* _sender) void notifyTopics(MyGUI::Widget* _sender)
@ -533,6 +537,7 @@ namespace
setVisible(ShowActiveBTN, false); setVisible(ShowActiveBTN, false);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page")); MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
struct AddNamesToList struct AddNamesToList
@ -594,6 +599,7 @@ namespace
} }
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page")); MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
} }
void notifyShowAll(MyGUI::Widget* _sender) void notifyShowAll(MyGUI::Widget* _sender)
@ -678,6 +684,7 @@ namespace
mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}"; mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}";
mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}"; mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}";
mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}"; mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}";
mControllerButtons.r3 = mOptionsMode && mQuestMode ? "Show All" : "";
return &mControllerButtons; return &mControllerButtons;
} }
@ -758,6 +765,13 @@ namespace
} }
return true; return true;
} }
else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSTICK) // R3: Show All/Some
{
if (mAllQuests)
notifyShowActive(getWidget<MyGUI::Widget>(ShowActiveBTN));
else
notifyShowAll(getWidget<MyGUI::Widget>(ShowAllBTN));
}
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP) else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP)
{ {
if (mOptionsMode && (mQuestMode || mTopicsMode)) if (mOptionsMode && (mQuestMode || mTopicsMode))