diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 23:07:50 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 23:07:50 +0200 |
| commit | 3869369703bce622ce9d44b71a08af4b62d700e3 (patch) | |
| tree | 4214d5d12a83376f24f3dc67a7288094a82ec0a7 | |
| parent | fix bug in CCurves (diff) | |
| parent | Comment out text following #endif (diff) | |
| download | re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar.gz re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar.bz2 re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar.lz re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar.xz re3-3869369703bce622ce9d44b71a08af4b62d700e3.tar.zst re3-3869369703bce622ce9d44b71a08af4b62d700e3.zip | |
| -rw-r--r-- | src/core/Camera.cpp | 2 | ||||
| -rw-r--r-- | src/core/Camera.h | 2 | ||||
| -rw-r--r-- | src/core/Radar.cpp | 7 | ||||
| -rw-r--r-- | src/vehicles/Train.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 3ebd52f2..e7cd65a0 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -4076,7 +4076,7 @@ CCamera::IsPointVisible(const CVector ¢er, const CMatrix *mat) } bool -CCamera::IsSphereVisible(const CVector ¢er, float radius, Const CMatrix *mat) +CCamera::IsSphereVisible(const CVector ¢er, float radius, const CMatrix *mat) { #ifdef GTA_PS2 CVuVector c; diff --git a/src/core/Camera.h b/src/core/Camera.h index 7612b937..39ecb760 100644 --- a/src/core/Camera.h +++ b/src/core/Camera.h @@ -631,7 +631,7 @@ public: CVector &GetGameCamPosition(void) { return m_vecGameCamPos; } void CalculateDerivedValues(void); bool IsPointVisible(const CVector ¢er, const CMatrix *mat); - bool IsSphereVisible(const CVector ¢er, float radius, Const CMatrix *mat); + bool IsSphereVisible(const CVector ¢er, float radius, const CMatrix *mat); bool IsSphereVisible(const CVector ¢er, float radius); bool IsBoxVisible(CVUVECTOR *box, const CMatrix *mat); }; diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 0792008a..ff9231c6 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -1003,9 +1003,11 @@ INITSAVEBUF WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE); #ifdef MAP_ENHANCEMENTS + bool bWaypointDeleted = false; if (TargetMarkerId != -1) { ClearBlip(TargetMarkerId); TargetMarkerId = -1; + bWaypointDeleted = true; } #endif @@ -1030,6 +1032,11 @@ INITSAVEBUF SkipSaveBuf(buf, sizeof(sRadarTraceSave)); } +#ifdef MAP_ENHANCEMENTS + if(bWaypointDeleted) + ToggleTargetMarker(TargetMarkerPos.x, TargetMarkerPos.y); +#endif + VALIDATESAVEBUF(*size); } diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp index 5f0cf36a..3a04b614 100644 --- a/src/vehicles/Train.cpp +++ b/src/vehicles/Train.cpp @@ -292,7 +292,7 @@ CTrain::ProcessControl(void) TrainHitStuff(s->m_lists[ENTITYLIST_PEDS_OVERLAP]); } } -#endif GTA_TRAIN +#endif // GTA_TRAIN } void |