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

Replaced tabs before comments with spaces, shortened a few lines and formatted some switches

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-09-17 10:48:05 +02:00
parent 6ffc8d7429
commit 4766172c3b
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/ArmsItem.cpp
View file

@ -51,7 +51,7 @@ BOOL AddArmsData(long code, long max_num)
} }
if (i == ARMS_MAX) if (i == ARMS_MAX)
return FALSE; // No space left return FALSE; // No space left
if (gArmsData[i].code == 0) if (gArmsData[i].code == 0)
{ {
@ -82,9 +82,9 @@ BOOL SubArmsData(long code)
#ifdef FIX_BUGS #ifdef FIX_BUGS
if (i == ARMS_MAX) if (i == ARMS_MAX)
#else #else
if (i == ITEM_MAX) // Oops if (i == ITEM_MAX) // Oops
#endif #endif
return FALSE; // Not found return FALSE; // Not found
// Shift all arms from the right to the left // Shift all arms from the right to the left
for (++i; i < ARMS_MAX; ++i) for (++i; i < ARMS_MAX; ++i)
@ -126,7 +126,7 @@ BOOL AddItemData(long code)
while (i < ITEM_MAX) while (i < ITEM_MAX)
{ {
if (gItemData[i].code == code) if (gItemData[i].code == code)
break; // Really, this could just return as the following code won't do anything meaningful in this case break; // Really, this could just return as the following code won't do anything meaningful in this case
if (gItemData[i].code == 0) if (gItemData[i].code == 0)
break; break;
@ -348,9 +348,11 @@ static void PutCampObject()
// Draw items cursor // Draw items cursor
if (gCampActive == TRUE) if (gCampActive == TRUE)
PutBitmap3(&rcView, 32 * (gSelectedItem % 6) + (WINDOW_WIDTH - 224) / 2, 16 * (gSelectedItem / 6) + (WINDOW_HEIGHT - 88) / 2, &rcCur2[(flash / 2) % 2], SURFACE_ID_TEXT_BOX); PutBitmap3(&rcView, 32 * (gSelectedItem % 6) + (WINDOW_WIDTH - 224) / 2, 16 * (gSelectedItem / 6) + (WINDOW_HEIGHT - 88) / 2, &rcCur2[(flash / 2) % 2],
SURFACE_ID_TEXT_BOX);
else else
PutBitmap3(&rcView, 32 * (gSelectedItem % 6) + (WINDOW_WIDTH - 224) / 2, 16 * (gSelectedItem / 6) + (WINDOW_HEIGHT - 88) / 2, &rcCur2[1], SURFACE_ID_TEXT_BOX); PutBitmap3(&rcView, 32 * (gSelectedItem % 6) + (WINDOW_WIDTH - 224) / 2, 16 * (gSelectedItem / 6) + (WINDOW_HEIGHT - 88) / 2, &rcCur2[1],
SURFACE_ID_TEXT_BOX);
for (i = 0; i < ITEM_MAX; ++i) for (i = 0; i < ITEM_MAX; ++i)
{ {
@ -400,10 +402,10 @@ int CampLoop()
{ {
switch (Call_Escape(ghWnd)) switch (Call_Escape(ghWnd))
{ {
case 0: case 0:
return 0; return 0;
case 2: case 2:
return 2; return 2;
} }
} }
@ -412,10 +414,10 @@ int CampLoop()
switch (TextScriptProc()) switch (TextScriptProc())
{ {
case 0: case 0:
return 0; return 0;
case 2: case 2:
return 2; return 2;
} }
PutBitmap4(&rcView, 0, 0, &rcView, SURFACE_ID_SCREEN_GRAB); PutBitmap4(&rcView, 0, 0, &rcView, SURFACE_ID_SCREEN_GRAB);