Remove not needed includes

McZapkie/MOVER.h

@@ -77,7 +77,6 @@ zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona
 ...
 */
 
-#include "utilities/utilities.h"
 
 /// <summary>Global counter incremented when a string-to-numeric conversion fails during config parsing.</summary>
 extern int ConversionError;

McZapkie/Mover.cpp

@@ -10,7 +10,6 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "MOVER.h"
 
-#include "utilities/utilities.h"
 #include "vehicle/DynObj.h"
 #include "Oerlikon_ESt.h"
 #include "utilities/Globals.h"

application/driverhints.cpp

@@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "vehicle/Driver.h"
 #include "utilities/Globals.h"
+#include "utilities/utilities.h"
 
 void
 TController::hint( driver_hint const Value, hintpredicate const Predicate, float const Predicateparameter ) {

application/drivermode.cpp

@@ -28,7 +28,6 @@ http://mozilla.org/MPL/2.0/.
 #include "input/messaging.h"
 #include "utilities/Timer.h"
 #include "rendering/renderer.h"
-#include "utilities/utilities.h"
 #include "utilities/Logs.h"
 /*
 namespace input {

application/driveruipanels.cpp

@@ -27,7 +27,6 @@ http://mozilla.org/MPL/2.0/.
 #include "vehicle/DynObj.h"
 #include "model/Model3d.h"
 #include "rendering/renderer.h"
-#include "utilities/utilities.h"
 #include "utilities/Logs.h"
 #include "widgets/vehicleparams.h"
 

application/editoruilayer.cpp

@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
 #include "application/editoruilayer.h"
 
 #include "utilities/Globals.h"
+#include "utilities/utilities.h"
 #include "scene/scenenode.h"
 #include "rendering/renderer.h"
 

application/editoruipanels.cpp

@@ -19,7 +19,6 @@ http://mozilla.org/MPL/2.0/.
 #include "world/MemCell.h"
 #include "application/editoruilayer.h"
 #include "rendering/renderer.h"
-#include "utilities/utilities.h"
 
 void itemproperties_panel::update(scene::basic_node const *Node)
 {

audio/audiorenderer.cpp

@@ -14,7 +14,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Globals.h"
 #include "vehicle/Camera.h"
 #include "utilities/Logs.h"
-#include "utilities/utilities.h"
 #include "simulation/simulation.h"
 #include "vehicle/Train.h"
 

environment/skydome.cpp

@@ -2,7 +2,6 @@
 #include "stdafx.h"
 #include "environment/skydome.h"
 #include "utilities/color.h"
-#include "utilities/utilities.h"
 #include "simulation/simulationenvironment.h"
 #include "utilities/Globals.h"
 

input/command.cpp

@@ -13,7 +13,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Globals.h"
 #include "utilities/Logs.h"
 #include "utilities/Timer.h"
-#include "utilities/utilities.h"
 #include "simulation/simulation.h"
 #include "vehicle/Train.h"
 

input/drivermouseinput.cpp

@@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/.
 
 #include "utilities/Globals.h"
 #include "application/application.h"
-#include "utilities/utilities.h"
 #include "utilities/Globals.h"
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"

launcher/scenery_scanner.h

@@ -2,7 +2,6 @@
 
 #include <filesystem>
 #include "model/Texture.h"
-#include "utilities/utilities.h"
 #include "utilities/parser.h"
 #include "textures_scanner.h"
 

model/Model3d.cpp

@@ -17,7 +17,6 @@ Copyright (C) 2001-2004  Marcin Wozniak, Maciej Czapkiewicz and others
 
 #include "utilities/Globals.h"
 #include "utilities/Logs.h"
-#include "utilities/utilities.h"
 #include "rendering/renderer.h"
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"

model/Texture.cpp

@@ -22,7 +22,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Logs.h"
 #include "utilities/utilities.h"
 #include "scene/sn_utils.h"
-#include "utilities/utilities.h"
 #include "rendering/flip-s3tc.h"
 #include "stb/stb_image.h"
 //#include <png.h>

model/material.cpp

@@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Logs.h"
 #include "scene/sn_utils.h"
 #include "utilities/Globals.h"
-#include "utilities/Logs.h"
 
 opengl_material::path_data opengl_material::paths;
 

model/vertex.h

@@ -9,8 +9,6 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "utilities/utilities.h"
-
 // geometry vertex with double precision position
 struct world_vertex {
 

rendering/opengl33renderer.cpp

@@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/.
 #include "vehicle/Camera.h"
 #include "simulation/simulation.h"
 #include "utilities/Logs.h"
-#include "utilities/utilities.h"
 #include "simulation/simulationtime.h"
 #include "application/application.h"
 #include "model/AnimModel.h"

rendering/opengllight.cpp

@@ -10,7 +10,6 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 
 #include "rendering/opengllight.h"
-#include "utilities/utilities.h"
 
 void
 opengl_light::apply_intensity( float const Factor ) {

rendering/openglrenderer.cpp

@@ -22,7 +22,6 @@ http://mozilla.org/MPL/2.0/.
 #include "world/Traction.h"
 #include "application/application.h"
 #include "utilities/Logs.h"
-#include "utilities/utilities.h"
 #include "rendering/openglgeometrybank.h"
 #include "rendering/openglcolor.h"
 #include "rendering/screenshot.h"

scene/scene.h

@@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/.
 #include "world/Traction.h"
 #include "audio/sound.h"
 #include "input/command.h"
+#include "utilities/utilities.h"
 
 class opengl_renderer;
 class opengl33_renderer;

simulation/simulationsounds.cpp

@@ -10,8 +10,6 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "simulation/simulationsounds.h"
 
-#include "utilities/utilities.h"
-
 namespace simulation {
 
 sound_overridemap Sound_overrides;

utilities/dictionary.cpp

@@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/dictionary.h"
 
 #include "simulation/simulation.h"
-#include "utilities/utilities.h"
 #include "vehicle/DynObj.h"
 #include "vehicle/Driver.h"
 #include "world/mtable.h"

utilities/parser.cpp

@@ -9,7 +9,6 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 #include "utilities/parser.h"
-#include "utilities/utilities.h"
 #include "utilities/Logs.h"
 
 #include "scene/scenenodegroups.h"

utilities/utilities.cpp

@@ -11,25 +11,26 @@ MaSzyna EU07 - SPKS
 Brakes.
 Copyright (C) 2007-2014 Maciej Cierniak
 */
-#include "stdafx.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
+//#include "stdafx.h"
+//
+//#include <sys/types.h>
+//#include <sys/stat.h>
 #include <ranges>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#ifdef WIN32
-#define stat _stat
-#endif
+//#ifndef WIN32
+//#include <unistd.h>
+//#endif
+//
+//#ifdef WIN32
+//#define stat _stat
+//#endif
 
 #include "utilities/utilities.h"
 #include "utilities/Globals.h"
 #include "utilities/parser.h"
 
-#include "utilities/Logs.h"
+//#include "utilities/Logs.h"
 
+// TODO: This shouldn't be in Globals?
 bool DebugModeFlag = false;
 bool FreeFlyModeFlag = false;
 bool EditorModeFlag = false;

utilities/utilities.h

@@ -10,12 +10,6 @@ http://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "stdafx.h"
-
-#include <string>
-#include <fstream>
-#include <ctime>
-#include <vector>
-#include <sstream>
 #include "utilities/parser.h"
 
 /*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/
@@ -34,6 +28,7 @@ template <typename T> constexpr T sq(T v)
 	return v * v;
 }
 
+// TODO: Shouldn't this be in globals?
 namespace paths
 {
 inline constexpr const char *scenery = "scenery/";

vehicle/Driver.h

@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include <string>
 #include "utilities/Classes.h"
+#include "utilities/utilities.h"
 #include "MOVER.h"
 #include "audio/sound.h"
 #include "vehicle/DynObj.h"

world/EvLaunch.cpp

@@ -24,7 +24,6 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/parser.h"
 #include "Console.h"
 #include "simulation/simulationtime.h"
-#include "utilities/utilities.h"
 
 //---------------------------------------------------------------------------
 

world/Segment.h

@@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/.
 
 #include "utilities/Classes.h"
 #include "rendering/geometrybank.h"
-#include "utilities/utilities.h"
 #include <glm/glm.hpp>
 
 struct map_colored_paths {