summaryrefslogtreecommitdiffstats
path: root/src/core/EventList.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:55 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-03-28 13:24:55 +0100
commit9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18 (patch)
tree6e220fddfcabc63c477335fb1ddccefe7b6d5e0d /src/core/EventList.cpp
parentgarages part 1 (diff)
parentremove include <new> from common.h (diff)
downloadre3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar.gz
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar.bz2
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar.lz
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar.xz
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.tar.zst
re3-9fb101fdd96c82f73f8b09a75a2f248e1ccc0f18.zip
Diffstat (limited to 'src/core/EventList.cpp')
-rw-r--r--src/core/EventList.cpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp
index caf0cb3f..4364359a 100644
--- a/src/core/EventList.cpp
+++ b/src/core/EventList.cpp
@@ -5,10 +5,13 @@
#include "World.h"
#include "Wanted.h"
#include "EventList.h"
+#include "Messages.h"
+#include "Text.h"
+#include "main.h"
int32 CEventList::ms_nFirstFreeSlotIndex;
-//CEvent gaEvent[NUMEVENTS];
-CEvent *gaEvent = (CEvent*)0x6EF830;
+CEvent gaEvent[NUMEVENTS];
+//CEvent *gaEvent = (CEvent*)0x6EF830;
enum
{
@@ -207,8 +210,20 @@ CEventList::ReportCrimeForEvent(eEventType type, int32 crimeId, bool copsDontCar
default: crime = CRIME_NONE; break;
}
- if(crime == CRIME_NONE)
- return;
+#ifdef VC_PED_PORTS
+ if (crime == CRIME_HIT_PED && ((CPed*)crimeId)->IsPointerValid() &&
+ FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 && ((CPed*)crimeId)->m_ped_flagE2) {
+
+ if(!((CPed*)crimeId)->DyingOrDead()) {
+ sprintf(gString, "$50 Good Citizen Bonus!");
+ AsciiToUnicode(gString, gUString);
+ CMessages::AddBigMessage(gUString, 5000, 0);
+ CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 50;
+ }
+ } else
+#endif
+ if(crime == CRIME_NONE)
+ return;
CVector playerPedCoors = FindPlayerPed()->GetPosition();
CVector playerCoors = FindPlayerCoors();