summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLPFaint99 <lpfaint99@gmail.com>2012-03-07 20:08:14 -0800
committerLPFaint99 <lpfaint99@gmail.com>2012-03-07 20:08:14 -0800
commit6fc8cdf12d41ea9f9be2d345face72ddf1fe045d (patch)
treeeaf0a4c244dfb936bec86e21a4402643f1d67881 /Source/Core
parent09217a6c47968d3d411c664514fbc9a50e03d970 (diff)
revert r90a2096a24f4 behavior changes in PixelEngine.cpp. Thanks to Autoran1 for finding the responsible commit. Fixes Scrubbing Serena Beach Countdown in both SC and DC.
Fixes issue 1498.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoCommon/Src/PixelEngine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
index 456e0fb535..8164bc41da 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp
@@ -269,6 +269,10 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
case PE_PERF_5L:
case PE_PERF_5H:
INFO_LOG(PIXELENGINE, "(r16) perf counter @ %08x", _iAddress);
+ // git r90a2096a24f4 (svn r3663) added the PE_PERF cases, without setting
+ // _uReturnValue to anything, this reverts to the previous behaviour which allows
+ // The timer in SMS:Scrubbing Serena Beach to countdown correctly
+ _uReturnValue = 1;
break;
default: