From 762b8cadf472ac573d38fb022c2caeaad87678e5 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 15 Dec 2011 15:21:34 +0100 Subject: [PATCH] make g_powerup_* count as "No strength"-like mutators --- .../xonotic/dialog_multiplayer_create_mutators.c | 6 ++++++ qcsrc/server/g_world.qc | 13 +++++++++++++ qcsrc/server/teamplay.qc | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c index 2711c57e7..e91611321 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -96,6 +96,12 @@ string XonoticMutatorsDialog_toString(entity me) s = strcat(s, ", ", _("Blood loss")); if(cvar("g_jetpack")) s = strcat(s, ", ", _("Jet pack")); + if(!cvar("g_powerup_superhealth")) + s = strcat(s, ", ", _("No superhealth")); + if(!cvar("g_powerup_strength")) + s = strcat(s, ", ", _("No strength")); + if(!cvar("g_powerup_shield")) + s = strcat(s, ", ", _("No shield")); if(s == "") return ZCTX(_("MUT^None")); else diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 3d1de580a..7df226be7 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -483,6 +483,7 @@ void cvar_changes_init() BADCVAR("sys_ticrate"); BADCVAR("teamplay_mode"); BADCVAR("timelimit_override"); + BADPREFIX("g_powerup_"); BADPREFIX("g_warmup_"); BADPREFIX("sv_ready_restart_"); @@ -765,6 +766,18 @@ void spawnfunc_worldspawn (void) if(autocvar_g_minstagib) s = strcat(s, ":minstagib"); + // TODO to mutator system + if(!autocvar_g_powerup_superhealth) + s = strcat(s, ":no_superhealth"); + + // TODO to mutator system + if(!autocvar_g_powerup_strength) + s = strcat(s, ":no_strength"); + + // TODO to mutator system + if(!autocvar_g_powerup_shield) + s = strcat(s, ":no_shield"); + GameLogEcho(s); GameLogEcho(":gameinfo:end"); } diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 3d65d760d..204bd6cd1 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -478,6 +478,12 @@ string getwelcomemessage(void) modifications = strcat(modifications, ", Blood loss"); if(g_jetpack) modifications = strcat(modifications, ", Jet pack"); + if(!autocvar_g_powerup_superhealth) + modifications = strcat(modifications, ", No superhealth"); + if(!autocvar_g_powerup_strength) + modifications = strcat(modifications, ", No strength"); + if(!autocvar_g_powerup_shield) + modifications = strcat(modifications, ", No shield"); modifications = substring(modifications, 2, strlen(modifications) - 2); string versionmessage; -- 2.39.2