teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Force position updates for players in animations

Browse source
This commit is contained in:
David Cernat 2017-11-01 22:00:54 +02:00
parent be25decee2
commit 2ca4017371
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -67,6 +67,7 @@ LocalPlayer::LocalPlayer()
diedSinceArrestAttempt = false; diedSinceArrestAttempt = false;
isReceivingQuickKeys = false; isReceivingQuickKeys = false;
isPlayingAnimation = false;
} }
LocalPlayer::~LocalPlayer() LocalPlayer::~LocalPlayer()
@ -339,6 +340,16 @@ void LocalPlayer::updatePosition(bool forceUpdate)
bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 || bool posIsChanging = (direction.pos[0] != 0 || direction.pos[1] != 0 ||
position.rot[0] != oldRot[0] || position.rot[2] != oldRot[1]); position.rot[0] != oldRot[0] || position.rot[2] != oldRot[1]);
// Animations can change a player's position without actually creating directional movement,
// so update positions accordingly
if (!posIsChanging && isPlayingAnimation)
{
if (MWBase::Environment::get().getMechanicsManager()->checkAnimationPlaying(ptrPlayer, animation.groupname))
posIsChanging = true;
else
isPlayingAnimation = false;
}
if (forceUpdate || posIsChanging || posWasChanged) if (forceUpdate || posIsChanging || posWasChanged)
{ {
oldRot[0] = position.rot[0]; oldRot[0] = position.rot[0];
@ -1452,6 +1463,8 @@ void LocalPlayer::playAnimation()
{ {
MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(getPlayerPtr(), MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(getPlayerPtr(),
animation.groupname, animation.mode, animation.count, animation.persist); animation.groupname, animation.mode, animation.count, animation.persist);
isPlayingAnimation = true;
} }
void LocalPlayer::playSpeech() void LocalPlayer::playSpeech()

1
components/openmw-mp/Base/BasePlayer.hpp
View file

@ -292,6 +292,7 @@ namespace mwmp
bool diedSinceArrestAttempt; bool diedSinceArrestAttempt;
bool isReceivingQuickKeys; bool isReceivingQuickKeys;
bool isPlayingAnimation;
}; };
} }