From 3517259982fdead9bae48a040fa26c3f712060b4 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Wed, 28 Oct 2015 15:27:34 +0000
Subject: [PATCH] Fixed bug in reading paddle input from Stelladaptor; I was a
 little too eager in code cleanup from 4.6.1.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3229 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 Changes.txt             | 12 ++++++++++--
 src/emucore/Paddles.cxx |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index 7fbb6a987..765d66a13 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,6 +12,16 @@
                                Release History
 ===========================================================================
 
+4.6.6 to 4.6.7: (October xx, 2015)
+
+  * Fixed bug introduced in version 4.6.5, whereby real paddles plugged
+    into a Stelladaptor/2600-daptor weren't working correctly.
+
+  * Fixed small logic error in 'MDM' bankswitching scheme.
+
+-Have fun!
+
+
 4.6.5 to 4.6.6: (October 11, 2015)
 
   * Added 'Alt/Cmd + j' shortcut key and 'tv.jitter' commandline argument
@@ -21,8 +31,6 @@
   * Fixed bug in 'MDM' bankswitch scheme; bankswitching wasn't being
     done under certain circumstances.
 
--Have fun!
-
 
 4.6.1 to 4.6.5: (September 26, 2015)
 
diff --git a/src/emucore/Paddles.cxx b/src/emucore/Paddles.cxx
index e7f21916f..fe3296522 100644
--- a/src/emucore/Paddles.cxx
+++ b/src/emucore/Paddles.cxx
@@ -269,12 +269,12 @@ void Paddles::update()
   int sa_yaxis = myEvent.get(myP1AxisValue);
   if(abs(myLastAxisX - sa_xaxis) > 10)
   {
-    myAnalogPinValue[Nine] = Int32(1400000 * (32767 - Int16(sa_xaxis)) / 65536.0);
+    myAnalogPinValue[Nine] = Int32(1400000 * ((32767 - Int16(sa_xaxis)) / 65536.0));
     sa_changed = true;
   }
   if(abs(myLastAxisY - sa_yaxis) > 10)
   {
-    myAnalogPinValue[Five] = Int32(1400000 * (32767 - Int16(sa_yaxis)) / 65536.0);
+    myAnalogPinValue[Five] = Int32(1400000 * ((32767 - Int16(sa_yaxis)) / 65536.0));
     sa_changed = true;
   }
   myLastAxisX = sa_xaxis;