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

This commit is contained in:
aap 2021-01-01 00:03:16 +01:00
commit c74c7ce1d4

View File

@ -1385,10 +1385,13 @@ 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++)
if(aMoneyMessages[i].m_nTimeRegistered != 0) break;
if(i == NUMMONEYMESSAGES) return;
#ifdef FIX_BUGS
for(i = 0; i < NUMMONEYMESSAGES && aMoneyMessages[i].m_nTimeRegistered != 0; i++);
#else
for(i = 0; aMoneyMessages[i].m_nTimeRegistered != 0 && i < NUMMONEYMESSAGES; i++);
#endif
if(i < NUMMONEYMESSAGES) {
// Add data of this money message to the array
AsciiToUnicode(pText, aMoneyMessages[i].m_aText);
@ -1400,6 +1403,7 @@ CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8
aMoneyMessages[i].m_fSize = fSize;
aMoneyMessages[i].m_fOpacity = fOpacity;
}
}
CRGBA FoamColour(255, 255, 255, 255);
unsigned int CSpecialParticleStuff::BoatFromStart;