[General] Fix logic issues related to ActorEquipment

8 years ago · 311ce4119d
parent cdfc2db2d1
commit 311ce4119d
2 changed files with 5 additions and 4 deletions
--- a/apps/openmw/mwmp/LocalActor.cpp
+++ b/apps/openmw/mwmp/LocalActor.cpp
@ -242,6 +242,7 @@ void LocalActor::updateEquipment(bool forceUpdate)
    if (equipmentChanged)
    {
        mwmp::Main::get().getNetworking()->getActorList()->addEquipmentActor(*this);
+        equipmentChanged = false;
    }
 }

--- a/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp
@ -38,11 +38,11 @@ void PacketActorEquipment::Packet(RakNet::BitStream *bs, bool send)
        RW(actor.refNumIndex, send);
        RW(actor.mpNum, send);

-        for (int i = 0; i < 19; i++)
+        for (int j = 0; j < 19; j++)
        {
-            RW(actor.equipedItems[i].refId, send);
-            RW(actor.equipedItems[i].count, send);
-            RW(actor.equipedItems[i].charge, send);
+            RW(actor.equipedItems[j].refId, send);
+            RW(actor.equipedItems[j].count, send);
+            RW(actor.equipedItems[j].charge, send);
        }

        if (!send)