From 02d8e08c58063ad9e8c8bbc7ce2778df7242c59a Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 15 May 2018 22:07:06 +0300 Subject: [PATCH 1/3] [Server] Rename WorldProcessor into ObjectProcessor --- apps/openmw-mp/CMakeLists.txt | 22 ++--- apps/openmw-mp/Networking.cpp | 4 +- ...WorldProcessor.cpp => ObjectProcessor.cpp} | 10 +-- ...WorldProcessor.hpp => ObjectProcessor.hpp} | 12 +-- .../processors/ProcessorInitializer.cpp | 82 +++++++++---------- .../{world => object}/ProcessorContainer.hpp | 4 +- .../{world => object}/ProcessorDoorState.hpp | 4 +- .../{world => object}/ProcessorMusicPlay.hpp | 4 +- .../ProcessorObjectAnimPlay.hpp | 4 +- .../ProcessorObjectDelete.hpp | 4 +- .../{world => object}/ProcessorObjectLock.hpp | 4 +- .../{world => object}/ProcessorObjectMove.hpp | 4 +- .../ProcessorObjectPlace.hpp | 4 +- .../ProcessorObjectRotate.hpp | 4 +- .../ProcessorObjectScale.hpp | 4 +- .../ProcessorObjectSpawn.hpp | 4 +- .../ProcessorObjectState.hpp | 4 +- .../{world => object}/ProcessorObjectTrap.hpp | 4 +- .../ProcessorScriptGlobalFloat.hpp | 4 +- .../ProcessorScriptGlobalShort.hpp | 4 +- .../ProcessorScriptLocalFloat.hpp | 4 +- .../ProcessorScriptLocalShort.hpp | 4 +- .../ProcessorScriptMemberFloat.hpp | 4 +- .../ProcessorScriptMemberShort.hpp | 4 +- .../{world => object}/ProcessorVideoPlay.hpp | 4 +- 25 files changed, 101 insertions(+), 109 deletions(-) rename apps/openmw-mp/processors/{WorldProcessor.cpp => ObjectProcessor.cpp} (81%) rename apps/openmw-mp/processors/{WorldProcessor.hpp => ObjectProcessor.hpp} (70%) rename apps/openmw-mp/processors/{world => object}/ProcessorContainer.hpp (91%) rename apps/openmw-mp/processors/{world => object}/ProcessorDoorState.hpp (85%) rename apps/openmw-mp/processors/{world => object}/ProcessorMusicPlay.hpp (73%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectAnimPlay.hpp (74%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectDelete.hpp (87%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectLock.hpp (87%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectMove.hpp (73%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectPlace.hpp (92%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectRotate.hpp (74%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectScale.hpp (87%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectSpawn.hpp (92%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectState.hpp (87%) rename apps/openmw-mp/processors/{world => object}/ProcessorObjectTrap.hpp (87%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptGlobalFloat.hpp (75%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptGlobalShort.hpp (75%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptLocalFloat.hpp (74%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptLocalShort.hpp (74%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptMemberFloat.hpp (75%) rename apps/openmw-mp/processors/{world => object}/ProcessorScriptMemberShort.hpp (75%) rename apps/openmw-mp/processors/{world => object}/ProcessorVideoPlay.hpp (73%) diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index fd693135a..6e9a5f4a6 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -145,16 +145,16 @@ set(PROCESSORS_PLAYER source_group(tes3mp-server\\processors\\player FILES ${PROCESSORS_PLAYER}) set(PROCESSORS_WORLD - processors/world/ProcessorContainer.hpp processors/world/ProcessorDoorState.hpp - processors/world/ProcessorMusicPlay.hpp processors/world/ProcessorObjectAnimPlay.hpp - processors/world/ProcessorObjectDelete.hpp processors/world/ProcessorObjectLock.hpp - processors/world/ProcessorObjectMove.hpp processors/world/ProcessorObjectPlace.hpp - processors/world/ProcessorObjectRotate.hpp processors/world/ProcessorObjectScale.hpp - processors/world/ProcessorObjectSpawn.hpp processors/world/ProcessorObjectState.hpp - processors/world/ProcessorObjectTrap.hpp processors/world/ProcessorScriptLocalShort.hpp - processors/world/ProcessorScriptLocalFloat.hpp processors/world/ProcessorScriptMemberShort.hpp - processors/world/ProcessorScriptMemberFloat.hpp processors/world/ProcessorScriptGlobalShort.hpp - processors/world/ProcessorScriptGlobalFloat.hpp processors/world/ProcessorVideoPlay.hpp + processors/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp + processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp + processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp + processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.hpp + processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp + processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp + processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorScriptLocalShort.hpp + processors/object/ProcessorScriptLocalFloat.hpp processors/object/ProcessorScriptMemberShort.hpp + processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorScriptGlobalShort.hpp + processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp ) source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD}) @@ -163,7 +163,7 @@ set(PROCESSORS processors/ProcessorInitializer.cpp processors/PlayerProcessor.cpp processors/ActorProcessor.cpp - processors/WorldProcessor.cpp + processors/ObjectProcessor.cpp ) source_group(tes3mp-server\\processors FILES ${PROCESSORS}) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index d242c268e..e740dc3f8 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -25,7 +25,7 @@ #include "CellController.hpp" #include "processors/PlayerProcessor.hpp" #include "processors/ActorProcessor.hpp" -#include "processors/WorldProcessor.hpp" +#include "processors/ObjectProcessor.hpp" using namespace mwmp; using namespace std; @@ -188,7 +188,7 @@ void Networking::processObjectPacket(RakNet::Packet *packet) if (!player->isHandshaked() || player->getLoadState() != Player::POSTLOADED) return; - if (!WorldProcessor::Process(*packet, baseObjectList)) + if (!ObjectProcessor::Process(*packet, baseObjectList)) LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", packet->data[0]); } diff --git a/apps/openmw-mp/processors/WorldProcessor.cpp b/apps/openmw-mp/processors/ObjectProcessor.cpp similarity index 81% rename from apps/openmw-mp/processors/WorldProcessor.cpp rename to apps/openmw-mp/processors/ObjectProcessor.cpp index 34a658d1c..cc451a813 100644 --- a/apps/openmw-mp/processors/WorldProcessor.cpp +++ b/apps/openmw-mp/processors/ObjectProcessor.cpp @@ -1,8 +1,4 @@ -// -// Created by koncord on 03.04.17. -// - -#include "WorldProcessor.hpp" +#include "ObjectProcessor.hpp" #include "Networking.hpp" using namespace mwmp; @@ -10,12 +6,12 @@ using namespace mwmp; template typename BasePacketProcessor::processors_t BasePacketProcessor::processors; -void WorldProcessor::Do(ObjectPacket &packet, Player &player, BaseObjectList &objectList) +void ObjectProcessor::Do(ObjectPacket &packet, Player &player, BaseObjectList &objectList) { packet.Send(true); } -bool WorldProcessor::Process(RakNet::Packet &packet, BaseObjectList &objectList) noexcept +bool ObjectProcessor::Process(RakNet::Packet &packet, BaseObjectList &objectList) noexcept { // Clear our BaseObjectList before loading new data in it objectList.cell.blank(); diff --git a/apps/openmw-mp/processors/WorldProcessor.hpp b/apps/openmw-mp/processors/ObjectProcessor.hpp similarity index 70% rename from apps/openmw-mp/processors/WorldProcessor.hpp rename to apps/openmw-mp/processors/ObjectProcessor.hpp index 752fbd203..273888a6a 100644 --- a/apps/openmw-mp/processors/WorldProcessor.hpp +++ b/apps/openmw-mp/processors/ObjectProcessor.hpp @@ -1,9 +1,5 @@ -// -// Created by koncord on 03.04.17. -// - -#ifndef OPENMW_WORLDPROCESSOR_HPP -#define OPENMW_WORLDPROCESSOR_HPP +#ifndef OPENMW_OBJECTPROCESSOR_HPP +#define OPENMW_OBJECTPROCESSOR_HPP #include @@ -15,7 +11,7 @@ namespace mwmp { - class WorldProcessor : public BasePacketProcessor + class ObjectProcessor : public BasePacketProcessor { public: @@ -25,4 +21,4 @@ namespace mwmp }; } -#endif //OPENMW_WORLDPROCESSOR_HPP +#endif //OPENMW_OBJECTPROCESSOR_HPP diff --git a/apps/openmw-mp/processors/ProcessorInitializer.cpp b/apps/openmw-mp/processors/ProcessorInitializer.cpp index ee5fd14c7..a7fe44a8c 100644 --- a/apps/openmw-mp/processors/ProcessorInitializer.cpp +++ b/apps/openmw-mp/processors/ProcessorInitializer.cpp @@ -58,27 +58,27 @@ #include "actor/ProcessorActorStatsDynamic.hpp" #include "actor/ProcessorActorPosition.hpp" #include "actor/ProcessorActorSpeech.hpp" -#include "WorldProcessor.hpp" -#include "world/ProcessorContainer.hpp" -#include "world/ProcessorDoorState.hpp" -#include "world/ProcessorMusicPlay.hpp" -#include "world/ProcessorObjectAnimPlay.hpp" -#include "world/ProcessorObjectDelete.hpp" -#include "world/ProcessorObjectPlace.hpp" -#include "world/ProcessorObjectLock.hpp" -#include "world/ProcessorObjectMove.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/ProcessorContainer.hpp" +#include "object/ProcessorDoorState.hpp" +#include "object/ProcessorMusicPlay.hpp" +#include "object/ProcessorObjectAnimPlay.hpp" +#include "object/ProcessorObjectDelete.hpp" +#include "object/ProcessorObjectPlace.hpp" +#include "object/ProcessorObjectLock.hpp" +#include "object/ProcessorObjectMove.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" using namespace mwmp; @@ -136,24 +136,24 @@ void ProcessorInitializer() ActorProcessor::AddProcessor(new ProcessorActorStatsDynamic()); ActorProcessor::AddProcessor(new ProcessorActorTest()); - WorldProcessor::AddProcessor(new ProcessorContainer()); - WorldProcessor::AddProcessor(new ProcessorDoorState()); - WorldProcessor::AddProcessor(new ProcessorMusicPlay()); - WorldProcessor::AddProcessor(new ProcessorObjectAnimPlay()); - WorldProcessor::AddProcessor(new ProcessorObjectDelete()); - WorldProcessor::AddProcessor(new ProcessorObjectLock()); - WorldProcessor::AddProcessor(new ProcessorObjectMove()); - WorldProcessor::AddProcessor(new ProcessorObjectPlace()); - 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 ProcessorContainer()); + ObjectProcessor::AddProcessor(new ProcessorDoorState()); + ObjectProcessor::AddProcessor(new ProcessorMusicPlay()); + ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay()); + ObjectProcessor::AddProcessor(new ProcessorObjectDelete()); + ObjectProcessor::AddProcessor(new ProcessorObjectLock()); + ObjectProcessor::AddProcessor(new ProcessorObjectMove()); + ObjectProcessor::AddProcessor(new ProcessorObjectPlace()); + 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()); } diff --git a/apps/openmw-mp/processors/world/ProcessorContainer.hpp b/apps/openmw-mp/processors/object/ProcessorContainer.hpp similarity index 91% rename from apps/openmw-mp/processors/world/ProcessorContainer.hpp rename to apps/openmw-mp/processors/object/ProcessorContainer.hpp index f6bedd98a..a6e2cfe02 100644 --- a/apps/openmw-mp/processors/world/ProcessorContainer.hpp +++ b/apps/openmw-mp/processors/object/ProcessorContainer.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSORCONTAINER_HPP #define OPENMW_PROCESSORCONTAINER_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorContainer : public WorldProcessor + class ProcessorContainer : public ObjectProcessor { public: ProcessorContainer() diff --git a/apps/openmw-mp/processors/world/ProcessorDoorState.hpp b/apps/openmw-mp/processors/object/ProcessorDoorState.hpp similarity index 85% rename from apps/openmw-mp/processors/world/ProcessorDoorState.hpp rename to apps/openmw-mp/processors/object/ProcessorDoorState.hpp index 2b29662c3..2403fe90b 100644 --- a/apps/openmw-mp/processors/world/ProcessorDoorState.hpp +++ b/apps/openmw-mp/processors/object/ProcessorDoorState.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSORDOORSTATE_HPP #define OPENMW_PROCESSORDOORSTATE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorDoorState : public WorldProcessor + class ProcessorDoorState : public ObjectProcessor { public: ProcessorDoorState() diff --git a/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp b/apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp similarity index 73% rename from apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp rename to apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp index e27395ab1..71baf04d0 100644 --- a/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp +++ b/apps/openmw-mp/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-mp/processors/world/ProcessorObjectAnimPlay.hpp b/apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp similarity index 74% rename from apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp index 5461c9d18..b35143199 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTANIMPLAY_HPP #define OPENMW_PROCESSOROBJECTANIMPLAY_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectAnimPlay : public WorldProcessor + class ProcessorObjectAnimPlay : public ObjectProcessor { public: ProcessorObjectAnimPlay() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp b/apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp similarity index 87% rename from apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp index e5d54ae25..2487762ee 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTDELETE_HPP #define OPENMW_PROCESSOROBJECTDELETE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectDelete : public WorldProcessor + class ProcessorObjectDelete : public ObjectProcessor { public: ProcessorObjectDelete() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp b/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp similarity index 87% rename from apps/openmw-mp/processors/world/ProcessorObjectLock.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectLock.hpp index 3f031734d..001dbeedd 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTLOCK_HPP #define OPENMW_PROCESSOROBJECTLOCK_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectLock : public WorldProcessor + class ProcessorObjectLock : public ObjectProcessor { public: ProcessorObjectLock() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp b/apps/openmw-mp/processors/object/ProcessorObjectMove.hpp similarity index 73% rename from apps/openmw-mp/processors/world/ProcessorObjectMove.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectMove.hpp index 523875b99..7d9f0a7c3 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectMove.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTMOVE_HPP #define OPENMW_PROCESSOROBJECTMOVE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectMove : public WorldProcessor + class ProcessorObjectMove : public ObjectProcessor { public: ProcessorObjectMove() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp b/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp similarity index 92% rename from apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp index 59b74ab0f..f84eca576 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp @@ -1,12 +1,12 @@ #ifndef OPENMW_PROCESSOROBJECTPLACE_HPP #define OPENMW_PROCESSOROBJECTPLACE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" #include namespace mwmp { - class ProcessorObjectPlace : public WorldProcessor + class ProcessorObjectPlace : public ObjectProcessor { public: ProcessorObjectPlace() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp b/apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp similarity index 74% rename from apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp index ed0eb6631..199190d94 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTROTATE_HPP #define OPENMW_PROCESSOROBJECTROTATE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectRotate : public WorldProcessor + class ProcessorObjectRotate : public ObjectProcessor { public: ProcessorObjectRotate() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp b/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp similarity index 87% rename from apps/openmw-mp/processors/world/ProcessorObjectScale.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectScale.hpp index 0d5227b87..a95acf413 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTSCALE_HPP #define OPENMW_PROCESSOROBJECTSCALE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectScale : public WorldProcessor + class ProcessorObjectScale : public ObjectProcessor { public: ProcessorObjectScale() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp b/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp similarity index 92% rename from apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp index 4973c9cf8..7ae29c1e0 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp @@ -1,12 +1,12 @@ #ifndef OPENMW_PROCESSOROBJECTSPAWN_HPP #define OPENMW_PROCESSOROBJECTSPAWN_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" #include namespace mwmp { - class ProcessorObjectSpawn : public WorldProcessor + class ProcessorObjectSpawn : public ObjectProcessor { public: ProcessorObjectSpawn() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectState.hpp b/apps/openmw-mp/processors/object/ProcessorObjectState.hpp similarity index 87% rename from apps/openmw-mp/processors/world/ProcessorObjectState.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectState.hpp index 1d09d7e6f..b62c76d08 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectState.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectState.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTSTATE_HPP #define OPENMW_PROCESSOROBJECTSTATE_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectState : public WorldProcessor + class ProcessorObjectState : public ObjectProcessor { public: ProcessorObjectState() diff --git a/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp b/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp similarity index 87% rename from apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp rename to apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp index 2be1eac5c..899b4bb77 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp +++ b/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSOROBJECTTRAP_HPP #define OPENMW_PROCESSOROBJECTTRAP_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorObjectTrap : public WorldProcessor + class ProcessorObjectTrap : public ObjectProcessor { public: ProcessorObjectTrap() diff --git a/apps/openmw-mp/processors/world/ProcessorScriptGlobalFloat.hpp b/apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp similarity index 75% rename from apps/openmw-mp/processors/world/ProcessorScriptGlobalFloat.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp index d31261e70..534e12234 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptGlobalFloat.hpp +++ b/apps/openmw-mp/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-mp/processors/world/ProcessorScriptGlobalShort.hpp b/apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp similarity index 75% rename from apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp index 1086dee4c..bd59f452c 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp +++ b/apps/openmw-mp/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-mp/processors/world/ProcessorScriptLocalFloat.hpp b/apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp similarity index 74% rename from apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp index 2a593c241..7213ae9c7 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp +++ b/apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP #define OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorScriptLocalFloat : public WorldProcessor + class ProcessorScriptLocalFloat : public ObjectProcessor { public: ProcessorScriptLocalFloat() diff --git a/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp b/apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp similarity index 74% rename from apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp index 518b3be46..fe552e2ec 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp +++ b/apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP #define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP -#include "../WorldProcessor.hpp" +#include "../ObjectProcessor.hpp" namespace mwmp { - class ProcessorScriptLocalShort : public WorldProcessor + class ProcessorScriptLocalShort : public ObjectProcessor { public: ProcessorScriptLocalShort() diff --git a/apps/openmw-mp/processors/world/ProcessorScriptMemberFloat.hpp b/apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp similarity index 75% rename from apps/openmw-mp/processors/world/ProcessorScriptMemberFloat.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp index 3655b21b1..8ab558e8d 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptMemberFloat.hpp +++ b/apps/openmw-mp/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-mp/processors/world/ProcessorScriptMemberShort.hpp b/apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp similarity index 75% rename from apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp rename to apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp index 75269d88f..37ddbbeb9 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp +++ b/apps/openmw-mp/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-mp/processors/world/ProcessorVideoPlay.hpp b/apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp similarity index 73% rename from apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp rename to apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp index 1b7940c6a..55a59fbac 100644 --- a/apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp +++ b/apps/openmw-mp/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() From 51698bed485f451b5469c66a980ee925ddb8cd27 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 15 May 2018 22:56:47 +0300 Subject: [PATCH 2/3] [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() From 2ac334664b3013b801664912cde83e5789a58e91 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 16 May 2018 02:16:27 +0300 Subject: [PATCH 3/3] [Server] Add deprecated alternatives for ObjectList functions This will avoid server crashes in older scripts. --- apps/openmw-mp/Script/Functions/Objects.cpp | 42 +++++++++++++++++++++ apps/openmw-mp/Script/Functions/Objects.hpp | 23 ++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/apps/openmw-mp/Script/Functions/Objects.cpp b/apps/openmw-mp/Script/Functions/Objects.cpp index 878b1a198..5b4f4cb68 100644 --- a/apps/openmw-mp/Script/Functions/Objects.cpp +++ b/apps/openmw-mp/Script/Functions/Objects.cpp @@ -449,3 +449,45 @@ void ObjectFunctions::SendConsoleCommand(bool broadcast) noexcept if (broadcast) packet->Send(true); } + +// All methods below are deprecated versions of methods from above + +void ObjectFunctions::ReadLastEvent() noexcept +{ + ReadLastObjectList(); +} + +void ObjectFunctions::InitializeEvent(unsigned short pid) noexcept +{ + InitializeObjectList(pid); +} + +unsigned char ObjectFunctions::GetEventAction() noexcept +{ + return GetObjectListAction(); +} + +unsigned char ObjectFunctions::GetEventContainerSubAction() noexcept +{ + return GetObjectListContainerSubAction(); +} + +void ObjectFunctions::SetEventCell(const char* cellDescription) noexcept +{ + SetObjectListCell(cellDescription); +} + +void ObjectFunctions::SetEventAction(unsigned char action) noexcept +{ + SetObjectListAction(action); +} + +void ObjectFunctions::SetEventConsoleCommand(const char* consoleCommand) noexcept +{ + SetObjectListConsoleCommand(consoleCommand); +} + +void ObjectFunctions::AddWorldObject() noexcept +{ + AddObject(); +} diff --git a/apps/openmw-mp/Script/Functions/Objects.hpp b/apps/openmw-mp/Script/Functions/Objects.hpp index f8992b7de..4e5c3d6ce 100644 --- a/apps/openmw-mp/Script/Functions/Objects.hpp +++ b/apps/openmw-mp/Script/Functions/Objects.hpp @@ -81,7 +81,16 @@ {"SendDoorState", ObjectFunctions::SendDoorState},\ {"SendDoorDestination", ObjectFunctions::SendDoorDestination},\ {"SendContainer", ObjectFunctions::SendContainer},\ - {"SendConsoleCommand", ObjectFunctions::SendConsoleCommand} + {"SendConsoleCommand", ObjectFunctions::SendConsoleCommand},\ + \ + {"ReadLastEvent", ObjectFunctions::ReadLastEvent},\ + {"InitializeEvent", ObjectFunctions::InitializeEvent},\ + {"GetEventAction", ObjectFunctions::GetEventAction},\ + {"GetEventContainerSubAction", ObjectFunctions::GetEventContainerSubAction},\ + {"SetEventCell", ObjectFunctions::SetEventCell},\ + {"SetEventAction", ObjectFunctions::SetEventAction},\ + {"SetEventConsoleCommand", ObjectFunctions::SetEventConsoleCommand},\ + {"AddWorldObject", ObjectFunctions::AddWorldObject} class ObjectFunctions { @@ -747,6 +756,18 @@ public: */ static void SendConsoleCommand(bool broadcast = false) noexcept; + + // All methods below are deprecated versions of methods from above + + static void ReadLastEvent() noexcept; + static void InitializeEvent(unsigned short pid) noexcept; + static unsigned char GetEventAction() noexcept; + static unsigned char GetEventContainerSubAction() noexcept; + static void SetEventCell(const char* cellDescription) noexcept; + static void SetEventAction(unsigned char action) noexcept; + static void SetEventConsoleCommand(const char* consoleCommand) noexcept; + static void AddWorldObject() noexcept; + };