[Client] Reorder files

8 years ago · 587b53bfed
parent 568b0702fa
commit 587b53bfed
77 changed files with 170 additions and 165 deletions
--- 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
--- a/apps/openmw/mwmp/GUI/GUIChat.cpp
+++ b/apps/openmw/mwmp/GUI/GUIChat.cpp
@ -5,17 +5,17 @@
 #include "GUIChat.hpp"

 #include <MyGUI_EditBox.h>
-#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 <MyGUI_InputManager.h>
 #include <components/openmw-mp/Log.hpp>

-#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
--- a/apps/openmw/mwmp/GUI/GUIChat.hpp
+++ b/apps/openmw/mwmp/GUI/GUIChat.hpp
@ -9,7 +9,7 @@
 #include <string>
 #include <vector>

-#include "../mwgui/windowbase.hpp"
+#include "apps/openmw/mwgui/windowbase.hpp"

 namespace mwmp
 {
--- a/apps/openmw/mwmp/GUI/GUIDialogList.cpp
+++ b/apps/openmw/mwmp/GUI/GUIDialogList.cpp
@ -4,17 +4,17 @@

 #include <components/openmw-mp/Log.hpp>

-#include "../mwbase/environment.hpp"
-#include "../mwgui/windowmanagerimp.hpp"
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwgui/windowmanagerimp.hpp"

 #include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ListBox.h>

 #include "GUIDialogList.hpp"
-#include "Main.hpp"
-#include "Networking.hpp"
-#include "LocalPlayer.hpp"
+#include "../Main.hpp"
+#include "../Networking.hpp"
+#include "../LocalPlayer.hpp"

 using namespace mwmp;

--- a/apps/openmw/mwmp/GUI/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
 {
--- a/apps/openmw/mwmp/GUI/GUILogin.cpp
+++ b/apps/openmw/mwmp/GUI/GUILogin.cpp
--- a/apps/openmw/mwmp/GUI/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
 {
--- a/apps/openmw/mwmp/GUI/PlayerMarkerCollection.cpp
+++ b/apps/openmw/mwmp/GUI/PlayerMarkerCollection.cpp
--- a/apps/openmw/mwmp/GUI/PlayerMarkerCollection.hpp
+++ b/apps/openmw/mwmp/GUI/PlayerMarkerCollection.hpp
--- a/apps/openmw/mwmp/GUI/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 <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
--- a/apps/openmw/mwmp/GUI/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
 {
--- 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"
--- a/apps/openmw/mwmp/GUIController.hpp
+++ b/apps/openmw/mwmp/GUIController.hpp
@ -7,11 +7,11 @@

 #include <components/settings/settings.hpp>

-#include "../mwgui/mode.hpp"
+#include "apps/openmw/mwgui/mode.hpp"

 #include <components/openmw-mp/Base/BasePlayer.hpp>
-#include "PlayerMarkerCollection.hpp"
-#include "TextInputDialog.hpp"
+#include "GUI/PlayerMarkerCollection.hpp"
+#include "GUI/TextInputDialog.hpp"

 namespace MWGui
 {
--- 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"

--- a/apps/openmw/mwmp/processors/ActorProcessor.cpp
+++ b/apps/openmw/mwmp/processors/ActorProcessor.cpp
@ -4,8 +4,8 @@

 #include <boost/foreach.hpp>
 #include "ActorProcessor.hpp"
-#include "Networking.hpp"
-#include "Main.hpp"
+#include "../Networking.hpp"
+#include "../Main.hpp"

 using namespace mwmp;

--- a/apps/openmw/mwmp/processors/ActorProcessor.hpp
+++ b/apps/openmw/mwmp/processors/ActorProcessor.hpp
@ -11,8 +11,8 @@
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 #include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
-#include "WorldEvent.hpp"
-#include "ActorList.hpp"
+#include "../WorldEvent.hpp"
+#include "../ActorList.hpp"
 #include "BaseClientPacketProcessor.hpp"

 namespace mwmp
--- a/apps/openmw/mwmp/processors/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;

--- a/apps/openmw/mwmp/processors/BaseClientPacketProcessor.hpp
+++ b/apps/openmw/mwmp/processors/BaseClientPacketProcessor.hpp
@ -6,8 +6,8 @@
 #define OPENMW_BASECLIENTPACKETPROCESSOR_HPP

 #include <components/openmw-mp/Base/BasePacketProcessor.hpp>
-#include "LocalPlayer.hpp"
-#include "DedicatedPlayer.hpp"
+#include "../LocalPlayer.hpp"
+#include "../DedicatedPlayer.hpp"

 namespace mwmp
 {
--- a/apps/openmw/mwmp/processors/PlayerProcessor.cpp
+++ b/apps/openmw/mwmp/processors/PlayerProcessor.cpp
@ -3,9 +3,9 @@
 //

 #include <boost/foreach.hpp>
-#include "Networking.hpp"
+#include "../Networking.hpp"
 #include "PlayerProcessor.hpp"
-#include "Main.hpp"
+#include "../Main.hpp"

 using namespace mwmp;

--- a/apps/openmw/mwmp/processors/PlayerProcessor.hpp
+++ b/apps/openmw/mwmp/processors/PlayerProcessor.hpp
@ -11,9 +11,9 @@
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 #include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
-#include "LocalPlayer.hpp"
-#include "DedicatedPlayer.hpp"
-#include "PlayerList.hpp"
+#include "../LocalPlayer.hpp"
+#include "../DedicatedPlayer.hpp"
+#include "../PlayerList.hpp"
 #include "BaseClientPacketProcessor.hpp"

 namespace mwmp
--- a/apps/openmw/mwmp/processors/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;

--- a/apps/openmw/mwmp/processors/ProcessorInitializer.hpp
+++ b/apps/openmw/mwmp/processors/ProcessorInitializer.hpp
--- a/apps/openmw/mwmp/processors/WorldProcessor.cpp
+++ b/apps/openmw/mwmp/processors/WorldProcessor.cpp
@ -4,8 +4,8 @@

 #include <boost/foreach.hpp>
 #include "WorldProcessor.hpp"
-#include "Main.hpp"
-#include "Networking.hpp"
+#include "../Main.hpp"
+#include "../Networking.hpp"

 using namespace mwmp;

--- a/apps/openmw/mwmp/processors/WorldProcessor.hpp
+++ b/apps/openmw/mwmp/processors/WorldProcessor.hpp
@ -11,9 +11,9 @@
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 #include <components/openmw-mp/Packets/World/WorldPacket.hpp>
-#include "WorldEvent.hpp"
-#include "LocalPlayer.hpp"
-#include "DedicatedPlayer.hpp"
+#include "../WorldEvent.hpp"
+#include "../LocalPlayer.hpp"
+#include "../DedicatedPlayer.hpp"
 #include "BaseClientPacketProcessor.hpp"

 namespace mwmp
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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
 {
--- 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
 {
--- a/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp
+++ b/apps/openmw/mwmp/processors/player/ProcessorGameTime.hpp
@ -8,7 +8,7 @@

 #include <apps/openmw/mwbase/world.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
-#include "apps/openmw/mwmp/PlayerProcessor.hpp"
+#include "../PlayerProcessor.hpp"

 namespace mwmp
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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"
--- 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"

--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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"

--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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 <apps/openmw/mwbase/environment.hpp>
 #include "apps/openmw/mwstate/statemanagerimp.hpp"

--- 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"
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {