Cleanup tes3mp headers

apps/openmw/engine.cpp

@@ -57,6 +57,7 @@
 #include "mwstate/statemanagerimp.hpp"
 
 #include "mwmp/Main.hpp"
+#include "mwmp/GUIController.hpp"
 
 namespace
 {

apps/openmw/mwclass/npc.cpp

@@ -11,6 +11,7 @@
 #include "../mwmp/DedicatedPlayer.hpp"
 #include "../mwmp/Networking.hpp"
 #include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/hud.cpp

@@ -2,6 +2,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include <MyGUI_RenderManager.h>

apps/openmw/mwgui/inventorywindow.cpp

@@ -18,6 +18,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/mapwindow.cpp

@@ -17,6 +17,7 @@
 #include <components/myguiplatform/myguitexture.hpp>
 
 #include "../mwmp/Main.hpp"
+#include "../mwmp/GUIController.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -47,6 +47,7 @@
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwmp/Main.hpp"
+#include "../mwmp/GUIController.hpp"
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"

apps/openmw/mwmechanics/actors.cpp

@@ -11,6 +11,7 @@
 
 #include "../mwmp/Main.hpp"
 #include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 
 #include "../mwworld/esmstore.hpp"
@@ -1047,7 +1048,7 @@ namespace MWMechanics
                 }
 
                 mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(iter->first);
-                if (dedicatedPlayer != nullptr)
+                if (dedicatedPlayer != NULL)
                     dedicatedPlayer->updateActor(iter->second);
 
 

apps/openmw/mwmechanics/character.cpp

@@ -28,6 +28,7 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 #include "../mwrender/animation.hpp"
 

apps/openmw/mwmechanics/combat.cpp

@@ -7,6 +7,7 @@
 #include "../mwmp/Networking.hpp"
 #include "../mwmp/Main.hpp"
 #include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -118,7 +119,7 @@ namespace MWMechanics
 
 
         mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(blocker);
-        bool isDedicated = dedicatedPlayer != nullptr;
+        bool isDedicated = dedicatedPlayer != NULL;
         if (attacker == MWMechanics::getPlayer())
             mwmp::Main::get().getLocalPlayer()->getAttack()->block = false;
 

apps/openmw/mwmechanics/security.cpp

@@ -2,6 +2,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include "../mwworld/cellstore.hpp"
 

apps/openmw/mwmechanics/spellcasting.cpp

@@ -10,6 +10,7 @@
 
 #include "../mwmp/Main.hpp"
 #include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -799,7 +800,7 @@ namespace MWMechanics
             float successChance = getSpellSuccessChance(spell, mCaster);
 
             mwmp::DedicatedPlayer *dedicatedPlayer = mwmp::Players::getPlayer(mCaster);
-            bool isDedicated = dedicatedPlayer != nullptr;
+            bool isDedicated = dedicatedPlayer != NULL;
 
             if (isDedicated)
                 dedicatedPlayer->getAttack()->pressed = false;

apps/openmw/mwmp/DedicatedPlayer.cpp

@@ -19,6 +19,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/action.hpp"
 #include "Main.hpp"
+#include "GUIController.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include <boost/algorithm/clamp.hpp>
 #include <components/openmw-mp/Log.hpp>

apps/openmw/mwmp/GUIChat.cpp

@@ -11,11 +11,9 @@
 #include <MyGUI_InputManager.h>
 #include <components/openmw-mp/Log.hpp>
 
-#include "../mwbase/windowmanager.hpp"
-#include "../mwworld/worldimp.hpp"
-#include "../mwworld/player.hpp"
 #include "Networking.hpp"
 #include "Main.hpp"
+#include "LocalPlayer.hpp"
 
 #include "GUIController.hpp"
 

apps/openmw/mwmp/GUIChat.hpp

@@ -9,15 +9,6 @@
 #include <string>
 #include <vector>
 
-#include <components/compiler/errorhandler.hpp>
-#include <components/compiler/lineparser.hpp>
-#include <components/compiler/scanner.hpp>
-#include <components/compiler/locals.hpp>
-#include <components/compiler/output.hpp>
-#include <components/compiler/extensions.hpp>
-#include <components/interpreter/interpreter.hpp>
-
-#include "../mwgui/referenceinterface.hpp"
 #include "../mwgui/windowbase.hpp"
 
 namespace mwmp

apps/openmw/mwmp/GUIController.cpp

@@ -29,6 +29,8 @@
 #include "GUIController.hpp"
 #include "Main.hpp"
 #include "PlayerMarkerCollection.hpp"
