a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 16:30:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
aap 2021-01-01 00:03:16 +01:00
parent 4d1305efb2 9d29b33ff4
commit c74c7ce1d4
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/render/SpecialFX.cpp
View file

@ -1385,10 +1385,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);
@ -1399,6 +1402,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);