From 2f7995619ea8b9256fec6def91401f99b2a794a7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 1 Sep 2022 19:33:49 +0200 Subject: [PATCH] - removed unused variables in SECTOR_OBJECT --- source/games/sw/src/game.h | 9 +++++---- source/games/sw/src/save.cpp | 3 --- source/games/sw/src/track.cpp | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index cc6a5b2a5..f85031c27 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1467,13 +1467,12 @@ struct SECTOR_OBJECT int vel, // velocity vel_tgt, // target velocity - player_xoff, // player x offset from the xmid - player_yoff, // player y offset from the ymid + update, // Distance from player at which you continue updating + + // start of must floatify zorig_floor[MAX_SO_SECTOR], // original z values for all sectors - zorig_ceiling[MAX_SO_SECTOR], // original z values for all sectors z_tgt, // target z delta z_rate, // rate at which z aproaches target - update, // Distance from player at which you continue updating // only works for single player. bob_diff, // bobbing difference for the frame floor_loz, // floor low z @@ -1482,6 +1481,8 @@ struct SECTOR_OBJECT morph_z_min, // morphing point z min morph_z_max, bob_amt, // bob amount max in z coord + // end of must floatify + // variables set by mappers for drivables drive_angspeed, drive_angslide, diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp index 75787e6c8..9f2323bd4 100644 --- a/source/games/sw/src/save.cpp +++ b/source/games/sw/src/save.cpp @@ -623,7 +623,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, SECTOR_OBJECT& w, ("clipbox_num", w.clipbox_num, def->clipbox_num) .Array("sectp", w.sectp, def->sectp, w.num_sectors) .Array("zorig_floor", w.zorig_floor, def->zorig_floor, w.num_sectors) - .Array("zorig_ceiling", w.zorig_ceiling, def->zorig_ceiling, w.num_sectors) .Array("sp_num", w.so_actors, def->so_actors, countof(w.so_actors)) .Array("xorig", w.xorig, def->xorig, w.num_walls) .Array("yorig", w.yorig, def->yorig, w.num_walls) @@ -634,8 +633,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, SECTOR_OBJECT& w, ("zmid", w.pmid.Z, def->pmid.Z) ("vel", w.vel, def->vel) ("vel_tgt", w.vel_tgt, def->vel_tgt) - ("player_xoff", w.player_xoff, def->player_xoff) - ("player_yoff", w.player_yoff, def->player_yoff) ("zdelta", w.zdelta, def->zdelta) ("z_tgt", w.z_tgt, def->z_tgt) diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp index 4383e705c..c4cafc48a 100644 --- a/source/games/sw/src/track.cpp +++ b/source/games/sw/src/track.cpp @@ -723,7 +723,6 @@ void SectorObjectSetupBounds(SECTOR_OBJECT* sop) sect->extra |= SECTFX_SECTOR_OBJECT; sop->zorig_floor[sop->num_sectors] = sect->int_floorz(); - sop->zorig_ceiling[sop->num_sectors] = sect->int_ceilingz(); if ((sect->extra & SECTFX_SINK)) sop->zorig_floor[sop->num_sectors] += Z(FixedToInt(sect->depth_fixed)); @@ -954,7 +953,6 @@ void SetupSectorObject(sectortype* sectp, short tag) sop->turn_speed = 4; sop->floor_loz = -9999999; sop->floor_hiz = 9999999; - sop->player_xoff = sop->player_yoff = 0; sop->ang_tgt = sop->ang = sop->ang_moving = 0; sop->op_main_sector = nullptr; sop->ram_damage = 0;