[Client] Rename WorldProcessor into ObjectProcessor

apps/openmw/CMakeLists.txt

@@ -104,7 +104,7 @@ add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer PlayerList Loca
 add_openmw_dir (mwmp/GUI GUIChat GUILogin PlayerMarkerCollection GUIDialogList TextInputDialog
     )
 
-add_openmw_dir(mwmp/processors BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer
+add_openmw_dir(mwmp/processors BaseClientPacketProcessor PlayerProcessor ObjectProcessor ActorProcessor ProcessorInitializer
     )
 
 add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack
@@ -124,7 +124,7 @@ add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGUIMessageB
     ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic
     )
 
-add_openmw_dir (mwmp/processors/world BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination
+add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination
     ProcessorDoorState ProcessorMusicPlay ProcessorVideoPlay ProcessorObjectAnimPlay ProcessorObjectAttach 
     ProcessorObjectCollision ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace 
     ProcessorObjectReset ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectState 

apps/openmw/mwmp/Networking.cpp

@@ -37,7 +37,7 @@
 #include "Main.hpp"
 #include "processors/ProcessorInitializer.hpp"
 #include "processors/PlayerProcessor.hpp"
-#include "processors/WorldProcessor.hpp"
+#include "processors/ObjectProcessor.hpp"
 #include "processors/ActorProcessor.hpp"
 #include "GUIController.hpp"
 #include "CellController.hpp"
@@ -430,7 +430,7 @@ void Networking::receiveMessage(RakNet::Packet *packet)
     }
     else if (objectPacketController.ContainsPacket(packet->data[0]))
     {
-        if (!WorldProcessor::Process(*packet, objectList))
+        if (!ObjectProcessor::Process(*packet, objectList))
             LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", packet->data[0]);
     }
 }

apps/openmw/mwmp/processors/ObjectProcessor.cpp

@@ -1,4 +1,4 @@
-#include "WorldProcessor.hpp"
+#include "ObjectProcessor.hpp"
 #include "../Main.hpp"
 #include "../Networking.hpp"
 
@@ -7,7 +7,7 @@ using namespace mwmp;
 template<class T>
 typename BasePacketProcessor<T>::processors_t BasePacketProcessor<T>::processors;
 
