mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 05:40:25 +00:00
Code Issues Releases Wiki Activity

Play the left-arm torch animation when it's equipped

Browse source
This commit is contained in:
Chris Robinson 2013-05-17 06:21:59 -07:00
parent ee585046ac
commit e8bbb755c3
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -441,6 +441,17 @@ void CharacterController::update(float duration, Movement &movement)
} }
} }
} }
MWWorld::ContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name())
{
if(!mAnimation->isPlaying("torch"))
mAnimation->play("torch", Priority_Torch,
MWRender::Animation::Group_LeftArm, false,
"start", "stop", 0.0f, (~(size_t)0));
}
else if(mAnimation->isPlaying("torch"))
mAnimation->disable("torch");
} }
} }

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

@ -18,6 +18,7 @@ class Movement;
enum Priority { enum Priority {
Priority_Default, Priority_Default,
Priority_Weapon, Priority_Weapon,
Priority_Torch,
Priority_Death, Priority_Death,

10
apps/openmw/mwrender/characterpreview.cpp
View file

@ -175,6 +175,16 @@ namespace MWRender
mAnimation->play(mCurrentAnimGroup, 1, Animation::Group_All, false, "start", "stop", 0.0f, 0); mAnimation->play(mCurrentAnimGroup, 1, Animation::Group_All, false, "start", "stop", 0.0f, 0);
} }
MWWorld::ContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name())
{
if(!mAnimation->getInfo("torch"))
mAnimation->play("torch", 2, MWRender::Animation::Group_LeftArm, false,
"start", "stop", 0.0f, (~(size_t)0));
}
else if(mAnimation->getInfo("torch"))
mAnimation->disable("torch");
mAnimation->forceUpdate(); mAnimation->forceUpdate();
mAnimation->runAnimation(0.0f); mAnimation->runAnimation(0.0f);