From 2f23cedf192c3a4b36999cebfd478ef5f819edc4 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Mon, 3 Feb 2025 16:26:57 +0100 Subject: [PATCH] Don't break UDMF maces (why am I even checking UDMF in binary conversion code) --- src/p_mobj.c | 2 +- src/p_setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 71cbfc87f..f7bb0d13f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11118,7 +11118,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) mnumspokes = mthing->args[1] + 1; mspokeangle = FixedAngle((360*FRACUNIT)/mnumspokes) >> ANGLETOFINESHIFT; mwidth = max(0, mthing->args[2]); - mspeed = abs(mthing->args[3]); + mspeed = abs(mthing->args[3] << (udmf ? 4 : 0)); mphase = mthing->args[4] % 360; mpinch = mthing->args[5] % 360; mnumnospokes = mthing->args[6]; diff --git a/src/p_setup.c b/src/p_setup.c index 97de60861..0a0f69480 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7160,7 +7160,7 @@ static void P_ConvertBinaryThingTypes(void) mapthings[i].pitch = lines[j].frontsector->floorheight >> FRACBITS; mapthings[i].args[0] = lines[j].dx >> FRACBITS; mapthings[i].args[1] = mapthings[i].extrainfo; - mapthings[i].args[3] = lines[j].dy >> (FRACBITS-4); + mapthings[i].args[3] = lines[j].dy >> FRACBITS; mapthings[i].args[4] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS; mapthings[i].args[7] = -sides[lines[j].sidenum[0]].rowoffset >> FRACBITS; if (lines[j].backsector)