diff --git a/language.version b/language.version index 3847b583d..49b3cfd15 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1232 \cu(miƩ 13 ago 2025 14:03:13 CEST)\c-"; -SWWM_SHORTVER="\cw1.3pre r1232 \cu(2025-08-13 14:03:13)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1233 \cu(lun 18 ago 2025 23:29:49 CEST)\c-"; +SWWM_SHORTVER="\cw1.3pre r1233 \cu(2025-08-18 23:29:49)\c-"; diff --git a/zscript/player/swwm_player_move.zsc b/zscript/player/swwm_player_move.zsc index 1fa26c7f2..09b30621d 100644 --- a/zscript/player/swwm_player_move.zsc +++ b/zscript/player/swwm_player_move.zsc @@ -324,7 +324,7 @@ extend Class Demolitionist vel *= .95; player.vel += RotateVector(nmove,angle)*cos(pitch)*16.; player.jumptics = -2; - if ( !(player.cheats & CF_PREDICTING) && (player.cmd.forwardmove|player.cmd.sidemove) ) + if ( player.cmd.forwardmove|player.cmd.sidemove ) PlayRunning(); if ( player.cheats&CF_REVERTPLEASE ) { @@ -428,7 +428,7 @@ extend Class Demolitionist if ( spd > maxspd ) vel.xy = (vel.xy+accel/GameTicRate).unit()*spd; else vel.xy = vel.xy+accel/GameTicRate; } - if ( !(player.cheats&CF_PREDICTING) && (nmove.length() > 0.) ) + if ( nmove.length() > 0. ) PlayRunning(); if ( player.cheats&CF_REVERTPLEASE ) { @@ -477,7 +477,7 @@ extend Class Demolitionist } if ( player.onground ) lastgroundtic = level.maptime; else lastairtic = level.maptime; - if ( !(player.cheats & CF_PREDICTING) && !(player.cmd.forwardmove|player.cmd.sidemove) ) + if ( !(player.cmd.forwardmove|player.cmd.sidemove) ) PlayIdle(); if ( !(player.cmd.buttons&BT_USER2) || (gamestate != GS_LEVEL) || (dashcooldown > 0) || (dashfuel < 20.) ) return; @@ -635,7 +635,7 @@ extend Class Demolitionist bool raging = FindInventory('RagekitPower'); if ( raging ) jumpvelz *= 2.; double pvelz = vel.z; - if ( !player.onground && !(player.cheats&CF_PREDICTING) ) + if ( !player.onground ) { // check for wall stuff if ( walljump ) diff --git a/zscript/player/swwm_player_think.zsc b/zscript/player/swwm_player_think.zsc index 756edcf7c..56e509b02 100644 --- a/zscript/player/swwm_player_think.zsc +++ b/zscript/player/swwm_player_think.zsc @@ -198,6 +198,12 @@ extend Class Demolitionist override void PlayerThink() { + if ( player && (player.cheats&CF_PREDICTING) ) + { + // sod off, m8 + Super.PlayerThink(); + return; + } if ( !player || (player.playerstate != PST_DEAD) ) deadtimer = 0; oldangles = (angle,pitch,roll); if ( player && (player.mo == self) && (player.playerstate != PST_DEAD) && (player.cmd.buttons&BT_USE) ) diff --git a/zscript/player/swwm_player_tick.zsc b/zscript/player/swwm_player_tick.zsc index 8cb5a58cc..f14788085 100644 --- a/zscript/player/swwm_player_tick.zsc +++ b/zscript/player/swwm_player_tick.zsc @@ -186,6 +186,12 @@ extend Class Demolitionist override void Tick() { + if ( player && (player.cheats&CF_PREDICTING) ) + { + // sod off, m8 + Super.Tick(); + return; + } Vector3 oldpos = pos; // can't be poisoned PoisonDurationReceived = 0;