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

fixed some controller spellings

This commit is contained in:
Thomas Jentzsch 2021-09-09 11:47:26 +02:00
parent fc86c899ff
commit b83b8b8f65
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/index.html
View File

@ -272,9 +272,9 @@
Atari 2600 FPGA project, including cycle-exact audio, analog interference
from mixing of audio channels, as well as stereo sound support; dynamic
sound resampling is also included</li>
<li>Emulates the Atari 2600 Joystick, Paddle, Driving, CBS BoosterGrip, Sega Genesis, QuadTari controllers using your computer's keyboard,
<li>Emulates the Atari 2600 Joystick, Paddle, Driving, CBS Booster Grip, Sega Genesis, QuadTari controllers using your computer's keyboard,
joysticks or mouse</li>
<li>Emulates CX22/CX80 style Trackballs, Amiga/Atari Mouse, Mindlink controller and the Light Gun using your
<li>Emulates CX22/CX80 style Trak-Balls, Amiga/Atari mouse, MindLink controller and the Light Gun using your
computer's mouse</li>
<li>Emulates the Atari 2600 Keyboard controllers using your computer's keyboard</li>
<li>Emulates <a href="https://en.wikipedia.org/wiki/CompuMate">Spectravideo CompuMate</a> system using your computer's keyboard,
@ -781,7 +781,7 @@
</table>
<p><b>Joystick/BoosterGrip Controller (can be remapped)</b></p>
<p><b>Joystick/Booster Grip Controller (can be remapped)</b></p>
<table BORDER=2>
<tr>
@ -880,7 +880,7 @@
</tr>
</table>
<p><b>Sega Genesis Controller (cannot be remapped, always associated with joystick and booster-grip controllers)</b></p>
<p><b>Sega Genesis Controller (cannot be remapped, always associated with joystick and Booster Grip controllers)</b></p>
<table BORDER=2>
<tr>
@ -2418,7 +2418,7 @@
<td> &#x2713;</td>
</tr>
<tr>
<th> Booster</th>
<th> Booster Grip</th>
<td> &#x2713;</td>
<td> &#x2713;</td>
<td> &#x2713; (+ extra)</td>
@ -2426,7 +2426,7 @@
<td> &#x2713; (+ extra)</td>
</tr>
<tr>
<th> Genesis</th>
<th> Sega Genesis</th>
<td> &#x2713;</td>
<td> &#x2713; (+ extra)</td>
<td> &#x2713;</td>
@ -2450,7 +2450,7 @@
<td> &#x2713;</td>
</tr>
<tr>
<th> Trackball/Mouse</th>
<th> Trak-Ball/Mouse</th>
<td> &#x2715;</td>
<td> &#x2715;</td>
<td> &#x2713;</td>
@ -2474,7 +2474,7 @@
<td> &#x2715;</td>
</tr>
<tr>
<th> Mindlink</th>
<th> MindLink</th>
<td> &#x2715;</td>
<td> &#x2715;</td>
<td> &#x2713;</td>
@ -4933,10 +4933,10 @@ Ms Pac-Man (Stella extended codes):
<tr><td>Trakball</td><td>Standard Atari 2600 CX22/CX80 'Trak-Ball' controller.</td></tr>
<tr><td><a href="https://atariage.com/store/index.php?l=product_detail&p=1045">AtariVox &#185</a></td><td>A SpeakJet based unlimited-vocabulary speech/sound synthesizer with 32K EEPROM.</td></tr>
<tr><td>SaveKey</td><td>A 32K EEPROM for saving high scores, etc. (the EEPROM portion of an AtariVox).</td></tr>
<tr><td>Genesis </td><td>Sega Genesis controller, which can be used similar to a BoosterGrip, giving an extra button.</td></tr>
<tr><td>Genesis </td><td>Sega Genesis controller, which can be used similar to a Booster Grip, giving an extra button.</td></tr>
<tr><td>CompuMate &#185</td><td>Spectravideo CompuMate (if either left or right is set, CompuMate is used for both).</td></tr>
<tr><td>Lightgun</td><td>Atari XG-1 compatible Light Gun.</td></tr>
<tr><td>Mindlink &#185</td><td>Mindlink controller.</td></tr>
<tr><td>MindLink &#185</td><td>MindLink controller.</td></tr>
<tr><td>KidVid</td><td>Kid Vid Voice Module, limited support (Right Keyboard controller buttons 1, 2 and 3 start the games, default mapping is 8, 9 and 0).</td></tr>
<tr><td>QuadTari</td><td><a href="#Quadtari">QuadTari</a> controller, limited support (see below).</td></tr>
</table></td>

