stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make exclusive scrolling the default

Browse source
This commit is contained in:
MascaraSnake 2021-07-01 00:47:56 +02:00
parent 977887f456
commit 052bfe130c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/conf/udb/Includes/SRB222_linedefs.cfg
View file

@ -2818,7 +2818,7 @@ udmf
enum = "scrolltype"; enum = "scrolltype";
flags flags
{ {
4 = "Exclusive"; 4 = "Non-exclusive";
} }
} }
} }

4
src/p_setup.c
View file

@ -3741,8 +3741,8 @@ static void P_ConvertBinaryMap(void)
lines[i].args[2] = ((lines[i].special - 510)/10 + 1) % 3; 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[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; lines[i].args[4] = (lines[i].special % 10) % 3;
if (lines[i].args[2] != 1 && lines[i].flags & ML_NOCLIMB) if (lines[i].args[2] != TMS_SCROLLONLY && !(lines[i].flags & ML_NOCLIMB))
lines[i].args[4] |= 4; lines[i].args[4] |= TMST_NONEXCLUSIVE;
lines[i].special = 510; lines[i].special = 510;
break; break;
case 606: //Colormap case 606: //Colormap

4
src/p_spec.c
View file

@ -7645,11 +7645,11 @@ static void P_SpawnScrollers(void)
fixed_t dy = FixedMul(FixedDiv(l->dy, length), speed) >> SCROLL_SHIFT; fixed_t dy = FixedMul(FixedDiv(l->dy, length), speed) >> SCROLL_SHIFT;
if (l->args[0] == 0) 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 else
{ {
TAG_ITER_SECTORS(l->args[0], s) 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; break;
} }

2
src/p_spec.h
View file

@ -132,7 +132,7 @@ typedef enum
TMST_ACCELERATIVE = 1, TMST_ACCELERATIVE = 1,
TMST_DISPLACEMENT = 2, TMST_DISPLACEMENT = 2,
TMST_TYPEMASK = 3, TMST_TYPEMASK = 3,
TMST_EXCLUSIVE = 4, TMST_NONEXCLUSIVE = 4,
} textmapscrolltype_t; } textmapscrolltype_t;
// GETSECSPECIAL (specialval, section) // GETSECSPECIAL (specialval, section)