Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts

# Conflicts:
#   apps/openmw-mp/Networking.cpp
#   apps/openmw-mp/Script/Functions/Objects.cpp
#   apps/openmw-mp/Script/Functions/Objects.hpp
#   apps/openmw-mp/processors/ObjectProcessor.cpp
#   apps/openmw-mp/processors/object/ProcessorContainer.hpp
#   apps/openmw-mp/processors/object/ProcessorDoorState.hpp
#   apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectMove.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectState.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp
#   apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp
#   apps/openmw/mwmp/Networking.cpp
#   apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
#   apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp
#   apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp

apps/openmw-mp/CMakeLists.txt

@@ -95,16 +95,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/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp
-        processors/world/ProcessorMusicPlay.hpp processors/world/ProcessorObjectAnimPlay.hpp
+        processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp
-        processors/world/ProcessorObjectDelete.hpp processors/world/ProcessorObjectLock.hpp
+        processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp
-        processors/world/ProcessorObjectMove.hpp processors/world/ProcessorObjectPlace.hpp
+        processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.hpp
-        processors/world/ProcessorObjectRotate.hpp processors/world/ProcessorObjectScale.hpp
+        processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp
-        processors/world/ProcessorObjectSpawn.hpp processors/world/ProcessorObjectState.hpp
+        processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp
-        processors/world/ProcessorObjectTrap.hpp processors/world/ProcessorScriptLocalShort.hpp
+        processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorScriptLocalShort.hpp
-        processors/world/ProcessorScriptLocalFloat.hpp processors/world/ProcessorScriptMemberShort.hpp
+        processors/object/ProcessorScriptLocalFloat.hpp processors/object/ProcessorScriptMemberShort.hpp
-        processors/world/ProcessorScriptMemberFloat.hpp processors/world/ProcessorScriptGlobalShort.hpp
+        processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorScriptGlobalShort.hpp
-        processors/world/ProcessorScriptGlobalFloat.hpp processors/world/ProcessorVideoPlay.hpp
+        processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp
         )
 
 source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD})
@@ -113,7 +113,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})

apps/openmw-mp/Networking.cpp

@@ -19,7 +19,7 @@
 #include "processors/ProcessorInitializer.hpp"
 #include "processors/PlayerProcessor.hpp"
 #include "processors/ActorProcessor.hpp"
-#include "processors/WorldProcessor.hpp"
+#include "processors/ObjectProcessor.hpp"
 
 #include "Networking.hpp"
 #include "MasterClient.hpp"
@@ -178,7 +178,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", (int) packet->data[0]);
 
 }

apps/openmw-mp/processors/ObjectProcessor.cpp

@@ -2,7 +2,7 @@
 // Created by koncord on 03.04.17.
 //
 
-#include "WorldProcessor.hpp"
+#include "ObjectProcessor.hpp"
 #include "Networking.hpp"
 
 using namespace mwmp;
@@ -10,12 +10,12 @@ using namespace mwmp;
 template<class T>
 typename BasePacketProcessor<T>::processors_t BasePacketProcessor<T>::processors;
 
