mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 15:15:31 +00:00
Code Issues Releases Wiki Activity

Switch to weapon drawstate when creating a bound weapon (Fixes #2387)

Browse source
This commit is contained in:
scrawl 2015-03-11 21:12:08 +01:00
parent 48ea6286fd
commit 68de876051
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,9 +54,17 @@ void adjustBoundItem (const std::string& item, bool bound, const MWWorld::Ptr& a
{ {
if (actor.getClass().getContainerStore(actor).count(item) == 0) if (actor.getClass().getContainerStore(actor).count(item) == 0)
{ {
MWWorld::Ptr newPtr = *actor.getClass().getContainerStore(actor).add(item, 1, actor); MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
MWWorld::Ptr newPtr = *store.MWWorld::ContainerStore::add(item, 1, actor);
MWWorld::ActionEquip action(newPtr); MWWorld::ActionEquip action(newPtr);
action.execute(actor); action.execute(actor);
MWWorld::ContainerStoreIterator rightHand = store.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
// change draw state only if the item is in player's right hand
if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr()
&& rightHand != store.end() && newPtr == *rightHand)
{
MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Weapon);
}
} }
} }
else else