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

Emulation.Common - cleanup Enums.cs

This commit is contained in:
adelikat 2017-04-27 11:45:44 -05:00
parent ad18694c3d
commit 57b63aaed4
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Common/Database/Database.cs
View File

@ -81,7 +81,7 @@ namespace BizHawk.Emulation.Common
case RomStatus.Overdump: case RomStatus.Overdump:
sb.Append("O"); sb.Append("O");
break; break;
case RomStatus.BIOS: case RomStatus.Bios:
sb.Append("I"); sb.Append("I");
break; break;
case RomStatus.Homebrew: case RomStatus.Homebrew:
@ -155,7 +155,7 @@ namespace BizHawk.Emulation.Common
game.Status = RomStatus.Overdump; game.Status = RomStatus.Overdump;
break; break;
case "I": case "I":
game.Status = RomStatus.BIOS; game.Status = RomStatus.Bios;
break; break;
case "D": case "D":
game.Status = RomStatus.Homebrew; game.Status = RomStatus.Homebrew;

18
BizHawk.Emulation.Common/Enums.cs
View File

@ -3,12 +3,22 @@
/// <summary> /// <summary>
/// DisplayType, used in IEmulator /// DisplayType, used in IEmulator
/// </summary> /// </summary>
public enum DisplayType { NTSC, PAL, DENDY } public enum DisplayType
{
NTSC,
PAL,
Dendy
}
/// <summary> /// <summary>
/// The type/increment of stepping in the Step method of IDebuggable /// The type/increment of stepping in the Step method of <seealso cref="IDebuggable"/>
/// </summary> /// </summary>
public enum StepType { Into, Out, Over } public enum StepType
{
Into,
Out,
Over
}
/// <summary> /// <summary>
/// In the game database, the status of the rom found in the database /// In the game database, the status of the rom found in the database
@ -21,7 +31,7 @@
TranslatedRom, TranslatedRom,
Hack, Hack,
Unknown, Unknown,
BIOS, Bios,
Overdump, Overdump,
NotInDatabase NotInDatabase
} }

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

@ -226,14 +226,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
cpu_sequence = cpu_sequence_NTSC; cpu_sequence = cpu_sequence_NTSC;
break; break;
// this is in bootgod, but not used at all // this is in bootgod, but not used at all
case Common.DisplayType.DENDY: case Common.DisplayType.Dendy:
apu = new APU(this, apu, false); apu = new APU(this, apu, false);
ppu.region = PPU.Region.Dendy; ppu.region = PPU.Region.Dendy;
CoreComm.VsyncNum = 50; CoreComm.VsyncNum = 50;
CoreComm.VsyncDen = 1; CoreComm.VsyncDen = 1;
cpuclockrate = 1773448; cpuclockrate = 1773448;
cpu_sequence = cpu_sequence_NTSC; cpu_sequence = cpu_sequence_NTSC;
_display_type = DisplayType.DENDY; _display_type = DisplayType.Dendy;
break; break;
default: default:
throw new Exception("Unknown displaytype!"); throw new Exception("Unknown displaytype!");

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

@ -764,7 +764,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (fromrom) switch (fromrom)
{ {
case NESSyncSettings.Region.Dendy: case NESSyncSettings.Region.Dendy:
_display_type = Common.DisplayType.DENDY; _display_type = Common.DisplayType.Dendy;
break; break;
case NESSyncSettings.Region.NTSC: case NESSyncSettings.Region.NTSC:
_display_type = Common.DisplayType.NTSC; _display_type = Common.DisplayType.NTSC;

2
BizHawk.sln.DotSettings
View File

@ -42,8 +42,10 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MGBA/@EntryIndexedValue">MGBA</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MGBA/@EntryIndexedValue">MGBA</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NES/@EntryIndexedValue">NES</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NES/@EntryIndexedValue">NES</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NMI/@EntryIndexedValue">NMI</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NMI/@EntryIndexedValue">NMI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NTSC/@EntryIndexedValue">NTSC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OBJ/@EntryIndexedValue">OBJ</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OBJ/@EntryIndexedValue">OBJ</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OR/@EntryIndexedValue">OR</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OR/@EntryIndexedValue">OR</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PAL/@EntryIndexedValue">PAL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCECD/@EntryIndexedValue">PCECD</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCECD/@EntryIndexedValue">PCECD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PSP/@EntryIndexedValue">PSP</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PSP/@EntryIndexedValue">PSP</s:String>