From 02570b820f079426ff3f372f7d60864dc1a33db3 Mon Sep 17 00:00:00 2001
From: galaxyhaxz <galaxy-haxz@hotmail.com>
Date: Wed, 18 Sep 2019 16:59:22 -0500
Subject: [PATCH] InitMonsters

---
 Source/monster.cpp | 12 ++++++++----
 enums.h            |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Source/monster.cpp b/Source/monster.cpp
index b2c94abf5..d300e5b38 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -956,7 +956,7 @@ void InitMonsters()
 	int numplacemonsters;
 	int mtype;
 	int numscattypes;
-	int scattertypes[111];
+	int scattertypes[NUM_MTYPES];
 
 	numscattypes = 0;
 	if (gbMaxPlayers != 1)
@@ -966,11 +966,11 @@ void InitMonsters()
 		AddMonster(1, 0, 0, 0, FALSE);
 		AddMonster(1, 0, 0, 0, FALSE);
 		AddMonster(1, 0, 0, 0, FALSE);
+	}
 #ifndef SPAWN
-		if (!setlevel && currlevel == 16)
-			LoadDiabMonsts();
+	if (!setlevel && currlevel == 16)
+		LoadDiabMonsts();
 #endif
-	}
 	nt = numtrigs;
 	if (currlevel == 15)
 		nt = 1;
@@ -1008,7 +1008,11 @@ void InitMonsters()
 			mtype = scattertypes[random(95, numscattypes)];
 			if (currlevel == 1 || random(95, 2) == 0)
 				na = 1;
+#ifdef HELLFIRE
+			else if (currlevel == 2 || currlevel >= 21 && currlevel <= 24)
+#else
 			else if (currlevel == 2)
+#endif
 				na = random(95, 2) + 2;
 			else
 				na = random(95, 3) + 3;
diff --git a/enums.h b/enums.h
index 6093a807b..487e08bc1 100644
--- a/enums.h
+++ b/enums.h
@@ -1697,7 +1697,11 @@ typedef enum _monster_id {
 	MT_DEFILER  = 0x7C,
 	MT_NAKRUL   = 0x89,
 #endif
+#ifdef HELLFIRE
+	NUM_MTYPES = 138
+#else
 	NUM_MTYPES
+#endif
 } _monster_id;
 
 // this enum contains indexes from UniqMonst array for special unique monsters (usually quest related)