summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-03 21:28:56 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-03 21:37:13 +0200
commit72e12f6aae10e294c9265dd58c75db5c5c54bd24 (patch)
tree12444f855de79b35585a712d3137ed15d7b73096 /src/core
parentMerge pull request #219 from Sergeanur/MoneyMessages (diff)
downloadre3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.gz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.bz2
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.lz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.xz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.zst
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pools.cpp1
-rw-r--r--src/core/Pools.h1
-rw-r--r--src/core/config.h7
3 files changed, 8 insertions, 1 deletions
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