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

Don't play a weapon-down sound when unreadying a spell

Browse source
This commit is contained in:
Chris Robinson 2013-07-25 00:46:20 -07:00
parent 92cc566fdc
commit 4ad28ed369
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -399,12 +399,9 @@ bool CharacterController::updateNpcState()
mUpperBodyState = UpperCharState_EquipingWeap;
}
mWeaponType = weaptype;
getWeaponGroup(mWeaponType, mCurrentWeapon);
if(weapon != inv.end())
if(weapon != inv.end() && !(weaptype == WeapType_None && mWeaponType == WeapType_Spell))
{
std::string soundid = (mWeaponType == WeapType_None) ?
std::string soundid = (weaptype == WeapType_None) ?
MWWorld::Class::get(*weapon).getDownSoundId(*weapon) :
MWWorld::Class::get(*weapon).getUpSoundId(*weapon);
if(!soundid.empty())
@ -413,6 +410,9 @@ bool CharacterController::updateNpcState()
sndMgr->playSound3D(mPtr, soundid, 1.0f, 1.0f);
}
}
mWeaponType = weaptype;
getWeaponGroup(mWeaponType, mCurrentWeapon);
}