2
src/emucore/AmigaMouse.hxx
View File

@ -38,7 +38,7 @@ class AmigaMouse : public PointingDevice
/**
Returns the name of this controller.
*/
string name() const override { return "AmigaMouse"; }
string name() const override { return "Amiga mouse"; }
protected:
uInt8 ioPortA(uInt8 countH, uInt8 countV, uInt8, uInt8) override

2
src/emucore/AtariMouse.hxx
View File

@ -38,7 +38,7 @@ class AtariMouse : public PointingDevice
/**
Returns the name of this controller.
*/
string name() const override { return "AtariMouse"; }
string name() const override { return "Atari mouse"; }
protected:
uInt8 ioPortA(uInt8 countH, uInt8 countV, uInt8, uInt8) override

2
src/emucore/Booster.hxx
View File

@ -44,7 +44,7 @@ class BoosterGrip : public Joystick
/**
Returns the name of this controller.
*/
string name() const override { return "BoosterGrip"; }
string name() const override { return "Booster Grip"; }
private:
/**

8
src/emucore/Control.cxx
View File

@ -107,10 +107,10 @@ string Controller::getName(const Type type)
static const std::array<string, int(Controller::Type::LastType)> NAMES =
{
"Unknown",
"AmigaMouse", "AtariMouse", "AtariVox", "BoosterGrip", "CompuMate",
"Driving", "Sega Genesis", "Joystick", "Keyboard", "KidVid", "MindLink",
"Paddles", "Paddles_IAxis", "Paddles_IAxDr", "SaveKey", "TrakBall",
"Lightgun", "QuadTari"
"Amiga mouse", "Atari mouse", "AtariVox", "Booster Grip", "CompuMate",
"Driving", "Sega Genesis", "Joystick", "Keyboard", "Kid Vid", "MindLink",
"Paddles", "Paddles_IAxis", "Paddles_IAxDr", "SaveKey", "Trak-Ball",
"Light Gun", "QuadTari"
};
return NAMES[int(type)];

2
src/emucore/Lightgun.hxx
View File

@ -66,7 +66,7 @@ class Lightgun : public Controller
/**
Returns the name of this controller.
*/
string name() const override { return "Lightgun"; }
string name() const override { return "Light Gun"; }
private:
const FrameBuffer& myFrameBuffer;

2
src/emucore/TrakBall.hxx
View File

@ -38,7 +38,7 @@ class TrakBall : public PointingDevice
/**
Returns the name of this controller.
*/
string name() const override { return "TrakBall"; }
string name() const override { return "Trak-Ball"; }
protected:
uInt8 ioPortA(uInt8 countH, uInt8 countV, uInt8 left, uInt8 down) override

12
src/gui/GameInfoDialog.cxx
View File

