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

Fixed some warnings

Browse source
This commit is contained in:
Clownacy 2019-02-13 15:43:35 +00:00
parent 08d9ca4ad8
commit d7813fd900
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Back.cpp
View file

@ -167,11 +167,11 @@ void PutFront(int fx, int fy)
if (gBack.type == 3)
{
int x_1 = fx / 0x4000;
int x_2 = fx / 0x4000 + (((WINDOW_WIDTH + 31) >> 5) + 1);
int x_2 = x_1 + (((WINDOW_WIDTH + 31) >> 5) + 1);
int y_1 = 0;
int y_2 = 32;
int y_2 = y_1 + 32;
for (int y = 0; y < y_2; y++)
for (int y = y_1; y < y_2; y++)
{
int ypos = (y << 14) / 0x200 - fy / 0x200 + gWaterY / 0x200;

2
src/Font.cpp
View file

@ -58,7 +58,7 @@ static unsigned long UTF8ToCode(const unsigned char *string, unsigned int *bytes
case 3:
case 4:
length = zero_bit;
charcode = string[0] & ((1 << (8 - zero_bit))) - 1;
charcode = string[0] & ((1 << (8 - zero_bit)) - 1);
for (unsigned int i = 1; i < zero_bit; ++i)
{

2
src/NpcAct160.cpp
View file

@ -1178,7 +1178,7 @@ void ActNpc173(NPCHAR *npc)
if (npc->ym > 0x5FF)
npc->ym = 0x5FF;
if ( npc->ym < -0x5FFu )
if (npc->ym < -0x5FF)
npc->ym = 0x5FF;
npc->x += npc->xm;

6
src/NpcAct180.cpp
View file

@ -564,6 +564,7 @@ void ActNpc184(NPCHAR *npc)
npc->ani_no = 1;
npc->act_wait = 0;
npc->bits |= npc_ignoreSolid;
// Fallthrough
case 11:
switch (npc->direct)
{
@ -960,11 +961,6 @@ void ActNpc190(NPCHAR *npc)
//Water level
void ActNpc191(NPCHAR *npc)
{
int v1; // edx
int v2; // edx
int v3; // edx
int v4; // edx
switch ( npc->act_no )
{
case 0:

2
src/NpcAct320.cpp
View file

@ -515,7 +515,7 @@ void ActNpc326(NPCHAR *npc)
npc->act_no = 41;
npc->act_wait = 0;
npc->ani_no = 0;
//Fallthorugh
//Fallthrough
case 41:
if (++npc->act_wait == 30)
npc->ani_no = 1;