[General] Add placeholders for 12 new packets, to be implemented soon

Additionally, make it slightly clearer who created which previously existing packets.

apps/openmw-mp/CMakeLists.txt

@@ -103,26 +103,29 @@ source_group(tes3mp-server FILES ${SERVER} ${SERVER_HEADER})
 
 set(PROCESSORS_ACTOR
         processors/actor/ProcessorActorAnimFlags.hpp processors/actor/ProcessorActorAnimPlay.hpp
-        processors/actor/ProcessorActorAttack.hpp processors/actor/ProcessorActorAuthority.hpp
+        processors/actor/ProcessorActorAttack.hpp processors/actor/ProcessorActorCellChange.hpp
-        processors/actor/ProcessorActorCellChange.hpp processors/actor/ProcessorActorEquipment.hpp
+        processors/actor/ProcessorActorEquipment.hpp processors/actor/ProcessorActorList.hpp
-        processors/actor/ProcessorActorList.hpp processors/actor/ProcessorActorPosition.hpp
+        processors/actor/ProcessorActorPosition.hpp processors/actor/ProcessorActorSpeech.hpp
-        processors/actor/ProcessorActorSpeech.hpp processors/actor/ProcessorActorStatsDynamic.hpp
+        processors/actor/ProcessorActorStatsDynamic.hpp processors/actor/ProcessorActorTest.hpp
-        processors/actor/ProcessorActorTest.hpp
         )
 
 source_group(tes3mp-server\\processors\\actor FILES ${PROCESSORS_ACTOR})
 
 set(PROCESSORS_PLAYER
         processors/player/ProcessorChatMsg.hpp processors/player/ProcessorGUIMessageBox.hpp
-        processors/player/ProcessorPlayerAnimFlags.hpp processors/player/ProcessorPlayerAttack.hpp
+        processors/player/ProcessorGameWeather.hpp processors/player/ProcessorPlayerAnimFlags.hpp
-        processors/player/ProcessorPlayerAttribute.hpp processors/player/ProcessorPlayerBounty.hpp
+        processors/player/ProcessorPlayerAnimPlay.hpp processors/player/ProcessorPlayerAttack.hpp
-        processors/player/ProcessorPlayerCellChange.hpp processors/player/ProcessorPlayerCellState.hpp
+        processors/player/ProcessorPlayerAttribute.hpp processors/player/ProcessorPlayerBook.hpp
-        processors/player/ProcessorPlayerCharClass.hpp processors/player/ProcessorPlayerCharGen.hpp
+        processors/player/ProcessorPlayerBounty.hpp processors/player/ProcessorPlayerCellChange.hpp
-        processors/player/ProcessorPlayerDeath.hpp processors/player/ProcessorPlayerEquipment.hpp
+        processors/player/ProcessorPlayerCellState.hpp processors/player/ProcessorPlayerCharClass.hpp
+        processors/player/ProcessorPlayerCharGen.hpp processors/player/ProcessorPlayerDeath.hpp
+        processors/player/ProcessorPlayerDisposition.hpp processors/player/ProcessorPlayerEquipment.hpp
         processors/player/ProcessorPlayerFaction.hpp processors/player/ProcessorPlayerInventory.hpp
         processors/player/ProcessorPlayerJournal.hpp processors/player/ProcessorPlayerLevel.hpp
-        processors/player/ProcessorPlayerPosition.hpp processors/player/ProcessorPlayerResurrect.hpp
+        processors/player/ProcessorPlayerMap.hpp processors/player/ProcessorPlayerPosition.hpp
-        processors/player/ProcessorPlayerSkill.hpp processors/player/ProcessorPlayerSpellbook.hpp
+        processors/player/ProcessorPlayerRegionChange.hpp processors/player/ProcessorPlayerRest.hpp
+        processors/player/ProcessorPlayerResurrect.hpp processors/player/ProcessorPlayerSkill.hpp
+        processors/player/ProcessorPlayerSpeech.hpp processors/player/ProcessorPlayerSpellbook.hpp
         processors/player/ProcessorPlayerStatsDynamic.hpp processors/player/ProcessorPlayerTopic.hpp
         )
 
@@ -134,9 +137,10 @@ set(PROCESSORS_WORLD
         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/ProcessorObjectTrap.hpp processors/world/ProcessorScriptLocalShort.hpp
+        processors/world/ProcessorObjectSpawn.hpp processors/world/ProcessorObjectTrap.hpp
-        processors/world/ProcessorScriptLocalFloat.hpp processors/world/ProcessorScriptMemberShort.hpp
+        processors/world/ProcessorScriptLocalShort.hpp processors/world/ProcessorScriptLocalFloat.hpp
-        processors/world/ProcessorScriptGlobalShort.hpp processors/world/ProcessorVideoPlay.hpp
+        processors/world/ProcessorScriptMemberShort.hpp processors/world/ProcessorScriptGlobalShort.hpp
+        processors/world/ProcessorVideoPlay.hpp
         )
 
 source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD})

apps/openmw-mp/ProcessorInitializer.cpp

@@ -10,34 +10,43 @@
 #include "PlayerProcessor.hpp"
 #include "processors/player/ProcessorChatMsg.hpp"
 #include "processors/player/ProcessorGUIMessageBox.hpp"
+#include "processors/player/ProcessorGameWeather.hpp"
 #include "processors/player/ProcessorPlayerCharGen.hpp"
 #include "processors/player/ProcessorPlayerAnimFlags.hpp"
+#include "processors/player/ProcessorPlayerAnimPlay.hpp"
 #include "processors/player/ProcessorPlayerAttack.hpp"
 #include "processors/player/ProcessorPlayerAttribute.hpp"
+#include "processors/player/ProcessorPlayerBook.hpp"
 #include "processors/player/ProcessorPlayerBounty.hpp"
 #include "processors/player/ProcessorPlayerCellChange.hpp"
 #include "processors/player/ProcessorPlayerCellState.hpp"
 #include "processors/player/ProcessorPlayerCharClass.hpp"
 #include "processors/player/ProcessorPlayerDeath.hpp"
+#include "processors/player/ProcessorPlayerDisposition.hpp"
 #include "processors/player/ProcessorPlayerEquipment.hpp"
 #include "processors/player/ProcessorPlayerFaction.hpp"
 #include "processors/player/ProcessorPlayerInventory.hpp"
 #include "processors/player/ProcessorPlayerJournal.hpp"
 #include "processors/player/ProcessorPlayerLevel.hpp"
+#include "processors/player/ProcessorPlayerMap.hpp"
 #include "processors/player/ProcessorPlayerPosition.hpp"
+#include "processors/player/ProcessorPlayerRegionChange.hpp"
+#include "processors/player/ProcessorPlayerRest.hpp"
 #include "processors/player/ProcessorPlayerResurrect.hpp"
 #include "processors/player/ProcessorPlayerSkill.hpp"
+#include "processors/player/ProcessorPlayerSpeech.hpp"
 #include "processors/player/ProcessorPlayerSpellbook.hpp"
 #include "processors/player/ProcessorPlayerStatsDynamic.hpp"
 #include "processors/player/ProcessorPlayerTopic.hpp"
 #include "ActorProcessor.hpp"
 #include "processors/actor/ProcessorActorList.hpp"
