Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-24 00:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/n64decomp/perfect_dark into port

Browse Source
This commit is contained in:
fgsfds committed 2023-08-16 10:53:02 +02:00
2 parents 7a4edd6ef7 fb5b505bab
commit fedcbb8917
6 files changed
+180 -188
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/menu.c
+8 -8
View File
@@ -493,7 +493,7 @@ char *menuResolveDialogTitle(struct menudialogdef *dialogdef)
return menuResolveText(dialogdef->title, dialogdef);
}
void func0f0f15a4(struct menuitem *item, s32 *arg1)
void menuGetItemBlocksRequired(struct menuitem *item, s32 *numwords)
{
switch (item->type) {
case MENUITEMTYPE_SLIDER:
@@ -501,31 +501,31 @@ void func0f0f15a4(struct menuitem *item, s32 *arg1)
case MENUITEMTYPE_RANKING:
case MENUITEMTYPE_14:
case MENUITEMTYPE_18:
*arg1 = 1;
*numwords = 1;
break;
#if VERSION < VERSION_PAL_BETA
case MENUITEMTYPE_SCROLLABLE:
#endif
case MENUITEMTYPE_MARQUEE:
case MENUITEMTYPE_CONTROLLER:
*arg1 = 2;
*numwords = 2;
break;
case MENUITEMTYPE_LIST:
#if VERSION >= VERSION_PAL_BETA
case MENUITEMTYPE_SCROLLABLE:
#endif
*arg1 = 3;
*numwords = 3;
break;
case MENUITEMTYPE_DROPDOWN:
*arg1 = 4;
*numwords = 4;
break;
case MENUITEMTYPE_PLAYERSTATS:
*arg1 = 5;
*numwords = 5;
break;
case MENUITEMTYPE_KEYBOARD:
case MENUITEMTYPE_10:
case MENUITEMTYPE_16:
*arg1 = 3;
*numwords = 3;
break;
}
}
@@ -890,7 +890,7 @@ void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, st
}
numblocksthisitem = -1;
func0f0f15a4(item, &numblocksthisitem);
menuGetItemBlocksRequired(item, &numblocksthisitem);
if (numblocksthisitem != -1) {
menu->rows[rowindex].blockindex = blockindex;