diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index b90c70d8c..e596d35a8 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -616,8 +616,7 @@ struct PLAYER double pbob_amt; int jump_count, jump_speed; // jumping - int16_t down_speed, up_speed; // diving - double z_speed; // used for diving and flying instead of down_speed, up_speed + double z_speed; int climb_ndx; double p_ceiling_dist,p_floor_dist; sectortype* hi_sectp, *lo_sectp; diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index 8c0f48d3e..0b87d733e 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -4401,7 +4401,7 @@ void DoPlayerDive(PLAYER* pp) } // make player bob if sitting still - if (!PLAYER_MOVING(pp) && pp->z_speed == 0 && pp->up_speed == 0) + if (!PLAYER_MOVING(pp) && pp->z_speed == 0) { DoPlayerSpriteBob(pp, PLAYER_DIVE_HEIGHTF, PLAYER_DIVE_BOB_AMT, 3); } @@ -6989,8 +6989,6 @@ saveable_module saveable_player = DEFINE_FIELD_X(SWPlayer, PLAYER, sop_remote) DEFINE_FIELD_X(SWPlayer, PLAYER, jump_count) DEFINE_FIELD_X(SWPlayer, PLAYER, jump_speed) -DEFINE_FIELD_X(SWPlayer, PLAYER, down_speed) -DEFINE_FIELD_X(SWPlayer, PLAYER, up_speed) DEFINE_FIELD_X(SWPlayer, PLAYER, z_speed) DEFINE_FIELD_X(SWPlayer, PLAYER, climb_ndx) DEFINE_FIELD_X(SWPlayer, PLAYER, hiz) diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp index 2644d83f7..78bda0465 100644 --- a/source/games/sw/src/save.cpp +++ b/source/games/sw/src/save.cpp @@ -449,8 +449,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PLAYER& w, PLAYER* ("sop", w.sop) ("jump_count", w.jump_count) ("jump_speed", w.jump_speed) - ("down_speed", w.down_speed) - ("up_speed", w.up_speed) ("z_speed", w.z_speed) ("climb_ndx", w.climb_ndx) ("hiz", w.hiz) diff --git a/wadsrc/static/zscript/games/sw/swgame.zs b/wadsrc/static/zscript/games/sw/swgame.zs index ba6062a55..24db162e7 100644 --- a/wadsrc/static/zscript/games/sw/swgame.zs +++ b/wadsrc/static/zscript/games/sw/swgame.zs @@ -188,8 +188,7 @@ struct SWPlayer native native voidptr sop_remote; // the status bar needs to check this - remove once the underlying type can be supported. native int jump_count, jump_speed; // jumping - native int16 down_speed, up_speed; // diving - native double z_speed; // used for diving and flying instead of down_speed, up_speed + native double z_speed; native int climb_ndx; native double hiz,loz; native double p_ceiling_dist,p_floor_dist;