diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index d98ba2306..f70b0d219 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -112,15 +112,14 @@ add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags P ) add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGUIMessageBox ProcessorHandshake - ProcessorUserDisconnected ProcessorUserMyID ProcessorCellCreate ProcessorGameSettings ProcessorGameWeather - ProcessorPlayerAnimFlags ProcessorPlayerAnimPlay ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBaseInfo - ProcessorPlayerBehavior ProcessorPlayerBook ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState - ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerDisposition ProcessorPlayerEquipment - ProcessorPlayerFaction ProcessorPlayerInteraction ProcessorPlayerInventory ProcessorPlayerJail ProcessorPlayerJournal - ProcessorPlayerKillCount ProcessorPlayerLevel ProcessorPlayerMiscellaneous ProcessorPlayerMomentum - ProcessorPlayerPosition ProcessorPlayerQuickKeys ProcessorPlayerReputation ProcessorPlayerResurrect - ProcessorPlayerShapeshift ProcessorPlayerSkill ProcessorPlayerSpeech ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic - ProcessorPlayerTopic + ProcessorUserDisconnected ProcessorUserMyID ProcessorGameSettings ProcessorGameWeather ProcessorPlayerAnimFlags + ProcessorPlayerAnimPlay ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBaseInfo ProcessorPlayerBehavior + ProcessorPlayerBook ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass + ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerDisposition ProcessorPlayerEquipment ProcessorPlayerFaction + ProcessorPlayerInteraction ProcessorPlayerInventory ProcessorPlayerJail ProcessorPlayerJournal ProcessorPlayerKillCount + ProcessorPlayerLevel ProcessorPlayerMiscellaneous ProcessorPlayerMomentum ProcessorPlayerPosition ProcessorPlayerQuickKeys + ProcessorPlayerReputation ProcessorPlayerResurrect ProcessorPlayerShapeshift ProcessorPlayerSkill ProcessorPlayerSpeech + ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic ) add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer @@ -131,8 +130,8 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleComma ProcessorScriptMemberShort ProcessorScriptMemberFloat ProcessorScriptGlobalShort ProcessorScriptGlobalFloat ) -add_openmw_dir (mwmp/processors/worldstate ProcessorRecordDynamic ProcessorWorldCollisionOverride ProcessorWorldMap - ProcessorWorldTime +add_openmw_dir (mwmp/processors/worldstate ProcessorCellCreate ProcessorRecordDynamic ProcessorWorldCollisionOverride + ProcessorWorldMap ProcessorWorldTime ) # Main executable diff --git a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp index 6624fed0a..12e30da26 100644 --- a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -5,7 +5,6 @@ #include "player/ProcessorGUIMessageBox.hpp" #include "player/ProcessorHandshake.hpp" #include "player/ProcessorUserDisconnected.hpp" -#include "player/ProcessorCellCreate.hpp" #include "player/ProcessorGameSettings.hpp" #include "player/ProcessorGameWeather.hpp" #include "player/ProcessorPlayerAnimFlags.hpp" @@ -89,6 +88,7 @@ #include "actor/ProcessorActorTest.hpp" #include "WorldstateProcessor.hpp" +#include "worldstate/ProcessorCellCreate.hpp" #include "worldstate/ProcessorRecordDynamic.hpp" #include "worldstate/ProcessorWorldCollisionOverride.hpp" #include "worldstate/ProcessorWorldMap.hpp" @@ -102,7 +102,6 @@ void ProcessorInitializer() PlayerProcessor::AddProcessor(new ProcessorGUIMessageBox()); PlayerProcessor::AddProcessor(new ProcessorHandshake()); PlayerProcessor::AddProcessor(new ProcessorUserDisconnected()); - PlayerProcessor::AddProcessor(new ProcessorCellCreate()); PlayerProcessor::AddProcessor(new ProcessorGameSettings()); PlayerProcessor::AddProcessor(new ProcessorGameWeather()); PlayerProcessor::AddProcessor(new ProcessorPlayerAnimFlags()); @@ -183,6 +182,7 @@ void ProcessorInitializer() ActorProcessor::AddProcessor(new ProcessorActorStatsDynamic()); ActorProcessor::AddProcessor(new ProcessorActorTest()); + WorldstateProcessor::AddProcessor(new ProcessorCellCreate()); WorldstateProcessor::AddProcessor(new ProcessorRecordDynamic()); WorldstateProcessor::AddProcessor(new ProcessorWorldCollisionOverride()); WorldstateProcessor::AddProcessor(new ProcessorWorldMap()); diff --git a/apps/openmw/mwmp/processors/player/ProcessorCellCreate.hpp b/apps/openmw/mwmp/processors/worldstate/ProcessorCellCreate.hpp similarity index 63% rename from apps/openmw/mwmp/processors/player/ProcessorCellCreate.hpp rename to apps/openmw/mwmp/processors/worldstate/ProcessorCellCreate.hpp index af2d09acf..a32ccd8d1 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorCellCreate.hpp +++ b/apps/openmw/mwmp/processors/worldstate/ProcessorCellCreate.hpp @@ -1,11 +1,11 @@ #ifndef OPENMW_PROCESSORCELLCREATE_HPP #define OPENMW_PROCESSORCELLCREATE_HPP -#include "../PlayerProcessor.hpp" +#include "../WorldstateProcessor.hpp" namespace mwmp { - class ProcessorCellCreate : public PlayerProcessor + class ProcessorCellCreate : public WorldstateProcessor { public: ProcessorCellCreate() @@ -13,7 +13,7 @@ namespace mwmp BPP_INIT(ID_CELL_CREATE) } - virtual void Do(PlayerPacket &packet, BasePlayer *player) + virtual void Do(WorldstatePacket &packet, Worldstate &worldstate) { // Placeholder } diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 43e9e74bd..b8327ad3d 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -178,8 +178,6 @@ add_component_dir (openmw-mp/Packets/Player PacketHandshake PacketChatMessage PacketGUIBoxes PacketGameSettings PacketGameWeather - PacketCellCreate - PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerActiveSkills PacketPlayerAnimFlags PacketPlayerAnimPlay PacketPlayerAttack PacketPlayerAttribute PacketPlayerBehavior PacketPlayerBook PacketPlayerBounty PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass PacketPlayerDeath PacketPlayerEquipment @@ -203,7 +201,7 @@ add_component_dir (openmw-mp/Packets/Object add_component_dir (openmw-mp/Packets/Worldstate WorldstatePacket - PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap PacketWorldTime + PacketCellCreate PacketRecordDynamic PacketWorldCollisionOverride PacketWorldMap PacketWorldTime ) add_component_dir (fallback diff --git a/components/openmw-mp/Controllers/PlayerPacketController.cpp b/components/openmw-mp/Controllers/PlayerPacketController.cpp index a9315b700..c104cc8de 100644 --- a/components/openmw-mp/Controllers/PlayerPacketController.cpp +++ b/components/openmw-mp/Controllers/PlayerPacketController.cpp @@ -4,7 +4,6 @@ #include "../Packets/Player/PacketHandshake.hpp" #include "../Packets/Player/PacketGUIBoxes.hpp" #include "../Packets/Player/PacketLoaded.hpp" -#include "../Packets/Player/PacketCellCreate.hpp" #include "../Packets/Player/PacketGameSettings.hpp" #include "../Packets/Player/PacketGameWeather.hpp" #include "../Packets/Player/PacketPlayerActiveSkills.hpp" @@ -60,7 +59,6 @@ mwmp::PlayerPacketController::PlayerPacketController(RakNet::RakPeerInterface *p AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); - AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); diff --git a/components/openmw-mp/Controllers/WorldstatePacketController.cpp b/components/openmw-mp/Controllers/WorldstatePacketController.cpp index 7e54ceade..0fe636a6b 100644 --- a/components/openmw-mp/Controllers/WorldstatePacketController.cpp +++ b/components/openmw-mp/Controllers/WorldstatePacketController.cpp @@ -1,3 +1,4 @@ +#include "../Packets/Worldstate/PacketCellCreate.hpp" #include "../Packets/Worldstate/PacketRecordDynamic.hpp" #include "../Packets/Worldstate/PacketWorldCollisionOverride.hpp" #include "../Packets/Worldstate/PacketWorldMap.hpp" @@ -15,6 +16,7 @@ inline void AddPacket(mwmp::WorldstatePacketController::packets_t *packets, RakN mwmp::WorldstatePacketController::WorldstatePacketController(RakNet::RakPeerInterface *peer) { + AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); diff --git a/components/openmw-mp/Packets/Player/PacketCellCreate.cpp b/components/openmw-mp/Packets/Worldstate/PacketCellCreate.cpp similarity index 82% rename from components/openmw-mp/Packets/Player/PacketCellCreate.cpp rename to components/openmw-mp/Packets/Worldstate/PacketCellCreate.cpp index 8090c6491..7211a242f 100644 --- a/components/openmw-mp/Packets/Player/PacketCellCreate.cpp +++ b/components/openmw-mp/Packets/Worldstate/PacketCellCreate.cpp @@ -3,7 +3,7 @@ using namespace mwmp; -PacketCellCreate::PacketCellCreate(RakNet::RakPeerInterface *peer) : PlayerPacket(peer) +PacketCellCreate::PacketCellCreate(RakNet::RakPeerInterface *peer) : WorldstatePacket(peer) { packetID = ID_CELL_CREATE; orderChannel = CHANNEL_SYSTEM; @@ -11,7 +11,7 @@ PacketCellCreate::PacketCellCreate(RakNet::RakPeerInterface *peer) : PlayerPacke void PacketCellCreate::Packet(RakNet::BitStream *bs, bool send) { - PlayerPacket::Packet(bs, send); + WorldstatePacket::Packet(bs, send); // Placeholder } diff --git a/components/openmw-mp/Packets/Player/PacketCellCreate.hpp b/components/openmw-mp/Packets/Worldstate/PacketCellCreate.hpp similarity index 72% rename from components/openmw-mp/Packets/Player/PacketCellCreate.hpp rename to components/openmw-mp/Packets/Worldstate/PacketCellCreate.hpp index 64bfde32a..ebd5f7bfd 100644 --- a/components/openmw-mp/Packets/Player/PacketCellCreate.hpp +++ b/components/openmw-mp/Packets/Worldstate/PacketCellCreate.hpp @@ -1,12 +1,12 @@ #ifndef OPENMW_PACKETCELLCREATE_HPP #define OPENMW_PACKETCELLCREATE_HPP -#include +#include #include namespace mwmp { - class PacketCellCreate: public PlayerPacket + class PacketCellCreate: public WorldstatePacket { public: PacketCellCreate(RakNet::RakPeerInterface *peer);