mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-23 17:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/miami' into miami

Browse source
This commit is contained in:
Nikolay Korolev 2021-08-09 00:07:50 +03:00
parent 2ee32abf84 42ad9c4378
commit 3869369703
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Camera.cpp
View file

@ -4076,7 +4076,7 @@ CCamera::IsPointVisible(const CVector &center, const CMatrix *mat)
} }
bool bool
CCamera::IsSphereVisible(const CVector &center, float radius, Const CMatrix *mat) CCamera::IsSphereVisible(const CVector &center, float radius, const CMatrix *mat)
{ {
#ifdef GTA_PS2 #ifdef GTA_PS2
CVuVector c; CVuVector c;

2
src/core/Camera.h
View file

@ -631,7 +631,7 @@ public:
CVector &GetGameCamPosition(void) { return m_vecGameCamPos; } CVector &GetGameCamPosition(void) { return m_vecGameCamPos; }
void CalculateDerivedValues(void); void CalculateDerivedValues(void);
bool IsPointVisible(const CVector &center, const CMatrix *mat); bool IsPointVisible(const CVector &center, const CMatrix *mat);
bool IsSphereVisible(const CVector &center, float radius, Const CMatrix *mat); bool IsSphereVisible(const CVector &center, float radius, const CMatrix *mat);
bool IsSphereVisible(const CVector &center, float radius); bool IsSphereVisible(const CVector &center, float radius);
bool IsBoxVisible(CVUVECTOR *box, const CMatrix *mat); bool IsBoxVisible(CVUVECTOR *box, const CMatrix *mat);
}; };

7
src/core/Radar.cpp
View file

@ -1003,9 +1003,11 @@ INITSAVEBUF
WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE); WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE);
#ifdef MAP_ENHANCEMENTS #ifdef MAP_ENHANCEMENTS
bool bWaypointDeleted = false;
if (TargetMarkerId != -1) { if (TargetMarkerId != -1) {
ClearBlip(TargetMarkerId); ClearBlip(TargetMarkerId);
TargetMarkerId = -1; TargetMarkerId = -1;
bWaypointDeleted = true;
} }
#endif #endif
@ -1030,6 +1032,11 @@ INITSAVEBUF
SkipSaveBuf(buf, sizeof(sRadarTraceSave)); SkipSaveBuf(buf, sizeof(sRadarTraceSave));
} }
#ifdef MAP_ENHANCEMENTS
if(bWaypointDeleted)
ToggleTargetMarker(TargetMarkerPos.x, TargetMarkerPos.y);
#endif
VALIDATESAVEBUF(*size); VALIDATESAVEBUF(*size);
} }

2
src/vehicles/Train.cpp
View file

@ -292,7 +292,7 @@ CTrain::ProcessControl(void)
TrainHitStuff(s->m_lists[ENTITYLIST_PEDS_OVERLAP]); TrainHitStuff(s->m_lists[ENTITYLIST_PEDS_OVERLAP]);
} }
} }
#endif GTA_TRAIN #endif // GTA_TRAIN
} }
void void