From 5b119ca78d44bb2f5c63f6e14b677fbacb38711b Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 3 Oct 2019 13:21:00 +0300
Subject: Added missed config.h

---
 src/core/config.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core')

diff --git a/src/core/config.h b/src/core/config.h
index f82967d5..4a9fa792 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -67,6 +67,7 @@ enum Config {
 	NUMANTENNAS = 8,
 	NUMCORONAS = 56,
 	NUMPOINTLIGHTS = 32,
+	NUMMONEYMESSAGES = 16,
 
 	NUMONSCREENTIMERENTRIES = 1,
 	NUMRADARBLIPS = 32,
-- 
cgit v1.2.3


From 72e12f6aae10e294c9265dd58c75db5c5c54bd24 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Thu, 3 Oct 2019 22:28:56 +0300
Subject: CPickups

---
 src/core/Pools.cpp | 1 +
 src/core/Pools.h   | 1 +
 src/core/config.h  | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index a76bbb6d..847fa753 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -13,6 +13,7 @@ CDummyPool *&CPools::ms_pDummyPool = *(CDummyPool**)0x8F2C18;
 CAudioScriptObjectPool *&CPools::ms_pAudioScriptObjectPool = *(CAudioScriptObjectPool**)0x8F1B6C;
 
 WRAPPER void CPools::Initialise(void) { EAXJMP(0x4A1770); }
+WRAPPER void CPools::MakeSureSlotInObjectPoolIsEmpty(int32 handle) { EAXJMP(0x4A2DB0); }
 
 #if 0
 void
diff --git a/src/core/Pools.h b/src/core/Pools.h
index bdf668c2..4e6bd547 100644
--- a/src/core/Pools.h
+++ b/src/core/Pools.h
@@ -49,4 +49,5 @@ public:
 	static CVehicle *GetVehicle(int32 handle);
 	static int32 GetObjectRef(CObject *object);
 	static CObject *GetObject(int32 handle);
+	static void MakeSureSlotInObjectPoolIsEmpty(int32 handle);
 };
diff --git a/src/core/config.h b/src/core/config.h
index 4a9fa792..49bef3fa 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -68,10 +68,14 @@ enum Config {
 	NUMCORONAS = 56,
 	NUMPOINTLIGHTS = 32,
 	NUMMONEYMESSAGES = 16,
+	NUMPICKUPMESSAGES = 16,
 
 	NUMONSCREENTIMERENTRIES = 1,
 	NUMRADARBLIPS = 32,
-	NUMPICKUPS = 336,
+	NUMGENERALPICKUPS = 320,
+	NUMSCRIPTEDPICKUPS = 16,
+	NUMPICKUPS = NUMGENERALPICKUPS + NUMSCRIPTEDPICKUPS,
+	NUMCOLLECTEDPICKUPS = 20,
 	NUMEVENTS = 64,
 
 	NUM_CARGENS = 160,
@@ -141,3 +145,4 @@ enum Config {
 #define ANIMATE_PED_COL_MODEL
 //#define REMOVE_TREADABLE_PATHFIND
 #define VC_PED_PORTS
+//#define MONEY_MESSAGES
\ No newline at end of file
-- 
cgit v1.2.3