ref: 9c63e5994b33fa2ba9455bc9fd44a34dbdd3e3bf
parent: aa396092b517fbb40bfcbeb4e5e64801814f47b2
author: Clownacy <Clownacy@users.noreply.github.com>
date: Thu Sep 3 17:52:05 EDT 2020
Document SelStage.cpp a little
--- a/src/ArmsItem.h
+++ b/src/ArmsItem.h
@@ -4,7 +4,7 @@
// Limits for the amount of weapons and items
#define ARMS_MAX 8
-#define ITEM_MAX 0x20
+#define ITEM_MAX 32
// "Arms" is a synonym of "weapon" here
// "Code" means "ID" here
--- a/src/SelStage.cpp
+++ b/src/SelStage.cpp
@@ -12,7 +12,7 @@
#include "Sound.h"
#include "TextScr.h"
-PERMIT_STAGE gPermitStage[8];
+PERMIT_STAGE gPermitStage[STAGE_MAX];
int gSelectedStage;
int gStageSelectTitleY;
@@ -26,7 +26,7 @@
{int i = 0;
- while (i < 8)
+ while (i < STAGE_MAX)
{if (gPermitStage[i].index == index)
break;
@@ -37,7 +37,7 @@
++i;
}
- if (i == 8)
+ if (i == STAGE_MAX)
return FALSE;
gPermitStage[i].index = index;
@@ -50,18 +50,18 @@
{int i;
- for (i = 0; i < 8; ++i)
+ for (i = 0; i < STAGE_MAX; ++i)
if (gPermitStage[i].index == index)
break;
#ifdef FIX_BUGS
- if (i == 8)
+ if (i == STAGE_MAX)
#else
- if (i == 32)
+ if (i == 32) // Same value as 'ITEM_MAX'
#endif
return FALSE;
- for (++i; i < 8; ++i)
+ for (++i; i < STAGE_MAX; ++i)
gPermitStage[i - 1] = gPermitStage[i];
gPermitStage[i - 1].index = 0;
@@ -139,11 +139,14 @@
PutBitmap3(&rcView, stage_x + (gSelectedStage * 40), (WINDOW_HEIGHT / 2) - 56, &rcCur[flash / 2 % 2], SURFACE_ID_TEXT_BOX);
- for (i = 0; i < 8; ++i)
+ for (i = 0; i < STAGE_MAX; ++i)
{if (gPermitStage[i].index == 0)
break;
+ // Interestingly, there's code for reading multiple rows of icons
+ // from the 'StageImage.pbm' file when there are more than 8 stages,
+ // despite only 6 icons ever being used.
rcStage.left = (gPermitStage[i].index % 8) * 32;
rcStage.right = rcStage.left + 32;
rcStage.top = (gPermitStage[i].index / 8) * 16;
--- a/src/SelStage.h
+++ b/src/SelStage.h
@@ -2,6 +2,8 @@
#include "WindowsWrapper.h"
+#define STAGE_MAX 8 // Note that Cave Story only has 5 stages
+
typedef struct PERMIT_STAGE
{int index;
@@ -8,7 +10,7 @@
int event;
} PERMIT_STAGE;
-extern PERMIT_STAGE gPermitStage[8];
+extern PERMIT_STAGE gPermitStage[STAGE_MAX];
extern int gSelectedStage;
extern int gStageSelectTitleY;