refactor(Core/Misc): headers cleanup (#9259)

src/tools/map_extractor/System.cpp

@@ -20,8 +20,8 @@
 #include <cstdio>
 #include <cstdlib>
 #include <deque>
-#include <set>
 #include <filesystem>
+#include <set>
 
 #ifdef _WIN32
 #include "direct.h"

src/tools/map_extractor/mpq_libmpq.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "mpq_libmpq04.h"
-#include <deque>
 #include <cstdio>
+#include <deque>
 
 ArchiveSet gOpenArchives;
 

src/tools/mesh_extractor/Cache.h

@@ -17,13 +17,13 @@
 
 #ifndef CACHE_H
 #define CACHE_H
-#include <string>
-#include <map>
 #include "Define.h"
-#include "PolicyLock.h"
-#include <mutex>
-#include "WorldModelRoot.h"
 #include "Model.h"
+#include "PolicyLock.h"
+#include "WorldModelRoot.h"
+#include <map>
+#include <mutex>
+#include <string>
 
 template<class K, class T>
 class GenericCache

src/tools/mesh_extractor/ChunkedData.h

@@ -18,8 +18,8 @@
 #ifndef CHNK_H
 #define CHNK_H
 
-#include <vector>
 #include "Chunk.h"
+#include <vector>
 
 class ChunkedData
 {

src/tools/mesh_extractor/ContinentBuilder.cpp

@@ -16,14 +16,14 @@
  */
 
 #include "ContinentBuilder.h"
-#include "TileBuilder.h"
-#include "WDT.h"
-#include "Utils.h"
-#include "DetourNavMesh.h"
 #include "Cache.h"
-#include <thread>
-#include "Recast.h"
 #include "DetourCommon.h"
+#include "DetourNavMesh.h"
+#include "Recast.h"
+#include "TileBuilder.h"
+#include "Utils.h"
+#include "WDT.h"
+#include <thread>
 
 class BuilderThread
 {

src/tools/mesh_extractor/ContinentBuilder.h

@@ -17,9 +17,9 @@
 
 #ifndef CONT_BUILDER_H
 #define CONT_BUILDER_H
-#include <string>
-#include "WDT.h"
 #include "Define.h"
+#include "WDT.h"
+#include <string>
 
 class ContinentBuilder
 {

src/tools/mesh_extractor/DBC.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cstdio>
 #include "DBC.h"
 #include "Define.h"
+#include <cstdio>
 
 DBC::DBC( FILE* stream ) : StringBlock(nullptr), StringBlockSize(0), IsFaulty(true)
 {

src/tools/mesh_extractor/DBC.h

@@ -17,9 +17,9 @@
 
 #ifndef DBC_H
 #define DBC_H
-#include <vector>
-#include <string>
 #include "Define.h"
+#include <string>
+#include <vector>
 
 class Record;
 

src/tools/mesh_extractor/DoodadHandler.cpp

@@ -16,10 +16,10 @@
  */
 
 #include "DoodadHandler.h"
-#include "Chunk.h"
 #include "Cache.h"
-#include "Model.h"
+#include "Chunk.h"
 #include "G3D/Matrix4.h"
+#include "Model.h"
 
 DoodadHandler::DoodadHandler( ADT* adt ) :
     ObjectDataHandler(adt), _definitions(nullptr), _paths(nullptr)

src/tools/mesh_extractor/DoodadHandler.h

@@ -17,10 +17,10 @@
 
 #ifndef DOOADHNDL_H
 #define DOOADHNDL_H
-#include "ObjectDataHandler.h"
-#include "Utils.h"
 #include "Chunk.h"
 #include "Model.h"
+#include "ObjectDataHandler.h"
+#include "Utils.h"
 #include <set>
 #include <vector>
 

src/tools/mesh_extractor/Geometry.cpp

@@ -16,10 +16,10 @@
  */
 
 #include "Geometry.h"
-#include "Constants.h"
 #include "ADT.h"
-#include "WorldModelHandler.h"
+#include "Constants.h"
 #include "DoodadHandler.h"
+#include "WorldModelHandler.h"
 #include <limits.h>
 
 Geometry::Geometry() : Transform(false)

src/tools/mesh_extractor/LiquidHandler.h

@@ -18,8 +18,8 @@
 #ifndef LIQUID_H
 #define LIQUID_H
 #include "ADT.h"
-#include "Utils.h"
 #include "Define.h"
+#include "Utils.h"
 
 #include <vector>
 

src/tools/mesh_extractor/MPQ.cpp

@@ -17,8 +17,8 @@
 
 #include "MPQ.h"
 #include "MPQMgr.h"
-#include <deque>
 #include <cstdio>
+#include <deque>
 
 MPQArchive::MPQArchive(const char* filename)
 {

src/tools/mesh_extractor/MPQ.h

@@ -18,14 +18,14 @@
 #ifndef MPQ_H
 #define MPQ_H
 
-#include "libmpq/mpq.h"
 #include "Define.h"
 #include "Errors.h"
-#include <string>
+#include "libmpq/mpq.h"
 #include <ctype.h>
-#include <vector>
-#include <iostream>
 #include <deque>
+#include <iostream>
+#include <string>
+#include <vector>
 
 class MPQArchive
 {

src/tools/mesh_extractor/MPQMgr.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "MPQMgr.h"
-#include "MPQ.h"
 #include "DBC.h"
+#include "MPQ.h"
 #include "Utils.h"
 
 char const* MPQMgr::Files[] =

src/tools/mesh_extractor/MPQMgr.h

@@ -20,9 +20,9 @@
 
 #include "MPQ.h"
 #include "PolicyLock.h"
+#include <map>
 #include <mutex>
 #include <set>
-#include <map>
 
 class DBC;
 class MPQMgr

src/tools/mesh_extractor/MapChunk.h

@@ -18,8 +18,8 @@
 #ifndef MAPCHUNK_H
 #define MAPCHUNK_H
 #include "Chunk.h"
-#include "Utils.h"
 #include "Constants.h"
+#include "Utils.h"
 #include <vector>
 class ADT;
 

src/tools/mesh_extractor/MeshExtractor.cpp

@@ -15,17 +15,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MPQMgr.h"
-#include "WDT.h"
-#include "ContinentBuilder.h"
 #include "Cache.h"
-#include "DBC.h"
 #include "Constants.h"
+#include "ContinentBuilder.h"
+#include "DBC.h"
+#include "MPQMgr.h"
 #include "Model.h"
+#include "WDT.h"
 
-#include "Recast.h"
 #include "DetourNavMesh.h"
 #include "DetourNavMeshQuery.h"
+#include "Recast.h"
 
 #include <stdio.h>
 

src/tools/mesh_extractor/Model.h

@@ -17,8 +17,8 @@
 
 #ifndef MODEL_H
 #define MODEL_H
-#include <vector>
 #include "Utils.h"
+#include <vector>
 
 class Model
 {

src/tools/mesh_extractor/ObjectDataHandler.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "ObjectDataHandler.h"
-#include "Chunk.h"
 #include "ADT.h"
+#include "Chunk.h"
 #include "ChunkedData.h"
 
 void ObjectDataHandler::ProcessMapChunk( MapChunk* chunk )

src/tools/mesh_extractor/TileBuilder.cpp

@@ -15,18 +15,18 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ContinentBuilder.h"
 #include "TileBuilder.h"
-#include "Geometry.h"
-#include "WorldModelRoot.h"
-#include "Constants.h"
-#include "Utils.h"
-#include "Cache.h"
 #include "ADT.h"
-#include "WDT.h"
+#include "Cache.h"
+#include "Constants.h"
+#include "ContinentBuilder.h"
+#include "DetourNavMeshBuilder.h"
+#include "Geometry.h"
 #include "Recast.h"
 #include "RecastAlloc.h"
-#include "DetourNavMeshBuilder.h"
+#include "Utils.h"
+#include "WDT.h"
+#include "WorldModelRoot.h"
 
 TileBuilder::TileBuilder(ContinentBuilder* _cBuilder, std::string world, int x, int y, uint32 mapId) :
     World(world), X(x), Y(y), MapId(mapId), _Geometry(nullptr), DataSize(0), cBuilder(_cBuilder)

src/tools/mesh_extractor/TileBuilder.h

@@ -17,8 +17,8 @@
 
 #ifndef TILE_BUILD_H
 #define TILE_BUILD_H
-#include <string>
 #include "Recast.h"
+#include <string>
 
 #include "Geometry.h"
 #include "WorldModelRoot.h"

src/tools/mesh_extractor/Utils.cpp

@@ -16,11 +16,11 @@
  */
 
 #include "Utils.h"
-#include "WorldModelHandler.h"
 #include "Constants.h"
-#include <cstring>
 #include "G3D/Matrix4.h"
 #include "G3D/Quat.h"
+#include "WorldModelHandler.h"
+#include <cstring>
 
 #ifdef _WIN32
 #include "direct.h"

src/tools/mesh_extractor/Utils.h

@@ -19,14 +19,14 @@
 #define UTILS_H
 
 #include <cstdio>
-#include <string>
 #include <sstream>
+#include <string>
 
-#include "G3D/Matrix4.h"
 #include "DetourNavMesh.h"
+#include "G3D/Matrix4.h"
 
-#include "Define.h"
 #include "Constants.h"
+#include "Define.h"
 
 struct WorldModelDefinition;
 class DoodadDefinition;

src/tools/mesh_extractor/WorldModelGroup.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "WorldModelGroup.h"
-#include "ChunkedData.h"
 #include "Chunk.h"
+#include "ChunkedData.h"
 #include "Utils.h"
 
 WorldModelGroup::WorldModelGroup( std::string path, int groupIndex ) : GroupIndex(groupIndex), MOBA(nullptr), IsBad(false), HasLiquidData(false)

src/tools/mesh_extractor/WorldModelHandler.cpp

@@ -16,13 +16,13 @@
  */
 
 #include "WorldModelHandler.h"
-#include "WorldModelRoot.h"
-#include "Chunk.h"
 #include "Cache.h"
-#include "Model.h"
+#include "Chunk.h"
 #include "Define.h"
 #include "G3D/Matrix4.h"
 #include "G3D/Quat.h"
+#include "Model.h"
+#include "WorldModelRoot.h"
 #include <cstdio>
 
 WorldModelDefinition WorldModelDefinition::Read( FILE* file )

src/tools/mesh_extractor/WorldModelHandler.h

@@ -18,9 +18,9 @@
 #ifndef WMODEL_HNDL_H
 #define WMODEL_HNDL_H
 #include "Define.h"
+#include "ObjectDataHandler.h"
 #include "Utils.h"
 #include "WorldModelRoot.h"
-#include "ObjectDataHandler.h"
 
 #include <set>
 #include <vector>

src/tools/mmaps_generator/IntermediateValues.h

@@ -18,10 +18,10 @@
 #ifndef _INTERMEDIATE_VALUES_H
 #define _INTERMEDIATE_VALUES_H
 
-#include "PathCommon.h"
-#include "TerrainBuilder.h"
-#include "Recast.h"
 #include "DetourNavMesh.h"
+#include "PathCommon.h"
+#include "Recast.h"
+#include "TerrainBuilder.h"
 
 namespace MMAP
 {

src/tools/mmaps_generator/MapBuilder.h

@@ -18,19 +18,19 @@
 #ifndef _MAP_BUILDER_H
 #define _MAP_BUILDER_H
 
-#include <list>
-#include <vector>
-#include <set>
 #include <atomic>
+#include <list>
 #include <map>
+#include <set>
 #include <thread>
+#include <vector>
 
-#include "TerrainBuilder.h"
 #include "IntermediateValues.h"
+#include "TerrainBuilder.h"
 
-#include "Recast.h"
 #include "DetourNavMesh.h"
 #include "PCQueue.h"
+#include "Recast.h"
 
 using namespace VMAP;
 

src/tools/mmaps_generator/PathGenerator.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "PathCommon.h"
 #include "MapBuilder.h"
+#include "PathCommon.h"
 #include "Timer.h"
 
 using namespace MMAP;

src/tools/mmaps_generator/TerrainBuilder.cpp

@@ -16,12 +16,12 @@
  */
 
 #include "TerrainBuilder.h"
-#include "PathCommon.h"
 #include "MapBuilder.h"
 #include "MapDefines.h"
-#include "VMapMgr2.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
+#include "PathCommon.h"
+#include "VMapMgr2.h"
 #include <vector>
 
 // ******************************************

src/tools/vmap4_assembler/VMapAssembler.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "TileAssembler.h"
 

src/tools/vmap4_extractor/adtfile.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vmapexport.h"
 #include "adtfile.h"
+#include "vmapexport.h"
 #include <algorithm>
 #include <cstdio>
 

src/tools/vmap4_extractor/adtfile.h

@@ -18,9 +18,9 @@
 #ifndef ADT_H
 #define ADT_H
 
+#include "model.h"
 #include "mpq_libmpq04.h"
 #include "wmo.h"
-#include "model.h"
 
 #define TILESIZE (533.33333f)
 #define CHUNKSIZE ((TILESIZE) / 16.0f)

src/tools/vmap4_extractor/gameobject_extract.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "model.h"
-#include "dbcfile.h"
 #include "adtfile.h"
+#include "dbcfile.h"
+#include "model.h"
 #include "vmapexport.h"
 #include <algorithm>
 #include <cstdio>

src/tools/vmap4_extractor/model.cpp

@@ -15,14 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vmapexport.h"
 #include "model.h"
-#include "wmo.h"
 #include "adtfile.h"
-#include <cassert>
 #include "mpq_libmpq04.h"
+#include "vmapexport.h"
+#include "wmo.h"
 #include <G3D/Quat.h>
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <limits>
 

src/tools/vmap4_extractor/model.h

@@ -19,8 +19,8 @@
 #define MODEL_H
 
 #include "loadlib/loadlib.h"
-#include "vec3d.h"
 #include "modelheaders.h"
+#include "vec3d.h"
 #include <vector>
 
 class MPQFile;

src/tools/vmap4_extractor/mpq_libmpq.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "mpq_libmpq04.h"
-#include <deque>
 #include <cstdio>
+#include <deque>
 
 ArchiveSet gOpenArchives;
 

src/tools/vmap4_extractor/vec3d.h

@@ -18,8 +18,8 @@
 #ifndef VEC3D_H
 #define VEC3D_H
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
 class Vec3D
 {

src/tools/vmap4_extractor/vmapexport.cpp

@@ -21,8 +21,8 @@
 #include <iostream>
 #include <list>
 #include <map>
-#include <vector>
 #include <sys/stat.h>
+#include <vector>
 
 #ifdef WIN32
 #include <Windows.h>
@@ -33,19 +33,13 @@
 #undef min
 #undef max
 
-//#pragma warning(disable : 4505)
-//#pragma comment(lib, "Winmm.lib")
-
-#include <map>
-
 //From Extractor
-#include "adtfile.h"
-#include "wdtfile.h"
-#include "dbcfile.h"
-#include "wmo.h"
-#include "mpq_libmpq04.h"
-
 #include "vmapexport.h"
+#include "adtfile.h"
+#include "dbcfile.h"
+#include "mpq_libmpq04.h"
+#include "wdtfile.h"
+#include "wmo.h"
 
 //------------------------------------------------------------------------------
 // Defines

src/tools/vmap4_extractor/wdtfile.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vmapexport.h"
 #include "wdtfile.h"
 #include "adtfile.h"
+#include "vmapexport.h"
 
 #include <cstdio>
 

src/tools/vmap4_extractor/wmo.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "adtfile.h"
 #include "wmo.h"
+#include "adtfile.h"
 #include "vec3d.h"
 #include "vmapexport.h"
 #include <cassert>