if (this.flags & FL_WATERJUMP) {
this.velocity_x = this.movedir.x;
this.velocity_y = this.movedir.y;
- if (this.waterlevel == WATERLEVEL_NONE) {
+ if (time > this.teleport_time || this.waterlevel == WATERLEVEL_NONE) {
this.flags &= ~FL_WATERJUMP;
+ this.teleport_time = 0;
}
} else if (MUTATOR_CALLHOOK(PM_Physics, this, maxspeed_mod, dt)) {
// handled
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))) {
}
}
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;
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;
}
}
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;
this.angles += dt * this.avelocity;
float movetime = dt;
- for (int i = 0; i < MAX_CLIP_PLANES && movetime > 0; i++) {
+ for (int i = 0; i < MAX_CLIP_PLANES && movetime > 0; ++i) {
vector push = vel * movetime;
vector p0 = pos;
vector p1 = p0 + push;
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);