Made code repetition less.

This commit is contained in:
toasterbabe 2017-02-02 16:10:37 +00:00
parent 42518a1759
commit 3aa7573c86
2 changed files with 12 additions and 48 deletions

View File

@ -1503,17 +1503,9 @@ menu_t SR_MainDef =
0, 0,
NULL NULL
}; };
menu_t SR_LevelSelectDef =
{ menu_t SR_LevelSelectDef = MAPPLATTERMENUSTYLE(NULL, SR_LevelSelectMenu);
NULL,
sizeof (SR_LevelSelectMenu)/sizeof (menuitem_t),
&SR_MainDef,
SR_LevelSelectMenu,
M_DrawLevelPlatterMenu,
0, 0,
0,
NULL
};
menu_t SR_UnlockChecklistDef = menu_t SR_UnlockChecklistDef =
{ {
NULL, NULL,
@ -1551,17 +1543,7 @@ menu_t SP_LoadDef =
NULL NULL
}; };
menu_t SP_LevelSelectDef = menu_t SP_LevelSelectDef = MAPPLATTERMENUSTYLE(NULL, SP_LevelSelectMenu);
{
NULL,
sizeof (SP_LevelSelectMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
SP_LevelSelectMenu,
M_DrawLevelPlatterMenu,
0, 0,
0,
NULL
};
menu_t SP_GameStatsDef = menu_t SP_GameStatsDef =
{ {
@ -1586,17 +1568,8 @@ menu_t SP_LevelStatsDef =
NULL NULL
}; };
menu_t SP_TimeAttackLevelSelectDef = menu_t SP_TimeAttackLevelSelectDef = MAPPLATTERMENUSTYLE("M_ATTACK", SP_TimeAttackLevelSelectMenu);
{
"M_ATTACK",
sizeof (SP_TimeAttackLevelSelectMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
SP_TimeAttackLevelSelectMenu,
M_DrawLevelPlatterMenu,
0, 0,
0,
NULL
};
static menu_t SP_TimeAttackDef = static menu_t SP_TimeAttackDef =
{ {
"M_ATTACK", "M_ATTACK",
@ -1642,17 +1615,8 @@ static menu_t SP_GhostDef =
NULL NULL
}; };
menu_t SP_NightsAttackLevelSelectDef = menu_t SP_NightsAttackLevelSelectDef = MAPPLATTERMENUSTYLE("M_NIGHTS", SP_NightsAttackLevelSelectMenu);
{
"M_NIGHTS", // HAMALAYAN
sizeof (SP_NightsAttackLevelSelectMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
SP_NightsAttackLevelSelectMenu,
M_DrawLevelPlatterMenu,
0, 0,
0,
NULL
};
static menu_t SP_NightsAttackDef = static menu_t SP_NightsAttackDef =
{ {
"M_NIGHTS", "M_NIGHTS",

View File

@ -279,14 +279,14 @@ void Screenshot_option_Onchange(void);
NULL\ NULL\
} }
#define MAPICONMENUSTYLE(header, source, prev)\ #define MAPPLATTERMENUSTYLE(header, source)\
{\ {\
header,\ header,\
sizeof (source)/sizeof (menuitem_t),\ sizeof (source)/sizeof (menuitem_t),\
prev,\ &MainDef,\
source,\ source,\
M_DrawServerMenu,\ M_DrawLevelPlatterMenu,\
27,40,\ 0,0,\
0,\ 0,\
NULL\ NULL\
} }