From 587b53bfed9d4604227b89b1ea80777b7c334da2 Mon Sep 17 00:00:00 2001 From: Koncord Date: Wed, 7 Jun 2017 00:06:10 +0800 Subject: [PATCH] [Client] Reorder files --- apps/openmw/CMakeLists.txt | 9 +- apps/openmw/mwmp/{ => GUI}/GUIChat.cpp | 14 +- apps/openmw/mwmp/{ => GUI}/GUIChat.hpp | 2 +- apps/openmw/mwmp/{ => GUI}/GUIDialogList.cpp | 10 +- apps/openmw/mwmp/{ => GUI}/GUIDialogList.hpp | 2 +- apps/openmw/mwmp/{ => GUI}/GUILogin.cpp | 0 apps/openmw/mwmp/{ => GUI}/GUILogin.hpp | 2 +- .../mwmp/{ => GUI}/PlayerMarkerCollection.cpp | 0 .../mwmp/{ => GUI}/PlayerMarkerCollection.hpp | 0 .../openmw/mwmp/{ => GUI}/TextInputDialog.cpp | 4 +- .../openmw/mwmp/{ => GUI}/TextInputDialog.hpp | 2 +- apps/openmw/mwmp/GUIController.cpp | 6 +- apps/openmw/mwmp/GUIController.hpp | 6 +- apps/openmw/mwmp/Networking.cpp | 8 +- .../mwmp/{ => processors}/ActorProcessor.cpp | 4 +- .../mwmp/{ => processors}/ActorProcessor.hpp | 4 +- .../BaseClientPacketProcessor.cpp | 2 +- .../BaseClientPacketProcessor.hpp | 4 +- .../mwmp/{ => processors}/PlayerProcessor.cpp | 4 +- .../mwmp/{ => processors}/PlayerProcessor.hpp | 6 +- .../{ => processors}/ProcessorInitializer.cpp | 130 +++++++++--------- .../{ => processors}/ProcessorInitializer.hpp | 0 .../mwmp/{ => processors}/WorldProcessor.cpp | 4 +- .../mwmp/{ => processors}/WorldProcessor.hpp | 6 +- .../processors/actor/ProcessorActorAI.hpp | 2 +- .../actor/ProcessorActorAnimFlags.hpp | 2 +- .../actor/ProcessorActorAnimPlay.hpp | 2 +- .../processors/actor/ProcessorActorAttack.hpp | 2 +- .../actor/ProcessorActorAuthority.hpp | 2 +- .../actor/ProcessorActorCellChange.hpp | 2 +- .../processors/actor/ProcessorActorDeath.hpp | 2 +- .../actor/ProcessorActorEquipment.hpp | 2 +- .../processors/actor/ProcessorActorList.hpp | 2 +- .../actor/ProcessorActorPosition.hpp | 2 +- .../processors/actor/ProcessorActorSpeech.hpp | 2 +- .../actor/ProcessorActorStatsDynamic.hpp | 2 +- .../processors/actor/ProcessorActorTest.hpp | 2 +- .../player/ProcessorChatMessage.hpp | 2 +- .../player/ProcessorGUIMessageBox.hpp | 2 +- .../player/ProcessorGameConsole.hpp | 2 +- .../processors/player/ProcessorGameTime.hpp | 2 +- .../player/ProcessorGameWeather.hpp | 2 +- .../processors/player/ProcessorHandshake.hpp | 2 +- .../player/ProcessorPlayerAnimFlags.hpp | 2 +- .../player/ProcessorPlayerAnimPlay.hpp | 2 +- .../player/ProcessorPlayerAttack.hpp | 2 +- .../player/ProcessorPlayerAttribute.hpp | 2 +- .../player/ProcessorPlayerBaseInfo.hpp | 2 +- .../processors/player/ProcessorPlayerBook.hpp | 2 +- .../player/ProcessorPlayerBounty.hpp | 2 +- .../player/ProcessorPlayerCellChange.hpp | 2 +- .../player/ProcessorPlayerCellState.hpp | 2 +- .../player/ProcessorPlayerCharClass.hpp | 2 +- .../player/ProcessorPlayerCharGen.hpp | 2 +- .../player/ProcessorPlayerDeath.hpp | 2 +- .../player/ProcessorPlayerDisposition.hpp | 2 +- .../player/ProcessorPlayerEquipment.hpp | 2 +- .../player/ProcessorPlayerFaction.hpp | 2 +- .../player/ProcessorPlayerInventory.hpp | 2 +- .../player/ProcessorPlayerJournal.hpp | 2 +- .../player/ProcessorPlayerLevel.hpp | 2 +- .../processors/player/ProcessorPlayerMap.hpp | 2 +- .../player/ProcessorPlayerPosition.hpp | 2 +- .../player/ProcessorPlayerRegionAuthority.hpp | 2 +- .../processors/player/ProcessorPlayerRest.hpp | 2 +- .../player/ProcessorPlayerResurrect.hpp | 2 +- .../player/ProcessorPlayerSkill.hpp | 2 +- .../player/ProcessorPlayerSpeech.hpp | 2 +- .../player/ProcessorPlayerSpellbook.hpp | 2 +- .../player/ProcessorPlayerStatsDynamic.hpp | 2 +- .../player/ProcessorPlayerTopic.hpp | 2 +- .../player/ProcessorUserDisconnected.hpp | 2 +- .../processors/world/BaseObjectProcessor.hpp | 2 +- .../processors/world/ProcessorMusicPlay.hpp | 2 +- .../world/ProcessorScriptGlobalShort.hpp | 2 +- .../world/ProcessorScriptMemberShort.hpp | 2 +- .../processors/world/ProcessorVideoPlay.hpp | 2 +- 77 files changed, 170 insertions(+), 165 deletions(-) rename apps/openmw/mwmp/{ => GUI}/GUIChat.cpp (96%) rename apps/openmw/mwmp/{ => GUI}/GUIChat.hpp (97%) rename apps/openmw/mwmp/{ => GUI}/GUIDialogList.cpp (89%) rename apps/openmw/mwmp/{ => GUI}/GUIDialogList.hpp (92%) rename apps/openmw/mwmp/{ => GUI}/GUILogin.cpp (100%) rename apps/openmw/mwmp/{ => GUI}/GUILogin.hpp (88%) rename apps/openmw/mwmp/{ => GUI}/PlayerMarkerCollection.cpp (100%) rename apps/openmw/mwmp/{ => GUI}/PlayerMarkerCollection.hpp (100%) rename apps/openmw/mwmp/{ => GUI}/TextInputDialog.cpp (96%) rename apps/openmw/mwmp/{ => GUI}/TextInputDialog.hpp (91%) rename apps/openmw/mwmp/{ => processors}/ActorProcessor.cpp (97%) rename apps/openmw/mwmp/{ => processors}/ActorProcessor.hpp (93%) rename apps/openmw/mwmp/{ => processors}/BaseClientPacketProcessor.cpp (94%) rename apps/openmw/mwmp/{ => processors}/BaseClientPacketProcessor.hpp (92%) rename apps/openmw/mwmp/{ => processors}/PlayerProcessor.cpp (97%) rename apps/openmw/mwmp/{ => processors}/PlayerProcessor.hpp (91%) rename apps/openmw/mwmp/{ => processors}/ProcessorInitializer.cpp (54%) rename apps/openmw/mwmp/{ => processors}/ProcessorInitializer.hpp (100%) rename apps/openmw/mwmp/{ => processors}/WorldProcessor.cpp (97%) rename apps/openmw/mwmp/{ => processors}/WorldProcessor.hpp (90%) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index e26ffd37b..a31e0f66a 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -97,8 +97,13 @@ add_openmw_dir (mwbase ) add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer PlayerList LocalActor DedicatedActor ActorList WorldEvent - Cell CellController MechanicsHelper GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList TextInputDialog - BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer + Cell CellController MechanicsHelper GUIController + ) + +add_openmw_dir (mwmp/GUI GUIChat GUILogin PlayerMarkerCollection GUIDialogList TextInputDialog + ) + +add_openmw_dir(mwmp/processors BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer ) add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack diff --git a/apps/openmw/mwmp/GUIChat.cpp b/apps/openmw/mwmp/GUI/GUIChat.cpp similarity index 96% rename from apps/openmw/mwmp/GUIChat.cpp rename to apps/openmw/mwmp/GUI/GUIChat.cpp index aabdd011e..31af443d4 100644 --- a/apps/openmw/mwmp/GUIChat.cpp +++ b/apps/openmw/mwmp/GUI/GUIChat.cpp @@ -5,17 +5,17 @@ #include "GUIChat.hpp" #include -#include "../mwbase/environment.hpp" -#include "../mwgui/windowmanagerimp.hpp" -#include "../mwinput/inputmanagerimp.hpp" +#include "apps/openmw/mwbase/environment.hpp" +#include "apps/openmw/mwgui/windowmanagerimp.hpp" +#include "apps/openmw/mwinput/inputmanagerimp.hpp" #include #include -#include "Networking.hpp" -#include "Main.hpp" -#include "LocalPlayer.hpp" +#include "../Networking.hpp" +#include "../Main.hpp" +#include "../LocalPlayer.hpp" -#include "GUIController.hpp" +#include "../GUIController.hpp" namespace mwmp diff --git a/apps/openmw/mwmp/GUIChat.hpp b/apps/openmw/mwmp/GUI/GUIChat.hpp similarity index 97% rename from apps/openmw/mwmp/GUIChat.hpp rename to apps/openmw/mwmp/GUI/GUIChat.hpp index d9a58a9ee..ca75ec21d 100644 --- a/apps/openmw/mwmp/GUIChat.hpp +++ b/apps/openmw/mwmp/GUI/GUIChat.hpp @@ -9,7 +9,7 @@ #include #include -#include "../mwgui/windowbase.hpp" +#include "apps/openmw/mwgui/windowbase.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/GUIDialogList.cpp b/apps/openmw/mwmp/GUI/GUIDialogList.cpp similarity index 89% rename from apps/openmw/mwmp/GUIDialogList.cpp rename to apps/openmw/mwmp/GUI/GUIDialogList.cpp index 4a6f1827d..96a4990fa 100644 --- a/apps/openmw/mwmp/GUIDialogList.cpp +++ b/apps/openmw/mwmp/GUI/GUIDialogList.cpp @@ -4,17 +4,17 @@ #include -#include "../mwbase/environment.hpp" -#include "../mwgui/windowmanagerimp.hpp" +#include "apps/openmw/mwbase/environment.hpp" +#include "apps/openmw/mwgui/windowmanagerimp.hpp" #include #include #include #include "GUIDialogList.hpp" -#include "Main.hpp" -#include "Networking.hpp" -#include "LocalPlayer.hpp" +#include "../Main.hpp" +#include "../Networking.hpp" +#include "../LocalPlayer.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/GUIDialogList.hpp b/apps/openmw/mwmp/GUI/GUIDialogList.hpp similarity index 92% rename from apps/openmw/mwmp/GUIDialogList.hpp rename to apps/openmw/mwmp/GUI/GUIDialogList.hpp index f144bebd8..8c6e7011a 100644 --- a/apps/openmw/mwmp/GUIDialogList.hpp +++ b/apps/openmw/mwmp/GUI/GUIDialogList.hpp @@ -6,7 +6,7 @@ #define OPENMW_GUIDIALOGLIST_HPP -#include "../mwgui/windowbase.hpp" +#include "apps/openmw/mwgui/windowbase.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/GUILogin.cpp b/apps/openmw/mwmp/GUI/GUILogin.cpp similarity index 100% rename from apps/openmw/mwmp/GUILogin.cpp rename to apps/openmw/mwmp/GUI/GUILogin.cpp diff --git a/apps/openmw/mwmp/GUILogin.hpp b/apps/openmw/mwmp/GUI/GUILogin.hpp similarity index 88% rename from apps/openmw/mwmp/GUILogin.hpp rename to apps/openmw/mwmp/GUI/GUILogin.hpp index cfb129649..7a0e6c66b 100644 --- a/apps/openmw/mwmp/GUILogin.hpp +++ b/apps/openmw/mwmp/GUI/GUILogin.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_GUILOGIN_HPP #define OPENMW_GUILOGIN_HPP -#include "../mwgui/windowbase.hpp" +#include "apps/openmw/mwgui/windowbase.hpp" class GUILogin : public MWGui::WindowModal { diff --git a/apps/openmw/mwmp/PlayerMarkerCollection.cpp b/apps/openmw/mwmp/GUI/PlayerMarkerCollection.cpp similarity index 100% rename from apps/openmw/mwmp/PlayerMarkerCollection.cpp rename to apps/openmw/mwmp/GUI/PlayerMarkerCollection.cpp diff --git a/apps/openmw/mwmp/PlayerMarkerCollection.hpp b/apps/openmw/mwmp/GUI/PlayerMarkerCollection.hpp similarity index 100% rename from apps/openmw/mwmp/PlayerMarkerCollection.hpp rename to apps/openmw/mwmp/GUI/PlayerMarkerCollection.hpp diff --git a/apps/openmw/mwmp/TextInputDialog.cpp b/apps/openmw/mwmp/GUI/TextInputDialog.cpp similarity index 96% rename from apps/openmw/mwmp/TextInputDialog.cpp rename to apps/openmw/mwmp/GUI/TextInputDialog.cpp index b07f654b7..d6159c4b2 100644 --- a/apps/openmw/mwmp/TextInputDialog.cpp +++ b/apps/openmw/mwmp/GUI/TextInputDialog.cpp @@ -4,8 +4,8 @@ #include "TextInputDialog.hpp" -#include "../mwbase/windowmanager.hpp" -#include "../mwbase/environment.hpp" +#include "apps/openmw/mwbase/windowmanager.hpp" +#include "apps/openmw/mwbase/environment.hpp" #include #include diff --git a/apps/openmw/mwmp/TextInputDialog.hpp b/apps/openmw/mwmp/GUI/TextInputDialog.hpp similarity index 91% rename from apps/openmw/mwmp/TextInputDialog.hpp rename to apps/openmw/mwmp/GUI/TextInputDialog.hpp index 6b57f9966..48b557361 100644 --- a/apps/openmw/mwmp/TextInputDialog.hpp +++ b/apps/openmw/mwmp/GUI/TextInputDialog.hpp @@ -6,7 +6,7 @@ #ifndef OPENMW_TEXTINPUTDIALOG_HPP #define OPENMW_TEXTINPUTDIALOG_HPP -#include "../mwgui/windowbase.hpp" +#include "apps/openmw/mwgui/windowbase.hpp" namespace MWGui { diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp index 7cfcc0eaa..ff451cc1a 100644 --- a/apps/openmw/mwmp/GUIController.cpp +++ b/apps/openmw/mwmp/GUIController.cpp @@ -30,9 +30,9 @@ #include "GUIController.hpp" #include "Main.hpp" #include "Networking.hpp" -#include "PlayerMarkerCollection.hpp" -#include "GUIDialogList.hpp" -#include "GUIChat.hpp" +#include "GUI/PlayerMarkerCollection.hpp" +#include "GUI/GUIDialogList.hpp" +#include "GUI/GUIChat.hpp" #include "LocalPlayer.hpp" #include "DedicatedPlayer.hpp" #include "PlayerList.hpp" diff --git a/apps/openmw/mwmp/GUIController.hpp b/apps/openmw/mwmp/GUIController.hpp index 93eefadda..9cbf51ff6 100644 --- a/apps/openmw/mwmp/GUIController.hpp +++ b/apps/openmw/mwmp/GUIController.hpp @@ -7,11 +7,11 @@ #include -#include "../mwgui/mode.hpp" +#include "apps/openmw/mwgui/mode.hpp" #include -#include "PlayerMarkerCollection.hpp" -#include "TextInputDialog.hpp" +#include "GUI/PlayerMarkerCollection.hpp" +#include "GUI/TextInputDialog.hpp" namespace MWGui { diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 29e31a05b..a494ff885 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -35,10 +35,10 @@ #include "Networking.hpp" #include "Main.hpp" -#include "ProcessorInitializer.hpp" -#include "PlayerProcessor.hpp" -#include "WorldProcessor.hpp" -#include "ActorProcessor.hpp" +#include "processors/ProcessorInitializer.hpp" +#include "processors/PlayerProcessor.hpp" +#include "processors/WorldProcessor.hpp" +#include "processors/ActorProcessor.hpp" #include "GUIController.hpp" #include "CellController.hpp" diff --git a/apps/openmw/mwmp/ActorProcessor.cpp b/apps/openmw/mwmp/processors/ActorProcessor.cpp similarity index 97% rename from apps/openmw/mwmp/ActorProcessor.cpp rename to apps/openmw/mwmp/processors/ActorProcessor.cpp index fc99c47c7..84f0b875d 100644 --- a/apps/openmw/mwmp/ActorProcessor.cpp +++ b/apps/openmw/mwmp/processors/ActorProcessor.cpp @@ -4,8 +4,8 @@ #include #include "ActorProcessor.hpp" -#include "Networking.hpp" -#include "Main.hpp" +#include "../Networking.hpp" +#include "../Main.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/ActorProcessor.hpp b/apps/openmw/mwmp/processors/ActorProcessor.hpp similarity index 93% rename from apps/openmw/mwmp/ActorProcessor.hpp rename to apps/openmw/mwmp/processors/ActorProcessor.hpp index 920bbb1e8..c88c400d2 100644 --- a/apps/openmw/mwmp/ActorProcessor.hpp +++ b/apps/openmw/mwmp/processors/ActorProcessor.hpp @@ -11,8 +11,8 @@ #include #include #include -#include "WorldEvent.hpp" -#include "ActorList.hpp" +#include "../WorldEvent.hpp" +#include "../ActorList.hpp" #include "BaseClientPacketProcessor.hpp" namespace mwmp diff --git a/apps/openmw/mwmp/BaseClientPacketProcessor.cpp b/apps/openmw/mwmp/processors/BaseClientPacketProcessor.cpp similarity index 94% rename from apps/openmw/mwmp/BaseClientPacketProcessor.cpp rename to apps/openmw/mwmp/processors/BaseClientPacketProcessor.cpp index a16ba9d24..b7d3192c6 100644 --- a/apps/openmw/mwmp/BaseClientPacketProcessor.cpp +++ b/apps/openmw/mwmp/processors/BaseClientPacketProcessor.cpp @@ -3,7 +3,7 @@ // #include "BaseClientPacketProcessor.hpp" -#include "Main.hpp" +#include "../Main.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/BaseClientPacketProcessor.hpp b/apps/openmw/mwmp/processors/BaseClientPacketProcessor.hpp similarity index 92% rename from apps/openmw/mwmp/BaseClientPacketProcessor.hpp rename to apps/openmw/mwmp/processors/BaseClientPacketProcessor.hpp index 5cd8553d2..5e39e4381 100644 --- a/apps/openmw/mwmp/BaseClientPacketProcessor.hpp +++ b/apps/openmw/mwmp/processors/BaseClientPacketProcessor.hpp @@ -6,8 +6,8 @@ #define OPENMW_BASECLIENTPACKETPROCESSOR_HPP #include -#include "LocalPlayer.hpp" -#include "DedicatedPlayer.hpp" +#include "../LocalPlayer.hpp" +#include "../DedicatedPlayer.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/PlayerProcessor.cpp b/apps/openmw/mwmp/processors/PlayerProcessor.cpp similarity index 97% rename from apps/openmw/mwmp/PlayerProcessor.cpp rename to apps/openmw/mwmp/processors/PlayerProcessor.cpp index 068362ae7..c8a7768f5 100644 --- a/apps/openmw/mwmp/PlayerProcessor.cpp +++ b/apps/openmw/mwmp/processors/PlayerProcessor.cpp @@ -3,9 +3,9 @@ // #include -#include "Networking.hpp" +#include "../Networking.hpp" #include "PlayerProcessor.hpp" -#include "Main.hpp" +#include "../Main.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/PlayerProcessor.hpp b/apps/openmw/mwmp/processors/PlayerProcessor.hpp similarity index 91% rename from apps/openmw/mwmp/PlayerProcessor.hpp rename to apps/openmw/mwmp/processors/PlayerProcessor.hpp index f3958ec1d..8d674bba2 100644 --- a/apps/openmw/mwmp/PlayerProcessor.hpp +++ b/apps/openmw/mwmp/processors/PlayerProcessor.hpp @@ -11,9 +11,9 @@ #include #include #include -#include "LocalPlayer.hpp" -#include "DedicatedPlayer.hpp" -#include "PlayerList.hpp" +#include "../LocalPlayer.hpp" +#include "../DedicatedPlayer.hpp" +#include "../PlayerList.hpp" #include "BaseClientPacketProcessor.hpp" namespace mwmp diff --git a/apps/openmw/mwmp/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp similarity index 54% rename from apps/openmw/mwmp/ProcessorInitializer.cpp rename to apps/openmw/mwmp/processors/ProcessorInitializer.cpp index 8c43c2ac0..076a643f9 100644 --- a/apps/openmw/mwmp/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -6,74 +6,74 @@ #include "PlayerProcessor.hpp" -#include "processors/player/ProcessorChatMessage.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" +#include "player/ProcessorChatMessage.hpp" +#include "player/ProcessorGUIMessageBox.hpp" +#include "player/ProcessorHandshake.hpp" +#include "player/ProcessorUserDisconnected.hpp" +#include "player/ProcessorGameConsole.hpp" +#include "player/ProcessorGameTime.hpp" +#include "player/ProcessorGameWeather.hpp" +#include "player/ProcessorPlayerBaseInfo.hpp" +#include "player/ProcessorPlayerCharGen.hpp" +#include "player/ProcessorPlayerAnimFlags.hpp" +#include "player/ProcessorPlayerAnimPlay.hpp" +#include "player/ProcessorPlayerAttack.hpp" +#include "player/ProcessorPlayerAttribute.hpp" +#include "player/ProcessorPlayerBook.hpp" +#include "player/ProcessorPlayerBounty.hpp" +#include "player/ProcessorPlayerCellChange.hpp" +#include "player/ProcessorPlayerCellState.hpp" +#include "player/ProcessorPlayerCharClass.hpp" +#include "player/ProcessorPlayerDeath.hpp" +#include "player/ProcessorPlayerDisposition.hpp" +#include "player/ProcessorPlayerEquipment.hpp" +#include "player/ProcessorPlayerFaction.hpp" +#include "player/ProcessorPlayerInventory.hpp" +#include "player/ProcessorPlayerJournal.hpp" +#include "player/ProcessorPlayerLevel.hpp" +#include "player/ProcessorPlayerMap.hpp" +#include "player/ProcessorPlayerPosition.hpp" +#include "player/ProcessorPlayerRegionAuthority.hpp" +#include "player/ProcessorPlayerRest.hpp" +#include "player/ProcessorPlayerResurrect.hpp" +#include "player/ProcessorPlayerSkill.hpp" +#include "player/ProcessorPlayerSpeech.hpp" +#include "player/ProcessorPlayerSpellbook.hpp" +#include "player/ProcessorPlayerStatsDynamic.hpp" +#include "player/ProcessorPlayerTopic.hpp" #include "WorldProcessor.hpp" -#include "processors/world/ProcessorContainer.hpp" -#include "processors/world/ProcessorDoorState.hpp" -#include "processors/world/ProcessorMusicPlay.hpp" -#include "processors/world/ProcessorObjectAnimPlay.hpp" -#include "processors/world/ProcessorObjectDelete.hpp" -#include "processors/world/ProcessorObjectLock.hpp" -#include "processors/world/ProcessorObjectMove.hpp" -#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" -#include "processors/world/ProcessorScriptMemberShort.hpp" -#include "processors/world/ProcessorScriptGlobalShort.hpp" -#include "processors/world/ProcessorVideoPlay.hpp" +#include "world/ProcessorContainer.hpp" +#include "world/ProcessorDoorState.hpp" +#include "world/ProcessorMusicPlay.hpp" +#include "world/ProcessorObjectAnimPlay.hpp" +#include "world/ProcessorObjectDelete.hpp" +#include "world/ProcessorObjectLock.hpp" +#include "world/ProcessorObjectMove.hpp" +#include "world/ProcessorObjectPlace.hpp" +#include "world/ProcessorObjectRotate.hpp" +#include "world/ProcessorObjectScale.hpp" +#include "world/ProcessorObjectSpawn.hpp" +#include "world/ProcessorObjectTrap.hpp" +#include "world/ProcessorScriptLocalShort.hpp" +#include "world/ProcessorScriptLocalFloat.hpp" +#include "world/ProcessorScriptMemberShort.hpp" +#include "world/ProcessorScriptGlobalShort.hpp" +#include "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" -#include "processors/actor/ProcessorActorSpeech.hpp" -#include "processors/actor/ProcessorActorStatsDynamic.hpp" -#include "processors/actor/ProcessorActorTest.hpp" +#include "actor/ProcessorActorAI.hpp" +#include "actor/ProcessorActorAnimFlags.hpp" +#include "actor/ProcessorActorAnimPlay.hpp" +#include "actor/ProcessorActorAttack.hpp" +#include "actor/ProcessorActorAuthority.hpp" +#include "actor/ProcessorActorCellChange.hpp" +#include "actor/ProcessorActorDeath.hpp" +#include "actor/ProcessorActorEquipment.hpp" +#include "actor/ProcessorActorList.hpp" +#include "actor/ProcessorActorPosition.hpp" +#include "actor/ProcessorActorSpeech.hpp" +#include "actor/ProcessorActorStatsDynamic.hpp" +#include "actor/ProcessorActorTest.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/ProcessorInitializer.hpp b/apps/openmw/mwmp/processors/ProcessorInitializer.hpp similarity index 100% rename from apps/openmw/mwmp/ProcessorInitializer.hpp rename to apps/openmw/mwmp/processors/ProcessorInitializer.hpp diff --git a/apps/openmw/mwmp/WorldProcessor.cpp b/apps/openmw/mwmp/processors/WorldProcessor.cpp similarity index 97% rename from apps/openmw/mwmp/WorldProcessor.cpp rename to apps/openmw/mwmp/processors/WorldProcessor.cpp index d4e7eb588..7c61c5d3e 100644 --- a/apps/openmw/mwmp/WorldProcessor.cpp +++ b/apps/openmw/mwmp/processors/WorldProcessor.cpp @@ -4,8 +4,8 @@ #include #include "WorldProcessor.hpp" -#include "Main.hpp" -#include "Networking.hpp" +#include "../Main.hpp" +#include "../Networking.hpp" using namespace mwmp; diff --git a/apps/openmw/mwmp/WorldProcessor.hpp b/apps/openmw/mwmp/processors/WorldProcessor.hpp similarity index 90% rename from apps/openmw/mwmp/WorldProcessor.hpp rename to apps/openmw/mwmp/processors/WorldProcessor.hpp index 2acf351c9..3710e8be4 100644 --- a/apps/openmw/mwmp/WorldProcessor.hpp +++ b/apps/openmw/mwmp/processors/WorldProcessor.hpp @@ -11,9 +11,9 @@ #include #include #include -#include "WorldEvent.hpp" -#include "LocalPlayer.hpp" -#include "DedicatedPlayer.hpp" +#include "../WorldEvent.hpp" +#include "../LocalPlayer.hpp" +#include "../DedicatedPlayer.hpp" #include "BaseClientPacketProcessor.hpp" namespace mwmp diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp index 033c6d69c..43cef9001 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORAI_HPP #define OPENMW_PROCESSORACTORAI_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorAnimFlags.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorAnimFlags.hpp index 440ec540e..259b68d38 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorAnimFlags.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorAnimFlags.hpp @@ -2,7 +2,7 @@ #define OPENMW_PROCESSORACTORANIMFLAGS_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorAnimPlay.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorAnimPlay.hpp index b5325e796..3a72077a8 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorAnimPlay.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorAnimPlay.hpp @@ -2,7 +2,7 @@ #define OPENMW_PROCESSORACTORANIMPLAY_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorAttack.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorAttack.hpp index 4c465b2d7..acc07a1ba 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorAttack.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorAttack.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORATTACK_HPP #define OPENMW_PROCESSORACTORATTACK_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorAuthority.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorAuthority.hpp index 7d043bd59..4bb0f32dd 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorAuthority.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorAuthority.hpp @@ -2,7 +2,7 @@ #define OPENMW_PROCESSORACTORAUTHORITY_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorCellChange.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorCellChange.hpp index 6636a32f8..fd46e4612 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorCellChange.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorCellChange.hpp @@ -2,7 +2,7 @@ #define OPENMW_PROCESSORACTORCELLCHANGE_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorDeath.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorDeath.hpp index 5ef8bd51d..59cdef367 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorDeath.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorDeath.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORDEATH_HPP #define OPENMW_PROCESSORACTORDEATH_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorEquipment.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorEquipment.hpp index 01dbfd437..3a1397a94 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorEquipment.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorEquipment.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTOREQUIPMENT_HPP #define OPENMW_PROCESSORACTOREQUIPMENT_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp index 9de8a01b2..3650cf080 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORLIST_HPP #define OPENMW_PROCESSORACTORLIST_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" #include "apps/openmw/mwmp/MechanicsHelper.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorPosition.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorPosition.hpp index 362a9e278..4267188ee 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorPosition.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorPosition.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORPOSITION_HPP #define OPENMW_PROCESSORACTORPOSITION_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorSpeech.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorSpeech.hpp index 9ab03a876..95d6741b9 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorSpeech.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorSpeech.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORSPEECH_HPP #define OPENMW_PROCESSORACTORSPEECH_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorStatsDynamic.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorStatsDynamic.hpp index 040283ce7..06c8b7f79 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorStatsDynamic.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorStatsDynamic.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP #define OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorTest.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorTest.hpp index f3b6a62c2..892983627 100644 --- a/apps/openmw/mwmp/processors/actor/ProcessorActorTest.hpp +++ b/apps/openmw/mwmp/processors/actor/ProcessorActorTest.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORTEST_HPP #define OPENMW_PROCESSORACTORTEST_HPP -#include "apps/openmw/mwmp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" diff --git a/apps/openmw/mwmp/processors/player/ProcessorChatMessage.hpp b/apps/openmw/mwmp/processors/player/ProcessorChatMessage.hpp index cdc2c92d8..ee512cf76 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorChatMessage.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorChatMessage.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORCHATMESSAGE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/GUIController.hpp" diff --git a/apps/openmw/mwmp/processors/player/ProcessorGUIMessageBox.hpp b/apps/openmw/mwmp/processors/player/ProcessorGUIMessageBox.hpp index 671f1e30e..ed73d100f 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorGUIMessageBox.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorGUIMessageBox.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORGUIMESSAGEBOX_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorGameConsole.hpp b/apps/openmw/mwmp/processors/player/ProcessorGameConsole.hpp index 92b648e73..381f7a162 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorGameConsole.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorGameConsole.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORGAMECONSOLE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp b/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp index 0ffbd9b64..1ee0b7694 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp @@ -8,7 +8,7 @@ #include #include -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorGameWeather.hpp b/apps/openmw/mwmp/processors/player/ProcessorGameWeather.hpp index f1e56ba5c..64bced047 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorGameWeather.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorGameWeather.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORGAMEWEATHER_HPP #define OPENMW_PROCESSORGAMEWEATHER_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorHandshake.hpp b/apps/openmw/mwmp/processors/player/ProcessorHandshake.hpp index 8390fedcd..78652b225 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorHandshake.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorHandshake.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORHANDSHAKE_HPP #define OPENMW_PROCESSORHANDSHAKE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimFlags.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimFlags.hpp index 246af1cea..1c4415644 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimFlags.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimFlags.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERANIMFLAGS_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimPlay.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimPlay.hpp index 318909f78..e8b360e5a 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimPlay.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerAnimPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERANIMPLAY_HPP #define OPENMW_PROCESSORPLAYERANIMPLAY_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerAttack.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerAttack.hpp index d9ded9f56..a4001cca1 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerAttack.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerAttack.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERATTACK_HPP #include "apps/openmw/mwmp/Main.hpp" -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw/mwmp/MechanicsHelper.hpp" #include "apps/openmw/mwbase/world.hpp" #include "apps/openmw/mwworld/containerstore.hpp" diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerAttribute.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerAttribute.hpp index a2d270b90..c49c065a7 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerAttribute.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerAttribute.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERATTRIBUTE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw/mwmechanics/npcstats.hpp" #include "apps/openmw/mwclass/npc.hpp" diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerBaseInfo.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerBaseInfo.hpp index e56e90720..a8e805f5b 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerBaseInfo.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerBaseInfo.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERBASEINFO_HPP #define OPENMW_PROCESSORPLAYERBASEINFO_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerBook.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerBook.hpp index e609ddbf1..a3e2f25c1 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerBook.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerBook.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERBOOK_HPP #define OPENMW_PROCESSORPLAYERBOOK_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerBounty.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerBounty.hpp index c36426009..b3196325e 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerBounty.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerBounty.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERBOUNTY_HPP #define OPENMW_PROCESSORPLAYERBOUNTY_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerCellChange.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerCellChange.hpp index af807ef38..5453aa4f9 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerCellChange.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerCellChange.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERCELLCHANGE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerCellState.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerCellState.hpp index f22ea7756..f75e1ec08 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerCellState.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerCellState.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERCELLSTATE_HPP #define OPENMW_PROCESSORPLAYERCELLSTATE_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerCharClass.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerCharClass.hpp index 143c636c4..d3986525c 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerCharClass.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerCharClass.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERCHARCLASS_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerCharGen.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerCharGen.hpp index ff1b8a65a..1262d2dde 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerCharGen.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerCharGen.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERCHARGEN_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp index afc159a16..797dd3ec7 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERDEATH_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerDisposition.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerDisposition.hpp index 8c732f6b3..13befe5f6 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerDisposition.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerDisposition.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERDISPOSITION_HPP #define OPENMW_PROCESSORPLAYERDISPOSITION_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerEquipment.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerEquipment.hpp index e09eee61c..5a0fd5b69 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerEquipment.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerEquipment.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYEREQUIPMENT_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerFaction.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerFaction.hpp index 0e96ec8e4..72acbce2c 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerFaction.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerFaction.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERFACTION_HPP #define OPENMW_PROCESSORPLAYERFACTION_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp index b56d8ecb0..f4a32f64a 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERUPDATEINVENTORY_HPP #define OPENMW_PROCESSORPLAYERUPDATEINVENTORY_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp index 3fbcbd5d9..ee104cc85 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERJOURNAL_HPP #define OPENMW_PROCESSORPLAYERJOURNAL_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerLevel.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerLevel.hpp index 4a9886129..0270ca222 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerLevel.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerLevel.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERLEVEL_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp index fdd112260..b900c4f35 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERMAP_HPP #define OPENMW_PROCESSORPLAYERMAP_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerPosition.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerPosition.hpp index 59b3c3aa0..6cd9101e5 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerPosition.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerPosition.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERPOSITION_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerRegionAuthority.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerRegionAuthority.hpp index f0e512b7c..8df1777cb 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerRegionAuthority.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerRegionAuthority.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERREGIONAUTHORITY_HPP #define OPENMW_PROCESSORPLAYERREGIONAUTHORITY_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerRest.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerRest.hpp index 17d36f391..6f8f94fbc 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerRest.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerRest.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERREST_HPP #define OPENMW_PROCESSORPLAYERREST_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp index bb490cdc4..3edf07770 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERRESURRECT_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/Networking.hpp" diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerSkill.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerSkill.hpp index 5ab50a99b..4b61b0a0a 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerSkill.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerSkill.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERSKILL_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerSpeech.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerSpeech.hpp index fc30be70d..b4e2bab8a 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerSpeech.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerSpeech.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERSPEECH_HPP #define OPENMW_PROCESSORPLAYERSPEECH_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerSpellbook.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerSpellbook.hpp index d446b6099..2a9ac3131 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerSpellbook.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerSpellbook.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERSPELLBOOK_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp index 57f783986..ee566184e 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORPLAYERSTATSDYNAMIC_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerTopic.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerTopic.hpp index 99141bf1a..197c555b2 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerTopic.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerTopic.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERTOPIC_HPP #define OPENMW_PROCESSORPLAYERTOPIC_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/player/ProcessorUserDisconnected.hpp b/apps/openmw/mwmp/processors/player/ProcessorUserDisconnected.hpp index f239918a7..e1c7fec6d 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorUserDisconnected.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorUserDisconnected.hpp @@ -6,7 +6,7 @@ #define OPENMW_PROCESSORUSERDISCONNECTED_HPP -#include "apps/openmw/mwmp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include #include "apps/openmw/mwstate/statemanagerimp.hpp" diff --git a/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp b/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp index a7410f56d..affd6b790 100644 --- a/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp +++ b/apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_BASEOBJECTPROCESSOR_HPP #define OPENMW_BASEOBJECTPROCESSOR_HPP -#include "apps/openmw/mwmp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" #include "apps/openmw/mwmp/Main.hpp" #include "apps/openmw/mwmp/CellController.hpp" #include "apps/openmw/mwworld/cellstore.hpp" diff --git a/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp b/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp index 255d93a34..012c484d1 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp +++ b/apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORMUSICPLAY_HPP #define OPENMW_PROCESSORMUSICPLAY_HPP -#include "apps/openmw/mwmp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp b/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp index 89800cba6..dbffc55d0 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp +++ b/apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP #define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP -#include "apps/openmw/mwmp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp b/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp index 27c8b4c78..75ebf37a3 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp +++ b/apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP #define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP -#include "apps/openmw/mwmp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp b/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp index c9f9f3c95..788d9c8ee 100644 --- a/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp +++ b/apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORVIDEOPLAY_HPP #define OPENMW_PROCESSORVIDEOPLAY_HPP -#include "apps/openmw/mwmp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp {