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

Fix TI83 screenshots. Fix screenshot naming code to use the filesystemsafe name, fix bug in screenshotas function

This commit is contained in:
andres.delikat 2011-07-10 01:55:37 +00:00
parent f89070f6ad
commit de1a3fdc50
4 changed files with 291 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Emulation/Consoles/Calculator/TI83.cs
View File

@ -347,7 +347,8 @@ namespace BizHawk.Emulation.Consoles.Calculator
this.emu = emu; this.emu = emu;
} }
public int[] GetVideoBuffer() { public int[] GetVideoBuffer()
{
//unflatten bit buffer //unflatten bit buffer
int[] pixels = new int[96 * 64]; int[] pixels = new int[96 * 64];
int i = 0; int i = 0;
@ -359,9 +360,10 @@ namespace BizHawk.Emulation.Consoles.Calculator
int bufbit = offset & 7; int bufbit = offset & 7;
int bit = ((emu.vram[bufbyte] >> (7 - bufbit)) & 1); int bit = ((emu.vram[bufbyte] >> (7 - bufbit)) & 1);
if (bit == 0) if (bit == 0)
pixels[i++] = 0xFFFFFF; unchecked { pixels[i++] = (int)0xFFFFFFFF; }
else else
pixels[i++] = 0; pixels[i++] = 0;
} }
return pixels; return pixels;
} }
@ -369,7 +371,8 @@ namespace BizHawk.Emulation.Consoles.Calculator
public int BufferHeight { get { return 64; } } public int BufferHeight { get { return 64; } }
public int BackgroundColor { get { return 0; } } public int BackgroundColor { get { return 0; } }
} }
public IVideoProvider VideoProvider { get { return new MyVideoProvider(this); } } public IVideoProvider VideoProvider {
get { return new MyVideoProvider(this); } }
public ISoundProvider SoundProvider { get { return NullSound.SilenceProvider; } } public ISoundProvider SoundProvider { get { return NullSound.SilenceProvider; } }

2
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -670,8 +670,6 @@ namespace BizHawk.MultiClient
if (result != DialogResult.OK) if (result != DialogResult.OK)
return; return;
MakeScreenshot(sfd.FileName); MakeScreenshot(sfd.FileName);
MakeScreenshot(path);
} }
private void runInBackgroundToolStripMenuItem_Click(object sender, EventArgs e) private void runInBackgroundToolStripMenuItem_Click(object sender, EventArgs e)

13
BizHawk.MultiClient/MainForm.cs
View File

@ -1352,7 +1352,18 @@ namespace BizHawk.MultiClient
var framebuf = video.GetVideoBuffer(); var framebuf = video.GetVideoBuffer();
for (int y = 0; y < video.BufferHeight; y++) for (int y = 0; y < video.BufferHeight; y++)
for (int x = 0; x < video.BufferWidth; x++) for (int x = 0; x < video.BufferWidth; x++)
image.SetPixel(x, y, Color.FromArgb(framebuf[(y * video.BufferWidth) + x])); {
int col = framebuf[(y * video.BufferWidth) + x];
if (Global.Emulator is TI83)
{
if (col == 0)
col = Color.Black.ToArgb();
else
col = Color.White.ToArgb();
}
image.SetPixel(x, y, Color.FromArgb(col));
}
var f = new FileInfo(path); var f = new FileInfo(path);
if (f.Directory.Exists == false) if (f.Directory.Exists == false)

21
BizHawk.MultiClient/RomGame.cs
View File

@ -103,7 +103,8 @@ namespace BizHawk.MultiClient
} }
} }
} }
} catch (Exception) { } // No need for errors in patching to propagate. }
catch (Exception) { } // No need for errors in patching to propagate.
} }
public byte[] GetRomData() { return RomData; } public byte[] GetRomData() { return RomData; }
@ -183,15 +184,15 @@ namespace BizHawk.MultiClient
{ {
switch (System) switch (System)
{ {
case "SMS": return PathManager.MakeAbsolutePath(Global.Config.PathSMSScreenshots, "SMS") + "/" + Name; case "SMS": return PathManager.MakeAbsolutePath(Global.Config.PathSMSScreenshots, "SMS") + "/" + filesystemSafeName;
case "GG": return PathManager.MakeAbsolutePath(Global.Config.PathGGScreenshots, "GG") + "/" + Name; case "GG": return PathManager.MakeAbsolutePath(Global.Config.PathGGScreenshots, "GG") + "/" + filesystemSafeName;
case "SG": return PathManager.MakeAbsolutePath(Global.Config.PathSGScreenshots, "SG") + "/" + Name; case "SG": return PathManager.MakeAbsolutePath(Global.Config.PathSGScreenshots, "SG") + "/" + filesystemSafeName;
case "PCE": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + Name; case "PCE": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + filesystemSafeName;
case "SGX": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + Name; case "SGX": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + filesystemSafeName;
case "GB": return PathManager.MakeAbsolutePath(Global.Config.PathGBScreenshots, "GB") + "/" + Name; case "GB": return PathManager.MakeAbsolutePath(Global.Config.PathGBScreenshots, "GB") + "/" + filesystemSafeName;
case "GEN": return PathManager.MakeAbsolutePath(Global.Config.PathGenesisScreenshots, "GEN") + "/" + Name; case "GEN": return PathManager.MakeAbsolutePath(Global.Config.PathGenesisScreenshots, "GEN") + "/" + filesystemSafeName;
case "NES": return PathManager.MakeAbsolutePath(Global.Config.PathNESScreenshots, "NES") + "/" + Name; case "NES": return PathManager.MakeAbsolutePath(Global.Config.PathNESScreenshots, "NES") + "/" + filesystemSafeName;
case "TI83": return PathManager.MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83") + "/" + Name; case "TI83": return PathManager.MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83") + "/" + filesystemSafeName;
default: return ""; default: return "";
} }
} }