From 8490829a6a36aba15b5ffd610677ea49d16af31f Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 19 Jul 2016 23:15:27 +1000 Subject: [PATCH] Remove .frozen field (virtually unused) --- qcsrc/common/mutators/mutator/nades/nades.qc | 2 +- qcsrc/menu/xonotic/serverlist.qc | 2 +- qcsrc/server/defs.qh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 353baa960..fd9a4226a 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -767,7 +767,7 @@ void nade_touch(entity this, entity toucher) if(autocvar_g_nades_pickup) if(time >= this.spawnshieldtime) if(!toucher.nade && this.health == this.max_health) // no boosted shot pickups, thank you very much - if(!toucher.frozen) + if(!STAT(FROZEN, toucher)) if(CanThrowNade(toucher)) // prevent some obvious things, like dead players if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here { diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index fc2ba573b..46506dcfa 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -1070,7 +1070,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is t = strcat(t, _("encryption:"), " ", (q ? sprintf(_("AES level %d"), q) : ZCTX(_("ENC^none"))), ", "); t = strcat(t, sprintf(_("mod: %s"), ((modname == "xonotic") ? ZCTX(_("MOD^Default")) : original_modname))); if(pure_available) - t = strcat(t, sprintf(_(" (%s)"), (pure) ? _("official settings") : _("modified settings"))); + t = strcat(t, sprintf(" (%s)", (pure) ? _("official settings") : _("modified settings"))); t = strcat(t, ", "); t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? _("stats enabled") : _("stats disabled"))); setZonedTooltip(me, t, string_null); diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d4aace83b..df791a626 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -395,7 +395,6 @@ const float ACTIVE_TOGGLE = 3; .float player_blocked; .float weapon_blocked; // weapon use disabled -.float frozen = _STAT(FROZEN); // for freeze attacks .float revive_progress = _STAT(REVIVE_PROGRESS); .float revival_time; // time at which player was last revived .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal) -- 2.39.2