stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-09 01:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change how SR_MainMenu is initialized.

Browse source
This commit is contained in:
spherallic 2022-03-20 14:10:18 +01:00
parent 1cc870485d
commit 99f0933986
1 changed files with 7 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/m_menu.c
View file

@ -693,90 +693,10 @@ static menuitem_t SR_PandorasBox[] =
}; };
// Sky Room Custom Unlocks // Sky Room Custom Unlocks
static menuitem_t SR_MainMenu[] = static menuitem_t SR_MainMenu[MAXUNLOCKABLES+1] =
{ {
{IT_STRING|IT_SUBMENU,NULL, "Extras Checklist", &SR_UnlockChecklistDef, 0}, {IT_STRING|IT_SUBMENU,NULL, "Extras Checklist", &SR_UnlockChecklistDef, 0},
{IT_DISABLED, NULL, "", NULL, 0}, // Custom1 // The remaining (MAXUNLOCKABLES) items are now initialized in M_SecretsMenu
{IT_DISABLED, NULL, "", NULL, 0}, // Custom2
{IT_DISABLED, NULL, "", NULL, 0}, // Custom3
{IT_DISABLED, NULL, "", NULL, 0}, // Custom4
{IT_DISABLED, NULL, "", NULL, 0}, // Custom5
{IT_DISABLED, NULL, "", NULL, 0}, // Custom6
{IT_DISABLED, NULL, "", NULL, 0}, // Custom7
{IT_DISABLED, NULL, "", NULL, 0}, // Custom8
{IT_DISABLED, NULL, "", NULL, 0}, // Custom9
{IT_DISABLED, NULL, "", NULL, 0}, // Custom10
{IT_DISABLED, NULL, "", NULL, 0}, // Custom11
{IT_DISABLED, NULL, "", NULL, 0}, // Custom12
{IT_DISABLED, NULL, "", NULL, 0}, // Custom13
{IT_DISABLED, NULL, "", NULL, 0}, // Custom14
{IT_DISABLED, NULL, "", NULL, 0}, // Custom15
{IT_DISABLED, NULL, "", NULL, 0}, // Custom16
{IT_DISABLED, NULL, "", NULL, 0}, // Custom17
{IT_DISABLED, NULL, "", NULL, 0}, // Custom18
{IT_DISABLED, NULL, "", NULL, 0}, // Custom19
{IT_DISABLED, NULL, "", NULL, 0}, // Custom20
{IT_DISABLED, NULL, "", NULL, 0}, // Custom21
{IT_DISABLED, NULL, "", NULL, 0}, // Custom22
{IT_DISABLED, NULL, "", NULL, 0}, // Custom23
{IT_DISABLED, NULL, "", NULL, 0}, // Custom24
{IT_DISABLED, NULL, "", NULL, 0}, // Custom25
{IT_DISABLED, NULL, "", NULL, 0}, // Custom26
{IT_DISABLED, NULL, "", NULL, 0}, // Custom27
{IT_DISABLED, NULL, "", NULL, 0}, // Custom28
{IT_DISABLED, NULL, "", NULL, 0}, // Custom29
{IT_DISABLED, NULL, "", NULL, 0}, // Custom30
{IT_DISABLED, NULL, "", NULL, 0}, // Custom31
{IT_DISABLED, NULL, "", NULL, 0}, // Custom32
{IT_DISABLED, NULL, "", NULL, 0}, // Custom33
{IT_DISABLED, NULL, "", NULL, 0}, // Custom34
{IT_DISABLED, NULL, "", NULL, 0}, // Custom35
{IT_DISABLED, NULL, "", NULL, 0}, // Custom36
{IT_DISABLED, NULL, "", NULL, 0}, // Custom37
{IT_DISABLED, NULL, "", NULL, 0}, // Custom38
{IT_DISABLED, NULL, "", NULL, 0}, // Custom39
{IT_DISABLED, NULL, "", NULL, 0}, // Custom40
{IT_DISABLED, NULL, "", NULL, 0}, // Custom41
{IT_DISABLED, NULL, "", NULL, 0}, // Custom42
{IT_DISABLED, NULL, "", NULL, 0}, // Custom43
{IT_DISABLED, NULL, "", NULL, 0}, // Custom44
{IT_DISABLED, NULL, "", NULL, 0}, // Custom45
{IT_DISABLED, NULL, "", NULL, 0}, // Custom46
{IT_DISABLED, NULL, "", NULL, 0}, // Custom47
{IT_DISABLED, NULL, "", NULL, 0}, // Custom48
{IT_DISABLED, NULL, "", NULL, 0}, // Custom49
{IT_DISABLED, NULL, "", NULL, 0}, // Custom50
{IT_DISABLED, NULL, "", NULL, 0}, // Custom51
{IT_DISABLED, NULL, "", NULL, 0}, // Custom52
{IT_DISABLED, NULL, "", NULL, 0}, // Custom53
{IT_DISABLED, NULL, "", NULL, 0}, // Custom54
{IT_DISABLED, NULL, "", NULL, 0}, // Custom55
{IT_DISABLED, NULL, "", NULL, 0}, // Custom56
{IT_DISABLED, NULL, "", NULL, 0}, // Custom57
{IT_DISABLED, NULL, "", NULL, 0}, // Custom58
{IT_DISABLED, NULL, "", NULL, 0}, // Custom59
{IT_DISABLED, NULL, "", NULL, 0}, // Custom60
{IT_DISABLED, NULL, "", NULL, 0}, // Custom61
{IT_DISABLED, NULL, "", NULL, 0}, // Custom62
{IT_DISABLED, NULL, "", NULL, 0}, // Custom63
{IT_DISABLED, NULL, "", NULL, 0}, // Custom64
{IT_DISABLED, NULL, "", NULL, 0}, // Custom65
{IT_DISABLED, NULL, "", NULL, 0}, // Custom66
{IT_DISABLED, NULL, "", NULL, 0}, // Custom67
{IT_DISABLED, NULL, "", NULL, 0}, // Custom68
{IT_DISABLED, NULL, "", NULL, 0}, // Custom69
{IT_DISABLED, NULL, "", NULL, 0}, // Custom70
{IT_DISABLED, NULL, "", NULL, 0}, // Custom71
{IT_DISABLED, NULL, "", NULL, 0}, // Custom72
{IT_DISABLED, NULL, "", NULL, 0}, // Custom73
{IT_DISABLED, NULL, "", NULL, 0}, // Custom74
{IT_DISABLED, NULL, "", NULL, 0}, // Custom75
{IT_DISABLED, NULL, "", NULL, 0}, // Custom76
{IT_DISABLED, NULL, "", NULL, 0}, // Custom77
{IT_DISABLED, NULL, "", NULL, 0}, // Custom78
{IT_DISABLED, NULL, "", NULL, 0}, // Custom79
{IT_DISABLED, NULL, "", NULL, 0}, // Custom80
}; };
static menuitem_t SR_LevelSelectMenu[] = static menuitem_t SR_LevelSelectMenu[] =
@ -8177,14 +8097,15 @@ static void M_SecretsMenu(INT32 choice)
(void)choice; (void)choice;
// Clear all before starting // Initialize array with placeholder entries
for (i = 1; i < MAXUNLOCKABLES+1; ++i) menuitem_t placeholder = {IT_DISABLED, NULL, "", NULL, 0};
SR_MainMenu[i].status = IT_DISABLED; for (i = 1; i <= MAXUNLOCKABLES; ++i)
SR_MainMenu[i] = placeholder;
memset(skyRoomMenuTranslations, 0, sizeof(skyRoomMenuTranslations)); memset(skyRoomMenuTranslations, 0, sizeof(skyRoomMenuTranslations));
memset(done, 0, sizeof(done)); memset(done, 0, sizeof(done));
for (i = 1; i < MAXUNLOCKABLES+1; ++i) for (i = 1; i <= MAXUNLOCKABLES; ++i)
{ {
curheight = UINT16_MAX; curheight = UINT16_MAX;
ul = -1; ul = -1;