mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 02:45:32 +00:00
Code Issues Releases Wiki Activity

Second minor fix

Browse source
This commit is contained in:
Glorf 2013-04-09 16:14:08 +02:00
parent 623c2c8201
commit 46925e93a6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwclass/armor.cpp
View file

@ -343,6 +343,9 @@ namespace MWClass
{ {
MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight); MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if(weapon == invStore.end())
return 1;
if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand || if(weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::LongBladeTwoHand ||
weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose || weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoClose ||
weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide || weapon->get<ESM::Weapon>()->mBase->mData.mType == ESM::Weapon::BluntTwoWide ||

9
apps/openmw/mwworld/actionequip.cpp
View file

@ -18,6 +18,7 @@ namespace MWWorld
void ActionEquip::executeImp (const Ptr& actor) void ActionEquip::executeImp (const Ptr& actor)
{ {
MWWorld::Ptr object = getTarget();
MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor); MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
// slots that this item can be equipped in // slots that this item can be equipped in
@ -27,7 +28,7 @@ namespace MWWorld
MWWorld::ContainerStoreIterator it = invStore.begin(); MWWorld::ContainerStoreIterator it = invStore.begin();
for (; it != invStore.end(); ++it) for (; it != invStore.end(); ++it)
{ {
if (*it == getTarget()) if (*it == object)
{ {
break; break;
} }
@ -43,7 +44,7 @@ namespace MWWorld
for (std::vector<int>::const_iterator slot=slots.first.begin(); for (std::vector<int>::const_iterator slot=slots.first.begin();
slot!=slots.first.end(); ++slot) slot!=slots.first.end(); ++slot)
{ {
switch(MWWorld::Class::get (getTarget()).canBeEquipped (actor, getTarget())) switch(MWWorld::Class::get (object).canBeEquipped (actor, object))
{ {
case 0: case 0:
return; return;
@ -70,10 +71,10 @@ namespace MWWorld
} }
} }
std::string script = MWWorld::Class::get(*it).getScript(*it); std::string script = MWWorld::Class::get(object).getScript(object);
/* Set OnPCEquip Variable on item's script, if the player is equipping it, and it has a script with that variable declared */ /* Set OnPCEquip Variable on item's script, if the player is equipping it, and it has a script with that variable declared */
if(equipped && actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() && script != "") if(equipped && actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() && script != "")
(*it).mRefData->getLocals().setVarByInt(script, "onpcequip", 1); (object).mRefData->getLocals().setVarByInt(script, "onpcequip", 1);
} }
} }