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

n64: fix crash with input display on

This commit is contained in:
goyuken 2013-04-30 00:50:08 +00:00
parent 1f7b5a5ce9
commit ad80b43c85
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -420,7 +420,9 @@
<Compile Include="SNESTools\SNESOptions.Designer.cs"> <Compile Include="SNESTools\SNESOptions.Designer.cs">
<DependentUpon>SNESOptions.cs</DependentUpon> <DependentUpon>SNESOptions.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="tools\AnalogControlPanel.cs" /> <Compile Include="tools\AnalogControlPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\HexColor.cs"> <Compile Include="tools\HexColor.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -511,7 +513,9 @@
<Compile Include="tools\VirtualPadGen3Button.cs"> <Compile Include="tools\VirtualPadGen3Button.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="tools\VirtualPadN64.cs" /> <Compile Include="tools\VirtualPadN64.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPadN64.Designer.cs"> <Compile Include="tools\VirtualPadN64.Designer.cs">
<DependentUpon>VirtualPadN64.cs</DependentUpon> <DependentUpon>VirtualPadN64.cs</DependentUpon>
</Compile> </Compile>

9
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -585,6 +585,10 @@ namespace BizHawk.MultiClient
{ {
return GetDualGameBoyControllerAsMnemonic(); return GetDualGameBoyControllerAsMnemonic();
} }
else if (ControlType == "Nintento 64 Controller")
{
return ""; // TODO
}
StringBuilder input = new StringBuilder("|"); StringBuilder input = new StringBuilder("|");
@ -1017,6 +1021,11 @@ namespace BizHawk.MultiClient
SetDualGameBoyControllerAsMnemonic(mnemonic); SetDualGameBoyControllerAsMnemonic(mnemonic);
return; return;
} }
else if (ControlType == "Nintento 64 Controller")
{
// TODO
return;
}
MnemonicChecker c = new MnemonicChecker(mnemonic); MnemonicChecker c = new MnemonicChecker(mnemonic);