Allow script-induced setting of equipment

apps/openmw/mwmp/LocalPlayer.cpp

@@ -366,7 +366,7 @@ void LocalPlayer::updateInventory(bool forceUpdate)
 
 
     MWWorld::InventoryStore &invStore = player.getClass().getInventoryStore(player);
-    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
     {
         MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
         if (it != invStore.end() && !::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), EquipedItem(slot)->refid))
@@ -659,6 +659,26 @@ void LocalPlayer::setClass()
     }
 }
 
+void LocalPlayer::setInventory()
+{
+    MWWorld::Ptr ptrPlayer = GetPlayerPtr();
+
+    MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer);
+    ptrInventory.clear();
+
+    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
+    {
+        mwmp::Item *currentItem = EquipedItem(slot);
+
+        //printf("Setting currentItem: %s in slot %i\n", currentItem->refid, slot);
+
+        if (!currentItem->refid.empty())
+        {
+            ptrInventory.equip(slot, ptrInventory.ContainerStore::add(EquipedItem(slot)->refid.c_str(), 1, ptrPlayer), ptrPlayer);
+        }
+    }
+}
+
 void LocalPlayer::sendClass()
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();

apps/openmw/mwmp/LocalPlayer.hpp

@@ -42,6 +42,7 @@ namespace mwmp
         void setPosition();
         void setCell();
         void setClass();
+        void setInventory();
 
         void sendClass();
         void sendAttack(char type);

apps/openmw/mwmp/Networking.cpp

@@ -259,8 +259,15 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
         {
             if (id == myid)
             {
-                getLocalPlayer()->updateInventory(true);
+                if (packet->length == myPacket->headerSize())
-                myPacket->Send(getLocalPlayer(), serverAddr);
+                {
+                    getLocalPlayer()->updateInventory(true);
+                }
+                else
+                {
+                    myPacket->Packet(&bsIn, getLocalPlayer(), false);
+                    getLocalPlayer()->setInventory();
+                }
             }
             else if (pl != 0)
             {