krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Add InventoryWindow::clear() as part of world cleanup

Browse source
This commit is contained in:
scrawl 2017-04-19 18:28:49 +02:00
parent 50f3794d12
commit 30081393a6
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -136,6 +136,18 @@ namespace MWGui
dirtyPreview(); dirtyPreview();
updatePreviewSize(); updatePreviewSize();
updateEncumbranceBar();
mItemView->update();
notifyContentChanged();
}
void InventoryWindow::clear()
{
mPtr = MWWorld::Ptr();
mTradeModel = NULL;
mSortModel = NULL;
mItemView->setModel(NULL);
} }
void InventoryWindow::setGuiMode(GuiMode mode) void InventoryWindow::setGuiMode(GuiMode mode)
@ -340,13 +352,12 @@ namespace MWGui
void InventoryWindow::open() void InventoryWindow::open()
{ {
mPtr = MWMechanics::getPlayer(); if (!mPtr.isEmpty())
{
updateEncumbranceBar(); updateEncumbranceBar();
mItemView->update();
mItemView->update(); notifyContentChanged();
}
notifyContentChanged();
adjustPanes(); adjustPanes();
} }

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

@ -60,6 +60,8 @@ namespace MWGui
void updatePlayer(); void updatePlayer();
void clear();
void useItem(const MWWorld::Ptr& ptr); void useItem(const MWWorld::Ptr& ptr);
void setGuiMode(GuiMode mode); void setGuiMode(GuiMode mode);

2
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1696,6 +1696,8 @@ namespace MWGui
mCompanionWindow->resetReference(); mCompanionWindow->resetReference();
mConsole->resetReference(); mConsole->resetReference();
mInventoryWindow->clear();
mSelectedSpell.clear(); mSelectedSpell.clear();
mCustomMarkers.clear(); mCustomMarkers.clear();