On second thought, rename ID_OBJECT_MOVE_WORLD into ID_OBJECT_MOVE

apps/openmw-mp/Networking.cpp

@@ -461,6 +461,23 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
         break;
     }
 
+    case ID_OBJECT_MOVE:
+    {
+        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE from %s",
+            player->Npc()->mName.c_str());
+
+        myPacket->Read(event);
+
+        LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %s",
+            event->cellRef.mRefID.c_str(),
+            event->cellRef.mRefNum.mIndex,
+            event->cell.getDescription().c_str());
+
+        myPacket->Send(event, true);
+
+        break;
+    }
+
     case ID_CONTAINER_ADD:
     {
         LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONTAINER_ADD from %s",
@@ -495,23 +512,6 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
         break;
     }
 
-    case ID_OBJECT_MOVE_WORLD:
-    {
-        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE_WORLD from %s",
-            player->Npc()->mName.c_str());
-
-        myPacket->Read(event);
-
-        LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %s",
-            event->cellRef.mRefID.c_str(),
-            event->cellRef.mRefNum.mIndex,
-            event->cell.getDescription().c_str());
-
-        myPacket->Send(event, true);
-
-        break;
-    }
-
     case ID_DOOR_ACTIVATE:
     {
         LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_ACTIVATE from %s",

components/CMakeLists.txt

@@ -158,7 +158,7 @@ add_component_dir (openmw-mp
         Packets/Player/PacketTime Packets/Player/PacketInventory
 
         Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectLock
-        Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale Packets/World/PacketObjectMoveWorld
+        Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale Packets/World/PacketObjectMove
 
         Packets/World/PacketContainerAdd Packets/World/PacketContainerRemove Packets/World/PacketDoorActivate
         Packets/World/PacketVideoPlay)

components/openmw-mp/Controllers/WorldPacketController.cpp

@@ -7,7 +7,7 @@
 #include "../Packets/World/PacketObjectLock.hpp"
 #include "../Packets/World/PacketObjectUnlock.hpp"
 #include "../Packets/World/PacketObjectScale.hpp"
-#include "../Packets/World/PacketObjectMoveWorld.hpp"
+#include "../Packets/World/PacketObjectMove.hpp"
 
 #include "../Packets/World/PacketContainerAdd.hpp"
 #include "../Packets/World/PacketContainerRemove.hpp"
@@ -31,7 +31,7 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
     AddPacket<PacketObjectLock>(&packets, peer);
     AddPacket<PacketObjectUnlock>(&packets, peer);
     AddPacket<PacketObjectScale>(&packets, peer);
-    AddPacket<PacketObjectMoveWorld>(&packets, peer);
+    AddPacket<PacketObjectMove>(&packets, peer);
 
     AddPacket<PacketContainerAdd>(&packets, peer);
     AddPacket<PacketContainerRemove>(&packets, peer);

components/openmw-mp/NetworkMessages.hpp

@@ -38,7 +38,7 @@ enum GameMessages
     ID_OBJECT_LOCK,
     ID_OBJECT_UNLOCK,
     ID_OBJECT_SCALE,
-    ID_OBJECT_MOVE_WORLD,
+    ID_OBJECT_MOVE,
 
     ID_CONTAINER_ADD,
     ID_CONTAINER_REMOVE,

components/openmw-mp/Packets/World/PacketObjectMove.cpp

@@ -0,0 +1,14 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include "PacketObjectMove.hpp"
+
+using namespace mwmp;
+
+PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
+{
+    packetID = ID_OBJECT_MOVE;
+}
+
+void PacketObjectMove::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
+{
+    WorldPacket::Packet(bs, event, send);
+}

components/openmw-mp/Packets/World/PacketObjectMove.hpp

@@ -0,0 +1,17 @@
+#ifndef OPENMW_PacketObjectMove_HPP
+#define OPENMW_PacketObjectMove_HPP
+
+#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
+
+namespace mwmp
+{
+    class PacketObjectMove : public WorldPacket
+    {
+    public:
+        PacketObjectMove(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, WorldEvent *event, bool send);
+    };
+}
+
+#endif //OPENMW_PacketObjectMove_HPP

components/openmw-mp/Packets/World/PacketObjectMoveWorld.cpp

@@ -1,14 +0,0 @@
-#include <components/openmw-mp/NetworkMessages.hpp>
-#include "PacketObjectMoveWorld.hpp"
-
-using namespace mwmp;
-
-PacketObjectMoveWorld::PacketObjectMoveWorld(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
-{
-    packetID = ID_OBJECT_MOVE_WORLD;
-}
-
-void PacketObjectMoveWorld::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
-{
-    WorldPacket::Packet(bs, event, send);
-}

components/openmw-mp/Packets/World/PacketObjectMoveWorld.hpp

@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETOBJECTMOVEWORLD_HPP
-#define OPENMW_PACKETOBJECTMOVEWORLD_HPP
-
-#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
-
-namespace mwmp
-{
-    class PacketObjectMoveWorld : public WorldPacket
-    {
-    public:
-        PacketObjectMoveWorld(RakNet::RakPeerInterface *peer);
-
-        virtual void Packet(RakNet::BitStream *bs, WorldEvent *event, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETOBJECTMOVEWORLD_HPP