Move resurfacing (when frozen) code to sys_phys_simulate

[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 ae5f119e7fe8db0eea039a57032af553cd4d7d24..fb0781e49e527391914ce6bc924e29eab822b2e4 100644 (file)
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -33,7 +33,12 @@ void sys_phys_update(entity this, float dt)
        if (IS_SVQC) {
                if (this.move_movetype == MOVETYPE_NONE) { return; }
                // when we get here, disableclientprediction cannot be 2
-               this.disableclientprediction = (this.move_qcphysics) ? -1 : 0;
+               if(this.move_movetype == MOVETYPE_FOLLOW) // not compatible with prediction
+                       this.disableclientprediction = 1;
+               else if(this.move_qcphysics)
+                       this.disableclientprediction = -1;
+               else
+                       this.disableclientprediction = 0;
        }
 
        viewloc_PlayerPhysics(this);
@@ -42,7 +47,7 @@ void sys_phys_update(entity this, float dt)
 
        PM_check_blocked(this);
 
-       float maxspeed_mod = (!this.in_swamp) ? 1 : this.swamp_slowdown;  // cvar("g_balance_swamp_moverate");
+       float maxspeed_mod = 1;
 
 // conveyors: first fix velocity
        if (this.conveyor.active) { this.velocity -= this.conveyor.movedir; }
@@ -85,13 +90,8 @@ void sys_phys_update(entity this, float dt)
        if (this.flags & FL_WATERJUMP) {
                this.velocity_x = this.movedir.x;
                this.velocity_y = this.movedir.y;
-               if (this.waterlevel == WATERLEVEL_NONE
-                   || time > PHYS_TELEPORT_TIME(this)
-                   || PHYS_WATERJUMP_TIME(this) <= 0
-                  ) {
+               if (this.waterlevel == WATERLEVEL_NONE) {
                        this.flags &= ~FL_WATERJUMP;
-                       PHYS_TELEPORT_TIME(this) = 0;
-                       PHYS_WATERJUMP_TIME(this) = 0;
                }
        } else if (MUTATOR_CALLHOOK(PM_Physics, this, maxspeed_mod, dt)) {
                // handled
@@ -126,7 +126,7 @@ void sys_phys_update(entity this, float dt)
                this.com_phys_gravity = '0 0 0';
        } else if (ITEMS_STAT(this) & IT_USING_JETPACK) {
                PM_jetpack(this, maxspeed_mod, dt);
-       } else if (IS_ONGROUND(this)) {
+       } else if (IS_ONGROUND(this) && (!IS_ONSLICK(this) || !PHYS_SLICK_APPLYGRAVITY(this))) {
                if (!WAS_ONGROUND(this)) {
                        emit(phys_land, this);
                        if (this.lastground < time - 0.3) {
@@ -191,10 +191,10 @@ void sys_phys_simulate(entity this, float dt)
        if (this.com_phys_water) {
                // water jump only in certain situations
                // this mimics quakeworld code
-               if (this.com_in_jump && this.waterlevel == WATERLEVEL_SWIMMING && this.velocity_z >= -180 && !this.viewloc) {
+               if (this.com_in_jump && this.waterlevel == WATERLEVEL_SWIMMING && this.velocity_z >= -180 && !this.viewloc && !PHYS_FROZEN(this)) {
                        vector yawangles = '0 1 0' * this.v_angle.y;
-                       makevectors(yawangles);
-                       vector forward = v_forward;
+                       vector forward, right, up;
+                       MAKE_VECTORS(yawangles, forward, right, up);
                        vector spot = this.origin + 24 * forward;
                        spot_z += 8;
                        traceline(spot, spot, MOVE_NOMONSTERS, this);
@@ -210,19 +210,29 @@ void sys_phys_simulate(entity this, float dt)
                        }
                }
        }
-       makevectors(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')));
-       // wishvel = v_forward * PHYS_CS(this).movement.x + v_right * PHYS_CS(this).movement.y + v_up * PHYS_CS(this).movement.z;
-       vector wishvel = v_forward * PHYS_CS(this).movement.x
-           + v_right * PHYS_CS(this).movement.y
+
+       vector forward, right, up;
+       MAKE_VECTORS(vmul(this.v_angle, (this.com_phys_vel_2d ? '0 1 0' : '1 1 1')), forward, right, up);
+       // wishvel = forward * PHYS_CS(this).movement.x + right * PHYS_CS(this).movement.y + up * PHYS_CS(this).movement.z;
+       vector wishvel = forward * PHYS_CS(this).movement.x
+           + right * PHYS_CS(this).movement.y
            + '0 0 1' * PHYS_CS(this).movement.z * (this.com_phys_vel_2d ? 0 : 1);
        if (this.com_phys_water) {
-               if (PHYS_INPUT_BUTTON_CROUCH(this)) {
-                       wishvel.z = -PHYS_MAXSPEED(this);
+               if (PHYS_FROZEN(this))
+               {
+                       if(this.waterlevel >= WATERLEVEL_SUBMERGED)
+                               wishvel = '0 0 160'; // resurface
                }
-               if (this.viewloc) {
-                       wishvel.z = -160;    // drift anyway
-               } else if (wishvel == '0 0 0') {
-                       wishvel = '0 0 -60'; // drift towards bottom
+               else
+               {
+                       if (PHYS_INPUT_BUTTON_CROUCH(this)) {
+                               wishvel.z = -PHYS_MAXSPEED(this);
+                       }
+                       if (this.viewloc) {
+                               wishvel.z = -160;    // drift anyway
+                       } else if (wishvel == '0 0 0') {
+                               wishvel = '0 0 -60'; // drift towards bottom
+                       }
                }
        }
        if (this.com_phys_ladder) {
@@ -254,8 +264,7 @@ void sys_phys_simulate(entity this, float dt)
        float wishspeed = min(vlen(wishvel), this.com_phys_vel_max);
 
        if (this.com_phys_air) {
-               if ((IS_SVQC && time >= PHYS_TELEPORT_TIME(this))
-                   ||  (IS_CSQC && PHYS_WATERJUMP_TIME(this) <= 0)) {
+               if (!(this.flags & FL_WATERJUMP)) {
                        // apply air speed limit
                        float airaccelqw = PHYS_AIRACCEL_QW(this);
                        float wishspeed0 = wishspeed;
@@ -316,7 +325,7 @@ void sys_phys_simulate(entity this, float dt)
                if (this.com_phys_water) {
                        wishspeed *= 0.7;
 
-                       //      if (PHYS_WATERJUMP_TIME(this) <= 0) // TODO: use
+                       //      if (!(this.flags & FL_WATERJUMP)) // TODO: use
                        {
                                // water friction
                                float f = 1 - dt * PHYS_FRICTION(this);
@@ -330,7 +339,7 @@ void sys_phys_simulate(entity this, float dt)
                                }
 
                                // holding jump button swims upward slowly
-                               if (this.com_in_jump && !this.viewloc) {
+                               if (this.com_in_jump && !this.viewloc && !PHYS_FROZEN(this)) {
                                        // was:
                                        // lava: 50
                                        // slime: 80
@@ -358,11 +367,9 @@ void sys_phys_simulate(entity this, float dt)
                        // apply edge friction
                        const float f2 = vlen2(vec2(this.velocity));
                        if (f2 > 0) {
-                               trace_dphitq3surfaceflags = 0;
-                               tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
                                // TODO: apply edge friction
                                // apply ground friction
-                               const int realfriction = (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK)
+                               const int realfriction = (IS_ONSLICK(this))
                                    ? PHYS_FRICTION_SLICK(this)
                                        : PHYS_FRICTION(this);
 
@@ -402,7 +409,7 @@ void sys_phys_simulate(entity this, float dt)
                        return;
                }
 
-               if (IS_CSQC ? PHYS_WATERJUMP_TIME(this) <= 0 : time >= PHYS_TELEPORT_TIME(this)) {
+               if (!(this.flags & FL_WATERJUMP)) {
                        PM_Accelerate(this, dt, wishdir, wishspeed, wishspeed, this.com_phys_acc_rate, 1, 0, 0, 0);
                }
        }