From a0cd65e0820669c14a5ea57b031cdf0398e6e50a Mon Sep 17 00:00:00 2001
From: Cesar Canassa <cesar.canassa@gmail.com>
Date: Wed, 20 Jul 2022 01:22:59 +0200
Subject: [PATCH] :recycle: Remove monsterId from M_SyncStartKill

---
 Source/monster.cpp | 5 +----
 Source/monster.h   | 2 +-
 Source/msg.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Source/monster.cpp b/Source/monster.cpp
index 71afe7053..916872885 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -3942,11 +3942,8 @@ void M_StartKill(Monster &monster, const Player &player)
 	StartMonsterDeath(monster, player, true);
 }
 
-void M_SyncStartKill(int monsterId, Point position, const Player &player)
+void M_SyncStartKill(Monster &monster, Point position, const Player &player)
 {
-	assert(static_cast<size_t>(monsterId) < MaxMonsters);
-	auto &monster = Monsters[monsterId];
-
 	if (monster.hitPoints == 0 || monster.mode == MonsterMode::Death) {
 		return;
 	}
diff --git a/Source/monster.h b/Source/monster.h
index 4598a4a31..93298be61 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -375,7 +375,7 @@ void M_StartHit(Monster &monster, const Player &player, int dam);
 void StartMonsterDeath(Monster &monster, const Player &player, bool sendmsg);
 void MonsterDeath(Monster &monster, Direction md, bool sendmsg);
 void M_StartKill(Monster &monster, const Player &player);
-void M_SyncStartKill(int monsterId, Point position, const Player &player);
+void M_SyncStartKill(Monster &monster, Point position, const Player &player);
 void M_UpdateRelations(const Monster &monster);
 void DoEnding();
 void PrepDoEnding();
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 7e0341292..006109734 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1526,7 +1526,7 @@ size_t OnMonstDeath(const TCmd *pCmd, int pnum)
 		if (&player != MyPlayer && InDungeonBounds(position) && message.wParam1 < MaxMonsters) {
 			Monster &monster = Monsters[message.wParam1];
 			if (player.isOnActiveLevel())
-				M_SyncStartKill(message.wParam1, position, player);
+				M_SyncStartKill(monster, position, player);
 			delta_kill_monster(monster, position, player);
 		}
 	} else {
@@ -1546,7 +1546,7 @@ size_t OnKillGolem(const TCmd *pCmd, int pnum)
 		if (&player != MyPlayer && InDungeonBounds(position)) {
 			Monster &monster = Monsters[pnum];
 			if (player.isOnActiveLevel())
-				M_SyncStartKill(pnum, position, player);
+				M_SyncStartKill(monster, position, player);
 			delta_kill_monster(monster, position, player);
 		}
 	} else {