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

I AM MASTER OVER DOG

This commit is contained in:
goyuken 2014-04-16 02:11:22 +00:00
parent 9730d06a46
commit 47b1e3ae49
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -351,6 +351,13 @@ namespace BizHawk.Client.EmuHawk
// coordinate translation happens later
FloatValues["WMouse X"] = P.X;
FloatValues["WMouse Y"] = P.Y;
var B = System.Windows.Forms.Control.MouseButtons;
HandleButton("WMouse L", (B & System.Windows.Forms.MouseButtons.Left) != 0);
HandleButton("WMouse M", (B & System.Windows.Forms.MouseButtons.Middle) != 0);
HandleButton("WMouse R", (B & System.Windows.Forms.MouseButtons.Right) != 0);
HandleButton("WMouse 1", (B & System.Windows.Forms.MouseButtons.XButton1) != 0);
HandleButton("WMouse 2", (B & System.Windows.Forms.MouseButtons.XButton2) != 0);
}
}

11
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -48,10 +48,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// untested so far
int sum = 0;
int ymin = Math.Max(Math.Max(y - 20, ppur.status.sl - 30), 0);
int ymax = Math.Min(Math.Min(y + 20, ppur.status.sl + 5),239);
int xmin = Math.Max(0, x - 20);
int xmax = Math.Min(255, x + 20);
int ymin = Math.Max(Math.Max(y - 30, ppur.status.sl - 20), 0);
int ymax = Math.Min(Math.Min(y + 30, ppur.status.sl + 2),239);
int xmin = Math.Max(0, x - 30);
int xmax = Math.Min(255, x + 30);
for (int j = ymin; j <= ymax; j++)
{
@ -64,7 +64,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
sum += lum;
}
}
return sum >= 40000;
// judging from Duck Hunt 3rd mode (skeet shooting), this is about correct
return sum >= 9001;
}