From fc0498b3a8029a6bb85cd00df4775cbe679338e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 6 Jun 2020 19:25:37 +0300
Subject: CFont crash workaround

---
 src/core/ControllerConfig.cpp |  6 +++++-
 src/peds/Ped.cpp              |  1 -
 src/render/Font.cpp           | 26 +++++++++++++++++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index e48f2c3f..2a5d20f0 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -437,9 +437,9 @@ void CControllerConfigManager::InitialiseControllerActionNameArray()
 	SETACTIONNAME(PED_CYCLE_TARGET_LEFT);
 	SETACTIONNAME(PED_CYCLE_TARGET_RIGHT);
 	SETACTIONNAME(PED_CENTER_CAMERA_BEHIND_PLAYER);
+	SETACTIONNAME(VEHICLE_LOOKBEHIND);
 	SETACTIONNAME(PED_DUCK);
 	SETACTIONNAME(PED_ANSWER_PHONE);
-	SETACTIONNAME(VEHICLE_LOOKBEHIND);
 	SETACTIONNAME(VEHICLE_LOOKLEFT);
 	SETACTIONNAME(VEHICLE_LOOKRIGHT);
 	SETACTIONNAME(VEHICLE_HORN);
@@ -462,6 +462,10 @@ void CControllerConfigManager::InitialiseControllerActionNameArray()
 	SETACTIONNAME(GO_RIGHT);
 	SETACTIONNAME(GO_FORWARD);
 	SETACTIONNAME(GO_BACK);
+	SETACTIONNAME(VEHICLE_TURRETLEFT);
+	SETACTIONNAME(VEHICLE_TURRETRIGHT);
+	SETACTIONNAME(VEHICLE_TURRETUP);
+	SETACTIONNAME(VEHICLE_TURRETDOWN);
 	SETACTIONNAME(NETWORK_TALK);
 	SETACTIONNAME(TOGGLE_DPAD);
 	SETACTIONNAME(SWITCH_DEBUG_CAM_ON);
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index cab14aff..2ad1fffa 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -6955,7 +6955,6 @@ CPed::ExitCar(void)
 				// TODO(Miami): What are those?
 				if (m_vehEnterType == 18 || m_vehEnterType == 8) {
 					((CBike*)m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNARMED, 0, this, false);
-					return;
 				}
 			} else if (m_pMyVehicle->IsCar()) {
 				if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS)) {
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index ef665fae..42637390 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -936,15 +936,27 @@ CFont::GetStringWidth(wchar *s, bool spaces)
 	} else
 #endif
 	{
-		for (; (*s != ' ' || spaces) && *s != '\0'; s++) {
-			if (*s == '~') {
-				s++;
-				while (*s != '~') s++;
+		for (wchar c = *s; (c != ' ' || spaces) && c != '\0'; c = *(++s)) {
+			if (c == '~') {
+
+				// This is original code
+#if 0
 				s++;
-				if (*s == ' ' && !spaces)
-					break;
+				while (*s != '~') {
+					s++;
+				}
+#else
+				// TODO(Miami): This is my code to prevent fuck up until InsertPlayerControlKeysInString is done 
+				if (*(s + 1) != '~') {
+					s++;
+					while (*s != '~') {
+						s++;
+					}
+				}
+#endif
+			} else {
+				w += GetCharacterSize(c - ' ');
 			}
-			w += GetCharacterSize(*s - ' ');
 		}
 	}
 	return w;
-- 
cgit v1.2.3