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

more mainform code cleanup

This commit is contained in:
adelikat 2013-10-27 13:53:28 +00:00
parent fa40ae718f
commit 9218e298dd
5 changed files with 1217 additions and 1156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -212,7 +212,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo
//check fceux's PowerNES and FCEU_MemoryRand function for more information: //check fceux's PowerNES and FCEU_MemoryRand function for more information:
//relevant games: Cybernoid; Minna no Taabou no Nakayoshi Daisakusen; Huang Di; and maybe mechanized attack //relevant games: Cybernoid; Minna no Taabou no Nakayoshi Daisakusen; Huang Di; and maybe mechanized attack
for(int i=0;i<0x800;i++) if((i&4)!=0) ram[i] = 0xFF; else ram[i] = 0x00;
//for(int i=0;i<0x800;i++) if((i&4)!=0) ram[i] = 0xFF; else ram[i] = 0x00;
Random r = new Random();
for (int i = 0; i < 0x800; i++)
{
ram[i] = (byte)(r.Next(0, 256));
}
SetupMemoryDomains(); SetupMemoryDomains();

1214
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1079
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

File diff suppressed because it is too large Load Diff

70
BizHawk.MultiClient/MainForm.cs
View File

@ -439,7 +439,7 @@ namespace BizHawk.MultiClient
if (!INTERIM) if (!INTERIM)
{ {
debuggerToolStripMenuItem.Enabled = false; NESDebuggerMenuItem.Enabled = false;
//luaConsoleToolStripMenuItem.Enabled = false; //luaConsoleToolStripMenuItem.Enabled = false;
} }
@ -857,17 +857,17 @@ namespace BizHawk.MultiClient
system = Global.Game.System; system = Global.Game.System;
} }
tI83ToolStripMenuItem.Visible = false; TI83SubMenu.Visible = false;
NESToolStripMenuItem.Visible = false; NESSubMenu.Visible = false;
pCEToolStripMenuItem.Visible = false; PCESubMenu.Visible = false;
sMSToolStripMenuItem.Visible = false; SMSSubMenu.Visible = false;
gBToolStripMenuItem.Visible = false; GBSubMenu.Visible = false;
gBAToolStripMenuItem.Visible = false; GBASubMenu.Visible = false;
atariToolStripMenuItem.Visible = false; AtariSubMenu.Visible = false;
sNESToolStripMenuItem.Visible = false; SNESSubMenu.Visible = false;
colecoToolStripMenuItem.Visible = false; ColecoSubMenu.Visible = false;
n64ToolStripMenuItem.Visible = false; N64SubMenu.Visible = false;
saturnToolStripMenuItem.Visible = false; SaturnSubMenu.Visible = false;
switch (system) switch (system)
{ {
@ -875,66 +875,66 @@ namespace BizHawk.MultiClient
case "GEN": case "GEN":
break; break;
case "NULL": case "NULL":
n64ToolStripMenuItem.Visible = true; N64SubMenu.Visible = true;
break; break;
case "TI83": case "TI83":
tI83ToolStripMenuItem.Visible = true; TI83SubMenu.Visible = true;
break; break;
case "NES": case "NES":
NESToolStripMenuItem.Visible = true; NESSubMenu.Visible = true;
NESSpeicalMenuControls(); NESSpeicalMenuControls();
break; break;
case "PCE": case "PCE":
case "PCECD": case "PCECD":
case "SGX": case "SGX":
pCEToolStripMenuItem.Visible = true; PCESubMenu.Visible = true;
break; break;
case "SMS": case "SMS":
sMSToolStripMenuItem.Text = "SMS"; SMSSubMenu.Text = "SMS";
sMSToolStripMenuItem.Visible = true; SMSSubMenu.Visible = true;
break; break;
case "SG": case "SG":
sMSToolStripMenuItem.Text = "SG"; SMSSubMenu.Text = "SG";
sMSToolStripMenuItem.Visible = true; SMSSubMenu.Visible = true;
break; break;
case "GG": case "GG":
sMSToolStripMenuItem.Text = "GG"; SMSSubMenu.Text = "GG";
sMSToolStripMenuItem.Visible = true; SMSSubMenu.Visible = true;
break; break;
case "GB": case "GB":
case "GBC": case "GBC":
gBToolStripMenuItem.Visible = true; GBSubMenu.Visible = true;
break; break;
case "GBA": case "GBA":
gBAToolStripMenuItem.Visible = true; GBASubMenu.Visible = true;
break; break;
case "A26": case "A26":
atariToolStripMenuItem.Visible = true; AtariSubMenu.Visible = true;
break; break;
case "SNES": case "SNES":
case "SGB": case "SGB":
if ((Global.Emulator as LibsnesCore).IsSGB) if ((Global.Emulator as LibsnesCore).IsSGB)
sNESToolStripMenuItem.Text = "&SGB"; SNESSubMenu.Text = "&SGB";
else else
sNESToolStripMenuItem.Text = "&SNES"; SNESSubMenu.Text = "&SNES";
sNESToolStripMenuItem.Visible = true; SNESSubMenu.Visible = true;
break; break;
case "Coleco": case "Coleco":
colecoToolStripMenuItem.Visible = true; ColecoSubMenu.Visible = true;
break; break;
case "N64": case "N64":
n64ToolStripMenuItem.Visible = true; N64SubMenu.Visible = true;
break; break;
case "SAT": case "SAT":
saturnToolStripMenuItem.Visible = true; SaturnSubMenu.Visible = true;
break; break;
} }
} }
void NESSpeicalMenuAdd(string name, string button, string msg) void NESSpeicalMenuAdd(string name, string button, string msg)
{ {
nESSpeicalToolStripMenuItem.Visible = true; NESSpecialControlsMenuItem.Visible = true;
nESSpeicalToolStripMenuItem.DropDownItems.Add(name, null, delegate NESSpecialControlsMenuItem.DropDownItems.Add(name, null, delegate
{ {
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains(button)) if (Global.Emulator.ControllerDefinition.BoolButtons.Contains(button))
{ {
@ -950,8 +950,8 @@ namespace BizHawk.MultiClient
void NESSpeicalMenuControls() void NESSpeicalMenuControls()
{ {
// ugly and hacky // ugly and hacky
nESSpeicalToolStripMenuItem.Visible = false; NESSpecialControlsMenuItem.Visible = false;
nESSpeicalToolStripMenuItem.DropDownItems.Clear(); NESSpecialControlsMenuItem.DropDownItems.Clear();
var ss = Global.Emulator.ControllerDefinition.BoolButtons; var ss = Global.Emulator.ControllerDefinition.BoolButtons;
if (ss.Contains("FDS Eject")) if (ss.Contains("FDS Eject"))
NESSpeicalMenuAdd("Eject Disk", "FDS Eject", "FDS Disk Ejected."); NESSpeicalMenuAdd("Eject Disk", "FDS Eject", "FDS Disk Ejected.");

2
BizHawk.MultiClient/MainForm.resx
View File

@ -121,7 +121,7 @@
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="N64PluginSettingsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="N64PluginSettingsMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAANjr9RwUqgAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAANjr9RwUqgAAACBjSFJNAACH
CAAAjBkAAPxwAACE1AAAe3cAAO0tAAA8/QAAIDiUKOg8AAACJWlDQ1BJQ0MgUHJvZmlsZQAAOMutkz9o CAAAjBkAAPxwAACE1AAAe3cAAO0tAAA8/QAAIDiUKOg8AAACJWlDQ1BJQ0MgUHJvZmlsZQAAOMutkz9o