From 4f1e6b76e07cf430f8226acc11d1ff4227cb9dd0 Mon Sep 17 00:00:00 2001
From: Vladimir Olteanu <vladimir.olteanu@cs.pub.ro>
Date: Sat, 18 Jun 2022 18:54:12 +0300
Subject: [PATCH] Refactor MI_Apoca (#4730)

---
 Source/missiles.cpp | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index a29e5c746..45b46f0da 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -3604,12 +3604,8 @@ void MI_Infra(Missile &missile)
 
 void MI_Apoca(Missile &missile)
 {
-	int id = missile._misource;
-	bool exit = false;
-	int j;
-	int k;
-	for (j = missile.var2; j < missile.var3 && !exit; j++) {
-		for (k = missile.var4; k < missile.var5 && !exit; k++) {
+	for (int j = missile.var2; j < missile.var3; j++) {
+		for (int k = missile.var4; k < missile.var5; k++) {
 			int mid = dMonster[k][j] - 1;
 			if (mid < 0)
 				continue;
@@ -3619,20 +3615,16 @@ void MI_Apoca(Missile &missile)
 				continue;
 			if (gbIsHellfire && !LineClearMissile(missile.position.tile, { k, j }))
 				continue;
+
+			int id = missile._misource;
 			AddMissile({ k, j }, { k, j }, Players[id]._pdir, MIS_BOOM, TARGET_MONSTERS, id, missile._midam, 0);
-			exit = true;
-		}
-		if (!exit) {
-			missile.var4 = missile.var6;
+			missile.var2 = j;
+			missile.var4 = k + 1;
+			return;
 		}
+		missile.var4 = missile.var6;
 	}
-
-	if (exit) {
-		missile.var2 = j - 1;
-		missile.var4 = k;
-	} else {
-		missile._miDelFlag = true;
-	}
+	missile._miDelFlag = true;
 }
 
 void MI_Wave(Missile &missile)