@ -277,17 +277,17 @@ void GameInfoDialog::addControllersTab()
VarList::push_back(items, "Paddles", "PADDLES");
VarList::push_back(items, "Paddles_IAxis", "PADDLES_IAXIS");
VarList::push_back(items, "Paddles_IAxDr", "PADDLES_IAXDR");
VarList::push_back(items, "BoosterGrip", "BOOSTERGRIP");
VarList::push_back(items, "Booster Grip", "BOOSTERGRIP");
VarList::push_back(items, "Driving", "DRIVING");
VarList::push_back(items, "Keyboard", "KEYBOARD");
VarList::push_back(items, "AmigaMouse", "AMIGAMOUSE");
VarList::push_back(items, "AtariMouse", "ATARIMOUSE");
VarList::push_back(items, "Trakball", "TRAKBALL");
VarList::push_back(items, "Amiga mouse", "AMIGAMOUSE");
VarList::push_back(items, "Atari mouse", "ATARIMOUSE");
VarList::push_back(items, "Trak-Ball", "TRAKBALL");
VarList::push_back(items, "AtariVox", "ATARIVOX");
VarList::push_back(items, "SaveKey", "SAVEKEY");
VarList::push_back(items, "Sega Genesis", "GENESIS");
VarList::push_back(items, "KidVid", "KIDVID");
VarList::push_back(items, "Lightgun", "LIGHTGUN");
VarList::push_back(items, "Kid Vid", "KIDVID");
VarList::push_back(items, "Light Gun", "LIGHTGUN");
VarList::push_back(items, "MindLink", "MINDLINK");
VarList::push_back(items, "QuadTari", "QUADTARI");

12
src/gui/QuadTariDialog.cxx
View File

@ -47,17 +47,17 @@ QuadTariDialog::QuadTariDialog(GuiObject* boss, const GUI::Font& font, int max_w
VarList::push_back(ctrls, "Paddles", "PADDLES");
//VarList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS");
//VarList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR");
//VarList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP");
//VarList::push_back(ctrls, "Booster Grip", "BOOSTERGRIP");
VarList::push_back(ctrls, "Driving", "DRIVING");
//VarList::push_back(ctrls, "Keyboard", "KEYBOARD");
//VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE");
//VarList::push_back(ctrls, "AtariMouse", "ATARIMOUSE");
//VarList::push_back(ctrls, "Trakball", "TRAKBALL");
//VarList::push_back(ctrls, "Amiga mouse", "AMIGAMOUSE");
//VarList::push_back(ctrls, "Atari mouse", "ATARIMOUSE");
//VarList::push_back(ctrls, "Trak-Ball", "TRAKBALL");
VarList::push_back(ctrls, "AtariVox", "ATARIVOX");
VarList::push_back(ctrls, "SaveKey", "SAVEKEY");
//VarList::push_back(ctrls, "Sega Genesis", "GENESIS");
//VarList::push_back(ctrls, "KidVid", "KIDVID");
//VarList::push_back(ctrls, "Lightgun", "LIGHTGUN");
//VarList::push_back(ctrls, "Kid Vid", "KIDVID");
//VarList::push_back(ctrls, "Light Gun", "LIGHTGUN");
//VarList::push_back(ctrls, "MindLink", "MINDLINK");
//VarList::push_back(ctrls, "QuadTari", "QUADTARI");

8
src/gui/StellaSettingsDialog.cxx
View File

@ -187,12 +187,12 @@ void StellaSettingsDialog::addGameOptions(WidgetArray& wid, int& xpos, int& ypos
VarList::push_back(ctrls, "Auto-detect", "AUTO");
VarList::push_back(ctrls, "Joystick", "JOYSTICK");
VarList::push_back(ctrls, "Paddles", "PADDLES");
VarList::push_back(ctrls, "BoosterGrip", "BOOSTERGRIP");
VarList::push_back(ctrls, "Booster Grip", "BOOSTERGRIP");
VarList::push_back(ctrls, "Driving", "DRIVING");
VarList::push_back(ctrls, "Keyboard", "KEYBOARD");
VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE");
VarList::push_back(ctrls, "AtariMouse", "ATARIMOUSE");
VarList::push_back(ctrls, "Trakball", "TRAKBALL");
VarList::push_back(ctrls, "Amiga mouse", "AMIGAMOUSE");
VarList::push_back(ctrls, "Atari mouse", "ATARIMOUSE");
VarList::push_back(ctrls, "Trak-Ball", "TRAKBALL");
VarList::push_back(ctrls, "Sega Genesis", "GENESIS");
VarList::push_back(ctrls, "QuadTari", "QUADTARI");