From ceda0b46cec5032f12cce6661bb0a09facd729fc Mon Sep 17 00:00:00 2001
From: obligaron <obligaron@live.com>
Date: Wed, 9 Jun 2021 00:22:10 +0200
Subject: [PATCH] Introduce InitDeadAnimationFromMonster

---
 Source/dead.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Source/dead.cpp b/Source/dead.cpp
index 2f83c008f..007e3d34f 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -15,6 +15,15 @@ namespace devilution {
 DeadStruct dead[MaxDead];
 int8_t stonendx;
 
+namespace {
+void InitDeadAnimationFromMonster(DeadStruct &d, const CMonster &mon)
+{
+	d._deadData = mon.Anims[MA_DEATH].Data;
+	d._deadFrame = mon.Anims[MA_DEATH].Frames;
+	d._deadWidth = mon.width;
+}
+}
+
 void InitDead()
 {
 	int8_t mtypes[MAXMONSTERS] = {};
@@ -25,9 +34,7 @@ void InitDead()
 		if (mtypes[Monsters[i].mtype] != 0)
 			continue;
 
-		dead[nd]._deadData = Monsters[i].Anims[MA_DEATH].Data;
-		dead[nd]._deadFrame = Monsters[i].Anims[MA_DEATH].Frames;
-		dead[nd]._deadWidth = Monsters[i].width;
+		InitDeadAnimationFromMonster(dead[nd], Monsters[i]);
 		dead[nd]._deadtrans = 0;
 		nd++;
 
@@ -55,9 +62,7 @@ void InitDead()
 	for (int i = 0; i < nummonsters; i++) {
 		int mi = monstactive[i];
 		if (monster[mi]._uniqtype != 0) {
-			dead[nd]._deadData = monster[mi].MType->Anims[MA_DEATH].Data;
-			dead[nd]._deadFrame = monster[mi].MType->Anims[MA_DEATH].Frames;
-			dead[nd]._deadWidth = monster[mi].MType->width;
+			InitDeadAnimationFromMonster(dead[nd], *monster[mi].MType);
 			dead[nd]._deadtrans = monster[mi]._uniqtrans + 4;
 			nd++;