Merge remote branch 'origin/master' into fruitiex/fruitbalance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_triggers.qc

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 44782894424346d5a5cfa4e2ff5f834dc15f87d0..a1ee74d4300439589790a925384997779f6c7de0 100644 (file)
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -1966,7 +1966,7 @@ void relay_activators_use()
                        trg.setactive(os.cnt);
                else
                {
-                       bprint("Not using setactive\n");
+                       //bprint("Not using setactive\n");
                        if(os.cnt == ACTIVE_TOGGLE)
                                if(trg.active == ACTIVE_ACTIVE)
                                        trg.active = ACTIVE_NOT;
@@ -1996,3 +1996,20 @@ void spawnfunc_relay_activatetoggle()
        self.cnt = ACTIVE_TOGGLE;
        self.use = relay_activators_use;        
 }
+
+.string chmap, gametype;
+void spawnfunc_target_changelevel_use()
+{
+       if(self.gametype != "")
+               MapInfo_SwitchGameType(MapInfo_Type_FromString(self.gametype));
+
+       if (self.chmap == "")
+               localcmd("endmatch\n");
+       else
+               localcmd(strcat("changelevel ", self.chmap, "\n"));
+};
+
+void spawnfunc_target_changelevel()
+{
+       self.use = spawnfunc_target_changelevel_use;
+};