Merge branch 'miami' of github.com:GTAmodding/re3 into miami

GTAmodding · Dec 31, 2020 · c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7 · c74c7ce
2 parents 4d1305e + 9d29b33
commit c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7
Unified Split

Showing with 18 additions and 14 deletions.

+18 −14 src/render/SpecialFX.cpp
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
@@ -1385,20 +1385,24 @@ void
 CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity)
 {
 	uint32 i;
-	for(i = 0; i < NUMMONEYMESSAGES; i++)
+#ifdef FIX_BUGS
-		if(aMoneyMessages[i].m_nTimeRegistered != 0) break;
+	for(i = 0; i < NUMMONEYMESSAGES && aMoneyMessages[i].m_nTimeRegistered != 0; i++);
-	if(i == NUMMONEYMESSAGES) return;
+#else
-
+	for(i = 0; aMoneyMessages[i].m_nTimeRegistered != 0 && i < NUMMONEYMESSAGES; i++);
-	// Add data of this money message to the array
+#endif
-	AsciiToUnicode(pText, aMoneyMessages[i].m_aText);
+
-
+	if(i < NUMMONEYMESSAGES) {
-	aMoneyMessages[i].m_nTimeRegistered = CTimer::GetTimeInMilliseconds();
+		// Add data of this money message to the array
-	aMoneyMessages[i].m_vecPosition = vecPos;
+		AsciiToUnicode(pText, aMoneyMessages[i].m_aText);
-	aMoneyMessages[i].m_Colour.red = bRed;
+
-	aMoneyMessages[i].m_Colour.green = bGreen;
+		aMoneyMessages[i].m_nTimeRegistered = CTimer::GetTimeInMilliseconds();
-	aMoneyMessages[i].m_Colour.blue = bBlue;
+		aMoneyMessages[i].m_vecPosition = vecPos;
-	aMoneyMessages[i].m_fSize = fSize;
+		aMoneyMessages[i].m_Colour.red = bRed;
-	aMoneyMessages[i].m_fOpacity = fOpacity;
+		aMoneyMessages[i].m_Colour.green = bGreen;
+		aMoneyMessages[i].m_Colour.blue = bBlue;
+		aMoneyMessages[i].m_fSize = fSize;
+		aMoneyMessages[i].m_fOpacity = fOpacity;
+	}
 }
 
 CRGBA FoamColour(255, 255, 255, 255);