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

tidy

This commit is contained in:
goyuken 2014-07-23 15:45:30 +00:00
parent 0d674308b9
commit 3e5945660f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -495,9 +495,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
unif = new Unif(new MemoryStream(file)); unif = new Unif(new MemoryStream(file));
LoadWriteLine("Found UNIF header:"); LoadWriteLine("Found UNIF header:");
LoadWriteLine(unif.GetCartInfo()); LoadWriteLine(unif.CartInfo);
LoadWriteLine("Since this is UNIF we can confidently parse PRG/CHR banks to hash."); LoadWriteLine("Since this is UNIF we can confidently parse PRG/CHR banks to hash.");
hash_sha1 = unif.GetCartInfo().sha1; hash_sha1 = unif.CartInfo.sha1;
hash_sha1_several.Add(hash_sha1); hash_sha1_several.Add(hash_sha1);
LoadWriteLine("headerless rom hash: {0}", hash_sha1); LoadWriteLine("headerless rom hash: {0}", hash_sha1);
} }
@ -603,8 +603,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
else if (unif != null) else if (unif != null)
{ {
if (choice.prg_size == -1) choice.prg_size = unif.GetCartInfo().prg_size; if (choice.prg_size == -1) choice.prg_size = unif.CartInfo.prg_size;
if (choice.chr_size == -1) choice.chr_size = unif.GetCartInfo().chr_size; if (choice.chr_size == -1) choice.chr_size = unif.CartInfo.chr_size;
// unif has no wram\vram sizes; hope the board impl can figure it out... // unif has no wram\vram sizes; hope the board impl can figure it out...
if (choice.vram_size == -1) choice.vram_size = 0; if (choice.vram_size == -1) choice.vram_size = 0;
if (choice.wram_size == -1) choice.wram_size = 0; if (choice.wram_size == -1) choice.wram_size = 0;
@ -633,7 +633,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
if (unif != null) if (unif != null)
{ {
LoadWriteLine("Using information from UNIF header"); LoadWriteLine("Using information from UNIF header");
choice = unif.GetCartInfo(); choice = unif.CartInfo;
origin = EDetectionOrigin.UNIF; origin = EDetectionOrigin.UNIF;
} }
if (iNesHeaderInfo != null) if (iNesHeaderInfo != null)
@ -752,8 +752,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
else else
{ {
board.ROM = unif.GetPRG(); board.ROM = unif.PRG;
board.VROM = unif.GetCHR(); board.VROM = unif.CHR;
} }
// IF YOU DO ANYTHING AT ALL BELOW THIS LINE, MAKE SURE THE APPROPRIATE CHANGE IS MADE TO FDS (if applicable) // IF YOU DO ANYTHING AT ALL BELOW THIS LINE, MAKE SURE THE APPROPRIATE CHANGE IS MADE TO FDS (if applicable)

6
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
View File

@ -109,9 +109,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
chrrom = null; chrrom = null;
} }
public NES.CartInfo GetCartInfo() { return ci; } public NES.CartInfo CartInfo { get { return ci; } }
public byte[] GetPRG() { return prgrom; } public byte[] PRG { get { return prgrom; } }
public byte[] GetCHR() { return chrrom; } public byte[] CHR { get { return chrrom; } }
} }
} }