Merge branch 'dehacked-hell-bruh' into 'next'
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops See merge request STJr/SRB2!1286
This commit is contained in:
commit
c6dd218e2b
|
@ -4331,6 +4331,7 @@ const char *const MOBJFLAG2_LIST[] = {
|
||||||
"AMBUSH", // Alternate behaviour typically set by MTF_AMBUSH
|
"AMBUSH", // Alternate behaviour typically set by MTF_AMBUSH
|
||||||
"LINKDRAW", // Draw vissprite of mobj immediately before/after tracer's vissprite (dependent on dispoffset and position)
|
"LINKDRAW", // Draw vissprite of mobj immediately before/after tracer's vissprite (dependent on dispoffset and position)
|
||||||
"SHIELD", // Thinker calls P_AddShield/P_ShieldLook (must be partnered with MF_SCENERY to use)
|
"SHIELD", // Thinker calls P_AddShield/P_ShieldLook (must be partnered with MF_SCENERY to use)
|
||||||
|
"SPLAT", // Object is a splat
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4872,6 +4873,36 @@ struct int_const_s const INT_CONST[] = {
|
||||||
{"tr_trans90",tr_trans90},
|
{"tr_trans90",tr_trans90},
|
||||||
{"NUMTRANSMAPS",NUMTRANSMAPS},
|
{"NUMTRANSMAPS",NUMTRANSMAPS},
|
||||||
|
|
||||||
|
// Alpha styles (blend modes)
|
||||||
|
{"AST_COPY",AST_COPY},
|
||||||
|
{"AST_TRANSLUCENT",AST_TRANSLUCENT},
|
||||||
|
{"AST_ADD",AST_ADD},
|
||||||
|
{"AST_SUBTRACT",AST_SUBTRACT},
|
||||||
|
{"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT},
|
||||||
|
{"AST_MODULATE",AST_MODULATE},
|
||||||
|
{"AST_OVERLAY",AST_OVERLAY},
|
||||||
|
|
||||||
|
// Render flags
|
||||||
|
{"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP},
|
||||||
|
{"RF_VERTICALFLIP",RF_VERTICALFLIP},
|
||||||
|
{"RF_ABSOLUTEOFFSETS",RF_ABSOLUTEOFFSETS},
|
||||||
|
{"RF_FLIPOFFSETS",RF_FLIPOFFSETS},
|
||||||
|
{"RF_SPLATMASK",RF_SPLATMASK},
|
||||||
|
{"RF_SLOPESPLAT",RF_SLOPESPLAT},
|
||||||
|
{"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT},
|
||||||
|
{"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD},
|
||||||
|
{"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE},
|
||||||
|
{"RF_BLENDMASK",RF_BLENDMASK},
|
||||||
|
{"RF_FULLBRIGHT",RF_FULLBRIGHT},
|
||||||
|
{"RF_FULLDARK",RF_FULLDARK},
|
||||||
|
{"RF_NOCOLORMAPS",RF_NOCOLORMAPS},
|
||||||
|
{"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK},
|
||||||
|
{"RF_PAPERSPRITE",RF_PAPERSPRITE},
|
||||||
|
{"RF_FLOORSPRITE",RF_FLOORSPRITE},
|
||||||
|
{"RF_SHADOWDRAW",RF_SHADOWDRAW},
|
||||||
|
{"RF_SHADOWEFFECTS",RF_SHADOWEFFECTS},
|
||||||
|
{"RF_DROPSHADOW",RF_DROPSHADOW},
|
||||||
|
|
||||||
// Level flags
|
// Level flags
|
||||||
{"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
|
{"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
|
||||||
{"LF_SPEEDMUSIC",LF_SPEEDMUSIC},
|
{"LF_SPEEDMUSIC",LF_SPEEDMUSIC},
|
||||||
|
|
Loading…
Reference in New Issue