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 19:47:34 +02:00
parent b4ef218dca
commit 4fc38593d2
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
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

@ -233,9 +233,9 @@ static void MoveCampCursor()
if (gKeyTrg & gKeyRight) if (gKeyTrg & gKeyRight)
{ {
if (gSelectedItem == item_num - 1) if (gSelectedItem == item_num - 1)
gSelectedItem = 6 * (gSelectedItem / 6); gSelectedItem = 6 * (gSelectedItem / 6); // Round down to multiple of 6
else if (gSelectedItem % 6 == 5) else if (gSelectedItem % 6 == 5)
gSelectedItem -= 5; gSelectedItem -= 5; // Loop around row
else else
++gSelectedItem; ++gSelectedItem;
@ -245,7 +245,7 @@ static void MoveCampCursor()
if (gKeyTrg & gKeyUp) if (gKeyTrg & gKeyUp)
{ {
if (gSelectedItem / 6 == 0) if (gSelectedItem / 6 == 0)
gCampActive = FALSE; gCampActive = FALSE; // We're on the first row, transition to weapons
else else
gSelectedItem -= 6; gSelectedItem -= 6;
@ -255,7 +255,7 @@ static void MoveCampCursor()
if (gKeyTrg & gKeyDown) if (gKeyTrg & gKeyDown)
{ {
if (gSelectedItem / 6 == (item_num - 1) / 6) if (gSelectedItem / 6 == (item_num - 1) / 6)
gCampActive = FALSE; gCampActive = FALSE; // We're on the last row, transition to weapons
else else
gSelectedItem += 6; gSelectedItem += 6;
@ -263,7 +263,7 @@ static void MoveCampCursor()
} }
if (gSelectedItem >= item_num) if (gSelectedItem >= item_num)
gSelectedItem = item_num - 1; gSelectedItem = item_num - 1; // Don't allow selecting a non-existing item
if (gCampActive && gKeyTrg & gKeyOk) if (gCampActive && gKeyTrg & gKeyOk)
StartTextScript(gItemData[gSelectedItem].code + 6000); StartTextScript(gItemData[gSelectedItem].code + 6000);