From 0abbc77bff1375494895250e5b5ae0570e636d95 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 11 Dec 2006 20:43:55 +0000
Subject: [PATCH] Fixed bug where paddle speeds weren't being properly set.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1204 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 stella/src/emucore/EventHandler.cxx |  4 ++--
 stella/src/gui/InputDialog.cxx      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index 643cb98a4..a40a04a3b 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.184 2006-12-10 18:07:39 stephena Exp $
+// $Id: EventHandler.cxx,v 1.185 2006-12-11 20:43:43 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -2201,7 +2201,7 @@ void EventHandler::setPaddleSpeed(int num, int speed)
 
   myPaddle[num].amt = (int) (20000 + speed/100.0 * 50000);
   ostringstream buf;
-  buf << "p" << num+1 << "speed";
+  buf << "p" << num << "speed";
   myOSystem->settings().setInt(buf.str(), speed);
 }
 
diff --git a/stella/src/gui/InputDialog.cxx b/stella/src/gui/InputDialog.cxx
index 755e8f583..b05b5bec3 100644
--- a/stella/src/gui/InputDialog.cxx
+++ b/stella/src/gui/InputDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: InputDialog.cxx,v 1.19 2006-12-09 00:25:20 stephena Exp $
+// $Id: InputDialog.cxx,v 1.20 2006-12-11 20:43:55 stephena Exp $
 //============================================================================
 
 // FIXME - this whole dialog should be a dialog of buttons instead of
@@ -148,7 +148,7 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
   // Add paddle 0 speed
   xpos = 5;  ypos += lineHeight + 3;
   myPaddleSpeed[0] = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                      "Paddle 1 speed: ",
+                                      "Paddle 0 speed: ",
                                       lwidth, kP0SpeedID);
   myPaddleSpeed[0]->setMinValue(1); myPaddleSpeed[0]->setMaxValue(100);
   xpos += myPaddleSpeed[0]->getWidth() + 5;
@@ -160,7 +160,7 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
   // Add paddle 1 speed
   xpos = 5;  ypos += lineHeight + 3;
   myPaddleSpeed[1] = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                      "Paddle 2 speed: ",
+                                      "Paddle 1 speed: ",
                                       lwidth, kP1SpeedID);
   myPaddleSpeed[1]->setMinValue(1); myPaddleSpeed[1]->setMaxValue(100);
   xpos += myPaddleSpeed[1]->getWidth() + 5;
@@ -172,7 +172,7 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
   // Add paddle 2 speed
   xpos = 5;  ypos += lineHeight + 3;
   myPaddleSpeed[2] = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                      "Paddle 3 speed: ",
+                                      "Paddle 2 speed: ",
                                       lwidth, kP2SpeedID);
   myPaddleSpeed[2]->setMinValue(1); myPaddleSpeed[2]->setMaxValue(100);
   xpos += myPaddleSpeed[2]->getWidth() + 5;
@@ -184,7 +184,7 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
   // Add paddle 3 speed
   xpos = 5;  ypos += lineHeight + 3;
   myPaddleSpeed[3] = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                      "Paddle 4 speed: ",
+                                      "Paddle 3 speed: ",
                                       lwidth, kP3SpeedID);
   myPaddleSpeed[3]->setMinValue(1); myPaddleSpeed[3]->setMaxValue(100);
   xpos += myPaddleSpeed[3]->getWidth() + 5;