diff options
| author | erorcun <erayorcunus@gmail.com> | 2019-10-05 16:08:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 16:08:55 +0200 |
| commit | a47f78758c86b65fe4f69111a2b5685096148ab7 (patch) | |
| tree | ad8198d43e156782930020c1e066f07812b9f45b /src/core | |
| parent | Fix warnings (diff) | |
| parent | CDarkel, walkaround fix (diff) | |
| download | re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar.gz re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar.bz2 re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar.lz re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar.xz re3-a47f78758c86b65fe4f69111a2b5685096148ab7.tar.zst re3-a47f78758c86b65fe4f69111a2b5685096148ab7.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Streaming.cpp | 8 | ||||
| -rw-r--r-- | src/core/config.h | 19 |
2 files changed, 21 insertions, 6 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index a7bde91e..d15415ea 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1021,7 +1021,7 @@ CStreaming::RemoveAllUnusedModels(void) for(i = 0; i < MAXVEHICLESLOADED; i++) RemoveLoadedVehicle(); - for(i = NUM_DEFAULT_MODELS; i < MODELINFOSIZE; i++){ + for(i = NUMDEFAULTMODELS; i < MODELINFOSIZE; i++){ if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED && ms_aInfoForModel[i].m_flags & STREAMFLAGS_DONT_REMOVE && CModelInfo::GetModelInfo(i)->m_refCount == 0){ @@ -2408,8 +2408,8 @@ CStreaming::MemoryCardSave(uint8 *buffer, uint32 *length) { int i; - *length = NUM_DEFAULT_MODELS; - for(i = 0; i < NUM_DEFAULT_MODELS; i++) + *length = NUMDEFAULTMODELS; + for(i = 0; i < NUMDEFAULTMODELS; i++) if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED) buffer[i] = ms_aInfoForModel[i].m_flags; else @@ -2421,7 +2421,7 @@ CStreaming::MemoryCardLoad(uint8 *buffer, uint32 length) { uint32 i; - assert(length == NUM_DEFAULT_MODELS); + assert(length == NUMDEFAULTMODELS); for(i = 0; i < length; i++) if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED) if(buffer[i] != 0xFF) diff --git a/src/core/config.h b/src/core/config.h index 49bef3fa..520bcc72 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -32,6 +32,7 @@ enum Config { NUMDUMMIES = 2802, // 2368 on PS2 NUMAUDIOSCRIPTOBJECTS = 256, NUMCUTSCENEOBJECTS = 50, + NUMDEFAULTMODELS = 200, NUMTEMPOBJECTS = 30, @@ -138,11 +139,25 @@ enum Config { #endif #define FIX_BUGS // fix bugs in the game, TODO: use this more + +// Pad #define KANGAROO_CHEAT + +// Hud #define ASPECT_RATIO_SCALE + +// Script #define USE_DEBUG_SCRIPT_LOADER + +// Vehicles #define EXPLODING_AIRTRAIN // can blow up jumbo jet with rocket launcher -#define ANIMATE_PED_COL_MODEL //#define REMOVE_TREADABLE_PATHFIND + +// Pickups +//#define MONEY_MESSAGES + +// Peds +#define ANIMATE_PED_COL_MODEL #define VC_PED_PORTS -//#define MONEY_MESSAGES
\ No newline at end of file +#define NEW_WALK_AROUND_ALGORITHM +#define CANCELLABLE_CAR_ENTER
\ No newline at end of file |