summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-01 00:03:16 +0100
committeraap <aap@papnet.eu>2021-01-01 00:03:16 +0100
commitc74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7 (patch)
tree728c47a735e21bf42bff2c96dbc975ee72ea4cfa
parentsome CAutomobile fixes (diff)
parentMerge branch 'miami' of github.com:GTAmodding/re3 into miami (diff)
downloadre3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar.gz
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar.bz2
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar.lz
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar.xz
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.tar.zst
re3-c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7.zip
-rw-r--r--src/render/SpecialFX.cpp32
1 files changed, 18 insertions, 14 deletions
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 0f121c1e..e17caa97 100644
--- 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++)
- 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);