-#include "processors/actor/ProcessorActorAuthority.hpp"
 #include "processors/actor/ProcessorActorTest.hpp"
+#include "processors/actor/ProcessorActorAI.hpp"
 #include "processors/actor/ProcessorActorAnimFlags.hpp"
 #include "processors/actor/ProcessorActorAnimPlay.hpp"
 #include "processors/actor/ProcessorActorAttack.hpp"
 #include "processors/actor/ProcessorActorCellChange.hpp"
+#include "processors/actor/ProcessorActorDeath.hpp"
 #include "processors/actor/ProcessorActorEquipment.hpp"
 #include "processors/actor/ProcessorActorStatsDynamic.hpp"
 #include "processors/actor/ProcessorActorPosition.hpp"
@@ -53,6 +62,7 @@
 #include "processors/world/ProcessorObjectMove.hpp"
 #include "processors/world/ProcessorObjectRotate.hpp"
 #include "processors/world/ProcessorObjectScale.hpp"
+#include "processors/world/ProcessorObjectSpawn.hpp"
 #include "processors/world/ProcessorObjectTrap.hpp"
 #include "processors/world/ProcessorScriptLocalShort.hpp"
 #include "processors/world/ProcessorScriptLocalFloat.hpp"
@@ -67,33 +77,42 @@ void ProcessorInitializer()
 {
     PlayerProcessor::AddProcessor(new ProcessorChatMsg());
     PlayerProcessor::AddProcessor(new ProcessorGUIMessageBox());
+    PlayerProcessor::AddProcessor(new ProcessorGameWeather());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCharGen());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAnimFlags());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerAnimPlay());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAttack());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerBook());
     PlayerProcessor::AddProcessor(new ProcessorPlayerBounty());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCellState());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCharClass());
     PlayerProcessor::AddProcessor(new ProcessorPlayerDeath());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerDisposition());
     PlayerProcessor::AddProcessor(new ProcessorPlayerEquipment());
     PlayerProcessor::AddProcessor(new ProcessorPlayerFaction());
     PlayerProcessor::AddProcessor(new ProcessorPlayerInventory());
     PlayerProcessor::AddProcessor(new ProcessorPlayerJournal());
     PlayerProcessor::AddProcessor(new ProcessorPlayerLevel());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerMap());
     PlayerProcessor::AddProcessor(new ProcessorPlayerPosition());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerRegionChange());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerRest());
     PlayerProcessor::AddProcessor(new ProcessorPlayerResurrect());
     PlayerProcessor::AddProcessor(new ProcessorPlayerSkill());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerSpeech());
     PlayerProcessor::AddProcessor(new ProcessorPlayerSpellbook());
     PlayerProcessor::AddProcessor(new ProcessorPlayerStatsDynamic());
     PlayerProcessor::AddProcessor(new ProcessorPlayerTopic());
 
     ActorProcessor::AddProcessor(new ProcessorActorList());
-    ActorProcessor::AddProcessor(new ProcessorActorAuthority());
+    ActorProcessor::AddProcessor(new ProcessorActorAI());
     ActorProcessor::AddProcessor(new ProcessorActorAnimFlags());
     ActorProcessor::AddProcessor(new ProcessorActorAnimPlay());
     ActorProcessor::AddProcessor(new ProcessorActorAttack());
     ActorProcessor::AddProcessor(new ProcessorActorCellChange());
+    ActorProcessor::AddProcessor(new ProcessorActorDeath());
     ActorProcessor::AddProcessor(new ProcessorActorEquipment());
     ActorProcessor::AddProcessor(new ProcessorActorPosition());
     ActorProcessor::AddProcessor(new ProcessorActorSpeech());
@@ -110,6 +129,7 @@ void ProcessorInitializer()
     WorldProcessor::AddProcessor(new ProcessorObjectPlace());
     WorldProcessor::AddProcessor(new ProcessorObjectRotate());
     WorldProcessor::AddProcessor(new ProcessorObjectScale());
+    WorldProcessor::AddProcessor(new ProcessorObjectSpawn());
     WorldProcessor::AddProcessor(new ProcessorObjectTrap());
     WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
     WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat());

apps/openmw-mp/Script/ScriptFunctions.hpp

@@ -124,6 +124,7 @@ public:
             {"OnPlayerDeath",            Function<void, unsigned short>()},
             {"OnPlayerResurrect",        Function<void, unsigned short>()},
             {"OnPlayerCellChange",       Function<void, unsigned short>()},
+            {"OnPlayerRegionChange",     Function<void, unsigned short>()},
             {"OnPlayerAttribute",        Function<void, unsigned short>()},
             {"OnPlayerSkill",            Function<void, unsigned short>()},
             {"OnPlayerLevel",            Function<void, unsigned short>()},
@@ -134,6 +135,10 @@ public:
             {"OnPlayerFaction",          Function<void, unsigned short>()},
             {"OnPlayerSpellbook",        Function<void, unsigned short>()},
             {"OnPlayerTopic",            Function<void, unsigned short>()},
+            {"OnPlayerDisposition",      Function<void, unsigned short>()},
+            {"OnPlayerBook",             Function<void, unsigned short>()},
+            {"OnPlayerMap",              Function<void, unsigned short>()},
+            {"OnPlayerRest",             Function<void, unsigned short>()},
             {"OnCellLoad",               Function<void, unsigned short, const char*>()},
             {"OnCellUnload",             Function<void, unsigned short, const char*>()},
             {"OnCellDeletion",           Function<void, const char*>()},
@@ -143,6 +148,7 @@ public:
             {"OnObjectLock",             Function<void, unsigned short, const char*>()},
             {"OnObjectPlace",            Function<void, unsigned short, const char*>()},
             {"OnObjectScale",            Function<void, unsigned short, const char*>()},
+            {"OnObjectSpawn",            Function<void, unsigned short, const char*>()},
             {"OnObjectTrap",             Function<void, unsigned short, const char*>()},
             {"OnActorList",              Function<void, unsigned short, const char*>()},
             {"OnActorEquipment",         Function<void, unsigned short, const char*>()},

apps/openmw-mp/processors/actor/ProcessorActorAI.hpp

