Remove a bad call from nexball (weapons are already initialized at start)
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 09:24:45 +0000 (20:24 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 09:24:45 +0000 (20:24 +1100)
qcsrc/server/mutators/gamemode_nexball.qc

index dd8dacc..392caa0 100644 (file)
@@ -299,7 +299,7 @@ void basketball_touch(void)
                football_touch();
                return;
        }
-       if(!self.cnt && IS_PLAYER(other) && !other.frozen && (other != self.nb_dropper || time > self.nb_droptime + autocvar_g_nexball_delay_collect))
+       if(!self.cnt && IS_PLAYER(other) && !other.frozen && !other.deadflag && (other != self.nb_dropper || time > self.nb_droptime + autocvar_g_nexball_delay_collect))
        {
                if(other.health <= 0)
                        return;
@@ -695,7 +695,7 @@ void W_Nexball_Touch(void)
 
        PROJECTILE_TOUCH;
        if(attacker.team != other.team || autocvar_g_nexball_basketball_teamsteal)
-               if((ball = other.ballcarried) && !other.deadflag && (IS_PLAYER(attacker)))
+               if((ball = other.ballcarried) && !other.frozen && !other.deadflag && (IS_PLAYER(attacker)))
                {
                        other.velocity = other.velocity + normalize(self.velocity) * other.damageforcescale * autocvar_g_balance_nexball_secondary_force;
                        other.flags &= ~FL_ONGROUND;
@@ -1012,8 +1012,6 @@ MUTATOR_DEFINITION(gamemode_nexball)
                g_nexball_meter_period = rint(g_nexball_meter_period * 32) / 32; //Round to 1/32ths to send as a byte multiplied by 32
                addstat(STAT_NB_METERSTART, AS_FLOAT, metertime);
 
-               W_Porto(WR_INIT); // abuse
-
                // General settings
                /*
                CVTOV(g_nexball_football_boost_forward);   //100