diff options
| author | aap <aap@papnet.eu> | 2020-05-06 23:39:38 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 23:39:38 +0200 |
| commit | a8d8c0690d65f3d37456791a9d9940b06187e5be (patch) | |
| tree | e79448f7dfea4097ba4cc6290a001b2aa34f8db2 | |
| parent | fixed lane offset (diff) | |
| download | re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar.gz re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar.bz2 re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar.lz re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar.xz re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.tar.zst re3-a8d8c0690d65f3d37456791a9d9940b06187e5be.zip | |
| -rw-r--r-- | src/control/Script.cpp | 6 | ||||
| -rw-r--r-- | src/core/FileLoader.cpp | 3 | ||||
| -rw-r--r-- | src/modelinfo/ModelIndices.h | 18 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 73bf45e8..0c3806a3 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -8214,9 +8214,9 @@ int8 CRunningScript::ProcessCommands900To999(int32 command) case MI_CABBIE: case MI_STALLION: case MI_RUMPO: - case 151: - case 152: - case 153: +// case 151: +// case 152: +// case 153: break; default: printf("CREATE_RANDOM_CAR_FOR_CAR_PARK - Unknown car model %d\n", CStreaming::ms_vehiclesLoaded[index]); diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 33be20cb..21fd8a70 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -883,9 +883,6 @@ CFileLoader::LoadPedObject(const char *line) break; mi->m_animGroup = animGroupId; mi->m_carsCanDrive = carsCanDrive; - - // ??? - CModelInfo::GetModelInfo(MI_LOPOLYGUY)->SetColModel(&CTempColModels::ms_colModelPed1); } int diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h index 38d1d42b..42c95894 100644 --- a/src/modelinfo/ModelIndices.h +++ b/src/modelinfo/ModelIndices.h @@ -257,7 +257,7 @@ enum MI_BUSKER4, // three more peds possible - MI_LANDSTAL = 90, + MI_LANDSTAL = 130, MI_IDAHO, MI_STINGER, MI_LINERUN, @@ -320,11 +320,11 @@ enum MI_GHOST, // leftovers on PC - MI_MIAMI_RCBARON = 154, - MI_MIAMI_RCRAIDER = 155, - MI_MIAMI_SPARROW = 159, + MI_MIAMI_RCBARON = 194, + MI_MIAMI_RCRAIDER = 195, + MI_MIAMI_SPARROW = 199, - MI_GRENADE = 170, + MI_GRENADE = 258, MI_AK47, MI_BASEBALL_BAT, MI_COLT, @@ -339,13 +339,13 @@ enum MI_BOMB, MI_FINGERS, - MI_CUTOBJ01 = 185, + MI_CUTOBJ01 = 295, MI_CUTOBJ02, MI_CUTOBJ03, MI_CUTOBJ04, MI_CUTOBJ05, - MI_CAR_DOOR = 190, + MI_CAR_DOOR = 240, MI_CAR_BUMPER, MI_CAR_PANEL, MI_CAR_BONNET, @@ -354,8 +354,8 @@ enum MI_BODYPARTA, MI_BODYPARTB, - MI_AIRTRAIN_VLO = 198, - MI_LOPOLYGUY, + MI_AIRTRAIN_VLO = 257, +// MI_LOPOLYGUY, NUM_DEFAULT_MODELS = 300 // MIAMI }; |