summaryrefslogtreecommitdiffstats
path: root/src/control/CarCtrl.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-07 15:59:40 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-07 15:59:40 +0200
commit5780b4503eb7172a1beee05de9513374306c26ec (patch)
tree71503475e494e238d9fcb725a23f8f75e8150ea7 /src/control/CarCtrl.cpp
parentcar control and friends (diff)
parentMerge branch 'miami' of github.com:GTAmodding/re3 into miami (diff)
downloadre3-5780b4503eb7172a1beee05de9513374306c26ec.tar
re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.gz
re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.bz2
re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.lz
re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.xz
re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.zst
re3-5780b4503eb7172a1beee05de9513374306c26ec.zip
Diffstat (limited to 'src/control/CarCtrl.cpp')
-rw-r--r--src/control/CarCtrl.cpp32
1 files changed, 24 insertions, 8 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 6818cd19..e8bc977c 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -329,9 +329,14 @@ CCarCtrl::GenerateOneRandomCar()
case RICH:
case EXEC:
case WORKER:
- case SPECIAL:
case BIG:
case TAXI:
+ // TODO(MIAMI): check this
+ case MOPED:
+ case MOTORBIKE:
+ case LEISUREBOAT:
+ case WORKERBOAT:
+ //
case MAFIA:
case TRIAD:
case DIABLO:
@@ -522,7 +527,12 @@ CCarCtrl::GenerateOneRandomCar()
case RICH:
case EXEC:
case WORKER:
- case SPECIAL:
+ // TODO(MIAMI): check this
+ case MOPED:
+ case MOTORBIKE:
+ case LEISUREBOAT:
+ case WORKERBOAT:
+ //
case BIG:
case TAXI:
case MAFIA:
@@ -602,16 +612,17 @@ CCarCtrl::ChooseModel(CZoneInfo* pZone, CVector* pPos, int* pClass) {
int32 model = -1;
while (model == -1 || !CStreaming::HasModelLoaded(model)){
int rnd = CGeneral::GetRandomNumberInRange(0, 1000);
+ // TODO(MIAMI): new car classes
if (rnd < pZone->carThreshold[0])
- model = CCarCtrl::ChooseCarModel((*pClass = POOR));
+ model = CCarCtrl::ChooseCarModel((*pClass = NORMAL));
else if (rnd < pZone->carThreshold[1])
- model = CCarCtrl::ChooseCarModel((*pClass = RICH));
+ model = CCarCtrl::ChooseCarModel((*pClass = POOR));
else if (rnd < pZone->carThreshold[2])
- model = CCarCtrl::ChooseCarModel((*pClass = EXEC));
+ model = CCarCtrl::ChooseCarModel((*pClass = RICH));
else if (rnd < pZone->carThreshold[3])
- model = CCarCtrl::ChooseCarModel((*pClass = WORKER));
+ model = CCarCtrl::ChooseCarModel((*pClass = EXEC));
else if (rnd < pZone->carThreshold[4])
- model = CCarCtrl::ChooseCarModel((*pClass = SPECIAL));
+ model = CCarCtrl::ChooseCarModel((*pClass = WORKER));
else if (rnd < pZone->carThreshold[5])
model = CCarCtrl::ChooseCarModel((*pClass = BIG));
else if (rnd < pZone->copThreshold)
@@ -649,7 +660,12 @@ CCarCtrl::ChooseCarModel(int32 vehclass)
case RICH:
case EXEC:
case WORKER:
- case SPECIAL:
+ // TODO(MIAMI): check this
+ case MOPED:
+ case MOTORBIKE:
+ case LEISUREBOAT:
+ case WORKERBOAT:
+ //
case BIG:
case TAXI:
{