-bool WorldProcessor::Process(RakNet::Packet &packet, ObjectList &objectList)
+bool ObjectProcessor::Process(RakNet::Packet &packet, ObjectList &objectList)
 {
     RakNet::BitStream bsIn(&packet.data[1], packet.length, false);
     bsIn.Read(guid);

apps/openmw/mwmp/processors/ObjectProcessor.hpp

@@ -15,7 +15,7 @@
 
 namespace mwmp
 {
-    class WorldProcessor : public BasePacketProcessor<WorldProcessor>, public BaseClientPacketProcessor
+    class ObjectProcessor : public BasePacketProcessor<ObjectProcessor>, public BaseClientPacketProcessor
     {
     public:
         virtual void Do(ObjectPacket &packet, ObjectList &objectList) = 0;

apps/openmw/mwmp/processors/ProcessorInitializer.cpp

@@ -53,32 +53,32 @@
 #include "player/ProcessorPlayerStatsDynamic.hpp"
 #include "player/ProcessorPlayerTopic.hpp"
 
-#include "WorldProcessor.hpp"
+#include "ObjectProcessor.hpp"
-#include "world/ProcessorConsoleCommand.hpp"
+#include "object/ProcessorConsoleCommand.hpp"
-#include "world/ProcessorContainer.hpp"
+#include "object/ProcessorContainer.hpp"
-#include "world/ProcessorDoorDestination.hpp"
+#include "object/ProcessorDoorDestination.hpp"
-#include "world/ProcessorDoorState.hpp"
+#include "object/ProcessorDoorState.hpp"
-#include "world/ProcessorMusicPlay.hpp"
+#include "object/ProcessorMusicPlay.hpp"
-#include "world/ProcessorObjectAnimPlay.hpp"
+#include "object/ProcessorObjectAnimPlay.hpp"
-#include "world/ProcessorObjectAttach.hpp"
+#include "object/ProcessorObjectAttach.hpp"
-#include "world/ProcessorObjectCollision.hpp"
+#include "object/ProcessorObjectCollision.hpp"
-#include "world/ProcessorObjectDelete.hpp"
+#include "object/ProcessorObjectDelete.hpp"
-#include "world/ProcessorObjectLock.hpp"
+#include "object/ProcessorObjectLock.hpp"
-#include "world/ProcessorObjectMove.hpp"
+#include "object/ProcessorObjectMove.hpp"
-#include "world/ProcessorObjectPlace.hpp"
+#include "object/ProcessorObjectPlace.hpp"
-#include "world/ProcessorObjectReset.hpp"
+#include "object/ProcessorObjectReset.hpp"
-#include "world/ProcessorObjectRotate.hpp"
+#include "object/ProcessorObjectRotate.hpp"
-#include "world/ProcessorObjectScale.hpp"
+#include "object/ProcessorObjectScale.hpp"
-#include "world/ProcessorObjectSpawn.hpp"
+#include "object/ProcessorObjectSpawn.hpp"
-#include "world/ProcessorObjectState.hpp"
+#include "object/ProcessorObjectState.hpp"
-#include "world/ProcessorObjectTrap.hpp"
+#include "object/ProcessorObjectTrap.hpp"
-#include "world/ProcessorScriptLocalShort.hpp"
+#include "object/ProcessorScriptLocalShort.hpp"
-#include "world/ProcessorScriptLocalFloat.hpp"
+#include "object/ProcessorScriptLocalFloat.hpp"
-#include "world/ProcessorScriptMemberShort.hpp"
+#include "object/ProcessorScriptMemberShort.hpp"
-#include "world/ProcessorScriptMemberFloat.hpp"
+#include "object/ProcessorScriptMemberFloat.hpp"
-#include "world/ProcessorScriptGlobalShort.hpp"
+#include "object/ProcessorScriptGlobalShort.hpp"
-#include "world/ProcessorScriptGlobalFloat.hpp"
+#include "object/ProcessorScriptGlobalFloat.hpp"
-#include "world/ProcessorVideoPlay.hpp"
+#include "object/ProcessorVideoPlay.hpp"
 
 #include "actor/ProcessorActorAI.hpp"
 #include "actor/ProcessorActorAnimFlags.hpp"
@@ -146,31 +146,31 @@ void ProcessorInitializer()
     PlayerProcessor::AddProcessor(new ProcessorPlayerStatsDynamic());
     PlayerProcessor::AddProcessor(new ProcessorPlayerTopic());
 
-    WorldProcessor::AddProcessor(new ProcessorConsoleCommand());
+    ObjectProcessor::AddProcessor(new ProcessorConsoleCommand());
-    WorldProcessor::AddProcessor(new ProcessorContainer());
+    ObjectProcessor::AddProcessor(new ProcessorContainer());
-    WorldProcessor::AddProcessor(new ProcessorDoorDestination());
+    ObjectProcessor::AddProcessor(new ProcessorDoorDestination());
-    WorldProcessor::AddProcessor(new ProcessorDoorState());
+    ObjectProcessor::AddProcessor(new ProcessorDoorState());
-    WorldProcessor::AddProcessor(new ProcessorMusicPlay());
+    ObjectProcessor::AddProcessor(new ProcessorMusicPlay());
-    WorldProcessor::AddProcessor(new ProcessorObjectAnimPlay());
+    ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay());
-    WorldProcessor::AddProcessor(new ProcessorObjectAttach());
+    ObjectProcessor::AddProcessor(new ProcessorObjectAttach());
-    WorldProcessor::AddProcessor(new ProcessorObjectCollision());
+    ObjectProcessor::AddProcessor(new ProcessorObjectCollision());
-    WorldProcessor::AddProcessor(new ProcessorObjectDelete());
+    ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
-    WorldProcessor::AddProcessor(new ProcessorObjectLock());
+    ObjectProcessor::AddProcessor(new ProcessorObjectLock());
-    WorldProcessor::AddProcessor(new ProcessorObjectMove());
+    ObjectProcessor::AddProcessor(new ProcessorObjectMove());
-    WorldProcessor::AddProcessor(new ProcessorObjectPlace());
+    ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
-    WorldProcessor::AddProcessor(new ProcessorObjectReset());
+    ObjectProcessor::AddProcessor(new ProcessorObjectReset());
-    WorldProcessor::AddProcessor(new ProcessorObjectRotate());
+    ObjectProcessor::AddProcessor(new ProcessorObjectRotate());
-    WorldProcessor::AddProcessor(new ProcessorObjectScale());
+    ObjectProcessor::AddProcessor(new ProcessorObjectScale());
-    WorldProcessor::AddProcessor(new ProcessorObjectSpawn());
+    ObjectProcessor::AddProcessor(new ProcessorObjectSpawn());
-    WorldProcessor::AddProcessor(new ProcessorObjectState());
+    ObjectProcessor::AddProcessor(new ProcessorObjectState());
-    WorldProcessor::AddProcessor(new ProcessorObjectTrap());
+    ObjectProcessor::AddProcessor(new ProcessorObjectTrap());
-    WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
+    ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort());
-    WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat());
+    ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat());
-    WorldProcessor::AddProcessor(new ProcessorScriptMemberShort());
+    ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort());
-    WorldProcessor::AddProcessor(new ProcessorScriptMemberFloat());
+    ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat());
-    WorldProcessor::AddProcessor(new ProcessorScriptGlobalShort());
+    ObjectProcessor::AddProcessor(new ProcessorScriptGlobalShort());
-    WorldProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
+    ObjectProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
-    WorldProcessor::AddProcessor(new ProcessorVideoPlay());
+    ObjectProcessor::AddProcessor(new ProcessorVideoPlay());
 
     ActorProcessor::AddProcessor(new ProcessorActorAI());
     ActorProcessor::AddProcessor(new ProcessorActorAnimFlags());

apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp

@@ -5,14 +5,14 @@
 #ifndef OPENMW_BASEOBJECTPROCESSOR_HPP
 #define OPENMW_BASEOBJECTPROCESSOR_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"
 #include "apps/openmw/mwworld/cellstore.hpp"
 
 namespace mwmp
 {
-    class BaseObjectProcessor : public WorldProcessor
+    class BaseObjectProcessor : public ObjectProcessor
     {
     public:
         virtual void Do(ObjectPacket &packet, ObjectList &objectList)

apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORMUSICPLAY_HPP
 #define OPENMW_PROCESSORMUSICPLAY_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorMusicPlay : public WorldProcessor
+    class ProcessorMusicPlay : public ObjectProcessor
     {
     public:
         ProcessorMusicPlay()

apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
 #define OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorScriptGlobalFloat : public WorldProcessor
+    class ProcessorScriptGlobalFloat : public ObjectProcessor
     {
     public:
         ProcessorScriptGlobalFloat()

apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorScriptGlobalShort : public WorldProcessor
+    class ProcessorScriptGlobalShort : public ObjectProcessor
     {
     public:
         ProcessorScriptGlobalShort()

apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
 #define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorScriptMemberFloat : public WorldProcessor
+    class ProcessorScriptMemberFloat : public ObjectProcessor
     {
     public:
         ProcessorScriptMemberFloat()

apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorScriptMemberShort : public WorldProcessor
+    class ProcessorScriptMemberShort : public ObjectProcessor
     {
     public:
         ProcessorScriptMemberShort()

apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp

@@ -1,11 +1,11 @@
 #ifndef OPENMW_PROCESSORVIDEOPLAY_HPP
 #define OPENMW_PROCESSORVIDEOPLAY_HPP
 
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorVideoPlay : public WorldProcessor
+    class ProcessorVideoPlay : public ObjectProcessor
     {
     public:
         ProcessorVideoPlay()