diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Streaming.cpp | 8 | ||||
| -rw-r--r-- | src/core/config.h | 5 | ||||
| -rw-r--r-- | src/core/re3.cpp | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index 227a4a9f..e59b2b39 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 = NUMDEFAULTMODELS; i < MODELINFOSIZE; i++){ + for(i = NUM_DEFAULT_MODELS; 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){ @@ -2405,8 +2405,8 @@ CStreaming::MemoryCardSave(uint8 *buffer, uint32 *length) { int i; - *length = NUMDEFAULTMODELS; - for(i = 0; i < NUMDEFAULTMODELS; i++) + *length = NUM_DEFAULT_MODELS; + for(i = 0; i < NUM_DEFAULT_MODELS; i++) if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED) buffer[i] = ms_aInfoForModel[i].m_flags; else @@ -2418,7 +2418,7 @@ CStreaming::MemoryCardLoad(uint8 *buffer, uint32 length) { uint32 i; - assert(length == NUMDEFAULTMODELS); + assert(length == NUM_DEFAULT_MODELS); 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 cfad6d85..a3fbac1b 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -32,7 +32,6 @@ enum Config { NUMDUMMIES = 2802, // 2368 on PS2 NUMAUDIOSCRIPTOBJECTS = 256, NUMCUTSCENEOBJECTS = 50, - NUMDEFAULTMODELS = 200, NUMTEMPOBJECTS = 30, @@ -84,7 +83,9 @@ enum Config { NUM_PATH_NODES_IN_AUTOPILOT = 8, NUM_ACCIDENTS = 20, - NUM_FIRES = 40 + NUM_FIRES = 40, + + NUMPEDROUTES = 200, }; // We'll use this once we're ready to become independent of the game diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 19b3c691..8e20ffb3 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -146,7 +146,7 @@ LetThemFollowYou(void) { CPed *nearPed = player->m_nearPeds[i]; if (nearPed && !nearPed->IsPlayer()) { nearPed->SetObjective(OBJECTIVE_FOLLOW_PED_IN_FORMATION, (void*)player); - nearPed->m_pedFormation = rand() & 7; + nearPed->m_pedFormation = (eFormation)(rand() & 7); nearPed->bScriptObjectiveCompleted = false; } } @@ -349,7 +349,7 @@ DebugMenuPopulate(void) DebugMenuAddVarBool8("Debug", "Don't render Vehicles", (int8*)&gbDontRenderVehicles, nil); DebugMenuAddVarBool8("Debug", "Don't render Objects", (int8*)&gbDontRenderObjects, nil); - DebugMenuAddCmd("Debug", "Make peds around you follow you", LetThemFollowYou); + DebugMenuAddCmd("Debug", "Make peds follow you in formation", LetThemFollowYou); #ifndef MASTER DebugMenuAddVarBool8("Debug", "Toggle unused fight feature", (int8*)&CPed::bUnusedFightThingOnPlayer, nil); #endif |