diff options
| author | withmorten <morten.with@gmail.com> | 2021-02-19 16:23:52 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-02-19 16:23:52 +0100 |
| commit | 73fce903b86d2dd6a9e8a145fd9e4856214027cb (patch) | |
| tree | 3f0aaec6402122ba413ba0403d880a00938cc73a | |
| parent | Update librw to fix Mac hi-dpi (diff) | |
| download | re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar.gz re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar.bz2 re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar.lz re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar.xz re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.tar.zst re3-73fce903b86d2dd6a9e8a145fd9e4856214027cb.zip | |
| -rw-r--r-- | src/control/CarCtrl.cpp | 2 | ||||
| -rw-r--r-- | src/render/WaterLevel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 25ced498..2e9752a7 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -2718,7 +2718,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 bccaea39..4b474219 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -432,14 +432,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, 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, false)) { return false; } |