mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-24 09:39:51 +00:00
Merge branch 'consoledisposal' into 'master'
Check if the console's selected object is available (bug #5870) Closes #5870 See merge request OpenMW/openmw!2713
This commit is contained in:
commit
886600a1dd
@ -9,6 +9,7 @@
|
||||
Bug #5371: Keyframe animation tracks are used for any file that begins with an X
|
||||
Bug #5714: Touch spells cast using ExplodeSpell don't always explode
|
||||
Bug #5849: Paralysis breaks landing
|
||||
Bug #5870: Disposing of actors who were selected in the console doesn't deselect them like vanilla
|
||||
Bug #5883: Immobile creatures don't cause water ripples
|
||||
Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load
|
||||
Bug #6313: Followers with high Fight can turn hostile
|
||||
|
@ -61,6 +61,7 @@ namespace MWGui
|
||||
|
||||
void updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr);
|
||||
|
||||
void onFrame(float dt) override { checkReferenceAvailable(); }
|
||||
void clear() override;
|
||||
|
||||
void resetReference() override;
|
||||
|
@ -896,6 +896,9 @@ namespace MWGui
|
||||
|
||||
mDebugWindow->onFrame(frameDuration);
|
||||
|
||||
if (isConsoleMode())
|
||||
mConsole->onFrame(frameDuration);
|
||||
|
||||
if (!gameRunning)
|
||||
return;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user