From d85a1ee1a9341af77c871f668d0589f2c499580e Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 23 Oct 2016 18:32:03 +0300
Subject: [PATCH] Fix errors remaining from merge with tes3mp-packetexpansion

---
 apps/openmw/mwmp/LocalPlayer.cpp                              | 2 +-
 apps/openmw/mwmp/Networking.cpp                               | 4 ++--
 components/CMakeLists.txt                                     | 2 +-
 components/openmw-mp/Packets/{ => Player}/PacketInventory.cpp | 0
 components/openmw-mp/Packets/{ => Player}/PacketInventory.hpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename components/openmw-mp/Packets/{ => Player}/PacketInventory.cpp (100%)
 rename components/openmw-mp/Packets/{ => Player}/PacketInventory.hpp (85%)

diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index e42dc86ef..ddd523312 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/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)
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index 577fb982e..8c21d851e 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/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
     }
 }
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 6e95d857c..6bab3eebe 100644
--- a/components/CMakeLists.txt
+++ b/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)
 
diff --git a/components/openmw-mp/Packets/PacketInventory.cpp b/components/openmw-mp/Packets/Player/PacketInventory.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketInventory.cpp
rename to components/openmw-mp/Packets/Player/PacketInventory.cpp
diff --git a/components/openmw-mp/Packets/PacketInventory.hpp b/components/openmw-mp/Packets/Player/PacketInventory.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketInventory.hpp
rename to components/openmw-mp/Packets/Player/PacketInventory.hpp
index 24cf66b62..8601a8b63 100644
--- a/components/openmw-mp/Packets/PacketInventory.hpp
+++ b/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
 {