mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merged pull request #1896

Browse source
This commit is contained in:
Marc Zinnschlag 2018-08-29 12:05:50 +02:00
commit 21d414187f
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -96,6 +96,7 @@
Bug #4553: Forcegreeting on non-actor opens a dialogue window which cannot be closed Bug #4553: Forcegreeting on non-actor opens a dialogue window which cannot be closed
Bug #4557: Topics with reserved names are handled differently from vanilla Bug #4557: Topics with reserved names are handled differently from vanilla
Bug #4558: Mesh optimizer: check for reserved node name is case-sensitive Bug #4558: Mesh optimizer: check for reserved node name is case-sensitive
Bug #4560: OpenMW does not update pinned windows properly
Bug #4563: Fast travel price logic checks destination cell instead of service actor cell Bug #4563: Fast travel price logic checks destination cell instead of service actor cell
Bug #4565: Underwater view distance should be limited Bug #4565: Underwater view distance should be limited
Bug #4573: Player uses headtracking in the 1st-person mode Bug #4573: Player uses headtracking in the 1st-person mode

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

@ -68,6 +68,7 @@ namespace MWGui
, mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer())) , mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
, mTrading(false) , mTrading(false)
, mScaleFactor(1.0f) , mScaleFactor(1.0f)
, mUpdateTimer(0.f)
{ {
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI"); float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
if (uiScale > 1.0) if (uiScale > 1.0)
@ -631,6 +632,22 @@ namespace MWGui
void InventoryWindow::onFrame(float dt) void InventoryWindow::onFrame(float dt)
{ {
updateEncumbranceBar(); updateEncumbranceBar();
if (mPinned)
{
mUpdateTimer += dt;
if (0.1f < mUpdateTimer)
{
mUpdateTimer = 0;
// Update pinned inventory in-game
if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
{
mItemView->update();
notifyContentChanged();
}
}
}
} }
void InventoryWindow::setTrading(bool trading) void InventoryWindow::setTrading(bool trading)

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

@ -102,6 +102,7 @@ namespace MWGui
bool mTrading; bool mTrading;
float mScaleFactor; float mScaleFactor;
float mUpdateTimer;
void onItemSelected(int index); void onItemSelected(int index);
void onItemSelectedFromSourceModel(int index); void onItemSelectedFromSourceModel(int index);

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

@ -86,6 +86,10 @@ namespace MWGui
mUpdateTimer = 0; mUpdateTimer = 0;
mSpellView->incrementalUpdate(); mSpellView->incrementalUpdate();
} }
// Update effects in-game too if the window is pinned
if (mPinned && !MWBase::Environment::get().getWindowManager()->isGuiMode())
mSpellIcons->updateWidgets(mEffectBox, false);
} }
void SpellWindow::updateSpells() void SpellWindow::updateSpells()