[Client] Move check for preventing auto equipping to correct spot

pull/541/head
David Cernat 5 years ago
parent e15428e139
commit e0f623fb87

@ -435,18 +435,6 @@ void MWWorld::InventoryStore::autoEquipWeapon (const MWWorld::Ptr& actor, TSlots
void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots& slots_) void MWWorld::InventoryStore::autoEquipArmor (const MWWorld::Ptr& actor, TSlots& slots_)
{ {
/*
Start of tes3mp addition
We need DedicatedPlayers and DedicatedActors to wear exactly what they're wearing on their
authority client, so don't auto-equip for them
*/
if (mwmp::PlayerList::isDedicatedPlayer(actor) || mwmp::Main::get().getCellController()->isDedicatedActor(actor))
return;
/*
End of tes3mp addition
*/
// Only NPCs can wear armor for now. // Only NPCs can wear armor for now.
// For creatures we equip only shields. // For creatures we equip only shields.
if (!actor.getClass().isNpc()) if (!actor.getClass().isNpc())
@ -590,6 +578,18 @@ void MWWorld::InventoryStore::autoEquipShield(const MWWorld::Ptr& actor, TSlots&
void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor) void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
{ {
/*
Start of tes3mp addition
We need DedicatedPlayers and DedicatedActors to wear exactly what they're wearing on their
authority client, so don't auto-equip for them
*/
if (mwmp::PlayerList::isDedicatedPlayer(actor) || mwmp::Main::get().getCellController()->isDedicatedActor(actor))
return;
/*
End of tes3mp addition
*/
TSlots slots_; TSlots slots_;
initSlots (slots_); initSlots (slots_);

Loading…
Cancel
Save