@@ -0,0 +1,27 @@
+#ifndef OPENMW_PROCESSORACTORAI_HPP
+#define OPENMW_PROCESSORACTORAI_HPP
+
+#include "apps/openmw-mp/ActorProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorActorAI : public ActorProcessor
+    {
+    public:
+        ProcessorActorAI()
+        {
+            BPP_INIT(ID_ACTOR_AI)
+        }
+
+        void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
+        {
+            // Send only to players who have the cell loaded
+            Cell *serverCell = CellController::get()->getCell(&actorList.cell);
+
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
+                serverCell->sendToLoaded(&packet, &actorList);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORACTORAI_HPP

apps/openmw-mp/processors/actor/ProcessorActorAuthority.hpp

@@ -1,23 +0,0 @@
-#ifndef OPENMW_PROCESSORACTORAUTHORITY_HPP
-#define OPENMW_PROCESSORACTORAUTHORITY_HPP
-
-#include "apps/openmw-mp/ActorProcessor.hpp"
-
-namespace mwmp
-{
-    class ProcessorActorAuthority : public ActorProcessor
-    {
-    public:
-        ProcessorActorAuthority()
-        {
-            BPP_INIT(ID_ACTOR_AUTHORITY)
-        }
-
-        void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
-        {
-            // In the current implementation, only the server should be able to send ActorAuthority packets
-        }
-    };
-}
-
-#endif //OPENMW_PROCESSORACTORAUTHORITY_HPP

apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp

@@ -0,0 +1,27 @@
+#ifndef OPENMW_PROCESSORACTORDEATH_HPP
+#define OPENMW_PROCESSORACTORDEATH_HPP
+
+#include "apps/openmw-mp/ActorProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorActorDeath : public ActorProcessor
+    {
+    public:
+        ProcessorActorDeath()
+        {
+            BPP_INIT(ID_ACTOR_DEATH)
+        }
+
+        void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
+        {
+            // Send only to players who have the cell loaded
+            Cell *serverCell = CellController::get()->getCell(&actorList.cell);
+
+            if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
+                serverCell->sendToLoaded(&packet, &actorList);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORACTORDEATH_HPP

apps/openmw-mp/processors/player/ProcessorChatMsg.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERCHATMSG_HPP
 #define OPENMW_PROCESSORPLAYERCHATMSG_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORGUIMESSAGEBOX_HPP
 #define OPENMW_PROCESSORGUIMESSAGEBOX_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -28,6 +27,4 @@ namespace mwmp
     };
 }
 
-
-
 #endif //OPENMW_PROCESSORGUIMESSAGEBOX_HPP

apps/openmw-mp/processors/player/ProcessorGameWeather.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORGAMEWEATHER_HPP
+#define OPENMW_PROCESSORGAMEWEATHER_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorGameWeather : public PlayerProcessor
+    {
+    public:
+        ProcessorGameWeather()
+        {
+            BPP_INIT(ID_GAME_WEATHER)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORGAMEWEATHER_HPP

apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERANIMFLAGS_HPP
 #define OPENMW_PROCESSORPLAYERANIMFLAGS_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -27,7 +26,4 @@ namespace mwmp
     };
 }
 
-
-
-
 #endif //OPENMW_PROCESSORPLAYERANIMFLAGS_HPP

apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORPLAYERANIMPLAY_HPP
+#define OPENMW_PROCESSORPLAYERANIMPLAY_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerAnimPlay : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerAnimPlay()
+        {
+            BPP_INIT(ID_PLAYER_ANIM_PLAY)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            player.sendToLoaded(&packet);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERANIMPLAY_HPP

apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERATTACK_HPP
 #define OPENMW_PROCESSORPLAYERATTACK_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERATTRIBUTE_HPP
 #define OPENMW_PROCESSORPLAYERATTRIBUTE_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerBook.hpp

@@ -0,0 +1,27 @@
+#ifndef OPENMW_PROCESSORPLAYERBOOK_HPP
+#define OPENMW_PROCESSORPLAYERBOOK_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerBook : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerBook()
+        {
+            BPP_INIT(ID_PLAYER_BOOK)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            packet.Send(true);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerBook")>(player.getId());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERBOOK_HPP

apps/openmw-mp/processors/player/ProcessorPlayerBounty.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERBOUNTY_HPP
 #define OPENMW_PROCESSORPLAYERBOUNTY_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp

@@ -78,5 +78,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERCELLCHANGE_HPP

apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 01.04.17.
-//
-
 #ifndef OPENMW_PROCESSORPLAYERCELLSTATE_HPP
 #define OPENMW_PROCESSORPLAYERCELLSTATE_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 #include "apps/openmw-mp/Networking.hpp"
 #include "apps/openmw-mp/Script/Script.hpp"
@@ -32,5 +27,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERCELLSTATE_HPP

apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERCHARCLASS_HPP
 #define OPENMW_PROCESSORPLAYERCHARCLASS_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -25,5 +24,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERCHARCLASS_HPP

apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERCHARGEN_HPP
 #define OPENMW_PROCESSORPLAYERCHARGEN_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -28,7 +27,4 @@ namespace mwmp
     };
 }
 
-
-
-
 #endif //OPENMW_PROCESSORPLAYERCHARGEN_HPP

apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERDEATH_HPP
 #define OPENMW_PROCESSORPLAYERDEATH_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 #include <chrono>
 

apps/openmw-mp/processors/player/ProcessorPlayerDisposition.hpp

@@ -0,0 +1,27 @@
+#ifndef OPENMW_PROCESSORPLAYERDISPOSITION_HPP
+#define OPENMW_PROCESSORPLAYERDISPOSITION_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerDisposition : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerDisposition()
+        {
+            BPP_INIT(ID_PLAYER_DISPOSITION)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            packet.Send(true);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerDisposition")>(player.getId());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERDISPOSITION_HPP

apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYEREQUIPMENT_HPP
 #define OPENMW_PROCESSORPLAYEREQUIPMENT_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerFaction.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERFACTION_HPP
 #define OPENMW_PROCESSORPLAYERFACTION_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp

@@ -26,6 +26,4 @@ namespace mwmp
     };
 }
 
-
-
 #endif //OPENMW_PROCESSORPLAYERINVENTORY_HPP

apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 01.04.17.
-//
-
 #ifndef OPENMW_PROCESSORPLAYERJOURNAL_HPP
 #define OPENMW_PROCESSORPLAYERJOURNAL_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 01.04.17.
-//
-
 #ifndef OPENMW_PROCESSORPLAYERLEVEL_HPP
 #define OPENMW_PROCESSORPLAYERLEVEL_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp

@@ -0,0 +1,27 @@
+#ifndef OPENMW_PROCESSORPLAYERMAP_HPP
+#define OPENMW_PROCESSORPLAYERMAP_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerMap : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerMap()
+        {
+            BPP_INIT(ID_PLAYER_MAP)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            packet.Send(true);
+
+            Script::Call<Script::CallbackIdentity("OnPlayerMap")>(player.getId());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERMAP_HPP

apps/openmw-mp/processors/player/ProcessorPlayerRegionChange.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORPLAYERREGIONCHANGE_HPP
+#define OPENMW_PROCESSORPLAYERREGIONCHANGE_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerRegionChange : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerRegionChange()
+        {
+            BPP_INIT(ID_PLAYER_REGION_CHANGE)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            Script::Call<Script::CallbackIdentity("OnPlayerRegionChange")>(player.getId());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERREGIONCHANGE_HPP

apps/openmw-mp/processors/player/ProcessorPlayerRest.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORPLAYERREST_HPP
+#define OPENMW_PROCESSORPLAYERREST_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerRest : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerRest()
+        {
+            BPP_INIT(ID_PLAYER_REST)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            Script::Call<Script::CallbackIdentity("OnPlayerRest")>(player.getId());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERREST_HPP

apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERRESURRECT_HPP
 #define OPENMW_PROCESSORPLAYERRESURRECT_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -32,6 +31,4 @@ namespace mwmp
     };
 }
 
-
-
 #endif //OPENMW_PROCESSORPLAYERRESURRECT_HPP

apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORPLAYERSPEECH_HPP
+#define OPENMW_PROCESSORPLAYERSPEECH_HPP
+
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerSpeech : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerSpeech()
+        {
+            BPP_INIT(ID_PLAYER_SPEECH)
+        }
+
+        void Do(PlayerPacket &packet, Player &player) override
+        {
+            DEBUG_PRINTF(strPacketID.c_str());
+
+            player.sendToLoaded(&packet);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERSPEECH_HPP

apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERSTATS_DYNAMIC_HPP
 #define OPENMW_PROCESSORPLAYERSTATS_DYNAMIC_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -27,5 +26,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERSTATS_DYNAMIC_HPP

apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERTOPIC_HPP
 #define OPENMW_PROCESSORPLAYERTOPIC_HPP
 
-
 #include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp

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

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORCONTAINER_HPP
 #define OPENMW_PROCESSORCONTAINER_HPP
 

apps/openmw-mp/processors/world/ProcessorDoorState.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORDOORSTATE_HPP
 #define OPENMW_PROCESSORDOORSTATE_HPP
 

apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORMUSICPLAY_HPP
 #define OPENMW_PROCESSORMUSICPLAY_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTANIMPLAY_HPP
 #define OPENMW_PROCESSOROBJECTANIMPLAY_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTDELETE_HPP
 #define OPENMW_PROCESSOROBJECTDELETE_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectLock.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTLOCK_HPP
 #define OPENMW_PROCESSOROBJECTLOCK_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectMove.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTMOVE_HPP
 #define OPENMW_PROCESSOROBJECTMOVE_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTPLACE_HPP
 #define OPENMW_PROCESSOROBJECTPLACE_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTROTATE_HPP
 #define OPENMW_PROCESSOROBJECTROTATE_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectScale.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTSCALE_HPP
 #define OPENMW_PROCESSOROBJECTSCALE_HPP
 

apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp

@@ -0,0 +1,36 @@
+#ifndef OPENMW_PROCESSOROBJECTSPAWN_HPP
+#define OPENMW_PROCESSOROBJECTSPAWN_HPP
+
+#include "apps/openmw-mp/WorldProcessor.hpp"
+#include <apps/openmw-mp/Networking.hpp>
+
+namespace mwmp
+{
+    class ProcessorObjectSpawn : public WorldProcessor
+    {
+    public:
+        ProcessorObjectSpawn()
+        {
+            BPP_INIT(ID_OBJECT_SPAWN)
+        }
+
+        void Do(WorldPacket &packet, Player &player, BaseEvent &event) override
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
+
+            for (unsigned int i = 0; i < event.worldObjectCount; i++)
+            {
+                event.worldObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
+            }
+
+            // Send this packet back to the original sender with the mpNum generation from above,
+            // then send it to the other players
+            packet.Send(false);
+            packet.Send(true);
+
+            Script::Call<Script::CallbackIdentity("OnObjectSpawn")>(player.getId(), event.cell.getDescription().c_str());
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSOROBJECTSPAWN_HPP

apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 

apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
 #define OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
 

apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
 

apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 

apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 03.04.17.
-//
-
 #ifndef OPENMW_PROCESSORVIDEOPLAY_HPP
 #define OPENMW_PROCESSORVIDEOPLAY_HPP
 

apps/openmw/CMakeLists.txt

@@ -101,23 +101,24 @@ add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer PlayerList Loca
     BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer
     )
 
-add_openmw_dir (mwmp/processors/actor ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack
+add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack
-    ProcessorActorAuthority ProcessorActorCellChange ProcessorActorEquipment ProcessorActorList ProcessorActorPosition
+    ProcessorActorAuthority ProcessorActorCellChange ProcessorActorDeath ProcessorActorEquipment ProcessorActorList
-    ProcessorActorSpeech ProcessorActorStatsDynamic ProcessorActorTest
+    ProcessorActorPosition ProcessorActorSpeech ProcessorActorStatsDynamic ProcessorActorTest
     )
 
-add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGameConsole ProcessorGameTime ProcessorGUIMessageBox
+add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGUIMessageBox ProcessorHandshake ProcessorUserDisconnected
-    ProcessorHandshake ProcessorUserDisconnected ProcessorUserMyID  ProcessorPlayerBaseInfo ProcessorPlayerAnimFlags
+    ProcessorUserMyID  ProcessorGameConsole ProcessorGameTime ProcessorGameWeather ProcessorPlayerBaseInfo
-    ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState
+    ProcessorPlayerAnimFlags ProcessorPlayerAnimPlay ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBook
-    ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerEquipment ProcessorPlayerFaction
+    ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass ProcessorPlayerCharGen
-    ProcessorPlayerInventory ProcessorPlayerJournal ProcessorPlayerLevel ProcessorPlayerPosition ProcessorPlayerResurrect
+    ProcessorPlayerDeath ProcessorPlayerDisposition ProcessorPlayerEquipment ProcessorPlayerFaction ProcessorPlayerInventory
-    ProcessorPlayerSkill ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic
+    ProcessorPlayerJournal ProcessorPlayerLevel ProcessorPlayerMap ProcessorPlayerPosition ProcessorPlayerResurrect
+    ProcessorPlayerSkill ProcessorPlayerSpeech ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic
     )
 
 add_openmw_dir (mwmp/processors/world BaseObjectProcessor ProcessorContainer ProcessorDoorState ProcessorMusicPlay
-    ProcessorObjectAnimPlay ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace
+    ProcessorVideoPlay ProcessorObjectAnimPlay ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove
-    ProcessorObjectRotate ProcessorObjectScale ProcessorObjectTrap ProcessorScriptGlobalShort ProcessorScriptLocalFloat
+    ProcessorObjectPlace ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectTrap
-    ProcessorScriptLocalShort ProcessorScriptMemberShort ProcessorVideoPlay
+    ProcessorScriptLocalShort ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptGlobalShort
     )
 
 # Main executable

apps/openmw/mwmp/ProcessorInitializer.cpp

@@ -7,29 +7,37 @@
 #include "PlayerProcessor.hpp"
 
 #include "processors/player/ProcessorChatMessage.hpp"
-#include "processors/player/ProcessorGameConsole.hpp"
-#include "processors/player/ProcessorGameTime.hpp"
 #include "processors/player/ProcessorGUIMessageBox.hpp"
 #include "processors/player/ProcessorHandshake.hpp"
 #include "processors/player/ProcessorUserDisconnected.hpp"
+#include "processors/player/ProcessorGameConsole.hpp"
+#include "processors/player/ProcessorGameTime.hpp"
+#include "processors/player/ProcessorGameWeather.hpp"
 #include "processors/player/ProcessorPlayerBaseInfo.hpp"
 #include "processors/player/ProcessorPlayerCharGen.hpp"
 #include "processors/player/ProcessorPlayerAnimFlags.hpp"
+#include "processors/player/ProcessorPlayerAnimPlay.hpp"
 #include "processors/player/ProcessorPlayerAttack.hpp"
 #include "processors/player/ProcessorPlayerAttribute.hpp"
+#include "processors/player/ProcessorPlayerBook.hpp"
 #include "processors/player/ProcessorPlayerBounty.hpp"
 #include "processors/player/ProcessorPlayerCellChange.hpp"
 #include "processors/player/ProcessorPlayerCellState.hpp"
 #include "processors/player/ProcessorPlayerCharClass.hpp"
 #include "processors/player/ProcessorPlayerDeath.hpp"
+#include "processors/player/ProcessorPlayerDisposition.hpp"
 #include "processors/player/ProcessorPlayerEquipment.hpp"
 #include "processors/player/ProcessorPlayerFaction.hpp"
 #include "processors/player/ProcessorPlayerInventory.hpp"
 #include "processors/player/ProcessorPlayerJournal.hpp"
 #include "processors/player/ProcessorPlayerLevel.hpp"
+#include "processors/player/ProcessorPlayerMap.hpp"
 #include "processors/player/ProcessorPlayerPosition.hpp"
+#include "processors/player/ProcessorPlayerRegionAuthority.hpp"
+#include "processors/player/ProcessorPlayerRest.hpp"
 #include "processors/player/ProcessorPlayerResurrect.hpp"
 #include "processors/player/ProcessorPlayerSkill.hpp"
+#include "processors/player/ProcessorPlayerSpeech.hpp"
 #include "processors/player/ProcessorPlayerSpellbook.hpp"
 #include "processors/player/ProcessorPlayerStatsDynamic.hpp"
 #include "processors/player/ProcessorPlayerTopic.hpp"
@@ -45,6 +53,7 @@
 #include "processors/world/ProcessorObjectPlace.hpp"
 #include "processors/world/ProcessorObjectRotate.hpp"
 #include "processors/world/ProcessorObjectScale.hpp"
+#include "processors/world/ProcessorObjectSpawn.hpp"
 #include "processors/world/ProcessorObjectTrap.hpp"
 #include "processors/world/ProcessorScriptLocalShort.hpp"
 #include "processors/world/ProcessorScriptLocalFloat.hpp"
@@ -52,11 +61,13 @@
 #include "processors/world/ProcessorScriptGlobalShort.hpp"
 #include "processors/world/ProcessorVideoPlay.hpp"
 
+#include "processors/actor/ProcessorActorAI.hpp"
 #include "processors/actor/ProcessorActorAnimFlags.hpp"
 #include "processors/actor/ProcessorActorAnimPlay.hpp"
 #include "processors/actor/ProcessorActorAttack.hpp"
 #include "processors/actor/ProcessorActorAuthority.hpp"
 #include "processors/actor/ProcessorActorCellChange.hpp"
+#include "processors/actor/ProcessorActorDeath.hpp"
 #include "processors/actor/ProcessorActorEquipment.hpp"
 #include "processors/actor/ProcessorActorList.hpp"
 #include "processors/actor/ProcessorActorPosition.hpp"
@@ -69,29 +80,37 @@ using namespace mwmp;
 void ProcessorInitializer()
 {
     PlayerProcessor::AddProcessor(new ProcessorChatMessage());
-    PlayerProcessor::AddProcessor(new ProcessorGameConsole());
-    PlayerProcessor::AddProcessor(new ProcessorGameTime());
     PlayerProcessor::AddProcessor(new ProcessorGUIMessageBox());
     PlayerProcessor::AddProcessor(new ProcessorHandshake());
     PlayerProcessor::AddProcessor(new ProcessorUserDisconnected());
+    PlayerProcessor::AddProcessor(new ProcessorGameConsole());
+    PlayerProcessor::AddProcessor(new ProcessorGameTime());
+    PlayerProcessor::AddProcessor(new ProcessorGameWeather());
     PlayerProcessor::AddProcessor(new ProcessorPlayerBaseInfo());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCharGen());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAnimFlags());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerAnimPlay());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAttack());
     PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerBook());
     PlayerProcessor::AddProcessor(new ProcessorPlayerBounty());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCellState());
     PlayerProcessor::AddProcessor(new ProcessorPlayerCharClass());
     PlayerProcessor::AddProcessor(new ProcessorPlayerDeath());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerDisposition());
     PlayerProcessor::AddProcessor(new ProcessorPlayerEquipment());
     PlayerProcessor::AddProcessor(new ProcessorPlayerFaction());
     PlayerProcessor::AddProcessor(new ProcessorPlayerInventory());
     PlayerProcessor::AddProcessor(new ProcessorPlayerJournal());
     PlayerProcessor::AddProcessor(new ProcessorPlayerLevel());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerMap());
     PlayerProcessor::AddProcessor(new ProcessorPlayerPosition());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerRegionAuthority());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerRest());
     PlayerProcessor::AddProcessor(new ProcessorPlayerResurrect());
     PlayerProcessor::AddProcessor(new ProcessorPlayerSkill());
