ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed 'paddle' as a saved setting (it can still be set from the 

commandline or by pressing Ctrl-0/1/2/3).  Also removed all related
settings from the settings dialog.

Added a ROM property called 'Controller.PaddleNo', which specifies
which paddle to use for a particular ROM (not all ROMs use paddle 0
be default).

Large update of the ROM properties, based on info from z26.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1151 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-11-19 00:48:55 +00:00
parent 75e050a34b
commit 8ce5a7cdab
10 changed files with 4239 additions and 4245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
stella/src/emucore/Console.cxx
View File

@ -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: Console.cxx,v 1.98 2006-11-08 00:09:53 stephena Exp $
// $Id: Console.cxx,v 1.99 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#include <assert.h>
@ -173,14 +173,15 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
myControllers[1] = new Joystick(rightjack, *myEvent);
}
#if 0 // this isn't production ready yet
// Make a guess at which paddle the mouse should emulate,
// by using the 'first' paddle in the pair
if(myControllers[0]->type() == Controller::Paddles)
myOSystem->eventHandler().setPaddleMode(0);
else if(myControllers[1]->type() == Controller::Paddles)
myOSystem->eventHandler().setPaddleMode(2);
#endif
// Set the paddle number which the mouse will emulate
if(myControllers[0]->type() == Controller::Paddles ||
myControllers[1]->type() == Controller::Paddles)
{
int paddle = myOSystem->settings().getInt("paddle");
if(paddle == -1) // not set on commandline
paddle = atoi(myProperties.get(Controller_PaddleNo).c_str());
myOSystem->eventHandler().setPaddleMode(paddle);
}
// Create switches for the console
mySwitches = new Switches(*myEvent, myProperties);
@ -396,7 +397,7 @@ void Console::initialize()
// VideoDialog box or on the commandline, but it can't be saved
// (ie, framerate is now solely determined based on ROM format).
uInt32 framerate = myOSystem->settings().getInt("framerate");
if(framerate == 0)
if(framerate == -1)
{
const string& s = myProperties.get(Display_Format);
if(s == "NTSC")

8192
stella/src/emucore/DefProps.hxx
View File

File diff suppressed because it is too large Load Diff

14
stella/src/emucore/EventHandler.cxx
View File

@ -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.170 2006-11-13 00:21:40 stephena Exp $
// $Id: EventHandler.cxx,v 1.171 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#include <sstream>
@ -155,8 +155,6 @@ void EventHandler::initialize()
setActionMappings(kMenuMode);
myGrabMouseFlag = myOSystem->settings().getBool("grabmouse");
setPaddleMode(myOSystem->settings().getInt("paddle"), false);
setPaddleThreshold(myOSystem->settings().getInt("pthresh"));
}
@ -181,10 +179,10 @@ void EventHandler::reset(State state)
memset(&myPaddle[i], 0, sizeof(JoyMouse));
myEvent->set(Paddle_Resistance[i], 1000000);
}
setPaddleSpeed(0, myOSystem->settings().getInt("p1speed"));
setPaddleSpeed(1, myOSystem->settings().getInt("p2speed"));
setPaddleSpeed(2, myOSystem->settings().getInt("p3speed"));
setPaddleSpeed(3, myOSystem->settings().getInt("p4speed"));
setPaddleSpeed(0, myOSystem->settings().getInt("p0speed"));
setPaddleSpeed(1, myOSystem->settings().getInt("p1speed"));
setPaddleSpeed(2, myOSystem->settings().getInt("p2speed"));
setPaddleSpeed(3, myOSystem->settings().getInt("p3speed"));
// myEventStreamer->reset();
}
@ -2181,8 +2179,6 @@ void EventHandler::setPaddleMode(int num, bool showmessage)
buf << "Mouse is paddle " << num;
myOSystem->frameBuffer().showMessage(buf.str());
}
myOSystem->settings().setInt("paddle", myPaddleMode);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
stella/src/emucore/Props.cxx
View File

