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

clean up some warnings

This commit is contained in:
adelikat 2016-01-30 21:28:49 -05:00
parent aaf4d39b58
commit 5ddd9e097b
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs
View File

@ -80,7 +80,7 @@ namespace BizHawk.Client.Common
"readbyterange", "readbyterange",
"Reads the address range that starts from address, and is length long. Returns the result into a table of key value pairs (where the address is the key)." "Reads the address range that starts from address, and is length long. Returns the result into a table of key value pairs (where the address is the key)."
)] )]
public new LuaTable ReadByteRange(int addr, int length) public LuaTable ReadByteRange(int addr, int length)
{ {
return base.ReadByteRange(addr, length); return base.ReadByteRange(addr, length);
} }
@ -89,7 +89,7 @@ namespace BizHawk.Client.Common
"writebyterange", "writebyterange",
"Writes the given values to the given addresses as unsigned bytes" "Writes the given values to the given addresses as unsigned bytes"
)] )]
public new void WriteByteRange(LuaTable memoryblock) public void WriteByteRange(LuaTable memoryblock)
{ {
base.WriteByteRange(memoryblock); base.WriteByteRange(memoryblock);
} }
@ -98,7 +98,7 @@ namespace BizHawk.Client.Common
"readfloat", "readfloat",
"Reads the given address as a 32-bit float value from the main memory domain with th e given endian" "Reads the given address as a 32-bit float value from the main memory domain with th e given endian"
)] )]
public new float ReadFloat(int addr, bool bigendian) public float ReadFloat(int addr, bool bigendian)
{ {
return base.ReadFloat(addr, bigendian); return base.ReadFloat(addr, bigendian);
} }
@ -107,7 +107,7 @@ namespace BizHawk.Client.Common
"writefloat", "writefloat",
"Writes the given 32-bit float value to the given address and endian" "Writes the given 32-bit float value to the given address and endian"
)] )]
public new void WriteFloat(int addr, double value, bool bigendian) public void WriteFloat(int addr, double value, bool bigendian)
{ {
base.WriteFloat(addr, value, bigendian); base.WriteFloat(addr, value, bigendian);
} }

5
BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -135,11 +135,6 @@ namespace BizHawk.Client.EmuHawk
i = 0; i = 0;
} }
if (button == "Pointer Pressed")
{
int zzz = 9;
}
if (categoryLabels.ContainsKey(button)) if (categoryLabels.ContainsKey(button))
categoryBuckets[categoryLabels[button]].Add(button); categoryBuckets[categoryLabels[button]].Add(button);
else buckets[i].Add(button); else buckets[i].Add(button);

1
BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs generated
View File

@ -79,7 +79,6 @@
this.Controls.Add(this.ButtonNameLabel); this.Controls.Add(this.ButtonNameLabel);
this.Name = "BotControlsRow"; this.Name = "BotControlsRow";
this.Size = new System.Drawing.Size(350, 29); this.Size = new System.Drawing.Size(350, 29);
this.Load += new System.EventHandler(this.BotControlsRow_Load);
((System.ComponentModel.ISupportInitialize)(this.ProbabilityUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ProbabilityUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ProbabilitySlider)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ProbabilitySlider)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);

27
BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.cs
View File

@ -26,25 +26,26 @@ namespace BizHawk.Client.EmuHawk
set { ProbabilityUpDown.Value = (decimal)value; } set { ProbabilityUpDown.Value = (decimal)value; }
} }
private void BotControlsRow_Load(object sender, EventArgs e)
{
}
private void ProbabilityUpDown_ValueChanged(object sender, EventArgs e) private void ProbabilityUpDown_ValueChanged(object sender, EventArgs e)
{ {
_programmaticallyChangingValues = true; if (!_programmaticallyChangingValues)
ProbabilitySlider.Value = (int)ProbabilityUpDown.Value; {
ChangedCallback(); _programmaticallyChangingValues = true;
_programmaticallyChangingValues = false; ProbabilitySlider.Value = (int)ProbabilityUpDown.Value;
ChangedCallback();
_programmaticallyChangingValues = false;
}
} }
private void ProbabilitySlider_ValueChanged(object sender, EventArgs e) private void ProbabilitySlider_ValueChanged(object sender, EventArgs e)
{ {
_programmaticallyChangingValues = true; if (!_programmaticallyChangingValues)
ProbabilityUpDown.Value = ProbabilitySlider.Value; {
ChangedCallback(); _programmaticallyChangingValues = true;
_programmaticallyChangingValues = false; ProbabilityUpDown.Value = ProbabilitySlider.Value;
ChangedCallback();
_programmaticallyChangingValues = false;
}
} }
private void ChangedCallback() private void ChangedCallback()