From 4fd9f411375a6317f9f72a87419eca52b0295862 Mon Sep 17 00:00:00 2001
From: qndel <stefan551@o2.pl>
Date: Sun, 12 May 2019 18:41:19 +0200
Subject: [PATCH] PrintMonstHistory bin exact

---
 Source/monster.cpp | 81 ++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 46 deletions(-)

diff --git a/Source/monster.cpp b/Source/monster.cpp
index bffa3c5e9..46cadc1e4 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -5189,79 +5189,68 @@ void M_FallenFear(int x, int y)
 
 void PrintMonstHistory(int mt)
 {
-	int v1;   // edi
-	int *v2;  // ebx
-	int v3;   // ecx
-	int v4;   // eax
-	int v5;   // edi
-	short v6; // bx
-	int v7;   // ebx
-
-	v1 = mt;
-	v2 = &monstkills[mt];
-	sprintf(tempstr, "Total kills : %i", *v2);
+	int minHP, maxHP, res;
+
+	sprintf(tempstr, "Total kills : %i", monstkills[mt]);
 	AddPanelString(tempstr, 1);
-	if (*v2 >= 30) {
-		v3 = monsterdata[v1].mMinHP;
-		v4 = monsterdata[v1].mMaxHP;
+	if (monstkills[mt] >= 30) {
+		minHP = monsterdata[mt].mMinHP;
+		maxHP = monsterdata[mt].mMaxHP;
 		if (gbMaxPlayers == 1) {
-			v3 = monsterdata[v1].mMinHP >> 1;
-			v4 = monsterdata[v1].mMaxHP >> 1;
+			minHP = monsterdata[mt].mMinHP >> 1;
+			maxHP = monsterdata[mt].mMaxHP >> 1;
 		}
-		if (v3 < 1)
-			v3 = 1;
-		if (v4 < 1)
-			v4 = 1;
+		if (minHP < 1)
+			minHP = 1;
+		if (maxHP < 1)
+			maxHP = 1;
 		if (gnDifficulty == DIFF_NIGHTMARE) {
-			v3 = 3 * v3 + 1;
-			v4 = 3 * v4 + 1;
+			minHP = 3 * minHP + 1;
+			maxHP = 3 * maxHP + 1;
 		}
 		if (gnDifficulty == DIFF_HELL) {
-			v3 = 4 * v3 + 3;
-			v4 = 4 * v4 + 3;
+			minHP = 4 * minHP + 3;
+			maxHP = 4 * maxHP + 3;
 		}
-		sprintf(tempstr, "Hit Points : %i-%i", v3, v4);
+		sprintf(tempstr, "Hit Points : %i-%i", minHP, maxHP);
 		AddPanelString(tempstr, 1);
 	}
-	if (*v2 >= 15) {
-		v5 = v1 << 7;
-		if (gnDifficulty == DIFF_HELL)
-			v6 = *(short *)((char *)&monsterdata[0].mMagicRes2 + v5);
+	if (monstkills[mt] >= 15) {
+		if (gnDifficulty != DIFF_HELL)
+			res = monsterdata[mt].mMagicRes;
 		else
-			v6 = *(short *)((char *)&monsterdata[0].mMagicRes + v5);
-		v7 = v6 & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMUNE_MAGIC | IMUNE_FIRE | IMUNE_LIGHTNING);
-		if (v7) {
-			if (v7 & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING)) {
+			res = monsterdata[mt].mMagicRes2;
+		res = res & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMUNE_MAGIC | IMUNE_FIRE | IMUNE_LIGHTNING);
+		if (!res) {
+			strcpy(tempstr, "No magic resistance");
+			AddPanelString(tempstr, 1);
+		} else{
+			if (res & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING)) {
 				strcpy(tempstr, "Resists : ");
-				if (v7 & RESIST_MAGIC)
+				if (res & RESIST_MAGIC)
 					strcat(tempstr, "Magic ");
-				if (v7 & RESIST_FIRE)
+				if (res & RESIST_FIRE)
 					strcat(tempstr, "Fire ");
-				if (v7 & RESIST_LIGHTNING)
+				if (res & RESIST_LIGHTNING)
 					strcat(tempstr, "Lightning ");
 				tempstr[strlen(tempstr) - 1] = '\0';
 				AddPanelString(tempstr, 1);
 			}
-			if (v7 & (IMUNE_MAGIC | IMUNE_FIRE | IMUNE_LIGHTNING)) {
+			if (res & (IMUNE_MAGIC | IMUNE_FIRE | IMUNE_LIGHTNING)) {
 				strcpy(tempstr, "Immune : ");
-				if (v7 & IMUNE_MAGIC)
+				if (res & IMUNE_MAGIC)
 					strcat(tempstr, "Magic ");
-				if (v7 & IMUNE_FIRE)
+				if (res & IMUNE_FIRE)
 					strcat(tempstr, "Fire ");
-				if (v7 & IMUNE_LIGHTNING)
+				if (res & IMUNE_LIGHTNING)
 					strcat(tempstr, "Lightning ");
 				tempstr[strlen(tempstr) - 1] = '\0';
 				AddPanelString(tempstr, 1);
 			}
-		} else {
-			strcpy(tempstr, "No magic resistance");
-			AddPanelString(tempstr, 1);
-		}
+		} 
 	}
 	pinfoflag = 1;
 }
-// 4B8824: using guessed type int pinfoflag;
-// 679660: using guessed type char gbMaxPlayers;
 
 void PrintUniqueHistory()
 {