turn NIX into a mutator; fix keyhunt

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

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index ad9341e2d0f947e6aec137e193b3b5f0650d8a4d..228782748d2aa6fd160719863791434b2fae502e 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -539,6 +539,11 @@ void spawnfunc_worldspawn (void)
 
                GameLogEcho(strcat(":gamestart:", GetGametype(), "_", GetMapname(), ":", s));
                s = ":gameinfo:mutators:LIST";
 
                GameLogEcho(strcat(":gamestart:", GetGametype(), "_", GetMapname(), ":", s));
                s = ":gameinfo:mutators:LIST";

+
+               ret_string = s;
+               MUTATOR_CALLHOOK(BuildMutatorsString);
+               s = ret_string;
+

                if(cvar("g_grappling_hook"))
                        s = strcat(s, ":grappling_hook");
                if(!cvar("g_use_ammunition"))
                if(cvar("g_grappling_hook"))
                        s = strcat(s, ":grappling_hook");
                if(!cvar("g_use_ammunition"))


@@ -547,8 +552,6 @@ void spawnfunc_worldspawn (void)
                        s = strcat(s, ":no_pickup_items");
                if(cvar_string("g_weaponarena") != "0")
                        s = strcat(s, ":", cvar_string("g_weaponarena"), " arena");
                        s = strcat(s, ":no_pickup_items");
                if(cvar_string("g_weaponarena") != "0")
                        s = strcat(s, ":", cvar_string("g_weaponarena"), " arena");

-               if(cvar("g_nixnex"))
-                       s = strcat(s, ":nixnex");

                if(cvar("g_vampire"))
                        s = strcat(s, ":vampire");
                if(cvar("g_laserguided_missile"))
                if(cvar("g_vampire"))
                        s = strcat(s, ":vampire");
                if(cvar("g_laserguided_missile"))