From ca699d117f2438aac82896ed51ccdd9a27abc4a5 Mon Sep 17 00:00:00 2001
From: docentYT <63965954+docentYT@users.noreply.github.com>
Date: Sat, 2 May 2026 14:40:31 +0200
Subject: [PATCH] Remove not needed includes
---
McZapkie/MOVER.h | 1 -
McZapkie/Mover.cpp | 1 -
application/driverhints.cpp | 1 +
application/drivermode.cpp | 1 -
application/driveruipanels.cpp | 1 -
application/editoruilayer.cpp | 1 +
application/editoruipanels.cpp | 1 -
audio/audiorenderer.cpp | 1 -
environment/skydome.cpp | 1 -
input/command.cpp | 1 -
input/drivermouseinput.cpp | 1 -
launcher/scenery_scanner.h | 1 -
model/Model3d.cpp | 1 -
model/Texture.cpp | 1 -
model/material.cpp | 1 -
model/vertex.h | 2 --
rendering/opengl33renderer.cpp | 1 -
rendering/opengllight.cpp | 1 -
rendering/openglrenderer.cpp | 1 -
scene/scene.h | 1 +
simulation/simulationsounds.cpp | 2 --
utilities/dictionary.cpp | 1 -
utilities/parser.cpp | 1 -
utilities/utilities.cpp | 25 +++++++++++++------------
utilities/utilities.h | 7 +------
vehicle/Driver.h | 1 +
world/EvLaunch.cpp | 1 -
world/Segment.h | 1 -
28 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h
index 32e16081..6c618d1e 100644
--- a/McZapkie/MOVER.h
+++ b/McZapkie/MOVER.h
@@ -77,7 +77,6 @@ zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona
...
*/
-#include "utilities/utilities.h"
/// Global counter incremented when a string-to-numeric conversion fails during config parsing.
extern int ConversionError;
diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index 8e477746..89a16d91 100644
--- a/McZapkie/Mover.cpp
+++ b/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"
diff --git a/application/driverhints.cpp b/application/driverhints.cpp
index 792b2bd2..fd1e6e05 100644
--- a/application/driverhints.cpp
+++ b/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 ) {
diff --git a/application/drivermode.cpp b/application/drivermode.cpp
index 1aec7a7a..1e4c5816 100644
--- a/application/drivermode.cpp
+++ b/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 {
diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp
index 5cf8e463..538ce8f7 100644
--- a/application/driveruipanels.cpp
+++ b/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"
diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp
index 0a225fe3..d87dd8fa 100644
--- a/application/editoruilayer.cpp
+++ b/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"
diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp
index db85b2c4..e2de630c 100644
--- a/application/editoruipanels.cpp
+++ b/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)
{
diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp
index f8a1ffed..20f7a64c 100644
--- a/audio/audiorenderer.cpp
+++ b/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"
diff --git a/environment/skydome.cpp b/environment/skydome.cpp
index 178a445e..3729214e 100644
--- a/environment/skydome.cpp
+++ b/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"
diff --git a/input/command.cpp b/input/command.cpp
index b963905b..73d0b40b 100644
--- a/input/command.cpp
+++ b/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"
diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp
index f5a67108..8324bd1c 100644
--- a/input/drivermouseinput.cpp
+++ b/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"
diff --git a/launcher/scenery_scanner.h b/launcher/scenery_scanner.h
index 573c2994..44854438 100644
--- a/launcher/scenery_scanner.h
+++ b/launcher/scenery_scanner.h
@@ -2,7 +2,6 @@
#include
#include "model/Texture.h"
-#include "utilities/utilities.h"
#include "utilities/parser.h"
#include "textures_scanner.h"
diff --git a/model/Model3d.cpp b/model/Model3d.cpp
index 1e2d5a16..ac3f9f3b 100644
--- a/model/Model3d.cpp
+++ b/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"
diff --git a/model/Texture.cpp b/model/Texture.cpp
index 1adea69b..91e62f8b 100644
--- a/model/Texture.cpp
+++ b/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
diff --git a/model/material.cpp b/model/material.cpp
index e0b04475..24b63752 100644
--- a/model/material.cpp
+++ b/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;
diff --git a/model/vertex.h b/model/vertex.h
index 316102a6..d3ec3eb9 100644
--- a/model/vertex.h
+++ b/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 {
diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp
index af9420b9..43fef6b4 100644
--- a/rendering/opengl33renderer.cpp
+++ b/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"
diff --git a/rendering/opengllight.cpp b/rendering/opengllight.cpp
index 61287d30..79ce967c 100644
--- a/rendering/opengllight.cpp
+++ b/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 ) {
diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp
index e0bdbca8..868e5122 100644
--- a/rendering/openglrenderer.cpp
+++ b/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"
diff --git a/scene/scene.h b/scene/scene.h
index 31ae66e2..f63a7f9e 100644
--- a/scene/scene.h
+++ b/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;
diff --git a/simulation/simulationsounds.cpp b/simulation/simulationsounds.cpp
index 43005589..fc11fc84 100644
--- a/simulation/simulationsounds.cpp
+++ b/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;
diff --git a/utilities/dictionary.cpp b/utilities/dictionary.cpp
index 244b5a51..70739847 100644
--- a/utilities/dictionary.cpp
+++ b/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"
diff --git a/utilities/parser.cpp b/utilities/parser.cpp
index 9631ebb9..7ee52777 100644
--- a/utilities/parser.cpp
+++ b/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"
diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp
index 8f734910..639292a9 100644
--- a/utilities/utilities.cpp
+++ b/utilities/utilities.cpp
@@ -11,25 +11,26 @@ MaSzyna EU07 - SPKS
Brakes.
Copyright (C) 2007-2014 Maciej Cierniak
*/
-#include "stdafx.h"
-
-#include
-#include
+//#include "stdafx.h"
+//
+//#include
+//#include
#include
-#ifndef WIN32
-#include
-#endif
-
-#ifdef WIN32
-#define stat _stat
-#endif
+//#ifndef WIN32
+//#include
+//#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;
diff --git a/utilities/utilities.h b/utilities/utilities.h
index 88fabbd3..6c0b9d2b 100644
--- a/utilities/utilities.h
+++ b/utilities/utilities.h
@@ -10,12 +10,6 @@ http://mozilla.org/MPL/2.0/.
#pragma once
#include "stdafx.h"
-
-#include
-#include
-#include
-#include
-#include
#include "utilities/parser.h"
/*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/
@@ -34,6 +28,7 @@ template constexpr T sq(T v)
return v * v;
}
+// TODO: Shouldn't this be in globals?
namespace paths
{
inline constexpr const char *scenery = "scenery/";
diff --git a/vehicle/Driver.h b/vehicle/Driver.h
index 40f05ba8..84dbbe55 100644
--- a/vehicle/Driver.h
+++ b/vehicle/Driver.h
@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
#include
#include "utilities/Classes.h"
+#include "utilities/utilities.h"
#include "MOVER.h"
#include "audio/sound.h"
#include "vehicle/DynObj.h"
diff --git a/world/EvLaunch.cpp b/world/EvLaunch.cpp
index a59af9d1..01c56dd6 100644
--- a/world/EvLaunch.cpp
+++ b/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"
//---------------------------------------------------------------------------
diff --git a/world/Segment.h b/world/Segment.h
index f678048a..fe69c864 100644
--- a/world/Segment.h
+++ b/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
struct map_colored_paths {