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

Play the appropriate casting animation sound

Browse source
This commit is contained in:
Chris Robinson 2013-07-23 11:12:19 -07:00
parent 17282c69b1
commit 11b094559f
1 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
apps/openmw/mwmechanics/character.cpp
View file

@ -410,26 +410,47 @@ bool CharacterController::updateNpcState()
weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed; weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;
float complete; float complete;
bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); bool animPlaying;
if(crstats.getAttackingOrSpell()) if(crstats.getAttackingOrSpell())
{ {
if(mUpperBodyState == UpperCharState_WeapEquiped) if(mUpperBodyState == UpperCharState_WeapEquiped)
{ {
mAttackType.clear();
if(mWeaponType == WeapType_Spell) if(mWeaponType == WeapType_Spell)
{ {
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const ESM::EffectList *effects = NULL;
const std::string spellid = crstats.getSpells().getSelectedSpell(); const std::string spellid = crstats.getSpells().getSelectedSpell();
if(!spellid.empty()) if(!spellid.empty())
effects = &store.get<ESM::Spell>().find(spellid)->mEffects;
else if(inv.getSelectedEnchantItem() != inv.end())
{ {
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); MWWorld::Ptr item = *inv.getSelectedEnchantItem();
const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid); const std::string enchid = MWWorld::Class::get(item).getEnchantment(item);
if(!enchid.empty())
effects = &store.get<ESM::Enchantment>().find(enchid)->mEffects;
}
switch(spell->mEffects.mList.at(0).mRange) if(effects)
{
static const std::string schools[] = {
"alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
};
const ESM::MagicEffect *effect;
effect = store.get<ESM::MagicEffect>().find(effects->mList.at(0).mEffectID);
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if(!effect->mCastSound.empty())
sndMgr->playSound3D(mPtr, effect->mCastSound, 1.0f, 1.0f);
else
sndMgr->playSound3D(mPtr, schools[effect->mData.mSchool]+" cast", 1.0f, 1.0f);
switch(effects->mList[0].mRange)
{ {
case 0: mAttackType = "self"; break; case 0: mAttackType = "self"; break;
case 1: mAttackType = "touch"; break; case 1: mAttackType = "touch"; break;
case 2: mAttackType = "target"; break; case 2: mAttackType = "target"; break;
default: mAttackType = ""; break;
} }
mAnimation->play(mCurrentWeapon, Priority_Weapon, mAnimation->play(mCurrentWeapon, Priority_Weapon,
@ -465,15 +486,20 @@ bool CharacterController::updateNpcState()
mUpperBodyState = UpperCharState_StartToMinAttack; mUpperBodyState = UpperCharState_StartToMinAttack;
} }
} }
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
} }
else if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack) else
{ {
mAnimation->disable(mCurrentWeapon); animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
mAnimation->play(mCurrentWeapon, Priority_Weapon, if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack)
MWRender::Animation::Group_UpperBody, false, {
weapSpeed, mAttackType+" max attack", mAttackType+" min hit", mAnimation->disable(mCurrentWeapon);
1.0f-complete, 0); mAnimation->play(mCurrentWeapon, Priority_Weapon,
mUpperBodyState = UpperCharState_MaxAttackToMinHit; MWRender::Animation::Group_UpperBody, false,
weapSpeed, mAttackType+" max attack", mAttackType+" min hit",
1.0f-complete, 0);
mUpperBodyState = UpperCharState_MaxAttackToMinHit;
}
} }
if(!animPlaying) if(!animPlaying)