Browse Source

Fix crash loading game with Search missile

pull/7108/head
staphen 2 years ago committed by Anders Jenbo
parent
commit
af07b71127
  1. 2
      Source/loadsave.cpp
  2. 10
      Source/missiles.cpp
  3. 2
      Source/missiles.h

2
Source/loadsave.cpp

@ -2532,7 +2532,7 @@ void LoadGame(bool firstflag)
}
}
missiles_process_charge();
SetUpMissileAnimationData();
RedoMissileFlags();
NewCursor(CURSOR_HAND);
gbProcessPlayers = IsDiabloAlive(!firstflag);

10
Source/missiles.cpp

@ -4175,13 +4175,17 @@ void ProcessMissiles()
DeleteMissiles();
}
void missiles_process_charge()
void SetUpMissileAnimationData()
{
for (auto &missile : Missiles) {
missile._miAnimData = GetMissileSpriteData(missile._miAnimType).spritesForDirection(missile._mimfnum);
if (missile._mitype != MissileID::Rhino)
if (missile._miAnimType == MissileGraphicID::None)
continue;
if (missile._mitype != MissileID::Rhino) {
missile._miAnimData = GetMissileSpriteData(missile._miAnimType).spritesForDirection(missile._mimfnum);
continue;
}
const CMonster &mon = Monsters[missile._misource].type();
MonsterGraphic graphic;

2
Source/missiles.h

@ -454,7 +454,7 @@ void ProcessBoneSpirit(Missile &missile);
void ProcessResurrectBeam(Missile &missile);
void ProcessRedPortal(Missile &missile);
void ProcessMissiles();
void missiles_process_charge();
void SetUpMissileAnimationData();
void RedoMissileFlags();
#ifdef BUILD_TESTING

Loading…
Cancel
Save