From 052bfe130ce5f96ae29f12f2e7183800c863d638 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Thu, 1 Jul 2021 00:47:56 +0200 Subject: [PATCH] Make exclusive scrolling the default --- extras/conf/udb/Includes/SRB222_linedefs.cfg | 2 +- src/p_setup.c | 4 ++-- src/p_spec.c | 4 ++-- src/p_spec.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg index f67372e88..449691cdc 100644 --- a/extras/conf/udb/Includes/SRB222_linedefs.cfg +++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg @@ -2818,7 +2818,7 @@ udmf enum = "scrolltype"; flags { - 4 = "Exclusive"; + 4 = "Non-exclusive"; } } } diff --git a/src/p_setup.c b/src/p_setup.c index 9bc87af94..575998d20 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3741,8 +3741,8 @@ static void P_ConvertBinaryMap(void) lines[i].args[2] = ((lines[i].special - 510)/10 + 1) % 3; lines[i].args[3] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> FRACBITS; lines[i].args[4] = (lines[i].special % 10) % 3; - if (lines[i].args[2] != 1 && lines[i].flags & ML_NOCLIMB) - lines[i].args[4] |= 4; + if (lines[i].args[2] != TMS_SCROLLONLY && !(lines[i].flags & ML_NOCLIMB)) + lines[i].args[4] |= TMST_NONEXCLUSIVE; lines[i].special = 510; break; case 606: //Colormap diff --git a/src/p_spec.c b/src/p_spec.c index cf6dc5fdd..32b935959 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -7645,11 +7645,11 @@ static void P_SpawnScrollers(void) fixed_t dy = FixedMul(FixedDiv(l->dy, length), speed) >> SCROLL_SHIFT; if (l->args[0] == 0) - P_SpawnPlaneScroller(l, dx, dy, control, (INT32)(l->frontsector - sectors), accel, l->args[4] & TMST_EXCLUSIVE); + P_SpawnPlaneScroller(l, dx, dy, control, (INT32)(l->frontsector - sectors), accel, l->args[4] & TMST_NONEXCLUSIVE); else { TAG_ITER_SECTORS(l->args[0], s) - P_SpawnPlaneScroller(l, dx, dy, control, s, accel, l->args[4] & TMST_EXCLUSIVE); + P_SpawnPlaneScroller(l, dx, dy, control, s, accel, l->args[4] & TMST_NONEXCLUSIVE); } break; } diff --git a/src/p_spec.h b/src/p_spec.h index aa9f85bc8..c2b6953cf 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -132,7 +132,7 @@ typedef enum TMST_ACCELERATIVE = 1, TMST_DISPLACEMENT = 2, TMST_TYPEMASK = 3, - TMST_EXCLUSIVE = 4, + TMST_NONEXCLUSIVE = 4, } textmapscrolltype_t; // GETSECSPECIAL (specialval, section)