Merge branch 'terencehill/sv_maxidle_playertospectator' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / ecs / systems / physics.qc

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index 75657c90f268c6f9248377114df942c96fbf1674..38d35d4b37a9b95bd56de2f516bced5ad4f05e91 100644 (file)
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -112,18 +112,18 @@ void sys_phys_update(entity this, float dt)
                sys_phys_simulate(this, dt);
                this.com_phys_water = false;
                this.jumppadcount = 0;
-       } else if (time < this.ladder_time) {
+       } else if (this.ladder_entity) {
                this.com_phys_friction = PHYS_FRICTION(this);
                this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;
                this.com_phys_acc_rate = PHYS_ACCELERATE(this) * maxspeed_mod;
-               this.com_phys_gravity = '0 0 -1' * PHYS_GRAVITY(this) * dt;
+               this.com_phys_gravity = -PHYS_GRAVITY(this) * dt;
                if (PHYS_ENTGRAVITY(this)) { this.com_phys_gravity *= PHYS_ENTGRAVITY(this); }
                this.com_phys_ladder = true;
                this.com_phys_friction_air = true;
                sys_phys_simulate(this, dt);
                this.com_phys_friction_air = false;
                this.com_phys_ladder = false;
-               this.com_phys_gravity = '0 0 0';
+               this.com_phys_gravity = 0;
        } else if (ITEMS_STAT(this) & IT_USING_JETPACK) {
                PM_jetpack(this, maxspeed_mod, dt);
        } else if (IS_ONGROUND(this) && (!IS_ONSLICK(this) || !PHYS_SLICK_APPLYGRAVITY(this))) {
@@ -134,14 +134,14 @@ void sys_phys_update(entity this, float dt)
                        }
                }
                this.com_phys_vel_max = PHYS_MAXSPEED(this) * maxspeed_mod;
-               this.com_phys_gravity = '0 0 -1' * PHYS_GRAVITY(this) * dt;
+               this.com_phys_gravity = -PHYS_GRAVITY(this) * dt;
                if (PHYS_ENTGRAVITY(this)) { this.com_phys_gravity *= PHYS_ENTGRAVITY(this); }
                this.com_phys_ground = true;
                this.com_phys_vel_2d = true;
                sys_phys_simulate(this, dt);
                this.com_phys_vel_2d = false;
                this.com_phys_ground = false;
-               this.com_phys_gravity = '0 0 0';
+               this.com_phys_gravity = 0;
        } else {
                this.com_phys_acc_rate_air = PHYS_AIRACCELERATE(this) * min(maxspeed_mod, 1);
                this.com_phys_acc_rate_air_stop = PHYS_AIRSTOPACCELERATE(this) * maxspeed_mod;
@@ -181,10 +181,10 @@ void sys_phys_simulate(entity this, float dt)
                UNSET_ONGROUND(this);
 
                if (this.com_phys_friction_air) {
-                       const vector g = -this.com_phys_gravity;
-                       this.velocity_z += g.z / 2;
+                       const float grav = -this.com_phys_gravity;
+                       this.velocity_z += grav / 2;
                        this.velocity = this.velocity * (1 - dt * this.com_phys_friction);
-                       this.velocity_z += g.z / 2;
+                       this.velocity_z += grav / 2;
                }
        }
 
@@ -427,7 +427,6 @@ void sys_phys_simulate_simple(entity this, float dt)
        vector g = '0 0 0';
        if (this.com_phys_gravity_factor && !g) g = '0 0 -1' * PHYS_GRAVITY(NULL);
 
-       vector acc = this.com_phys_acc;
        vector vel = this.com_phys_vel;
        vector pos = this.com_phys_pos;
 
@@ -500,7 +499,6 @@ void sys_phys_simulate_simple(entity this, float dt)
                ClipVelocity(vel, trace_plane_normal, vel, 1);
        }
 
-       this.com_phys_acc = acc;
        this.com_phys_vel = vel;
        this.com_phys_pos = pos;
        setorigin(this, this.com_phys_pos);