CMoneyMessages::RegisterOne v2

This commit is contained in:
Filip Gawin 2020-12-31 22:09:25 +01:00
parent 31000fb4f0
commit e9288dd005

View File

@ -1092,10 +1092,13 @@ void
CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity) CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity)
{ {
uint32 i; 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++);
#endif
if(i < NUMMONEYMESSAGES) {
// Add data of this money message to the array // Add data of this money message to the array
AsciiToUnicode(pText, aMoneyMessages[i].m_aText); AsciiToUnicode(pText, aMoneyMessages[i].m_aText);
@ -1106,6 +1109,7 @@ CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8
aMoneyMessages[i].m_Colour.blue = bBlue; aMoneyMessages[i].m_Colour.blue = bBlue;
aMoneyMessages[i].m_fSize = fSize; aMoneyMessages[i].m_fSize = fSize;
aMoneyMessages[i].m_fOpacity = fOpacity; aMoneyMessages[i].m_fOpacity = fOpacity;
}
} }
CRGBA FoamColour(255, 255, 255, 255); CRGBA FoamColour(255, 255, 255, 255);