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

A few more BoosterGrip related changes. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1512 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2008-05-16 12:17:23 +00:00
parent 9d51e63d86
commit 7ed4ef1b58
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stella/docs/index.html
View File

@ -280,7 +280,7 @@
or joysticks</li>
<li>Emulates the Atari 2600 Driving Controllers using your computer's keyboard
or joysticks</li>
<li>Emulates the CBS Booster-Grip Controller using your computer's keyboard or
<li>Emulates the CBS BoosterGrip Controller using your computer's keyboard or
joysticks</li>
<li>Emulates CX-22 / CX-80 style trackballs and Amiga Mouse using your
computer's mouse</li>
@ -904,20 +904,20 @@
<tr>
<td><pre>-lc &lt;type&gt;</pre></td>
<td>Set "Controller.Left" property, where type is one of Booster-Grip,
Driving, Keyboard, Paddles, or Joystick.</td>
<td>Set "Controller.Left" property. See the <i>Game Properties</i>
section for valid types.</td>
</tr>
<tr>
<td><pre>-rc &lt;type&gt;</pre></td>
<td>Set "Controller.Right" property, where type is one of Booster-Grip,
Driving, Keyboard, Paddles, or Joystick.</td>
<td>Set "Controller.Right" property. See the <i>Game Properties</i>
section for valid types.</td>
</tr>
<tr>
<td><pre>-bc &lt;type&gt;</pre></td>
<td>Sets both "Controller.Left" and "Controller.Right" properties, where
type is one of Booster-Grip, Driving, Keyboard, Paddles, or Joystick.</td>
<td>Sets both "Controller.Left" and "Controller.Right" properties.
See the <i>Game Properties</i> section for valid types.</td>
</tr>
<tr>
@ -1151,7 +1151,7 @@
</table>
<p><b>Joystick / Booster-Grip Controller (can be remapped)</b></p>
<p><b>Joystick / BoosterGrip Controller (can be remapped)</b></p>
<table BORDER=2>
<tr>

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

