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

More comments in ArmsItem

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-09-23 07:28:48 +02:00
parent eb46198635
commit 9d8018e901
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ArmsItem.cpp
View file

@ -203,13 +203,14 @@ static void MoveCampCursor()
if (gKeyTrg & (gKeyUp | gKeyDown)) if (gKeyTrg & (gKeyUp | gKeyDown))
{ {
// If there are any items, we're changing to the items section, since the weapons section has only 1 row
if (item_num) if (item_num)
gCampActive = TRUE; gCampActive = TRUE;
bChange = TRUE; bChange = TRUE;
} }
// Loop around gSelectedArms if needed
if (gSelectedArms < 0) if (gSelectedArms < 0)
gSelectedArms = arms_num - 1; gSelectedArms = arms_num - 1;
@ -513,24 +514,24 @@ BOOL CheckArms(long a)
{ {
for (int i = 0; i < ARMS_MAX; ++i) for (int i = 0; i < ARMS_MAX; ++i)
if (gArmsData[i].code == a) if (gArmsData[i].code == a)
return TRUE; return TRUE; // Found
return FALSE; return FALSE; // Not found
} }
BOOL UseArmsEnergy(long num) BOOL UseArmsEnergy(long num)
{ {
if (gArmsData[gSelectedArms].max_num == 0) if (gArmsData[gSelectedArms].max_num == 0)
return TRUE; return TRUE; // No ammo needed
if (gArmsData[gSelectedArms].num == 0) if (gArmsData[gSelectedArms].num == 0)
return FALSE; return FALSE; // No ammo left
gArmsData[gSelectedArms].num -= num; gArmsData[gSelectedArms].num -= num;
if (gArmsData[gSelectedArms].num < 0) if (gArmsData[gSelectedArms].num < 0)
gArmsData[gSelectedArms].num = 0; gArmsData[gSelectedArms].num = 0;
return TRUE; return TRUE; // Was able to spend ammo
} }
BOOL ChargeArmsEnergy(long num) BOOL ChargeArmsEnergy(long num)