summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-02-19 16:32:25 +0100
committerwithmorten <morten.with@gmail.com>2021-02-19 16:32:25 +0100
commit60bc816af5ef4061a17f0294900da2e503a68671 (patch)
tree5622d2d5368a497bc20f5d2228107a2284e382a9 /src
parentUpdate librw to fix Mac hi-dpi (diff)
downloadre3-60bc816af5ef4061a17f0294900da2e503a68671.tar
re3-60bc816af5ef4061a17f0294900da2e503a68671.tar.gz
re3-60bc816af5ef4061a17f0294900da2e503a68671.tar.bz2
re3-60bc816af5ef4061a17f0294900da2e503a68671.tar.lz
re3-60bc816af5ef4061a17f0294900da2e503a68671.tar.xz
re3-60bc816af5ef4061a17f0294900da2e503a68671.tar.zst
re3-60bc816af5ef4061a17f0294900da2e503a68671.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/CarCtrl.cpp2
-rw-r--r--src/render/WaterLevel.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index d05d9827..8db6fd95 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -3238,7 +3238,7 @@ bool CCarCtrl::GenerateOneEmergencyServicesCar(uint32 mi, CVector vecPos)
attempts += 1;
}
if (attempts >= 5)
- return nil;
+ return false;
CAutomobile* pVehicle = new CAutomobile(mi, RANDOM_VEHICLE);
pVehicle->AutoPilot.m_vecDestinationCoors = vecPos;
pVehicle->SetPosition(spawnPos);
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index e91aa790..0d114db9 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -611,14 +611,14 @@ CWaterLevel::TestVisibilityForFineWaterBlocks(const CVector &worldPos)
if ((lineEnd.x > WORLD_MIN_X && lineEnd.x < WORLD_MAX_X) && (lineEnd.y > WORLD_MIN_Y && lineEnd.y < WORLD_MAX_Y))
{
- if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false, nil))
+ if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false))
{
lineStart.x += 0.4f;
lineStart.y += 0.4f;
lineEnd.x += 0.4f;
lineEnd.y += 0.4f;
- if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false, nil))
+ if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false))
{
return false;
}