From f1f032b4f45e7106bf82ae1002bd96c52b2c684c Mon Sep 17 00:00:00 2001
From: Robin Eklind <rnd0x00@gmail.com>
Date: Sun, 16 Sep 2018 21:51:49 +0200
Subject: [PATCH] Use BOOL for lightflag and light4flag

---
 Source/diablo.cpp   | 2 +-
 Source/diablo.h     | 2 +-
 Source/drlg_l1.cpp  | 4 ++--
 Source/lighting.cpp | 2 +-
 Source/lighting.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index b144ef8b5..02a213db6 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -24,7 +24,7 @@ char cineflag; // weak
 int drawpanflag; // weak
 int visiondebug; // weak
 int scrollflag; /* unused */
-int light4flag; // weak
+BOOL light4flag;
 int leveldebug; // weak
 int monstdebug; // weak
 int trigdebug; /* unused */
diff --git a/Source/diablo.h b/Source/diablo.h
index fca909111..954edd970 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -24,7 +24,7 @@ extern char cineflag; // weak
 extern int drawpanflag; // weak
 extern int visiondebug; // weak
 extern int scrollflag; /* unused */
-extern int light4flag; // weak
+extern BOOL light4flag;
 extern int leveldebug; // weak
 extern int monstdebug; // weak
 extern int trigdebug; /* unused */
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 33f5fada0..39fe56d57 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -122,8 +122,8 @@ void __cdecl DRLG_Init_Globals()
 	memset(dItem, 0, sizeof(dItem));
 	memset(dMissile, 0, sizeof(dMissile));
 	memset(dArch, 0, sizeof(dArch));
-	if ( lightflag == 0 )
-		c = light4flag != 0 ? 3 : 15;
+	if ( !lightflag )
+		c = ( light4flag ) ? 3 : 15;
 	else
 		c = 0;
 	memset(dTransVal, c, sizeof(dTransVal));
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index fcf7eab6f..a9749e4c9 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -14,7 +14,7 @@ int dolighting; // weak
 char dung_map_rgba[16384]; /* int [64][64] short [64][128] char [64][256] */
 int visionid;
 char *pLightTbl; /* todo: struct? */
-int lightflag; // weak
+BOOL lightflag;
 
 char CrawlTable[2749] =
 {
diff --git a/Source/lighting.h b/Source/lighting.h
index c1dfd3f2b..7acd8a931 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -14,7 +14,7 @@ extern int dolighting; // weak
 extern char dung_map_rgba[16384]; /* int [64][64] short [64][128] char [64][256] */
 extern int visionid;
 extern char *pLightTbl; /* todo: struct? */
-extern int lightflag; // weak
+extern BOOL lightflag;
 
 void __fastcall SetLightFX(int *x, int *y, short *s_r, short *s_g, int *s_b, int *d_r, int *d_g, int *d_b);
 void __fastcall DoLighting(int nXPos, int nYPos, int nRadius, int Lnum);