AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-27 14:10:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues caused by incomplete merge

Browse Source
This commit is contained in:
Andrew Lanzone 2025-07-06 23:17:00 -07:00
parent b170500183
commit 3a05ddb982
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -90,9 +90,8 @@ namespace MWGui
, mLastYSize(0)
, mPreview(std::make_unique<MWRender::InventoryPreview>(parent, resourceSystem, MWMechanics::getPlayer()))
, mTrading(false)
, mUpdateTimer(0.f)
, mPendingControllerAction(ControllerAction::None)
, mUpdateNextFrame(false)
, mPendingControllerAction(ControllerAction::None)
{
mPreviewTexture
= std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());

1
apps/openmw/mwgui/tradewindow.cpp
View File

@ -694,7 +694,6 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
}
<<<<<<< HEAD
bool TradeWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)