Emulation/mupen64plus-ui-console
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-ui-console.git synced 2025-04-02 10:52:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

New implementation of the savestate loaded at startup option.

Browse source 
The savestate will be loaded on the first safe state interrupt instead of being loaded on the first frame.
This commit is contained in:
Gillou68310 2016-10-19 17:15:06 +02:00
parent 07dba790c8
commit 334db80b55
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main.c
View file

@ -126,15 +126,6 @@ void DebugCallback(void *Context, int level, const char *message)
static void FrameCallback(unsigned int FrameIndex)
{
// load savestate at first frame if needed
if (l_SaveStatePath != NULL && FrameIndex == 0)
{
if ((*CoreDoCommand)(M64CMD_STATE_LOAD, 0, (void *) l_SaveStatePath) != M64ERR_SUCCESS)
{
DebugMessage(M64MSG_WARNING, "couldn't load state, rom will run normally.");
}
}
// take a screenshot if we need to
if (l_TestShotList != NULL)
{
@ -769,12 +760,21 @@ int main(int argc, char *argv[])
}
}
/* set up Frame Callback if --testshots or --savestate is enabled */
if (l_TestShotList != NULL || l_SaveStatePath != NULL)
/* set up Frame Callback if --testshots is enabled */
if (l_TestShotList != NULL)
{
if ((*CoreDoCommand)(M64CMD_SET_FRAME_CALLBACK, 0, FrameCallback) != M64ERR_SUCCESS)
{
DebugMessage(M64MSG_WARNING, "couldn't set frame callback, --testshots and/or --savestate will not work.");
DebugMessage(M64MSG_WARNING, "couldn't set frame callback, --testshots will not work.");
}
}
/* load savestate at startup */
if (l_SaveStatePath != NULL)
{
if ((*CoreDoCommand)(M64CMD_STATE_LOAD, 0, (void *) l_SaveStatePath) != M64ERR_SUCCESS)
{
DebugMessage(M64MSG_WARNING, "couldn't load state, rom will run normally.");
}
}