[General] Add placeholder for CellReplace packet

apps/openmw/CMakeLists.txt

@@ -130,8 +130,8 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleComma
     ProcessorScriptMemberShort ProcessorScriptMemberFloat ProcessorScriptGlobalShort ProcessorScriptGlobalFloat
     )
 
-add_openmw_dir (mwmp/processors/worldstate ProcessorCellCreate ProcessorRecordDynamic ProcessorWorldCollisionOverride
+add_openmw_dir (mwmp/processors/worldstate ProcessorCellCreate ProcessorCellReplace ProcessorRecordDynamic
-    ProcessorWorldMap ProcessorWorldTime
+    ProcessorWorldCollisionOverride ProcessorWorldMap ProcessorWorldTime
     )
 
 # Main executable

apps/openmw/mwmp/processors/ProcessorInitializer.cpp

@@ -89,6 +89,7 @@
 
 #include "WorldstateProcessor.hpp"
 #include "worldstate/ProcessorCellCreate.hpp"
+#include "worldstate/ProcessorCellReplace.hpp"
 #include "worldstate/ProcessorRecordDynamic.hpp"
 #include "worldstate/ProcessorWorldCollisionOverride.hpp"
 #include "worldstate/ProcessorWorldMap.hpp"
@@ -183,6 +184,7 @@ void ProcessorInitializer()
     ActorProcessor::AddProcessor(new ProcessorActorTest());
 
     WorldstateProcessor::AddProcessor(new ProcessorCellCreate());
+    WorldstateProcessor::AddProcessor(new ProcessorCellReplace());
     WorldstateProcessor::AddProcessor(new ProcessorRecordDynamic());
     WorldstateProcessor::AddProcessor(new ProcessorWorldCollisionOverride());
     WorldstateProcessor::AddProcessor(new ProcessorWorldMap());

apps/openmw/mwmp/processors/worldstate/ProcessorCellReplace.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORCELLREPLACE_HPP
+#define OPENMW_PROCESSORCELLREPLACE_HPP
+
+#include "../WorldstateProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorCellReplace : public WorldstateProcessor
+    {
+    public:
+        ProcessorCellReplace()
+        {
+            BPP_INIT(ID_CELL_REPLACE)
+        }
+
+        virtual void Do(WorldstatePacket &packet, Worldstate &worldstate)
+        {
+            // Placeholder
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORCELLREPLACE_HPP

components/CMakeLists.txt

@@ -201,7 +201,8 @@ add_component_dir (openmw-mp/Packets/Object
 add_component_dir (openmw-mp/Packets/Worldstate
         WorldstatePacket
 
-        PacketCellCreate PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap PacketWorldTime
+        PacketCellCreate PacketCellReplace PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap
+        PacketWorldTime
         )
 
 add_component_dir (fallback

components/openmw-mp/Controllers/WorldstatePacketController.cpp

@@ -1,4 +1,5 @@
 #include "../Packets/Worldstate/PacketCellCreate.hpp"
+#include "../Packets/Worldstate/PacketCellReplace.hpp"
 #include "../Packets/Worldstate/PacketRecordDynamic.hpp"
 #include "../Packets/Worldstate/PacketWorldCollisionOverride.hpp"
 #include "../Packets/Worldstate/PacketWorldMap.hpp"
@@ -17,6 +18,7 @@ inline void AddPacket(mwmp::WorldstatePacketController::packets_t *packets, RakN
 mwmp::WorldstatePacketController::WorldstatePacketController(RakNet::RakPeerInterface *peer)
 {
     AddPacket<PacketCellCreate>(&packets, peer);
+    AddPacket<PacketCellReplace>(&packets, peer);
     AddPacket<PacketRecordDynamic>(&packets, peer);
     AddPacket<PacketWorldCollisionOverride>(&packets, peer);
     AddPacket<PacketWorldMap>(&packets, peer);

components/openmw-mp/NetworkMessages.hpp

@@ -86,8 +86,6 @@ enum GameMessages
     ID_OBJECT_SPAWN,
     ID_OBJECT_STATE,
     ID_OBJECT_TRAP,
-
-    ID_CELL_CREATE,
     
     ID_CONSOLE_COMMAND,
     ID_CONTAINER,
@@ -106,6 +104,8 @@ enum GameMessages
     ID_GAME_SETTINGS,
     ID_GAME_PREINIT,
 
+    ID_CELL_CREATE,
+    ID_CELL_REPLACE,
     ID_RECORD_DYNAMIC,
     ID_WORLD_COLLISION_OVERRIDE,
     ID_WORLD_MAP,

components/openmw-mp/Packets/Worldstate/PacketCellReplace.cpp

@@ -0,0 +1,17 @@
+#include "PacketCellReplace.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketCellReplace::PacketCellReplace(RakNet::RakPeerInterface *peer) : WorldstatePacket(peer)
+{
+    packetID = ID_CELL_REPLACE;
+    orderChannel = CHANNEL_SYSTEM;
+}
+
+void PacketCellReplace::Packet(RakNet::BitStream *bs, bool send)
+{
+    WorldstatePacket::Packet(bs, send);
+
+    // Placeholder
+}

components/openmw-mp/Packets/Worldstate/PacketCellReplace.hpp

@@ -0,0 +1,18 @@
+#ifndef OPENMW_PACKETCELLREPLACE_HPP
+#define OPENMW_PACKETCELLREPLACE_HPP
+
+#include <components/openmw-mp/Packets/Worldstate/WorldstatePacket.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+namespace mwmp
+{
+    class PacketCellReplace: public WorldstatePacket
+    {
+    public:
+        PacketCellReplace(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETCELLREPLACE_HPP