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

Clean-up MycParam.cpp

Browse source
This commit is contained in:
Clownacy 2019-11-14 23:02:10 +00:00
parent de50e49f1c
commit dcc0f14266
2 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/MycParam.cpp
View file

@ -85,13 +85,13 @@ void AddExpMyChar(int x)
} }
} }
void ZeroExpMyChar() void ZeroExpMyChar(void)
{ {
gArmsData[gSelectedArms].level = 1; gArmsData[gSelectedArms].level = 1;
gArmsData[gSelectedArms].exp = 0; gArmsData[gSelectedArms].exp = 0;
} }
BOOL IsMaxExpMyChar() BOOL IsMaxExpMyChar(void)
{ {
if (gArmsData[gSelectedArms].level == 3) if (gArmsData[gSelectedArms].level == 3)
{ {
@ -107,10 +107,10 @@ BOOL IsMaxExpMyChar()
void DamageMyChar(int damage) void DamageMyChar(int damage)
{ {
#ifdef FIX_BUGS #ifdef FIX_BUGS
if ((g_GameFlags & 2) == 0) if (!(g_GameFlags & 2))
#else #else
// I'm preeeetty sure this is a typo. The Linux port optimised it out. // I'm preeeetty sure this is a typo. The Linux port optimised it out.
if ((g_GameFlags | 2) == 0) if (!(g_GameFlags | 2))
#endif #endif
return; return;
@ -124,7 +124,8 @@ void DamageMyChar(int damage)
if (gMC.unit == 1) if (gMC.unit == 1)
{ {
// Another weird case where there *has* to be an empty 'if' here to produce the same assembly // Another weird case where there *has* to be an empty 'if' here to produce the same assembly.
// Chances are there used to be some commented-out code here.
} }
else else
{ {
@ -141,7 +142,7 @@ void DamageMyChar(int damage)
if (gMC.equip & 4) if (gMC.equip & 4)
gArmsData[gSelectedArms].exp -= damage; gArmsData[gSelectedArms].exp -= damage;
else else
gArmsData[gSelectedArms].exp -= 2 * damage; gArmsData[gSelectedArms].exp -= damage * 2;
while (gArmsData[gSelectedArms].exp < 0) while (gArmsData[gSelectedArms].exp < 0)
{ {
@ -176,9 +177,11 @@ void DamageMyChar(int damage)
} }
} }
void ZeroArmsEnergy_All() void ZeroArmsEnergy_All(void)
{ {
for (int a = 0; a < ARMS_MAX; a++) int a;
for (a = 0; a < ARMS_MAX; a++)
{ {
gArmsData[a].level = 1; gArmsData[a].level = 1;
gArmsData[a].exp = 0; gArmsData[a].exp = 0;
@ -187,9 +190,10 @@ void ZeroArmsEnergy_All()
void AddBulletMyChar(int no, int val) void AddBulletMyChar(int no, int val)
{ {
int a = 0; int a;
// Missile Launcher // Missile Launcher
a = 0;
while (a < ARMS_MAX && gArmsData[a].code != 5) while (a < ARMS_MAX && gArmsData[a].code != 5)
++a; ++a;
@ -286,8 +290,8 @@ void PutArmsEnergy(BOOL flash)
} }
else else
{ {
if (exp_next) if (exp_next != 0)
rcExpVal.right += 40 * exp_now / exp_next; rcExpVal.right += (exp_now * 40) / exp_next;
else else
rcExpVal.right = 0; rcExpVal.right = 0;
@ -299,7 +303,7 @@ void PutArmsEnergy(BOOL flash)
PutBitmap3(&rcView, gArmsEnergyX + 24, 32, &rcExpFlash, SURFACE_ID_TEXT_BOX); PutBitmap3(&rcView, gArmsEnergyX + 24, 32, &rcExpFlash, SURFACE_ID_TEXT_BOX);
} }
void PutActiveArmsList() void PutActiveArmsList(void)
{ {
int x; int x;
int a; int a;
@ -313,23 +317,23 @@ void PutActiveArmsList()
if (arms_num == 0) if (arms_num == 0)
return; return;
for (a = 0; a < arms_num; a++) for (a = 0; a < arms_num; ++a)
{ {
// Get X position to draw at // Get X position to draw at
x = 16 * (a - gSelectedArms) + gArmsEnergyX; x = ((a - gSelectedArms) * 16) + gArmsEnergyX;
if (x < 8) if (x < 8)
x += 48 + (16 * arms_num); x += 48 + (arms_num * 16);
else if (x >= 24) else if (x >= 24)
x += 48; x += 48;
if (x >= 72 + (16 * (arms_num - 1))) if (x >= 72 + ((arms_num - 1) * 16))
x -= 48 + (16 * arms_num); x -= 48 + (arms_num * 16);
if (x < 72 && x >= 24) if (x < 72 && x >= 24)
x -= 48; x -= 48;
// Draw icon // Draw icon
rect.left = 16 * gArmsData[a].code; rect.left = gArmsData[a].code * 16;
rect.right = rect.left + 16; rect.right = rect.left + 16;
PutBitmap3(&grcGame, x, 16, &rect, SURFACE_ID_ARMS_IMAGE); PutBitmap3(&grcGame, x, 16, &rect, SURFACE_ID_ARMS_IMAGE);
} }
@ -341,7 +345,7 @@ void PutMyLife(BOOL flash)
RECT rcLife = {0, 24, 232, 32}; RECT rcLife = {0, 24, 232, 32};
RECT rcBr = {0, 32, 232, 40}; RECT rcBr = {0, 32, 232, 40};
if (flash == TRUE && (gMC.shock / 2) % 2) if (flash == TRUE && gMC.shock / 2 % 2)
return; return;
if (gMC.lifeBr < gMC.life) if (gMC.lifeBr < gMC.life)
@ -359,8 +363,8 @@ void PutMyLife(BOOL flash)
// Draw bar // Draw bar
rcCase.right = 64; rcCase.right = 64;
rcLife.right = 40 * gMC.life / gMC.max_life - 1; rcLife.right = ((gMC.life * 40) / gMC.max_life) - 1;
rcBr.right = 40 * gMC.lifeBr / gMC.max_life - 1; rcBr.right = ((gMC.lifeBr * 40) / gMC.max_life) - 1;
PutBitmap3(&grcGame, 16, 40, &rcCase, SURFACE_ID_TEXT_BOX); PutBitmap3(&grcGame, 16, 40, &rcCase, SURFACE_ID_TEXT_BOX);
PutBitmap3(&grcGame, 40, 40, &rcBr, SURFACE_ID_TEXT_BOX); PutBitmap3(&grcGame, 40, 40, &rcBr, SURFACE_ID_TEXT_BOX);
@ -378,7 +382,7 @@ void PutMyAir(int x, int y)
if (gMC.equip & 0x10) if (gMC.equip & 0x10)
return; return;
if (gMC.air_get) if (gMC.air_get != 0)
{ {
// Draw how much air is left // Draw how much air is left
if (gMC.air_get % 6 < 4) if (gMC.air_get % 6 < 4)
@ -430,7 +434,7 @@ void PutTimeCounter(int x, int y)
} }
} }
BOOL SaveTimeCounter() BOOL SaveTimeCounter(void)
{ {
unsigned char *p; unsigned char *p;
int i; int i;
@ -463,7 +467,7 @@ BOOL SaveTimeCounter()
} }
// Save new time // Save new time
for (i = 0; i < 4; i++) for (i = 0; i < 4; ++i)
{ {
rec.counter[i] = time_count; rec.counter[i] = time_count;
rec.random[i] = Random(0, 250) + i; rec.random[i] = Random(0, 250) + i;
@ -485,7 +489,7 @@ BOOL SaveTimeCounter()
return TRUE; return TRUE;
} }
int LoadTimeCounter() int LoadTimeCounter(void)
{ {
unsigned char *p; unsigned char *p;
int i; int i;
@ -505,7 +509,7 @@ int LoadTimeCounter()
fclose(fp); fclose(fp);
// Decode from checksum // Decode from checksum
for (i = 0; i < 4; i++) for (i = 0; i < 4; ++i)
{ {
p = (unsigned char*)&rec.counter[i]; p = (unsigned char*)&rec.counter[i];
p[0] -= rec.random[i]; p[0] -= rec.random[i];

12
src/MycParam.h
View file

@ -16,17 +16,17 @@ struct REC
extern ARMS_LEVEL gArmsLevelTable[14]; extern ARMS_LEVEL gArmsLevelTable[14];
void AddExpMyChar(int x); void AddExpMyChar(int x);
void ZeroExpMyChar(); void ZeroExpMyChar(void);
BOOL IsMaxExpMyChar(); BOOL IsMaxExpMyChar(void);
void DamageMyChar(int damage); void DamageMyChar(int damage);
void ZeroArmsEnergy_All(); void ZeroArmsEnergy_All(void);
void AddBulletMyChar(int no, int val); void AddBulletMyChar(int no, int val);
void AddLifeMyChar(int x); void AddLifeMyChar(int x);
void AddMaxLifeMyChar(int val); void AddMaxLifeMyChar(int val);
void PutArmsEnergy(BOOL flash); void PutArmsEnergy(BOOL flash);
void PutActiveArmsList(); void PutActiveArmsList(void);
void PutMyLife(BOOL flash); void PutMyLife(BOOL flash);
void PutMyAir(int x, int y); void PutMyAir(int x, int y);
void PutTimeCounter(int x, int y); void PutTimeCounter(int x, int y);
BOOL SaveTimeCounter(); BOOL SaveTimeCounter(void);
int LoadTimeCounter(); int LoadTimeCounter(void);