From f3e4cdcd16a1765a85d24cbe031bb851cc609855 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 9 Jul 2011 23:35:26 +0000 Subject: [PATCH] Rip out "wasPressed" code, remove debug code left in by accident from inputwidget --- BizHawk.MultiClient/MainForm.cs | 3 --- BizHawk.MultiClient/RenderPanel.cs | 14 ++------------ BizHawk.MultiClient/config/InputWidget.cs | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index d2f0b5fddd..ad852c1df4 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -44,7 +44,6 @@ namespace BizHawk.MultiClient bool runloop_frameadvance; DateTime runloop_second; bool runloop_last_ff; - public string wasPressed = ""; //Last frame mnemonic Throttle throttle = new Throttle(); bool unthrottled = false; @@ -1203,8 +1202,6 @@ namespace BizHawk.MultiClient UnpauseEmulator(); } } - - wasPressed = Global.GetOutputControllersAsMnemonic(); PressFrameAdvance = false; } else diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 45a22d88a2..59b5360e42 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -338,7 +338,6 @@ namespace BizHawk.MultiClient } if (Global.Config.DisplayInput) { - string input = MakeLastInputDisplay(); Color c; x = GetX(Global.Config.DispInpx, Global.Config.DispInpanchor); y = GetY(Global.Config.DispInpy, Global.Config.DispInpanchor); @@ -349,9 +348,8 @@ namespace BizHawk.MultiClient else c = Color.FromArgb(Global.Config.MessagesColor); - MessageFont.DrawString(null, input, x + 2, y + 2, new Color4(Color.Black)); - MessageFont.DrawString(null, input, x + 1, y + 1, Color.FromArgb(Global.Config.LastInputColor)); - input = MakeInputDisplay(); + string input = MakeInputDisplay(); + MessageFont.DrawString(null, input, x + 1, y + 1, Color.Black); MessageFont.DrawString(null, input, x, y, c); } if (Global.MainForm.UserMovie.MultiTrack.IsActive) @@ -489,14 +487,6 @@ namespace BizHawk.MultiClient return tmp; } - public string MakeLastInputDisplay() - { - string tmp = Global.MainForm.wasPressed; - tmp = tmp.Replace(".", " "); - tmp = tmp.Replace("|", ""); - return tmp; - } - public string MakeRerecordCount() { string tmp = ""; diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs index c5444a3f1f..7688c58e57 100644 --- a/BizHawk.MultiClient/config/InputWidget.cs +++ b/BizHawk.MultiClient/config/InputWidget.cs @@ -30,7 +30,6 @@ namespace BizHawk.MultiClient this.timer.Tick += new System.EventHandler(this.Timer_Tick); InitializeBindings(); tooltip1.AutoPopDelay = 2000; - FlagDuplicate("Ur mom's button"); } public InputWidget(int maxBindings)