diff options
| author | aap <aap@papnet.eu> | 2020-05-09 17:05:26 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-09 17:05:26 +0200 |
| commit | 97d5698e0c669fd98911991b2ce3042fce376f06 (patch) | |
| tree | 925f3f75e2b7d643fb7484018d484edc6a1e73d5 /src/core | |
| parent | removed cutscene heads (diff) | |
| download | re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar.gz re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar.bz2 re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar.lz re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar.xz re3-97d5698e0c669fd98911991b2ce3042fce376f06.tar.zst re3-97d5698e0c669fd98911991b2ce3042fce376f06.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/EventList.cpp | 2 | ||||
| -rw-r--r-- | src/core/FileLoader.cpp | 9 | ||||
| -rw-r--r-- | src/core/Pad.cpp | 4 | ||||
| -rw-r--r-- | src/core/config.h | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp index 675040ea..c3508a51 100644 --- a/src/core/EventList.cpp +++ b/src/core/EventList.cpp @@ -67,8 +67,6 @@ CEventList::RegisterEvent(eEventType type, eEventEntity entityType, CEntity *ent switch(entityType){ case EVENT_ENTITY_PED: ref = CPools::GetPedRef((CPed*)ent); - if(ent->GetModelIndex() >= MI_GANG01 && ent->GetModelIndex() <= MI_CRIMINAL02) - copsDontCare = true; break; case EVENT_ENTITY_VEHICLE: ref = CPools::GetVehicleRef((CVehicle*)ent); diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 07e2eee7..6a434bdd 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -861,15 +861,16 @@ CFileLoader::LoadPedObject(const char *line) { int id; char model[24], txd[24]; - char pedType[24], pedStats[24], animGroup[24]; + char pedType[24], pedStats[24], animGroup[24], animFile[16]; int carsCanDrive; CPedModelInfo *mi; int animGroupId; + int radio1, radio2; - if(sscanf(line, "%d %s %s %s %s %s %x", + sscanf(line, "%d %s %s %s %s %s %x %s %d %d", &id, model, txd, - pedType, pedStats, animGroup, &carsCanDrive) != 7) - return; + pedType, pedStats, animGroup, &carsCanDrive, + animFile, &radio1, &radio2); mi = CModelInfo::AddPedModel(id); mi->SetName(model); diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index da86d15e..b996dc28 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -140,9 +140,9 @@ void ChangePlayerCheat() do { do - modelId = CGeneral::GetRandomNumberInRange(0, MI_CAS_WOM+1); + modelId = CGeneral::GetRandomNumberInRange(0, MI_WFYG2+1); while (!CModelInfo::GetModelInfo(modelId)); - } while (modelId >= MI_SPECIAL01 && modelId <= MI_SPECIAL04 || modelId == MI_TAXI_D); + } while (modelId == MI_TAXI_D); uint8 flags = CStreaming::ms_aInfoForModel[modelId].m_flags; ped->DeleteRwObject(); diff --git a/src/core/config.h b/src/core/config.h index 29a73f33..2ded57bf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -108,8 +108,8 @@ enum Config { NUMPEDROUTES = 200, NUMPHONES = 50, - NUMPEDGROUPS = 31, - NUMMODELSPERPEDGROUP = 8, // TODO(MIAMI): 16 once we have peds + NUMPEDGROUPS = 67, + NUMMODELSPERPEDGROUP = 16, NUMSHOTINFOS = 100, NUMROADBLOCKS = 300, |