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

Bind ROM in HawkFile, add .rom to open file dialog (and a TI-83 row), fix a bunch of tool dialogs to end the Restart() method if dialog is not open. TI-83 will now open properly again.

This commit is contained in:
andres.delikat 2011-04-21 00:28:04 +00:00
parent 34894b322d
commit c76f9ed729
8 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/MainForm.cs
View File

@ -505,7 +505,7 @@ namespace BizHawk.MultiClient
//try binding normal rom extensions first //try binding normal rom extensions first
if (!file.IsBound) if (!file.IsBound)
file.BindSoleItemOf("SMS", "PCE", "SGX", "GG", "SG", "BIN", "SMD", "GB", "NES"); file.BindSoleItemOf("SMS", "PCE", "SGX", "GG", "SG", "BIN", "SMD", "GB", "NES", "ROM");
//if we have an archive and need to bind something, then pop the dialog //if we have an archive and need to bind something, then pop the dialog
if (file.IsArchive && !file.IsBound) if (file.IsArchive && !file.IsBound)
@ -1470,7 +1470,7 @@ namespace BizHawk.MultiClient
{ {
var ofd = new OpenFileDialog(); var ofd = new OpenFileDialog();
ofd.InitialDirectory = Global.Config.LastRomPath; ofd.InitialDirectory = Global.Config.LastRomPath;
ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|Archive Files|*.zip;*.7z|All Files|*.*"; ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|All Files|*.*";
ofd.RestoreDirectory = true; ofd.RestoreDirectory = true;
Global.Sound.StopSound(); Global.Sound.StopSound();

2
BizHawk.MultiClient/NEStools/NESDebugger.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
if (!this.IsHandleCreated || this.IsDisposed) return;
} }
private void NESDebugger_Load(object sender, EventArgs e) private void NESDebugger_Load(object sender, EventArgs e)

1
BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
View File

@ -64,6 +64,7 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
if (!(Global.Emulator is NES)) this.Close(); if (!(Global.Emulator is NES)) this.Close();
if (!this.IsHandleCreated || this.IsDisposed) return;
Nes = Global.Emulator as NES; Nes = Global.Emulator as NES;
} }

1
BizHawk.MultiClient/NEStools/NESPPU.cs
View File

@ -41,6 +41,7 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
if (!(Global.Emulator is NES)) this.Close(); if (!(Global.Emulator is NES)) this.Close();
if (!this.IsHandleCreated || this.IsDisposed) return;
Nes = Global.Emulator as NES; Nes = Global.Emulator as NES;
} }

3
BizHawk.MultiClient/tools/Cheats.cs
View File

@ -72,7 +72,8 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
NewCheatList(); NewCheatList(); //Should be run even if dialog isn't open so cheats system can work
if (!this.IsHandleCreated || this.IsDisposed) return;
ClearFields(); ClearFields();
} }

1
BizHawk.MultiClient/tools/HexEditor.cs
View File

@ -76,6 +76,7 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
if (!this.IsHandleCreated || this.IsDisposed) return;
SetMemoryDomainMenu(); //Calls update routines SetMemoryDomainMenu(); //Calls update routines
MemoryViewer.ResetScrollBar(); MemoryViewer.ResetScrollBar();
} }

1
BizHawk.MultiClient/tools/RamSearch.cs
View File

@ -127,6 +127,7 @@ namespace BizHawk.MultiClient
public void Restart() public void Restart()
{ {
if (!this.IsHandleCreated || this.IsDisposed) return;
SetMemoryDomainMenu(); //Calls Start New Search SetMemoryDomainMenu(); //Calls Start New Search
} }

1
BizHawk.MultiClient/tools/RamWatch.cs
View File

@ -17,6 +17,7 @@ namespace BizHawk.MultiClient
public partial class RamWatch : Form public partial class RamWatch : Form
{ {
//TODO: //TODO:
//Restart() method to be called in main
//Restore window size should restore column order as well //Restore window size should restore column order as well
//When receiving a watch from a different domain, should something be done? //When receiving a watch from a different domain, should something be done?