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

Fix PPA GCC-15 build failure with ButtonDefinition

Browse source
This commit is contained in:
Bret Curtis 2025-08-07 15:45:41 +02:00
parent d46e68a4d5
commit 7ff139e7b1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/controllerbuttonsoverlay.cpp
View file

@ -48,9 +48,9 @@ namespace MWGui
for (size_t i = 0; i < mButtons.size(); i++) for (size_t i = 0; i < mButtons.size(); i++)
{ {
getWidget(mButtons[i].mImage, "Btn" + sButtonDefs[i].mName + "Image"); getWidget(mButtons[i].mImage, "Btn" + std::string(sButtonDefs[i].mName) + "Image");
getWidget(mButtons[i].mText, "Btn" + sButtonDefs[i].mName + "Text"); getWidget(mButtons[i].mText, "Btn" + std::string(sButtonDefs[i].mName) + "Text");
getWidget(mButtons[i].mHBox, "Btn" + sButtonDefs[i].mName); getWidget(mButtons[i].mHBox, "Btn" + std::string(sButtonDefs[i].mName));
if (sButtonDefs[i].mInputType == InputType_Axis) if (sButtonDefs[i].mInputType == InputType_Axis)
setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis)); setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis));

2
apps/openmw/mwgui/controllerbuttonsoverlay.hpp
View file

@ -49,7 +49,7 @@ namespace MWGui
struct ButtonDefinition struct ButtonDefinition
{ {
Button mButton; Button mButton;
std::string mName; const char* mName;
InputType mInputType; InputType mInputType;
union union
{ {