From 51698bed485f451b5469c66a980ee925ddb8cd27 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 15 May 2018 22:56:47 +0300 Subject: [PATCH] [Client] Rename WorldProcessor into ObjectProcessor --- apps/openmw/CMakeLists.txt | 4 +- apps/openmw/mwmp/Networking.cpp | 4 +- ...WorldProcessor.cpp => ObjectProcessor.cpp} | 4 +- ...WorldProcessor.hpp => ObjectProcessor.hpp} | 2 +- .../mwmp/processors/ProcessorInitializer.cpp | 102 +++++++++--------- .../{world => object}/BaseObjectProcessor.hpp | 4 +- .../ProcessorConsoleCommand.hpp | 0 .../{world => object}/ProcessorContainer.hpp | 0 .../ProcessorDoorDestination.hpp | 0 .../{world => object}/ProcessorDoorState.hpp | 0 .../{world => object}/ProcessorMusicPlay.hpp | 4 +- .../ProcessorObjectAnimPlay.hpp | 0 .../ProcessorObjectAttach.hpp | 0 .../ProcessorObjectCollision.hpp | 0 .../ProcessorObjectDelete.hpp | 0 .../{world => object}/ProcessorObjectLock.hpp | 0 .../{world => object}/ProcessorObjectMove.hpp | 0 .../ProcessorObjectPlace.hpp | 0 .../ProcessorObjectReset.hpp | 0 .../ProcessorObjectRotate.hpp | 0 .../ProcessorObjectScale.hpp | 0 .../ProcessorObjectSpawn.hpp | 0 .../ProcessorObjectState.hpp | 0 .../{world => object}/ProcessorObjectTrap.hpp | 0 .../ProcessorScriptGlobalFloat.hpp | 4 +- .../ProcessorScriptGlobalShort.hpp | 4 +- .../ProcessorScriptLocalFloat.hpp | 0 .../ProcessorScriptLocalShort.hpp | 0 .../ProcessorScriptMemberFloat.hpp | 4 +- .../ProcessorScriptMemberShort.hpp | 4 +- .../{world => object}/ProcessorVideoPlay.hpp | 4 +- 31 files changed, 72 insertions(+), 72 deletions(-) rename apps/openmw/mwmp/processors/{WorldProcessor.cpp => ObjectProcessor.cpp} (91%) rename apps/openmw/mwmp/processors/{WorldProcessor.hpp => ObjectProcessor.hpp} (85%) rename apps/openmw/mwmp/processors/{world => object}/BaseObjectProcessor.hpp (89%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorConsoleCommand.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorContainer.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorDoorDestination.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorDoorState.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorMusicPlay.hpp (84%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectAnimPlay.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectAttach.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectCollision.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectDelete.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectLock.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectMove.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectPlace.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectReset.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectRotate.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectScale.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectSpawn.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectState.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorObjectTrap.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptGlobalFloat.hpp (84%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptGlobalShort.hpp (84%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptLocalFloat.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptLocalShort.hpp (100%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptMemberFloat.hpp (84%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorScriptMemberShort.hpp (84%) rename apps/openmw/mwmp/processors/{world => object}/ProcessorVideoPlay.hpp (83%) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 90b2e1311..de991998c 100644 --- a/apps/openmw/CMakeLists.txt +++ b/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 diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index b36acb27d..5e3a0d34c 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/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]); } } diff --git a/apps/openmw/mwmp/processors/WorldProcessor.cpp b/apps/openmw/mwmp/processors/ObjectProcessor.cpp similarity index 91% rename from apps/openmw/mwmp/processors/WorldProcessor.cpp rename to apps/openmw/mwmp/processors/ObjectProcessor.cpp index d951c02d9..7eae403db 100644 --- a/apps/openmw/mwmp/processors/WorldProcessor.cpp +++ b/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 typename BasePacketProcessor::processors_t BasePacketProcessor::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); diff --git a/apps/openmw/mwmp/processors/WorldProcessor.hpp b/apps/openmw/mwmp/processors/ObjectProcessor.hpp similarity index 85% rename from apps/openmw/mwmp/processors/WorldProcessor.hpp rename to apps/openmw/mwmp/processors/ObjectProcessor.hpp index 1aa39b2ae..8179a9271 100644 --- a/apps/openmw/mwmp/processors/WorldProcessor.hpp +++ b/apps/openmw/mwmp/processors/ObjectProcessor.hpp @@ -15,7 +15,7 @@ namespace mwmp { - class WorldProcessor : public BasePacketProcessor, public BaseClientPacketProcessor + class ObjectProcessor : public BasePacketProcessor, public BaseClientPacketProcessor { public: virtual void Do(ObjectPacket &packet, ObjectList &objectList) = 0; diff --git a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp index 196b35eea..2b66ed3e4 100644 --- a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -53,32 +53,32 @@ #include "player/ProcessorPlayerStatsDynamic.hpp" #include "player/ProcessorPlayerTopic.hpp" -#include "WorldProcessor.hpp" -#include "world/ProcessorConsoleCommand.hpp" -#include "world/ProcessorContainer.hpp" -#include "world/ProcessorDoorDestination.hpp" -#include "world/ProcessorDoorState.hpp" -#include "world/ProcessorMusicPlay.hpp" -#include "world/ProcessorObjectAnimPlay.hpp" -#include "world/ProcessorObjectAttach.hpp" -#include "world/ProcessorObjectCollision.hpp" -#include "world/ProcessorObjectDelete.hpp" -#include "world/ProcessorObjectLock.hpp" -#include "world/ProcessorObjectMove.hpp" -#include "world/ProcessorObjectPlace.hpp" -#include "world/ProcessorObjectReset.hpp" -#include "world/ProcessorObjectRotate.hpp" -#include "world/ProcessorObjectScale.hpp" -#include "world/ProcessorObjectSpawn.hpp" -#include "world/ProcessorObjectState.hpp" -#include "world/ProcessorObjectTrap.hpp" -#include "world/ProcessorScriptLocalShort.hpp" -#include "world/ProcessorScriptLocalFloat.hpp" -#include "world/ProcessorScriptMemberShort.hpp" -#include "world/ProcessorScriptMemberFloat.hpp" -#include "world/ProcessorScriptGlobalShort.hpp" -#include "world/ProcessorScriptGlobalFloat.hpp" -#include "world/ProcessorVideoPlay.hpp" +#include "ObjectProcessor.hpp" +#include "object/ProcessorConsoleCommand.hpp" +#include "object/ProcessorContainer.hpp" +#include "object/ProcessorDoorDestination.hpp" +#include "object/ProcessorDoorState.hpp" +#include "object/ProcessorMusicPlay.hpp" +#include "object/ProcessorObjectAnimPlay.hpp" +#include "object/ProcessorObjectAttach.hpp" +#include "object/ProcessorObjectCollision.hpp" +#include "object/ProcessorObjectDelete.hpp" +#include "object/ProcessorObjectLock.hpp" +#include "object/ProcessorObjectMove.hpp" +#include "object/ProcessorObjectPlace.hpp" +#include "object/ProcessorObjectReset.hpp" +#include "object/ProcessorObjectRotate.hpp" +#include "object/ProcessorObjectScale.hpp" +#include "object/ProcessorObjectSpawn.hpp" +#include "object/ProcessorObjectState.hpp" +#include "object/ProcessorObjectTrap.hpp" +#include "object/ProcessorScriptLocalShort.hpp" +#include "object/ProcessorScriptLocalFloat.hpp" +#include "object/ProcessorScriptMemberShort.hpp" +#include "object/ProcessorScriptMemberFloat.hpp" +#include "object/ProcessorScriptGlobalShort.hpp" +#include "object/ProcessorScriptGlobalFloat.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()); - WorldProcessor::AddProcessor(new ProcessorContainer()); - WorldProcessor::AddProcessor(new ProcessorDoorDestination()); - WorldProcessor::AddProcessor(new ProcessorDoorState()); - WorldProcessor::AddProcessor(new ProcessorMusicPlay()); - WorldProcessor::AddProcessor(new ProcessorObjectAnimPlay()); - WorldProcessor::AddProcessor(new ProcessorObjectAttach()); - WorldProcessor::AddProcessor(new ProcessorObjectCollision()); - WorldProcessor::AddProcessor(new ProcessorObjectDelete()); - WorldProcessor::AddProcessor(new ProcessorObjectLock()); - WorldProcessor::AddProcessor(new ProcessorObjectMove()); - WorldProcessor::AddProcessor(new ProcessorObjectPlace()); - WorldProcessor::AddProcessor(new ProcessorObjectReset()); - WorldProcessor::AddProcessor(new ProcessorObjectRotate()); - WorldProcessor::AddProcessor(new ProcessorObjectScale()); - WorldProcessor::AddProcessor(new ProcessorObjectSpawn()); - WorldProcessor::AddProcessor(new ProcessorObjectState()); - WorldProcessor::AddProcessor(new ProcessorObjectTrap()); - WorldProcessor::AddProcessor(new ProcessorScriptLocalShort()); - WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat()); - WorldProcessor::AddProcessor(new ProcessorScriptMemberShort()); - WorldProcessor::AddProcessor(new ProcessorScriptMemberFloat()); - WorldProcessor::AddProcessor(new ProcessorScriptGlobalShort()); - WorldProcessor::AddProcessor(new ProcessorScriptGlobalFloat()); - WorldProcessor::AddProcessor(new ProcessorVideoPlay()); + ObjectProcessor::AddProcessor(new ProcessorConsoleCommand()); + ObjectProcessor::AddProcessor(new ProcessorContainer()); + ObjectProcessor::AddProcessor(new ProcessorDoorDestination()); + ObjectProcessor::AddProcessor(new ProcessorDoorState()); + ObjectProcessor::AddProcessor(new ProcessorMusicPlay()); + ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay()); + ObjectProcessor::AddProcessor(new ProcessorObjectAttach()); + ObjectProcessor::AddProcessor(new ProcessorObjectCollision()); + ObjectProcessor::AddProcessor(new ProcessorObjectDelete()); + ObjectProcessor::AddProcessor(new ProcessorObjectLock()); + ObjectProcessor::AddProcessor(new ProcessorObjectMove()); + ObjectProcessor::AddProcessor(new ProcessorObjectPlace()); + ObjectProcessor::AddProcessor(new ProcessorObjectReset()); + ObjectProcessor::AddProcessor(new ProcessorObjectRotate()); + ObjectProcessor::AddProcessor(new ProcessorObjectScale()); + ObjectProcessor::AddProcessor(new ProcessorObjectSpawn()); + ObjectProcessor::AddProcessor(new ProcessorObjectState()); + ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); + ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort()); + ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat()); + ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort()); + ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat()); + ObjectProcessor::AddProcessor(new ProcessorScriptGlobalShort()); + ObjectProcessor::AddProcessor(new ProcessorScriptGlobalFloat()); + ObjectProcessor::AddProcessor(new ProcessorVideoPlay()); ActorProcessor::AddProcessor(new ProcessorActorAI()); ActorProcessor::AddProcessor(new ProcessorActorAnimFlags()); diff --git a/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp b/apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp similarity index 89% rename from apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp rename to apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp index 4780f0657..783119f78 100644 --- a/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp +++ b/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) diff --git a/apps/openmw/mwmp/processors/world/ProcessorConsoleCommand.hpp b/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorConsoleCommand.hpp rename to apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorContainer.hpp b/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorContainer.hpp rename to apps/openmw/mwmp/processors/object/ProcessorContainer.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorDoorDestination.hpp b/apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorDoorDestination.hpp rename to apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorDoorState.hpp b/apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorDoorState.hpp rename to apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp b/apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp similarity index 84% rename from apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp rename to apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp index 5cf6172b0..e72f21539 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp +++ b/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() diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectAnimPlay.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectAnimPlay.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectAttach.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectAttach.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectCollision.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectCollision.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectDelete.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectDelete.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectLock.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectLock.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectMove.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectMove.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectPlace.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectPlace.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectReset.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectReset.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectReset.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectReset.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectRotate.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectRotate.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectScale.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectScale.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectSpawn.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectSpawn.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectState.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectState.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorObjectTrap.hpp b/apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorObjectTrap.hpp rename to apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalFloat.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp similarity index 84% rename from apps/openmw/mwmp/processors/world/ProcessorScriptGlobalFloat.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp index f26b9bc07..3f53d28aa 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalFloat.hpp +++ b/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() diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp similarity index 84% rename from apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp index 22e8dab02..243441c9b 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp +++ b/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() diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptLocalFloat.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptLocalFloat.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorScriptLocalFloat.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptLocalFloat.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptLocalShort.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp similarity index 100% rename from apps/openmw/mwmp/processors/world/ProcessorScriptLocalShort.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberFloat.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp similarity index 84% rename from apps/openmw/mwmp/processors/world/ProcessorScriptMemberFloat.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp index 2ac2f8c0b..215a1f745 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberFloat.hpp +++ b/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() diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp b/apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp similarity index 84% rename from apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp rename to apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp index d6d698339..58cc405f7 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp +++ b/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() diff --git a/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp b/apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp similarity index 83% rename from apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp rename to apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp index 07e0c7ac7..f47c0c790 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp +++ b/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()