@ -445,7 +445,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "25265d0e7f88b3026003809f25ee025e", "Atari - GCC, Ava-Robin Cohen", "CX26123", "Jr. Pac-Man (1984) (Atari) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "25472dfdeef6a42581a231d631d6b04d", "", "", "Gunfight 2600 - Design thoughts (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "25710bde8fa181b0c5cf0846b983bec1", "", "", "Demo Image Series #15 - Three Marios (NTSC) (06-03-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "257bc3b72a6b5db3fd0d47619125b387", "CBS Electronics", "4L 2737 0000", "Omega Race (1983) (CBS Electronics) [a]", "Set right difficulty to 'A' for Booster-Grip in both ports", "", "", "", "", "", "", "", "BOOSTER-GRIP", "BOOSTER-GRIP", "", "", "", "", "", "", "" },
{ "257bc3b72a6b5db3fd0d47619125b387", "CBS Electronics", "4L 2737 0000", "Omega Race (1983) (CBS Electronics) [a]", "Set right difficulty to 'A' for BoosterGrip in both ports", "", "", "", "", "", "", "", "BOOSTERGRIP", "BOOSTERGRIP", "", "", "", "", "", "", "" },
{ "25a21c47afe925a3ca0806876a2b4f3f", "Quelle", "685.640 5", "Der kleine Baer (1983) (Quelle) (PAL)", "AKA Frostbite", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "25a943e9d5e312b516660b0627352448", "", "", "Image - Baboon (Interlaced Demo 1) (15-02-2003) (TJ)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "25b52bf8dd215bcbd59c9abdb55c44f8", "Atari - GCC, Betty Ryan Tylko, Doug Macrae", "CX2694, CX2694P", "Pole Position (1983) (Atari) (PAL) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
@ -1616,7 +1616,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "87e79cd41ce136fd4f72cc6e2c161bee", "Atari - GCC, Mark Ackerman, Glenn Parker", "CX2675", "Ms. Pac-Man (1982) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "87f020daa98d0132e98e43db7d8fea7e", "20th Century Fox Video Games - Sirius, David Lubar", "11001", "Worm War I (1982) (20th Century Fox)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "883258dcd68cefc6cd4d40b1185116dc", "Activision, David Crane - Ariola", "EAZ-030, EAZ-030-04B, EAZ-030-04I - 711 030-725", "Decathlon (1983) (Activision) (PAL)", "", "Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "885b2002fa9d27502d84968d4656c4ca", "CBS Electronics", "4L 2737 0000", "Omega Race (1983) (CBS Electronics) (16K)", "Set right difficulty to 'A' for Booster-Grip in both ports", "", "", "", "", "A", "", "", "BOOSTER-GRIP", "BOOSTER-GRIP", "", "", "", "", "", "", "" },
{ "885b2002fa9d27502d84968d4656c4ca", "CBS Electronics", "4L 2737 0000", "Omega Race (1983) (CBS Electronics) (16K)", "Set right difficulty to 'A' for BoosterGrip in both ports", "", "", "", "", "A", "", "", "BOOSTERGRIP", "BOOSTERGRIP", "", "", "", "", "", "", "" },
{ "8874b68751fd2ba6d3306a263ae57a7d", "Eric Mooney", "", "Invaders by Erik Mooney (Alpha 1) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "8885d0ce11c5b40c3a8a8d9ed28cefef", "Atari, Carol Shaw, Nick 'Sandy Maiwald' Turner - Sears", "CX2608 - 49-75165", "Super Breakout (1982 - 1981) (Atari) [a]", "Uses the Paddle Controllers (left only)", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "", "" },
{ "888debb162d7d1ae71025b4ab794257f", "", "", "Interleaved ChronoColour - Nude Art (17-04-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
@ -1801,7 +1801,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "9912d06eea42200a198dd3e2be18c601", "Imagic, Michael Greene", "IA3312", "No Escape! (1982) (Imagic) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "991d57bbcd529ad62925098e0aec1241", "", "", "Gunfight 2600 - The Final Kernel (MP) [a1]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9945a22f60bbaf6d04a8d73b3cf3db75", "Activision, Dan Kitchen", "EAX-039-04B, EAX-039-04I", "Kung-Fu Master (1987) (Activision) (PAL) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9947f1ebabb56fd075a96c6d37351efa", "CBS Electronics", "4L-2737", "Omega Race (1983) (CBS Electronics)", "Set right difficulty to 'A' for Booster-Grip in both ports", "", "", "", "", "A", "", "", "BOOSTER-GRIP", "BOOSTER-GRIP", "", "", "", "", "", "", "" },
{ "9947f1ebabb56fd075a96c6d37351efa", "CBS Electronics", "4L-2737", "Omega Race (1983) (CBS Electronics)", "Set right difficulty to 'A' for BoosterGrip in both ports", "", "", "", "", "A", "", "", "BOOSTERGRIP", "BOOSTERGRIP", "", "", "", "", "", "", "" },
{ "9962034ea7b3d4a905d0991804670087", "", "", "Grid Demo (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9989f974c3cf9c641db6c8a70a2a2267", "Eckhard Stolberg", "", "Colours Selector (Eckhard Stolberg)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "99a24d7bb31d49b720b422550b32c35f", "", "", "Hangman Ghost Biglist1 (Hack)", "Hack of Hangman", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
@ -2564,7 +2564,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
{ "de62f8a30298e2325249fe112ecb5c10", "CCE", "C-810", "Enduro (1983) (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "de78b3a064d374390ac0710f95edde92", "Bomb - Onbase", "CA281", "Assault (1983) (Bomb)", "AKA Sky Alien", "Extremely Rare", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "de7a64108074098ba333cc0c70eef18a", "", "", "Nuts (Unknown)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "de7bca4e569ad9d3fd08ff1395e53d2d", "Thomas Jentzsch", "", "Thrust (V1.22) (2000) (TJ)", "Won't work with Stella < V1.2, supports Booster Grip", "New Release", "", "", "", "", "", "", "BOOSTER-GRIP", "", "", "", "", "", "", "", "" },
{ "de7bca4e569ad9d3fd08ff1395e53d2d", "Thomas Jentzsch", "", "Thrust (V1.22) (2000) (TJ)", "Won't work with Stella < V1.2, supports Booster Grip", "New Release", "", "", "", "", "", "", "BOOSTERGRIP", "", "", "", "", "", "", "", "" },
{ "dea0ade296f7093e71185e802b500db8", "CCE", "", "Fishing Derby (CCE)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "deb39482e77f984d4ce73be9fd8adabd", "Activision, David Lubar", "AK-048-04", "River Raid II (1988) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "ded26e1cb17f875a9c17515c900f9933", "", "", "Space Treat (29-12-2002) (Fabrizio Zavagli)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

10
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.222 2008-05-11 21:18:35 stephena Exp $
// $Id: EventHandler.cxx,v 1.223 2008-05-16 12:17:22 stephena Exp $
//============================================================================
#include <sstream>
@ -2221,16 +2221,16 @@ EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] =
{ Event::JoystickZeroLeft, "P0 Joystick Left", 0 },
{ Event::JoystickZeroRight, "P0 Joystick Right", 0 },
{ Event::JoystickZeroFire1, "P0 Joystick Fire", 0 },
{ Event::JoystickZeroFire2, "P0 Booster-Grip Trigger", 0 },
{ Event::JoystickZeroFire3, "P0 Booster-Grip Booster", 0 },
{ Event::JoystickZeroFire2, "P0 BoosterGrip Trigger", 0 },
{ Event::JoystickZeroFire3, "P0 BoosterGrip Booster", 0 },
{ Event::JoystickOneUp, "P1 Joystick Up", 0 },
{ Event::JoystickOneDown, "P1 Joystick Down", 0 },
{ Event::JoystickOneLeft, "P1 Joystick Left", 0 },
{ Event::JoystickOneRight, "P1 Joystick Right", 0 },
{ Event::JoystickOneFire1, "P1 Joystick Fire", 0 },
{ Event::JoystickOneFire2, "P1 Booster-Grip Trigger", 0 },
{ Event::JoystickOneFire3, "P1 Booster-Grip Booster", 0 },
{ Event::JoystickOneFire2, "P1 BoosterGrip Trigger", 0 },
{ Event::JoystickOneFire3, "P1 BoosterGrip Booster", 0 },
{ Event::PaddleZeroAnalog, "Paddle 0 Analog", 0 },
{ Event::PaddleZeroDecrease, "Paddle 0 Decrease", 0 },

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

@ -2636,9 +2636,9 @@
"Cartridge.Manufacturer" "CBS Electronics"
"Cartridge.ModelNo" "4L 2737 0000"
"Cartridge.Name" "Omega Race (1983) (CBS Electronics) [a]"
"Cartridge.Note" "Set right difficulty to 'A' for Booster-Grip in both ports"
"Controller.Left" "BOOSTER-GRIP"
"Controller.Right" "BOOSTER-GRIP"
"Cartridge.Note" "Set right difficulty to 'A' for BoosterGrip in both ports"
"Controller.Left" "BOOSTERGRIP"
"Controller.Right" "BOOSTERGRIP"
""
"Cartridge.MD5" "25bcf07491f65012a70a528959c4881c"
@ -9656,10 +9656,10 @@
"Cartridge.Manufacturer" "CBS Electronics"
"Cartridge.ModelNo" "4L 2737 0000"
"Cartridge.Name" "Omega Race (1983) (CBS Electronics) (16K)"
"Cartridge.Note" "Set right difficulty to 'A' for Booster-Grip in both ports"
"Cartridge.Note" "Set right difficulty to 'A' for BoosterGrip in both ports"
"Console.RightDifficulty" "A"
"Controller.Left" "BOOSTER-GRIP"
"Controller.Right" "BOOSTER-GRIP"
"Controller.Left" "BOOSTERGRIP"
"Controller.Right" "BOOSTERGRIP"
""
"Cartridge.MD5" "8885d0ce11c5b40c3a8a8d9ed28cefef"
@ -10751,10 +10751,10 @@
"Cartridge.Manufacturer" "CBS Electronics"
"Cartridge.ModelNo" "4L-2737"
"Cartridge.Name" "Omega Race (1983) (CBS Electronics)"
"Cartridge.Note" "Set right difficulty to 'A' for Booster-Grip in both ports"
"Cartridge.Note" "Set right difficulty to 'A' for BoosterGrip in both ports"
"Console.RightDifficulty" "A"
"Controller.Left" "BOOSTER-GRIP"
"Controller.Right" "BOOSTER-GRIP"
"Controller.Left" "BOOSTERGRIP"
"Controller.Right" "BOOSTERGRIP"
""
"Cartridge.MD5" "99f7c6c26046bbe95f1c604b25da8360"
@ -15329,7 +15329,7 @@
"Cartridge.Name" "Thrust (V1.22) (2000) (TJ)"
"Cartridge.Note" "Won't work with Stella < V1.2, supports Booster Grip"
"Cartridge.Rarity" "New Release"
"Controller.Left" "BOOSTER-GRIP"
"Controller.Left" "BOOSTERGRIP"
""
"Cartridge.MD5" "deb39482e77f984d4ce73be9fd8adabd"

22
stella/src/gui/GameInfoDialog.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: GameInfoDialog.cxx,v 1.55 2008-05-12 22:40:26 stephena Exp $
// $Id: GameInfoDialog.cxx,v 1.56 2008-05-16 12:17:23 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -672,16 +672,16 @@ void GameInfoDialog::handleCommand(CommandSender* sender, int cmd,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const char* GameInfoDialog::ourControllerList[kNumControllerTypes][2] = {
{ "Joystick", "JOYSTICK" },
{ "Paddles", "PADDLES" },
{ "Booster-Grip", "BOOSTER-GRIP" },
{ "Driving", "DRIVING" },
{ "Keyboard", "KEYBOARD" },
{ "CX-22 Trakball", "TRACKBALL22" },
{ "CX-80 Mouse", "TRACKBALL80" },
{ "AmigaMouse", "AMIGAMOUSE" },
{ "AtariVox", "ATARIVOX" },
{ "SaveKey", "SAVEKEY" }
{ "Joystick", "JOYSTICK" },
{ "Paddles", "PADDLES" },
{ "BoosterGrip", "BOOSTERGRIP" },
{ "Driving", "DRIVING" },
{ "Keyboard", "KEYBOARD" },
{ "CX-22 Trakball", "TRACKBALL22" },
{ "CX-80 Mouse", "TRACKBALL80" },
{ "AmigaMouse", "AMIGAMOUSE" },
{ "AtariVox", "ATARIVOX" },
{ "SaveKey", "SAVEKEY" }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -