mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 20:11:12 +00:00
Remove unnecessary options from quicksand FOF again
This commit is contained in:
parent
698c18bd40
commit
88aad41310
4 changed files with 11 additions and 31 deletions
|
@ -2104,24 +2104,15 @@ udmf
|
|||
}
|
||||
arg1
|
||||
{
|
||||
title = "Alpha";
|
||||
default = 255;
|
||||
title = "Ripple effect?";
|
||||
type = 11;
|
||||
enum = "yesno";
|
||||
}
|
||||
arg2
|
||||
{
|
||||
title = "Ripple effect?";
|
||||
type = 12;
|
||||
enum
|
||||
{
|
||||
1 = "No ripple effect";
|
||||
2 = "Cut cyan flat pixels";
|
||||
}
|
||||
}
|
||||
arg3
|
||||
{
|
||||
title = "Sinking speed";
|
||||
}
|
||||
arg4
|
||||
arg3
|
||||
{
|
||||
title = "Friction";
|
||||
}
|
||||
|
|
|
@ -3363,13 +3363,10 @@ static void P_ConvertBinaryMap(void)
|
|||
break;
|
||||
case 257: //FOF: Quicksand
|
||||
lines[i].args[0] = lines[i].tag;
|
||||
lines[i].args[1] = 255;
|
||||
if (!(lines[i].flags & ML_EFFECT5))
|
||||
lines[i].args[2] |= TMFQ_NORIPPLE;
|
||||
if (lines[i].flags & ML_EFFECT6)
|
||||
lines[i].args[2] |= TMFQ_SPLAT;
|
||||
lines[i].args[3] = lines[i].dx >> FRACBITS; //Sinking speed
|
||||
lines[i].args[4] = lines[i].dy >> FRACBITS; //Friction
|
||||
lines[i].args[1] = 1; //No ripple effect
|
||||
lines[i].args[2] = lines[i].dx >> FRACBITS; //Sinking speed
|
||||
lines[i].args[3] = lines[i].dy >> FRACBITS; //Friction
|
||||
break;
|
||||
case 258: //FOF: Laser
|
||||
lines[i].args[0] = lines[i].tag;
|
||||
|
|
10
src/p_spec.c
10
src/p_spec.c
|
@ -6887,16 +6887,14 @@ void P_SpawnSpecials(boolean fromnetsave)
|
|||
}
|
||||
case 257: // Quicksand
|
||||
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;
|
||||
if (lines[i].args[2] & TMFQ_SPLAT)
|
||||
ffloorflags |= FF_SPLAT;
|
||||
|
||||
for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0], s)) >= 0 ;)
|
||||
{
|
||||
ffloor_t *fflr = P_AddFakeFloor(§ors[s], lines[i].frontsector, lines + i, lines[i].args[1], ffloorflags, secthinkers);
|
||||
fflr->sinkspeed = abs(lines[i].args[3]) << (FRACBITS - 1);
|
||||
fflr->friction = abs(lines[i].args[4]) << (FRACBITS - 6);
|
||||
ffloor_t *fflr = P_AddFakeFloor(§ors[s], lines[i].frontsector, lines + i, 0xff, ffloorflags, secthinkers);
|
||||
fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1);
|
||||
fflr->friction = abs(lines[i].args[3]) << (FRACBITS - 6);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -96,12 +96,6 @@ typedef enum
|
|||
TMFB_SPLAT = 1<<3,
|
||||
} textmapfofbustflags_t;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
TMFQ_NORIPPLE = 1,
|
||||
TMFQ_SPLAT = 1<<1,
|
||||
} textmapfofquicksandflags_t;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
TMFL_NOBOSSES = 1,
|
||||
|
|
Loading…
Reference in a new issue