From a0f4bae094d5724b78fe974770b74ccda42d1858 Mon Sep 17 00:00:00 2001
From: Gabriel Ravier <gabravier@gmail.com>
Date: Mon, 13 May 2019 18:58:29 +0200
Subject: [PATCH] Moved and renamed flag macros

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
---
 src/Flags.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Flags.cpp b/src/Flags.cpp
index afc3706a..97eb069c 100644
--- a/src/Flags.cpp
+++ b/src/Flags.cpp
@@ -7,11 +7,6 @@
 unsigned char gFlagNPC[1000];
 unsigned char gSkipFlag[8];
 
-// Macros for setting, un-setting and getting bits
-#define SET_BIT(x, i) ((x)[(i) / 8] |= 1 << (i) % 8)
-#define UNSET_BIT(x, i) ((x)[(i) / 8] &= ~(1 << (i) % 8))
-#define GET_BIT(x, i) ((x)[(i) / 8] & (1 << (i) % 8))
-
 //Flag inits
 void InitFlags()
 {
@@ -23,20 +18,29 @@ void InitSkipFlags()
 	memset(gSkipFlag, 0, sizeof(gSkipFlag));
 }
 
+// Macros for setting, un-setting and getting flags
+// Each flag is stored in a single bit
+#define SET_BIT(x, i) ((x)[(i) / 8] |= 1 << (i) % 8)
+#define UNSET_BIT(x, i) ((x)[(i) / 8] &= ~(1 << (i) % 8))
+#define GET_BIT(x, i) ((x)[(i) / 8] & (1 << (i) % 8))
+#define SET_FLAG SET_BIT
+#define UNSET_FLAG UNSET_BIT
+#define GET_FLAG GET_BIT
+
 //NPC flags
 void SetNPCFlag(long a)
 {
-	SET_BIT(gFlagNPC, a);
+	SET_FLAG(gFlagNPC, a);
 }
 
 void CutNPCFlag(long a)
 {
-	UNSET_BIT(gFlagNPC, a);
+	UNSET_FLAG(gFlagNPC, a);
 }
 
 BOOL GetNPCFlag(long a)
 {
-	if (GET_BIT(gFlagNPC, a))
+	if (GET_FLAG(gFlagNPC, a))
 		return TRUE;
 	else
 		return FALSE;
@@ -45,17 +49,17 @@ BOOL GetNPCFlag(long a)
 //Skip flags
 void SetSkipFlag(long a)
 {
-	SET_BIT(gSkipFlag, a);
+	SET_FLAG(gSkipFlag, a);
 }
 
 void CutSkipFlag(long a)
 {
-	UNSET_BIT(gSkipFlag, a);
+	UNSET_FLAG(gSkipFlag, a);
 }
 
 BOOL GetSkipFlag(long a)
 {
-	if (GET_BIT(gSkipFlag, a))
+	if (GET_FLAG(gSkipFlag, a))
 		return TRUE;
 	else
 		return FALSE;