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

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2019-11-09 14:24:55 +00:00
commit 8344716548
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.cpp
View file

@ -46,7 +46,7 @@ BOOL LoadConfigData(CONFIG *conf)
fclose(fp); fclose(fp);
// Check if version is not correct, and return if it failed // Check if version is not correct, and return if it failed
if (strcmp(conf->proof, config_magic)) if (strcmp(conf->proof, config_magic) != 0)
{ {
memset(conf, 0, sizeof(CONFIG)); memset(conf, 0, sizeof(CONFIG));
return FALSE; return FALSE;

6
src/Flags.cpp
View file

@ -6,9 +6,9 @@
// Macros for setting, un-setting and getting flags // 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 // 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 SET_FLAG(x, i) ((x)[(i) / 8] |= 1 << ((i) % 8))
#define UNSET_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)) #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];

2
src/Map.cpp
View file

@ -42,7 +42,7 @@ BOOL LoadMapData2(const char *path_map)
char check[3]; char check[3];
fread(check, 1, 3, fp); fread(check, 1, 3, fp);
if (memcmp(check, code_pxma, 3)) if (memcmp(check, code_pxma, 3) != 0)
{ {
fclose(fp); fclose(fp);
return FALSE; return FALSE;

2
src/NpChar.cpp
View file

@ -69,7 +69,7 @@ BOOL LoadEvent(const char *path_event)
// Read "PXE" check // Read "PXE" check
char code[4]; char code[4];
fread(code, 1, 4, fp); fread(code, 1, 4, fp);
if (memcmp(code, gPassPixEve, 3)) if (memcmp(code, gPassPixEve, 3) != 0)
{ {
#ifdef FIX_BUGS #ifdef FIX_BUGS
// The original game forgot to close the file here // The original game forgot to close the file here

2
src/Profile.cpp
View file

@ -137,7 +137,7 @@ BOOL LoadProfile(const char *name)
// Check header code // Check header code
fread(profile.code, 8, 1, fp); fread(profile.code, 8, 1, fp);
if (memcmp(profile.code, gProfileCode, 8)) if (memcmp(profile.code, gProfileCode, 8) != 0)
{ {
#ifdef FIX_BUGS #ifdef FIX_BUGS
fclose(fp); // The original game forgets to close the file fclose(fp); // The original game forgets to close the file

2
src/Stage.cpp
View file

@ -250,7 +250,7 @@ MusicID gMusicNo;
void ChangeMusic(MusicID no) void ChangeMusic(MusicID no)
{ {
if (no && no == gMusicNo) if (no != MUS_SILENCE && no == gMusicNo)
return; return;
//Stop and keep track of old song //Stop and keep track of old song

2
src/TextScr.cpp
View file

@ -33,7 +33,7 @@
#include "Stage.h" #include "Stage.h"
#include "Tags.h" #include "Tags.h"
#define IS_COMMAND(c1, c2, c3) gTS.data[gTS.p_read + 1] == c1 && gTS.data[gTS.p_read + 2] == c2 && gTS.data[gTS.p_read + 3] == c3 #define IS_COMMAND(c1, c2, c3) (gTS.data[gTS.p_read + 1] == (c1) && gTS.data[gTS.p_read + 2] == (c2) && gTS.data[gTS.p_read + 3] == (c3))
#define TSC_BUFFER_SIZE 0x5000 #define TSC_BUFFER_SIZE 0x5000