From f85b5e99edfb2e1b9a4563cacc96892195eee379 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sat, 16 Jan 2021 16:44:59 +0300
Subject: Includes overhaul, fix some compiler warnings

---
 src/control/Garages.h   | 3 +--
 src/control/Script.h    | 4 ++--
 src/control/Script3.cpp | 1 +
 src/control/Script4.cpp | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/control')

diff --git a/src/control/Garages.h b/src/control/Garages.h
index 3d12d4a2..39327e4e 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -1,11 +1,10 @@
 #pragma once
-#include "Automobile.h"
 #include "audio_enums.h"
 #include "Camera.h"
 #include "config.h"
+#include "Lists.h"
 
 class CVehicle;
-class CCamera;
 
 enum eGarageState
 {
diff --git a/src/control/Script.h b/src/control/Script.h
index ae984c59..a45e11cf 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -1,7 +1,5 @@
 #pragma once
-#include "common.h"
 #include "Font.h"
-#include "Ped.h"
 #include "PedType.h"
 #include "Text.h"
 #include "Sprite2d.h"
@@ -38,9 +36,11 @@ void FlushLog();
 #define SPHERE_MARKER_PULSE_FRACTION 0.1f
 
 #ifdef USE_PRECISE_MEASUREMENT_CONVERTION
+#define MILES_IN_METER (0.000621371192f)
 #define METERS_IN_FOOT (0.3048f)
 #define FEET_IN_METER (3.28084f)
 #else
+#define MILES_IN_METER (1 / 1670.f)
 #define METERS_IN_FOOT (0.3f)
 #define FEET_IN_METER (3.33f)
 #endif
diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp
index aba06d03..1ac18fa8 100644
--- a/src/control/Script3.cpp
+++ b/src/control/Script3.cpp
@@ -34,6 +34,7 @@
 #include "Zones.h"
 #include "GameLogic.h"
 #include "Bike.h"
+#include "Wanted.h"
 
 int8 CRunningScript::ProcessCommands500To599(int32 command)
 {
diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index 51dc14d3..9830f0dc 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -39,6 +39,7 @@
 #include "World.h"
 #include "Zones.h"
 #include "Bike.h"
+#include "Wanted.h"
 
 #ifdef FIX_BUGS
 static bool IsSlideObjectUsedWrongByScript(const CVector& posTarget, const CVector& slideBy)
-- 
cgit v1.2.3