From 6ba57a2d10c852cc775a3808ab9fe6067afedde1 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 20 Jul 2019 23:04:41 +0200
Subject: [PATCH] Remove the last bit of garbage

---
 Source/render.cpp | 36 ++++++++++++++++++------------------
 defs.h            |  9 ---------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Source/render.cpp b/Source/render.cpp
index d536eff08..3590a3f0b 100644
--- a/Source/render.cpp
+++ b/Source/render.cpp
@@ -167,7 +167,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff)
 							width = *src++;
 							if ((width & 0x80u) == 0)
 								break;
-							_LOBYTE(width) = -(char)width;
+							width = -(char)width;
 							dst += width;
 							yy_32 -= width;
 							if (!yy_32)
@@ -362,7 +362,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff)
 					width = *src++;
 					if ((width & 0x80u) == 0)
 						break;
-					_LOBYTE(width) = -(char)width;
+					width = -(char)width;
 					dst += width;
 					xx_32 -= width;
 					if (!xx_32) {
@@ -831,7 +831,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff)
 					if (!yy_32)
 						goto LABEL_391;
 				}
-				_LOBYTE(width) = -(char)width;
+				width = -(char)width;
 				dst += width;
 				yy_32 -= width;
 			} while (yy_32);
@@ -1190,7 +1190,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, DWORD *pMask)
 						width = *src++;
 						if ((width & 0x80u) == 0)
 							break;
-						_LOBYTE(width) = -(char)width;
+						width = -(char)width;
 						dst += width;
 						if (width & 0x1F)
 							gdwCurrentMask <<= width & 0x1F;
@@ -1417,7 +1417,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, DWORD *pMask)
 							width = *src++;
 							if ((width & 0x80u) == 0)
 								break;
-							_LOBYTE(width) = -(char)width;
+							width = -(char)width;
 							dst += width;
 							if (width & 0x1F)
 								gdwCurrentMask <<= width & 0x1F;
@@ -1570,7 +1570,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, DWORD *pMask)
 					width = *src++;
 					if ((width & 0x80u) == 0)
 						break;
-					_LOBYTE(width) = -(char)width;
+					width = -(char)width;
 					dst += width;
 					if (width & 0x1F)
 						gdwCurrentMask <<= width & 0x1F;
@@ -1833,7 +1833,7 @@ void drawUpperScreen(BYTE *pBuff)
 						width = *src++;
 						if ((width & 0x80u) == 0)
 							break;
-						_LOBYTE(width) = -(char)width;
+						width = -(char)width;
 						dst += width;
 						yy_32 -= width;
 						if (!yy_32)
@@ -2053,7 +2053,7 @@ void drawUpperScreen(BYTE *pBuff)
 							width = *src++;
 							if ((width & 0x80u) == 0)
 								break;
-							_LOBYTE(width) = -(char)width;
+							width = -(char)width;
 							dst += width;
 							yy_32 -= width;
 							if (!yy_32)
@@ -2192,7 +2192,7 @@ void drawUpperScreen(BYTE *pBuff)
 					width = *src++;
 					if ((width & 0x80u) == 0)
 						break;
-					_LOBYTE(width) = -(char)width;
+					width = -(char)width;
 					dst += width;
 					yy_32 -= width;
 					if (!yy_32)
@@ -2460,7 +2460,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff)
 					width = *src++;
 					if ((width & 0x80u) == 0)
 						break;
-					_LOBYTE(width) = -(char)width;
+					width = -(char)width;
 					dst += width;
 					yy_32 -= width;
 					if (!yy_32) {
@@ -2890,7 +2890,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff)
 						width = *src++;
 						if ((width & 0x80u) == 0)
 							break;
-						_LOBYTE(width) = -(char)width;
+						width = -(char)width;
 						dst += width;
 						yy_32 -= width;
 						if (!yy_32)
@@ -3230,7 +3230,7 @@ LABEL_11:
 					if (!yy_32)
 						goto LABEL_293;
 				}
-				_LOBYTE(width) = -(char)width;
+				width = -(char)width;
 				dst += width;
 				yy_32 -= width;
 			} while (yy_32);
@@ -3699,7 +3699,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, DWORD *pMask)
 							if (!yy_32)
 								goto LABEL_252;
 						}
-						_LOBYTE(width) = -(char)width;
+						width = -(char)width;
 						dst += width;
 						if (width & 0x1F)
 							gdwCurrentMask <<= width & 0x1F;
@@ -3940,7 +3940,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, DWORD *pMask)
 							if (!yy_32)
 								goto LABEL_52;
 						}
-						_LOBYTE(width) = -(char)width;
+						width = -(char)width;
 						dst += width;
 						if (width & 0x1F)
 							gdwCurrentMask <<= width & 0x1F;
@@ -4170,7 +4170,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, DWORD *pMask)
 					if (!yy_32)
 						goto LABEL_152;
 				}
-				_LOBYTE(width) = -(char)width;
+				width = -(char)width;
 				dst += width;
 				if (width & 0x1F)
 					gdwCurrentMask <<= width & 0x1F;
@@ -4482,7 +4482,7 @@ void drawLowerScreen(BYTE *pBuff)
 							width = *src++;
 							if ((width & 0x80u) == 0)
 								break;
-							_LOBYTE(width) = -(char)width;
+							width = -(char)width;
 							dst += width;
 							yy_32 -= width;
 							if (!yy_32)
@@ -4733,7 +4733,7 @@ void drawLowerScreen(BYTE *pBuff)
 								dst += width;
 							}
 						} else {
-							_LOBYTE(width) = -(char)width;
+							width = -(char)width;
 							dst += width;
 							yy_32 -= width;
 						}
@@ -4929,7 +4929,7 @@ void drawLowerScreen(BYTE *pBuff)
 					width = *src++;
 					if ((width & 0x80u) == 0)
 						break;
-					_LOBYTE(width) = -(char)width;
+					width = -(char)width;
 					dst += width;
 					yy_32 -= width;
 					if (!yy_32)
diff --git a/defs.h b/defs.h
index c930e376f..df4fd1983 100644
--- a/defs.h
+++ b/defs.h
@@ -151,15 +151,6 @@
 #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
 #endif
 
-/////////////////////////////////////////////////////////////////////////
-/* temporary stuff from the decompiler */
-/* remove all the garbage below in the future */
-/////////////////////////////////////////////////////////////////////////
-#ifndef IDA_GARBAGE
-#define IDA_GARBAGE
-#define _LOBYTE(x)  (*((BYTE*)&(x)))
-#endif /* IDA_GARBAGE */
-
 // Typedef for the function pointer
 typedef void (*_PVFV)(void);