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

rename struct menudata.unk00c-> prevmenudata

Browse Source
This commit is contained in:
Catherine Reprobate authored and Catherine Reprobate committed 2025-04-27 16:01:10 -07:00
1 parent 872aa3a4a4
commit 039eb8b562
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/menu.c
+2 -2
View File
@@ -3609,7 +3609,7 @@ void func0f0f820c(struct menudialogdef *dialogdef, s32 root)
g_MpPlayerNum = prevplayernum;
g_MenuData.prevmenuroot = root;
g_MenuData.unk00c = dialogdef;
g_MenuData.prevmenudialog = dialogdef;
}
void menuSetBackground(s32 bg)
@@ -4005,7 +4005,7 @@ void menuReset(void)
}
g_MenuData.unk668 = -1;
g_MenuData.unk00c = 0;
g_MenuData.prevmenudialog = 0;
g_MenuData.prevmenuroot = -1;
g_MenuData.count = 0;
g_MenuData.root = 0;
src/game/menutick.c
+5 -5
View File
@@ -498,13 +498,13 @@ void menuTick(void)
&& g_MenuData.prevmenuroot == -1) {
if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) {
g_MenuData.prevmenuroot = MENUROOT_MAINMENU;
g_MenuData.unk00c = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
g_MenuData.prevmenudialog = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
} else if (IS4MB()) {
g_MenuData.prevmenuroot = MENUROOT_4MBMAINMENU;
g_MenuData.unk00c = &g_MainMenu4MbMenuDialog;
g_MenuData.prevmenudialog = &g_MainMenu4MbMenuDialog;
} else {
g_MenuData.prevmenuroot = MENUROOT_MPSETUP;
g_MenuData.unk00c = &g_CombatSimulatorMenuDialog;
g_MenuData.prevmenudialog = &g_CombatSimulatorMenuDialog;
}
}
@@ -570,7 +570,7 @@ void menuTick(void)
musicQueueStopAllEvent();
} else {
bool startmusic = false;
menuPushRootDialog(g_MenuData.unk00c, g_MenuData.prevmenuroot);
menuPushRootDialog(g_MenuData.prevmenudialog, g_MenuData.prevmenuroot);
sp344 = true;
if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
@@ -597,7 +597,7 @@ void menuTick(void)
}
}
g_MenuData.unk00c = NULL;
g_MenuData.prevmenudialog = NULL;
g_MenuData.prevmenuroot = -1;
} else {
switch (g_MenuData.root) {
src/include/types.h
+1 -1
View File
@@ -4786,7 +4786,7 @@ struct menudata {
/*0x000*/ s32 count;
/*0x004*/ s32 root;
/*0x008*/ s32 prevmenuroot; // also a menuroot constant
/*0x00c*/ struct menudialogdef *unk00c;
/*0x00c*/ struct menudialogdef *prevmenudialog;
/*0x010*/ f32 unk010;
/*0x014*/ u8 bg;
/*0x015*/ u8 nextbg;