Make trigger_changelevel a target instead

diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index ff85ba0346e03e8a8f140c48c6b347dd589cfdec..ebc63e13d005f8fbe4d70cf1af67cebcc20756fe 100644 (file)
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -1817,21 +1817,10 @@ void spawnfunc_trigger_magicear()
 }\r
 \r
 .string chmap;\r
-void trigger_changelevel_touch()\r
+void spawnfunc_target_changelevel()\r
 {\r
-       if not (other.iscreature)\r
-               return;\r
-\r
-       EXACTTRIGGER_TOUCH;\r
-\r
        if (self.chmap == "")\r
                localcmd("endmatch\n");\r
        else\r
                localcmd(strcat("changelevel ", self.chmap, "\n"));\r
 };\r
-\r
-void spawnfunc_trigger_changelevel()\r
-{\r
-       EXACTTRIGGER_INIT;\r
-       self.touch = trigger_changelevel_touch;\r
-};\r

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 d0b261c38cefa8e592c08dbd4ce5d510a099bd18..69993b30e7a35abe98ac3acd21050a31a8c791ad 100644 (file)
--- 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