From b883b4c7ce46bd9e5ee2b2c01412d6df19723765 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 8 Apr 2017 12:54:38 +0300
Subject: [PATCH] [Client] Reorder includes

---
 apps/openmw/mwmp/Cell.cpp            |  3 +-
 apps/openmw/mwmp/CellController.cpp  |  6 ++--
 apps/openmw/mwmp/DedicatedPlayer.cpp |  7 +++--
 apps/openmw/mwmp/LocalPlayer.cpp     | 43 +++++++++++++++++-----------
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp
index b32511b9d..5c7dc594b 100644
--- a/apps/openmw/mwmp/Cell.cpp
+++ b/apps/openmw/mwmp/Cell.cpp
@@ -1,7 +1,8 @@
-#include "../mwworld/worldimp.hpp"
 #include <components/esm/cellid.hpp>
 #include <components/openmw-mp/Log.hpp>
 
+#include "../mwworld/worldimp.hpp"
+
 #include "Cell.hpp"
 #include "CellController.hpp"
 #include "Main.hpp"
diff --git a/apps/openmw/mwmp/CellController.cpp b/apps/openmw/mwmp/CellController.cpp
index 2e2f79258..c93910571 100644
--- a/apps/openmw/mwmp/CellController.cpp
+++ b/apps/openmw/mwmp/CellController.cpp
@@ -1,10 +1,12 @@
-#include "../mwbase/environment.hpp"
-#include "../mwworld/worldimp.hpp"
 #include <components/esm/cellid.hpp>
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/Utils.hpp>
+
+#include "../mwbase/environment.hpp"
+
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/worldimp.hpp"
 
 #include "CellController.hpp"
 #include "Main.hpp"
diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp
index a0b16b032..2de818fae 100644
--- a/apps/openmw/mwmp/DedicatedPlayer.cpp
+++ b/apps/openmw/mwmp/DedicatedPlayer.cpp
@@ -5,12 +5,13 @@
 #include "DedicatedPlayer.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwstate/statemanagerimp.hpp"
-#include "../mwinput/inputmanagerimp.hpp"
+
 #include "../mwgui/windowmanagerimp.hpp"
 
 #include "../mwclass/npc.hpp"
 
+#include "../mwinput/inputmanagerimp.hpp"
+
 #include "../mwmechanics/actor.hpp"
 #include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/creaturestats.hpp"
@@ -18,6 +19,8 @@
 #include "../mwmechanics/mechanicsmanagerimp.hpp"
 #include "../mwmechanics/spellcasting.hpp"
 
+#include "../mwstate/statemanagerimp.hpp"
+
 #include "../mwworld/action.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/customdata.hpp"
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index 1833aa0d8..9249c2772 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -2,29 +2,38 @@
 // Created by koncord on 14.01.16.
 //
 
-#include "../mwworld/manualref.hpp"
-#include "../mwmechanics/aitravel.hpp"
+#include <components/misc/rng.hpp>
 #include <components/esm/esmwriter.hpp>
+#include <components/openmw-mp/Log.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/journal.hpp"
-#include "../mwstate/statemanagerimp.hpp"
-#include "../mwinput/inputmanagerimp.hpp"
-#include "../mwscript/scriptmanagerimp.hpp"
-#include "../mwgui/windowmanagerimp.hpp"
-#include "../mwworld/worldimp.hpp"
-#include "../mwworld/player.hpp"
-#include "../mwworld/customdata.hpp"
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwclass/npc.hpp"
+
 #include "../mwclass/creature.hpp"
-#include "../mwmechanics/mechanicsmanagerimp.hpp"
-#include "../mwworld/cellstore.hpp"
+#include "../mwclass/npc.hpp"
+
 #include "../mwdialogue/dialoguemanagerimp.hpp"
-#include "../mwworld/inventorystore.hpp"
-#include "../mwmechanics/spellcasting.hpp"
+
 #include "../mwgui/inventorywindow.hpp"
-#include <components/openmw-mp/Log.hpp>
-#include <components/misc/rng.hpp>
+#include "../mwgui/windowmanagerimp.hpp"
+
+#include "../mwinput/inputmanagerimp.hpp"
+
+#include "../mwmechanics/aitravel.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/mechanicsmanagerimp.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+
+#include "../mwscript/scriptmanagerimp.hpp"
+
+#include "../mwstate/statemanagerimp.hpp"
+
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/customdata.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/worldimp.hpp"
 
 #include "LocalPlayer.hpp"
 #include "Networking.hpp"