EnsureDestination

Author: Nyano1337

src/movement/movement.cpp

@@ -141,11 +141,9 @@ void CMovementPlayer::Teleport(const Vector* origin, const QAngle* angle, const
 	if (origin) {
 		SetOrigin(*origin);
 	}
-
 	if (angle) {
 		SetAngles(*angle);
 	}
-
 	if (vel) {
 		SetVelocity(*vel);
 	}

src/surf/zones/edit.cpp

@@ -1,6 +1,7 @@
 #include "edit.h"
 #include <utils/utils.h>
 #include <surf/zones/surf_zones.h>
+#include <surf/misc/surf_misc.h>
 
 void ZoneEditProperty::Init(CSurfZoneService* outer) {
 	m_pOuter = outer;
@@ -133,3 +134,20 @@ void ZoneEditProperty::ClearBeams() {
 	}
 	m_vBeam.clear();
 }
+
+void ZoneData_t::EnsureDestination() {
+	for (const auto& hTele : SURF::MiscPlugin()->m_vTeleDestination) {
+		auto pTeleEnt = hTele.Get();
+		if (pTeleEnt) {
+			const Vector& origin = pTeleEnt->GetOrigin();
+			if (IsInsideBox(origin)) {
+				m_vecDestination = origin;
+				m_angDestination = pTeleEnt->GetAbsAngles();
+				return;
+			}
+		}
+	}
+
+	m_vecDestination = (m_vecMins + m_vecMaxs) / 2.0f;
+	m_angDestination.Invalidate();
+}

src/surf/zones/edit.h

@@ -53,6 +53,8 @@ struct ZoneData_t {
 		return (vec.x > m_vecMins.x && vec.y > m_vecMins.y && vec.z > m_vecMins.z) && (vec.x < m_vecMaxs.x && vec.y < m_vecMaxs.y && vec.z < m_vecMaxs.z);
 	}
 
+	void EnsureDestination();
+
 	ZoneTrack m_iTrack;
 	ZoneType m_iType;
 	i32 m_iValue;

src/surf/zones/surf_zones.cpp

@@ -2,7 +2,6 @@
 #include <utils/utils.h>
 #include <core/sdkhook.h>
 #include <surf/global/surf_global.h>
-#include <surf/misc/surf_misc.h>
 
 CSurfZonePlugin g_SurfZonePlugin;
 
@@ -151,7 +150,7 @@ bool CSurfZoneService::TeleportToZone(ZoneTrack track, ZoneType type) {
 		vecTargetAng = customDestination.second;
 	}
 
-	GetPlayer()->Teleport(&vecTargetOrigin, &vecTargetAng, &SURF::ZERO_VEC);
+	GetPlayer()->Teleport(&vecTargetOrigin, vecTargetAng.IsValid() ? &vecTargetAng : nullptr, &SURF::ZERO_VEC);
 
 	return true;
 }
@@ -188,18 +187,3 @@ CBaseEntity* CSurfZonePlugin::CreateNormalZone(const Vector& vecMins, const Vect
 void CSurfZoneService::OnReset() {
 	m_ZoneEdit.Init(this);
 }
-
-void ZoneCache_t::EnsureDestination() {
-	for (const auto& hTele : SURF::MiscPlugin()->m_vTeleDestination) {
-		auto pTeleEnt = hTele.Get();
-		if (pTeleEnt) {
-			const Vector& origin = pTeleEnt->GetOrigin();
-			if (IsInsideBox(origin)) {
-				m_vecDestination = origin;
-				return;
-			}
-		}
-	}
-
-	m_vecDestination = (m_vecMins + m_vecMaxs) / 2.0f;
-}

src/surf/zones/surf_zones.h

@@ -12,8 +12,6 @@ struct ZoneCache_t : ZoneData_t {
 		m_aBeams.fill(CEntityHandle());
 	}
 
-	void EnsureDestination();
-
 	std::array<CHandle<CBeam>, 12> m_aBeams;
 };