From f6fe639233f00e06b91ff3bfa79be36776a2f7d4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 29 Nov 2022 22:33:09 +0100 Subject: [PATCH] - avoid propagating owner flags where easily doable. This particular case is done a lot better by setting a special flag. --- source/games/duke/src/actors.cpp | 4 ++-- wadsrc/static/zscript/games/duke/actors/flammables.zs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index ea91e4f5d..3f0dc5783 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -880,7 +880,7 @@ bool bloodpool(DDukeActor* actor, bool puke) if (actor->temp_data[2] < 32) { actor->temp_data[2]++; - if (attackerflag(actor, SFLAG_FLAMMABLEPOOLEFFECT)) + if (actor->spr.detail == 1) { if (actor->spr.scale.X < 1 && actor->spr.scale.Y < 1) { @@ -916,7 +916,7 @@ bool bloodpool(DDukeActor* actor, bool puke) if (actor->temp_data[1] == 1) return false; actor->temp_data[1] = 1; - if (attackerflag(actor, SFLAG_FLAMMABLEPOOLEFFECT)) + if (actor->spr.detail == 1) ps[p].footprintcount = 10; else ps[p].footprintcount = 3; diff --git a/wadsrc/static/zscript/games/duke/actors/flammables.zs b/wadsrc/static/zscript/games/duke/actors/flammables.zs index a800f7edb..775ff996f 100644 --- a/wadsrc/static/zscript/games/duke/actors/flammables.zs +++ b/wadsrc/static/zscript/games/duke/actors/flammables.zs @@ -26,6 +26,7 @@ class DukeFlammable : DukeActor { spawned.pal = 2; spawned.shade = 127; + spawned.detail = 1; } } else