- transfer the nofloorfire flag to the flame actor.

When checked on the owner it can fall victim to garbage collection.
ZDoom · Mar 27, 2023 · 7a7022a · 7a7022a
1 parent cf89d06
commit 7a7022a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/wadsrc/static/zscript/games/duke/actors/burning.zs b/wadsrc/static/zscript/games/duke/actors/burning.zs
@@ -55,9 +55,11 @@ class DukeBurning : DukeActor
 			}
 		}
 		t.cstat |= CSTAT_SPRITE_YCENTER;
+		/*
 		double d;
-		if (!OwnerAc || !OwnerAc.bNOFLOORFIRE)
+		if (!bNOFLOORFIRE)
 			[d, t.pos.Z] = t.sector.getSlopes(t.pos.XY);
+			*/
 		return false;
 	}
 }
@@ -84,8 +86,7 @@ class RedneckFire : DukeActor
 	{
 		let OwnerAc = self.ownerActor;
 		double d;
-		if (!OwnerAc || !OwnerAc.bNOFLOORFIRE)
-			[d, t.pos.Z] = t.sector.getSlopes(t.pos.XY);
+		[d, t.pos.Z] = t.sector.getSlopes(t.pos.XY);
 		return false;
 	}
 }

diff --git a/wadsrc/static/zscript/games/duke/actors/flammables.zs b/wadsrc/static/zscript/games/duke/actors/flammables.zs
@@ -71,7 +71,8 @@ class DukeFlammable : DukeActor
 			{
 				self.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
 				self.counter = 1;
-				self.spawn("DukeBurning");
+				let burn = self.spawn("DukeBurning");
+				if (burn) burn.bNoFloorFire = self.bNoFloorFire;
 			}
 		}
 	}