@ -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: Props.cxx,v 1.13 2006-11-04 19:38:24 stephena Exp $
// $Id: Props.cxx,v 1.14 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#include <cctype>
@ -287,6 +287,7 @@ const char* Properties::ourDefaultProperties[LastPropType] = {
"NO", // Console.SwapPorts
"JOYSTICK", // Controller.Left
"JOYSTICK", // Controller.Right
"0", // Controller.PaddleNo
"NTSC", // Display.Format
"0", // Display.XStart
"160", // Display.Width
@ -313,6 +314,7 @@ const char* Properties::ourPropertyNames[LastPropType] = {
"Console.SwapPorts",
"Controller.Left",
"Controller.Right",
"Controller.PaddleNo",
"Display.Format",
"Display.XStart",
"Display.Width",

5
stella/src/emucore/Props.hxx
View File

@ -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: Props.hxx,v 1.9 2006-11-04 19:38:24 stephena Exp $
// $Id: Props.hxx,v 1.10 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#ifndef PROPERTIES_HXX
@ -36,6 +36,7 @@ enum PropertyType {
Console_SwapPorts,
Controller_Left,
Controller_Right,
Controller_PaddleNo,
Display_Format,
Display_XStart,
Display_Width,
@ -56,7 +57,7 @@ enum PropertyType {
if the property key is not found in the original property list.
@author Bradford W. Mott
@version $Id: Props.hxx,v 1.9 2006-11-04 19:38:24 stephena Exp $
@version $Id: Props.hxx,v 1.10 2006-11-19 00:48:55 stephena Exp $
*/
class Properties
{

14
stella/src/emucore/Settings.cxx
View File

@ -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: Settings.cxx,v 1.90 2006-11-13 00:21:41 stephena Exp $
// $Id: Settings.cxx,v 1.91 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#include <cassert>
@ -60,14 +60,13 @@ Settings::Settings(OSystem* osystem)
setInternal("joymap", "");
setInternal("joyaxismap", "");
setInternal("joyhatmap", "");
setInternal("paddle", "0");
setInternal("sa1", "left");
setInternal("sa2", "right");
setInternal("joymouse", "false");
setInternal("p0speed", "50");
setInternal("p1speed", "50");
setInternal("p2speed", "50");
setInternal("p3speed", "50");
setInternal("p4speed", "50");
setInternal("pthresh", "600");
setInternal("showinfo", "false");
@ -252,10 +251,6 @@ void Settings::validate()
s != "HQ2x" && s != "HQ3x" && s != "HQ4x")
setInternal("scale_tia", "Zoom1x");
i = getInt("paddle");
if(i < 0 || i > 3)
setInternal("paddle", "0");
i = getInt("pthresh");
if(i < 400)
setInternal("pthresh", "400");
@ -316,11 +311,10 @@ void Settings::usage()
<< " -paddle <0|1|2|3> Indicates which paddle the mouse should emulate\n"
<< " -sa1 <left|right> Stelladaptor 1 emulates specified joystick port\n"
<< " -sa2 <left|right> Stelladaptor 2 emulates specified joystick port\n"
<< " -joymouse <1|0> Enable mouse emulation using joystick in GUI\n"
<< " -p0speed <number> Speed of emulated mouse movement for paddle 0 (0-100)\n"
<< " -p1speed <number> Speed of emulated mouse movement for paddle 1 (0-100)\n"
<< " -p2speed <number> Speed of emulated mouse movement for paddle 2 (0-100)\n"
<< " -p3speed <number> Speed of emulated mouse movement for paddle 3 (0-100)\n"
<< " -p4speed <number> Speed of emulated mouse movement for paddle 4 (0-100)\n"
<< " -pthresh <number> Set threshold for eliminating paddle jitter\n"
<< " -tiadefaults <1|0> Use TIA positioning defaults instead of enhanced values\n"
#ifdef UNIX
@ -472,7 +466,7 @@ int Settings::getInt(const string& key) const
else if((idx = getExternalPos(key)) != -1)
return (int) atoi(myExternalSettings[idx].value.c_str());
else
return 0;
return -1;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

147
stella/src/emucore/stella.pro
View File

@ -496,11 +496,12 @@
"Cartridge.Name" "Star Wars - Jedi Arena (1983) (Parker Bros) (PAL) [!]"
"Cartridge.Manufacturer" "Parker Bros"
"Cartridge.ModelNo" "PB5000"
"Cartridge.Note" "Uses the Paddle Controllers (swapped)"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Format" "PAL"
"Display.Height" "199"
"Display.Width" "144"
@ -656,6 +657,7 @@
"Display.Width" "152"
"Display.XStart" "8"
"Display.YStart" "57"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "074ec425ec20579e64a7ded592155d48"
@ -803,7 +805,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Height" "205"
"Display.YStart" "55"
@ -867,7 +868,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "0a1b98937911d621b004b1617446d124"
@ -998,7 +998,6 @@
"Cartridge.Rarity" "Common"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "180"
"Display.Width" "136"
"Display.XStart" "8"
@ -1378,7 +1377,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.YStart" "50"
""
@ -2001,6 +1999,7 @@
"Cartridge.Manufacturer" "Video Gems / Thomas Jentzsch"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "New Release (Video Format Conversion)"
"Console.LeftDifficulty" "A"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "243"
@ -2120,6 +2119,7 @@
"Cartridge.Name" "Picnic (1982) (US Games) [!]"
"Cartridge.Manufacturer" "US Games"
"Cartridge.ModelNo" "VC 2004"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "PADDLES"
"Display.Height" "196"
@ -2736,7 +2736,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "New Release"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "178"
"Display.YStart" "44"
""
@ -3118,6 +3117,7 @@
"Display.YStart" "26"
"Display.Width" "152"
"Display.XStart" "8"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "245f07c8603077a0caf5f83ee6cf8b43"
@ -3319,7 +3319,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "219"
"Display.YStart" "27"
"Display.Phosphor" "Yes"
@ -3680,7 +3679,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Height" "247"
"Display.YStart" "62"
@ -3831,6 +3829,8 @@
"Cartridge.MD5" "2c2aea31b01c6126c1a43e10cacbfd58"
"Cartridge.Name" "Synthcart (2002) (Paul Slocum)"
"Cartridge.Manufacturer" "Paul Slocum"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "Keyboard"
"Display.Phosphor" "Yes"
""
@ -4106,6 +4106,10 @@
"Cartridge.Name" "Canyon Bomber (1978) (Atari) [o1]"
"Cartridge.ModelNo" "CX2607 / 6699828 / 4975115"
"Cartridge.Rarity" "Uncommon"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "195"
"Display.YStart" "47"
""
@ -4176,8 +4180,10 @@
"Cartridge.Name" "Circus Atari (1978) (Atari) (PAL) [!]"
"Cartridge.Manufacturer" "Atari"
"Cartridge.ModelNo" "CX2630 / 4975122"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Display.Format" "PAL"
"Display.Height" "229"
"Display.YStart" "45"
@ -4299,6 +4305,7 @@
"Cartridge.Rarity" "Extremely Rare"
"Display.Height" "239"
"Display.YStart" "37"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "335793736cbf6fc99c9359ed2a32a49d"
@ -4723,7 +4730,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "192"
""
@ -4821,7 +4827,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "200"
"Display.Width" "136"
"Display.XStart" "8"
@ -4929,7 +4934,6 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "200"
"Display.Phosphor" "Yes"
""
@ -4968,10 +4972,11 @@
"Cartridge.Name" "Street Racer - Speedway II (1978) (Atari)"
"Cartridge.Manufacturer" "Atari"
"Cartridge.ModelNo" "CX2612 / 6699804 / 4975103"
"Cartridge.Note" "Uses the Paddle Controllers (swapped)"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "211"
"Display.YStart" "33"
""
@ -5084,6 +5089,7 @@
"Console.LeftDifficulty" "A"
"Display.Height" "185"
"Display.YStart" "38"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "3b6dba1a24bb2893bd3bd0593f92016b"
@ -5701,7 +5707,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "42ae81ae8ac51e5c238639f9f77d91ae"
@ -6018,7 +6023,6 @@
"Cartridge.Note" "Uses Kids/Keypad Controllers (left only)"
"Cartridge.Rarity" "Rare"
"Controller.Left" "Keyboard"
"Controller.Right" "None"
"Display.Format" "PAL"
"Display.Height" "227"
"Display.YStart" "46"
@ -6289,15 +6293,12 @@
""
"Cartridge.MD5" "4ac9f40ddfcf194bd8732a75b3f2f214"
"Cartridge.Name" "Grover's Music Maker (Atari) (Prototype) (PAL)"
"Cartridge.Name" "Grover's Music Maker (Atari) (Prototype)"
"Cartridge.Manufacturer" "Atari"
"Cartridge.ModelNo" "CX26106"
"Cartridge.Note" "Uses Kids/Keypad Controllers (left only)"
"Cartridge.Rarity" "Prototype"
"Controller.Left" "Keyboard"
"Controller.Right" "None"
"Display.Format" "PAL"
"Display.YStart" "27"
""
"Cartridge.MD5" "4abb4c87a4c5f5d0c14ead2bb36251be"
@ -6382,6 +6383,9 @@
"Cartridge.ModelNo" "AR-4302"
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.YStart" "25"
""
@ -6570,7 +6574,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "4dd6f53684ccbb569fe9f41498d80018"
@ -6853,6 +6856,7 @@
"Cartridge.Name" "SCSIcide (1.30) (CGE 2001 Release) (Joe Grand)"
"Cartridge.Manufacturer" "Joe Grand"
"Cartridge.Rarity" "New Release"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
@ -6935,6 +6939,7 @@
"Display.Width" "144"
"Display.XStart" "8"
"Display.YStart" "35"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "5360693f1eb90856176bd1c0a7b17432"
@ -6998,7 +7003,6 @@
"Cartridge.Rarity" "Uncommon"
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "192"
"Display.Width" "144"
"Display.XStart" "8"
@ -7282,7 +7286,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "219"
"Display.YStart" "27"
"Display.Phosphor" "Yes"
@ -7341,7 +7344,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "59b70658f9dd0e2075770b07be1a35cf"
@ -7907,7 +7909,9 @@
"Cartridge.MD5" "605fd59bfef88901c8c4794193a4cbad"
"Cartridge.Name" "Secret Agent (Data Age) (Prototype)"
"Cartridge.Manufacturer" "Data Age"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Prototype"
"Controller.Left" "Paddles"
"Display.Height" "220"
""
@ -7942,6 +7946,7 @@
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "205"
"Display.YStart" "30"
""
@ -8331,7 +8336,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Unbelievably Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "205"
"Display.Width" "144"
"Display.XStart" "8"
@ -8393,6 +8397,7 @@
"Cartridge.MD5" "66706459e62514d0c39c3797cbf73ff1"
"Cartridge.Name" "Treasure Below (Video Gems) (PAL)"
"Cartridge.Manufacturer" "Video Gems"
"Console.LeftDifficulty" "A"
"Display.Format" "PAL"
"Display.YStart" "56"
"Display.Height" "230"
@ -8420,7 +8425,6 @@
"Cartridge.Rarity" "Uncommon"
"Cartridge.Note" "Uses paddle controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "678c1d71a1616d9d022f03d8545b64bb"
@ -8448,7 +8452,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "200"
"Display.Width" "136"
"Display.XStart" "8"
@ -8532,7 +8535,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "200"
"Display.Width" "136"
"Display.XStart" "8"
@ -8561,6 +8563,7 @@
"Cartridge.MD5" "67bd3d4dc5ac6a42a99950b4245bdc81"
"Cartridge.Name" "Qb (2.11) (Retroactive)"
"Cartridge.Manufacturer" "Retroactive"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "679e910b27406c6a2072f9569ae35fc8"
@ -8568,6 +8571,9 @@
"Cartridge.Manufacturer" "Data Age"
"Cartridge.ModelNo" "DA 1002"
"Cartridge.Rarity" "Common"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "195"
"Display.Phosphor" "Yes"
""
@ -8889,7 +8895,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "New Release"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "174"
"Display.YStart" "44"
""
@ -8932,7 +8937,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Height" "235"
"Display.YStart" "50"
@ -9104,7 +9108,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "6e7ed74082f39ad4166c823765a59909"
@ -9216,10 +9219,11 @@
"Cartridge.Name" "Street Racer - Speedway II (1978) (Atari) [o1]"
"Cartridge.Manufacturer" "Atari"
"Cartridge.ModelNo" "CX2612 / 6699804 / 4975103"
"Cartridge.Note" "Uses the Paddle Controllers (swapped)"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.YStart" "33"
""
@ -9901,6 +9905,7 @@
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Format" "PAL"
"Display.Height" "205"
"Display.YStart" "56"
@ -10003,6 +10008,8 @@
"Cartridge.MD5" "798b8921276eec9e332dfcb47a2dbb17"
"Cartridge.Name" "Cookie Monster Munch (1983) (Atari) (PAL) [a1][!]"
"Cartridge.Note" "Uses Kids/Keypad Controllers"
"Controller.Left" "KEYBOARD"
"Display.Format" "PAL"
"Display.YStart" "45"
"Display.Height" "228"
@ -10046,6 +10053,7 @@
"Cartridge.MD5" "79b649fb812c50b4347d12e7ddbb8400"
"Cartridge.Name" "Red Pong Number 2 Demo 2 (PD)"
"Display.Height" "194"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "79c27f90591e3fdc7d2ed020ecbedeb3"
@ -10165,7 +10173,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "7b33407b2b198af74906b936ce1eecbb"
@ -10406,6 +10413,9 @@
"Cartridge.ModelNo" "AR-4302"
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.YStart" "50"
""
@ -10764,6 +10774,7 @@
"Cartridge.Name" "Treasure Below (Video Gems) (NTSC by Thomas Jentzsch)"
"Cartridge.Manufacturer" "Video Gems / Thomas Jentzsch"
"Cartridge.Rarity" "New Release (Video Format Conversion)"
"Console.LeftDifficulty" "A"
"Display.Height" "225"
"Display.Width" "152"
"Display.XStart" "8"
@ -10796,6 +10807,7 @@
"Cartridge.Rarity" "Rare"
"Display.Height" "190"
"Display.YStart" "42"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "82337e5fe0f418ca9484ca851dfc226a"
@ -10816,7 +10828,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "85478bb289dfa5c63726b9153992a920"
@ -10953,6 +10964,7 @@
"Cartridge.Name" "SCSIcide (1.31) (Joe Grand)"
"Cartridge.Manufacturer" "Joe Grand"
"Cartridge.Rarity" "New Release"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
@ -11021,7 +11033,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Height" "230"
"Display.YStart" "46"
@ -11161,6 +11172,7 @@
"Cartridge.MD5" "874c76726f68c166fcfac48ce78eef95"
"Cartridge.Name" "Red Pong Number 2 Demo (PD)"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "8747ba79cd39fa83a529bb26010db21b"
@ -11279,7 +11291,6 @@
"Cartridge.Rarity" "Common"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "180"
"Display.Width" "136"
"Display.XStart" "8"
@ -11338,11 +11349,15 @@
"Cartridge.MD5" "896ec58f26e930e02f5e4f046602c3a1"
"Cartridge.Name" "Synthcart (Beta) (2002) (Paul Slocum)"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "Keyboard"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "8933976f2029c0d8492ebd8f4eb21492"
"Cartridge.Name" "Synthcart Plus (09-02-2003) (Paul Slocum)"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "Keyboard"
""
"Cartridge.MD5" "89a65b83203980d5d4d60f52a584a5b8"
@ -11418,6 +11433,7 @@
"Cartridge.Note" "Hack of Jungle Fever (Mystique)"
"Cartridge.Rarity" "New Release (Hack)"
"Display.YStart" "26"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "8b81af55cd2ef3c7444d6aec4e3a1c09"
@ -11468,6 +11484,8 @@
"Cartridge.MD5" "8b556c3d9ca8e5e6e665bd759b93ffae"
"Cartridge.Name" "Synthcart (2002) (Paul Slocum) (PAL) [!]"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "Keyboard"
"Display.Format" "PAL"
"Display.YStart" "55"
"Display.Height" "250"
@ -12246,6 +12264,7 @@
"Cartridge.Manufacturer" "Starsoft"
"Display.Format" "PAL"
"Display.Height" "242"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "95a89d1bf767d7cc9d0d5093d579ba61"
@ -12378,7 +12397,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "190"
"Display.Width" "144"
"Display.XStart" "8"
@ -12477,7 +12495,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "9905f9f4706223dadee84f6867ede8e3"
@ -12935,6 +12952,7 @@
"Cartridge.Name" "SCSIcide (1.32) (Hozer Video Games)"
"Cartridge.Manufacturer" "Hozer Video Games"
"Cartridge.Rarity" "New Release"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
@ -13332,7 +13350,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Width" "136"
"Display.XStart" "8"
@ -13619,7 +13636,6 @@
"Cartridge.Rarity" "Common"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "190"
"Display.YStart" "42"
""
@ -13641,6 +13657,7 @@
"Cartridge.MD5" "a8101cb667e50a46165c6fb48c608b6b"
"Cartridge.Name" "Kung Fu Sprite Demo (PD)"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "a7ed7dc5cbc901388afa59030fb11d26"
@ -13853,7 +13870,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "192"
""
@ -14221,7 +14237,6 @@
"Cartridge.Rarity" "Uncommon"
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "192"
"Display.Width" "144"
"Display.XStart" "8"
@ -14459,7 +14474,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "b2737034f974535f5c0c6431ab8caf73"
@ -14700,6 +14714,7 @@
"Cartridge.Name" "Mission Survive (1983) (NTSC by Thomas Jentzsch)"
"Cartridge.Manufacturer" "Video Gems / Thomas Jentzsch"
"Cartridge.Rarity" "New Release (Video Format Conversion)"
"Console.LeftDifficulty" "A"
"Display.Width" "148"
"Display.XStart" "8"
""
@ -14863,7 +14878,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Height" "220"
"Display.YStart" "36"
""
@ -15248,7 +15262,7 @@
"Cartridge.Manufacturer" "CCE"
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Controller.PaddleNo" "1"
"Display.Height" "195"
"Display.YStart" "35"
""
@ -15362,6 +15376,7 @@
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "205"
"Display.YStart" "30"
""
@ -15507,6 +15522,7 @@
"Cartridge.MD5" "c221607529cabc93450ef25dbac6e8d2"
"Cartridge.Name" "Color Test (26-09-2002) (Eckhard Stolberg)"
"Console.LeftDifficulty" "A"
"Display.Format" "PAL"
"Display.YStart" "53"
""
@ -15749,6 +15765,7 @@
"Cartridge.MD5" "c482f8eebd45e0b8d479d9b71dd72bb8"
"Cartridge.Name" "Push (V0.03) (1998) (AD)"
"Cartridge.Manufacturer" "Retroactive"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "c473b222b7c5308d0773326416094272"
@ -15865,7 +15882,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "c68a6bafb667bad2f6d020f879be1d11"
@ -16140,11 +16156,12 @@
"Cartridge.Name" "Star Wars - Jedi Arena (1983) (Parker Bros)"
"Cartridge.Manufacturer" "Parker Bros"
"Cartridge.ModelNo" "PB5000"
"Cartridge.Note" "Uses the Paddle Controllers (swapped)"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "199"
"Display.Width" "144"
"Display.XStart" "8"
@ -16223,6 +16240,7 @@
"Cartridge.MD5" "ca54de69f7cdf4d7996e86f347129892"
"Cartridge.Name" "Philly Flasher (1982) (Playaround)"
"Cartridge.Manufacturer" "Playaround"
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "PADDLES"
"Display.Height" "213"
@ -16516,7 +16534,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Width" "136"
"Display.XStart" "8"
@ -16536,6 +16553,7 @@
"Cartridge.MD5" "cddabfd68363a76cd30bee4e8094c646"
"Cartridge.Name" "Magicard (CommaVid)"
"Cartridge.Manufacturer" "CommaVid"
"Cartridge.Note" "Uses Keypad Controllers"
"Cartridge.Type" "CV"
"Controller.Left" "Keyboard"
"Display.YStart" "25"
@ -16569,6 +16587,7 @@
"Cartridge.Name" "Kung Fu Sprite Demo 2 (PD)"
"Display.Height" "208"
"Display.YStart" "37"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "ce4bbe11d682c15a490ae15a4a8716cf"
@ -16693,10 +16712,12 @@
"Cartridge.MD5" "cf9069f92a43f719974ee712c50cd932"
"Cartridge.Name" "Mission Survive (1983) (Video Gems) (PAL)"
"Cartridge.Manufacturer" "Video Gems"
"Console.LeftDifficulty" "A"
"Display.Format" "PAL"
"Display.YStart" "60"
"Display.Width" "148"
"Display.XStart" "8"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "cfd6a8b23d12b0462baf6a05ef347cd8"
@ -16754,11 +16775,13 @@
"Display.Width" "152"
"Display.XStart" "4"
"Display.YStart" "38"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "cff1e9170bdbc29859b815203edf18fa"
"Cartridge.Name" "Push (V0.01) (1998) (AD)"
"Cartridge.Manufacturer" "Retroactive"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "cfef1a2d1f6a5ee7a5e1f43f3056f112"
@ -16836,6 +16859,8 @@
"Cartridge.MD5" "d0b9f705aa5f61f47a748a66009ae2d2"
"Cartridge.Name" "Synthcart (14-01-2002) (Paul Slocum)"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "Keyboard"
"Display.Phosphor" "Yes"
""
@ -17080,7 +17105,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Extremely Rare"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "d3456b4cf1bd1a7b8fb907af1a80ee15"
@ -17106,8 +17130,8 @@
"Cartridge.Note" "Uses the Paddle Controllers (right only)"
"Cartridge.Rarity" "Uncommon"
"Cartridge.Type" "4K"
"Controller.Left" "None"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "3"
"Display.Height" "202"
"Display.Width" "152"
"Display.XStart" "8"
@ -17259,7 +17283,7 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Controller.PaddleNo" "1"
"Display.Format" "PAL"
"Display.Height" "229"
"Display.YStart" "44"
@ -17548,6 +17572,7 @@
"Cartridge.Name" "Pick 'n Pile (1990) (Salu) (PAL) [!]"
"Cartridge.Manufacturer" "Salu"
"Cartridge.Rarity" "Extremely Rare"
"Console.SwapPorts" "Yes"
"Display.Height" "219"
"Display.YStart" "58"
"Display.Phosphor" "Yes"
@ -17683,7 +17708,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "dbc7485ad5814d466de780a3e7ed3b46"
@ -17732,7 +17756,6 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "192"
"Display.Width" "144"
"Display.XStart" "8"
@ -18170,9 +18193,10 @@
"Cartridge.Name" "Street Racer - Speedway II (1978) (Atari) (PAL) [!]"
"Cartridge.Manufacturer" "Atari"
"Cartridge.ModelNo" "CX2612 / 6699804 / 4975103"
"Cartridge.Note" "Uses the Paddle Controllers (swapped)"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Format" "PAL"
"Display.Height" "256"
"Display.YStart" "36"
@ -18194,7 +18218,6 @@
"Cartridge.Rarity" "Uncommon"
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "192"
"Display.Width" "144"
"Display.XStart" "8"
@ -18445,6 +18468,8 @@
"Cartridge.MD5" "e40a818dac4dd851f3b4aafbe2f1e0c1"
"Cartridge.Name" "Peek-A-Boo (Atari) (Prototype)"
"Cartridge.ModelNo" "CX26137"
"Cartridge.Note" "Uses Keypad Controllers"
"Controller.Left" "KEYBOARD"
"Cartridge.Rarity" "Prototype"
"Display.YStart" "36"
""
@ -18671,7 +18696,6 @@
"Cartridge.Rarity" "Rare"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.Height" "194"
"Display.Width" "144"
@ -18900,6 +18924,7 @@
"Cartridge.ModelNo" "PB5370"
"Cartridge.Rarity" "Common"
"Display.Format" "PAL"
"Display.Phosphor" "Yes"
""
"Cartridge.MD5" "ea38fcfc06ad87a0aed1a3d1588744e4"
@ -19237,7 +19262,6 @@
"Cartridge.Rarity" "Common"
"Cartridge.Type" "4K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Format" "PAL"
"Display.Height" "234"
"Display.Width" "136"
@ -19666,6 +19690,7 @@
"Cartridge.Name" "Steeple Chase (Video Gems) (PAL)"
"Cartridge.Manufacturer" "Video Gems"
"Cartridge.Note" "Uses the Paddle Controllers"
"Console.LeftDifficulty" "A"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
@ -19722,7 +19747,6 @@
"Cartridge.Note" "Uses the Paddle Controllers"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
""
"Cartridge.MD5" "f344ac1279152157d63e64aa39479599"
@ -19844,7 +19868,6 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Height" "200"
"Display.Phosphor" "Yes"
""
@ -20216,7 +20239,7 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Rarity" "Uncommon"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Controller.PaddleNo" "1"
"Display.Height" "195"
"Display.YStart" "35"
""
@ -20288,7 +20311,6 @@
"Cartridge.Rarity" "Uncommon"
"Cartridge.Type" "2K"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Format" "PAL"
"Display.Height" "200"
"Display.Width" "144"
@ -20783,6 +20805,10 @@
"Cartridge.Name" "Canyon Bomber (1978) (Atari) [!]"
"Cartridge.ModelNo" "CX2607 / 6699828 / 4975115"
"Cartridge.Rarity" "Uncommon"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Controller.PaddleNo" "1"
"Display.Height" "195"
"Display.YStart" "47"
""
@ -20802,7 +20828,6 @@
"Cartridge.Note" "Uses the Paddle Controllers (left only)"
"Cartridge.Rarity" "Common"
"Controller.Left" "Paddles"
"Controller.Right" "None"
"Display.Format" "PAL"
"Display.Height" "240"
"Display.Phosphor" "Yes"
@ -20813,7 +20838,6 @@
"Cartridge.Manufacturer" "Atari"
"Cartridge.Note" "Uses the Paddle Controllers"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.YStart" "64"
""
@ -20842,7 +20866,6 @@
"Cartridge.Rarity" "Extremely Rare"
"Cartridge.Type" "AR"
"Controller.Left" "Paddles"
"Controller.Right" "Paddles"
"Display.Format" "PAL"
"Display.YStart" "50"
""

57
stella/src/gui/InputDialog.cxx
View File

@ -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.16 2006-05-15 12:24:09 stephena Exp $
// $Id: InputDialog.cxx,v 1.17 2006-11-19 00:48:55 stephena Exp $
//============================================================================
// FIXME - this whole dialog should be a dialog of buttons instead of
@ -29,15 +29,6 @@
#include "bspf.hxx"
enum {
kPaddleChanged = 'PDch',
kPaddleThreshChanged = 'PDth',
kP0SpeedID = 100,
kP1SpeedID = 101,
kP2SpeedID = 102,
kP3SpeedID = 103
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
InputDialog::InputDialog(OSystem* osystem, DialogContainer* parent,
const GUI::Font& font, int x, int y, int w, int h)
@ -121,28 +112,18 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
myLeftPort->appendEntry("right virtual port", 2);
wid.push_back(myLeftPort);
ypos += lineHeight + 3;
ypos += lineHeight + 5;
myRightPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
"Stelladaptor 2 is: ", lwidth);
myRightPort->appendEntry("left virtual port", 1);
myRightPort->appendEntry("right virtual port", 2);
wid.push_back(myRightPort);
// Add 'mouse to paddle' mapping
ypos += 2*lineHeight;
lwidth = font.getStringWidth("Paddle threshold: ");
pwidth = font.getMaxCharWidth() * 5;
myPaddleMode = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
"Mouse is paddle: ", lwidth, kPaddleChanged);
myPaddleMode->setMinValue(0); myPaddleMode->setMaxValue(3);
xpos += myPaddleMode->getWidth() + 5;
myPaddleModeLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight,
"", kTextAlignLeft);
myPaddleModeLabel->setFlags(WIDGET_CLEARBG);
wid.push_back(myPaddleMode);
// Add 'paddle threshhold' setting
xpos = 5; ypos += lineHeight + 3;
lwidth = font.getStringWidth("Paddle threshold: ");
pwidth = font.getMaxCharWidth() * 5;
xpos = 5; ypos += 2*lineHeight + 3;
myPaddleThreshold = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
"Paddle threshold: ",
lwidth, kPaddleThreshChanged);
@ -217,23 +198,19 @@ void InputDialog::loadConfig()
int rport = sa2 == "right" ? 2 : 1;
myRightPort->setSelectedTag(rport);
// Paddle mode
myPaddleMode->setValue(instance()->settings().getInt("paddle"));
myPaddleModeLabel->setLabel(instance()->settings().getString("paddle"));
// Paddle threshold
myPaddleThreshold->setValue(instance()->settings().getInt("pthresh"));
myPaddleThresholdLabel->setLabel(instance()->settings().getString("pthresh"));
// Paddle speed settings
myPaddleSpeed[0]->setValue(instance()->settings().getInt("p1speed"));
myPaddleLabel[0]->setLabel(instance()->settings().getString("p1speed"));
myPaddleSpeed[1]->setValue(instance()->settings().getInt("p2speed"));
myPaddleLabel[1]->setLabel(instance()->settings().getString("p2speed"));
myPaddleSpeed[2]->setValue(instance()->settings().getInt("p3speed"));
myPaddleLabel[2]->setLabel(instance()->settings().getString("p3speed"));
myPaddleSpeed[3]->setValue(instance()->settings().getInt("p4speed"));
myPaddleLabel[3]->setLabel(instance()->settings().getString("p4speed"));
myPaddleSpeed[0]->setValue(instance()->settings().getInt("p0speed"));
myPaddleLabel[0]->setLabel(instance()->settings().getString("p0speed"));
myPaddleSpeed[1]->setValue(instance()->settings().getInt("p1speed"));
myPaddleLabel[1]->setLabel(instance()->settings().getString("p1speed"));
myPaddleSpeed[2]->setValue(instance()->settings().getInt("p2speed"));
myPaddleLabel[2]->setLabel(instance()->settings().getString("p2speed"));
myPaddleSpeed[3]->setValue(instance()->settings().getInt("p3speed"));
myPaddleLabel[3]->setLabel(instance()->settings().getString("p3speed"));
myTab->loadConfig();
}
@ -246,10 +223,6 @@ void InputDialog::saveConfig()
string sa2 = myRightPort->getSelectedTag() == 2 ? "right" : "left";
instance()->eventHandler().mapStelladaptors(sa1, sa2);
// Paddle mode
int mode = myPaddleMode->getValue();
instance()->eventHandler().setPaddleMode(mode);
// Paddle threshold
int threshold = myPaddleThreshold->getValue();
instance()->eventHandler().setPaddleThreshold(threshold);
@ -323,10 +296,6 @@ void InputDialog::handleCommand(CommandSender* sender, int cmd,
close();
break;
case kPaddleChanged:
myPaddleModeLabel->setValue(myPaddleMode->getValue());
break;
case kPaddleThreshChanged:
myPaddleThresholdLabel->setValue(myPaddleThreshold->getValue());
break;

12
stella/src/gui/InputDialog.hxx
View File

@ -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.hxx,v 1.9 2006-05-05 18:00:51 stephena Exp $
// $Id: InputDialog.hxx,v 1.10 2006-11-19 00:48:55 stephena Exp $
//============================================================================
#ifndef INPUT_DIALOG_HXX
@ -52,6 +52,14 @@ class InputDialog : public Dialog
void addVDeviceTab(const GUI::Font& font);
private:
enum {
kPaddleThreshChanged = 'PDth',
kP0SpeedID = 100,
kP1SpeedID = 101,
kP2SpeedID = 102,
kP3SpeedID = 103
};
TabWidget* myTab;
EventMappingWidget* myEmulEventMapper;
@ -60,8 +68,6 @@ class InputDialog : public Dialog
PopUpWidget* myLeftPort;
PopUpWidget* myRightPort;
SliderWidget* myPaddleMode;
StaticTextWidget* myPaddleModeLabel;
SliderWidget* myPaddleThreshold;
StaticTextWidget* myPaddleThresholdLabel;
SliderWidget* myPaddleSpeed[4];

18
stella/src/tools/create_props.pl
View File

@ -21,14 +21,15 @@ my %proptype = (
"Console.SwapPorts" => 11,
"Controller.Left" => 12,
"Controller.Right" => 13,
"Display.Format" => 14,
"Display.XStart" => 15,
"Display.Width" => 16,
"Display.YStart" => 17,
"Display.Height" => 18,
"Display.Phosphor" => 19,
"Display.PPBlend" => 20,
"Emulation.HmoveBlanks" => 21
"Controller.PaddleNo" => 14,
"Display.Format" => 15,
"Display.XStart" => 16,
"Display.Width" => 17,
"Display.YStart" => 18,
"Display.Height" => 19,
"Display.Phosphor" => 20,
"Display.PPBlend" => 21,
"Emulation.HmoveBlanks" => 22
);
my @prop_defaults = (
@ -46,6 +47,7 @@ my @prop_defaults = (
"NO",
"JOYSTICK",
"JOYSTICK",
"0",
"NTSC",
"0",
"160",