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

Merge branch 'forceverticalflipflag' into 'next'

Browse source 
Add flag to action 433 to force MFE_VERTICALFLIP

See merge request STJr/SRB2!1948
This commit is contained in:
sphere 2023-03-31 16:13:23 +00:00
commit 3f499178b0
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extras/conf/SRB2-22.cfg
View file

@ -2341,6 +2341,7 @@ linedeftypes
{ {
title = "Enable/Disable Gravity Flip"; title = "Enable/Disable Gravity Flip";
prefix = "(433)"; prefix = "(433)";
flags2text = "[1] Force MFE_VERTICALFLIP";
flags8text = "[3] Set delay by backside sector"; flags8text = "[3] Set delay by backside sector";
flags32text = "[5] Invert current gravity"; flags32text = "[5] Invert current gravity";
flags64text = "[6] Return to normal"; flags64text = "[6] Return to normal";

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

@ -4223,6 +4223,16 @@ udmf
1 = "Yes"; 1 = "Yes";
} }
} }
arg2
{
title = "Force MFE_VERTICALFLIP";
type = 11;
enum
{
0 = "No";
1 = "Yes";
}
}
} }
434 434

1
src/p_setup.c
View file

@ -5299,6 +5299,7 @@ static void P_ConvertBinaryLinedefTypes(void)
case 433: //Enable/disable gravity flip case 433: //Enable/disable gravity flip
lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
lines[i].args[1] = !!(lines[i].flags & ML_SKEWTD); lines[i].args[1] = !!(lines[i].flags & ML_SKEWTD);
lines[i].args[2] = !!(lines[i].flags & ML_BLOCKMONSTERS);
break; break;
case 434: //Award power-up case 434: //Award power-up
if (sides[lines[i].sidenum[0]].text) if (sides[lines[i].sidenum[0]].text)

2
src/p_spec.c
View file

@ -2786,6 +2786,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
mo->flags2 &= ~MF2_OBJECTFLIP; mo->flags2 &= ~MF2_OBJECTFLIP;
else else
mo->flags2 |= MF2_OBJECTFLIP; mo->flags2 |= MF2_OBJECTFLIP;
if (line->args[2])
mo->eflags |= MFE_VERTICALFLIP;
if (bot) if (bot)
bot->flags2 = (bot->flags2 & ~MF2_OBJECTFLIP) | (mo->flags2 & MF2_OBJECTFLIP); bot->flags2 = (bot->flags2 & ~MF2_OBJECTFLIP) | (mo->flags2 & MF2_OBJECTFLIP);
break; break;