Properly execute target_changelevel

[voretournament/voretournament.git] / data / qcsrc / server / g_triggers.qc

diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index ff85ba0346e03e8a8f140c48c6b347dd589cfdec..92a9cfec3d5e9a9ae04bb78f4f89738a82de8a1c 100644 (file)
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -1816,13 +1816,11 @@ void spawnfunc_trigger_magicear()
        //   what to trigger\r
 }\r
 \r
-.string chmap;\r
-void trigger_changelevel_touch()\r
+.string chmap, gametype;\r
+void spawnfunc_target_changelevel_use()\r
 {\r
-       if not (other.iscreature)\r
-               return;\r
-\r
-       EXACTTRIGGER_TOUCH;\r
+       if(self.gametype != "")\r
+               MapInfo_SwitchGameType(MapInfo_Type_FromString(self.gametype));\r
 \r
        if (self.chmap == "")\r
                localcmd("endmatch\n");\r
@@ -1830,8 +1828,7 @@ void trigger_changelevel_touch()
                localcmd(strcat("changelevel ", self.chmap, "\n"));\r
 };\r
 \r
-void spawnfunc_trigger_changelevel()\r
+void spawnfunc_target_changelevel()\r
 {\r
-       EXACTTRIGGER_INIT;\r
-       self.touch = trigger_changelevel_touch;\r
+       self.use = spawnfunc_target_changelevel_use;\r
 };\r