From 102f4abe9bd027721a9feff322649f12552201e6 Mon Sep 17 00:00:00 2001 From: Cesar Canassa Date: Wed, 27 Jul 2022 16:50:52 +0200 Subject: [PATCH] :recycle: Remove _misource access from AddLightningWall (#5098) --- Source/missiles.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 07a98a454..adc90422c 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1378,12 +1378,19 @@ void AddLightningWall(Missile &missile, const AddMissileParameter ¶meter) UpdateMissileVelocity(missile, parameter.dst, 16); missile._miAnimFrame = GenerateRnd(8) + 1; missile._mirange = 255 * (missile._mispllvl + 1); - if (missile._misource < 0) { + switch (missile.sourceType()) { + case MissileSource::Trap: missile.var1 = missile.position.start.x; missile.var2 = missile.position.start.y; - } else { - missile.var1 = Players[missile._misource].position.tile.x; - missile.var2 = Players[missile._misource].position.tile.y; + break; + case MissileSource::Player: { + Player &player = *missile.sourcePlayer(); + missile.var1 = player.position.tile.x; + missile.var2 = player.position.tile.y; + } break; + case MissileSource::Monster: + assert(missile.sourceType() != MissileSource::Monster); + break; } }