[hellfire] Fix monster eating logic

- Nolonger drop health when not on normal difficulty
- Uniques will nolonger drop health
- All monsters heal at the same rate

Source/monster.cpp

@@ -3783,20 +3783,16 @@ void MAI_Scav(int i)
 		if (dDead[Monst->_mx][Monst->_my] != 0) {
 			M_StartEat(i);
 			if (!(Monst->_mFlags & MFLAG_NOHEAL)) {
-#ifdef HELLFIRE
+				if (gbIsHellfire) {
-				int mMaxHP = Monst->MType->mMaxHP << 6; // BUGFIX use _mmaxhp or we loose health when difficulty isn't normal
+					int mMaxHP = Monst->_mmaxhp; // BUGFIX use _mmaxhp or we loose health when difficulty isn't normal (fixed)
-				if (gbMaxPlayers == 1)
+					Monst->_mhitpoints += mMaxHP >> 3;
-					mMaxHP >>= 1;
+					if (Monst->_mhitpoints > Monst->_mmaxhp)
-				Monst->_mhitpoints += mMaxHP >> 3;
+						Monst->_mhitpoints = Monst->_mmaxhp;
-				if (Monst->_mhitpoints > mMaxHP)
+					if (Monst->_mgoalvar3 <= 0 || Monst->_mhitpoints == Monst->_mmaxhp)
-					Monst->_mhitpoints = mMaxHP;
+						dDead[Monst->_mx][Monst->_my] = 0;
-				if (Monst->_mmaxhp < Monst->_mhitpoints)
+				} else {
-					Monst->_mmaxhp = Monst->_mhitpoints;
+					Monst->_mhitpoints += 64;
-				if (Monst->_mgoalvar3 <= 0 || Monst->_mhitpoints == mMaxHP)
+				}
-					dDead[Monst->_mx][Monst->_my] = 0;
-#else
-				Monst->_mhitpoints += 64;
-#endif
 			}
 			int targetHealth = Monst->_mmaxhp;
 			if (!gbIsHellfire)

Source/trigs.cpp

@@ -67,7 +67,7 @@ void InitTownTriggers()
 	trigs[numtrigs]._tmsg = WM_DIABNEXTLVL;
 	numtrigs++;
 
-	bool isMultiplayer = gbMaxPlayers == MAX_PLRS;
+	bool isMultiplayer = gbMaxPlayers != 1;
 
 	for (i = 0; i < sizeof(townwarps) / sizeof(townwarps[0]); i++) {
 		townwarps[i] = isMultiplayer && !gbIsSpawn;