From f71953077d2412c4542e616cc9748217dfe046c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Tue, 29 Sep 2020 22:53:12 +0300
Subject: Population and many small classes done, mouse AUX buttons, Frontend,
 Hud, fixes

---
 src/control/GameLogic.cpp | 2 +-
 src/control/PathFind.cpp  | 4 ++--
 src/control/PathFind.h    | 3 ++-
 src/control/Phones.cpp    | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/control')

diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index c5394e7c..573720be 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -380,7 +380,7 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
 	CStats::CheckPointReachedUnsuccessfully();
 	CWorld::Remove(pPlayerPed);
 	CWorld::Add(pPlayerPed);
-	//CHud::ResetWastedText() // TODO(MIAMI)
+	CHud::ResetWastedText();
 	CStreaming::StreamZoneModels(pos);
 	clearWaterDrop = true;
 }
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 81d87b05..e85893e6 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1872,8 +1872,8 @@ CPathFind::TakeWidthIntoAccountForWandering(CPathNode* nextNode, uint16 random)
 void
 CPathFind::TakeWidthIntoAccountForCoors(CPathNode* node1, CPathNode* node2, uint16 random, float* x, float* y)
 {
-	*x += (Min(node1->width, node2->width) * ((random % 16) - 7));
-	*y += (Min(node1->width, node2->width) * (((random / 16) % 16) - 7));
+	*x += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * ((random % 16) - 7));
+	*y += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * (((random / 16) % 16) - 7));
 }
 
 CPathNode*
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index 013d9d31..820d0b86 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -6,6 +6,7 @@ class CVehicle;
 class CPtrList;
 
 #define LANE_WIDTH 5.0f
+#define WIDTH_TO_PED_NODE_WIDTH (31.f/(500.f * 8.f))
 
 enum
 {
@@ -89,7 +90,7 @@ struct CPathNode
 	float GetZ(void) { return z/8.0f; }
 	bool HasDivider(void) { return width != 0; }
 	float GetDividerWidth(void) { return width/(2*8.0f); }
-	float GetPedNodeWidth(void) { return width*(31.f/(500.f * 8.f)); }
+	float GetPedNodeWidth(void) { return width*WIDTH_TO_PED_NODE_WIDTH; }
 	CPathNode *GetPrev(void);
 	CPathNode *GetNext(void);
 	void SetPrev(CPathNode *node);
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index 4f1703f2..7f8677ec 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -17,6 +17,8 @@
 #include "Replay.h"
 #endif
 
+// --MIAMI: file done
+
 CPhoneInfo gPhoneInfo;
 
 bool CPhoneInfo::bDisplayingPhoneMessage;  // is phone picked up
-- 
cgit v1.2.3