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

Merge pull request #20 from GabrielRavier/improveArmsItemAgain

Browse source 
Improve ArmsItem again
This commit is contained in:
Clownacy 2019-05-07 14:27:24 +00:00 • committed by GitHub
commit 05949cb772
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ArmsItem.cpp
View file

@ -158,9 +158,9 @@ void MoveCampCursor()
{ {
int arms_num = 0; int arms_num = 0;
int item_num = 0; int item_num = 0;
while ( gArmsData[arms_num].code != 0 ) while (gArmsData[arms_num].code != 0)
++arms_num; ++arms_num;
while ( gItemData[item_num].code != 0 ) while (gItemData[item_num].code != 0)
++item_num; ++item_num;
if (arms_num == 0 && item_num == 0) if (arms_num == 0 && item_num == 0)
@ -228,9 +228,9 @@ void MoveCampCursor()
bChange = TRUE; bChange = TRUE;
} }
if ( gKeyTrg & gKeyDown ) if (gKeyTrg & gKeyDown)
{ {
if ( gSelectedItem / 6 == (item_num - 1) / 6 ) if (gSelectedItem / 6 == (item_num - 1) / 6)
gCampActive = FALSE; gCampActive = FALSE;
else else
gSelectedItem += 6; gSelectedItem += 6;
@ -325,7 +325,7 @@ void PutCampObject()
PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 160) / 2, gArmsData[i].level, 0); PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 160) / 2, gArmsData[i].level, 0);
// Draw ammo // Draw ammo
if ( gArmsData[i].max_num ) if (gArmsData[i].max_num)
{ {
PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 144) / 2, gArmsData[i].num, 0); PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 144) / 2, gArmsData[i].num, 0);
PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 128) / 2, gArmsData[i].max_num, 0); PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 128) / 2, gArmsData[i].max_num, 0);