popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Prevent Combat Simulator 'Load Settings' clobber

Browse Source
This commit is contained in:
Matthew Coppola committed 2025-12-07 03:04:27 -05:00
1 parent 8165b5005e
commit 75d1b8ffd2
3 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/mplayer/mplayer.c
+1 -1
View File
@@ -601,7 +601,7 @@ void mpInit(bool resetplayers)
g_MpSetup.chrslots = 0; g_MpSetup.chrslots = 0;
for (i = 0; i < ARRAYCOUNT(g_Menus); i++) { for (i = 0; i < ARRAYCOUNT(g_Menus); i++) {
g_Menus[i].mpsetup.showpresets = 1; g_Menus[i].mpsetupext.showpresets = 1;
} }
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
src/game/mplayer/setup.c
+3 -3
View File
@@ -2258,7 +2258,7 @@ MenuItemHandlerResult mpPlayerNameMenuHandler(s32 operation, struct menuitem *it
MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data)
{ {
u8 presets = g_Menus[g_MpPlayerNum].mpsetup.showpresets; u8 presets = g_Menus[g_MpPlayerNum].mpsetupext.showpresets;
s32 numpresets = mpGetNumUnlockedPresets()*presets; s32 numpresets = mpGetNumUnlockedPresets()*presets;
switch (operation) { switch (operation) {
@@ -2568,8 +2568,8 @@ MenuDialogHandlerResult mpLoadSettingsDialogHandler(s32 operation, struct menudi
{ {
if (operation == MENUOP_TICK) { if (operation == MENUOP_TICK) {
if (menuAltAnyPressed(g_MpPlayerNum)) { if (menuAltAnyPressed(g_MpPlayerNum)) {
u8 presets = g_Menus[g_MpPlayerNum].mpsetup.showpresets; u8 presets = g_Menus[g_MpPlayerNum].mpsetupext.showpresets;
g_Menus[g_MpPlayerNum].mpsetup.showpresets = 1 - presets; g_Menus[g_MpPlayerNum].mpsetupext.showpresets = 1 - presets;
} }
} }
} }
src/include/types.h
+4 -2
View File
@@ -3777,8 +3777,9 @@ struct menudata_mpsetup {
u32 slotindex; u32 slotindex;
u32 slotcount; u32 slotcount;
u32 unke24; u32 unke24;
u32 unke28; };
u32 unke2c;
struct menudata_mpsetup_ext {
u8 showpresets; u8 showpresets;
}; };
@@ -3995,6 +3996,7 @@ struct menu {
struct menudata_mpsetup mpsetup; struct menudata_mpsetup mpsetup;
}; };
struct menudata_mpsetup_ext mpsetupext;
}; };
struct gamefile { struct gamefile {