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

Merge remote-tracking branch 'glorf/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-06-27 12:24:09 +02:00
commit e88040662e
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,6 +179,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
, mSkipAnim(false) , mSkipAnim(false)
, mSecondsOfRunning(0) , mSecondsOfRunning(0)
, mSecondsOfSwimming(0) , mSecondsOfSwimming(0)
, mUpdateWeapon(true)
{ {
if(!mAnimation) if(!mAnimation)
return; return;
@ -407,6 +408,13 @@ void CharacterController::update(float duration, Movement &movement)
else else
weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight); weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if(mUpdateWeapon)
{
mWeaponType = weaptype;
forceStateUpdate();
mUpdateWeapon = false;
}
if(weaptype != mWeaponType) if(weaptype != mWeaponType)
{ {
std::string weapgroup; std::string weapgroup;

3
apps/openmw/mwmechanics/character.hpp
View file

@ -104,6 +104,9 @@ class CharacterController
WeaponType mWeaponType; WeaponType mWeaponType;
bool mSkipAnim; bool mSkipAnim;
// Workaround for playing weapon draw animation and sound when going to new cell
bool mUpdateWeapon;
// counted for skill increase // counted for skill increase
float mSecondsOfSwimming; float mSecondsOfSwimming;
float mSecondsOfRunning; float mSecondsOfRunning;