From 3def111ca1f3779670d8191eb0cd2c2b96fa2383 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 6 May 2017 04:49:49 +0300 Subject: [PATCH] [Client] Fix graphical glitches related to DedicatedActor initialization --- apps/openmw/mwmp/DedicatedActor.cpp | 3 +++ apps/openmw/mwmp/LocalActor.cpp | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwmp/DedicatedActor.cpp b/apps/openmw/mwmp/DedicatedActor.cpp index d37923385..5eaebadf6 100644 --- a/apps/openmw/mwmp/DedicatedActor.cpp +++ b/apps/openmw/mwmp/DedicatedActor.cpp @@ -175,4 +175,7 @@ void DedicatedActor::setPtr(const MWWorld::Ptr& newPtr) refId = ptr.getCellRef().getRefId(); refNumIndex = ptr.getCellRef().getRefNum().mIndex; mpNum = ptr.getCellRef().getMpNum(); + + position = ptr.getRefData().getPosition(); + drawState = ptr.getClass().getCreatureStats(ptr).getDrawState(); } diff --git a/apps/openmw/mwmp/LocalActor.cpp b/apps/openmw/mwmp/LocalActor.cpp index c59304d9b..75e6e50a8 100644 --- a/apps/openmw/mwmp/LocalActor.cpp +++ b/apps/openmw/mwmp/LocalActor.cpp @@ -125,12 +125,7 @@ void LocalActor::updateAnimFlags(bool forceUpdate) #undef __SETFLAG - if (currentDrawState == MWMechanics::DrawState_Nothing) - drawState = 0; - else if (currentDrawState == MWMechanics::DrawState_Weapon) - drawState = 1; - else if (currentDrawState == MWMechanics::DrawState_Spell) - drawState = 2; + drawState = currentDrawState; mwmp::Main::get().getNetworking()->getActorList()->addAnimFlagsActor(*this); }