ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N64: Dirty hack to allow savestates to be loaded during the first or second frame of emulation.

This commit is contained in:
pjgat09 2013-05-19 23:38:34 +00:00
parent ff0d3c4beb
commit 9cc5a00076
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
View File

@ -708,6 +708,16 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public void LoadState(byte[] buffer) public void LoadState(byte[] buffer)
{ {
// This is a dirty hack...
// When using the dynamic recompiler if a state is loaded too early some pointers are not set up yet, so mupen
// tries to access null pointers and the emulator crashes. It seems like it takes 2 frames to fully set up the recompiler,
// so if two frames haven't been run yet, run them, then load the state.
if (bizhawkCore.Frame < 2)
{
frame_advance();
frame_advance();
}
m64pCoreLoadState(buffer); m64pCoreLoadState(buffer);
} }