From 47b1e3ae49235c564bdca63ba91dd206469c3ad3 Mon Sep 17 00:00:00 2001 From: goyuken Date: Wed, 16 Apr 2014 02:11:22 +0000 Subject: [PATCH] I AM MASTER OVER DOG --- BizHawk.Client.EmuHawk/Input/Input.cs | 7 +++++++ BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.EmuHawk/Input/Input.cs b/BizHawk.Client.EmuHawk/Input/Input.cs index 95dc02da29..3fa45ce956 100644 --- a/BizHawk.Client.EmuHawk/Input/Input.cs +++ b/BizHawk.Client.EmuHawk/Input/Input.cs @@ -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); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs index 55b4b5ed48..2b235bca8c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs @@ -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; }