From 8a6907a028e0fc2f854c82347daca76903dde74e Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 15 Oct 2018 22:16:44 +0200
Subject: [PATCH] Clean up ClrDiabloMsg

---
 Source/error.cpp | 18 ++++++------------
 Source/error.h   |  6 +++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Source/error.cpp b/Source/error.cpp
index 467d62ae5..ee9d44b2a 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -3,9 +3,9 @@
 #include "../types.h"
 
 char msgtable[80];
-char msgdelay; // weak
-char msgflag; // weak
-char msgcnt; // weak
+char msgdelay;
+char msgflag;
+char msgcnt;
 
 char *MsgStrings[44] =
 {
@@ -69,18 +69,15 @@ void __fastcall InitDiabloMsg(char e)
 	msgflag = msgtable[0];
 	msgdelay = 70;
 }
-// 52B9F0: using guessed type char msgdelay;
-// 52B9F1: using guessed type char msgflag;
-// 52B9F2: using guessed type char msgcnt;
 
 void __cdecl ClrDiabloMsg()
 {
+	for (int i = 0; i < sizeof(msgtable); i++)
+		msgtable[i] = 0;
+
 	msgflag = 0;
 	msgcnt = 0;
-	memset(msgtable, 0, sizeof(msgtable));
 }
-// 52B9F1: using guessed type char msgflag;
-// 52B9F2: using guessed type char msgcnt;
 
 void __cdecl DrawDiabloMsg()
 {
@@ -197,6 +194,3 @@ LABEL_27:
 			msgflag = msgtable[msgcnt];
 	}
 }
-// 52B9F0: using guessed type char msgdelay;
-// 52B9F1: using guessed type char msgflag;
-// 52B9F2: using guessed type char msgcnt;
diff --git a/Source/error.h b/Source/error.h
index 21c6aee26..333fdd647 100644
--- a/Source/error.h
+++ b/Source/error.h
@@ -3,9 +3,9 @@
 #define __ERROR_H__
 
 extern char msgtable[80];
-extern char msgdelay; // weak
-extern char msgflag; // weak
-extern char msgcnt; // weak
+extern char msgdelay;
+extern char msgflag;
+extern char msgcnt;
 
 void __fastcall InitDiabloMsg(char e);
 void __cdecl ClrDiabloMsg();