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

Merge pull request #21 from Clownacy/master

Browse source 
Merge Clownacy/master into master
This commit is contained in:
Gabriel Ravier 2019-05-15 21:31:50 +02:00 • committed by GitHub
commit 461d1cfda9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Flags.cpp
View file

@ -4,10 +4,16 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
// Macros for setting, un-setting and getting flags
// Each flag is stored in a bit, so we can use the exact same macros we'd use for bits
#define SET_FLAG(x, i) ((x)[(i) / 8] |= 1 << (i) % 8)
#define UNSET_FLAG(x, i) ((x)[(i) / 8] &= ~(1 << (i) % 8))
#define GET_FLAG(x, i) ((x)[(i) / 8] & (1 << (i) % 8))
unsigned char gFlagNPC[1000]; unsigned char gFlagNPC[1000];
unsigned char gSkipFlag[8]; unsigned char gSkipFlag[8];
//Flag inits // Flag initializers
void InitFlags() void InitFlags()
{ {
memset(gFlagNPC, 0, sizeof(gFlagNPC)); memset(gFlagNPC, 0, sizeof(gFlagNPC));
@ -18,39 +24,39 @@ void InitSkipFlags()
memset(gSkipFlag, 0, sizeof(gSkipFlag)); memset(gSkipFlag, 0, sizeof(gSkipFlag));
} }
//NPC flags // NPC flags
void SetNPCFlag(long a) void SetNPCFlag(long a)
{ {
gFlagNPC[a / 8] |= 1 << a % 8; SET_FLAG(gFlagNPC, a);
} }
void CutNPCFlag(long a) void CutNPCFlag(long a)
{ {
gFlagNPC[a / 8] &= ~(1 << a % 8); UNSET_FLAG(gFlagNPC, a);
} }
BOOL GetNPCFlag(long a) BOOL GetNPCFlag(long a)
{ {
if (gFlagNPC[a / 8] & (1 << a % 8)) if (GET_FLAG(gFlagNPC, a))
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
} }
//Skip flags // Skip flags
void SetSkipFlag(long a) void SetSkipFlag(long a)
{ {
gSkipFlag[a / 8] |= 1 << a % 8; SET_FLAG(gSkipFlag, a);
} }
void CutSkipFlag(long a) void CutSkipFlag(long a)
{ {
gSkipFlag[a / 8] &= ~(1 << a % 8); UNSET_FLAG(gSkipFlag, a);
} }
BOOL GetSkipFlag(long a) BOOL GetSkipFlag(long a)
{ {
if (gSkipFlag[a / 8] & (1 << a % 8)) if (GET_FLAG(gSkipFlag, a))
return TRUE; return TRUE;
else else
return FALSE; return FALSE;

12
src/Frame.cpp
View file

@ -85,7 +85,7 @@ void MoveFrame3()
gFrame.y = ((map_l - 1) * 0x10 - WINDOW_HEIGHT) * 0x200; gFrame.y = ((map_l - 1) * 0x10 - WINDOW_HEIGHT) * 0x200;
#endif #endif
//Quake // Quake
if (gFrame.quake2) if (gFrame.quake2)
{ {
gFrame.x += (Random(-5, 5) * 0x200); gFrame.x += (Random(-5, 5) * 0x200);
@ -114,18 +114,18 @@ void GetFramePosition(int *fx, int *fy)
void SetFramePosition(int fx, int fy) void SetFramePosition(int fx, int fy)
{ {
//End quake // End quake
gFrame.quake = 0; gFrame.quake = 0;
gFrame.quake2 = 0; gFrame.quake2 = 0;
//Move frame position // Move frame position
short map_w, map_l; short map_w, map_l;
GetMapData(0, &map_w, &map_l); GetMapData(0, &map_w, &map_l);
gFrame.x = fx; gFrame.x = fx;
gFrame.y = fy; gFrame.y = fy;
//Keep in bounds // Keep in bounds
if (gFrame.x / 0x200 < 0) if (gFrame.x / 0x200 < 0)
gFrame.x = 0; gFrame.x = 0;
if (gFrame.y / 0x200 < 0) if (gFrame.y / 0x200 < 0)
@ -139,7 +139,7 @@ void SetFramePosition(int fx, int fy)
void SetFrameMyChar() void SetFrameMyChar()
{ {
//Move frame position // Move frame position
int mc_x, mc_y; int mc_x, mc_y;
GetMyCharPosition(&mc_x, &mc_y); GetMyCharPosition(&mc_x, &mc_y);
@ -149,7 +149,7 @@ void SetFrameMyChar()
gFrame.x = mc_x - (WINDOW_WIDTH << 8); gFrame.x = mc_x - (WINDOW_WIDTH << 8);
gFrame.y = mc_y - (WINDOW_HEIGHT << 8); gFrame.y = mc_y - (WINDOW_HEIGHT << 8);
//Keep in bounds // Keep in bounds
if (gFrame.x / 0x200 < 0) if (gFrame.x / 0x200 < 0)
gFrame.x = 0; gFrame.x = 0;
if (gFrame.y / 0x200 < 0) if (gFrame.y / 0x200 < 0)