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

last round of pointless code cleanup

This commit is contained in:
adelikat 2013-04-16 00:42:57 +00:00
parent e32eaeeb9a
commit 462e861072
28 changed files with 197 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -198,7 +198,7 @@ namespace BizHawk
game.Name,
Util.BytesToHexString(System.Security.Cryptography.SHA1.Create().ComputeHash(rom)),
Util.BytesToHexString(System.Security.Cryptography.MD5.Create().ComputeHash(rom)),
mapper.GetType().ToString());
mapper.GetType());
}
public void FrameAdvance(bool render, bool rendersound)
@ -260,7 +260,7 @@ namespace BizHawk
return value;
}
private bool bw = false;
private bool bw;
private bool p0difficulty = true;
private bool p1difficulty = true;

20
BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
View File

@ -19,11 +19,15 @@ namespace BizHawk
public Atari2600(CoreComm comm, GameInfo game, byte[] rom)
{
CoreComm = comm;
var domains = new List<MemoryDomain>(1);
domains.Add(new MemoryDomain("Main RAM", 128, Endian.Little, addr => ram[addr & 127], (addr, value) => ram[addr & 127] = value));
domains.Add(new MemoryDomain("TIA", 16, Endian.Little, addr => tia.ReadMemory((ushort)addr, true), (addr, value) => tia.WriteMemory((ushort)addr, value)));
domains.Add(new MemoryDomain("PIA", 1024, Endian.Little, addr => m6532.ReadMemory((ushort)addr, true), (addr, value) => m6532.WriteMemory((ushort)addr, value)));
domains.Add(new MemoryDomain("System Bus", 8192, Endian.Little, addr => mapper.PeekMemory((ushort)addr), (addr, value) => {}));
var domains = new List<MemoryDomain>(1)
{
new MemoryDomain("Main RAM", 128, Endian.Little, addr => ram[addr & 127], (addr, value) => ram[addr & 127] = value),
new MemoryDomain("TIA", 16, Endian.Little, addr => tia.ReadMemory((ushort) addr, true),
(addr, value) => tia.WriteMemory((ushort) addr, value)),
new MemoryDomain("PIA", 1024, Endian.Little, addr => m6532.ReadMemory((ushort) addr, true),
(addr, value) => m6532.WriteMemory((ushort) addr, value)),
new MemoryDomain("System Bus", 8192, Endian.Little, addr => mapper.PeekMemory((ushort) addr), (addr, value) => { })
};
memoryDomains = domains.AsReadOnly();
CoreComm.CpuTraceAvailable = true;
this.rom = rom;
@ -72,8 +76,8 @@ namespace BizHawk
public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
public bool IsLagFrame { get { return _islag; } }
private bool _islag = true;
private int _lagcount = 0;
private int _frame = 0;
private int _lagcount;
private int _frame;
public byte[] ReadSaveRam() { return null; }
public void StoreSaveRam(byte[] data) { }
@ -95,7 +99,7 @@ namespace BizHawk
return ms.ToArray();
}
private IList<MemoryDomain> memoryDomains;
private readonly IList<MemoryDomain> memoryDomains;
public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
public void Dispose() { }

6
BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
View File