+    PlayerProcessor::AddProcessor(new ProcessorPlayerSpeech());
     PlayerProcessor::AddProcessor(new ProcessorPlayerSpellbook());
     PlayerProcessor::AddProcessor(new ProcessorPlayerStatsDynamic());
     PlayerProcessor::AddProcessor(new ProcessorPlayerTopic());
@@ -106,6 +125,7 @@ void ProcessorInitializer()
     WorldProcessor::AddProcessor(new ProcessorObjectPlace());
     WorldProcessor::AddProcessor(new ProcessorObjectRotate());
     WorldProcessor::AddProcessor(new ProcessorObjectScale());
+    WorldProcessor::AddProcessor(new ProcessorObjectSpawn());
     WorldProcessor::AddProcessor(new ProcessorObjectTrap());
     WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
     WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat());
@@ -113,11 +133,13 @@ void ProcessorInitializer()
     WorldProcessor::AddProcessor(new ProcessorScriptGlobalShort());
     WorldProcessor::AddProcessor(new ProcessorVideoPlay());
 
+    ActorProcessor::AddProcessor(new ProcessorActorAI());
     ActorProcessor::AddProcessor(new ProcessorActorAnimFlags());
     ActorProcessor::AddProcessor(new ProcessorActorAnimPlay());
     ActorProcessor::AddProcessor(new ProcessorActorAttack());
     ActorProcessor::AddProcessor(new ProcessorActorAuthority());
     ActorProcessor::AddProcessor(new ProcessorActorCellChange());
