duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved and renamed flag macros

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-05-13 18:58:29 +02:00
parent 7f75ad6ef8
commit a0f4bae094
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Flags.cpp
View file

@ -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;