+#include "LocalPlayer.hpp"
+#include "Networking.hpp"
 #include "DedicatedPlayer.hpp"
 #include "GUIDialogList.hpp"
 #include "GUIChat.hpp"

apps/openmw/mwmp/GUIDialogList.cpp

@@ -4,6 +4,8 @@
 
 #include "GUIDialogList.hpp"
 #include "Main.hpp"
+#include "LocalPlayer.hpp"
+#include "Networking.hpp"
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ListBox.h>

apps/openmw/mwmp/LocalPlayer.cpp

@@ -26,6 +26,7 @@
 #include <components/misc/rng.hpp>
 
 #include "LocalPlayer.hpp"
+#include "Networking.hpp"
 #include "Main.hpp"
 
 using namespace mwmp;

apps/openmw/mwmp/LocalPlayer.hpp

@@ -7,10 +7,10 @@
 
 #include <components/openmw-mp/Base/BasePlayer.hpp>
 #include <RakNetTypes.h>
-#include "Networking.hpp"
 
 namespace mwmp
 {
+    class Networking;
     class LocalPlayer : public BasePlayer
     {
     public:

apps/openmw/mwmp/Main.cpp

@@ -26,8 +26,11 @@
 #include <components/openmw-mp/Log.hpp>
 #include <cstdlib>
 
-#include "DedicatedPlayer.hpp"
+#include "Networking.hpp"
 #include "LocalPlayer.hpp"
+#include "DedicatedPlayer.hpp"
+#include "GUIController.hpp"
+#include "WorldController.hpp"
 
 using namespace mwmp;
 using namespace std;

apps/openmw/mwmp/Main.hpp

@@ -1,12 +1,13 @@
 #include "../mwworld/ptr.hpp"
 #include <boost/program_options.hpp>
-#include "Networking.hpp"
-#include "LocalPlayer.hpp"
-#include "GUIController.hpp"
-#include "WorldController.hpp"
 
 namespace mwmp
 {
+    class WorldController;
+    class GUIController;
+    class LocalPlayer;
+    class Networking;
+
     class Main
     {
     public:

apps/openmw/mwmp/Networking.cpp

@@ -28,6 +28,9 @@
 #include <components/openmw-mp/Version.hpp>
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "DedicatedPlayer.hpp"
+#include "LocalPlayer.hpp"
+#include "GUIController.hpp"
+#include "WorldController.hpp"
 #include "Main.hpp"
 
 using namespace std;

apps/openmw/mwmp/Networking.hpp

@@ -10,15 +10,6 @@
 #include <string>
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include <components/openmw-mp/Packets/Player/PacketPosition.hpp>
-#include <components/openmw-mp/Packets/Player/PacketBaseInfo.hpp>
-#include <components/openmw-mp/Packets/Player/PacketEquipment.hpp>
-#include <components/openmw-mp/Packets/Player/PacketAttack.hpp>
-#include <components/openmw-mp/Packets/Player/PacketDynamicStats.hpp>
-#include <components/openmw-mp/Packets/Player/PacketResurrect.hpp>
-#include <components/openmw-mp/Packets/Player/PacketDie.hpp>
-#include <components/openmw-mp/Packets/Player/PacketCell.hpp>
-#include <components/openmw-mp/Packets/Player/PacketDrawState.hpp>
 #include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
 #include <components/openmw-mp/Controllers/WorldPacketController.hpp>
 

apps/openmw/mwscript/animationextensions.cpp

@@ -5,6 +5,8 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 

apps/openmw/mwscript/interpretercontext.cpp

@@ -12,6 +12,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include "../mwworld/esmstore.hpp"
 

apps/openmw/mwscript/miscextensions.cpp

@@ -4,6 +4,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>

apps/openmw/mwscript/soundextensions.cpp

@@ -2,6 +2,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>

apps/openmw/mwscript/statsextensions.cpp

@@ -4,6 +4,7 @@
 #include <cmath>
 
 #include "../mwmp/Main.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 
 #include <components/esm/loadnpc.hpp>
 

apps/openmw/mwscript/transformationextensions.cpp

@@ -2,6 +2,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 

apps/openmw/mwworld/actiontake.cpp

@@ -2,6 +2,8 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/LocalPlayer.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwworld/worldimp.cpp

@@ -7,6 +7,7 @@
 
 #include <components/openmw-mp/Base/WorldEvent.hpp>
 #include "../mwmp/Main.hpp"
+#include "../mwmp/Networking.hpp"
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>