+    ActorProcessor::AddProcessor(new ProcessorActorDeath());
     ActorProcessor::AddProcessor(new ProcessorActorEquipment());
     ActorProcessor::AddProcessor(new ProcessorActorList());
     ActorProcessor::AddProcessor(new ProcessorActorPosition());

apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORACTORAI_HPP
+#define OPENMW_PROCESSORACTORAI_HPP
+
+#include "apps/openmw/mwmp/ActorProcessor.hpp"
+#include "apps/openmw/mwmp/Main.hpp"
+#include "apps/openmw/mwmp/CellController.hpp"
+
+namespace mwmp
+{
+    class ProcessorActorAI : public ActorProcessor
+    {
+    public:
+        ProcessorActorAI()
+        {
+            BPP_INIT(ID_ACTOR_AI);
+        }
+
+        virtual void Do(ActorPacket &packet, ActorList &actorList)
+        {
+            //Main::get().getCellController()->readAI(actorList);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORACTORAI_HPP

apps/openmw/mwmp/processors/actor/ProcessorActorAnimFlags.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORANIMFLAGS_HPP
 #define OPENMW_PROCESSORACTORANIMFLAGS_HPP
 

apps/openmw/mwmp/processors/actor/ProcessorActorAnimPlay.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORANIMPLAY_HPP
 #define OPENMW_PROCESSORACTORANIMPLAY_HPP
 

apps/openmw/mwmp/processors/actor/ProcessorActorAttack.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORATTACK_HPP
 #define OPENMW_PROCESSORACTORATTACK_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/actor/ProcessorActorAuthority.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORAUTHORITY_HPP
 #define OPENMW_PROCESSORACTORAUTHORITY_HPP
 

apps/openmw/mwmp/processors/actor/ProcessorActorCellChange.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORCELLCHANGE_HPP
 #define OPENMW_PROCESSORACTORCELLCHANGE_HPP
 

apps/openmw/mwmp/processors/actor/ProcessorActorDeath.hpp

@@ -0,0 +1,25 @@
+#ifndef OPENMW_PROCESSORACTORDEATH_HPP
+#define OPENMW_PROCESSORACTORDEATH_HPP
+
+#include "apps/openmw/mwmp/ActorProcessor.hpp"
+#include "apps/openmw/mwmp/Main.hpp"
+#include "apps/openmw/mwmp/CellController.hpp"
+
+namespace mwmp
+{
+    class ProcessorActorDeath : public ActorProcessor
+    {
+    public:
+        ProcessorActorDeath()
+        {
+            BPP_INIT(ID_ACTOR_DEATH);
+        }
+
+        virtual void Do(ActorPacket &packet, ActorList &actorList)
+        {
+            //Main::get().getCellController()->readDeath(actorList);
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORACTORDEATH_HPP

apps/openmw/mwmp/processors/actor/ProcessorActorEquipment.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORACTOREQUIPMENT_HPP
 #define OPENMW_PROCESSORACTOREQUIPMENT_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORLIST_HPP
 #define OPENMW_PROCESSORACTORLIST_HPP
 

apps/openmw/mwmp/processors/actor/ProcessorActorPosition.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORPOSITION_HPP
 #define OPENMW_PROCESSORACTORPOSITION_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/actor/ProcessorActorSpeech.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORSPEECH_HPP
 #define OPENMW_PROCESSORACTORSPEECH_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/actor/ProcessorActorStatsDynamic.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP
 #define OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/actor/ProcessorActorTest.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORACTORTEST_HPP
 #define OPENMW_PROCESSORACTORTEST_HPP
 
-
 #include "apps/openmw/mwmp/ActorProcessor.hpp"
 #include "apps/openmw/mwmp/Main.hpp"
 #include "apps/openmw/mwmp/CellController.hpp"

apps/openmw/mwmp/processors/player/ProcessorGameWeather.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORGAMEWEATHER_HPP
+#define OPENMW_PROCESSORGAMEWEATHER_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorGameWeather : public PlayerProcessor
+    {
+    public:
+        ProcessorGameWeather()
+        {
+            BPP_INIT(ID_GAME_WEATHER)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORGAMEWEATHER_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerAnimPlay.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERANIMPLAY_HPP
+#define OPENMW_PROCESSORPLAYERANIMPLAY_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerAnimPlay : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerAnimPlay()
+        {
+            BPP_INIT(ID_PLAYER_ANIM_PLAY)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERANIMPLAY_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerBook.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERBOOK_HPP
+#define OPENMW_PROCESSORPLAYERBOOK_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerBook : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerBook()
+        {
+            BPP_INIT(ID_PLAYER_BOOK)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERBOOK_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerBounty.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERBOUNTY_HPP
 #define OPENMW_PROCESSORPLAYERBOUNTY_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -34,5 +33,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERBOUNTY_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerCellState.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 16.04.17.
-//
-
 #ifndef OPENMW_PROCESSORPLAYERCELLSTATE_HPP
 #define OPENMW_PROCESSORPLAYERCELLSTATE_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/player/ProcessorPlayerDisposition.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERDISPOSITION_HPP
+#define OPENMW_PROCESSORPLAYERDISPOSITION_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerDisposition : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerDisposition()
+        {
+            BPP_INIT(ID_PLAYER_DISPOSITION)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERDISPOSITION_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerFaction.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERFACTION_HPP
 #define OPENMW_PROCESSORPLAYERFACTION_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -28,5 +27,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERFACTION_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp

@@ -5,7 +5,6 @@
 #ifndef OPENMW_PROCESSORPLAYERUPDATEINVENTORY_HPP
 #define OPENMW_PROCESSORPLAYERUPDATEINVENTORY_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 16.04.17.
-//
-
 #ifndef OPENMW_PROCESSORPLAYERJOURNAL_HPP
 #define OPENMW_PROCESSORPLAYERJOURNAL_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -32,5 +27,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERJOURNAL_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERMAP_HPP
+#define OPENMW_PROCESSORPLAYERMAP_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerMap : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerMap()
+        {
+            BPP_INIT(ID_PLAYER_MAP)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERMAP_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerRegionAuthority.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERREGIONAUTHORITY_HPP
+#define OPENMW_PROCESSORPLAYERREGIONAUTHORITY_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerRegionAuthority : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerRegionAuthority()
+        {
+            BPP_INIT(ID_PLAYER_REGION_AUTHORITY)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERREGIONAUTHORITY_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerRest.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERREST_HPP
+#define OPENMW_PROCESSORPLAYERREST_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerRest : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerRest()
+        {
+            BPP_INIT(ID_PLAYER_REST)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERREST_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerSpeech.hpp

@@ -0,0 +1,23 @@
+#ifndef OPENMW_PROCESSORPLAYERSPEECH_HPP
+#define OPENMW_PROCESSORPLAYERSPEECH_HPP
+
+#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorPlayerSpeech : public PlayerProcessor
+    {
+    public:
+        ProcessorPlayerSpeech()
+        {
+            BPP_INIT(ID_PLAYER_SPEECH)
+        }
+
+        virtual void Do(PlayerPacket &packet, BasePlayer *player)
+        {
+            // Placeholder to be filled in later
+        }
+    };
+}
+
+#endif //OPENMW_PROCESSORPLAYERSPEECH_HPP

apps/openmw/mwmp/processors/player/ProcessorPlayerTopic.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSORPLAYERTOPIC_HPP
 #define OPENMW_PROCESSORPLAYERTOPIC_HPP
 
-
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
 
 namespace mwmp
@@ -28,5 +27,4 @@ namespace mwmp
     };
 }
 
-
 #endif //OPENMW_PROCESSORPLAYERTOPIC_HPP

apps/openmw/mwmp/processors/player/ProcessorUserDisconnected.hpp

@@ -7,6 +7,7 @@
 
 
 #include "apps/openmw/mwmp/PlayerProcessor.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
 #include "apps/openmw/mwstate/statemanagerimp.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorContainer.hpp

@@ -1,7 +1,3 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORCONTAINER_HPP
 #define OPENMW_PROCESSORCONTAINER_HPP
 

apps/openmw/mwmp/processors/world/ProcessorDoorState.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSDOORSTATE_HPP
 #define OPENMW_PROCESSDOORSTATE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

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

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORMUSICPLAY_HPP
 #define OPENMW_PROCESSORMUSICPLAY_HPP
 
-
 #include "apps/openmw/mwmp/WorldProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectAnimPlay.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTANIMPLAY_HPP
 #define OPENMW_PROCESSOROBJECTANIMPLAY_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectDelete.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTDELETE_HPP
 #define OPENMW_PROCESSOROBJECTDELETE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectLock.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTLOCK_HPP
 #define OPENMW_PROCESSOROBJECTLOCK_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectMove.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTMOVE_HPP
 #define OPENMW_PROCESSOROBJECTMOVE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectPlace.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTPLACE_HPP
 #define OPENMW_PROCESSOROBJECTPLACE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectRotate.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTROTATE_HPP
 #define OPENMW_PROCESSOROBJECTROTATE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectScale.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSOROBJECTSCALE_HPP
 #define OPENMW_PROCESSOROBJECTSCALE_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorObjectSpawn.hpp

@@ -0,0 +1,26 @@
+#ifndef OPENMW_PROCESSOROBJECTSPAWN_HPP
+#define OPENMW_PROCESSOROBJECTSPAWN_HPP
+
+#include "BaseObjectProcessor.hpp"
+
+namespace mwmp
+{
+    class ProcessorObjectSpawn : public BaseObjectProcessor
+    {
+    public:
+        ProcessorObjectSpawn()
+        {
+            BPP_INIT(ID_OBJECT_SPAWN)
+        }
+
+        virtual void Do(WorldPacket &packet, WorldEvent &event)
+        {
+            BaseObjectProcessor::Do(packet, event);
+
+            //event.spawnObjects(ptrCellStore);
+        }
+
+    };
+}
+
+#endif //OPENMW_PROCESSOROBJECTSPAWN_HPP

apps/openmw/mwmp/processors/world/ProcessorObjectTrap.hpp

@@ -1,7 +1,6 @@
 #ifndef OPENMW_PROCESSOROBJECTTRAP_HPP
 #define OPENMW_PROCESSOROBJECTTRAP_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

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

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
 
-
 #include "apps/openmw/mwmp/WorldProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorScriptLocalFloat.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
 #define OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

apps/openmw/mwmp/processors/world/ProcessorScriptLocalShort.hpp

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
 
-
 #include "BaseObjectProcessor.hpp"
 
 namespace mwmp

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

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 #define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
 
-
 #include "apps/openmw/mwmp/WorldProcessor.hpp"
 
 namespace mwmp

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

@@ -1,11 +1,6 @@
-//
-// Created by koncord on 18.04.17.
-//
-
 #ifndef OPENMW_PROCESSORVIDEOPLAY_HPP
 #define OPENMW_PROCESSORVIDEOPLAY_HPP
 
-
 #include "apps/openmw/mwmp/WorldProcessor.hpp"
 
 namespace mwmp

components/CMakeLists.txt

@@ -169,24 +169,26 @@ add_component_dir (openmw-mp/Packets
 
 add_component_dir (openmw-mp/Packets/Actor
         ActorPacket
-        PacketActorList PacketActorAuthority PacketActorTest PacketActorAnimPlay PacketActorAttack PacketActorCellChange
+        PacketActorList PacketActorAuthority PacketActorTest PacketActorAI PacketActorAnimFlags PacketActorAnimPlay
-        PacketActorAnimFlags PacketActorEquipment PacketActorPosition PacketActorSpeech PacketActorStatsDynamic
+        PacketActorAttack PacketActorCellChange PacketActorDeath PacketActorEquipment PacketActorPosition PacketActorSpeech
+        PacketActorStatsDynamic
         )
 
 add_component_dir (openmw-mp/Packets/Player
         PlayerPacket
-        PacketHandshake PacketChatMessage PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerAnimFlags PacketPlayerAttack
+        PacketHandshake PacketChatMessage PacketGUIBoxes PacketGameTime PacketGameWeather PacketPlayerBaseInfo PacketPlayerCharGen
-        PacketPlayerAttribute PacketPlayerBounty PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass
+        PacketPlayerActiveSkills PacketPlayerAnimFlags PacketPlayerAnimPlay PacketPlayerAttack PacketPlayerAttribute
-        PacketPlayerDeath PacketPlayerEquipment PacketPlayerFaction PacketPlayerInventory PacketPlayerJournal PacketPlayerLevel
+        PacketPlayerBook PacketPlayerBounty PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass PacketPlayerDeath
-        PacketPlayerPosition PacketPlayerResurrect PacketPlayerSkill PacketPlayerSpellbook PacketPlayerStatsDynamic
+        PacketPlayerEquipment PacketPlayerFaction PacketPlayerInventory PacketPlayerJournal PacketPlayerLevel PacketPlayerMap
-        PacketPlayerTopic PacketPlayerActiveSkills PacketGUIBoxes PacketTime
+        PacketPlayerPosition PacketPlayerRegionAuthority PacketPlayerRegionChange PacketPlayerRest PacketPlayerResurrect
+        PacketPlayerSkill PacketPlayerSpeech PacketPlayerSpellbook PacketPlayerStatsDynamic PacketPlayerTopic
         )
 
 add_component_dir (openmw-mp/Packets/World
         WorldPacket
         PacketContainer PacketObjectAnimPlay PacketObjectDelete PacketDoorState PacketObjectLock PacketObjectMove PacketObjectPlace
-        PacketObjectRotate PacketObjectScale PacketObjectTrap PacketMusicPlay PacketVideoPlay PacketScriptLocalShort
+        PacketObjectRotate PacketObjectScale PacketObjectSpawn PacketObjectTrap PacketMusicPlay PacketVideoPlay
-        PacketScriptLocalFloat PacketScriptMemberShort PacketScriptGlobalShort
+        PacketScriptLocalShort PacketScriptLocalFloat PacketScriptMemberShort PacketScriptGlobalShort
         )
 
 add_component_dir (fallback

components/openmw-mp/Controllers/ActorPacketController.cpp

@@ -5,10 +5,12 @@
 #include "../Packets/Actor/PacketActorList.hpp"
 #include "../Packets/Actor/PacketActorAuthority.hpp"
 #include "../Packets/Actor/PacketActorTest.hpp"
+#include "../Packets/Actor/PacketActorAI.hpp"
 #include "../Packets/Actor/PacketActorAnimFlags.hpp"
 #include "../Packets/Actor/PacketActorAnimPlay.hpp"
 #include "../Packets/Actor/PacketActorAttack.hpp"
 #include "../Packets/Actor/PacketActorCellChange.hpp"
+#include "../Packets/Actor/PacketActorDeath.hpp"
 #include "../Packets/Actor/PacketActorEquipment.hpp"
 #include "../Packets/Actor/PacketActorPosition.hpp"
 #include "../Packets/Actor/PacketActorStatsDynamic.hpp"
@@ -30,10 +32,12 @@ mwmp::ActorPacketController::ActorPacketController(RakNet::RakPeerInterface *pee
     AddPacket<PacketActorList>(&packets, peer);
     AddPacket<PacketActorAuthority>(&packets, peer);
     AddPacket<PacketActorTest>(&packets, peer);
+    AddPacket<PacketActorAI>(&packets, peer);
     AddPacket<PacketActorAnimFlags>(&packets, peer);
     AddPacket<PacketActorAnimPlay>(&packets, peer);
     AddPacket<PacketActorAttack>(&packets, peer);
     AddPacket<PacketActorCellChange>(&packets, peer);
+    AddPacket<PacketActorDeath>(&packets, peer);
     AddPacket<PacketActorEquipment>(&packets, peer);
     AddPacket<PacketActorPosition>(&packets, peer);
     AddPacket<PacketActorSpeech>(&packets, peer);

components/openmw-mp/Controllers/PlayerPacketController.cpp

@@ -7,14 +7,17 @@
 #include "../Packets/Player/PacketPlayerCharGen.hpp"
 #include "../Packets/Player/PacketHandshake.hpp"
 #include "../Packets/Player/PacketGUIBoxes.hpp"
-#include "../Packets/Player/PacketTime.hpp"
 #include "../Packets/Player/PacketLoaded.hpp"
 #include "../Packets/Player/PacketConsole.hpp"
+#include "../Packets/Player/PacketGameTime.hpp"
+#include "../Packets/Player/PacketGameWeather.hpp"
 #include "../Packets/Player/PacketPlayerActiveSkills.hpp"
 #include "../Packets/Player/PacketPlayerBaseInfo.hpp"
 #include "../Packets/Player/PacketPlayerAnimFlags.hpp"
+#include "../Packets/Player/PacketPlayerAnimPlay.hpp"
 #include "../Packets/Player/PacketPlayerAttack.hpp"
 #include "../Packets/Player/PacketPlayerAttribute.hpp"
+#include "../Packets/Player/PacketPlayerBook.hpp"
 #include "../Packets/Player/PacketPlayerBounty.hpp"
 #include "../Packets/Player/PacketPlayerCellChange.hpp"
 #include "../Packets/Player/PacketPlayerCellState.hpp"
@@ -25,9 +28,14 @@
 #include "../Packets/Player/PacketPlayerInventory.hpp"
 #include "../Packets/Player/PacketPlayerJournal.hpp"
 #include "../Packets/Player/PacketPlayerLevel.hpp"
+#include "../Packets/Player/PacketPlayerMap.hpp"
 #include "../Packets/Player/PacketPlayerPosition.hpp"
+#include "../Packets/Player/PacketPlayerRegionAuthority.hpp"
+#include "../Packets/Player/PacketPlayerRegionChange.hpp"
+#include "../Packets/Player/PacketPlayerRest.hpp"
 #include "../Packets/Player/PacketPlayerResurrect.hpp"
 #include "../Packets/Player/PacketPlayerSkill.hpp"
+#include "../Packets/Player/PacketPlayerSpeech.hpp"
 #include "../Packets/Player/PacketPlayerSpellbook.hpp"
 #include "../Packets/Player/PacketPlayerStatsDynamic.hpp"
 #include "../Packets/Player/PacketPlayerTopic.hpp"
@@ -48,16 +56,19 @@ mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketChatMessage>(&packets, peer);
     AddPacket<PacketHandshake>(&packets, peer);
     AddPacket<PacketGUIBoxes>(&packets, peer);
-    AddPacket<PacketTime>(&packets, peer);
     AddPacket<PacketLoaded>(&packets, peer);
     AddPacket<PacketConsole>(&packets, peer);
+    AddPacket<PacketGameTime>(&packets, peer);
+    AddPacket<PacketGameWeather>(&packets, peer);
     AddPacket<PacketPlayerActiveSkills>(&packets, peer);
 
     AddPacket<PacketPlayerBaseInfo>(&packets, peer);
     AddPacket<PacketPlayerCharGen>(&packets, peer);
     AddPacket<PacketPlayerAnimFlags>(&packets, peer);
+    AddPacket<PacketPlayerAnimPlay>(&packets, peer);
     AddPacket<PacketPlayerAttack>(&packets, peer);
     AddPacket<PacketPlayerAttribute>(&packets, peer);
+    AddPacket<PacketPlayerBook>(&packets, peer);
     AddPacket<PacketPlayerBounty>(&packets, peer);
     AddPacket<PacketPlayerCellChange>(&packets, peer);
     AddPacket<PacketPlayerCellState>(&packets, peer);
@@ -68,9 +79,14 @@ mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *p
     AddPacket<PacketPlayerInventory>(&packets, peer);
     AddPacket<PacketPlayerJournal>(&packets, peer);
     AddPacket<PacketPlayerLevel>(&packets, peer);
+    AddPacket<PacketPlayerMap>(&packets, peer);
     AddPacket<PacketPlayerPosition>(&packets, peer);
+    AddPacket<PacketPlayerRegionAuthority>(&packets, peer);
+    AddPacket<PacketPlayerRegionChange>(&packets, peer);
+    AddPacket<PacketPlayerRest>(&packets, peer);
     AddPacket<PacketPlayerResurrect>(&packets, peer);
     AddPacket<PacketPlayerSkill>(&packets, peer);
+    AddPacket<PacketPlayerSpeech>(&packets, peer);
     AddPacket<PacketPlayerSpellbook>(&packets, peer);
     AddPacket<PacketPlayerStatsDynamic>(&packets, peer);
     AddPacket<PacketPlayerTopic>(&packets, peer);

components/openmw-mp/Controllers/WorldPacketController.cpp

@@ -9,6 +9,7 @@
 #include "../Packets/World/PacketObjectPlace.hpp"
 #include "../Packets/World/PacketObjectRotate.hpp"
 #include "../Packets/World/PacketObjectScale.hpp"
+#include "../Packets/World/PacketObjectSpawn.hpp"
 #include "../Packets/World/PacketObjectTrap.hpp"
 
 #include "../Packets/World/PacketContainer.hpp"
@@ -40,6 +41,7 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
     AddPacket<PacketObjectPlace>(&packets, peer);
     AddPacket<PacketObjectRotate>(&packets, peer);
     AddPacket<PacketObjectScale>(&packets, peer);
+    AddPacket<PacketObjectSpawn>(&packets, peer);
     AddPacket<PacketObjectTrap>(&packets, peer);
     
     AddPacket<PacketContainer>(&packets, peer);