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

Rip out "wasPressed" code, remove debug code left in by accident from inputwidget

This commit is contained in:
andres.delikat 2011-07-09 23:35:26 +00:00
parent 4ac74a20b3
commit f3e4cdcd16
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/MainForm.cs
View File

@ -44,7 +44,6 @@ namespace BizHawk.MultiClient
bool runloop_frameadvance; bool runloop_frameadvance;
DateTime runloop_second; DateTime runloop_second;
bool runloop_last_ff; bool runloop_last_ff;
public string wasPressed = ""; //Last frame mnemonic
Throttle throttle = new Throttle(); Throttle throttle = new Throttle();
bool unthrottled = false; bool unthrottled = false;
@ -1203,8 +1202,6 @@ namespace BizHawk.MultiClient
UnpauseEmulator(); UnpauseEmulator();
} }
} }
wasPressed = Global.GetOutputControllersAsMnemonic();
PressFrameAdvance = false; PressFrameAdvance = false;
} }
else else

14
BizHawk.MultiClient/RenderPanel.cs
View File

@ -338,7 +338,6 @@ namespace BizHawk.MultiClient
} }
if (Global.Config.DisplayInput) if (Global.Config.DisplayInput)
{ {
string input = MakeLastInputDisplay();
Color c; Color c;
x = GetX(Global.Config.DispInpx, Global.Config.DispInpanchor); x = GetX(Global.Config.DispInpx, Global.Config.DispInpanchor);
y = GetY(Global.Config.DispInpy, Global.Config.DispInpanchor); y = GetY(Global.Config.DispInpy, Global.Config.DispInpanchor);
@ -349,9 +348,8 @@ namespace BizHawk.MultiClient
else else
c = Color.FromArgb(Global.Config.MessagesColor); c = Color.FromArgb(Global.Config.MessagesColor);
MessageFont.DrawString(null, input, x + 2, y + 2, new Color4(Color.Black)); string input = MakeInputDisplay();
MessageFont.DrawString(null, input, x + 1, y + 1, Color.FromArgb(Global.Config.LastInputColor)); MessageFont.DrawString(null, input, x + 1, y + 1, Color.Black);
input = MakeInputDisplay();
MessageFont.DrawString(null, input, x, y, c); MessageFont.DrawString(null, input, x, y, c);
} }
if (Global.MainForm.UserMovie.MultiTrack.IsActive) if (Global.MainForm.UserMovie.MultiTrack.IsActive)
@ -489,14 +487,6 @@ namespace BizHawk.MultiClient
return tmp; return tmp;
} }
public string MakeLastInputDisplay()
{
string tmp = Global.MainForm.wasPressed;
tmp = tmp.Replace(".", " ");
tmp = tmp.Replace("|", "");
return tmp;
}
public string MakeRerecordCount() public string MakeRerecordCount()
{ {
string tmp = ""; string tmp = "";

1
BizHawk.MultiClient/config/InputWidget.cs
View File

@ -30,7 +30,6 @@ namespace BizHawk.MultiClient
this.timer.Tick += new System.EventHandler(this.Timer_Tick); this.timer.Tick += new System.EventHandler(this.Timer_Tick);
InitializeBindings(); InitializeBindings();
tooltip1.AutoPopDelay = 2000; tooltip1.AutoPopDelay = 2000;
FlagDuplicate("Ur mom's button");
} }
public InputWidget(int maxBindings) public InputWidget(int maxBindings)