From e29e20e779990c77794ad14a84fcec46a64cf2b0 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 30 Aug 2023 12:14:18 +0200 Subject: [PATCH] port: small cleanup; decrease bigfont height to 26 this avoids scrolling in the main menu; will probably also help with the extended options later --- src/game/mainmenu.c | 12 ++++++++++-- src/game/menu.c | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index a6ca3d07a..cff845e97 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -2237,7 +2237,8 @@ MenuItemHandlerResult menuhandlerChangeAgent(s32 operation, struct menuitem *ite return 0; } -MenuItemHandlerResult menuhandlerExitGame(s32 operation, struct menuitem *item) +#ifndef PLATFORM_N64 +MenuItemHandlerResult menuhandlerExitGame(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { exit(0); @@ -2245,6 +2246,7 @@ MenuItemHandlerResult menuhandlerExitGame(s32 operation, struct menuitem *item) return 0; } +#endif struct menuitem g_2PMissionControlStyleMenuItems[] = { { @@ -3417,12 +3419,14 @@ struct menudialogdef g_ChangeAgentMenuDialog = { NULL, }; +#ifndef PLATFORM_N64 + struct menuitem g_ExitGameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING, - L_OPTIONS_110, // "Are you sure you want to exit the game?" + L_OPTIONS_110, // "Exit" 0, NULL, }, @@ -3454,6 +3458,8 @@ struct menudialogdef g_ExitGameMenuDialog = { NULL, }; +#endif + struct menuitem g_SoloMissionOptionsMenuItems[] = { { MENUITEMTYPE_SELECTABLE, @@ -4872,6 +4878,7 @@ struct menuitem g_MainMenuMenuItems[] = { 0x00000006, (void *)&g_ChangeAgentMenuDialog, }, +#ifndef PLATFORM_N64 { MENUITEMTYPE_SELECTABLE, 0, @@ -4880,6 +4887,7 @@ struct menuitem g_MainMenuMenuItems[] = { 0x00000007, (void *)&g_ExitGameMenuDialog, }, +#endif { MENUITEMTYPE_END }, }; diff --git a/src/game/menu.c b/src/game/menu.c index cee8361a4..e48c3b9d2 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -761,7 +761,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc } if (item->flags & MENUITEMFLAG_BIGFONT) { - *height = 28; + *height = 26; *width += 36; }