From 39ee43ee6668292cc9fc0c0a887bf706b03c161d Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Sat, 17 Dec 2016 21:45:28 +0100
Subject: [PATCH] Fix wide player positioning, adjust NUSIZx during decode to
 better match real hardware.

---
 src/emucore/tia/Player.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/emucore/tia/Player.cxx b/src/emucore/tia/Player.cxx
index d05102712..005e9d7ca 100644
--- a/src/emucore/tia/Player.cxx
+++ b/src/emucore/tia/Player.cxx
@@ -88,8 +88,8 @@ void Player::nusiz(uInt8 value)
   if (myIsRendering && myRenderCounter >= myWidth)
     myIsRendering = false;
 
-  if (myIsRendering && myRenderCounter < -2 && myWidth > 8 && oldWidth == 8)
-    myRenderCounter -= 2;
+  if (myIsRendering && myRenderCounter < 0 && myWidth > 8 && oldWidth == 8)
+    myRenderCounter += (myRenderCounter < -2 ? -1 : 1);
 
   if (oldWidth != myWidth) updatePattern();
 }
@@ -195,7 +195,7 @@ void Player::tick()
 {
   if (myDecodes[myCounter]) {
     myIsRendering = true;
-    myRenderCounter = myWidth > 8 ? Count::renderCounterOffset : Count::renderCounterOffset;
+    myRenderCounter = myWidth > 8 ? Count::renderCounterOffsetWide : Count::renderCounterOffset;
   } else if (myIsRendering && ++myRenderCounter >= myWidth) {
     myIsRendering = false;
   }