mirror of
https://github.com/halpz/re3.git
synced 2024-12-22 17:35:29 +00:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
3869369703
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
};
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -292,7 +292,7 @@ CTrain::ProcessControl(void)
|
|||
TrainHitStuff(s->m_lists[ENTITYLIST_PEDS_OVERLAP]);
|
||||
}
|
||||
}
|
||||
#endif GTA_TRAIN
|
||||
#endif // GTA_TRAIN
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue