From aa136190870f21d1f2cc68025e3db9468683a1a2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 31 Oct 2021 18:13:10 +0100
Subject: [PATCH] - SpawnBreakFlames

---
 source/games/sw/src/break.cpp  | 2 +-
 source/games/sw/src/weapon.cpp | 9 ++++-----
 source/games/sw/src/weapon.h   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/games/sw/src/break.cpp b/source/games/sw/src/break.cpp
index 74793c72b..fe06f7775 100644
--- a/source/games/sw/src/break.cpp
+++ b/source/games/sw/src/break.cpp
@@ -976,7 +976,7 @@ int AutoBreakSprite(DSWActor* breakActor, short type)
     if (TEST(break_info->flags, BF_KILL) || break_info->breaknum == -1)
     {
         if (TEST(break_info->flags, BF_FIRE_FALL))
-            SpawnBreakFlames(BreakSprite);
+            SpawnBreakFlames(breakActor);
 
         RESET(bp->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
         SET(bp->cstat, CSTAT_SPRITE_INVISIBLE);
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index 4ad4ab739..f279fc302 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -10815,16 +10815,15 @@ void SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
 
 
 int
-SpawnBreakFlames(int16_t SpriteNum)
+SpawnBreakFlames(DSWActor* actor)
 {
-    SPRITEp sp = &sprite[SpriteNum];
-    USERp u = User[SpriteNum].Data();
+    SPRITEp sp = &actor->s();
+    USERp u = actor->u();
     SPRITEp np;
     USERp nu;
     short New;
 
-    New = SpawnSprite(STAT_MISSILE, FIREBALL_FLAMES+1, s_BreakFlames, sp->sectnum,
-                      sp->x, sp->y, sp->z, sp->ang, 0);
+    New = SpawnSprite(STAT_MISSILE, FIREBALL_FLAMES+1, s_BreakFlames, sp->sectnum, sp->x, sp->y, sp->z, sp->ang, 0);
     auto actorNew = &swActors[New];
     np = &actorNew->s();
     nu = actorNew->u();
diff --git a/source/games/sw/src/weapon.h b/source/games/sw/src/weapon.h
index e5cb36102..1cc944ebc 100644
--- a/source/games/sw/src/weapon.h
+++ b/source/games/sw/src/weapon.h
@@ -85,7 +85,7 @@ int DoShrapVelocity(int16_t SpriteNum);
 int ShrapKillSprite(short SpriteNum);
 bool MissileSetPos(short Weapon,ANIMATORp DoWeapon,int dist);
 int ActorPain(short SpriteNum);
-int SpawnBreakFlames(int16_t SpriteNum);
+int SpawnBreakFlames(DSWActor*);
 bool PlayerTakeDamage(PLAYERp pp, DSWActor* weapActor);
 const char *DeathString(short SpriteNum);