From: terencehill Date: Thu, 5 Jan 2012 23:02:05 +0000 (+0100) Subject: Remove checks that avoid resetting strength and invincibility when warmup ends. The... X-Git-Tag: xonotic-v0.6.0~42^2~5^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d64aef439cacf93f9accdd57a765e98cd8687e19;p=xonotic%2Fxonotic-data.pk3dir.git Remove checks that avoid resetting strength and invincibility when warmup ends. The goal of those checks was to prevent that they spawn "very early each match" but current code seems working fine without them. The main issue was: if e.g. strength is already spawned but not taken in the warmup stage, match starts with it already spawned. --- diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index c89c2b2ef..023958a58 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -56,7 +56,7 @@ void reset_map(float dorespawn) race_ReadyRestart(); for(self = world; (self = nextent(self)); ) - if(clienttype(self) == CLIENTTYPE_NOTACLIENT && self.items != IT_STRENGTH && self.items != IT_INVINCIBLE) // don't respawn strength or shield, that will only lead to them spawning very early each match + if(clienttype(self) == CLIENTTYPE_NOTACLIENT) { if(self.reset) {