From 768790e9b4485429437aca38d381c80da49f57c1 Mon Sep 17 00:00:00 2001 From: Koncord Date: Tue, 4 Jul 2017 01:13:10 +0800 Subject: [PATCH] [Server] Move Base processors and Initializer to processors subdirectory --- apps/openmw-mp/CMakeLists.txt | 13 +- apps/openmw-mp/Networking.cpp | 8 +- .../{ => processors}/ActorProcessor.cpp | 0 .../{ => processors}/ActorProcessor.hpp | 0 .../{ => processors}/PlayerProcessor.cpp | 0 .../{ => processors}/PlayerProcessor.hpp | 0 .../{ => processors}/ProcessorInitializer.cpp | 118 +++++++++--------- .../{ => processors}/ProcessorInitializer.hpp | 0 .../{ => processors}/WorldProcessor.cpp | 0 .../{ => processors}/WorldProcessor.hpp | 0 .../processors/actor/ProcessorActorAI.hpp | 2 +- .../actor/ProcessorActorAnimFlags.hpp | 2 +- .../actor/ProcessorActorAnimPlay.hpp | 2 +- .../processors/actor/ProcessorActorAttack.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 +- .../processors/player/ProcessorChatMsg.hpp | 2 +- .../player/ProcessorGUIMessageBox.hpp | 2 +- .../player/ProcessorGameWeather.hpp | 2 +- .../player/ProcessorPlayerAnimFlags.hpp | 2 +- .../player/ProcessorPlayerAnimPlay.hpp | 2 +- .../player/ProcessorPlayerAttack.hpp | 2 +- .../player/ProcessorPlayerAttribute.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/ProcessorPlayerKillCount.hpp | 2 +- .../player/ProcessorPlayerLevel.hpp | 2 +- .../processors/player/ProcessorPlayerMap.hpp | 2 +- .../player/ProcessorPlayerPosition.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 +- .../processors/world/ProcessorContainer.hpp | 2 +- .../processors/world/ProcessorDoorState.hpp | 2 +- .../processors/world/ProcessorMusicPlay.hpp | 2 +- .../world/ProcessorObjectAnimPlay.hpp | 2 +- .../world/ProcessorObjectDelete.hpp | 2 +- .../processors/world/ProcessorObjectLock.hpp | 2 +- .../processors/world/ProcessorObjectMove.hpp | 2 +- .../processors/world/ProcessorObjectPlace.hpp | 2 +- .../world/ProcessorObjectRotate.hpp | 2 +- .../processors/world/ProcessorObjectScale.hpp | 2 +- .../processors/world/ProcessorObjectSpawn.hpp | 2 +- .../processors/world/ProcessorObjectTrap.hpp | 2 +- .../world/ProcessorScriptGlobalShort.hpp | 2 +- .../world/ProcessorScriptLocalFloat.hpp | 2 +- .../world/ProcessorScriptLocalShort.hpp | 2 +- .../world/ProcessorScriptMemberShort.hpp | 2 +- .../processors/world/ProcessorVideoPlay.hpp | 2 +- 69 files changed, 132 insertions(+), 125 deletions(-) rename apps/openmw-mp/{ => processors}/ActorProcessor.cpp (100%) rename apps/openmw-mp/{ => processors}/ActorProcessor.hpp (100%) rename apps/openmw-mp/{ => processors}/PlayerProcessor.cpp (100%) rename apps/openmw-mp/{ => processors}/PlayerProcessor.hpp (100%) rename apps/openmw-mp/{ => processors}/ProcessorInitializer.cpp (55%) rename apps/openmw-mp/{ => processors}/ProcessorInitializer.hpp (100%) rename apps/openmw-mp/{ => processors}/WorldProcessor.cpp (100%) rename apps/openmw-mp/{ => processors}/WorldProcessor.hpp (100%) diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index 368443089..eda0bc86b 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -90,8 +90,6 @@ set(SERVER Script/Functions/Positions.cpp Script/Functions/Quests.cpp Script/Functions/Settings.cpp Script/Functions/Spells.cpp Script/Functions/Stats.cpp Script/Functions/Timer.cpp - ProcessorInitializer.cpp PlayerProcessor.cpp ActorProcessor.cpp WorldProcessor.cpp - Script/API/TimerAPI.cpp Script/API/PublicFnAPI.cpp ${PawnScript_Sources} ${LuaScript_Sources} @@ -154,13 +152,22 @@ set(PROCESSORS_WORLD source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD}) +set(PROCESSORS + processors/ProcessorInitializer.cpp + processors/PlayerProcessor.cpp + processors/ActorProcessor.cpp + processors/WorldProcessor.cpp + ) + +source_group(tes3mp-server\\processors FILES ${PROCESSORS}) + include_directories("./") # Main executable add_executable(tes3mp-server ${SERVER} ${SERVER_HEADER} - ${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_WORLD} + ${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_WORLD} ${PROCESSORS} ${APPLE_BUNDLE_RESOURCES} ) add_definitions(-std=gnu++14 -Wno-ignored-qualifiers) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index 9c01e380f..8dc082fa4 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -3,7 +3,7 @@ // #include "Player.hpp" -#include "ProcessorInitializer.hpp" +#include "processors/ProcessorInitializer.hpp" #include #include #include @@ -18,9 +18,9 @@ #include "MasterClient.hpp" #include "Cell.hpp" #include "CellController.hpp" -#include "PlayerProcessor.hpp" -#include "ActorProcessor.hpp" -#include "WorldProcessor.hpp" +#include "apps/openmw-mp/processors/PlayerProcessor.hpp" +#include "apps/openmw-mp/processors/ActorProcessor.hpp" +#include "apps/openmw-mp/processors/WorldProcessor.hpp" #include #include diff --git a/apps/openmw-mp/ActorProcessor.cpp b/apps/openmw-mp/processors/ActorProcessor.cpp similarity index 100% rename from apps/openmw-mp/ActorProcessor.cpp rename to apps/openmw-mp/processors/ActorProcessor.cpp diff --git a/apps/openmw-mp/ActorProcessor.hpp b/apps/openmw-mp/processors/ActorProcessor.hpp similarity index 100% rename from apps/openmw-mp/ActorProcessor.hpp rename to apps/openmw-mp/processors/ActorProcessor.hpp diff --git a/apps/openmw-mp/PlayerProcessor.cpp b/apps/openmw-mp/processors/PlayerProcessor.cpp similarity index 100% rename from apps/openmw-mp/PlayerProcessor.cpp rename to apps/openmw-mp/processors/PlayerProcessor.cpp diff --git a/apps/openmw-mp/PlayerProcessor.hpp b/apps/openmw-mp/processors/PlayerProcessor.hpp similarity index 100% rename from apps/openmw-mp/PlayerProcessor.hpp rename to apps/openmw-mp/processors/PlayerProcessor.hpp diff --git a/apps/openmw-mp/ProcessorInitializer.cpp b/apps/openmw-mp/processors/ProcessorInitializer.cpp similarity index 55% rename from apps/openmw-mp/ProcessorInitializer.cpp rename to apps/openmw-mp/processors/ProcessorInitializer.cpp index b8dafa770..4c0405995 100644 --- a/apps/openmw-mp/ProcessorInitializer.cpp +++ b/apps/openmw-mp/processors/ProcessorInitializer.cpp @@ -8,67 +8,67 @@ #include "Script/Script.hpp" #include "PlayerProcessor.hpp" -#include "processors/player/ProcessorChatMsg.hpp" -#include "processors/player/ProcessorGUIMessageBox.hpp" -#include "processors/player/ProcessorGameWeather.hpp" -#include "processors/player/ProcessorPlayerCharGen.hpp" -#include "processors/player/ProcessorPlayerAnimFlags.hpp" -#include "processors/player/ProcessorPlayerAnimPlay.hpp" -#include "processors/player/ProcessorPlayerAttack.hpp" -#include "processors/player/ProcessorPlayerAttribute.hpp" -#include "processors/player/ProcessorPlayerBook.hpp" -#include "processors/player/ProcessorPlayerBounty.hpp" -#include "processors/player/ProcessorPlayerCellChange.hpp" -#include "processors/player/ProcessorPlayerCellState.hpp" -#include "processors/player/ProcessorPlayerCharClass.hpp" -#include "processors/player/ProcessorPlayerDeath.hpp" -#include "processors/player/ProcessorPlayerDisposition.hpp" -#include "processors/player/ProcessorPlayerEquipment.hpp" -#include "processors/player/ProcessorPlayerFaction.hpp" -#include "processors/player/ProcessorPlayerInventory.hpp" -#include "processors/player/ProcessorPlayerJournal.hpp" -#include "processors/player/ProcessorPlayerKillCount.hpp" -#include "processors/player/ProcessorPlayerLevel.hpp" -#include "processors/player/ProcessorPlayerMap.hpp" -#include "processors/player/ProcessorPlayerPosition.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/ProcessorChatMsg.hpp" +#include "player/ProcessorGUIMessageBox.hpp" +#include "player/ProcessorGameWeather.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/ProcessorPlayerKillCount.hpp" +#include "player/ProcessorPlayerLevel.hpp" +#include "player/ProcessorPlayerMap.hpp" +#include "player/ProcessorPlayerPosition.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 "ActorProcessor.hpp" -#include "processors/actor/ProcessorActorList.hpp" -#include "processors/actor/ProcessorActorTest.hpp" -#include "processors/actor/ProcessorActorAI.hpp" -#include "processors/actor/ProcessorActorAnimFlags.hpp" -#include "processors/actor/ProcessorActorAnimPlay.hpp" -#include "processors/actor/ProcessorActorAttack.hpp" -#include "processors/actor/ProcessorActorCellChange.hpp" -#include "processors/actor/ProcessorActorDeath.hpp" -#include "processors/actor/ProcessorActorEquipment.hpp" -#include "processors/actor/ProcessorActorStatsDynamic.hpp" -#include "processors/actor/ProcessorActorPosition.hpp" -#include "processors/actor/ProcessorActorSpeech.hpp" +#include "actor/ProcessorActorList.hpp" +#include "actor/ProcessorActorTest.hpp" +#include "actor/ProcessorActorAI.hpp" +#include "actor/ProcessorActorAnimFlags.hpp" +#include "actor/ProcessorActorAnimPlay.hpp" +#include "actor/ProcessorActorAttack.hpp" +#include "actor/ProcessorActorCellChange.hpp" +#include "actor/ProcessorActorDeath.hpp" +#include "actor/ProcessorActorEquipment.hpp" +#include "actor/ProcessorActorStatsDynamic.hpp" +#include "actor/ProcessorActorPosition.hpp" +#include "actor/ProcessorActorSpeech.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/ProcessorObjectPlace.hpp" -#include "processors/world/ProcessorObjectLock.hpp" -#include "processors/world/ProcessorObjectMove.hpp" -#include "processors/world/ProcessorObjectRotate.hpp" -#include "processors/world/ProcessorObjectScale.hpp" -#include "processors/world/ProcessorObjectSpawn.hpp" -#include "processors/world/ProcessorObjectTrap.hpp" -#include "processors/world/ProcessorScriptLocalShort.hpp" -#include "processors/world/ProcessorScriptLocalFloat.hpp" -#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/ProcessorObjectPlace.hpp" +#include "world/ProcessorObjectLock.hpp" +#include "world/ProcessorObjectMove.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" using namespace mwmp; diff --git a/apps/openmw-mp/ProcessorInitializer.hpp b/apps/openmw-mp/processors/ProcessorInitializer.hpp similarity index 100% rename from apps/openmw-mp/ProcessorInitializer.hpp rename to apps/openmw-mp/processors/ProcessorInitializer.hpp diff --git a/apps/openmw-mp/WorldProcessor.cpp b/apps/openmw-mp/processors/WorldProcessor.cpp similarity index 100% rename from apps/openmw-mp/WorldProcessor.cpp rename to apps/openmw-mp/processors/WorldProcessor.cpp diff --git a/apps/openmw-mp/WorldProcessor.hpp b/apps/openmw-mp/processors/WorldProcessor.hpp similarity index 100% rename from apps/openmw-mp/WorldProcessor.hpp rename to apps/openmw-mp/processors/WorldProcessor.hpp diff --git a/apps/openmw-mp/processors/actor/ProcessorActorAI.hpp b/apps/openmw-mp/processors/actor/ProcessorActorAI.hpp index 9cda87e31..3fd5861f6 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorAI.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorAI.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORAI_HPP #define OPENMW_PROCESSORACTORAI_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp b/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp index 4bf6bee38..7a9441a98 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORANIMFLAGS_HPP #define OPENMW_PROCESSORACTORANIMFLAGS_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp b/apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp index 39fc3bccf..445ee8ea1 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORANIMPLAY_HPP #define OPENMW_PROCESSORACTORANIMPLAY_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp b/apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp index c2b17fe69..9da7271b7 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORATTACK_HPP #define OPENMW_PROCESSORACTORATTACK_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp b/apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp index 6d2c98cf2..311786121 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORCELLCHANGE_HPP #define OPENMW_PROCESSORACTORCELLCHANGE_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp b/apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp index b7f1aab54..ef6953318 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORDEATH_HPP #define OPENMW_PROCESSORACTORDEATH_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorEquipment.hpp b/apps/openmw-mp/processors/actor/ProcessorActorEquipment.hpp index 0200b65ad..41064489e 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorEquipment.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorEquipment.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTOREQUIPMENT_HPP #define OPENMW_PROCESSORACTOREQUIPMENT_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorList.hpp b/apps/openmw-mp/processors/actor/ProcessorActorList.hpp index 89ff3612f..e278472cb 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorList.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorList.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORLIST_HPP #define OPENMW_PROCESSORACTORLIST_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp b/apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp index 238a66c66..05133b4ac 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORPOSITION_HPP #define OPENMW_PROCESSORACTORPOSITION_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp b/apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp index 386dc7a46..f5de44f24 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORSPEECH_HPP #define OPENMW_PROCESSORACTORSPEECH_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp b/apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp index 1523a4efc..4447a899f 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP #define OPENMW_PROCESSORACTORSTATSDYNAMIC_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp b/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp index 20107b5f5..68b63f36d 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORACTORTEST_HPP #define OPENMW_PROCESSORACTORTEST_HPP -#include "apps/openmw-mp/ActorProcessor.hpp" +#include "../ActorProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp b/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp index b9b86246a..cbf8dfcca 100644 --- a/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp +++ b/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERCHATMSG_HPP #define OPENMW_PROCESSORPLAYERCHATMSG_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp b/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp index b9ee7d1d4..1b45ba816 100644 --- a/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp +++ b/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORGUIMESSAGEBOX_HPP #define OPENMW_PROCESSORGUIMESSAGEBOX_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorGameWeather.hpp b/apps/openmw-mp/processors/player/ProcessorGameWeather.hpp index 342e23eba..cb0a360f4 100644 --- a/apps/openmw-mp/processors/player/ProcessorGameWeather.hpp +++ b/apps/openmw-mp/processors/player/ProcessorGameWeather.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORGAMEWEATHER_HPP #define OPENMW_PROCESSORGAMEWEATHER_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp index 2b84810c0..1d5c44101 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERANIMFLAGS_HPP #define OPENMW_PROCESSORPLAYERANIMFLAGS_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp index 714677255..d13e2737d 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERANIMPLAY_HPP #define OPENMW_PROCESSORPLAYERANIMPLAY_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp index fc55a71e5..2120d97e7 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERATTACK_HPP #define OPENMW_PROCESSORPLAYERATTACK_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp index 29af23093..e70f0dca4 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERATTRIBUTE_HPP #define OPENMW_PROCESSORPLAYERATTRIBUTE_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerBook.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerBook.hpp index c42c0f4c3..b87b51970 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerBook.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerBook.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERBOOK_HPP #define OPENMW_PROCESSORPLAYERBOOK_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerBounty.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerBounty.hpp index 82cb60587..90a738160 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerBounty.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerBounty.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERBOUNTY_HPP #define OPENMW_PROCESSORPLAYERBOUNTY_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp index e87d3d833..8fcd150fb 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERCELLCHANGE_HPP #define OPENMW_PROCESSORPLAYERCELLCHANGE_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw-mp/Networking.hpp" #include "apps/openmw-mp/Script/Script.hpp" #include diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp index 35b5d84a6..4c20cb2e0 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERCELLSTATE_HPP #define OPENMW_PROCESSORPLAYERCELLSTATE_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include "apps/openmw-mp/Networking.hpp" #include "apps/openmw-mp/Script/Script.hpp" #include diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp index 29894ac87..03f0f0fdc 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERCHARCLASS_HPP #define OPENMW_PROCESSORPLAYERCHARCLASS_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp index 516fcd9db..f4eca4e70 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERCHARGEN_HPP #define OPENMW_PROCESSORPLAYERCHARGEN_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp index bbfb0c731..1b76a77df 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERDEATH_HPP #define OPENMW_PROCESSORPLAYERDEATH_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" #include namespace mwmp diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerDisposition.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDisposition.hpp index 5d9b82b08..9e3c0b95f 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerDisposition.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerDisposition.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERDISPOSITION_HPP #define OPENMW_PROCESSORPLAYERDISPOSITION_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp index eb823e83c..446bb8544 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYEREQUIPMENT_HPP #define OPENMW_PROCESSORPLAYEREQUIPMENT_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerFaction.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerFaction.hpp index a8f2821df..20ab6b3bf 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerFaction.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerFaction.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERFACTION_HPP #define OPENMW_PROCESSORPLAYERFACTION_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp index 79719f378..77b3efbb1 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERINVENTORY_HPP #define OPENMW_PROCESSORPLAYERINVENTORY_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp index 1ce55d02f..1ec3f1850 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERJOURNAL_HPP #define OPENMW_PROCESSORPLAYERJOURNAL_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerKillCount.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerKillCount.hpp index 86f171332..609b3d676 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerKillCount.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerKillCount.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERKILLCOUNT_HPP #define OPENMW_PROCESSORPLAYERKILLCOUNT_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp index 1dafe0566..230517ca3 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERLEVEL_HPP #define OPENMW_PROCESSORPLAYERLEVEL_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp index e1620df9e..01d3cfe43 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERMAP_HPP #define OPENMW_PROCESSORPLAYERMAP_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp index 1ce5c982c..15b0e96df 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERPOSITION_HPP #define OPENMW_PROCESSORPLAYERPOSITION_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerRest.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerRest.hpp index c12d7254e..81118dae4 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerRest.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerRest.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERREST_HPP #define OPENMW_PROCESSORPLAYERREST_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp index 59373ecba..c64523c6e 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERRESURRECT_HPP #define OPENMW_PROCESSORPLAYERRESURRECT_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp index 28eeaa648..2bd37ffa5 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERSKILL_HPP #define OPENMW_PROCESSORPLAYERSKILL_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp index 8fe268825..79ef5f609 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERSPEECH_HPP #define OPENMW_PROCESSORPLAYERSPEECH_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp index e09ad2b42..ffaf4dd46 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERSPELLBOOK_HPP #define OPENMW_PROCESSORPLAYERSPELLBOOK_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp index ff45cad49..457f489fb 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp @@ -5,7 +5,7 @@ #ifndef OPENMW_PROCESSORPLAYERSTATS_DYNAMIC_HPP #define OPENMW_PROCESSORPLAYERSTATS_DYNAMIC_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp index 440f3df74..15375498f 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORPLAYERTOPIC_HPP #define OPENMW_PROCESSORPLAYERTOPIC_HPP -#include "apps/openmw-mp/PlayerProcessor.hpp" +#include "../PlayerProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorContainer.hpp b/apps/openmw-mp/processors/world/ProcessorContainer.hpp index d3878e802..8a6dcd819 100644 --- a/apps/openmw-mp/processors/world/ProcessorContainer.hpp +++ b/apps/openmw-mp/processors/world/ProcessorContainer.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORCONTAINER_HPP #define OPENMW_PROCESSORCONTAINER_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorDoorState.hpp b/apps/openmw-mp/processors/world/ProcessorDoorState.hpp index 7f382eb44..0167b66c9 100644 --- a/apps/openmw-mp/processors/world/ProcessorDoorState.hpp +++ b/apps/openmw-mp/processors/world/ProcessorDoorState.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORDOORSTATE_HPP #define OPENMW_PROCESSORDOORSTATE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp b/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp index aef796021..e27395ab1 100644 --- a/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp +++ b/apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORMUSICPLAY_HPP #define OPENMW_PROCESSORMUSICPLAY_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp b/apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp index e9bf7b54f..5461c9d18 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTANIMPLAY_HPP #define OPENMW_PROCESSOROBJECTANIMPLAY_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp b/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp index 5754dbc88..7c8a5e4fb 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTDELETE_HPP #define OPENMW_PROCESSOROBJECTDELETE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp b/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp index 035ba0746..0bc8ad7dd 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectLock.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTLOCK_HPP #define OPENMW_PROCESSOROBJECTLOCK_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp b/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp index 77deaa7ce..523875b99 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectMove.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTMOVE_HPP #define OPENMW_PROCESSOROBJECTMOVE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp b/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp index 93d5a849f..5ad4f3bb1 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTPLACE_HPP #define OPENMW_PROCESSOROBJECTPLACE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" #include namespace mwmp diff --git a/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp b/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp index 42094ff92..ed0eb6631 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTROTATE_HPP #define OPENMW_PROCESSOROBJECTROTATE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp b/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp index 39418e15a..b79cc9c6f 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectScale.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTSCALE_HPP #define OPENMW_PROCESSOROBJECTSCALE_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp b/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp index 1207d803d..5924bc675 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTSPAWN_HPP #define OPENMW_PROCESSOROBJECTSPAWN_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" #include namespace mwmp diff --git a/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp b/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp index 963cac8b0..bbd0a5b5e 100644 --- a/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp +++ b/apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSOROBJECTTRAP_HPP #define OPENMW_PROCESSOROBJECTTRAP_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp b/apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp index ffa7b2039..1086dee4c 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp +++ b/apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP #define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp b/apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp index ab6be90b6..2a593c241 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp +++ b/apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP #define OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp b/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp index 4c775e51f..518b3be46 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp +++ b/apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP #define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp b/apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp index dbdb1341b..75269d88f 100644 --- a/apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp +++ b/apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP #define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp { diff --git a/apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp b/apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp index 1ae82be31..1b7940c6a 100644 --- a/apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp +++ b/apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_PROCESSORVIDEOPLAY_HPP #define OPENMW_PROCESSORVIDEOPLAY_HPP -#include "apps/openmw-mp/WorldProcessor.hpp" +#include "../WorldProcessor.hpp" namespace mwmp {