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

Misc code cleanup

This commit is contained in:
beirich 2011-02-16 04:45:59 +00:00
parent 41b68e198e
commit 577f249905
14 changed files with 24 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,12 +27,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
bool m_CursorMoved;
//-------
public string type
{
get { return "TI83"; }
}
public byte ReadMemory(ushort addr)
public byte ReadMemory(ushort addr)
{
int romPage = romPageLow3Bits | (romPageHighBit << 3);
//Console.WriteLine("read memory: {0:X4}", addr);
@ -444,6 +439,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
return new byte[0];
}
public string SystemId { get { return "TI83"; } }
public IList<MemoryDomain> MemoryDomains { get { throw new NotImplementedException(); } }
public MemoryDomain MainMemory { get { throw new NotImplementedException(); } }
}

1
BizHawk.Emulation/Consoles/Gameboy/Gameboy.cs
View File

@ -842,6 +842,7 @@ namespace BizHawk.Emulation.Consoles.Gameboy
}
public bool DeterministicEmulation { get; set; }
public string SystemId { get { return "GB"; } }
public IList<MemoryDomain> MemoryDomains { get { throw new NotImplementedException(); } }
public MemoryDomain MainMemory { get { throw new NotImplementedException(); } }

6
BizHawk.Emulation/Consoles/Gameboy/Input.cs
View File

@ -2,11 +2,6 @@
{
public partial class Gameboy
{
public string type
{
get { return "GB"; }
}
public static readonly ControllerDefinition GbController = new ControllerDefinition
{
Name = "Gameboy Controller",
@ -18,6 +13,5 @@
public ControllerDefinition ControllerDefinition { get { return GbController; } }
public IController Controller { get; set; }
}
}

5
BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs
View File

@ -10,11 +10,6 @@
// However, I believe more fixes will be made in the future, and SF2 works, so this is not
// currently a priority.
public string type
{
get { return "PCE"; }
}
private byte SF2MapperLatch;
private byte ReadMemorySF2(ushort addr)

3
BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
View File

@ -128,7 +128,8 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
{
get { return PSG; }
}
public string SystemId { get { return "PCE"; } }
public string Region { get; set; }
public bool DeterministicEmulation { get; set; }

6
BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
View File

@ -10,11 +10,6 @@ namespace BizHawk.Emulation.Consoles.Sega
{
public sealed partial class Genesis : IEmulator, IMemoryController
{
public string type
{
get { return "GEN"; }
}
// ROM
public byte[] RomData;
@ -146,6 +141,7 @@ namespace BizHawk.Emulation.Consoles.Sega
public int Frame { get; set; }
public bool DeterministicEmulation { get; set; }
public string SystemId { get { return "GEN"; } }
public byte[] SaveRam
{

9
BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt
View File

@ -1,14 +1,7 @@
======= Sega MasterSystem Compatibility Issues =======
* CodeMasters games use a custom mapper and special video modes (both implemented)
+ Fantastic Dizzy crashes shortly after starting a new game. Investigating.
+ Excellent Dizzy Collection doesn't boot.
======= Game Gear compatibility issues =======
======= Game Gear compatibility issues =======
* Outrun has raster effect on the wrong line. I've been able to modify interrupt code to
fix it, but so far, not without breaking other games.
* GG Turrican homebrew not starting correctly
======= SG-1000 compatibility checklist =======

5
BizHawk.Emulation/Consoles/Sega/SMS/Input.cs
View File

@ -13,11 +13,6 @@
}
};
public string type
{
get { return "SMS"; }
}
public ControllerDefinition ControllerDefinition { get { return SmsController; } }
public IController Controller { get; set; }

4
BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
View File

@ -11,7 +11,7 @@ using BizHawk.Emulation.Sound;
+ HCounter
+ Try to clean up the organization of the source code.
+ Fix remaining broken games
+ SMS Fake Stereo Separation
+ Lightgun/Paddle/etc if I get really bored
**********************************************************/
@ -311,6 +311,8 @@ namespace BizHawk.Emulation.Consoles.Sega
private ISoundProvider ActiveSoundProvider;
public ISoundProvider SoundProvider { get { return ActiveSoundProvider; } }
public string SystemId { get { return "SMS"; } }
private string region = "Export";
public string Region
{

8
BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
View File

@ -6,11 +6,7 @@ namespace BizHawk
{
public class NullEmulator : IEmulator, IVideoProvider, ISoundProvider
{
public string type
{
get { return "NULL"; }
}
public string SystemId { get { return "NULL"; } }
private static readonly ControllerDefinition NullController = new ControllerDefinition { Name = "Null Controller" };
private int[] frameBuffer = new int[256 * 192];
@ -49,5 +45,7 @@ namespace BizHawk
private IList<MemoryDomain> memoryDomains;
public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
}
}

5
BizHawk.Emulation/Interfaces/IEmulator.cs
View File

@ -12,12 +12,11 @@ namespace BizHawk
ControllerDefinition ControllerDefinition { get; }
IController Controller { get; set; }
string type { get; }
void LoadGame(IGame game);
void FrameAdvance(bool render);
int Frame { get; }
string SystemId { get; }
bool DeterministicEmulation { get; set; }
byte[] SaveRam { get; }

14
BizHawk.MultiClient/MainForm.cs
View File

@ -371,6 +371,12 @@ namespace BizHawk.MultiClient
if (ActiveForm != null)
ScreenSaver.ResetTimerPeriodically();
if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
{
Rewind(Global.ClientControls["Fast Forward"] ? 3 : 1);
return;
}
if (EmulatorPaused == false)
{
CaptureRewindState();
@ -380,7 +386,6 @@ namespace BizHawk.MultiClient
if (!Global.ClientControls.IsPressed("Frame Advance"))
FrameAdvanceDelay = 60;
if (Global.ClientControls["Frame Advance"] && FrameAdvanceDelay > 0)
{
if (FrameAdvanceDelay == 60)
@ -403,13 +408,6 @@ namespace BizHawk.MultiClient
{
DoFrameAdvance();
}
if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
{
PauseEmulator();
Rewind(Global.ClientControls["Fast Forward"] ? 3 : 1);
return;
}
if (Global.ClientControls["Quick Save State"])
{

2
BizHawk.MultiClient/RenderPanel.cs
View File

@ -255,7 +255,7 @@ namespace BizHawk.MultiClient
if (Global.Config.DisplayInput)
{
string input = "";
if (Global.Emulator.type == "SMS")
if (Global.Emulator.SystemId == "SMS")
{
if (Global.Emulator.Controller.IsPressed("P1 Up"))
input += "U";

4
BizHawk.MultiClient/output/gamedb.txt
View File

@ -300,8 +300,8 @@ DFA2AE07 V Enduro Racer (corrupted) SMS Insert hex byte $0D at offset $B3A1 to f
5D5C50B3 Enduro Racer (JP) SMS
C4BB1676 E-SWAT [A] SMS
C10FCE39 E-SWAT [B] SMS
8813514B Excellent Dizzy Collection, The [Proto] SMS CMMapper;PAL
AA140C9C Excellent Dizzy Collection, The [SMS-GG] SMS CMMapper;PAL
8813514B Excellent Dizzy Collection, The [Proto] SMS CMMapper
AA140C9C Excellent Dizzy Collection, The [SMS-GG] SMS CMMapper
EC788661 F1 SMS
8AB10CB4 V F1 (first 128KB only) SMS
EAEBF323 F-16 Fighter SMS