summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-08 23:00:06 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-08 23:00:06 +0200
commit46d891b745141a27b2f563baf4e739f6f46e1cda (patch)
treedf83f421ef1efe2f0c4de403661a16d8fc1ec1bf /src
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar.gz
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar.bz2
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar.lz
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar.xz
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.tar.zst
re3-46d891b745141a27b2f563baf4e739f6f46e1cda.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/CarCtrl.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 699ccc20..692627a9 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -298,19 +298,19 @@ CCarCtrl::GenerateOneRandomCar()
CStreaming::RequestModel(MI_PREDATOR, STREAMFLAGS_DEPENDENCY);
return;
}
- else {
- int i;
- carModel = -1;
- for (i = 10; i > 0 && (carModel == -1 || CStreaming::HasModelLoaded(carModel)); i--) {
- carModel = ChooseBoatModel(ChooseBoatRating(&zone));
- }
- if (i == 0)
- return;
- }
- if (pCurNode->bOnlySmallBoats || pNextNode->bOnlySmallBoats) {
- if (BoatWithTallMast(carModel))
- return;
+ }
+ else {
+ int i;
+ carModel = -1;
+ for (i = 10; i > 0 && (carModel == -1 || CStreaming::HasModelLoaded(carModel)); i--) {
+ carModel = ChooseBoatModel(ChooseBoatRating(&zone));
}
+ if (i == 0)
+ return;
+ }
+ if (pCurNode->bOnlySmallBoats || pNextNode->bOnlySmallBoats) {
+ if (BoatWithTallMast(carModel))
+ return;
}
}
int16 colliding;