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

NES - remove the partial class closure on the PPU object files

This commit is contained in:
adelikat 2015-01-17 21:09:33 +00:00
parent 3b2c00cf39
commit 9f6c0ca695
6 changed files with 1190 additions and 1199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
View File

@ -244,7 +244,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
int bank_1k = addr >> 10;
int ofs = addr & ((1 << 10) - 1);
if (exram_mode == 1 && NES.ppu.ppuphase == NES.PPU.PPUPHASE.BG)
if (exram_mode == 1 && NES.ppu.ppuphase == PPU.PPUPHASE.BG)
{
int exram_addr = last_nt_read;
int bank_4k = EXRAM[exram_addr] & 0x3F;
@ -266,7 +266,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
&& NES.ppu.reg_2001.show_obj
)
{
if (NES.ppu.ppuphase == NES.PPU.PPUPHASE.OBJ)
if (NES.ppu.ppuphase == PPU.PPUPHASE.OBJ)
bank_1k = a_banks_1k[bank_1k];
else
bank_1k = b_banks_1k[bank_1k];

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
View File

@ -296,7 +296,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
#if VS2012
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
private void RunCpuOne()
internal void RunCpuOne()
{
cpu_stepcounter++;
if (cpu_stepcounter == cpu_sequence[cpu_step])

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISettable.cs
View File

@ -54,8 +54,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return ret;
}
private NESSettings Settings = new NESSettings();
private NESSyncSettings SyncSettings = new NESSyncSettings();
internal NESSettings Settings = new NESSettings();
internal NESSyncSettings SyncSettings = new NESSyncSettings();
public class NESSyncSettings
{

3
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -6,8 +6,6 @@ using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
partial class NES
{
public sealed partial class PPU
{
// this only handles region differences within the PPU
@ -238,5 +236,4 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//bool SPRITELIMIT = true;
}
}
}

3
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs
View File

@ -17,8 +17,6 @@ using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
partial class NES
{
sealed partial class PPU
{
public sealed class Reg_2001
@ -557,7 +555,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
}
}
}

3
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
View File

@ -8,8 +8,6 @@ using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
partial class NES
{
sealed partial class PPU
{
const int kFetchTime = 2;
@ -467,6 +465,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
--ppudead;
}
}
}
}