Turn com_phys_gravity field into a float

diff --git a/qcsrc/ecs/components/physics.qh b/qcsrc/ecs/components/physics.qh
index 1852d14eac05d47811f07f97e5430b036c601a23..b2a99d9636c1ac0f0174a035c33a796050940e5b 100644 (file)
--- a/qcsrc/ecs/components/physics.qh
+++ b/qcsrc/ecs/components/physics.qh
@@ -13,7 +13,7 @@ COMPONENT(phys);
 .float com_phys_acc_rate_air_stop;
 .float com_phys_friction;
 
-.vector com_phys_gravity;
+.float com_phys_gravity;
 .float com_phys_gravity_factor;
 // TODO: remove
 .bool com_phys_ground;

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index 1f42c698824537cc6b0c2478e47acfe751b4dec0..38d35d4b37a9b95bd56de2f516bced5ad4f05e91 100644 (file)
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -116,14 +116,14 @@ void sys_phys_update(entity this, float dt)
                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;
                }
        }