mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 04:55:39 +00:00
Code Issues Projects Releases Wiki Activity

fixed debug teleport

Browse source
This commit is contained in:
Nikolay Korolev 2021-08-26 21:14:26 +03:00
parent b7db2a12d4
commit 915888d275
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Radar.cpp
View file

@ -1504,7 +1504,7 @@ CRadar::ToggleTargetMarker(float x, float y)
ms_RadarTrace[nextBlip].m_bDim = 0; ms_RadarTrace[nextBlip].m_bDim = 0;
ms_RadarTrace[nextBlip].m_bInUse = 1; ms_RadarTrace[nextBlip].m_bInUse = 1;
ms_RadarTrace[nextBlip].m_Radius = 1.0f; ms_RadarTrace[nextBlip].m_Radius = 1.0f;
CVector pos(x, y, 0.0f/*CWorld::FindGroundZForCoord(x,y)*/); CVector pos(x, y, 0.0f);
TargetMarkerPos = pos; TargetMarkerPos = pos;
ms_RadarTrace[nextBlip].m_vec2DPos = pos; ms_RadarTrace[nextBlip].m_vec2DPos = pos;
ms_RadarTrace[nextBlip].m_vecPos = pos; ms_RadarTrace[nextBlip].m_vecPos = pos;

6
src/core/re3.cpp
View file

@ -775,12 +775,14 @@ FixCar(void)
static void static void
TeleportToWaypoint(void) TeleportToWaypoint(void)
{ {
CStreaming::LoadScene(CRadar::TargetMarkerPos);
CStreaming::LoadSceneCollision(CRadar::TargetMarkerPos);
if (FindPlayerVehicle()) { if (FindPlayerVehicle()) {
if (CRadar::TargetMarkerId != -1) if (CRadar::TargetMarkerId != -1)
FindPlayerVehicle()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, FindPlayerVehicle()->GetColModel()->boundingSphere.center.z)); FindPlayerVehicle()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, CWorld::FindGroundZForCoord(CRadar::TargetMarkerPos.x, CRadar::TargetMarkerPos.y) + FindPlayerVehicle()->GetColModel()->boundingSphere.radius));
} else } else
if(CRadar::TargetMarkerId != -1) if(CRadar::TargetMarkerId != -1)
FindPlayerPed()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, FEET_OFFSET)); FindPlayerPed()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, CWorld::FindGroundZForCoord(CRadar::TargetMarkerPos.x, CRadar::TargetMarkerPos.y) + FEET_OFFSET));
} }
#endif #endif