add nes stub

This commit is contained in:
zeromus 2011-02-20 02:17:09 +00:00
parent 3aeae6e771
commit 022c4be0c8
4 changed files with 26 additions and 1 deletions

View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion> <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</ProjectGuid> <ProjectGuid>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
@ -52,6 +52,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Consoles\Calculator\TI83.cs" /> <Compile Include="Consoles\Calculator\TI83.cs" />
<Compile Include="Consoles\Nintendo\NES\NES.cs" />
<Compile Include="Consoles\Sega\SMS\MemoryMap.CodeMasters.cs" /> <Compile Include="Consoles\Sega\SMS\MemoryMap.CodeMasters.cs" />
<Compile Include="Consoles\Sega\SMS\MemoryMap.Sega.cs" /> <Compile Include="Consoles\Sega\SMS\MemoryMap.Sega.cs" />
<Compile Include="Consoles\Sega\SMS\VDP.ModeTMS.cs" /> <Compile Include="Consoles\Sega\SMS\VDP.ModeTMS.cs" />

View File

@ -18,5 +18,6 @@ namespace BizHawk.MultiClient
public static IController PCEControls; public static IController PCEControls;
public static IController GenControls; public static IController GenControls;
public static IController TI83Controls; public static IController TI83Controls;
public static IController NESControls;
} }
} }

View File

@ -9,6 +9,7 @@ using BizHawk.Emulation.Consoles.Sega;
using BizHawk.Emulation.Consoles.TurboGrafx; using BizHawk.Emulation.Consoles.TurboGrafx;
using BizHawk.Emulation.Consoles.Calculator; using BizHawk.Emulation.Consoles.Calculator;
using BizHawk.Emulation.Consoles.Gameboy; using BizHawk.Emulation.Consoles.Gameboy;
using BizHawk.Emulation.Consoles.Nintendo;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
@ -245,6 +246,15 @@ namespace BizHawk.MultiClient
TI83Controls.BindMulti("CLEAR", "Escape"); TI83Controls.BindMulti("CLEAR", "Escape");
TI83Controls.BindMulti("DOT", "NumberPadPeriod"); TI83Controls.BindMulti("DOT", "NumberPadPeriod");
Global.TI83Controls = TI83Controls; Global.TI83Controls = TI83Controls;
var NESControls = new Controller(NES.NESController);
NESControls.BindMulti("B", "Z");
NESControls.BindMulti("A", "X");
NESControls.BindMulti("UP", "UpArrow");
NESControls.BindMulti("DOWN", "DownArrow");
NESControls.BindMulti("LEFT", "LeftArrow");
NESControls.BindMulti("RIGHT", "RightArrow");
Global.NESControls = NESControls;
} }
private static void FormDragEnter(object sender, DragEventArgs e) private static void FormDragEnter(object sender, DragEventArgs e)
@ -277,6 +287,7 @@ namespace BizHawk.MultiClient
case "SGX": return "SuperGrafx"; case "SGX": return "SuperGrafx";
case "GEN": return "Genesis"; case "GEN": return "Genesis";
case "TI83": return "TI-83"; case "TI83": return "TI-83";
case "NES": return "NES";
case "GB": return "Game Boy"; case "GB": return "Game Boy";
} }
return ""; return "";
@ -323,6 +334,10 @@ namespace BizHawk.MultiClient
Global.Emulator = new TI83(); Global.Emulator = new TI83();
Global.Emulator.Controller = Global.TI83Controls; Global.Emulator.Controller = Global.TI83Controls;
break; break;
case "NES":
Global.Emulator = new NES();
Global.Emulator.Controller = Global.NESControls;
break;
case "GB": case "GB":
Global.Emulator = new Gameboy(); Global.Emulator = new Gameboy();
break; break;

View File

@ -196,6 +196,11 @@ namespace BizHawk.MultiClient
this.Text = ControllerStr + "TI-83"; this.Text = ControllerStr + "TI-83";
} }
private void DoNES()
{
this.Text = ControllerStr + "NES";
}
private void DoGameBoy() private void DoGameBoy()
{ {
Label TempLabel; Label TempLabel;
@ -411,6 +416,9 @@ namespace BizHawk.MultiClient
case "TI-83": case "TI-83":
DoTI83(); DoTI83();
break; break;
case "NES":
DoNES();
break;
} }
CurSelectController = ControllComboBox.SelectedIndex; CurSelectController = ControllComboBox.SelectedIndex;
} }