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

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

@ -27,16 +27,16 @@ namespace BizHawk.Emulation.Consoles.Calculator
bool m_CursorMoved;
//-------
public byte ReadMemory(ushort addr)
{
public byte ReadMemory(ushort addr)
{
int romPage = romPageLow3Bits | (romPageHighBit << 3);
//Console.WriteLine("read memory: {0:X4}", addr);
if (addr < 0x4000)
return rom[addr]; //ROM zero-page
else if (addr < 0x8000)
return rom[romPage*0x4000+addr-0x4000]; //other rom page
return rom[romPage * 0x4000 + addr - 0x4000]; //other rom page
else return ram[addr - 0x8000];
}
}
public void WriteMemory(ushort addr, byte value)
{
@ -57,7 +57,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
m_LinkState = m_LinkOutput ^ 3;
break;
case 1: //PORT_KEYBOARD:
lagged = false;
lagged = false;
keyboardMask = value;
//Console.WriteLine("write PORT_KEYBOARD {0:X2}",value);
break;
@ -83,7 +83,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
switch (addr)
{
case 0: //PORT_LINK
return (byte)((romPageHighBit << 4) | (m_LinkState<<2) | m_LinkOutput);
return (byte)((romPageHighBit << 4) | (m_LinkState << 2) | m_LinkOutput);
case 1: //PORT_KEYBOARD:
//Console.WriteLine("read PORT_KEYBOARD");
return ReadKeyboard();
@ -123,7 +123,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
byte ReadKeyboard()
{
//ref TI-9X
int ret = 0xFF;
//Console.WriteLine("keyboardMask: {0:X2}",keyboardMask);
if ((keyboardMask & 1) == 0)
@ -146,12 +146,12 @@ namespace BizHawk.Emulation.Consoles.Calculator
if ((keyboardMask & 4) == 0)
{
if (Controller.IsPressed("DASH")) ret ^= 1;
if (Controller.IsPressed("3")) ret ^= 2;
if (Controller.IsPressed("3")) ret ^= 2;
if (Controller.IsPressed("6")) ret ^= 4;
if (Controller.IsPressed("9")) ret ^= 8;
if (Controller.IsPressed("PARACLOSE")) ret ^= 16;
if (Controller.IsPressed("TAN")) ret ^= 32;
if (Controller.IsPressed("VARS")) ret ^= 64;
if (Controller.IsPressed("PARACLOSE")) ret ^= 16;
if (Controller.IsPressed("TAN")) ret ^= 32;
if (Controller.IsPressed("VARS")) ret ^= 64;
}
if ((keyboardMask & 8) == 0)
{
@ -159,10 +159,10 @@ namespace BizHawk.Emulation.Consoles.Calculator
if (Controller.IsPressed("2")) ret ^= 2;
if (Controller.IsPressed("5")) ret ^= 4;
if (Controller.IsPressed("8")) ret ^= 8;
if (Controller.IsPressed("PARAOPEN")) ret ^= 16;
if (Controller.IsPressed("COS")) ret ^= 32;
if (Controller.IsPressed("PRGM")) ret ^= 64;
if (Controller.IsPressed("STAT")) ret ^= 128;
if (Controller.IsPressed("PARAOPEN")) ret ^= 16;
if (Controller.IsPressed("COS")) ret ^= 32;
if (Controller.IsPressed("PRGM")) ret ^= 64;
if (Controller.IsPressed("STAT")) ret ^= 128;
}
if ((keyboardMask & 16) == 0)
{
@ -170,35 +170,35 @@ namespace BizHawk.Emulation.Consoles.Calculator
if (Controller.IsPressed("1")) ret ^= 2;
if (Controller.IsPressed("4")) ret ^= 4;
if (Controller.IsPressed("7")) ret ^= 8;
if (Controller.IsPressed("COMMA")) ret ^= 16;
if (Controller.IsPressed("SIN")) ret ^= 32;
if (Controller.IsPressed("MATRIX")) ret ^= 64;
if (Controller.IsPressed("X")) ret ^= 128;
if (Controller.IsPressed("COMMA")) ret ^= 16;
if (Controller.IsPressed("SIN")) ret ^= 32;
if (Controller.IsPressed("MATRIX")) ret ^= 64;
if (Controller.IsPressed("X")) ret ^= 128;
}
if ((keyboardMask & 32) == 0)
{
if (Controller.IsPressed("STO")) ret ^= 2;
if (Controller.IsPressed("LN")) ret ^= 4;
if (Controller.IsPressed("LOG")) ret ^= 8;
if (Controller.IsPressed("SQUARED")) ret ^= 16;
if (Controller.IsPressed("NEG1")) ret ^= 32;
if (Controller.IsPressed("MATH"))
ret ^= 64;
if (Controller.IsPressed("ALPHA")) ret ^= 128;
}
if ((keyboardMask & 32) == 0)
{
if (Controller.IsPressed("STO")) ret ^= 2;
if (Controller.IsPressed("LN")) ret ^= 4;
if (Controller.IsPressed("LOG")) ret ^= 8;
if (Controller.IsPressed("SQUARED")) ret ^= 16;
if (Controller.IsPressed("NEG1")) ret ^= 32;
if (Controller.IsPressed("MATH"))
ret ^= 64;
if (Controller.IsPressed("ALPHA")) ret ^= 128;
}
if ((keyboardMask & 64) == 0)
{
if (Controller.IsPressed("GRAPH")) ret ^= 1;
if (Controller.IsPressed("TRACE")) ret ^= 2;
if (Controller.IsPressed("ZOOM")) ret ^= 4;
if (Controller.IsPressed("WINDOW")) ret ^= 8;
if (Controller.IsPressed("Y")) ret ^= 16;
if (Controller.IsPressed("2ND")) ret ^= 32;
if (Controller.IsPressed("MODE")) ret ^= 64;
if (Controller.IsPressed("DEL")) ret ^= 128;
}
if ((keyboardMask & 64) == 0)
{
if (Controller.IsPressed("GRAPH")) ret ^= 1;
if (Controller.IsPressed("TRACE")) ret ^= 2;
if (Controller.IsPressed("ZOOM")) ret ^= 4;
if (Controller.IsPressed("WINDOW")) ret ^= 8;
if (Controller.IsPressed("Y")) ret ^= 16;
if (Controller.IsPressed("2ND")) ret ^= 32;
if (Controller.IsPressed("MODE")) ret ^= 64;
if (Controller.IsPressed("DEL")) ret ^= 128;
}
return (byte)ret;
@ -347,21 +347,23 @@ namespace BizHawk.Emulation.Consoles.Calculator
this.emu = emu;
}
public int[] GetVideoBuffer() {
public int[] GetVideoBuffer()
{
//unflatten bit buffer
int[] pixels = new int[96*64];
int i=0;
for(int y=0;y<64;y++)
int[] pixels = new int[96 * 64];
int i = 0;
for (int y = 0; y < 64; y++)
for (int x = 0; x < 96; x++)
{
int offset = y * 96 + x;
int bufbyte = offset >> 3;
int bufbit = offset & 7;
int bit = ((emu.vram[bufbyte] >> (7 - bufbit)) & 1);
if(bit==0)
pixels[i++] = 0xFFFFFF;
if (bit == 0)
unchecked { pixels[i++] = (int)0xFFFFFFFF; }
else
pixels[i++] = 0;
}
return pixels;
}
@ -369,7 +371,8 @@ namespace BizHawk.Emulation.Consoles.Calculator
public int BufferHeight { get { return 64; } }
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; } }
@ -382,9 +385,9 @@ namespace BizHawk.Emulation.Consoles.Calculator
"DOWN","LEFT","UP","RIGHT",
"PLUS","MINUS","MULTIPLY","DIVIDE",
"CLEAR", "EXP", "DASH", "PARACLOSE", "TAN", "VARS", "PARAOPEN",
"COS", "PRGM", "STAT", "COMMA", "SIN", "MATRIX", "X",
"STO", "LN", "LOG", "SQUARED", "NEG1", "MATH", "ALPHA",
"GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL"
"COS", "PRGM", "STAT", "COMMA", "SIN", "MATRIX", "X",
"STO", "LN", "LOG", "SQUARED", "NEG1", "MATH", "ALPHA",
"GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL"
}
};
@ -394,7 +397,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
public IController Controller
{
get { return controller; }
set { controller = value; }
set { controller = value; }
}
//configuration
ushort startPC;
@ -407,19 +410,19 @@ namespace BizHawk.Emulation.Consoles.Calculator
//different calculators (different revisions?) have different initPC. we track this in the game database by rom hash
//if( *(unsigned long *)(m_pRom + 0x6ce) == 0x04D3163E ) m_Regs.PC.W = 0x6ce; //KNOWN
//else if( *(unsigned long *)(m_pRom + 0x6f6) == 0x04D3163E ) m_Regs.PC.W = 0x6f6; //UNKNOWN
if (opt.StartsWith("initPC"))
startPC = ushort.Parse(opt.Split('=')[1], NumberStyles.HexNumber);
startPC = ushort.Parse(opt.Split('=')[1], NumberStyles.HexNumber);
}
HardReset();
SetupMemoryDomains();
SetupMemoryDomains();
}
public void FrameAdvance(bool render)
{
lagged = true;
//I eyeballed this speed
lagged = true;
//I eyeballed this speed
for (int i = 0; i < 5; i++)
{
onPressed = Controller.IsPressed("ON");
@ -427,28 +430,28 @@ namespace BizHawk.Emulation.Consoles.Calculator
cpu.ExecuteCycles(10000);
cpu.Interrupt = true;
}
Controller.UpdateControls(Frame++);
if (lagged)
{
_lagcount++;
islag = true;
}
else
islag = false;
Controller.UpdateControls(Frame++);
if (lagged)
{
_lagcount++;
islag = true;
}
else
islag = false;
}
public void HardReset()
{
cpu.Reset();
ram = new byte[0x8000];
for(int i=0;i<0x8000;i++)
for (int i = 0; i < 0x8000; i++)
ram[i] = 0xFF;
cpu.RegisterPC = startPC;
cpu.IFF1 = false;
cpu.IFF2 = false;
cpu.InterruptMode = 2;
maskOn = false;
romPageHighBit = 0;
romPageLow3Bits = 0;
@ -459,13 +462,13 @@ namespace BizHawk.Emulation.Consoles.Calculator
disp_x = disp_y = 0;
}
private int _lagcount = 0;
private bool lagged = true;
private bool islag = false;
public int Frame {get; set;}
public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
public bool IsLagFrame { get { return islag; } }
private int _lagcount = 0;
private bool lagged = true;
private bool islag = false;
public int Frame { get; set; }
public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
public bool IsLagFrame { get { return islag; } }
public bool DeterministicEmulation { get { return true; } set { } }
public byte[] SaveRam { get { return null; } }
@ -477,70 +480,70 @@ namespace BizHawk.Emulation.Consoles.Calculator
public void SaveStateText(TextWriter writer)
{
writer.WriteLine("[TI83]\n");
writer.WriteLine("Frame {0}", Frame);
cpu.SaveStateText(writer);
writer.Write("RAM ");
ram.SaveAsHex(writer);
writer.WriteLine ("romPageLow3Bits {0}", romPageLow3Bits);
writer.WriteLine("romPageHighBit {0}", romPageHighBit);
writer.WriteLine("disp_mode {0}", disp_mode);
writer.WriteLine("disp_move {0}", disp_move);
writer.WriteLine("disp_x {0}", disp_x);
writer.WriteLine("disp_y {0}", disp_y);
writer.WriteLine("m_CursorMoved {0}", m_CursorMoved);
writer.WriteLine("maskOn {0}", maskOn);
writer.WriteLine("onPressed {0}", onPressed);
writer.WriteLine("keyboardMask {0}", keyboardMask);
writer.WriteLine("m_LinkOutput {0}", m_LinkOutput);
writer.WriteLine("m_LinkState {0}", m_LinkState);
writer.WriteLine("lag {0}", _lagcount);
writer.WriteLine("[/TI83]");
writer.WriteLine("[TI83]\n");
writer.WriteLine("Frame {0}", Frame);
cpu.SaveStateText(writer);
writer.Write("RAM ");
ram.SaveAsHex(writer);
writer.WriteLine("romPageLow3Bits {0}", romPageLow3Bits);
writer.WriteLine("romPageHighBit {0}", romPageHighBit);
writer.WriteLine("disp_mode {0}", disp_mode);
writer.WriteLine("disp_move {0}", disp_move);
writer.WriteLine("disp_x {0}", disp_x);
writer.WriteLine("disp_y {0}", disp_y);
writer.WriteLine("m_CursorMoved {0}", m_CursorMoved);
writer.WriteLine("maskOn {0}", maskOn);
writer.WriteLine("onPressed {0}", onPressed);
writer.WriteLine("keyboardMask {0}", keyboardMask);
writer.WriteLine("m_LinkOutput {0}", m_LinkOutput);
writer.WriteLine("m_LinkState {0}", m_LinkState);
writer.WriteLine("lag {0}", _lagcount);
writer.WriteLine("[/TI83]");
}
public void LoadStateText(TextReader reader)
{
while (true)
{
string[] args = reader.ReadLine().Split(' ');
if (args[0].Trim() == "") continue;
if (args[0] == "[TI83]") continue;
if (args[0] == "[/TI83]") break;
if (args[0] == "Frame")
Frame = int.Parse(args[1]);
else if (args[0] == "[Z80]")
cpu.LoadStateText(reader);
else if (args[0] == "RAM")
ram.ReadFromHex(args[1]);
else if (args[0] == "romPageLow3Bits")
romPageLow3Bits = int.Parse(args[1]);
else if (args[0] == "romPageHighBit")
romPageHighBit = int.Parse(args[1]);
else if (args[0] == "disp_mode")
disp_mode = int.Parse(args[1]);
else if (args[0] == "disp_move")
disp_move = int.Parse(args[1]);
else if (args[0] == "disp_x")
disp_x = uint.Parse(args[1]);
else if (args[0] == "disp_y")
disp_y = uint.Parse(args[1]);
else if (args[0] == "m_CursorMoved")
m_CursorMoved = bool.Parse(args[1]);
else if (args[0] == "maskOn")
maskOn = bool.Parse(args[1]);
else if (args[0] == "onPressed")
onPressed = bool.Parse(args[1]);
else if (args[0] == "keyboardMask")
keyboardMask = int.Parse(args[1]);
else if (args[0] == "m_LinkOutput")
m_LinkOutput = int.Parse(args[1]);
else if (args[0] == "m_LinkState")
m_LinkState = int.Parse(args[1]);
else if (args[0] == "lag")
_lagcount = int.Parse(args[1]);
else
Console.WriteLine("Skipping unrecognized identifier " + args[0]);
}
while (true)
{
string[] args = reader.ReadLine().Split(' ');
if (args[0].Trim() == "") continue;
if (args[0] == "[TI83]") continue;
if (args[0] == "[/TI83]") break;
if (args[0] == "Frame")
Frame = int.Parse(args[1]);
else if (args[0] == "[Z80]")
cpu.LoadStateText(reader);
else if (args[0] == "RAM")
ram.ReadFromHex(args[1]);
else if (args[0] == "romPageLow3Bits")
romPageLow3Bits = int.Parse(args[1]);
else if (args[0] == "romPageHighBit")
romPageHighBit = int.Parse(args[1]);
else if (args[0] == "disp_mode")
disp_mode = int.Parse(args[1]);
else if (args[0] == "disp_move")
disp_move = int.Parse(args[1]);
else if (args[0] == "disp_x")
disp_x = uint.Parse(args[1]);
else if (args[0] == "disp_y")
disp_y = uint.Parse(args[1]);
else if (args[0] == "m_CursorMoved")
m_CursorMoved = bool.Parse(args[1]);
else if (args[0] == "maskOn")
maskOn = bool.Parse(args[1]);
else if (args[0] == "onPressed")
onPressed = bool.Parse(args[1]);
else if (args[0] == "keyboardMask")
keyboardMask = int.Parse(args[1]);
else if (args[0] == "m_LinkOutput")
m_LinkOutput = int.Parse(args[1]);
else if (args[0] == "m_LinkState")
m_LinkState = int.Parse(args[1]);
else if (args[0] == "lag")
_lagcount = int.Parse(args[1]);
else
Console.WriteLine("Skipping unrecognized identifier " + args[0]);
}
}
public void SaveStateBinary(BinaryWriter writer)
@ -556,24 +559,24 @@ namespace BizHawk.Emulation.Consoles.Calculator
return new byte[0];
}
public string SystemId { get { return "TI83"; } }
public string SystemId { get { return "TI83"; } }
private IList<MemoryDomain> memoryDomains;
private const ushort RamSizeMask = 0x7FFF;
private IList<MemoryDomain> memoryDomains;
private const ushort RamSizeMask = 0x7FFF;
private void SetupMemoryDomains()
{
var domains = new List<MemoryDomain>();
var MainMemoryDomain = new MemoryDomain("Main RAM", ram.Length, Endian.Little,
addr => ram[addr & RamSizeMask],
(addr, value) => ram[addr & RamSizeMask] = value);
domains.Add(MainMemoryDomain);
memoryDomains = domains.AsReadOnly();
}
private void SetupMemoryDomains()
{
var domains = new List<MemoryDomain>();
var MainMemoryDomain = new MemoryDomain("Main RAM", ram.Length, Endian.Little,
addr => ram[addr & RamSizeMask],
(addr, value) => ram[addr & RamSizeMask] = value);
domains.Add(MainMemoryDomain);
memoryDomains = domains.AsReadOnly();
}
public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
public void Dispose() { }
}
public void Dispose() { }
}
}

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

