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

Don't save the frame buffer into savestates if the core is NES since it saves this data itself anyway

This commit is contained in:
andres.delikat 2011-09-24 16:19:38 +00:00
parent edb40f4087
commit f06c4e0091
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BizHawk.MultiClient/MainForm.cs
View File

@ -74,7 +74,7 @@ namespace BizHawk.MultiClient
LogConsole.ShowConsole(); LogConsole.ShowConsole();
displayLogWindowToolStripMenuItem.Checked = true; displayLogWindowToolStripMenuItem.Checked = true;
} }
throttle = new Throttle(); throttle = new Throttle();
DiscSystem.FFMpeg.FFMpegPath = PathManager.MakeProgramRelativePath(Global.Config.FFMpegPath); DiscSystem.FFMpeg.FFMpegPath = PathManager.MakeProgramRelativePath(Global.Config.FFMpegPath);
@ -251,7 +251,7 @@ namespace BizHawk.MultiClient
{ {
bool gdi = Global.Config.DisplayGDI; bool gdi = Global.Config.DisplayGDI;
if(Global.Direct3D == null) if (Global.Direct3D == null)
gdi = true; gdi = true;
if (renderTarget != null) if (renderTarget != null)
@ -340,7 +340,7 @@ namespace BizHawk.MultiClient
StepRunLoop_Core(); StepRunLoop_Core();
//if(!IsNullEmulator()) //if(!IsNullEmulator())
StepRunLoop_Throttle(); StepRunLoop_Throttle();
Render(); Render();
@ -889,7 +889,7 @@ namespace BizHawk.MultiClient
void RewireInputChain() void RewireInputChain()
{ {
Global.ControllerInputCoalescer = new InputCoalescer(); Global.ControllerInputCoalescer = new InputCoalescer();
Global.ControllerInputCoalescer.Type = Global.ActiveController.Type; Global.ControllerInputCoalescer.Type = Global.ActiveController.Type;
Global.OrControllerAdapter.Source = Global.ActiveController; Global.OrControllerAdapter.Source = Global.ActiveController;
@ -897,7 +897,7 @@ namespace BizHawk.MultiClient
Global.UD_LR_ControllerAdapter.Source = Global.OrControllerAdapter; Global.UD_LR_ControllerAdapter.Source = Global.OrControllerAdapter;
Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter; Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter;
Global.MultitrackRewiringControllerAdapter.Source = Global.StickyXORAdapter; Global.MultitrackRewiringControllerAdapter.Source = Global.StickyXORAdapter;
Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringControllerAdapter; Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringControllerAdapter;
Global.ControllerOutput.Source = Global.MovieOutputHardpoint; Global.ControllerOutput.Source = Global.MovieOutputHardpoint;
@ -991,7 +991,7 @@ namespace BizHawk.MultiClient
rom = new RomGame(new HawkFile(Global.Config.PathPCEBios)); rom = new RomGame(new HawkFile(Global.Config.PathPCEBios));
if (rom.GameInfo.Status == RomStatus.BadDump) if (rom.GameInfo.Status == RomStatus.BadDump)
MessageBox.Show("The PCE-CD System Card you have selected is known to be a bad dump. This may cause problems playing PCE-CD games.\n\n"+ MessageBox.Show("The PCE-CD System Card you have selected is known to be a bad dump. This may cause problems playing PCE-CD games.\n\n" +
"It is recommended that you find a good dump of the system card. Sorry to be the bearer of bad news!"); "It is recommended that you find a good dump of the system card. Sorry to be the bearer of bad news!");
else if (rom.GameInfo.NotInDatabase) else if (rom.GameInfo.NotInDatabase)
@ -1768,11 +1768,14 @@ namespace BizHawk.MultiClient
{ {
Global.Emulator.SaveStateText(writer); Global.Emulator.SaveStateText(writer);
HandleMovieSaveState(writer); HandleMovieSaveState(writer);
if (Global.Config.SaveScreenshotWithStates) if (Global.Config.SaveScreenshotWithStates)
{ {
writer.Write("Framebuffer "); if (!(Global.Emulator is NES)) //NES saves the video buffer on its own so it does not need to do this
Global.Emulator.VideoProvider.GetVideoBuffer().SaveAsHex(writer); {
} writer.Write("Framebuffer ");
Global.Emulator.VideoProvider.GetVideoBuffer().SaveAsHex(writer);
}
}
writer.Close(); writer.Close();
Global.RenderPanel.AddMessage("Saved state: " + name); Global.RenderPanel.AddMessage("Saved state: " + name);
@ -1806,17 +1809,17 @@ namespace BizHawk.MultiClient
while (true) while (true)
{ {
string str = reader.ReadLine(); string str = reader.ReadLine();
if (str == null) break; if (str == null) break;
if (str.Trim() == "") continue; if (str.Trim() == "") continue;
string[] args = str.Split(' '); string[] args = str.Split(' ');
if (args[0] == "Framebuffer") if (args[0] == "Framebuffer")
Global.Emulator.VideoProvider.GetVideoBuffer().ReadFromHex(args[1]); Global.Emulator.VideoProvider.GetVideoBuffer().ReadFromHex(args[1]);
} }
reader.Close(); reader.Close();
UpdateTools(); UpdateTools();
Global.RenderPanel.AddMessage("Loaded state: " + name); Global.RenderPanel.AddMessage("Loaded state: " + name);
} }
else else
@ -2140,7 +2143,7 @@ namespace BizHawk.MultiClient
{ {
CloseGame(); CloseGame();
Global.Emulator = new NullEmulator(); Global.Emulator = new NullEmulator();
Global.Game = GameInfo.GetNullGame(); Global.Game = GameInfo.GetNullGame();
MemoryPulse.Clear(); MemoryPulse.Clear();
RamSearch1.Restart(); RamSearch1.Restart();
RamWatch1.Restart(); RamWatch1.Restart();
@ -2179,7 +2182,7 @@ namespace BizHawk.MultiClient
private void PreviousSlot() private void PreviousSlot()
{ {
if (Global.Config.SaveSlot == 0) if (Global.Config.SaveSlot == 0)
Global.Config.SaveSlot = 9; //Wrap to end of slot list Global.Config.SaveSlot = 9; //Wrap to end of slot list
else if (Global.Config.SaveSlot > 9) else if (Global.Config.SaveSlot > 9)
Global.Config.SaveSlot = 9; //Meh, just in case Global.Config.SaveSlot = 9; //Meh, just in case