-void WorldProcessor::Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseObjectList &objectList)
+void ObjectProcessor::Do(ObjectPacket &packet, const std::shared_ptr<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();

apps/openmw-mp/processors/ObjectProcessor.hpp

@@ -14,7 +14,7 @@
 
 namespace mwmp
 {
-    class WorldProcessor : public BasePacketProcessor<WorldProcessor>
+    class ObjectProcessor : public BasePacketProcessor<ObjectProcessor>
     {
     public:
 

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 "ObjectProcessor.hpp"
-#include "world/ProcessorContainer.hpp"
+#include "object/ProcessorContainer.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/ProcessorObjectDelete.hpp"
+#include "object/ProcessorObjectDelete.hpp"
-#include "world/ProcessorObjectPlace.hpp"
+#include "object/ProcessorObjectPlace.hpp"
-#include "world/ProcessorObjectLock.hpp"
+#include "object/ProcessorObjectLock.hpp"
-#include "world/ProcessorObjectMove.hpp"
+#include "object/ProcessorObjectMove.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"
 
 
 using namespace mwmp;
@@ -137,24 +137,24 @@ void ProcessorInitializer()
     ActorProcessor::AddProcessor(new ProcessorActorStatsDynamic());
     ActorProcessor::AddProcessor(new ProcessorActorTest());
 
-    WorldProcessor::AddProcessor(new ProcessorContainer());
+    ObjectProcessor::AddProcessor(new ProcessorContainer());
-    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 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 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());
 }

apps/openmw-mp/processors/object/ProcessorContainer.hpp

@@ -2,12 +2,12 @@
 #define OPENMW_PROCESSORCONTAINER_HPP
 
 #include <apps/openmw-mp/Object.hpp>
-#include "../WorldProcessor.hpp"
+#include "../ObjectProcessor.hpp"
 
 
 namespace mwmp
 {
-    class ProcessorContainer final: public WorldProcessor
+    class ProcessorContainer final: public ObjectProcessor
     {
     public:
         ProcessorContainer()

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 final: public WorldProcessor
+    class ProcessorDoorState final: public ObjectProcessor
     {
     public:
         ProcessorDoorState()

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 final: public WorldProcessor
+    class ProcessorMusicPlay final: public ObjectProcessor
     {
     public:
         ProcessorMusicPlay()

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 final: public WorldProcessor
+    class ProcessorObjectAnimPlay final: public ObjectProcessor
     {
     public:
         ProcessorObjectAnimPlay()

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 final: public WorldProcessor
+    class ProcessorObjectDelete final: public ObjectProcessor
     {
     public:
         ProcessorObjectDelete()

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 final: public WorldProcessor
+    class ProcessorObjectLock final: public ObjectProcessor
     {
     public:
         ProcessorObjectLock()

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 final: public WorldProcessor
+    class ProcessorObjectMove final: public ObjectProcessor
     {
     public:
         ProcessorObjectMove()

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 <apps/openmw-mp/Networking.hpp>
 
 namespace mwmp
 {
-    class ProcessorObjectPlace final: public WorldProcessor
+    class ProcessorObjectPlace final: public ObjectProcessor
     {
     public:
         ProcessorObjectPlace()

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 final: public WorldProcessor
+    class ProcessorObjectRotate final: public ObjectProcessor
     {
     public:
         ProcessorObjectRotate()

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 final: public WorldProcessor
+    class ProcessorObjectScale final: public ObjectProcessor
     {
     public:
         ProcessorObjectScale()

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 <apps/openmw-mp/Networking.hpp>
 
 namespace mwmp
 {
-    class ProcessorObjectSpawn final: public WorldProcessor
+    class ProcessorObjectSpawn final: public ObjectProcessor
     {
     public:
         ProcessorObjectSpawn()

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 final: public WorldProcessor
+    class ProcessorObjectState final: public ObjectProcessor
     {
     public:
         ProcessorObjectState()

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 final: public WorldProcessor
+    class ProcessorObjectTrap final: public ObjectProcessor
     {
     public:
         ProcessorObjectTrap()

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 final : public WorldProcessor
+    class ProcessorScriptGlobalFloat final : public ObjectProcessor
     {
     public:
         ProcessorScriptGlobalFloat()

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 final: public WorldProcessor
+    class ProcessorScriptGlobalShort final: public ObjectProcessor
     {
     public:
         ProcessorScriptGlobalShort()

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 final: public WorldProcessor
+    class ProcessorScriptLocalFloat final: public ObjectProcessor
     {
     public:
         ProcessorScriptLocalFloat()

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 final: public WorldProcessor
+    class ProcessorScriptLocalShort final: public ObjectProcessor
     {
     public:
         ProcessorScriptLocalShort()

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 final : public WorldProcessor
+    class ProcessorScriptMemberFloat final : public ObjectProcessor
     {
     public:
         ProcessorScriptMemberFloat()

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 final: public WorldProcessor
+    class ProcessorScriptMemberShort final: public ObjectProcessor
     {
     public:
         ProcessorScriptMemberShort()

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 final: public WorldProcessor
+    class ProcessorVideoPlay final: public ObjectProcessor
     {
     public:
         ProcessorVideoPlay()

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 GUICustomWindow
     )
 
-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

@@ -38,7 +38,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"
@@ -432,7 +432,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", (int) 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

@@ -54,32 +54,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"
@@ -148,31 +148,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 final: public WorldProcessor
+    class ProcessorMusicPlay final: 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 final: public WorldProcessor
+    class ProcessorScriptGlobalFloat final: 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 final: public WorldProcessor
+    class ProcessorScriptGlobalShort final: 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 final: public WorldProcessor
+    class ProcessorScriptMemberFloat final: 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 final: public WorldProcessor
+    class ProcessorScriptMemberShort final: 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 final: public WorldProcessor
+    class ProcessorVideoPlay final: public ObjectProcessor
     {
     public:
         ProcessorVideoPlay()