diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-13 17:10:17 +0200 |
| commit | d0f5464200be032ee464218cfe415f3ce0b119a7 (patch) | |
| tree | dd6f068286bb29c72192689bf741c43fcb505ae1 /src/control/Restart.cpp | |
| parent | Merge pull request #654 from erorcun/miami (diff) | |
| parent | Rename LEVEL_NONE to LEVEL_GENERIC (diff) | |
| download | re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.gz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.bz2 re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.lz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.xz re3-d0f5464200be032ee464218cfe415f3ce0b119a7.tar.zst re3-d0f5464200be032ee464218cfe415f3ce0b119a7.zip | |
Diffstat (limited to 'src/control/Restart.cpp')
| -rw-r--r-- | src/control/Restart.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Restart.cpp b/src/control/Restart.cpp index 64cabf5d..8fa018d6 100644 --- a/src/control/Restart.cpp +++ b/src/control/Restart.cpp @@ -24,8 +24,8 @@ uint16 CRestart::NumberOfPoliceRestarts; void CRestart::Initialise() { - OverridePoliceStationLevel = LEVEL_NONE; - OverrideHospitalLevel = LEVEL_NONE; + OverridePoliceStationLevel = LEVEL_GENERIC; + OverrideHospitalLevel = LEVEL_GENERIC; bFadeInAfterNextArrest = true; bFadeInAfterNextDeath = true; OverrideHeading = 0.0f; @@ -86,7 +86,7 @@ CRestart::FindClosestHospitalRestartPoint(const CVector &pos, CVector *outPos, f // find closest point on this level for (int i = 0; i < NumberOfHospitalRestarts; i++) { - if (CTheZones::GetLevelFromPosition(&HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_NONE ? OverrideHospitalLevel : curlevel)) { + if (CTheZones::GetLevelFromPosition(&HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_GENERIC ? OverrideHospitalLevel : curlevel)) { float dist = (pos - HospitalRestartPoints[i]).MagnitudeSqr(); if (fMinDist >= dist) { fMinDist = dist; @@ -133,7 +133,7 @@ CRestart::FindClosestPoliceRestartPoint(const CVector &pos, CVector *outPos, flo // find closest point on this level for (int i = 0; i < NumberOfPoliceRestarts; i++) { - if (CTheZones::GetLevelFromPosition(&PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_NONE ? OverridePoliceStationLevel : curlevel)) { + if (CTheZones::GetLevelFromPosition(&PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_GENERIC ? OverridePoliceStationLevel : curlevel)) { float dist = (pos - PoliceRestartPoints[i]).MagnitudeSqr(); if (fMinDist >= dist) { fMinDist = dist; |