From ac7ed30a4cd8538649c84ceddf44242cb12edf64 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 27 Nov 2022 22:14:22 +0000 Subject: [PATCH] Merge branch 'fix-499' into 'master' Fix linedef type 499 binary->UDMF conversion See merge request KartKrew/Kart!787 --- src/p_setup.c | 4 ++++ src/p_spec.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index efea952fb..9249e1202 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -5887,6 +5887,10 @@ static void P_ConvertBinaryLinedefTypes(void) if (lines[i].flags & ML_SKEWTD) lines[i].args[3] |= TMPF_GHOSTFADE; break; + case 499: //Ring Racers - Toggle waypoints + lines[i].args[0] = tag; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; case 500: //Scroll front wall left case 501: //Scroll front wall right lines[i].args[0] = 0; diff --git a/src/p_spec.c b/src/p_spec.c index f016b04d5..474f39db9 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4150,7 +4150,7 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha { if (thing->type == MT_WAYPOINT) { - if (line->flags & ML_NOCLIMB) + if (line->args[1]) { thing->extravalue1 = 1; }