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

tastudio: when loading another project, update column menus 

todo: fix autoload
This commit is contained in:
feos 2016-11-14 22:39:58 +03:00
parent 52506433a2
commit 0b1245d769
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -432,15 +432,6 @@ namespace BizHawk.Client.EmuHawk
var columnNames = GenerateColumnNames(); var columnNames = GenerateColumnNames();
foreach (var kvp in columnNames) foreach (var kvp in columnNames)
{ {
// N64 hack for now, for fake analog
//if (Emulator.SystemId == "N64")
//{
// if (kvp.Key.Contains("A Up") || kvp.Key.Contains("A Down") ||
// kvp.Key.Contains("A Left") || kvp.Key.Contains("A Right"))
// {
// continue;
// }
//}
AddColumn(kvp.Key, kvp.Value, (kvp.Value.Length * 6) + 14); AddColumn(kvp.Key, kvp.Value, (kvp.Value.Length * 6) + 14);
} }
@ -481,6 +472,7 @@ namespace BizHawk.Client.EmuHawk
for (int i = bStart; i < BoolPatterns.Length - 2; i++) for (int i = bStart; i < BoolPatterns.Length - 2; i++)
BoolPatterns[i] = new AutoPatternBool(1, 1); BoolPatterns[i] = new AutoPatternBool(1, 1);
BoolPatterns[BoolPatterns.Length - 2] = new AutoPatternBool(1, 0); BoolPatterns[BoolPatterns.Length - 2] = new AutoPatternBool(1, 0);
BoolPatterns[BoolPatterns.Length - 1] = new AutoPatternBool( BoolPatterns[BoolPatterns.Length - 1] = new AutoPatternBool(
Global.Config.AutofireOn, Global.Config.AutofireOff); Global.Config.AutofireOn, Global.Config.AutofireOff);
@ -554,14 +546,16 @@ namespace BizHawk.Client.EmuHawk
Settings.RecentTas.Add(newMovie.Filename); // only add if it did load Settings.RecentTas.Add(newMovie.Filename); // only add if it did load
if (TasView.AllColumns.Count() == 0 || file.Extension != "." + TasMovie.Extension)
SetUpColumns();
if (startsFromSavestate) if (startsFromSavestate)
GoToFrame(0); GoToFrame(0);
else else
GoToFrame(CurrentTasMovie.Session.CurrentFrame); GoToFrame(CurrentTasMovie.Session.CurrentFrame);
if (TasView.AllColumns.Count() == 0 || file.Extension != "." + TasMovie.Extension)
SetUpColumns();
else
SetUpToolStripColumns();
CurrentTasMovie.PropertyChanged += new PropertyChangedEventHandler(this.TasMovie_OnPropertyChanged); CurrentTasMovie.PropertyChanged += new PropertyChangedEventHandler(this.TasMovie_OnPropertyChanged);
CurrentTasMovie.CurrentBranch = CurrentTasMovie.Session.CurrentBranch; CurrentTasMovie.CurrentBranch = CurrentTasMovie.Session.CurrentBranch;