Browse Source

Introduce InitDeadAnimationFromMonster

pull/2189/head
obligaron 5 years ago committed by Anders Jenbo
parent
commit
ceda0b46ce
  1. 17
      Source/dead.cpp

17
Source/dead.cpp

@ -15,6 +15,15 @@ namespace devilution {
DeadStruct dead[MaxDead]; DeadStruct dead[MaxDead];
int8_t stonendx; 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() void InitDead()
{ {
int8_t mtypes[MAXMONSTERS] = {}; int8_t mtypes[MAXMONSTERS] = {};
@ -25,9 +34,7 @@ void InitDead()
if (mtypes[Monsters[i].mtype] != 0) if (mtypes[Monsters[i].mtype] != 0)
continue; continue;
dead[nd]._deadData = Monsters[i].Anims[MA_DEATH].Data; InitDeadAnimationFromMonster(dead[nd], Monsters[i]);
dead[nd]._deadFrame = Monsters[i].Anims[MA_DEATH].Frames;
dead[nd]._deadWidth = Monsters[i].width;
dead[nd]._deadtrans = 0; dead[nd]._deadtrans = 0;
nd++; nd++;
@ -55,9 +62,7 @@ void InitDead()
for (int i = 0; i < nummonsters; i++) { for (int i = 0; i < nummonsters; i++) {
int mi = monstactive[i]; int mi = monstactive[i];
if (monster[mi]._uniqtype != 0) { if (monster[mi]._uniqtype != 0) {
dead[nd]._deadData = monster[mi].MType->Anims[MA_DEATH].Data; InitDeadAnimationFromMonster(dead[nd], *monster[mi].MType);
dead[nd]._deadFrame = monster[mi].MType->Anims[MA_DEATH].Frames;
dead[nd]._deadWidth = monster[mi].MType->width;
dead[nd]._deadtrans = monster[mi]._uniqtrans + 4; dead[nd]._deadtrans = monster[mi]._uniqtrans + 4;
nd++; nd++;

Loading…
Cancel
Save