Fix errors remaining from merge with tes3mp-packetexpansion

apps/openmw/mwmp/LocalPlayer.cpp

@@ -481,7 +481,7 @@ void LocalPlayer::updateInventory(bool forceUpdate)
 
     inventory.count = (unsigned int) inventory.items.size();
     inventory.action = Inventory::UPDATE;
-    Main::get().getNetworking()->GetPacket(ID_GAME_INVENTORY)->Send(this);
+    Main::get().getNetworking()->GetPlayerPacket(ID_GAME_INVENTORY)->Send(this);
 }
 
 void LocalPlayer::updateAttackState(bool forceUpdate)

apps/openmw/mwmp/Networking.cpp

@@ -596,6 +596,7 @@ void Networking::ProcessPlayerPacket(RakNet::Packet *packet)
                 getLocalPlayer()->setClass();
             }
         }
+    }
     case ID_GAME_INVENTORY:
     {
         if (id == myid)
@@ -604,7 +605,7 @@ void Networking::ProcessPlayerPacket(RakNet::Packet *packet)
             {
                 printf("ID_GAME_INVENTORY update only\n");
                 getLocalPlayer()->updateInventory(true);
-                GetPacket(ID_GAME_INVENTORY)->Send(getLocalPlayer());
+                GetPlayerPacket(ID_GAME_INVENTORY)->Send(getLocalPlayer());
             }
             else
             {
@@ -727,7 +728,6 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
     default:
         LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unhandled WorldPacket with identifier %i has arrived",
             packet->data[0]);
->>>>>>> refs/remotes/origin/tes3mp-packetexpansion
     }
 }
 

components/CMakeLists.txt

@@ -155,7 +155,7 @@ add_component_dir (openmw-mp
         Packets/Player/PacketDrawState Packets/Player/PacketChatMessage Packets/Player/PacketCharGen
         Packets/Player/PacketAttribute Packets/Player/PacketSkill Packets/Player/PacketLevel
         Packets/Player/PacketHandshake Packets/Player/PacketGUIBoxes Packets/Player/PacketClass
-        Packets/Player/PacketTime Packets/PacketInventory
+        Packets/Player/PacketTime Packets/Player/PacketInventory
 
         Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace)
 

components/openmw-mp/Packets/Player/PacketInventory.hpp

@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETINVENTORY_HPP
 #define OPENMW_PACKETINVENTORY_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {