From 611f759dbea020eeb3b25161e3bb2a210878e124 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Tue, 24 Aug 2021 14:01:33 +0200 Subject: [PATCH] Clean up AddMissile --- Source/missiles.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index da6608545..8901df809 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -2831,30 +2831,30 @@ int AddMissile(Point src, Point dst, int midir, missile_id mitype, mienemy_type memset(&missile, 0, sizeof(missile)); + auto &missileData = MissileData[mitype]; + missile._mitype = mitype; missile._micaster = micaster; missile._misource = id; missile._midam = midam; - missile._miAnimType = MissileData[mitype].mFileNum; - missile._miDrawFlag = MissileData[mitype].mDraw; missile._mispllvl = spllvl; - missile._mimfnum = midir; + missile.position.tile = src; + missile.position.start = src; + missile._miAnimAdd = 1; + missile._miAnimType = missileData.mFileNum; + missile._miDrawFlag = missileData.mDraw; + missile._mlid = NO_LIGHT; if (missile._miAnimType == MFILE_NONE || MissileSpriteData[missile._miAnimType].animFAmt < 8) SetMissDir(missile, 0); else SetMissDir(missile, midir); - missile.position.tile = src; - missile.position.start = src; - missile._miAnimAdd = 1; - missile._mlid = NO_LIGHT; - - if (MissileData[mitype].mlSFX != -1) { - PlaySfxLoc(MissileData[mitype].mlSFX, missile.position.start); + if (missileData.mlSFX != SFX_NONE) { + PlaySfxLoc(missileData.mlSFX, missile.position.start); } - MissileData[mitype].mAddProc(missile, dst, midir); + missileData.mAddProc(missile, dst, midir); return mi; }