From 771a84338e6a5a949b3f0a23b09fe85b911e8d9b Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 8 Jan 2022 22:30:34 +1100 Subject: [PATCH] - Fix typo in MOVEFTA flag (was `NOVEFTA`). Thanks Gaerzi! --- source/games/duke/src/actors.cpp | 2 +- source/games/duke/src/constants.h | 2 +- source/games/duke/src/flags_d.cpp | 2 +- source/games/duke/src/flags_r.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index ffea4d295..0fe58938b 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -5288,7 +5288,7 @@ void movefta(void) if (canseeme) { - if (actorflag(act, SFLAG2_NOVEFTA_MAKESTANDABLE)) + if (actorflag(act, SFLAG2_MOVEFTA_MAKESTANDABLE)) { if (act->sector()->ceilingstat & CSTAT_SECTOR_SKY) act->spr.shade = act->sector()->ceilingshade; diff --git a/source/games/duke/src/constants.h b/source/games/duke/src/constants.h index d18eabcef..0e1745bcd 100644 --- a/source/games/duke/src/constants.h +++ b/source/games/duke/src/constants.h @@ -320,7 +320,7 @@ DEFINE_TFLAGS_OPERATORS(EDukeFlags1) enum sflags2_t { - SFLAG2_NOVEFTA_MAKESTANDABLE = 0x00000001, + SFLAG2_MOVEFTA_MAKESTANDABLE = 0x00000001, SFLAG2_TRIGGER_IFHITSECTOR = 0x00000002, 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 diff --git a/source/games/duke/src/flags_d.cpp b/source/games/duke/src/flags_d.cpp index d183673d6..9ccffb58d 100644 --- a/source/games/duke/src/flags_d.cpp +++ b/source/games/duke/src/flags_d.cpp @@ -245,7 +245,7 @@ void initactorflags_d() setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2 }); - setflag(SFLAG2_NOVEFTA_MAKESTANDABLE, { + setflag(SFLAG2_MOVEFTA_MAKESTANDABLE, { RUBBERCAN, EXPLODINGBARREL, WOODENHORSE, diff --git a/source/games/duke/src/flags_r.cpp b/source/games/duke/src/flags_r.cpp index 3832adedc..86ce322e0 100644 --- a/source/games/duke/src/flags_r.cpp +++ b/source/games/duke/src/flags_r.cpp @@ -214,7 +214,7 @@ void initactorflags_r() setflag(SFLAG2_TRIGGER_IFHITSECTOR, { EXPLOSION2, EXPLOSION3 }); - setflag(SFLAG2_NOVEFTA_MAKESTANDABLE, { + setflag(SFLAG2_MOVEFTA_MAKESTANDABLE, { RUBBERCAN, EXPLODINGBARREL, WOODENHORSE,