Gametype key

diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index ebc63e13d005f8fbe4d70cf1af67cebcc20756fe..66bc39d9432e58c5730584bd6ae2afd3cf83b42c 100644 (file)
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -1816,9 +1816,12 @@ void spawnfunc_trigger_magicear()
        //   what to trigger\r
 }\r
 \r
        //   what to trigger\r
 }\r
 \r

-.string chmap;\r
+.string chmap, gametype;\r

 void spawnfunc_target_changelevel()\r
 {\r
 void spawnfunc_target_changelevel()\r
 {\r

+       if(self.gametype != "")\r
+               MapInfo_SwitchGameType(MapInfo_Type_FromString(self.gametype));\r
+\r

        if (self.chmap == "")\r
                localcmd("endmatch\n");\r
        else\r
        if (self.chmap == "")\r
                localcmd("endmatch\n");\r
        else\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 69993b30e7a35abe98ac3acd21050a31a8c791ad..16fc133e64b32928b5250bd3def89ac6cd941a4a 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
@@ -1379,4 +1379,5 @@ When no chmap key is set, the entity just ends the match when triggered. The pla
 -------- KEYS --------
 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
 -------- KEYS --------
 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

+gametype: Switch to this gametype. If empty, the same gametype stays.

 */
\ No newline at end of file
 */
\ No newline at end of file