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

psx - add a PSX options menu

This commit is contained in:
zeromus 2014-12-11 20:31:55 +00:00
parent 2a3a8a3124
commit f5dabcdbf5
5 changed files with 370 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -418,6 +418,12 @@
<Compile Include="config\ProfileConfig.Designer.cs"> <Compile Include="config\ProfileConfig.Designer.cs">
<DependentUpon>ProfileConfig.cs</DependentUpon> <DependentUpon>ProfileConfig.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="config\PSX\PSXOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\PSX\PSXOptions.Designer.cs">
<DependentUpon>PSXOptions.cs</DependentUpon>
</Compile>
<Compile Include="config\RewindConfig.cs"> <Compile Include="config\RewindConfig.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -1171,6 +1177,9 @@
<EmbeddedResource Include="config\ProfileConfig.resx"> <EmbeddedResource Include="config\ProfileConfig.resx">
<DependentUpon>ProfileConfig.cs</DependentUpon> <DependentUpon>ProfileConfig.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="config\PSX\PSXOptions.resx">
<DependentUpon>PSXOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\RewindConfig.resx"> <EmbeddedResource Include="config\RewindConfig.resx">
<DependentUpon>RewindConfig.cs</DependentUpon> <DependentUpon>RewindConfig.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

674
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1776,6 +1776,12 @@ namespace BizHawk.Client.EmuHawk
SNESOptions.DoSettingsDialog(this); SNESOptions.DoSettingsDialog(this);
} }
private void PSXOptionsMenuItem_Click(object sender, EventArgs e)
{
//help me, i dont want to mess with doing this the right way right now
new PSXOptions().ShowDialog();
}
#endregion #endregion
#region Coleco #region Coleco

7
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1543,6 +1543,7 @@ namespace BizHawk.Client.EmuHawk
GBASubMenu.Visible = false; GBASubMenu.Visible = false;
AtariSubMenu.Visible = false; AtariSubMenu.Visible = false;
SNESSubMenu.Visible = false; SNESSubMenu.Visible = false;
PSXSubMenu.Visible = false;
ColecoSubMenu.Visible = false; ColecoSubMenu.Visible = false;
N64SubMenu.Visible = false; N64SubMenu.Visible = false;
SaturnSubMenu.Visible = false; SaturnSubMenu.Visible = false;
@ -1588,6 +1589,9 @@ namespace BizHawk.Client.EmuHawk
case "A26": case "A26":
AtariSubMenu.Visible = true; AtariSubMenu.Visible = true;
break; break;
case "PSX":
PSXSubMenu.Visible = true;
break;
case "SNES": case "SNES":
case "SGB": case "SGB":
// TODO: fix SNES9x here // TODO: fix SNES9x here
@ -3702,5 +3706,8 @@ namespace BizHawk.Client.EmuHawk
{ {
FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild; FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild;
} }
} }
} }

2
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -21,7 +21,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
)] )]
public unsafe class Octoshock : IEmulator, IVideoProvider, ISyncSoundProvider, IMemoryDomains, ISaveRam public unsafe class Octoshock : IEmulator, IVideoProvider, ISyncSoundProvider, IMemoryDomains, ISaveRam
{ {
public string SystemId { get { return "NULL"; } } public string SystemId { get { return "PSX"; } }
public static readonly ControllerDefinition DualShockController = new ControllerDefinition public static readonly ControllerDefinition DualShockController = new ControllerDefinition
{ {