@ -670,8 +670,6 @@ namespace BizHawk.MultiClient
if (result != DialogResult.OK)
return;
MakeScreenshot(sfd.FileName);
MakeScreenshot(path);
}
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();
for (int y = 0; y < video.BufferHeight; y++)
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);
if (f.Directory.Exists == false)

251
BizHawk.MultiClient/RomGame.cs
View File

@ -5,25 +5,25 @@ using System.IO;
namespace BizHawk.MultiClient
{
public class RomGame : IGame
{
public byte[] RomData;
public class RomGame : IGame
{
public byte[] RomData;
public byte[] FileData;
public string System;
public string System;
private string name;
private string name;
private string filesystemSafeName;
private List<string> options;
private const int BankSize = 4096;
private List<string> options;
private const int BankSize = 4096;
public RomGame(HawkFile file) : this(file, null){}
public RomGame(HawkFile file) : this(file, null) { }
public RomGame(HawkFile file, string patch)
{
public RomGame(HawkFile file, string patch)
{
if (!file.Exists)
throw new Exception("The file needs to exist, yo.");
throw new Exception("The file needs to exist, yo.");
var stream = file.GetStream();
var stream = file.GetStream();
FileData = Util.ReadAllBytes(stream);
@ -38,10 +38,10 @@ namespace BizHawk.MultiClient
RomData = DeInterleaveSMD(RomData);
var info = Database.GetGameInfo(RomData, file.Name);
name = info.Name;
System = info.System;
options = new List<string>(info.GetOptions());
CheckForPatchOptions();
name = info.Name;
System = info.System;
options = new List<string>(info.GetOptions());
CheckForPatchOptions();
//build a safe filesystem name for use in auxilary files (savestates, saveram, etc)
filesystemSafeName = file.CanonicalName.Replace("|", "+");
@ -53,71 +53,72 @@ namespace BizHawk.MultiClient
using (var patchFile = new HawkFile(patch))
{
patchFile.BindFirstOf("IPS");
if(patchFile.IsBound)
if (patchFile.IsBound)
IPS.Patch(RomData, patchFile.GetStream());
}
}
}
}
}
public void AddOptions(params string[] options)
{
this.options.AddRange(options);
}
public void AddOptions(params string[] options)
{
this.options.AddRange(options);
}
private byte[] DeInterleaveSMD(byte[] source)
{
// SMD files are interleaved in pages of 16k, with the first 8k containing all
// odd bytes and the second 8k containing all even bytes.
private byte[] DeInterleaveSMD(byte[] source)
{
// SMD files are interleaved in pages of 16k, with the first 8k containing all
// odd bytes and the second 8k containing all even bytes.
int size = source.Length;
if (size > 0x400000) size = 0x400000;
int pages = size / 0x4000;
byte[] output = new byte[size];
int size = source.Length;
if (size > 0x400000) size = 0x400000;
int pages = size / 0x4000;
byte[] output = new byte[size];
for (int page = 0; page < pages; page++)
{
for (int i = 0; i < 0x2000; i++)
{
output[(page * 0x4000) + (i * 2) + 0] = source[(page * 0x4000) + 0x2000 + i];
output[(page * 0x4000) + (i * 2) + 1] = source[(page * 0x4000) + 0x0000 + i];
}
}
return output;
}
for (int page = 0; page < pages; page++)
{
for (int i = 0; i < 0x2000; i++)
{
output[(page * 0x4000) + (i * 2) + 0] = source[(page * 0x4000) + 0x2000 + i];
output[(page * 0x4000) + (i * 2) + 1] = source[(page * 0x4000) + 0x0000 + i];
}
}
return output;
}
private void CheckForPatchOptions()
{
try
{
foreach (var opt in options)
{
if (opt.StartsWith("PatchBytes"))
{
var split1 = opt.Split('=');
foreach (var val in split1[1].Split(','))
{
var split3 = val.Split(':');
int offset = int.Parse(split3[0], NumberStyles.HexNumber);
byte value = byte.Parse(split3[1], NumberStyles.HexNumber);
RomData[offset] = value;
}
}
}
} catch (Exception) { } // No need for errors in patching to propagate.
}
private void CheckForPatchOptions()
{
try
{
foreach (var opt in options)
{
if (opt.StartsWith("PatchBytes"))
{
var split1 = opt.Split('=');
foreach (var val in split1[1].Split(','))
{
var split3 = val.Split(':');
int offset = int.Parse(split3[0], NumberStyles.HexNumber);
byte value = byte.Parse(split3[1], NumberStyles.HexNumber);
RomData[offset] = value;
}
}
}
}
catch (Exception) { } // No need for errors in patching to propagate.
}
public byte[] GetRomData() { return RomData; }
public byte[] GetRomData() { return RomData; }
public byte[] GetFileData() { return FileData; }
public IList<string> GetOptions() { return options; }
public IList<string> GetOptions() { return options; }
public string Name { get { return name; } set { name = value; } }
public string FilesystemSafeName { get { return filesystemSafeName; } }
public string SaveRamPath
{
get
{
switch (System)
{
public string SaveRamPath
{
get
{
switch (System)
{
case "SMS": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSMSSaveRAM, "SMS"), filesystemSafeName + ".SaveRAM");
case "GG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGGSaveRAM, "GG"), filesystemSafeName + ".SaveRAM");
case "SG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSGSaveRAM, "SG"), filesystemSafeName + ".SaveRAM");
@ -127,42 +128,42 @@ namespace BizHawk.MultiClient
case "GEN": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGenesisSaveRAM, "GEN"), filesystemSafeName + ".SaveRAM");
case "NES": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathNESSaveRAM, "NES"), filesystemSafeName + ".SaveRAM");
case "TI83": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathTI83SaveRAM, "TI83"), filesystemSafeName + ".SaveRAM");
default: return "";
}
}
}
default: return "";
}
}
}
public string SaveStatePrefix
{
get
{
string Bind = "";
public string SaveStatePrefix
{
get
{
string Bind = "";
if (Global.Config.BindSavestatesToMovies && Global.MainForm.UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
Bind += " - " + Path.GetFileNameWithoutExtension(Global.MainForm.UserMovie.GetFilePath());
switch (System)
{
case "SMS": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSMSSavestates, "SMS") ,filesystemSafeName + Bind);
case "GG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGGSavestates, "GG") ,filesystemSafeName + Bind);
case "SG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSGSavestates, "SG") ,filesystemSafeName + Bind);
case "PCE": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathPCESavestates, "PCE") ,filesystemSafeName + Bind);
case "SGX": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathPCESavestates, "PCE") ,filesystemSafeName + Bind);
case "GB": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBSavestates, "GB") ,filesystemSafeName + Bind);
case "GEN": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGenesisSavestates, "GEN") ,filesystemSafeName + Bind);
case "NES": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathNESSavestates, "NES") ,filesystemSafeName + Bind);
Bind += " - " + Path.GetFileNameWithoutExtension(Global.MainForm.UserMovie.GetFilePath());
switch (System)
{
case "SMS": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSMSSavestates, "SMS"), filesystemSafeName + Bind);
case "GG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGGSavestates, "GG"), filesystemSafeName + Bind);
case "SG": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathSGSavestates, "SG"), filesystemSafeName + Bind);
case "PCE": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathPCESavestates, "PCE"), filesystemSafeName + Bind);
case "SGX": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathPCESavestates, "PCE"), filesystemSafeName + Bind);
case "GB": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBSavestates, "GB"), filesystemSafeName + Bind);
case "GEN": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGenesisSavestates, "GEN"), filesystemSafeName + Bind);
case "NES": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathNESSavestates, "NES"), filesystemSafeName + Bind);
case "TI83": return Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathTI83Savestates, "TI83"), filesystemSafeName + Bind);
default: return "";
}
}
}
default: return "";
}
public string MoviePrefix
{
//Obsolete because there is one singular Movie path
get
{
switch (System)
{
}
}
public string MoviePrefix
{
//Obsolete because there is one singular Movie path
get
{
switch (System)
{
case "SMS": return "SMS/Movie/" + filesystemSafeName;
case "GG": return "Game Gear/Movie/" + filesystemSafeName;
case "SG": return "SG-1000/Movie/" + filesystemSafeName;
@ -172,29 +173,29 @@ namespace BizHawk.MultiClient
case "GEN": return "Genesis/Movie/" + filesystemSafeName;
case "NES": return "NES/Movie/" + filesystemSafeName;
case "TI83": return "TI83/Movie/" + filesystemSafeName;
default: return "";
}
}
}
default: return "";
}
}
}
public string ScreenshotPrefix
{
get
{
switch (System)
{
case "SMS": return PathManager.MakeAbsolutePath(Global.Config.PathSMSScreenshots, "SMS") + "/" + Name;
case "GG": return PathManager.MakeAbsolutePath(Global.Config.PathGGScreenshots, "GG") + "/" + Name;
case "SG": return PathManager.MakeAbsolutePath(Global.Config.PathSGScreenshots, "SG") + "/" + Name;
case "PCE": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + Name;
case "SGX": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + Name;
case "GB": return PathManager.MakeAbsolutePath(Global.Config.PathGBScreenshots, "GB") + "/" + Name;
case "GEN": return PathManager.MakeAbsolutePath(Global.Config.PathGenesisScreenshots, "GEN") + "/" + Name;
case "NES": return PathManager.MakeAbsolutePath(Global.Config.PathNESScreenshots, "NES") + "/" + Name;
case "TI83": return PathManager.MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83") + "/" + Name;
default: return "";
}
}
}
}
public string ScreenshotPrefix
{
get
{
switch (System)
{
case "SMS": return PathManager.MakeAbsolutePath(Global.Config.PathSMSScreenshots, "SMS") + "/" + filesystemSafeName;
case "GG": return PathManager.MakeAbsolutePath(Global.Config.PathGGScreenshots, "GG") + "/" + filesystemSafeName;
case "SG": return PathManager.MakeAbsolutePath(Global.Config.PathSGScreenshots, "SG") + "/" + filesystemSafeName;
case "PCE": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + filesystemSafeName;
case "SGX": return PathManager.MakeAbsolutePath(Global.Config.PathPCEScreenshots, "PCE") + "/" + filesystemSafeName;
case "GB": return PathManager.MakeAbsolutePath(Global.Config.PathGBScreenshots, "GB") + "/" + filesystemSafeName;
case "GEN": return PathManager.MakeAbsolutePath(Global.Config.PathGenesisScreenshots, "GEN") + "/" + filesystemSafeName;
case "NES": return PathManager.MakeAbsolutePath(Global.Config.PathNESScreenshots, "NES") + "/" + filesystemSafeName;
case "TI83": return PathManager.MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83") + "/" + filesystemSafeName;
default: return "";
}
}
}
}
}