diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs index 3e84c844ac..9f3a3b2e1d 100644 --- a/BizHawk.MultiClient/LuaImplementation.cs +++ b/BizHawk.MultiClient/LuaImplementation.cs @@ -1218,9 +1218,6 @@ namespace BizHawk.MultiClient if (button.Substring(0, 2) == "P" + LuaInt(controller).ToString()) buttons[button] = Global.ControllerOutput[button]; - foreach (var asd in Global.ControllerOutput.Source.Type.FloatControls) - MessageBox.Show(asd); - //zero 23-mar-2012 - wtf is this?????? buttons["clear"] = null; buttons["getluafunctionslist"] = null; diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs index 365918aac7..197d68855c 100644 --- a/BizHawk.MultiClient/PlayMovie.cs +++ b/BizHawk.MultiClient/PlayMovie.cs @@ -72,8 +72,8 @@ namespace BizHawk.MultiClient { OpenFileDialog ofd = new OpenFileDialog(); ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, ""); - //ofd.Filter = "Generic Movie Files (*.tas)|*.tas;*.zip;*.7z|" + Global.MainForm.GetMovieExtName() + "|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*"; - ofd.Filter = "Generic Movie Files (*.tas)|*.tas;*.zip;*.7z|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*"; + ofd.Filter = "Generic Movie Files (*.tas)|*.tas;*.zip;*.7z|" + Global.MainForm.GetMovieExtName() + "|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*"; + //ofd.Filter = "Generic Movie Files (*.tas)|*.tas;*.zip;*.7z|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*"; Global.Sound.StopSound(); var result = ofd.ShowDialog(); diff --git a/BizHawk.MultiClient/RecordMovie.cs b/BizHawk.MultiClient/RecordMovie.cs index d75948d61a..fe7d2ff0ca 100644 --- a/BizHawk.MultiClient/RecordMovie.cs +++ b/BizHawk.MultiClient/RecordMovie.cs @@ -111,8 +111,8 @@ namespace BizHawk.MultiClient sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, ""); sfd.DefaultExt = ".tas"; sfd.FileName = PathManager.FilesystemSafeName(Global.Game) + "." + sfd.DefaultExt; - //sfd.Filter = "Generic Movie Files (*.tas)|*.tas|" + Global.MainForm.GetMovieExtName() + "|All Files (*.*)|*.*"; - sfd.Filter = "Generic Movie Files (*.tas)|*.tas|All Files (*.*)|*.*"; + sfd.Filter = "Generic Movie Files (*.tas)|*.tas|" + Global.MainForm.GetMovieExtName() + "|All Files (*.*)|*.*"; + //sfd.Filter = "Generic Movie Files (*.tas)|*.tas|All Files (*.*)|*.*"; Global.Sound.StopSound(); var result = sfd.ShowDialog();