summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-16 14:44:59 +0100
committershfil <filip.gawin@zoho.com>2021-01-17 21:32:54 +0100
commit5a47379bf5f011a65c1d0f88a0cb5f2130feb9db (patch)
treed3b13533c6058d2b26035d180e4a7e8b735c283c /src/control
parentvehicle fixes (diff)
downloadre3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar.gz
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar.bz2
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar.lz
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar.xz
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.tar.zst
re3-5a47379bf5f011a65c1d0f88a0cb5f2130feb9db.zip
Diffstat (limited to '')
-rw-r--r--src/control/Darkel.cpp2
-rw-r--r--src/control/Garages.h3
-rw-r--r--src/control/Script.h4
-rw-r--r--src/control/Script3.cpp1
-rw-r--r--src/control/Script4.cpp1
5 files changed, 6 insertions, 5 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index 91d2163d..9f6809df 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -126,7 +126,7 @@ CDarkel::DrawMessages()
#if defined(PS2_HUD) || defined(FIX_BUGS)
#ifdef FIX_BUGS
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(34.0f - 1.0f), SCREEN_SCALE_Y(108.0f + 1.0f), gUString);
- #else -
+ #else
CFont::PrintString(SCREEN_WIDTH-(34.0f - 1.0f), 108.0f + 1.0f, gUString);
#endif
#else
diff --git a/src/control/Garages.h b/src/control/Garages.h
index ee5ac4d3..3a8bc08d 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 c0b69e0f..ff1a9706 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"
@@ -36,9 +34,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 27277f0e..6e6e15bf 100644
--- a/src/control/Script3.cpp
+++ b/src/control/Script3.cpp
@@ -32,6 +32,7 @@
#include "WaterLevel.h"
#include "Weather.h"
#include "Zones.h"
+#include "Wanted.h"
int8 CRunningScript::ProcessCommands500To599(int32 command)
{
diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index d17334a9..6fea8807 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -38,6 +38,7 @@
#include "WaterLevel.h"
#include "World.h"
#include "Zones.h"
+#include "Wanted.h"
int8 CRunningScript::ProcessCommands800To899(int32 command)
{