From 07d75abdf84894a8d6c5dcd6a7a73e3d73160494 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 23 Nov 2017 08:11:37 +0200
Subject: [PATCH] [Server] Use consistent order for includes

---
 apps/openmw-mp/Actors.cpp          |  4 +++-
 apps/openmw-mp/Books.cpp           |  7 +++---
 apps/openmw-mp/Cell.cpp            |  8 +++----
 apps/openmw-mp/CellController.cpp  |  7 +++---
 apps/openmw-mp/CellState.cpp       |  4 ++--
 apps/openmw-mp/Cells.cpp           |  7 +++---
 apps/openmw-mp/CharClass.cpp       |  9 ++++----
 apps/openmw-mp/Dialogue.cpp        |  7 +++---
 apps/openmw-mp/Factions.cpp        |  5 +++--
 apps/openmw-mp/GUI.cpp             |  4 +++-
 apps/openmw-mp/Inventory.cpp       | 11 ++++++----
 apps/openmw-mp/MasterClient.cpp    | 12 ++++++----
 apps/openmw-mp/NetActor.cpp        |  8 +++----
 apps/openmw-mp/Networking.cpp      | 25 ++++++++++-----------
 apps/openmw-mp/Object.cpp          |  4 +++-
 apps/openmw-mp/Player.cpp          |  5 ++++-
 apps/openmw-mp/Quests.cpp          |  7 +++---
 apps/openmw-mp/Script/LuaState.cpp | 35 +++++++++++++++++-------------
 apps/openmw-mp/Settings.cpp        |  5 +++--
 apps/openmw-mp/Spells.cpp          |  7 +++---
 apps/openmw-mp/Timer.cpp           |  3 ++-
 21 files changed, 107 insertions(+), 77 deletions(-)

diff --git a/apps/openmw-mp/Actors.cpp b/apps/openmw-mp/Actors.cpp
index b2c501c51..c97db425e 100644
--- a/apps/openmw-mp/Actors.cpp
+++ b/apps/openmw-mp/Actors.cpp
@@ -3,9 +3,11 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include "Actors.hpp"
+
 #include "Script/LuaState.hpp"
 #include "Networking.hpp"
+
+#include "Actors.hpp"
 #include "Cell.hpp"
 #include "CellController.hpp"
 #include "Player.hpp"
diff --git a/apps/openmw-mp/Books.cpp b/apps/openmw-mp/Books.cpp
index 55c42842d..e49024d7a 100644
--- a/apps/openmw-mp/Books.cpp
+++ b/apps/openmw-mp/Books.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 15.08.17.
 //
 
-#include "Books.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+
 #include "Script/LuaState.hpp"
-#include "Player.hpp"
 #include "Networking.hpp"
 
+#include "Books.hpp"
+#include "Player.hpp"
+
 void Books::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<Books>("Books",
diff --git a/apps/openmw-mp/Cell.cpp b/apps/openmw-mp/Cell.cpp
index a804fd8a4..e74e4aa03 100644
--- a/apps/openmw-mp/Cell.cpp
+++ b/apps/openmw-mp/Cell.cpp
@@ -2,15 +2,15 @@
 // Created by koncord on 18.02.17.
 //
 
-#include "Cell.hpp"
-
+#include <iostream>
 #include <components/openmw-mp/NetworkMessages.hpp>
 
-#include <iostream>
 #include "Script/EventController.hpp"
-#include "Player.hpp"
 #include "Networking.hpp"
 
+#include "Cell.hpp"
+#include "Player.hpp"
+
 using namespace std;
 
 Cell::Cell(ESM::Cell cell) : cell(cell)
diff --git a/apps/openmw-mp/CellController.cpp b/apps/openmw-mp/CellController.cpp
index b6b5e97d4..61a124c8d 100644
--- a/apps/openmw-mp/CellController.cpp
+++ b/apps/openmw-mp/CellController.cpp
@@ -1,10 +1,11 @@
-#include "CellController.hpp"
-
 #include <iostream>
+
 #include <apps/openmw-mp/Script/EventController.hpp>
+#include "Networking.hpp"
+
+#include "CellController.hpp"
 #include "Cell.hpp"
 #include "Player.hpp"
-#include "Networking.hpp"
 
 using namespace std;
 
diff --git a/apps/openmw-mp/CellState.cpp b/apps/openmw-mp/CellState.cpp
index 4d37eef7b..e1693c4bd 100644
--- a/apps/openmw-mp/CellState.cpp
+++ b/apps/openmw-mp/CellState.cpp
@@ -2,10 +2,10 @@
 // Created by koncord on 25.08.17.
 //
 
-#include "CellState.hpp"
-
 #include "Script/LuaState.hpp"
 
+#include "CellState.hpp"
+
 void CellState::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<CellState>("CellState",
diff --git a/apps/openmw-mp/Cells.cpp b/apps/openmw-mp/Cells.cpp
index c517b0e0d..9b295990a 100644
--- a/apps/openmw-mp/Cells.cpp
+++ b/apps/openmw-mp/Cells.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 25.08.17.
 //
 
-#include "Cells.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+
 #include "Script/LuaState.hpp"
-#include "NetActor.hpp"
 #include "Networking.hpp"
 
+#include "Cells.hpp"
+#include "NetActor.hpp"
+
 using namespace std;
 
 void Cells::Init(LuaState &lua)
diff --git a/apps/openmw-mp/CharClass.cpp b/apps/openmw-mp/CharClass.cpp
index 12d3c0345..739468cc3 100644
--- a/apps/openmw-mp/CharClass.cpp
+++ b/apps/openmw-mp/CharClass.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 12.08.17.
 //
 
-#include "CharClass.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include <apps/openmw-mp/Script/LuaState.hpp>
-#include "Player.hpp"
+
+#include "Script/LuaState.hpp"
 #include "Networking.hpp"
 
+#include "CharClass.hpp"
+#include "Player.hpp"
+
 using namespace std;
 
 void CharClass::Init(LuaState &lua)
diff --git a/apps/openmw-mp/Dialogue.cpp b/apps/openmw-mp/Dialogue.cpp
index af9a85c77..98c142043 100644
--- a/apps/openmw-mp/Dialogue.cpp
+++ b/apps/openmw-mp/Dialogue.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 15.08.17.
 //
 
-#include "Dialogue.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+
 #include "Script/LuaState.hpp"
-#include "Player.hpp"
 #include "Networking.hpp"
 
+#include "Dialogue.hpp"
+#include "Player.hpp"
+
 void Dialogue::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<Dialogue>("Dialogue",
diff --git a/apps/openmw-mp/Factions.cpp b/apps/openmw-mp/Factions.cpp
index 9c615a036..a3e40915d 100644
--- a/apps/openmw-mp/Factions.cpp
+++ b/apps/openmw-mp/Factions.cpp
@@ -3,12 +3,13 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include "Factions.hpp"
 
-#include "Player.hpp"
 #include "Script/LuaState.hpp"
 #include "Networking.hpp"
 
+#include "Factions.hpp"
+#include "Player.hpp"
+
 void Factions::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<Factions>("Factions",
diff --git a/apps/openmw-mp/GUI.cpp b/apps/openmw-mp/GUI.cpp
index 6bbdf3492..6182fa37e 100644
--- a/apps/openmw-mp/GUI.cpp
+++ b/apps/openmw-mp/GUI.cpp
@@ -3,9 +3,11 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
+
+#include "Networking.hpp"
+
 #include "GUI.hpp"
 #include "Player.hpp"
-#include "Networking.hpp"
 
 void GUI::Init(LuaState &lua)
 {
diff --git a/apps/openmw-mp/Inventory.cpp b/apps/openmw-mp/Inventory.cpp
index b1f5adefe..ca443ec17 100644
--- a/apps/openmw-mp/Inventory.cpp
+++ b/apps/openmw-mp/Inventory.cpp
@@ -2,14 +2,17 @@
 // Created by koncord on 12.08.17.
 //
 
-#include "Inventory.hpp"
+#include <components/misc/stringops.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include <apps/openmw-mp/Script/LuaState.hpp>
+
 #include <apps/openmw/mwworld/inventorystore.hpp>
-#include <components/misc/stringops.hpp>
-#include "NetActor.hpp"
+
+#include "Script/LuaState.hpp"
 #include "Networking.hpp"
 
+#include "Inventory.hpp"
+#include "NetActor.hpp"
+
 using namespace std;
 
 void Inventory::Init(LuaState &lua)
diff --git a/apps/openmw-mp/MasterClient.cpp b/apps/openmw-mp/MasterClient.cpp
index a352295ea..620e4d8f9 100644
--- a/apps/openmw-mp/MasterClient.cpp
+++ b/apps/openmw-mp/MasterClient.cpp
@@ -2,17 +2,21 @@
 // Created by koncord on 14.08.16.
 //
 
-#include <RakSleep.h>
-#include <Getche.h>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 #include <thread>
+
+#include <Getche.h>
 #include <RakPeerInterface.h>
-#include "MasterClient.hpp"
+#include <RakSleep.h>
+
 #include <components/openmw-mp/Log.hpp>
 #include <components/openmw-mp/Version.hpp>
 #include <components/openmw-mp/Master/PacketMasterAnnounce.hpp>
+
+#include "MasterClient.hpp"
 #include "Networking.hpp"
+
 #include "Players.hpp"
 
 using namespace std;
diff --git a/apps/openmw-mp/NetActor.cpp b/apps/openmw-mp/NetActor.cpp
index dffc2fc85..9908c09b3 100644
--- a/apps/openmw-mp/NetActor.cpp
+++ b/apps/openmw-mp/NetActor.cpp
@@ -2,13 +2,13 @@
 // Created by koncord on 25.08.17.
 //
 
-#include "NetActor.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Base/BaseNetCreature.hpp>
+
 #include "Script/LuaState.hpp"
-//#include "Player.hpp"
 #include "Networking.hpp"
-#include <components/openmw-mp/Base/BaseNetCreature.hpp>
+
+#include "NetActor.hpp"
 
 using namespace std;
 
diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index 48780770f..704584ac3 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -2,11 +2,12 @@
 // Created by koncord on 12.01.16.
 //
 
-#include "Players.hpp"
-#include <Script/EventController.hpp>
-#include "processors/ProcessorInitializer.hpp"
-#include <RakPeer.h>
+#include <chrono>
+#include <iostream>
+#include <thread>
+
 #include <Kbhit.h>
+#include <RakPeer.h>
 
 #include <components/misc/stringops.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
@@ -14,18 +15,18 @@
 #include <components/openmw-mp/Version.hpp>
 #include <components/openmw-mp/Packets/PacketPreInit.hpp>
 
-#include <iostream>
-//#include <Script/API/TimerAPI.hpp>
-#include <chrono>
-#include <thread>
+#include <Script/EventController.hpp>
+#include "processors/ProcessorInitializer.hpp"
+#include "processors/PlayerProcessor.hpp"
+#include "processors/ActorProcessor.hpp"
+#include "processors/WorldProcessor.hpp"
 
 #include "Networking.hpp"
 #include "MasterClient.hpp"
+
 #include "Cell.hpp"
 #include "CellController.hpp"
-#include "processors/PlayerProcessor.hpp"
-#include "processors/ActorProcessor.hpp"
-#include "processors/WorldProcessor.hpp"
+#include "Players.hpp"
 
 using namespace mwmp;
 using namespace std;
@@ -34,8 +35,6 @@ Networking *Networking::sThis = nullptr;
 
 static int currentMpNum = 0;
 
-
-
 Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
 {
     sThis = this;
diff --git a/apps/openmw-mp/Object.cpp b/apps/openmw-mp/Object.cpp
index 6196a94ba..2df61e2d9 100644
--- a/apps/openmw-mp/Object.cpp
+++ b/apps/openmw-mp/Object.cpp
@@ -3,9 +3,11 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
+
+#include "Networking.hpp"
+
 #include "Object.hpp"
 #include "Player.hpp"
-#include "Networking.hpp"
 
 using namespace std;
 
diff --git a/apps/openmw-mp/Player.cpp b/apps/openmw-mp/Player.cpp
index 11ec8731b..05719e637 100644
--- a/apps/openmw-mp/Player.cpp
+++ b/apps/openmw-mp/Player.cpp
@@ -3,8 +3,10 @@
 //
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include "Player.hpp"
+
 #include "Networking.hpp"
+
+#include "Player.hpp"
 #include "Inventory.hpp"
 #include "Settings.hpp"
 
@@ -490,6 +492,7 @@ std::tuple<int, int, float> Player::getSkill(unsigned short id) const
         return make_tuple(0, 0, 0.0f);
 
     const auto &skill = npcStats.mSkills[id];
+
     return make_tuple(skill.mBase, skill.mCurrent, skill.mProgress);
 }
 
diff --git a/apps/openmw-mp/Quests.cpp b/apps/openmw-mp/Quests.cpp
index 7cffd80a8..ec3d8883a 100644
--- a/apps/openmw-mp/Quests.cpp
+++ b/apps/openmw-mp/Quests.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 25.08.17.
 //
 
-#include "Quests.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+
 #include "Script/LuaState.hpp"
-#include "Player.hpp"
 #include "Networking.hpp"
 
+#include "Quests.hpp"
+#include "Player.hpp"
+
 void JournalItem::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<JournalItem>("JournalItem",
diff --git a/apps/openmw-mp/Script/LuaState.cpp b/apps/openmw-mp/Script/LuaState.cpp
index ca6b7e9cd..7d332d76d 100644
--- a/apps/openmw-mp/Script/LuaState.cpp
+++ b/apps/openmw-mp/Script/LuaState.cpp
@@ -4,31 +4,36 @@
 
 #include <iostream>
 #include <cstdlib>
+
 #include <boost/filesystem.hpp>
-#include <boost/tokenizer.hpp>
 #include <boost/lexical_cast.hpp>
-#include <components/misc/stringops.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
-#include <apps/openmw-mp/Networking.hpp>
-#include <components/openmw-mp/Version.hpp>
-#include <apps/openmw-mp/GUI.hpp>
-#include <apps/openmw-mp/Dialogue.hpp>
-#include <apps/openmw-mp/Factions.hpp>
-#include <apps/openmw-mp/Quests.hpp>
-#include <apps/openmw-mp/Spells.hpp>
-#include <components/openmw-mp/NetworkMessages.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#include <boost/tokenizer.hpp>
+
+#include <components/misc/stringops.hpp>
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Version.hpp>
+
+#include <apps/openmw/mwworld/inventorystore.hpp>
+
 #include "LuaState.hpp"
-#include "EventController.hpp"
 #include "luaUtils.hpp"
+#include "EventController.hpp"
 #include "CommandController.hpp"
-#include "../Inventory.hpp"
-#include "../Settings.hpp"
-#include "../Players.hpp"
+
 #include "../Networking.hpp"
 #include "../MasterClient.hpp"
 
+#include "../Dialogue.hpp"
+#include "../Factions.hpp"
+#include "../GUI.hpp"
+#include "../Inventory.hpp"
+#include "../Players.hpp"
+#include "../Quests.hpp"
+#include "../Settings.hpp"
+#include "../Spells.hpp"
+
 using namespace std;
 
 
diff --git a/apps/openmw-mp/Settings.cpp b/apps/openmw-mp/Settings.cpp
index 4716acead..6049f0c3a 100644
--- a/apps/openmw-mp/Settings.cpp
+++ b/apps/openmw-mp/Settings.cpp
@@ -2,12 +2,13 @@
 // Created by koncord on 12.08.17.
 //
 
-#include "Settings.hpp"
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include "Player.hpp"
+
 #include "Script/LuaState.hpp"
 #include "Networking.hpp"
 
+#include "Settings.hpp"
+#include "Player.hpp"
 
 void GameSettings::Init(LuaState &lua)
 {
diff --git a/apps/openmw-mp/Spells.cpp b/apps/openmw-mp/Spells.cpp
index 631b10a23..f8c663956 100644
--- a/apps/openmw-mp/Spells.cpp
+++ b/apps/openmw-mp/Spells.cpp
@@ -2,13 +2,14 @@
 // Created by koncord on 25.08.17.
 //
 
-#include "Spells.hpp"
-
 #include <components/openmw-mp/NetworkMessages.hpp>
+
 #include "Script/LuaState.hpp"
-#include "Player.hpp"
 #include "Networking.hpp"
 
+#include "Spells.hpp"
+#include "Player.hpp"
+
 void Effect::Init(LuaState &lua)
 {
     lua.getState()->new_usertype<Effect>("Effect",
diff --git a/apps/openmw-mp/Timer.cpp b/apps/openmw-mp/Timer.cpp
index c5b08f816..1eb727401 100644
--- a/apps/openmw-mp/Timer.cpp
+++ b/apps/openmw-mp/Timer.cpp
@@ -4,10 +4,11 @@
 
 #include <chrono>
 #include <memory>
-#include "Timer.hpp"
 
 #include "Script/LuaState.hpp"
 
+#include "Timer.hpp"
+
 using namespace std;
 
 void Timer::Init(LuaState &lua)