From cb7e797842df329555dd8e5f27350aa5425bab8b Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 8 Sep 2020 20:48:01 +1000 Subject: [PATCH] - SW: Partially revert changes from df0331a4c3078641b70bb0f0903f18e08caee489. --- source/sw/src/game.h | 3 +-- source/sw/src/track.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/sw/src/game.h b/source/sw/src/game.h index e354aa96b..d4b1714c7 100644 --- a/source/sw/src/game.h +++ b/source/sw/src/game.h @@ -1713,14 +1713,13 @@ struct SECTOR_OBJECTstruct morph_z_max, bob_amt, // bob amount max in z coord // variables set by mappers for drivables + drive_angspeed, drive_angslide, drive_speed, drive_slide, crush_z, flags; - fixed_t drive_angspeed; - short sector[MAX_SO_SECTOR], // hold the sector numbers of the sector object sp_num[MAX_SO_SPRITE], // hold the sprite numbers of the object xorig[MAX_SO_POINTS], // save the original x & y location of each wall so it can be diff --git a/source/sw/src/track.cpp b/source/sw/src/track.cpp index cdfcfcb80..4b1570261 100644 --- a/source/sw/src/track.cpp +++ b/source/sw/src/track.cpp @@ -1273,7 +1273,8 @@ SetupSectorObject(short sectnum, short tag) case SO_DRIVABLE_ATTRIB: - sop->drive_angspeed = SP_TAG2(sp) << 21; + sop->drive_angspeed = SP_TAG2(sp); + sop->drive_angspeed <<= 5; sop->drive_angslide = SP_TAG3(sp); if (sop->drive_angslide <= 0 || sop->drive_angslide == 32) sop->drive_angslide = 1;