- Fix typo in MOVEFTA flag (was NOVEFTA). Thanks Gaerzi!

This commit is contained in:
Mitchell Richters 2022-01-08 22:30:34 +11:00
parent 1c721f3568
commit 771a84338e
4 changed files with 4 additions and 4 deletions

View file

@ -5288,7 +5288,7 @@ void movefta(void)
if (canseeme) if (canseeme)
{ {
if (actorflag(act, SFLAG2_NOVEFTA_MAKESTANDABLE)) if (actorflag(act, SFLAG2_MOVEFTA_MAKESTANDABLE))
{ {
if (act->sector()->ceilingstat & CSTAT_SECTOR_SKY) if (act->sector()->ceilingstat & CSTAT_SECTOR_SKY)
act->spr.shade = act->sector()->ceilingshade; act->spr.shade = act->sector()->ceilingshade;

View file

@ -320,7 +320,7 @@ DEFINE_TFLAGS_OPERATORS(EDukeFlags1)
enum sflags2_t enum sflags2_t
{ {
SFLAG2_NOVEFTA_MAKESTANDABLE = 0x00000001, SFLAG2_MOVEFTA_MAKESTANDABLE = 0x00000001,
SFLAG2_TRIGGER_IFHITSECTOR = 0x00000002, SFLAG2_TRIGGER_IFHITSECTOR = 0x00000002,
SFLAG2_MOVEFTA_WAKEUPCHECK = 0x00000004, SFLAG2_MOVEFTA_WAKEUPCHECK = 0x00000004,
SFLAG2_MOVEFTA_CHECKSEEWITHPAL8 = 0x00000008, // let's hope this can be done better later. For now this was what blocked merging the Duke and RR variants of movefta SFLAG2_MOVEFTA_CHECKSEEWITHPAL8 = 0x00000008, // let's hope this can be done better later. For now this was what blocked merging the Duke and RR variants of movefta

View file

@ -245,7 +245,7 @@ void initactorflags_d()
setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2 }); setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2 });
setflag(SFLAG2_NOVEFTA_MAKESTANDABLE, { setflag(SFLAG2_MOVEFTA_MAKESTANDABLE, {
RUBBERCAN, RUBBERCAN,
EXPLODINGBARREL, EXPLODINGBARREL,
WOODENHORSE, WOODENHORSE,

View file

@ -214,7 +214,7 @@ void initactorflags_r()
setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2, EXPLOSION3 }); setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2, EXPLOSION3 });
setflag(SFLAG2_NOVEFTA_MAKESTANDABLE, { setflag(SFLAG2_MOVEFTA_MAKESTANDABLE, {
RUBBERCAN, RUBBERCAN,
EXPLODINGBARREL, EXPLODINGBARREL,
WOODENHORSE, WOODENHORSE,