summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-03 22:35:09 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-03 22:38:21 +0200
commit47e6cbe65e1715d11d81cbe3dc85b01f894e70c1 (patch)
tree6ed22776f5a8fb85479baff3673de26b6e74f68a
parentMerge pull request #220 from Sergeanur/Pickups (diff)
downloadre3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar.gz
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar.bz2
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar.lz
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar.xz
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.tar.zst
re3-47e6cbe65e1715d11d81cbe3dc85b01f894e70c1.zip
-rw-r--r--src/control/Pickups.cpp3
-rw-r--r--src/render/MoneyMessages.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 1eb096a2..2d112592 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -252,8 +252,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
printf("All collectables have been picked up\n");
CGarages::TriggerMessage("CO_ALL", -1, 5000, -1);
CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 1000000;
- }
- else
+ } else
CGarages::TriggerMessage("CO_ONE", CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages, 5000, CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages);
Remove();
diff --git a/src/render/MoneyMessages.cpp b/src/render/MoneyMessages.cpp
index d80be276..53d6db58 100644
--- a/src/render/MoneyMessages.cpp
+++ b/src/render/MoneyMessages.cpp
@@ -55,7 +55,7 @@ void
CMoneyMessages::Render()
{
for (int32 i = 0; i < NUMMONEYMESSAGES; i++) {
- if (aMoneyMessages[i].m_nTimeRegistered)
+ if (aMoneyMessages[i].m_nTimeRegistered != 0)
aMoneyMessages[i].Render();
}
}