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/control | |
| 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 '')
| -rw-r--r-- | src/control/CarCtrl.cpp | 2 | ||||
| -rw-r--r-- | src/control/SceneEdit.cpp | 4 | ||||
| -rw-r--r-- | src/control/Script.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 8be39a86..8d850087 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -825,7 +825,7 @@ int32 CCarCtrl::ChooseGangCarModel(int32 gang) { if (CStreaming::HasModelLoaded(MI_GANG01 + 2 * gang) && - CStreaming::HasModelLoaded(MI_GANG02 + 2 * gang)) + CStreaming::HasModelLoaded(MI_GANG01+1 + 2 * gang)) return CGangs::GetGangVehicleModel(gang); return -1; } diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp index c8b4242e..bdb93f33 100644 --- a/src/control/SceneEdit.cpp +++ b/src/control/SceneEdit.cpp @@ -76,7 +76,7 @@ static int32 NextValidModelId(int32 mi, int32 step) int32 i = mi; while (result == -1) { i += step; - if (i < 0 || i > 5500) { + if (i < 0 || i > MODELINFOSIZE) { step = -step; continue; } @@ -86,7 +86,7 @@ static int32 NextValidModelId(int32 mi, int32 step) continue; if (pInfo->GetModelType() == MITYPE_PED #ifdef FIX_BUGS - && !(i >= MI_SPECIAL01 && i <= MI_SPECIAL04) + && !(i >= MI_SPECIAL01 && i <= MI_SPECIAL21) #endif || pInfo->GetModelType() == MITYPE_VEHICLE && #ifdef FIX_BUGS diff --git a/src/control/Script.cpp b/src/control/Script.cpp index badcebf2..e4a8e411 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -5903,8 +5903,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command) continue; if (pPed->bFadeOut) continue; - if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN) - continue; +// if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN) +// continue; if (!ThisIsAValidRandomPed(pPed->m_nPedType)) continue; if (pPed->bIsLeader || pPed->m_leader) @@ -5952,8 +5952,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command) continue; if (pPed->bFadeOut) continue; - if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN) - continue; +// if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN) +// continue; if (!ThisIsAValidRandomPed(pPed->m_nPedType)) continue; if (pPed->bIsLeader || pPed->m_leader) |