game_dir: added trigger_teleport_point entity to FGD

SNMetamorph · Nov 22, 2024 · 99ddc30 · 99ddc30
1 parent 08bb151
commit 99ddc30
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/game_dir/primext.fgd b/game_dir/primext.fgd
@@ -1,4 +1,4 @@
-// PrimeXT FGD (last updated 18 February 2024)
+// PrimeXT FGD (last updated 23 November 2024)
 // Please report any found errors at: https://github.com/SNMetamorph/PrimeXT/issues (Subject: "FGD error")
 
 //
@@ -4475,6 +4475,19 @@
 	m_iszPath(target_destination) : "Patrol Path Start"
 ]
 
+@PointClass base(Targetname) color(180 255 10) = trigger_teleport_point : "Teleport any entity regardless of its current location. This entity acts as a target. To teleport the player, leave Entity field empty or write: player."
+[
+	target(target_destination) : "Activate after tele"
+	master(target_destination) : "Master"
+	entityname(target_destination) : "Entity name"
+	spawnflags(flags) =
+	[
+		1: "Keep entity's velocity" : 0
+		2: "Keep entity's angles" : 0
+		4: "Remove after teleport" : 0
+	]
+]
+
 @SolidClass base(Trigger) = trigger_teleport : "Trigger Teleport" []
 
 @SolidClass base(Targetname) = trigger_transition : "Trigger: Select Transition Area" []

diff --git a/server/entities/trigger_teleport_point.cpp b/server/entities/trigger_teleport_point.cpp
@@ -50,17 +50,17 @@ void CTriggerTeleportPoint::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, U
 		entityVelocity = pEntity->GetAbsVelocity();
 	}
 
-	Vector EntityAngles = targetAng;
+	Vector entityAngles = targetAng;
 	if (FBitSet(pev->spawnflags, PT_KEEP_ANGLES)) {
-		EntityAngles = pEntity->GetAbsAngles();
+		entityAngles = pEntity->GetAbsAngles();
 	}
 
 	// offset to correctly teleport the player...
 	if (pEntity->IsPlayer()) {
 		targetOrg.z += 36;
 	}
 
-	pEntity->Teleport(&targetOrg, &EntityAngles, &entityVelocity);
+	pEntity->Teleport(&targetOrg, &entityAngles, &entityVelocity);
 
 	UTIL_FireTargets(pev->target, pActivator, pCaller, USE_TOGGLE, 0);