@ -1,13 +1,13 @@
namespace BizHawk.Emulation.Consoles.Atari
{
// Emulates the M6532 RIOT Chip
public partial class M6532
public class M6532
{
Atari2600 core;
public byte ddra = 0x00;
public byte ddrb = 0x00;
private readonly Atari2600 core;
public struct timerData
{
public int prescalerCount;

6
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
View File

@ -20,9 +20,9 @@
*/
class m3E : MapperBase
{
int lowbank_2k = 0;
int rambank_1k = 0;
bool hasRam = false;
int lowbank_2k;
int rambank_1k;
bool hasRam;
ByteBuffer ram = new ByteBuffer(262144); //Up to 256k
public override void SyncState(Serializer ser)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
View File

@ -21,7 +21,7 @@
class m3F :MapperBase
{
int lowbank_2k = 0;
int lowbank_2k;
public override void SyncState(Serializer ser)
{

12
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
View File

@ -23,9 +23,9 @@
class mE0 : MapperBase
{
int toggle1 = 0;
int toggle2 = 0;
int toggle3 = 0;
int toggle1;
int toggle2;
int toggle3;
private byte ReadMem(ushort addr, bool peek)
{
@ -35,9 +35,9 @@
}
if (addr < 0x1000) return base.ReadMemory(addr);
else if (addr < 0x1400) return core.rom[toggle1 * 1024 + (addr & 0x3FF)];
else if (addr < 0x1800) return core.rom[toggle2 * 1024 + (addr & 0x3FF)];
else if (addr < 0x1C00) return core.rom[toggle3 * 1024 + (addr & 0x3FF)];
else if (addr < 0x1400) return core.rom[(toggle1 << 10) + (addr & 0x3FF)];
else if (addr < 0x1800) return core.rom[(toggle2 << 10) + (addr & 0x3FF)];
else if (addr < 0x1C00) return core.rom[(toggle3 << 10) + (addr & 0x3FF)];
else
return core.rom[7 * 1024 + (addr & 0x3FF)]; //7 because final bank is always set to last
}

10
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
View File

@ -27,11 +27,11 @@
class mE7 : MapperBase
{
int rombank_1k = 0;
int rambank1_toggle = 0;
ByteBuffer rambank0 = new ByteBuffer(1024);
ByteBuffer rambank1 = new ByteBuffer(1024);
bool EnableRam0 = false;
private int rombank_1k;
private int rambank1_toggle;
private ByteBuffer rambank0 = new ByteBuffer(1024);
private ByteBuffer rambank1 = new ByteBuffer(1024);
private bool EnableRam0;
private byte ReadMem(ushort addr, bool peek)
{

4
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
View File

@ -12,7 +12,7 @@
class mEF : MapperBase
{
int toggle = 0;
private int toggle;
private byte ReadMem(ushort addr, bool peek)
{
@ -22,7 +22,7 @@
}
if (addr < 0x1000) return base.ReadMemory(addr);
return core.rom[toggle * 4 * 1024 + (addr & 0xFFF)];
return core.rom[(toggle << 12) + (addr & 0xFFF)];
}
public override byte ReadMemory(ushort addr)

4
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
View File

@ -18,7 +18,7 @@
class mF0 : MapperBase
{
int bank = 0;
int bank;
private byte ReadMem(ushort addr, bool peek)
{
@ -29,7 +29,7 @@
}
if (addr < 0x1000) return base.ReadMemory(addr);
else return core.rom[bank * 4096 + (addr & 0xFFF)];
else return core.rom[(bank << 12) + (addr & 0xFFF)];
}
public override byte ReadMemory(ushort addr)

4
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
View File

@ -10,7 +10,7 @@
class mF4 :MapperBase
{
int toggle = 0;
int toggle;
private byte ReadMem(ushort addr, bool peek)
{
@ -20,7 +20,7 @@
}
if (addr < 0x1000) return base.ReadMemory(addr);
return core.rom[toggle * 4096 + (addr & 0xFFF)];
return core.rom[(toggle << 12) + (addr & 0xFFF)];
}
public override byte ReadMemory(ushort addr)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
View File

@ -11,7 +11,7 @@
class mF6 : MapperBase
{
int toggle = 0;
int toggle;
private byte ReadMem(ushort addr, bool peek)
{

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
View File

@ -21,7 +21,7 @@
class mF8 : MapperBase
{
int bank_4k = 0;
int bank_4k;
private byte ReadMem(ushort addr, bool peek)
{

4
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
View File

@ -14,7 +14,7 @@
class mFA : MapperBase
{
int toggle = 0;
int toggle;
ByteBuffer aux_ram = new ByteBuffer(256);
private byte ReadMem(ushort addr, bool peek)
@ -38,7 +38,7 @@
}
else
{
return core.rom[(toggle * 4096) + (addr & 0xFFF)];
return core.rom[(toggle << 12) + (addr & 0xFFF)];
}
}

4
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
View File

@ -12,7 +12,7 @@
class mUA : MapperBase
{
int toggle = 0;
int toggle;
private byte ReadMem(ushort addr, bool peek)
{
@ -22,7 +22,7 @@
}
if (addr < 0x1000) return base.ReadMemory(addr);
return core.rom[toggle * 4096 + (addr & 0xFFF)];
return core.rom[(toggle << 12) + (addr & 0xFFF)];
}
public override byte ReadMemory(ushort addr)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
View File

@ -33,7 +33,7 @@
class mX07 : MapperBase
{
int rombank_2k = 0;
int rombank_2k;
private byte ReadMem(ushort addr, bool peek)
{

152
BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
View File

@ -4,51 +4,51 @@ using System.Collections.Generic;
namespace BizHawk.Emulation.Consoles.Atari
{
// Emulates the TIA
public partial class TIA : IVideoProvider, ISoundProvider
public class TIA : IVideoProvider, ISoundProvider
{
Atari2600 core;
public bool frameComplete;
byte hsyncCnt = 0;
int capChargeStart = 0;
bool capCharging = false;
static byte CXP0 = 0x01;
static byte CXP1 = 0x02;
static byte CXM0 = 0x04;
static byte CXM1 = 0x08;
static byte CXPF = 0x10;
static byte CXBL = 0x20;
private readonly Atari2600 core;
private byte hsyncCnt;
private int capChargeStart;
private bool capCharging;
private const byte CXP0 = 0x01;
private const byte CXP1 = 0x02;
private const byte CXM0 = 0x04;
private const byte CXM1 = 0x08;
private const byte CXPF = 0x10;
private const byte CXBL = 0x20;
struct missileData
{
public bool enabled;
public bool resetToPlayer;
public byte hPosCnt;
public byte size;
public byte number;
public byte HM;
public byte collisions;
public bool Enabled;
public bool ResetToPlayer;
public byte HPosCnt;
public byte Size;
public byte Number;
public byte Hm;
public byte Collisions;
public bool tick()
public bool Tick()
{
bool result = false;
// At hPosCnt == 0, start drawing the missile, if enabled
if (hPosCnt < (1 << size))
if (HPosCnt < (1 << Size))
{
if (enabled && !resetToPlayer)
if (Enabled && !ResetToPlayer)
{
// Draw the missile
result = true;
}
}
if ((number & 0x07) == 0x01 || ((number & 0x07) == 0x03))
if ((Number & 0x07) == 0x01 || ((Number & 0x07) == 0x03))
{
if (hPosCnt >= 16 && hPosCnt <= (16 + (1 << size) - 1) )
if (HPosCnt >= 16 && HPosCnt <= (16 + (1 << Size) - 1) )
{
if (enabled && !resetToPlayer)
if (Enabled && !ResetToPlayer)
{
// Draw the missile
result = true;
@ -56,11 +56,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
}
if (((number & 0x07) == 0x02 || ((number & 0x07) == 0x03) || ((number & 0x07) == 0x06)))
if (((Number & 0x07) == 0x02 || ((Number & 0x07) == 0x03) || ((Number & 0x07) == 0x06)))
{
if (hPosCnt >= 32 && hPosCnt <= (32 + (1 << size) - 1) )
if (HPosCnt >= 32 && HPosCnt <= (32 + (1 << Size) - 1) )
{
if (enabled && !resetToPlayer)
if (Enabled && !ResetToPlayer)
{
// Draw the missile
result = true;
@ -68,11 +68,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
}
if ((number & 0x07) == 0x04 || (number & 0x07) == 0x06)
if ((Number & 0x07) == 0x04 || (Number & 0x07) == 0x06)
{
if (hPosCnt >= 64 && hPosCnt <= (64 + (1 << size) - 1) )
if (HPosCnt >= 64 && HPosCnt <= (64 + (1 << Size) - 1) )
{
if (enabled && !resetToPlayer)
if (Enabled && !ResetToPlayer)
{
// Draw the missile
result = true;
@ -81,9 +81,9 @@ namespace BizHawk.Emulation.Consoles.Atari
}
// Increment the counter
hPosCnt++;
HPosCnt++;
// Counter loops at 160
hPosCnt %= 160;
HPosCnt %= 160;
return result;
}
@ -91,13 +91,13 @@ namespace BizHawk.Emulation.Consoles.Atari
public void SyncState(Serializer ser)
{
ser.BeginSection("Missile");
ser.Sync("enabled", ref enabled);
ser.Sync("resetToPlayer", ref resetToPlayer);
ser.Sync("hPosCnt", ref hPosCnt);
ser.Sync("size", ref size);
ser.Sync("number", ref number);
ser.Sync("HM", ref HM);
ser.Sync("collisions", ref collisions);
ser.Sync("enabled", ref Enabled);
ser.Sync("resetToPlayer", ref ResetToPlayer);
ser.Sync("hPosCnt", ref HPosCnt);
ser.Sync("size", ref Size);
ser.Sync("number", ref Number);
ser.Sync("HM", ref Hm);
ser.Sync("collisions", ref Collisions);
ser.EndSection();
}
}
@ -150,9 +150,9 @@ namespace BizHawk.Emulation.Consoles.Atari
}
// Reset missile, if desired
if (scanCnt == 0x04 && hPosCnt <= 16 && missile.resetToPlayer)
if (scanCnt == 0x04 && hPosCnt <= 16 && missile.ResetToPlayer)
{
missile.hPosCnt = 0;
missile.HPosCnt = 0;
}
// Increment counter
@ -378,13 +378,13 @@ namespace BizHawk.Emulation.Consoles.Atari
ballData ball;
bool vblankEnabled = false;
bool vsyncEnabled = false;
bool vblankEnabled;
bool vsyncEnabled;
List<uint[]> scanlinesBuffer = new List<uint[]>();
private readonly List<uint[]> scanlinesBuffer = new List<uint[]>();
uint[] scanline = new uint[160];
UInt32[] palette = new UInt32[]{
private readonly UInt32[] palette = new UInt32[]{
0x000000, 0, 0x4a4a4a, 0, 0x6f6f6f, 0, 0x8e8e8e, 0,
0xaaaaaa, 0, 0xc0c0c0, 0, 0xd6d6d6, 0, 0xececec, 0,
0x484800, 0, 0x69690f, 0, 0x86861d, 0, 0xa2a22a, 0,
@ -452,7 +452,7 @@ namespace BizHawk.Emulation.Consoles.Atari
int sr3 = 2;
/// <summary>counter based off AUDF</summary>
byte freqcnt = 0;
byte freqcnt;
/// <summary>latched audio value</summary>
bool on = true;
@ -691,13 +691,13 @@ namespace BizHawk.Emulation.Consoles.Atari
collisions |= (player0.tick() ? CXP0 : (byte)0x00);
// ---- Missile 0 ----
collisions |= (player0.missile.tick() ? CXM0 : (byte)0x00);
collisions |= (player0.missile.Tick() ? CXM0 : (byte)0x00);
// ---- Player 1 ----
collisions |= (player1.tick() ? CXP1 : (byte)0x00);
// ---- Missile 0 ----
collisions |= (player1.missile.tick() ? CXM1 : (byte)0x00);
collisions |= (player1.missile.Tick() ? CXM1 : (byte)0x00);
// ---- Ball ----
collisions |= (ball.tick() ? CXBL : (byte)0x00);
@ -740,7 +740,7 @@ namespace BizHawk.Emulation.Consoles.Atari
if ((collisions & CXM1) != 0)
{
player1.missile.collisions |= collisions;
player1.missile.Collisions |= collisions;
if (core.CoreComm.Atari2600_ShowMissle2)
{
pixelColor = palette[player1.color];
@ -758,7 +758,7 @@ namespace BizHawk.Emulation.Consoles.Atari
if ((collisions & CXM0) != 0)
{
player0.missile.collisions |= collisions;
player0.missile.Collisions |= collisions;
if (core.CoreComm.Atari2600_ShowMissle1)
{
pixelColor = palette[player0.color];
@ -866,10 +866,10 @@ namespace BizHawk.Emulation.Consoles.Atari
{ }
// If the move counter still has a bit in common with the HM register
if (((15 - hmove.missile0Cnt) ^ ((player0.missile.HM & 0x07) | ((~(player0.missile.HM & 0x08)) & 0x08))) != 0x0F)
if (((15 - hmove.missile0Cnt) ^ ((player0.missile.Hm & 0x07) | ((~(player0.missile.Hm & 0x08)) & 0x08))) != 0x0F)
{
// "Clock-Stuffing"
player0.missile.tick();
player0.missile.Tick();
// Increase by 1, max of 15
hmove.missile0Cnt++;
@ -903,10 +903,10 @@ namespace BizHawk.Emulation.Consoles.Atari
if (hmove.missile1Latch)
{
// If the move counter still has a bit in common with the HM register
if (((15 - hmove.missile1Cnt) ^ ((player1.missile.HM & 0x07) | ((~(player1.missile.HM & 0x08)) & 0x08))) != 0x0F)
if (((15 - hmove.missile1Cnt) ^ ((player1.missile.Hm & 0x07) | ((~(player1.missile.Hm & 0x08)) & 0x08))) != 0x0F)
{
// "Clock-Stuffing"
player1.missile.tick();
player1.missile.Tick();
// Increase by 1, max of 15
hmove.missile1Cnt++;
@ -1011,11 +1011,11 @@ namespace BizHawk.Emulation.Consoles.Atari
ushort maskedAddr = (ushort)(addr & 0x000F);
if (maskedAddr == 0x00) // CXM0P
{
return (byte)((((player0.missile.collisions & CXP1) != 0) ? 0x80 : 0x00) | (((player0.missile.collisions & CXP0) != 0) ? 0x40 : 0x00));
return (byte)((((player0.missile.Collisions & CXP1) != 0) ? 0x80 : 0x00) | (((player0.missile.Collisions & CXP0) != 0) ? 0x40 : 0x00));
}
else if (maskedAddr == 0x01) // CXM1P
{
return (byte)((((player1.missile.collisions & CXP0) != 0) ? 0x80 : 0x00) | (((player1.missile.collisions & CXP1) != 0) ? 0x40 : 0x00));
return (byte)((((player1.missile.Collisions & CXP0) != 0) ? 0x80 : 0x00) | (((player1.missile.Collisions & CXP1) != 0) ? 0x40 : 0x00));
}
else if (maskedAddr == 0x02) // CXP0FB
{
@ -1027,11 +1027,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x04) // CXM0FB
{
return (byte)((((player0.missile.collisions & CXPF) != 0) ? 0x80 : 0x00) | (((player0.missile.collisions & CXBL) != 0) ? 0x40 : 0x00));
return (byte)((((player0.missile.Collisions & CXPF) != 0) ? 0x80 : 0x00) | (((player0.missile.Collisions & CXBL) != 0) ? 0x40 : 0x00));
}
else if (maskedAddr == 0x05) // CXM1FB
{
return (byte)((((player1.missile.collisions & CXPF) != 0) ? 0x80 : 0x00) | (((player1.missile.collisions & CXBL) != 0) ? 0x40 : 0x00));
return (byte)((((player1.missile.Collisions & CXPF) != 0) ? 0x80 : 0x00) | (((player1.missile.Collisions & CXBL) != 0) ? 0x40 : 0x00));
}
else if (maskedAddr == 0x06) // CXBLPF
{
@ -1039,7 +1039,7 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x07) // CXPPMM
{
return (byte)((((player0.collisions & CXP1) != 0) ? 0x80 : 0x00) | (((player0.missile.collisions & CXM1) != 0) ? 0x40 : 0x00));
return (byte)((((player0.collisions & CXP1) != 0) ? 0x80 : 0x00) | (((player0.missile.Collisions & CXM1) != 0) ? 0x40 : 0x00));
}
else if (maskedAddr == 0x08) // INPT0
{
@ -1121,14 +1121,14 @@ namespace BizHawk.Emulation.Consoles.Atari
else if (maskedAddr == 0x04) // NUSIZ0
{
player0.nusiz = (byte)(value & 0x37);
player0.missile.size = (byte)((value & 0x30) >> 4);
player0.missile.number = (byte)(value & 0x07);
player0.missile.Size = (byte)((value & 0x30) >> 4);
player0.missile.Number = (byte)(value & 0x07);
}
else if (maskedAddr == 0x05) // NUSIZ1
{
player1.nusiz = (byte)(value & 0x37);
player1.missile.size = (byte)((value & 0x30) >> 4);
player1.missile.number = (byte)(value & 0x07);
player1.missile.Size = (byte)((value & 0x30) >> 4);
player1.missile.Number = (byte)(value & 0x07);
}
else if (maskedAddr == 0x06) // COLUP0
{
@ -1230,11 +1230,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x12) // RESM0
{
player0.missile.hPosCnt = (byte)(hsyncCnt < 68 ? 160 - 2 : 160 - 4);
player0.missile.HPosCnt = (byte)(hsyncCnt < 68 ? 160 - 2 : 160 - 4);
}
else if (maskedAddr == 0x13) // RESM1
{
player1.missile.hPosCnt = (byte)(hsyncCnt < 68 ? 160 - 2 : 160 - 4);
player1.missile.HPosCnt = (byte)(hsyncCnt < 68 ? 160 - 2 : 160 - 4);
}
else if (maskedAddr == 0x14) // RESBL
{
@ -1279,11 +1279,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x1D) // ENAM0
{
player0.missile.enabled = (value & 0x02) != 0;
player0.missile.Enabled = (value & 0x02) != 0;
}
else if (maskedAddr == 0x1E) // ENAM1
{
player1.missile.enabled = (value & 0x02) != 0;
player1.missile.Enabled = (value & 0x02) != 0;
}
else if (maskedAddr == 0x1F) // ENABL
{
@ -1299,11 +1299,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x22) // HMM0
{
player0.missile.HM = (byte)((value & 0xF0) >> 4);
player0.missile.Hm = (byte)((value & 0xF0) >> 4);
}
else if (maskedAddr == 0x23) // HMM1
{
player1.missile.HM = (byte)((value & 0xF0) >> 4);
player1.missile.Hm = (byte)((value & 0xF0) >> 4);
}
else if (maskedAddr == 0x24) // HMBL
{
@ -1323,11 +1323,11 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x28) // RESMP0
{
player0.missile.resetToPlayer = (value & 0x02) != 0;
player0.missile.ResetToPlayer = (value & 0x02) != 0;
}
else if (maskedAddr == 0x29) // RESMP1
{
player1.missile.resetToPlayer = (value & 0x02) != 0;
player1.missile.ResetToPlayer = (value & 0x02) != 0;
}
else if (maskedAddr == 0x2A) // HMOVE
{
@ -1338,17 +1338,17 @@ namespace BizHawk.Emulation.Consoles.Atari
else if (maskedAddr == 0x2B) // HMCLR
{
player0.HM = 0;
player0.missile.HM = 0;
player0.missile.Hm = 0;
player1.HM = 0;
player1.missile.HM = 0;
player1.missile.Hm = 0;
ball.HM = 0;
}
else if (maskedAddr == 0x2C) // CXCLR
{
player0.collisions = 0;
player0.missile.collisions = 0;
player0.missile.Collisions = 0;
player1.collisions = 0;
player1.missile.collisions = 0;
player1.missile.Collisions = 0;
ball.collisions = 0;
}
}

60
BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
View File

@ -4,23 +4,21 @@ using System.Collections.Generic;
namespace BizHawk.Emulation.Consoles.Atari
{
// Emulates the TIA
public partial class oldTIA
public class oldTIA
{
Atari2600 core;
private readonly Atari2600 core;
public bool audioEnabled = false;
public byte audioFreqDiv = 0;
UInt32 PF; // PlayField data
byte BKcolor, PFcolor;
bool PFpriority = false;
bool PFreflect = false;
bool PFscore = false;
bool inpt_latching = false;
bool inpt4 = false;
bool hmoveHappened = false;
bool PFpriority;
bool PFreflect;
bool PFscore;
bool inpt_latching;
bool inpt4;
bool hmoveHappened;
struct playerData
{
@ -53,18 +51,18 @@ namespace BizHawk.Emulation.Consoles.Atari
playerData player0;
playerData player1;
byte player0copies = 0;
byte player0copy1 = 0;
byte player0copy2 = 0;
byte player1copies = 0;
byte player1copy1 = 0;
byte player1copy2 = 0;
byte player0copies;
byte player0copy1;
byte player0copy2;
byte player1copies;
byte player1copy1;
byte player1copy2;
byte P0_collisions = 0;
byte P1_collisions = 0;
byte M0_collisions = 0;
byte M1_collisions = 0;
byte BL_collisions = 0;
byte P0_collisions;
byte P1_collisions;
byte M0_collisions;
byte M1_collisions;
byte BL_collisions;
const byte COLP0 = 0x01;
const byte COLP1 = 0x02;
@ -73,17 +71,16 @@ namespace BizHawk.Emulation.Consoles.Atari
const byte COLPF = 0x10;
const byte COLBL = 0x20;
bool vblankEnabled = false;
bool vblankEnabled;
int[] frameBuffer;
readonly int[] frameBuffer;
public bool frameComplete;
List<uint[]> scanlinesBuffer = new List<uint[]> ();
readonly List<uint[]> scanlinesBuffer = new List<uint[]> ();
uint[] scanline = new uint[160];
public int scanlinePos;
int[] hmove = new int[] { 0,-1,-2,-3,-4,-5,-6,-7,-8,7,6,5,4,3,2,1 };
readonly int[] hmove = new int[] { 0,-1,-2,-3,-4,-5,-6,-7,-8,7,6,5,4,3,2,1 };
UInt32[] palette = new UInt32[]{
0x000000, 0, 0x4a4a4a, 0, 0x6f6f6f, 0, 0x8e8e8e, 0,
@ -122,6 +119,8 @@ namespace BizHawk.Emulation.Consoles.Atari
public oldTIA(Atari2600 core, int[] frameBuffer)
{
player1copy2 = 0;
player0copy2 = 0;
this.core = core;
BKcolor = 0x00;
this.frameBuffer = frameBuffer;
@ -162,8 +161,7 @@ namespace BizHawk.Emulation.Consoles.Atari
}
}
UInt32 color;
color = palette[BKcolor];
uint color = palette[BKcolor];
byte collisions = 0;
if ((PF & PFmask) != 0)
@ -289,7 +287,7 @@ namespace BizHawk.Emulation.Consoles.Atari
}
}
if ((PF & PFmask) != 0 && PFpriority == true)
if ((PF & PFmask) != 0 && PFpriority)
{
color = palette[PFcolor];
if (PFscore)
@ -371,7 +369,7 @@ namespace BizHawk.Emulation.Consoles.Atari
{
if (inpt_latching)
{
if (inpt4 == true)
if (inpt4)
{
inpt4 = ((core.ReadControls1(peek) & 0x08) != 0);
}
@ -527,7 +525,7 @@ namespace BizHawk.Emulation.Consoles.Atari
}
else if (maskedAddr == 0x0F) // PF2
{
PF = (UInt32)((PF & 0xFFF00) + reverseBits(value));
PF = (PF & 0xFFF00) + reverseBits(value);
}
else if (maskedAddr == 0x10) // RESP0
{

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

@ -11,20 +11,20 @@ namespace BizHawk.Emulation.Consoles.Calculator
public class TI83 : IEmulator
{
//hardware
Z80A cpu = new Z80A();
byte[] rom;
byte[] ram;
int romPageLow3Bits;
int romPageHighBit;
bool maskOn;
bool onPressed = false;
int keyboardMask;
private readonly Z80A cpu = new Z80A();
private readonly byte[] rom;
private byte[] ram;
private int romPageLow3Bits;
private int romPageHighBit;
private bool maskOn;
private bool onPressed;
private int keyboardMask;
int disp_mode;
int disp_move;
uint disp_x, disp_y;
int m_LinkOutput, m_LinkState;
bool m_CursorMoved;
private int disp_mode;
private int disp_move;
private uint disp_x, disp_y;
private int m_LinkOutput, m_LinkState;
private bool m_CursorMoved;
//-------
@ -246,7 +246,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
void WriteDispData(byte value)
{
int offset = -1;
int offset;
if (disp_mode == 1)
{
offset = (int)disp_y * 12 + (int)disp_x;
@ -367,7 +367,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
protected byte[] vram = new byte[0x300];
class MyVideoProvider : IVideoProvider
{
TI83 emu;
private readonly TI83 emu;
public MyVideoProvider(TI83 emu)
{
this.emu = emu;

9
BizHawk.Util/FolderBrowserDialogEx.cs
View File

@ -1,7 +1,6 @@
using System.Runtime.InteropServices;
using System.Text;
using System;
using System.Drawing;
using System.Windows.Forms;
using System.ComponentModel;
using System.Security.Permissions;
@ -16,7 +15,7 @@ namespace BizHawk
/// </summary>
public sealed class FolderBrowserEx : Component
{
private static readonly int MAX_PATH = 260;
private const int MAX_PATH = 260;
// Root node of the tree view.
private FolderID startLocation = FolderID.Desktop;
@ -25,14 +24,11 @@ namespace BizHawk
private int publicOptions = (int) Win32API.Shell32.BffStyles.RestrictToFilesystem |
(int) Win32API.Shell32.BffStyles.RestrictToDomain;
private int privateOptions = (int)(Win32API.Shell32.BffStyles.NewDialogStyle | Win32API.Shell32.BffStyles.ShowTextBox);
private const int privateOptions = (int) (Win32API.Shell32.BffStyles.NewDialogStyle | Win32API.Shell32.BffStyles.ShowTextBox);
// Description text to show.
public string Description = "Please select a folder below:";
// Folder chosen by the user.
private string directoryPath = String.Empty;
/// <summary>
/// Enum of CSIDLs identifying standard shell folders.
/// </summary>
@ -160,7 +156,6 @@ namespace BizHawk
}
// Convert to a string.
directoryPath = sb.ToString();
}
finally
{

8
BizHawk.Util/HexTextBox.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Windows.Forms;
namespace BizHawk
{
@ -10,7 +6,7 @@ namespace BizHawk
{
public HexTextBox()
{
this.CharacterCasing = CharacterCasing.Upper;
CharacterCasing = CharacterCasing.Upper;
}
protected override void OnKeyPress(KeyPressEventArgs e)

3
BizHawk.Util/InputConfigBase.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Windows.Forms;
namespace BizHawk

6
BizHawk.Util/InputValidate.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text;
namespace BizHawk
{
@ -80,7 +77,6 @@ namespace BizHawk
/// <summary>
/// validates is a Hex number 0-9, A-F (must be capital letters)
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static bool IsValidHexNumber(string Str)
{

35
BizHawk.Util/KeyTurbo.cs
View File

@ -1,41 +1,36 @@
using System;
using System.Collections;
using System.Windows.Forms;
namespace BizHawk
namespace BizHawk
{
public class TurboKey
{
public void Reset(int downTime, int upTime)
{
value = false;
timer = 0;
this.upTime = upTime;
this.downTime = downTime;
Value = false;
_timer = 0;
_upTime = upTime;
_downTime = downTime;
}
public void Tick(bool down)
{
if (!down)
{
Reset(downTime, upTime);
Reset(_downTime, _upTime);
return;
}
timer++;
_timer++;
value = true;
if (timer > downTime)
value = false;
if(timer > (upTime+downTime))
Value = true;
if (_timer > _downTime)
Value = false;
if(_timer > (_upTime+_downTime))
{
timer = 0;
value = true;
_timer = 0;
Value = true;
}
}
public bool value;
int upTime, downTime;
int timer;
public bool Value;
private int _upTime, _downTime, _timer;
}
}

12
BizHawk.Util/MiscControls.cs
View File

@ -1,16 +1,10 @@
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Drawing;
using System.Windows.Forms;
namespace BizHawk.Core
{
public class HorizontalLine : Control
{
public HorizontalLine()
{
}
protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
{
base.SetBoundsCore(x, y, width, 2, specified);
@ -31,7 +25,7 @@ namespace BizHawk.Core
set { _CheckBackColor = value; Refresh(); }
}
bool? _ForceChecked = null;
bool? _ForceChecked;
public bool? ForceChecked
{
get { return _ForceChecked; }
@ -53,7 +47,7 @@ namespace BizHawk.Core
pevent.Graphics.FillRectangle(brush, glyphLoc);
//draw a checkbox menu glyph (we could do this more elegantly with DrawFrameControl)
bool c = CheckState == System.Windows.Forms.CheckState.Checked;
bool c = CheckState == CheckState.Checked;
if (ForceChecked.HasValue)
{
c = ForceChecked.Value;

10
BizHawk.Util/StringHelpers.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk
{
@ -11,13 +9,7 @@ namespace BizHawk
{
if (!String.IsNullOrEmpty(str))
{
int count = 0;
for (int x = 0; x < str.Length; x++)
{
if (str[x] == c)
count++;
}
return count;
return str.Count(t => t == c);
}
else
{

3
BizHawk.Util/TextDebugView.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Drawing;
using System.Drawing;
using System.Windows.Forms;
namespace BizHawk

13
BizHawk.Util/ToolStripEx.cs
View File

@ -2,7 +2,6 @@
using System;
using System.Windows.Forms;
using System.Runtime.InteropServices;
/// <summary>
/// This class adds on to the functionality provided in System.Windows.Forms.ToolStrip.
@ -19,18 +18,18 @@ public class ToolStripEx : ToolStrip
{
get
{
return this.clickThrough;
return clickThrough;
}
set
{
this.clickThrough = value;
clickThrough = value;
}
}
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (this.clickThrough &&
if (clickThrough &&
m.Msg == NativeConstants.WM_MOUSEACTIVATE &&
m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
@ -54,18 +53,18 @@ public class MenuStripEx : MenuStrip
{
get
{
return this.clickThrough;
return clickThrough;
}
set
{
this.clickThrough = value;
clickThrough = value;
}
}
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (this.clickThrough &&
if (clickThrough &&
m.Msg == NativeConstants.WM_MOUSEACTIVATE &&
m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{

8
BizHawk.Util/Util.cs
View File

@ -1,13 +1,5 @@
using System;
using System.Windows.Forms;
using System.Linq;
using System.Reflection;
using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Text;
namespace BizHawk
{