Merge pull request #518 from TES3MP/0.7.0-alpha

[General] Rename CellReplace packet into CellReset

apps/openmw/CMakeLists.txt

@@ -134,7 +134,7 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor
     ProcessorScriptGlobalFloat
     )
 
-add_openmw_dir (mwmp/processors/worldstate ProcessorCellCreate ProcessorCellReplace ProcessorRecordDynamic
+add_openmw_dir (mwmp/processors/worldstate ProcessorCellCreate ProcessorCellReset ProcessorRecordDynamic
     ProcessorWorldCollisionOverride ProcessorWorldMap ProcessorWorldRegionAuthority ProcessorWorldTime
     ProcessorWorldWeather
     )

apps/openmw/mwmp/processors/ProcessorInitializer.cpp

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

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

@@ -1,23 +0,0 @@
-#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

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

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

components/CMakeLists.txt

@@ -202,7 +202,7 @@ add_component_dir (openmw-mp/Packets/Object
 add_component_dir (openmw-mp/Packets/Worldstate
         WorldstatePacket
 
-        PacketCellCreate PacketCellReplace PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap
+        PacketCellCreate PacketCellReset PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap
         PacketWorldRegionAuthority PacketWorldTime PacketWorldWeather
         )
 

components/openmw-mp/Controllers/WorldstatePacketController.cpp

@@ -1,5 +1,5 @@
 #include "../Packets/Worldstate/PacketCellCreate.hpp"
-#include "../Packets/Worldstate/PacketCellReplace.hpp"
+#include "../Packets/Worldstate/PacketCellReset.hpp"
 #include "../Packets/Worldstate/PacketRecordDynamic.hpp"
 #include "../Packets/Worldstate/PacketWorldCollisionOverride.hpp"
 #include "../Packets/Worldstate/PacketWorldMap.hpp"
@@ -20,7 +20,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<PacketCellReset>(&packets, peer);
     AddPacket<PacketRecordDynamic>(&packets, peer);
     AddPacket<PacketWorldCollisionOverride>(&packets, peer);
     AddPacket<PacketWorldMap>(&packets, peer);

components/openmw-mp/NetworkMessages.hpp

@@ -104,7 +104,7 @@ enum GameMessages
     ID_GAME_PREINIT,
 
     ID_CELL_CREATE,
-    ID_CELL_REPLACE,
+    ID_CELL_RESET,
     ID_RECORD_DYNAMIC,
     ID_WORLD_COLLISION_OVERRIDE,
     ID_WORLD_MAP,

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

@@ -1,17 +0,0 @@
-#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/PacketCellReset.cpp

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

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

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