mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

Rename the follow-up upper character state enum

Browse Source
This commit is contained in:
Chris Robinson 2013-07-23 04:56:49 -07:00
parent 537d5c4934
commit d5d832846e
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ bool CharacterController::updateNpcState()
if(!animPlaying) if(!animPlaying)
{ {
if(mUpperBodyState == UpperCharState_EquipingWeap || if(mUpperBodyState == UpperCharState_EquipingWeap ||
mUpperBodyState == UpperCharState_LargeFollowStartToLargeFollowStop) mUpperBodyState == UpperCharState_FollowStartToFollowStop)
mUpperBodyState = UpperCharState_WeapEquiped; mUpperBodyState = UpperCharState_WeapEquiped;
else if(mUpperBodyState == UpperCharState_UnEquipingWeap) else if(mUpperBodyState == UpperCharState_UnEquipingWeap)
mUpperBodyState = UpperCharState_Nothing; mUpperBodyState = UpperCharState_Nothing;
@ -480,12 +480,7 @@ bool CharacterController::updateNpcState()
MWRender::Animation::Group_UpperBody, true, MWRender::Animation::Group_UpperBody, true,
weapSpeed, mAttackType+" large follow start", mAttackType+" large follow stop", weapSpeed, mAttackType+" large follow start", mAttackType+" large follow stop",
0.0f, 0); 0.0f, 0);
mUpperBodyState = UpperCharState_LargeFollowStartToLargeFollowStop; mUpperBodyState = UpperCharState_FollowStartToFollowStop;
}
else if(mUpperBodyState == UpperCharState_LargeFollowStartToLargeFollowStop)
{
mAnimation->disable(mCurrentWeapon);
mUpperBodyState = UpperCharState_WeapEquiped;
} }
} }

6
apps/openmw/mwmechanics/character.hpp
View File

@ -104,11 +104,7 @@ enum UpperBodyCharacterState {
UpperCharState_MinAttackToMaxAttack, UpperCharState_MinAttackToMaxAttack,
UpperCharState_MaxAttackToMinHit, UpperCharState_MaxAttackToMinHit,
UpperCharState_MinHitToHit, UpperCharState_MinHitToHit,
UpperCharState_LargeFollowStartToLargeFollowStop, UpperCharState_FollowStartToFollowStop
UpperCharState_MediumFollowStartToMediumFollowStop,
UpperCharState_SmallFollowStartToSmallFollowStop,
UpperCharState_EquipingSpell,
UpperCharState_UnEquipingSpell
}; };
class CharacterController class CharacterController