From 7482b23473df99827862cc0ab165a2cfce52577c Mon Sep 17 00:00:00 2001 From: Vladimir Olteanu Date: Mon, 26 Jul 2021 11:02:31 +0300 Subject: [PATCH] MissileSpriteData: move checks for hidden sprites to class members --- Source/misdat.cpp | 3 +++ Source/missiles.cpp | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/misdat.cpp b/Source/misdat.cpp index aa7cbd431..42cc40395 100644 --- a/Source/misdat.cpp +++ b/Source/misdat.cpp @@ -223,6 +223,9 @@ void MisFileData::LoadGFX() if (animData[0] != nullptr) return; + if ((flags & MFLAG_HIDDEN) != 0) + return; + char pszName[256]; if ((flags & MFLAG_ALLOW_SPECIAL) != 0) { sprintf(pszName, "Missiles\\%s.CL2", name); diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 497073906..e74301fb5 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1217,25 +1217,20 @@ void InitMissileGFX() for (int mi = 0; MissileSpriteData[mi].animFAmt != 0; mi++) { if (!gbIsHellfire && mi > MFILE_SCBSEXPD) break; - if ((MissileSpriteData[mi].flags & MFLAG_HIDDEN) == 0) - LoadMissileGFX(mi); + LoadMissileGFX(mi); } } void FreeMissiles() { - for (int mi = 0; MissileSpriteData[mi].animFAmt != 0; mi++) { - if ((MissileSpriteData[mi].flags & MFLAG_HIDDEN) == 0) - MissileSpriteData[mi].FreeGFX(); - } + for (int mi = 0; MissileSpriteData[mi].animFAmt != 0; mi++) + MissileSpriteData[mi].FreeGFX(); } void FreeMissiles2() { - for (int mi = 0; MissileSpriteData[mi].animFAmt != 0; mi++) { - if ((MissileSpriteData[mi].flags & MFLAG_HIDDEN) != 0) - MissileSpriteData[mi].FreeGFX(); - } + for (int mi = 0; MissileSpriteData[mi].animFAmt != 0; mi++) + MissileSpriteData[mi].FreeGFX(); } void InitMissiles()