AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 13:25:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix queueing of vanity mode toggle (Bug #3421)

Browse Source
This commit is contained in:
scrawl 2016-06-10 01:39:37 +02:00
parent ce91637cf9
commit c47a679ac9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwrender/camera.cpp
View File

@ -56,6 +56,7 @@ namespace MWRender
mMaxCameraDistance(192.f), mMaxCameraDistance(192.f),
mDistanceAdjusted(false), mDistanceAdjusted(false),
mVanityToggleQueued(false), mVanityToggleQueued(false),
mVanityToggleQueuedValue(false),
mViewModeToggleQueued(false), mViewModeToggleQueued(false),
mCameraDistance(0.f) mCameraDistance(0.f)
{ {
@ -150,7 +151,7 @@ namespace MWRender
// Now process the view changes we queued earlier // Now process the view changes we queued earlier
if (mVanityToggleQueued) if (mVanityToggleQueued)
{ {
toggleVanityMode(!mVanity.enabled); toggleVanityMode(mVanityToggleQueuedValue);
mVanityToggleQueued = false; mVanityToggleQueued = false;
} }
if (mViewModeToggleQueued) if (mViewModeToggleQueued)
@ -205,6 +206,7 @@ namespace MWRender
if (isFirstPerson() && !mAnimation->upperBodyReady()) if (isFirstPerson() && !mAnimation->upperBodyReady())
{ {
mVanityToggleQueued = true; mVanityToggleQueued = true;
mVanityToggleQueuedValue = enable;
return false; return false;
} }

1
apps/openmw/mwrender/camera.hpp
View File

@ -52,6 +52,7 @@ namespace MWRender
bool mDistanceAdjusted; bool mDistanceAdjusted;
bool mVanityToggleQueued; bool mVanityToggleQueued;
bool mVanityToggleQueuedValue;
bool mViewModeToggleQueued; bool mViewModeToggleQueued;
float mCameraDistance; float mCameraDistance;