AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 19:39:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1741 from akortunov/master

Browse Source 
Do not reset mUpperBodyState for weapon->weapon switch
This commit is contained in:
Bret Curtis 2018-06-10 11:56:54 +02:00 committed by GitHub
commit 926ddcd47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwmechanics/character.cpp
View File

@ -1214,7 +1214,6 @@ bool CharacterController::updateWeaponState()
bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if (!animPlaying || complete >= 1.0f) if (!animPlaying || complete >= 1.0f)
{ {
mUpperBodyState = UpperCharState_Nothing;
forcestateupdate = true; forcestateupdate = true;
mAnimation->showCarriedLeft(updateCarriedLeftVisible(weaptype)); mAnimation->showCarriedLeft(updateCarriedLeftVisible(weaptype));