From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Oct 2010 11:34:36 +0000 (+0300)
Subject: Make trigger_changelevel a target instead
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9a924a97e80cc9022bd539f835d4342d4f288e08;p=voretournament%2Fvoretournament.git

Make trigger_changelevel a target instead
---

diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index ff85ba03..ebc63e13 100644
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -1817,21 +1817,10 @@ void spawnfunc_trigger_magicear()
 }
 
 .string chmap;
-void trigger_changelevel_touch()
+void spawnfunc_target_changelevel()
 {
-	if not (other.iscreature)
-		return;
-
-	EXACTTRIGGER_TOUCH;
-
 	if (self.chmap == "")
 		localcmd("endmatch\n");
 	else
 		localcmd(strcat("changelevel ", self.chmap, "\n"));
 };
-
-void spawnfunc_trigger_changelevel()
-{
-	EXACTTRIGGER_INIT;
-	self.touch = trigger_changelevel_touch;
-};
diff --git a/extra/netradiant-1.5.0-win32/voretournament.game/data/entities.def b/extra/netradiant-1.5.0-win32/voretournament.game/data/entities.def
index d0b261c3..69993b30 100644
--- a/extra/netradiant-1.5.0-win32/voretournament.game/data/entities.def
+++ b/extra/netradiant-1.5.0-win32/voretournament.game/data/entities.def
@@ -1373,11 +1373,10 @@ fade_rate: fade-out time
 START_OFF: the trigger is off initially
 */
 
-/*QUAKED trigger_changelevel (.5 .5 .5) ? 
-Loads another map when touched by a player. Useful in RPG and single player maps.
-When no chmap key is set, the trigger just ends the match when touched, and the player / team with the highest score at that moment wins.
+/*QUAKED target_changelevel (0 .5 .5) (-8 -8 -8) (8 8 8)
+Loads another map when triggered. Useful in RPG and single player maps.
+When no chmap key is set, the entity just ends the match when triggered. The player / team with the highest score at that moment wins.
 -------- KEYS --------
-dmg: amount of damage to deal (default: 1000)
-message: kill message when someone gets killed by this (default: "was in the wrong place")
-message2: kill message when someone gets pushed into this (default: "was thrown into a world of hurt by"). The # character is replaced by the attacker name if present (and it instead does not get appended to the end)
+targetname: The name other entities can use to target this entity
+chmap: Map file to switch to, leave empty to make this entity just end the match instead
 */
\ No newline at end of file