Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into port-net

This commit is contained in:
fgsfds committed 2024-01-07 22:06:47 +01:00
commit 511d6ca299
3 files changed
+20

No files matched your search

+9
View File
@@ -41,6 +41,10 @@ s32 g_TickRateDiv = 1;
s32 g_SkipIntro = false;
s32 g_FileAutoSelect = -1;
extern s32 g_StageNum;
s32 bootGetMemSize(void)
{
return (s32)g_OsMemSize;
@@ -145,6 +149,11 @@ int main(int argc, const char **argv)
sysLogPrintf(LOG_NOTE, "boot stage set to 0x%02x", g_StageNum);
}
g_FileAutoSelect = sysArgGetInt("--profile", -1);
if (g_FileAutoSelect >= 0) {
sysLogPrintf(LOG_NOTE, "player profile set to %d", g_FileAutoSelect);
}
mainProc();
return 0;
+10
View File
@@ -2592,6 +2592,16 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me
}
}
}
#ifndef PLATFORM_N64
if (g_FileAutoSelect >= 0 && g_FileLists[0] && g_FileLists[0]->numfiles > 0) {
const u32 tmp = data->list.value;
data->list.value = g_FileAutoSelect;
g_FileAutoSelect = -1;
filemgrChooseAgentListMenuHandler(MENUOP_SET, item, data);
data->list.value = tmp;
}
#endif
break;
case MENUOP_GETOPTIONCOUNT:
data->list.value = g_FileLists[0]->numfiles + 1;
+1
View File
@@ -552,6 +552,7 @@ extern bool g_BlurFbDirty;
extern s32 g_TickRateDiv;
extern s32 g_MusicDisableMpDeath;
extern s32 g_BgunGeMuzzleFlashes;
extern s32 g_FileAutoSelect;
extern s32 g_NetMode;