Browse Source

♻️ Remove monsterId from M_SyncStartKill

pull/5084/head
Cesar Canassa 4 years ago committed by Anders Jenbo
parent
commit
a0cd65e082
  1. 5
      Source/monster.cpp
  2. 2
      Source/monster.h
  3. 4
      Source/msg.cpp

5
Source/monster.cpp

@ -3942,11 +3942,8 @@ void M_StartKill(Monster &monster, const Player &player)
StartMonsterDeath(monster, player, true); 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) { if (monster.hitPoints == 0 || monster.mode == MonsterMode::Death) {
return; return;
} }

2
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 StartMonsterDeath(Monster &monster, const Player &player, bool sendmsg);
void MonsterDeath(Monster &monster, Direction md, bool sendmsg); void MonsterDeath(Monster &monster, Direction md, bool sendmsg);
void M_StartKill(Monster &monster, const Player &player); 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 M_UpdateRelations(const Monster &monster);
void DoEnding(); void DoEnding();
void PrepDoEnding(); void PrepDoEnding();

4
Source/msg.cpp

@ -1526,7 +1526,7 @@ size_t OnMonstDeath(const TCmd *pCmd, int pnum)
if (&player != MyPlayer && InDungeonBounds(position) && message.wParam1 < MaxMonsters) { if (&player != MyPlayer && InDungeonBounds(position) && message.wParam1 < MaxMonsters) {
Monster &monster = Monsters[message.wParam1]; Monster &monster = Monsters[message.wParam1];
if (player.isOnActiveLevel()) if (player.isOnActiveLevel())
M_SyncStartKill(message.wParam1, position, player); M_SyncStartKill(monster, position, player);
delta_kill_monster(monster, position, player); delta_kill_monster(monster, position, player);
} }
} else { } else {
@ -1546,7 +1546,7 @@ size_t OnKillGolem(const TCmd *pCmd, int pnum)
if (&player != MyPlayer && InDungeonBounds(position)) { if (&player != MyPlayer && InDungeonBounds(position)) {
Monster &monster = Monsters[pnum]; Monster &monster = Monsters[pnum];
if (player.isOnActiveLevel()) if (player.isOnActiveLevel())
M_SyncStartKill(pnum, position, player); M_SyncStartKill(monster, position, player);
delta_kill_monster(monster, position, player); delta_kill_monster(monster, position, player);
} }
} else { } else {

Loading…
Cancel
Save