From 9aaae82de001b5e973a42a680eedcd94d8e32853 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 3 Sep 2022 23:27:03 +0200 Subject: [PATCH] - variable renaming again --- source/games/sw/src/game.h | 4 ++-- source/games/sw/src/input.cpp | 2 +- source/games/sw/src/player.cpp | 2 +- source/games/sw/src/save.cpp | 4 ++-- source/games/sw/src/track.cpp | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 1ddfa89f7..8648740f8 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1470,8 +1470,8 @@ struct SECTOR_OBJECT z_rate, // rate at which z aproaches target // only works for single player. bob_diff, // bobbing difference for the frame - floor_loz, // floor low z - floor_hiz, // floor hi z + _floor_loz, // floor low z + _floor_hiz, // floor hi z bob_amt, // bob amount max in z coord // end of must floatify diff --git a/source/games/sw/src/input.cpp b/source/games/sw/src/input.cpp index fbfd1f141..45d67142f 100644 --- a/source/games/sw/src/input.cpp +++ b/source/games/sw/src/input.cpp @@ -186,7 +186,7 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju if ((pp->Flags2 & PF2_INPUT_CAN_TURN_VEHICLE)) { - DoPlayerTurnVehicle(pp, input.avel, pp->int_ppos().Z + Z(10), abs(pp->int_ppos().Z + Z(10) - pp->sop->floor_loz)); + DoPlayerTurnVehicle(pp, input.avel, pp->int_ppos().Z + Z(10), abs(pp->int_ppos().Z + Z(10) - pp->sop->_floor_loz)); } if ((pp->Flags2 & PF2_INPUT_CAN_TURN_TURRET)) diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index 9dc957b9a..948cad694 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -2535,7 +2535,7 @@ void DoPlayerMoveVehicle(PLAYER* pp) OperateSectorObject(pp->sop, pp->angle.ang.Buildang(), { MAXSO, MAXSO }); pp->setcursector(pp->sop->op_main_sector); // for speed - floor_dist = abs(z - pp->sop->floor_loz); + floor_dist = abs(z - pp->sop->_floor_loz); if (RectClip) diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp index dd1b8758a..f3b62f7f4 100644 --- a/source/games/sw/src/save.cpp +++ b/source/games/sw/src/save.cpp @@ -639,8 +639,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, SECTOR_OBJECT& w, ("update", w.update, def->update) ("bob_diff", w.bob_diff, def->bob_diff) ("target_dist", w.target_dist, def->target_dist) - ("floor_loz", w.floor_loz, def->floor_loz) - ("floor_hiz", w.floor_hiz, def->floor_hiz) + ("floor_loz", w._floor_loz, def->_floor_loz) + ("floor_hiz", w._floor_hiz, def->_floor_hiz) ("morph_z", w.morph_z, def->morph_z) ("morph_z_min", w.morph_z_min, def->morph_z_min) ("morph_z_max", w.morph_z_max, def->morph_z_max) diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp index 99e18611b..5c67e5df2 100644 --- a/source/games/sw/src/track.cpp +++ b/source/games/sw/src/track.cpp @@ -728,11 +728,11 @@ void SectorObjectSetupBounds(SECTOR_OBJECT* sop) sop->zorig_floor[sop->num_sectors] += Z(FixedToInt(sect->depth_fixed)); // lowest and highest floor z's - if (sect->int_floorz() > sop->floor_loz) - sop->floor_loz = sect->int_floorz(); + if (sect->int_floorz() > sop->_floor_loz) + sop->_floor_loz = sect->int_floorz(); - if (sect->int_floorz() < sop->floor_hiz) - sop->floor_hiz = sect->int_floorz(); + if (sect->int_floorz() < sop->_floor_hiz) + sop->_floor_hiz = sect->int_floorz(); sop->num_sectors++; } @@ -948,8 +948,8 @@ void SetupSectorObject(sectortype* sectp, short tag) sop->clipdist = 1024; sop->target_dist = 0; sop->turn_speed = 4; - sop->floor_loz = -9999999; - sop->floor_hiz = 9999999; + sop->_floor_loz = -9999999; + sop->_floor_hiz = 9999999; sop->ang_tgt = sop->ang = sop->ang_moving = 0; sop->op_main_sector = nullptr; sop->ram_damage = 0;