Merge branch 'master' into Mario/nade_drop
authorMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)
qcsrc/server/mutators/mutator_nades.qc

index 5ab6df7..2fad602 100644 (file)
@@ -169,16 +169,15 @@ void toss_nade(entity e, vector _velocity, float _time)
        if (trace_startsolid)
                setorigin(_nade, e.origin);
 
-       if(e.crouch)
-               _nade.velocity = '0 0 -10';
+       if(self.v_angle_x >= 70 && self.v_angle_x <= 110)
+               _nade.velocity = '0 0 100';
        else if(autocvar_g_nades_nade_newton_style == 1)
                _nade.velocity = e.velocity + _velocity;
        else if(autocvar_g_nades_nade_newton_style == 2)
                _nade.velocity = _velocity;
        else
                _nade.velocity = W_CalculateProjectileVelocity(e.velocity, _velocity, TRUE);
-
-       //_nade.solid = SOLID_BBOX; // TODO: remember why this was needed
+               
        _nade.touch = nade_touch;
        _nade.health = autocvar_g_nades_nade_health;
        _nade.max_health = _nade.health;