From fd26f7fd2d210bf7494ae6cdc7022892c2e0ebfa Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 3 Dec 2022 18:42:44 +0100 Subject: [PATCH] - set some more flags. --- source/games/duke/src/flags_d.cpp | 16 +++++++++++++++- source/games/duke/src/flags_r.cpp | 15 ++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/source/games/duke/src/flags_d.cpp b/source/games/duke/src/flags_d.cpp index c06cd2a9d..66d994c09 100644 --- a/source/games/duke/src/flags_d.cpp +++ b/source/games/duke/src/flags_d.cpp @@ -133,7 +133,21 @@ void initactorflags_d() setflag(SFLAG_NOFALLER, { CRACK1, CRACK2, CRACK3, CRACK4, SPEAKER, LETTER, DUCK, TARGET, TRIPBOMB, VIEWSCREEN, VIEWSCREEN2 }); setflag(SFLAG2_NOROTATEWITHSECTOR, { LASERLINE }); setflag(SFLAG2_SHOWWALLSPRITEONMAP, { LASERLINE }); - setflag(SFLAG2_NOFLOORPAL, { TRIPBOMB, LASERLINE }); + setflag(SFLAG2_NOFLOORPAL, { + TRIPBOMB, + LASERLINE, + FORCESPHERE, + BURNING, + BURNING2, + ATOMICHEALTH, + CRYSTALAMMO, + VIEWSCREEN, + VIEWSCREEN2, + SHRINKSPARK, + GROWSPARK, + RPG, + RECON }); + setflag(SFLAG2_EXPLOSIVE, { FIREEXT, RPG, RADIUSEXPLOSION, SEENINE, OOZFILTER }); setflag(SFLAG2_BRIGHTEXPLODE, { SEENINE, OOZFILTER }); setflag(SFLAG2_DOUBLEDMGTHRUST, { RADIUSEXPLOSION, RPG, HYDRENT, HEAVYHBOMB, SEENINE, OOZFILTER, EXPLODINGBARREL }); diff --git a/source/games/duke/src/flags_r.cpp b/source/games/duke/src/flags_r.cpp index e9cf93cb6..c7d9a62f6 100644 --- a/source/games/duke/src/flags_r.cpp +++ b/source/games/duke/src/flags_r.cpp @@ -219,6 +219,18 @@ void initactorflags_r() TOUGHGAL }); + setflag(SFLAG2_NOFLOORPAL, { + RESPAWNMARKERRED, + RESPAWNMARKERYELLOW, + RESPAWNMARKERGREEN, + FORCESPHERE, + BURNING, + ATOMICHEALTH, + CRYSTALAMMO, + SHITBALL, + RPG, + RECON, + }); // Animals were not supposed to have this, but due to a coding bug the logic was unconditional for everything in the game. for (auto& ainf : gs.actorinfo) { @@ -236,7 +248,8 @@ void initactorflags_r() setflag(SFLAG2_SPAWNRABBITGUTS, { MAMA }); setflag(SFLAG2_ALTPROJECTILESPRITE, { CHEER, CHEERSTAYPUT }); setflag(SFLAG2_UNDERWATERSLOWDOWN, { RPG2 }); - setflag(SFLAG2_ALWAYSROTATE2, { RPG2 }); + setflag(SFLAG2_ALWAYSROTATE2, { RPG2, EMPTYBIKE, EMPTYBOAT }); + setflag(SFLAG2_NOFLOORPAL, { CHEERBOMB, RPG2 }); } else {