summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsi29a <psi29a@gmail.com>2020-11-23 06:05:45 +0000
committerpsi29a <psi29a@gmail.com>2020-11-23 20:15:28 +0000
commitb87c6dc84d6ec5c0b3e854dacd3b3e531401d783 (patch)
tree35901dc13453a705356d4d091a6f22dde1079070
parentf8c791fde359d3b7bc15cc407abdefb52fb7e5cf (diff)
Merge branch 'fastforwardpos' into 'master'cherry-pick-ff2d7695
Discard physics simulation results after fast forward See merge request OpenMW/openmw!423 (cherry picked from commit ff2d7695698341ef059c75707aa092cef48deea4) 03a37433 In case of time fast forward (resting, jail), force reset of positions
-rw-r--r--apps/openmw/mwworld/worldimp.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 54b94833e3..20ee7625b4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -890,6 +890,7 @@ namespace MWWorld
{
mRendering->notifyWorldSpaceChanged();
mProjectileManager->clear();
+ mDiscardMovements = true;
}
}