From b7550f19d93b955a7636a00a687ea430dc21d51c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 28 Jan 2022 22:50:50 +1000 Subject: [PATCH] Replace flag literals with constants in menudialog definitions --- src/game/activemenu/activemenu.c | 2 +- src/game/cheats.c | 16 ++-- src/game/endscreen.c | 26 ++--- src/game/filemgr.c | 40 ++++---- src/game/game_0f09f0.c | 38 ++++---- src/game/game_10c9c0.c | 24 ++--- src/game/mainmenu.c | 88 ++++++++--------- src/game/menu/items.c | 2 +- src/game/mplayer/ingame.c | 36 +++---- src/game/mplayer/scenarios.c | 4 +- src/game/mplayer/scenarios/capturethecase.inc | 2 +- src/game/mplayer/scenarios/combat.inc | 2 +- src/game/mplayer/scenarios/hackthatmac.inc | 2 +- .../mplayer/scenarios/holdthebriefcase.inc | 2 +- src/game/mplayer/scenarios/kingofthehill.inc | 2 +- src/game/mplayer/scenarios/popacap.inc | 2 +- src/game/mplayer/setup.c | 94 +++++++++---------- src/game/training/menus.c | 46 ++++----- src/include/constants.h | 22 ++--- 19 files changed, 225 insertions(+), 225 deletions(-) diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index 2a0fb6478..313b16786 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -226,7 +226,7 @@ struct menudialogdef g_AmPickTargetMenuDialog = { L_OPTIONS_492, // "Pick Target" g_AmPickTargetMenuItems, amPickTargetMenuDialog, - 0x00000000, + 0, NULL, }; diff --git a/src/game/cheats.c b/src/game/cheats.c index c113b41b2..80df61f4d 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -937,7 +937,7 @@ struct menudialogdef g_CheatsWarningMenuDialog = { L_MPMENU_478, // "Warning" g_CheatsWarningMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -965,7 +965,7 @@ struct menudialogdef g_CheatsFunMenuDialog = { L_MPWEAPONS_118, // "Fun" g_CheatsFunMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -990,7 +990,7 @@ struct menudialogdef g_CheatsGameplayMenuDialog = { L_MPWEAPONS_119, // "Gameplay" g_CheatsGameplayMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -1015,7 +1015,7 @@ struct menudialogdef g_CheatsSoloWeaponsMenuDialog = { L_MPWEAPONS_122, // "Weapons for Jo in Solo" g_CheatsSoloWeaponsMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -1040,7 +1040,7 @@ struct menudialogdef g_CheatsClassicWeaponsMenuDialog = { L_MPWEAPONS_123, // "Classic Weapons for Jo in Solo" g_CheatsClassicWeaponsMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -1065,7 +1065,7 @@ struct menudialogdef g_CheatsWeaponsMenuDialog = { L_MPWEAPONS_120, // "Weapons" g_CheatsWeaponsMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -1087,7 +1087,7 @@ struct menudialogdef g_CheatsBuddiesMenuDialog = { L_MPWEAPONS_121, // "Buddies" g_CheatsBuddiesMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; @@ -1110,6 +1110,6 @@ struct menudialogdef g_CheatsMenuDialog = { L_MPMENU_476, // "Cheats" g_CheatsMenuItems, cheatMenuHandleDialog, - 0x00000000, + 0, NULL, }; diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 8e92f38ed..2a3e51d88 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -148,7 +148,7 @@ struct menudialogdef g_RetryMissionMenuDialog = { (u32)&menuDialogTitleRetryStageName, g_RetryMissionMenuItems, menudialogRetryMission, - 0x0000000c, + MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, &g_PreAndPostMissionBriefingMenuDialog, }; @@ -166,7 +166,7 @@ struct menudialogdef g_NextMissionMenuDialog = { (u32)&menuDialogTitleNextMissionStageName, g_NextMissionMenuItems, menudialogRetryMission, - 0x0000000c, + MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, &g_PreAndPostMissionBriefingMenuDialog, }; @@ -455,7 +455,7 @@ struct menudialogdef g_SoloEndscreenObjectivesFailedMenuDialog = { L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -464,7 +464,7 @@ struct menudialogdef g_SoloEndscreenObjectivesCompletedMenuDialog = { L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -473,7 +473,7 @@ struct menudialogdef g_2PMissionEndscreenObjectivesFailedVMenuDialog = { L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -482,7 +482,7 @@ struct menudialogdef g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -512,7 +512,7 @@ struct menudialogdef g_MissionContinueOrReplyMenuDialog = { (u32)&menuTextCurrentStageName3, g_MissionContinueOrReplyMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; #endif @@ -1158,7 +1158,7 @@ struct menudialogdef g_SoloMissionEndscreenCompletedMenuDialog = { (u32)&menuTitleStageCompleted, g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenCompleted, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesCompletedMenuDialog, }; @@ -1167,7 +1167,7 @@ struct menudialogdef g_SoloMissionEndscreenFailedMenuDialog = { (u32)&menuTitleStageFailed, g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenFailed, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesFailedMenuDialog, }; @@ -1559,7 +1559,7 @@ struct menudialogdef g_2PMissionEndscreenCompletedHMenuDialog = { (u32)&menuTitleStageCompleted, g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenCompleted, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesCompletedMenuDialog, }; @@ -1568,7 +1568,7 @@ struct menudialogdef g_2PMissionEndscreenFailedHMenuDialog = { (u32)&menuTitleStageFailed, g_MissionEndscreenMenuItems, menudialogSolo2PEndscreenFailed, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesFailedMenuDialog, }; @@ -1577,7 +1577,7 @@ struct menudialogdef g_2PMissionEndscreenCompletedVMenuDialog = { L_OPTIONS_276, // "Completed" g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenCompleted, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionEndscreenObjectivesCompletedVMenuDialog, }; @@ -1586,7 +1586,7 @@ struct menudialogdef g_2PMissionEndscreenFailedVMenuDialog = { L_OPTIONS_277, // "Failed" g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenFailed, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionEndscreenObjectivesFailedVMenuDialog, }; diff --git a/src/game/filemgr.c b/src/game/filemgr.c index 4c32cdb5b..02b36f743 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -93,7 +93,7 @@ struct menudialogdef g_ChooseLanguageMenuDialog = { L_OPTIONS_095, g_ChooseLanguageMenuItems, NULL, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, NULL, }; #endif @@ -337,7 +337,7 @@ struct menudialogdef g_FilemgrErrorMenuDialog = { L_OPTIONS_320, // "Error" g_FilemgrErrorMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1162,7 +1162,7 @@ struct menudialogdef g_FilemgrFileSavedMenuDialog = { L_OPTIONS_345, // "Cool!" g_FilemgrFileSavedMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1180,7 +1180,7 @@ struct menudialogdef g_FilemgrSaveErrorMenuDialog = { (u32)&filemgrMenuTextErrorTitle, g_FilemgrSaveErrorMenuItems, NULL, - 0x000000a0, + MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1201,7 +1201,7 @@ struct menudialogdef g_FilemgrFileLostMenuDialog = { (u32)&filemgrMenuTextErrorTitle, g_FilemgrFileLostMenuItems, NULL, - 0x000000a0, + MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1217,7 +1217,7 @@ struct menudialogdef g_FilemgrSaveElsewhereMenuDialog = { L_OPTIONS_359, // "Save" g_FilemgrSaveElsewhereMenuItems, NULL, - 0x000000a0, + MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1237,7 +1237,7 @@ struct menudialogdef g_PakNotOriginalMenuDialog = { (u32)&filemgrMenuTextErrorTitle, g_PakNotOriginalMenuItems, filemgrInsertOriginalPakMenuDialog, - 0x000000a0, + MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1591,7 +1591,7 @@ struct menudialogdef g_FilemgrRenameMenuDialog = { L_MPWEAPONS_238, // "Change File Name" g_FilemgrRenameMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; #endif @@ -1613,7 +1613,7 @@ struct menudialogdef g_FilemgrDuplicateNameMenuDialog = { L_MPWEAPONS_232, // "Duplicate File Name" g_FilemgrDuplicateMenuMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; #endif @@ -2986,7 +2986,7 @@ struct menudialogdef g_FilemgrSelectLocationMenuDialog = { L_OPTIONS_367, // "Select Location" g_FilemgrSelectLocationMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -3004,7 +3004,7 @@ struct menudialogdef g_FilemgrConfirmDeleteMenuDialog = { L_OPTIONS_379, // "Warning" g_FilemgrConfirmDeleteMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -3025,7 +3025,7 @@ struct menudialogdef g_FilemgrFileInUseMenuDialog = { L_MPWEAPONS_159, // "Error" g_FilemgrFileInUseMenuItems, NULL, - 0x00000080, + MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -3041,7 +3041,7 @@ struct menudialogdef g_FilemgrDeleteMenuDialog = { L_OPTIONS_376, // "Delete File" g_FilemgrDeleteMenuItems, filemgrCopyOrDeleteListMenuDialog, - 0x00000000, + 0, NULL, }; @@ -3057,7 +3057,7 @@ struct menudialogdef g_FilemgrCopyMenuDialog = { L_OPTIONS_373, // "Copy File" g_FilemgrCopyMenuItems, filemgrCopyOrDeleteListMenuDialog, - 0x00000000, + 0, NULL, }; @@ -3075,7 +3075,7 @@ struct menudialogdef g_PakDeleteNoteMenuDialog = { L_OPTIONS_383, // "Delete Game Note" g_PakDeleteNoteMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -3095,7 +3095,7 @@ struct menudialogdef g_PakGameNotesMenuDialog = { L_OPTIONS_387, // "Game Notes" g_PakGameNotesMenuItems, pakGameNotesMenuDialog, - 0x00000000, + 0, NULL, }; @@ -3117,7 +3117,7 @@ struct menudialogdef g_PakChoosePakMenuDialog = { L_OPTIONS_107, // "Controller Pak Menu" g_PakChoosePakMenuItems, pakChoosePakMenuDialog, - 0x00000000, + 0, NULL, }; @@ -3141,7 +3141,7 @@ struct menudialogdef g_FilemgrOperationsMenuDialog = { L_OPTIONS_099, // "Game Files" g_FilemgrOperationsMenuItems, NULL, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, NULL, }; @@ -3155,7 +3155,7 @@ struct menudialogdef g_FilemgrEnterNameMenuDialog = { L_OPTIONS_401, // "Enter Agent Name" g_FilemgrEnterNameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -3170,6 +3170,6 @@ struct menudialogdef g_FilemgrFileSelectMenuDialog = { L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelectMenuItems, filemgrMainMenuDialog, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, &g_FilemgrOperationsMenuDialog, }; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 67f48421b..3d2bfced4 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -2357,7 +2357,7 @@ void dialog0f0f1ef4(struct menudialog *dialog) s32 i; s32 j; - if ((dialog->definition->flags & MENUDIALOGFLAG_0040) == 0 + if ((dialog->definition->flags & MENUDIALOGFLAG_SMOOTHSCROLLABLE) == 0 && g_MenuData.root != MENUROOT_TRAINING && bodyheight < dialog->contentheight) { for (i = 0; i < dialog->numcols; i++) { @@ -13225,7 +13225,7 @@ Gfx *menuRenderDialogs(Gfx *gdl) // Render banner messages if (g_Menus[g_MpPlayerNum].bannernum != -1 - && (g_Menus[g_MpPlayerNum].curdialog->definition->flags & MENUDIALOGFLAG_0080) == 0) { + && (g_Menus[g_MpPlayerNum].curdialog->definition->flags & MENUDIALOGFLAG_DISABLEBANNER) == 0) { if (g_MenuData.count >= 2) { s32 xmin; s32 ymin; @@ -13558,7 +13558,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl if (dialog == g_Menus[g_MpPlayerNum].curdialog) { transitiontotype = definition->type; - if (mpIsPlayerLockedOut(g_MpPlayerNum) && (dialog->definition->flags & MENUDIALOGFLAG_0010)) { + if (mpIsPlayerLockedOut(g_MpPlayerNum) && (dialog->definition->flags & MENUDIALOGFLAG_MPLOCKABLE)) { transitiontotype = MENUDIALOGTYPE_DANGER; } @@ -13752,7 +13752,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } } - if ((dialog->definition->flags & MENUDIALOGFLAG_0200) == 0) { + if ((dialog->definition->flags & MENUDIALOGFLAG_DISABLERESIZE) == 0) { dialogCalculateContentSize(dialog->definition, dialog, menu); } @@ -13955,16 +13955,16 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } if (inputs->back) { - if ((dialog->definition->flags & MENUDIALOGFLAG_0800) && g_Vars.unk000498) { + if ((dialog->definition->flags & MENUDIALOGFLAG_DROPOUTONCLOSE) && g_Vars.unk000498) { if (IS4MB()) { menuPushDialog(&g_MpDropOut4MbMenuDialog); } else { menuPushDialog(&g_MpDropOutMenuDialog); } - } else if ((dialog->definition->flags & MENUDIALOGFLAG_0020) == 0) { + } else if ((dialog->definition->flags & MENUDIALOGFLAG_IGNOREBACK) == 0) { menuPopDialog(); } - } else if (dialog->definition->flags & MENUDIALOGFLAG_0001) { + } else if (dialog->definition->flags & MENUDIALOGFLAG_CLOSEONSELECT) { if (dialog->state > MENUDIALOGSTATE_PREOPEN) { if ((inputs->select & 1) == 1 || (inputs->back & 1) == 1) { menuPopDialog(); @@ -13974,7 +13974,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } // Scrolling related (when the dialog is too big vertically) - if (dialog->focuseditem && (dialog->definition->flags & MENUDIALOGFLAG_0008) == 0) { + if (dialog->focuseditem && (dialog->definition->flags & MENUDIALOGFLAG_DISABLEITEMSCROLL) == 0) { #if VERSION >= VERSION_NTSC_1_0 s32 dstscroll; s32 itemy; @@ -14005,7 +14005,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } else { dialog->dstscroll = 0; } - } else if (dialog->definition->flags & MENUDIALOGFLAG_0040) { + } else if (dialog->definition->flags & MENUDIALOGFLAG_SMOOTHSCROLLABLE) { #if VERSION >= VERSION_PAL_FINAL s32 adjustment = (s32)(inputs->yaxis * g_Vars.diffframe60freal / 20) - (s32)(inputs->updownheld * g_Vars.diffframe60freal); #else @@ -17666,7 +17666,7 @@ glabel var7f1b2ac8 // if (g_Menus[g_MpPlayerNum].curdialog && starttap) { // struct menuitem *item; // -// if (g_Menus[g_MpPlayerNum].curdialog->definition->flags & MENUDIALOGFLAG_0004) { +// if (g_Menus[g_MpPlayerNum].curdialog->definition->flags & MENUDIALOGFLAG_STARTSELECTS) { // inputs.select = true; // starttoselect = true; // } @@ -17727,7 +17727,7 @@ glabel var7f1b2ac8 // case MENUROOT_MPENDSCREEN: // case MENUROOT_TRAINING: // if (inputs.start && !starttoselect && g_Menus[g_MpPlayerNum].curdialog -// && (dialog->definition->flags & MENUDIALOGFLAG_0020) == 0) { +// && (dialog->definition->flags & MENUDIALOGFLAG_IGNOREBACK) == 0) { // func0f0f8120(); // } // break; @@ -18392,7 +18392,7 @@ struct menudialogdef g_PakRemovedMenuDialog = { L_MPWEAPONS_173, // "Error" g_PakRemovedMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -18412,7 +18412,7 @@ struct menudialogdef g_PakRepairSuccessMenuDialog = { L_MPWEAPONS_180, // "Repair Successful" g_PakRepairSuccessMenuItems, menudialog000fcd48, - 0x00000000, + 0, NULL, }; @@ -18428,7 +18428,7 @@ struct menudialogdef g_PakRepairFailedMenuDialog = { L_MPWEAPONS_182, // "Repair Failed" g_PakRepairFailedMenuItems, menudialog000fcd48, - 0x00000000, + 0, NULL, }; @@ -18446,7 +18446,7 @@ struct menudialogdef g_PakAttemptRepairMenuDialog = { L_MPWEAPONS_175, // "Attempt Repair" g_PakAttemptRepairMenuItems, menudialog000fcd48, - 0x00000000, + 0, NULL, }; @@ -18660,7 +18660,7 @@ struct menudialogdef g_PakDamagedMenuDialog = { #if VERSION >= VERSION_NTSC_1_0 0x00000020, #else - 0x00000000, + 0, #endif NULL, }; @@ -18683,7 +18683,7 @@ struct menudialogdef g_PakFullMenuDialog = { #if VERSION >= VERSION_NTSC_1_0 0x00000020, #else - 0x00000000, + 0, #endif NULL, }; @@ -18701,7 +18701,7 @@ struct menudialogdef g_PakCannotReadGameBoyMenuDialog = { L_MPWEAPONS_253, // "Error" g_PakCannotReadGameBoyMenuItems, NULL, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, NULL, }; @@ -18720,7 +18720,7 @@ struct menudialogdef g_PakDataLostMenuDialog = { L_MPWEAPONS_256, // "Error" g_PakDataLostMenuItems, NULL, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, NULL, }; #endif diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index a14698b04..e53c65d90 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -202,7 +202,7 @@ struct menudialogdef g_GameFiles4MbMenuDialog = { L_OPTIONS_099, // "Game Files" g_GameFiles4MbMenuItems, NULL, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, NULL, }; @@ -217,7 +217,7 @@ struct menudialogdef g_FilemgrFileSelect4MbMenuDialog = { L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelect4MbMenuItems, filemgrMainMenuDialog, - 0x00000020, + MENUDIALOGFLAG_IGNOREBACK, &g_GameFiles4MbMenuDialog, }; @@ -245,7 +245,7 @@ struct menudialogdef g_AudioVideo4MbMenuDialog = { L_OPTIONS_307, // "Audio/Visual" g_AudioVideo4MbMenuItems, menudialog0010559c, - 0x00000000, + 0, NULL, }; @@ -265,7 +265,7 @@ struct menudialogdef g_MpPlayerSetup4MbMenuDialog = { L_MPMENU_028, // "Player Setup" g_MpPlayerSetup4MbMenuItems, NULL, - 0x00000800, + MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpChallengeListOrDetailsMenuDialog, }; @@ -286,7 +286,7 @@ struct menudialogdef g_MpQuickGo4MbMenuDialog = { L_MISC_460, // "Quick Go" g_MpQuickGo4MbMenuItems, menudialogMpQuickGo, - 0x00000000, + 0, NULL, }; @@ -303,7 +303,7 @@ struct menudialogdef g_MpConfirmChallenge4MbMenuDialog = { (u32)&func0f17e318, g_MpConfirmChallenge4MbMenuItems, menudialog0017e3fc, - 0x00000000, + 0, NULL, }; @@ -317,7 +317,7 @@ struct menudialogdef g_MpChallenges4MbMenuDialog = { L_MPMENU_050, // "Combat Challenges" g_MpChallenges4MbMenuItems, mpCombatChallengesMenuDialog, - 0x00000000, + 0, NULL, }; @@ -337,7 +337,7 @@ struct menudialogdef g_MainMenu4MbMenuDialog = { L_OPTIONS_302, // "Small but Perfect Menu" g_MainMenu4MbMenuItems, menudialog4MbMainMenu, - 0x00000030, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_IGNOREBACK, NULL, }; @@ -353,7 +353,7 @@ struct menudialogdef g_MpDropOut4MbMenuDialog = { L_MPMENU_195, // "Drop Out" g_MpDropOut4MbMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -369,7 +369,7 @@ struct menudialogdef g_UnusedAbortMenuDialog = { L_MPMENU_052, // "Abort" g_UnusedAbortMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -387,7 +387,7 @@ struct menudialogdef g_MpEditSimulant4MbMenuDialog = { (u32)&mpMenuTitleEditSimulant, g_MpEditSimulant4MbMenuItems, menudialogMpSimulant, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -414,6 +414,6 @@ struct menudialogdef g_AdvancedSetup4MbMenuDialog = { L_MPMENU_017, // "Game Setup" g_AdvancedSetup4MbMenuItems, menudialogMpGameSetup, - 0x00000810, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetup4MbMenuDialog, }; diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index e9e00d76f..8bb6137ce 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -721,7 +721,7 @@ struct menudialogdef g_PreAndPostMissionBriefingMenuDialog = { L_OPTIONS_247, // "Briefing" g_PreAndPostMissionBriefingMenuItems, menudialogBriefing, - 0x00000008, + MENUDIALOGFLAG_DISABLEITEMSCROLL, NULL, }; @@ -824,7 +824,7 @@ struct menudialogdef g_AcceptMissionMenuDialog = { (u32)&soloMenuTitleStageOverview, g_AcceptMissionMenuItems, menudialog00103608, - 0x0000000c, + MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, &g_PreAndPostMissionBriefingMenuDialog, }; @@ -902,7 +902,7 @@ struct menudialogdef g_PdModeSettingsMenuDialog = { L_MPWEAPONS_221, // "Perfect Dark" g_PdModeSettingsMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -1581,7 +1581,7 @@ struct menudialogdef g_SoloMissionDifficultyMenuDialog = { L_OPTIONS_248, // "Select Difficulty" g_SoloMissionDifficultyMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -1965,7 +1965,7 @@ struct menudialogdef g_CoopOptionsMenuDialog = { L_OPTIONS_255, // "Co-Operative Options" g_CoopOptionsMenuItems, menudialogCoopAntiOptions, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -2018,7 +2018,7 @@ struct menudialogdef g_AntiOptionsMenuDialog = { L_OPTIONS_266, // "Counter-Operative Options" g_AntiOptionsMenuItems, menudialogCoopAntiOptions, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -2057,7 +2057,7 @@ struct menudialogdef g_CoopMissionDifficultyMenuDialog = { L_OPTIONS_248, // "Select Difficulty" g_CoopMissionDifficultyMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -2089,7 +2089,7 @@ struct menudialogdef g_AntiMissionDifficultyMenuDialog = { L_OPTIONS_248, // "Select Difficulty" g_AntiMissionDifficultyMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -4178,7 +4178,7 @@ struct menudialogdef g_SoloMissionBriefingMenuDialog = { L_OPTIONS_247, // "Briefing" g_MissionBriefingMenuItems, NULL, - 0x00000008, + MENUDIALOGFLAG_DISABLEITEMSCROLL, NULL, }; @@ -4187,7 +4187,7 @@ struct menudialogdef g_2PMissionBriefingHMenuDialog = { L_OPTIONS_247, // "Briefing" g_MissionBriefingMenuItems, NULL, - 0x00000008, + MENUDIALOGFLAG_DISABLEITEMSCROLL, NULL, }; @@ -4196,7 +4196,7 @@ struct menudialogdef g_2PMissionBriefingVMenuDialog = { L_OPTIONS_247, // "Briefing" g_2PMissionBreifingVMenuItems, NULL, - 0x00000008, + MENUDIALOGFLAG_DISABLEITEMSCROLL, NULL, }; @@ -4272,7 +4272,7 @@ struct menudialogdef g_2PMissionControlStyleMenuDialog = { L_OPTIONS_236, // "Control" g_2PMissionControlStyleMenuItems, NULL, - 0x00000400, + MENUDIALOGFLAG_0400, NULL, }; @@ -4287,7 +4287,7 @@ struct menudialogdef g_SoloMissionControlStyleMenuDialog = { L_OPTIONS_236, // "Control" g_SoloMissionControlStyleMenuItems, NULL, - 0x00000400, + MENUDIALOGFLAG_0400, NULL, }; @@ -4302,7 +4302,7 @@ struct menudialogdef g_CiControlStyleMenuDialog = { L_OPTIONS_236, // "Control" g_CiControlStyleMenuItems, NULL, - 0x00000400, + MENUDIALOGFLAG_0400, NULL, }; @@ -4317,7 +4317,7 @@ struct menudialogdef g_CiControlStylePlayer2MenuDialog = { L_OPTIONS_236, // "Control" g_CiControlStylePlayer2MenuItems, NULL, - 0x00000400, + MENUDIALOGFLAG_0400, NULL, }; @@ -4341,7 +4341,7 @@ struct menudialogdef g_AudioOptionsMenuDialog = { L_OPTIONS_227, // "Audio Options" g_AudioOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4365,7 +4365,7 @@ struct menudialogdef g_2PMissionAudioOptionsVMenuDialog = { L_OPTIONS_227, // "Audio Options" g_2PMissionAudioOptionsVMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4400,7 +4400,7 @@ struct menudialogdef g_VideoOptionsMenuDialog = { L_OPTIONS_214, // "Video Options" g_VideoOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4409,7 +4409,7 @@ struct menudialogdef g_2PMissionVideoOptionsMenuDialog = { L_OPTIONS_214, // "Video Options" g_2PMissionVideoOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4433,7 +4433,7 @@ struct menudialogdef g_MissionDisplayOptionsMenuDialog = { L_OPTIONS_203, // "Display Options" g_MissionDisplayOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4462,7 +4462,7 @@ struct menudialogdef g_2PMissionDisplayOptionsVMenuDialog = { L_OPTIONS_203, // "Display Options" g_2PMissionDisplayOptionsVMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4488,7 +4488,7 @@ struct menudialogdef g_CiDisplayMenuDialog = { L_OPTIONS_203, // "Display Options" g_CiDisplayMenuItems, NULL, - 0x00000000, + 0, &g_CiDisplayPlayer2MenuDialog, }; @@ -4512,7 +4512,7 @@ struct menudialogdef g_CiDisplayPlayer2MenuDialog = { L_OPTIONS_204, // "Display Player 2" g_CiDisplayPlayer2MenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4533,7 +4533,7 @@ struct menudialogdef g_MissionControlOptionsMenuDialog = { L_OPTIONS_192, // "Control Options" g_MissionControlOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4555,7 +4555,7 @@ struct menudialogdef g_CiControlOptionsMenuDialog2 = { L_OPTIONS_192, // "Control Options" g_CiControlOptionsMenuItems2, NULL, - 0x00000000, + 0, NULL, }; #endif @@ -4577,7 +4577,7 @@ struct menudialogdef g_CiControlOptionsMenuDialog = { L_OPTIONS_192, // "Control Options" g_CiControlOptionsMenuItems, NULL, - 0x00000000, + 0, &g_CiControlPlayer2MenuDialog, }; @@ -4598,7 +4598,7 @@ struct menudialogdef g_CiControlPlayer2MenuDialog = { L_OPTIONS_193, // "Control Player 2" g_CiControlPlayer2MenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4614,7 +4614,7 @@ struct menudialogdef g_ChangeAgentMenuDialog = { L_OPTIONS_188, // "Warning" g_ChangeAgentMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4665,7 +4665,7 @@ struct menudialogdef g_SoloMissionOptionsMenuDialog = { L_OPTIONS_180, // "Options" g_SoloMissionOptionsMenuItems, menudialog0010559c, - 0x00000000, + 0, &g_SoloMissionBriefingMenuDialog, }; @@ -4674,7 +4674,7 @@ struct menudialogdef g_CiOptionsViaPcMenuDialog = { L_OPTIONS_180, // "Options" g_CiOptionsMenuItems, menudialog0010559c, - 0x00000000, + 0, NULL, }; @@ -4683,7 +4683,7 @@ struct menudialogdef g_CiOptionsViaPauseMenuDialog = { L_OPTIONS_180, // "Options" g_CiOptionsMenuItems, menudialog0010559c, - 0x00000000, + 0, NULL, }; @@ -4692,7 +4692,7 @@ struct menudialogdef g_2PMissionOptionsHMenuDialog = { L_OPTIONS_180, // "Options" g_2PMissionOptionsHMenuItems, menudialog0010559c, - 0x00000000, + 0, &g_2PMissionBriefingHMenuDialog, }; @@ -4701,7 +4701,7 @@ struct menudialogdef g_2PMissionOptionsVMenuDialog = { L_OPTIONS_180, // "Options" g_2PMissionOptionsVMenuItems, menudialog0010559c, - 0x00000000, + 0, &g_2PMissionBriefingVMenuDialog, }; @@ -5676,7 +5676,7 @@ struct menudialogdef g_SoloMissionInventoryMenuDialog = { L_OPTIONS_178, // "Inventory" g_SoloMissionInventoryMenuItems, inventoryMenuDialog, - 0x00000602, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, &g_SoloMissionOptionsMenuDialog, }; @@ -5685,7 +5685,7 @@ struct menudialogdef g_FrWeaponsAvailableMenuDialog = { L_OPTIONS_179, // "Weapons Available" g_FrWeaponsAvailableMenuItems, inventoryMenuDialog, - 0x00000602, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; @@ -5722,7 +5722,7 @@ struct menudialogdef g_MissionAbortMenuDialog = { L_OPTIONS_174, // "Warning" g_MissionAbortMenuItems, menudialogAbortMission, - 0x00000000, + 0, NULL, }; @@ -5738,7 +5738,7 @@ struct menudialogdef g_2PMissionAbortVMenuDialog = { L_OPTIONS_174, // "Warning" g_2PMissionAbortVMenuItems, menudialogAbortMission, - 0x00000000, + 0, NULL, }; @@ -5814,7 +5814,7 @@ struct menudialogdef g_SoloMissionPauseMenuDialog = { (u32)&soloMenuTitlePauseStatus, g_MissionPauseMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloMissionInventoryMenuDialog, }; @@ -5823,7 +5823,7 @@ struct menudialogdef g_2PMissionPauseHMenuDialog = { (u32)&soloMenuTitlePauseStatus, g_MissionPauseMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionInventoryHMenuDialog, }; @@ -5832,7 +5832,7 @@ struct menudialogdef g_2PMissionPauseVMenuDialog = { L_OPTIONS_172, // "Status" g_2PMissionPauseVMenuItems, soloMenuDialogPauseStatus, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionInventoryVMenuDialog, }; @@ -6031,7 +6031,7 @@ struct menudialogdef g_CinemaMenuDialog = { L_OPTIONS_490, // "Cinema" g_CinemaMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -6045,7 +6045,7 @@ struct menudialogdef g_SelectMissionMenuDialog = { L_OPTIONS_122, // "Mission Select" g_SelectMissionMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -6165,7 +6165,7 @@ struct menudialogdef g_CiMenuViaPcMenuDialog = { L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, menudialogMainMenu, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, &g_CiOptionsViaPcMenuDialog, }; @@ -6174,7 +6174,7 @@ struct menudialogdef g_CiMenuViaPauseMenuDialog = { L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, menudialogMainMenu, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, &g_CiOptionsViaPauseMenuDialog, }; diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 91c085dd1..042ba95b8 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -3596,7 +3596,7 @@ bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, stru menuitemListTick(item, inputs, tickflags, data); if (mpIsPlayerLockedOut(g_MpPlayerNum)) { - if ((item->flags & MENUITEMFLAG_00040000) || (dialog->definition->flags & MENUDIALOGFLAG_0010)) { + if ((item->flags & MENUITEMFLAG_00040000) || (dialog->definition->flags & MENUDIALOGFLAG_MPLOCKABLE)) { dialog->dimmed = false; } } diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index b71c30d10..9d75026ac 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -254,7 +254,7 @@ struct menudialogdef g_MpEndGameMenuDialog = { L_MPMENU_290, // "End Game" g_MpEndGameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -276,7 +276,7 @@ struct menudialogdef g_MpPauseControlMenuDialog = { L_MPMENU_285, // "Control" g_MpPauseControlMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -291,7 +291,7 @@ struct menudialogdef g_MpPauseInventoryMenuDialog = { L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, - 0x00000000, + 0, &g_MpPauseControlMenuDialog, }; @@ -300,7 +300,7 @@ struct menudialogdef g_2PMissionInventoryHMenuDialog = { L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, - 0x00000000, + 0, &g_2PMissionOptionsHMenuDialog, }; @@ -309,7 +309,7 @@ struct menudialogdef g_2PMissionInventoryVMenuDialog = { L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, - 0x00000000, + 0, &g_2PMissionOptionsVMenuDialog, }; @@ -323,7 +323,7 @@ struct menudialogdef g_MpPausePlayerStatsMenuDialog = { (u32)&mpMenuTitleStatsFor, g_MpInGamePlayerStatsMenuItems, NULL, - 0x00000000, + 0, &g_MpPauseInventoryMenuDialog, }; @@ -332,7 +332,7 @@ struct menudialogdef g_MpEndscreenPlayerStatsMenuDialog = { (u32)&mpMenuTitleStatsFor, g_MpInGamePlayerStatsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -346,7 +346,7 @@ struct menudialogdef g_MpPausePlayerRankingMenuDialog = { L_MPMENU_276, // "Player Ranking" g_MpPlayerRankingMenuItems, NULL, - 0x00000000, + 0, &g_MpPausePlayerStatsMenuDialog, }; @@ -355,7 +355,7 @@ struct menudialogdef g_MpEndscreenPlayerRankingMenuDialog = { L_MPMENU_276, // "Player Ranking" g_MpPlayerRankingMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenPlayerStatsMenuDialog, }; @@ -369,7 +369,7 @@ struct menudialogdef g_MpPauseTeamRankingsMenuDialog = { L_MPMENU_279, // "Team Ranking" g_MpTeamRankingsMenuItems, NULL, - 0x00000000, + 0, &g_MpPausePlayerRankingMenuDialog, }; @@ -378,7 +378,7 @@ struct menudialogdef g_MpEndscreenTeamRankingMenuDialog = { L_MPMENU_279, // "Team Ranking" g_MpTeamRankingsMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenPlayerRankingMenuDialog, }; @@ -622,7 +622,7 @@ struct menudialogdef g_MpEndscreenIndGameOverMenuDialog = { L_MPMENU_260, // "Game Over" g_MpGameOverMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenPlayerRankingMenuDialog, }; @@ -631,7 +631,7 @@ struct menudialogdef g_MpEndscreenTeamGameOverMenuDialog = { L_MPMENU_260, // "Game Over" g_MpGameOverMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenTeamRankingMenuDialog, }; @@ -640,7 +640,7 @@ struct menudialogdef g_MpEndscreenChallengeCompletedMenuDialog = { L_MPWEAPONS_165, // "Challenge Completed!" g_MpTeamRankingsMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenIndGameOverMenuDialog, }; @@ -649,7 +649,7 @@ struct menudialogdef g_MpEndscreenChallengeCheatedMenuDialog = { L_MPWEAPONS_167, // "Challenge Cheated!" g_MpTeamRankingsMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenIndGameOverMenuDialog, }; @@ -658,7 +658,7 @@ struct menudialogdef g_MpEndscreenChallengeFailedMenuDialog = { L_MPWEAPONS_166, // "Challenge Failed!" g_MpTeamRankingsMenuItems, NULL, - 0x00000000, + 0, &g_MpEndscreenIndGameOverMenuDialog, }; @@ -674,7 +674,7 @@ struct menudialogdef g_MpEndscreenConfirmNameMenuDialog = { L_MPMENU_142, // "Player Name" g_MpEndscreenConfirmNameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -690,7 +690,7 @@ struct menudialogdef g_MpEndscreenSavePlayerMenuDialog = { L_MPWEAPONS_246, // "Save Player" g_MpEndscreenSavePlayerMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; #endif diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 4fb8aea0f..2dbfb4d82 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -915,7 +915,7 @@ struct menudialogdef g_MpScenarioMenuDialog = { L_MPMENU_243, // "Scenario" g_MpScenarioMenuItems, NULL, - 0x00000011, + MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -929,7 +929,7 @@ struct menudialogdef g_MpQuickTeamScenarioMenuDialog = { L_MPMENU_243, // "Scenario" g_MpQuickTeamScenarioMenuItems, NULL, - 0x00000011, + MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/capturethecase.inc b/src/game/mplayer/scenarios/capturethecase.inc index fc8e555f6..dbee81265 100644 --- a/src/game/mplayer/scenarios/capturethecase.inc +++ b/src/game/mplayer/scenarios/capturethecase.inc @@ -31,7 +31,7 @@ struct menudialogdef g_CtcOptionsMenuDialog = { L_MPMENU_220, // "Capture Options" g_CtcOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc index ae2552cee..5cab6d32a 100644 --- a/src/game/mplayer/scenarios/combat.inc +++ b/src/game/mplayer/scenarios/combat.inc @@ -26,6 +26,6 @@ struct menudialogdef g_MpCombatOptionsMenuDialog = { L_MPMENU_215, // "Combat Options" g_MpCombatOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc index dded45887..5bed4dc95 100644 --- a/src/game/mplayer/scenarios/hackthatmac.inc +++ b/src/game/mplayer/scenarios/hackthatmac.inc @@ -30,7 +30,7 @@ struct menudialogdef g_HtmOptionsMenuDialog = { L_MPMENU_217, // "Hacker Options" g_HtmOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc index ca9fa0dee..2d805437c 100644 --- a/src/game/mplayer/scenarios/holdthebriefcase.inc +++ b/src/game/mplayer/scenarios/holdthebriefcase.inc @@ -30,7 +30,7 @@ struct menudialogdef g_HtbOptionsMenuDialog = { L_MPMENU_216, // "Briefcase Options" g_HtbOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc index eb1799837..ed91e661a 100644 --- a/src/game/mplayer/scenarios/kingofthehill.inc +++ b/src/game/mplayer/scenarios/kingofthehill.inc @@ -52,7 +52,7 @@ struct menudialogdef g_KohOptionsMenuDialog = { L_MPMENU_219, // "Hill Options" g_KohOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc index 1bcab51d1..4b9ccd4d9 100644 --- a/src/game/mplayer/scenarios/popacap.inc +++ b/src/game/mplayer/scenarios/popacap.inc @@ -28,7 +28,7 @@ struct menudialogdef g_PacOptionsMenuDialog = { L_MPMENU_218, // "Pop a Cap Options" g_PacOptionsMenuItems, mpOptionsMenuDialog, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index c1ae7951e..8e69dfb99 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -67,7 +67,7 @@ struct menudialogdef g_MpDropOutMenuDialog = { L_MPMENU_195, // "Drop Out" g_MpDropOutMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1003,7 +1003,7 @@ struct menudialogdef g_MpSavePlayerMenuDialog = { L_MPMENU_190, // "Confirm" g_MpSavePlayerMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1018,7 +1018,7 @@ struct menudialogdef g_MpSaveSetupNameMenuDialog = { L_MPMENU_188, // "Game File Name" g_MpSaveSetupNameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1039,7 +1039,7 @@ struct menudialogdef g_MpSaveSetupExistsMenuDialog = { L_MPMENU_183, // "Save Game Setup" g_MpSaveSetupExistsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1063,7 +1063,7 @@ struct menudialogdef g_MpWeaponsMenuDialog = { L_MPMENU_173, // "Weapons" g_MpWeaponsMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -1085,7 +1085,7 @@ struct menudialogdef g_MpQuickTeamWeaponsMenuDialog = { L_MPMENU_173, // "Weapons" g_MpQuickTeamWeaponsMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -1104,7 +1104,7 @@ struct menudialogdef g_MpPlayerOptionsMenuDialog = { L_MPMENU_167, // "Options" g_MpPlayerOptionsMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1132,7 +1132,7 @@ struct menudialogdef g_MpControlMenuDialog = { L_MPMENU_199, // "Control" g_MpControlMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1146,7 +1146,7 @@ struct menudialogdef g_MpCompletedChallengesMenuDialog = { L_MPMENU_165, // "Completed Challenges" g_MpCompletedChallengesMenuItems, NULL, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -1250,7 +1250,7 @@ struct menudialogdef g_MpPlayerStatsMenuDialog = { (u32)&mpMenuTitleStatsForPlayerName, g_MpPlayerStatsMenuItems, NULL, - 0x00000048, + MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_MpCompletedChallengesMenuDialog, }; @@ -1733,7 +1733,7 @@ struct menudialogdef g_MpCharacterMenuDialog = { L_MPMENU_143, // "Character" g_MpCharacterMenuItems, menudialog0017a174, - 0x00000002, + MENUDIALOGFLAG_0002, NULL, }; @@ -1747,7 +1747,7 @@ struct menudialogdef g_MpPlayerNameMenuDialog = { L_MPMENU_142, // "Player Name" g_MpPlayerNameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1762,7 +1762,7 @@ struct menudialogdef g_MpLoadSettingsMenuDialog = { L_MPMENU_139, // "Load Game Settings" g_MpLoadSettingsMenuItems, NULL, - 0x00000001, + MENUDIALOGFLAG_CLOSEONSELECT, NULL, }; @@ -1777,7 +1777,7 @@ struct menudialogdef g_MpLoadPresetMenuDialog = { L_MPMENU_139, // "Load Game Settings" g_MpLoadPresetMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1792,7 +1792,7 @@ struct menudialogdef g_MpLoadPlayerMenuDialog = { L_MPMENU_137, // "Load Player" g_MpLoadPlayerMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1806,7 +1806,7 @@ struct menudialogdef g_MpArenaMenuDialog = { L_MPMENU_115, // "Arena" g_MpArenaMenuItems, NULL, - 0x00000011, + MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -1825,7 +1825,7 @@ struct menudialogdef g_MpLimitsMenuDialog = { L_MPMENU_107, // "Limits" g_MpLimitsMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -1845,7 +1845,7 @@ struct menudialogdef g_MpHandicapsMenuDialog = { L_MPWEAPONS_184, // "Player Handicaps" g_MpHandicapsMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -1859,7 +1859,7 @@ struct menudialogdef g_MpReadyMenuDialog = { L_MPMENU_105, // "Ready!" g_MpReadyMenuItems, menudialogMpReady, - 0x00000001, + MENUDIALOGFLAG_CLOSEONSELECT, NULL, }; @@ -2210,7 +2210,7 @@ struct menudialogdef g_MpAddSimulantMenuDialog = { L_MPMENU_101, // "Add Simulant" g_MpAddChangeSimulantMenuItems, NULL, - 0x00000011, + MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2219,7 +2219,7 @@ struct menudialogdef g_MpChangeSimulantMenuDialog = { L_MPMENU_102, // "Change Simulant" g_MpAddChangeSimulantMenuItems, menudialogMpSimulant, - 0x00000011, + MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2234,7 +2234,7 @@ struct menudialogdef g_MpSimulantCharacterMenuDialog = { L_MPMENU_100, // "Simulant Character" g_MpSimulantCharacterMenuItems, menudialog0017ccfc, - 0x00000012, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2253,7 +2253,7 @@ struct menudialogdef g_MpEditSimulantMenuDialog = { (u32)&mpMenuTitleEditSimulant, g_MpEditSimulantMenuItems, menudialogMpSimulant, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2279,7 +2279,7 @@ struct menudialogdef g_MpSimulantsMenuDialog = { L_MPMENU_083, // "Simulants" g_MpSimulantsMenuItems, menudialogMpSimulants, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2727,7 +2727,7 @@ struct menudialogdef g_MpAutoTeamMenuDialog = { L_MPMENU_075, // "Auto Team" g_MpAutoTeamMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -2758,7 +2758,7 @@ struct menudialogdef g_MpTeamsMenuDialog = { L_MPMENU_070, // "Team Control" g_MpTeamsMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3034,7 +3034,7 @@ struct menudialogdef g_MpSelectTunesMenuDialog = { (u32)&mpMenuTextSelectTuneOrTunes, g_MpSelectTunesMenuItems, menudialogMpSelectTune, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3054,7 +3054,7 @@ struct menudialogdef g_MpSoundtrackMenuDialog = { L_MPMENU_062, // "Soundtrack" g_MpSoundtrackMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3068,7 +3068,7 @@ struct menudialogdef g_MpChangeTeamNameMenuDialog = { L_MPMENU_061, // "Change Team Name" g_MpChangeTeamNameMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -3091,7 +3091,7 @@ struct menudialogdef g_MpTeamNamesMenuDialog = { L_MPMENU_059, // "Team Names" g_MpTeamNamesMenuItems, NULL, - 0x00000010, + MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3108,7 +3108,7 @@ struct menudialogdef g_MpConfirmChallengeViaListOrDetailsMenuDialog = { (u32)&func0f17e318, g_MpConfirmChallengeViaListOrDetailsMenuItems, menudialog0017e3fc, - 0x00000014, + MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3136,7 +3136,7 @@ struct menudialogdef g_MpChallengeListOrDetailsMenuDialog = { #if VERSION >= VERSION_NTSC_1_0 0x00000808, #else - 0x00000800, + MENUDIALOGFLAG_DROPOUTONCLOSE, #endif NULL, }; @@ -3156,7 +3156,7 @@ struct menudialogdef g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = { 0x00000808, &g_MpAdvancedSetupViaAdvChallengeMenuDialog, #else - 0x00000800, + MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpAdvancedSetupMenuDialog, #endif }; @@ -3174,7 +3174,7 @@ struct menudialogdef g_MpConfirmChallengeMenuDialog = { (u32)&func0f17e318, g_MpConfirmChallengeMenuItems, menudialog0017e3fc, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -3388,7 +3388,7 @@ struct menudialogdef g_MpChallengesMenuDialog = { L_MPMENU_050, // "Combat Challenges" g_MpChallengesMenuItems, mpCombatChallengesMenuDialog, - 0x00000000, + 0, NULL, }; @@ -3912,7 +3912,7 @@ struct menudialogdef g_MpStuffMenuDialog = { L_MPMENU_040, // "Stuff" g_MpStuffMenuItems, NULL, - 0x00000810, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpChallengeListOrDetailsMenuDialog, }; @@ -3921,7 +3921,7 @@ struct menudialogdef g_MpStuffViaAdvChallengeMenuDialog = { L_MPMENU_040, // "Stuff" g_MpStuffMenuItems, NULL, - 0x00000810, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, NULL, }; @@ -3942,7 +3942,7 @@ struct menudialogdef g_MpPlayerSetupViaAdvMenuDialog = { L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, - 0x00000800, + MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpStuffMenuDialog, }; @@ -3951,7 +3951,7 @@ struct menudialogdef g_MpPlayerSetupViaAdvChallengeMenuDialog = { L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, - 0x00000800, + MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpStuffViaAdvChallengeMenuDialog, }; @@ -3960,7 +3960,7 @@ struct menudialogdef g_MpPlayerSetupViaQuickGoMenuDialog = { L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -3976,7 +3976,7 @@ struct menudialogdef g_MpAbortMenuDialog = { L_MPMENU_052, // "Abort" g_MpAbortMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4000,7 +4000,7 @@ struct menudialogdef g_MpAdvancedSetupMenuDialog = { L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, - 0x00000810, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetupViaAdvMenuDialog, }; @@ -4009,7 +4009,7 @@ struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog = { L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, - 0x00000810, + MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetupViaAdvChallengeMenuDialog, }; @@ -4028,7 +4028,7 @@ struct menudialogdef g_MpQuickGoMenuDialog = { L_MISC_460, // "Quick Go" g_MpQuickGoMenuItems, menudialogMpQuickGo, - 0x00000000, + 0, NULL, }; @@ -4058,7 +4058,7 @@ struct menudialogdef g_MpQuickTeamGameSetupMenuDialog = { L_MPMENU_017, // "Game Setup" g_MpQuickTeamGameSetupMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -4077,7 +4077,7 @@ struct menudialogdef g_MpQuickTeamMenuDialog = { L_MISC_462, // "Quick Team" g_MpQuickTeamMenuItems, NULL, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -4094,7 +4094,7 @@ struct menudialogdef g_CombatSimulatorMenuDialog = { L_MISC_445, // "Combat Simulator" g_CombatSimulatorMenuItems, menudialogCombatSimulator, - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, }; diff --git a/src/game/training/menus.c b/src/game/training/menus.c index a81ad3d95..1eaa2e96a 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -874,7 +874,7 @@ struct menudialogdef g_FrDifficultyMenuDialog = { L_MPMENU_442, // "Difficulty" g_FrDifficultyMenuItems, NULL, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -888,7 +888,7 @@ struct menudialogdef g_FrWeaponListMenuDialog = { L_MPMENU_446, // "Weapon" g_FrWeaponListMenuItems, NULL, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -911,7 +911,7 @@ struct menudialogdef g_FrTrainingInfoInGameMenuDialog = { L_MPMENU_447, // "Training Info" g_FrTrainingInfoInGameMenuItems, frTrainingInfoMenuDialog, - 0x00000602, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; @@ -934,7 +934,7 @@ struct menudialogdef g_FrTrainingInfoPreGameMenuDialog = { L_MPMENU_447, // "Training Info" g_FrTrainingInfoPreGameMenuItems, frTrainingInfoMenuDialog, - 0x00000602, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; @@ -965,7 +965,7 @@ struct menudialogdef g_FrCompletedMenuDialog = { g_FrCompletedMenuItems, frTrainingStatsMenuDialog, #if VERSION >= VERSION_NTSC_1_0 - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, #else 0, @@ -1000,10 +1000,10 @@ struct menudialogdef g_FrFailedMenuDialog = { g_FrFailedMenuItems, frTrainingStatsMenuDialog, #if VERSION >= VERSION_NTSC_1_0 - 0x00000004, + MENUDIALOGFLAG_STARTSELECTS, NULL, #else - 0x00000000, + 0, &g_FrWeaponListMenuDialog, #endif }; @@ -1069,7 +1069,7 @@ struct menudialogdef g_BioListMenuDialog = { L_MPMENU_418, // "Information" g_BioListMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1085,7 +1085,7 @@ struct menudialogdef g_NowSafeMenuDialog = { L_MPMENU_436, // "Cheats" g_NowSafeMenuItems, NULL, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -1313,7 +1313,7 @@ struct menudialogdef g_BioProfileMenuDialog = { L_MPMENU_431, // "Character Profile" g_BioProfileMenuItems, ciCharacterProfileMenuDialog, - 0x00000002, + MENUDIALOGFLAG_0002, NULL, }; @@ -1329,7 +1329,7 @@ struct menudialogdef g_BioTextMenuDialog = { (u32)&ciMenuTextMiscBioName, g_BioTextMenuItems, NULL, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -1343,7 +1343,7 @@ struct menudialogdef g_DtListMenuDialog = { L_MPMENU_417, // "Device List" g_DtListMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1623,7 +1623,7 @@ struct menudialogdef g_DtDetailsMenuDialog = { (u32)&dtMenuTextName, g_DtDetailsMenuItems, dtTrainingDetailsMenuDialog, - 0x00000206, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -1641,7 +1641,7 @@ struct menudialogdef g_DtFailedMenuDialog = { L_MPMENU_423, // "Training Stats" g_DtFailedMenuItems, menudialogDeviceTrainingResults, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, &g_DtListMenuDialog, }; @@ -1659,7 +1659,7 @@ struct menudialogdef g_DtCompletedMenuDialog = { L_MPMENU_423, // "Training Stats" g_DtCompletedMenuItems, menudialogDeviceTrainingResults, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, &g_DtListMenuDialog, }; @@ -1673,7 +1673,7 @@ struct menudialogdef g_HtListMenuDialog = { L_MPMENU_416, // "Holotraining" g_HtListMenuItems, NULL, - 0x00000000, + 0, NULL, }; @@ -1691,7 +1691,7 @@ struct menudialogdef g_HtDetailsMenuDialog = { (u32)&htMenuTextName, g_HtDetailsMenuItems, menudialog001a6aa4, - 0x00000206, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -1709,7 +1709,7 @@ struct menudialogdef g_HtFailedMenuDialog = { L_MPMENU_423, // "Training Stats" g_HtFailedMenuItems, menudialogFiringRangeResults, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, &g_HtListMenuDialog, }; @@ -1727,7 +1727,7 @@ struct menudialogdef g_HtCompletedMenuDialog = { L_MPMENU_423, // "Training Stats" g_HtCompletedMenuItems, menudialogFiringRangeResults, - 0x00000200, + MENUDIALOGFLAG_DISABLERESIZE, &g_HtListMenuDialog, }; @@ -2343,7 +2343,7 @@ struct menudialogdef g_HangarVehicleHolographMenuDialog = { L_MISC_471, // "Holograph" g_HangarVehicleHolographMenuItems, ciHangarHolographMenuDialog, - 0x00000202, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -2352,7 +2352,7 @@ struct menudialogdef g_HangarVehicleDetailsMenuDialog = { (u32)&bioMenuTextName, g_HangarDetailsMenuItems, NULL, - 0x00000202, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, &g_HangarVehicleHolographMenuDialog, }; @@ -2361,7 +2361,7 @@ struct menudialogdef g_HangarLocationDetailsMenuDialog = { (u32)&bioMenuTextName, g_HangarDetailsMenuItems, NULL, - 0x00000202, + MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -2375,6 +2375,6 @@ struct menudialogdef g_HangarListMenuDialog = { L_MPMENU_415, // "Hangar Information" g_HangarListMenuItems, NULL, - 0x00000000, + 0, NULL, }; diff --git a/src/include/constants.h b/src/include/constants.h index 7e828e968..bb33d03ec 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1445,17 +1445,17 @@ #define MENUBG_8 8 #define MENUBG_TUNNELOPAQUE 9 // 4MB combat simulator -#define MENUDIALOGFLAG_0001 0x0001 -#define MENUDIALOGFLAG_0002 0x0002 -#define MENUDIALOGFLAG_0004 0x0004 -#define MENUDIALOGFLAG_0008 0x0008 -#define MENUDIALOGFLAG_0010 0x0010 -#define MENUDIALOGFLAG_0020 0x0020 -#define MENUDIALOGFLAG_0040 0x0040 -#define MENUDIALOGFLAG_0080 0x0080 -#define MENUDIALOGFLAG_0200 0x0200 -#define MENUDIALOGFLAG_0400 0x0400 -#define MENUDIALOGFLAG_0800 0x0800 +#define MENUDIALOGFLAG_CLOSEONSELECT 0x0001 +#define MENUDIALOGFLAG_0002 0x0002 +#define MENUDIALOGFLAG_STARTSELECTS 0x0004 +#define MENUDIALOGFLAG_DISABLEITEMSCROLL 0x0008 +#define MENUDIALOGFLAG_MPLOCKABLE 0x0010 +#define MENUDIALOGFLAG_IGNOREBACK 0x0020 +#define MENUDIALOGFLAG_SMOOTHSCROLLABLE 0x0040 +#define MENUDIALOGFLAG_DISABLEBANNER 0x0080 +#define MENUDIALOGFLAG_DISABLERESIZE 0x0200 +#define MENUDIALOGFLAG_0400 0x0400 +#define MENUDIALOGFLAG_DROPOUTONCLOSE 0x0800 #define MENUDIALOGSTATE_PREOPEN 0 #define MENUDIALOGSTATE_OPENING 1