mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Play the appropriate swish sound and follow-up animation

Browse Source
This commit is contained in:
Chris Robinson 2013-08-02 00:20:12 -07:00
parent b70975a74d
commit f57c829cba
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,9 +501,12 @@ bool CharacterController::updateNpcState()
if(mAttackType != "shoot") if(mAttackType != "shoot")
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
// NOTE: SwishL, SwishM, SwishS - large, medium, small. if(complete < 0.5f)
// Based on weapon weight, speed, or attack strength? sndMgr->playSound3D(mPtr, "SwishL", 1.0f, 1.0f);
sndMgr->playSound3D(mPtr, "SwishL", 1.0f, 1.0f); else if(complete < 1.0f)
sndMgr->playSound3D(mPtr, "SwishM", 1.0f, 1.0f);
else
sndMgr->playSound3D(mPtr, "SwishS", 1.0f, 1.0f);
} }
stats.setAttackStrength(complete); stats.setAttackStrength(complete);
@ -560,10 +563,18 @@ bool CharacterController::updateNpcState()
weapSpeed, mAttackType+" follow start", mAttackType+" follow stop", weapSpeed, mAttackType+" follow start", mAttackType+" follow stop",
0.0f, 0); 0.0f, 0);
else else
{
float str = stats.getAttackStrength();
std::string start = mAttackType+((str < 0.5f) ? " small follow start"
: (str < 1.0f) ? " medium follow start"
: " large follow start");
std::string stop = mAttackType+((str < 0.5f) ? " small follow stop"
: (str < 1.0f) ? " medium follow stop"
: " large follow stop");
mAnimation->play(mCurrentWeapon, Priority_Weapon, mAnimation->play(mCurrentWeapon, Priority_Weapon,
MWRender::Animation::Group_UpperBody, true, MWRender::Animation::Group_UpperBody, true,
weapSpeed, mAttackType+" large follow start", mAttackType+" large follow stop", weapSpeed, start, stop, 0.0f, 0);
0.0f, 0); }
mUpperBodyState = UpperCharState_FollowStartToFollowStop; mUpperBodyState = UpperCharState_FollowStartToFollowStop;
} }
} }