diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-12-31 22:09:25 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-12-31 22:09:25 +0100 |
| commit | e9288dd0058d8aab122b3182e03c7157c62e177c (patch) | |
| tree | 639cfeb249ce9cc89cbd0ac4cdd13cc00e6b23da | |
| parent | remove superfluous CWorld:: (diff) | |
| download | re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar.gz re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar.bz2 re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar.lz re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar.xz re3-e9288dd0058d8aab122b3182e03c7157c62e177c.tar.zst re3-e9288dd0058d8aab122b3182e03c7157c62e177c.zip | |
| -rw-r--r-- | src/render/SpecialFX.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp index 908b67d8..5c970855 100644 --- a/src/render/SpecialFX.cpp +++ b/src/render/SpecialFX.cpp @@ -1092,20 +1092,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++) - if(aMoneyMessages[i].m_nTimeRegistered != 0) break; - if(i == NUMMONEYMESSAGES) return; - - // Add data of this money message to the array - AsciiToUnicode(pText, aMoneyMessages[i].m_aText); - - aMoneyMessages[i].m_nTimeRegistered = CTimer::GetTimeInMilliseconds(); - aMoneyMessages[i].m_vecPosition = vecPos; - aMoneyMessages[i].m_Colour.red = bRed; - aMoneyMessages[i].m_Colour.green = bGreen; - aMoneyMessages[i].m_Colour.blue = bBlue; - aMoneyMessages[i].m_fSize = fSize; - aMoneyMessages[i].m_fOpacity = fOpacity; +#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); + + aMoneyMessages[i].m_nTimeRegistered = CTimer::GetTimeInMilliseconds(); + aMoneyMessages[i].m_vecPosition = vecPos; + aMoneyMessages[i].m_Colour.red = bRed; + 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); |