From 63951d9b957b30a110f42a03edb4833cbbaf380e Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 17 Apr 2020 19:30:57 +0200
Subject: Part one

---
 src/core/CrimeType.h    | 23 +++++++++++++++++++++++
 src/core/Game.cpp       |  2 +-
 src/core/General.h      |  2 +-
 src/core/Pad.cpp        |  2 +-
 src/core/PlayerInfo.cpp |  2 +-
 src/core/Wanted.h       | 22 +---------------------
 src/core/common.h       |  4 ++--
 7 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 src/core/CrimeType.h

(limited to 'src/core')

diff --git a/src/core/CrimeType.h b/src/core/CrimeType.h
new file mode 100644
index 00000000..23f609eb
--- /dev/null
+++ b/src/core/CrimeType.h
@@ -0,0 +1,23 @@
+#pragma once
+
+enum eCrimeType
+{
+	CRIME_NONE,
+	CRIME_POSSESSION_GUN,
+	CRIME_HIT_PED,
+	CRIME_HIT_COP,
+	CRIME_SHOOT_PED,
+	CRIME_SHOOT_COP,
+	CRIME_STEAL_CAR,
+	CRIME_RUN_REDLIGHT,
+	CRIME_RECKLESS_DRIVING,
+	CRIME_SPEEDING,
+	CRIME_RUNOVER_PED,
+	CRIME_RUNOVER_COP,
+	CRIME_SHOOT_HELI,
+	CRIME_PED_BURNED,
+	CRIME_COP_BURNED,
+	CRIME_VEHICLE_BURNED,
+	CRIME_DESTROYED_CESSNA,
+	NUM_CRIME_TYPES
+};
\ No newline at end of file
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 7ccf78d0..8b2f8604 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -72,7 +72,7 @@
 #include "Streaming.h"
 #include "SurfaceTable.h"
 #include "TempColModels.h"
-#include "TimeCycle.h"
+#include "Timecycle.h"
 #include "TrafficLights.h"
 #include "Train.h"
 #include "TxdStore.h"
diff --git a/src/core/General.h b/src/core/General.h
index 77828854..103bafde 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -124,7 +124,7 @@ public:
 	static bool faststricmp(const char *str1, const char *str2)
 	{
 		for (; *str1; str1++, str2++) {
-#if MUCH_SLOWER
+#if 1
 			if (toupper(*str1) != toupper(*str2))
 #else
 			if (__ascii_toupper(*str1) != __ascii_toupper(*str2))
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 86aff05e..49affbbe 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -6,7 +6,7 @@
 
 #include "common.h"
 #ifdef XINPUT
-#include <Xinput.h>
+#include <xinput.h>
 #pragma comment( lib, "Xinput9_1_0.lib" )
 #endif
 
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index cfa0cea4..3852f540 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -180,7 +180,7 @@ CPlayerInfo::MakePlayerSafe(bool toggle)
 		m_pPed->bExplosionProof = true;
 		m_pPed->m_bCanBeDamaged = false;
 		((CPlayerPed*)m_pPed)->ClearAdrenaline();
-		CancelPlayerEnteringCars(false);
+		CancelPlayerEnteringCars(nil);
 		gFireManager.ExtinguishPoint(GetPos(), 4000.0f);
 		CExplosion::RemoveAllExplosionsInArea(GetPos(), 4000.0f);
 		CProjectileInfo::RemoveAllProjectiles();
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
index afeec8b0..c5e9d388 100644
--- a/src/core/Wanted.h
+++ b/src/core/Wanted.h
@@ -3,27 +3,7 @@
 class CEntity;
 class CCopPed;
 
-enum eCrimeType
-{
-	CRIME_NONE,
-	CRIME_POSSESSION_GUN,
-	CRIME_HIT_PED,
-	CRIME_HIT_COP,
-	CRIME_SHOOT_PED,
-	CRIME_SHOOT_COP,
-	CRIME_STEAL_CAR,
-	CRIME_RUN_REDLIGHT,
-	CRIME_RECKLESS_DRIVING,
-	CRIME_SPEEDING,
-	CRIME_RUNOVER_PED,
-	CRIME_RUNOVER_COP,
-	CRIME_SHOOT_HELI,
-	CRIME_PED_BURNED,
-	CRIME_COP_BURNED,
-	CRIME_VEHICLE_BURNED,
-	CRIME_DESTROYED_CESSNA,
-	NUM_CRIME_TYPES
-};
+#include "CrimeType.h"
 
 class CCrimeBeingQd
 {
diff --git a/src/core/common.h b/src/core/common.h
index 454b848a..e10b222c 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -12,7 +12,7 @@
 #include <math.h>
 
 #ifdef WITHWINDOWS
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 #ifdef WITHD3D
@@ -62,7 +62,7 @@ typedef int64_t int64;
 typedef uint16_t wchar;
 
 #ifndef nil
-#define nil nullptr
+#define nil NULL
 #endif
 
 #include "config.h"
-- 
cgit v1.2.3