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

Remove unnecessary options from quicksand FOF again

Browse source
This commit is contained in:
MascaraSnake 2020-06-12 18:22:16 +02:00
parent 698c18bd40
commit 88aad41310
4 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2104,24 +2104,15 @@ udmf
} }
arg1 arg1
{ {
title = "Alpha"; title = "Ripple effect?";
default = 255; type = 11;
enum = "yesno";
} }
arg2 arg2
{
title = "Ripple effect?";
type = 12;
enum
{
1 = "No ripple effect";
2 = "Cut cyan flat pixels";
}
}
arg3
{ {
title = "Sinking speed"; title = "Sinking speed";
} }
arg4 arg3
{ {
title = "Friction"; title = "Friction";
} }

9
src/p_setup.c
View file

@ -3363,13 +3363,10 @@ static void P_ConvertBinaryMap(void)
break; break;
case 257: //FOF: Quicksand case 257: //FOF: Quicksand
lines[i].args[0] = lines[i].tag; lines[i].args[0] = lines[i].tag;
lines[i].args[1] = 255;
if (!(lines[i].flags & ML_EFFECT5)) if (!(lines[i].flags & ML_EFFECT5))
lines[i].args[2] |= TMFQ_NORIPPLE; lines[i].args[1] = 1; //No ripple effect
if (lines[i].flags & ML_EFFECT6) lines[i].args[2] = lines[i].dx >> FRACBITS; //Sinking speed
lines[i].args[2] |= TMFQ_SPLAT; lines[i].args[3] = lines[i].dy >> FRACBITS; //Friction
lines[i].args[3] = lines[i].dx >> FRACBITS; //Sinking speed
lines[i].args[4] = lines[i].dy >> FRACBITS; //Friction
break; break;
case 258: //FOF: Laser case 258: //FOF: Laser
lines[i].args[0] = lines[i].tag; lines[i].args[0] = lines[i].tag;

10
src/p_spec.c
View file

@ -6887,16 +6887,14 @@ void P_SpawnSpecials(boolean fromnetsave)
} }
case 257: // Quicksand case 257: // Quicksand
ffloorflags = FF_EXISTS|FF_QUICKSAND|FF_RENDERALL|FF_ALLSIDES|FF_CUTSPRITES; ffloorflags = FF_EXISTS|FF_QUICKSAND|FF_RENDERALL|FF_ALLSIDES|FF_CUTSPRITES;
if (!(lines[i].args[2] & TMFQ_NORIPPLE)) if (!(lines[i].args[1]))
ffloorflags |= FF_RIPPLE; ffloorflags |= FF_RIPPLE;
if (lines[i].args[2] & TMFQ_SPLAT)
ffloorflags |= FF_SPLAT;
for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0], s)) >= 0 ;) for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0], s)) >= 0 ;)
{ {
ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], ffloorflags, secthinkers); ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, 0xff, ffloorflags, secthinkers);
fflr->sinkspeed = abs(lines[i].args[3]) << (FRACBITS - 1); fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1);
fflr->friction = abs(lines[i].args[4]) << (FRACBITS - 6); fflr->friction = abs(lines[i].args[3]) << (FRACBITS - 6);
} }
break; break;

6
src/p_spec.h
View file

@ -96,12 +96,6 @@ typedef enum
TMFB_SPLAT = 1<<3, TMFB_SPLAT = 1<<3,
} textmapfofbustflags_t; } textmapfofbustflags_t;
typedef enum
{
TMFQ_NORIPPLE = 1,
TMFQ_SPLAT = 1<<1,
} textmapfofquicksandflags_t;
typedef enum typedef enum
{ {
TMFL_NOBOSSES = 1, TMFL_NOBOSSES = 1,