From 9bd225d2801d9991bc7e2b3247a5de720531f742 Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Thu, 9 Sep 2021 11:47:26 +0200 Subject: [PATCH] fixed some controller spellings --- docs/index.html | 20 ++++++++++---------- src/emucore/AmigaMouse.hxx | 2 +- src/emucore/AtariMouse.hxx | 2 +- src/emucore/Booster.hxx | 2 +- src/emucore/Control.cxx | 8 ++++---- src/emucore/Lightgun.hxx | 2 +- src/emucore/TrakBall.hxx | 2 +- src/gui/GameInfoDialog.cxx | 12 ++++++------ src/gui/QuadTariDialog.cxx | 12 ++++++------ src/gui/StellaSettingsDialog.cxx | 8 ++++---- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/index.html b/docs/index.html index 6ffb4d08d..0cb14a30d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -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 -
  • Emulates the Atari 2600 Joystick, Paddle, Driving, CBS BoosterGrip, Sega Genesis, QuadTari controllers using your computer's keyboard, +
  • Emulates the Atari 2600 Joystick, Paddle, Driving, CBS Booster Grip, Sega Genesis, QuadTari controllers using your computer's keyboard, joysticks or mouse
    • -
  • Emulates CX22/CX80 style Trackballs, Amiga/Atari Mouse, Mindlink controller and the Light Gun using your +
  • Emulates CX22/CX80 style Trak-Balls, Amiga/Atari mouse, MindLink controller and the Light Gun using your computer's mouse
  • Emulates the Atari 2600 Keyboard controllers using your computer's keyboard
  • Emulates Spectravideo CompuMate system using your computer's keyboard, @@ -781,7 +781,7 @@ -

    Joystick/BoosterGrip Controller (can be remapped)

    +

    Joystick/Booster Grip Controller (can be remapped)

    @@ -880,7 +880,7 @@
    -

    Sega Genesis Controller (cannot be remapped, always associated with joystick and booster-grip controllers)

    +

    Sega Genesis Controller (cannot be remapped, always associated with joystick and Booster Grip controllers)

    @@ -2418,7 +2418,7 @@ - + @@ -2426,7 +2426,7 @@ - + @@ -2450,7 +2450,7 @@ - + @@ -2474,7 +2474,7 @@ - + @@ -4933,10 +4933,10 @@ Ms Pac-Man (Stella extended codes): - + - +
    ✓
    Booster Booster Grip ✓ ✓ ✓ (+ extra) ✓ (+ extra)
    Genesis Sega Genesis ✓ ✓ (+ extra) ✓ ✓
    Trackball/Mouse Trak-Ball/Mouse ✕ ✕ ✓ ✕
    Mindlink MindLink ✕ ✕ ✓
    TrakballStandard Atari 2600 CX22/CX80 'Trak-Ball' controller.
    AtariVox ¹A SpeakJet based unlimited-vocabulary speech/sound synthesizer with 32K EEPROM.
    SaveKeyA 32K EEPROM for saving high scores, etc. (the EEPROM portion of an AtariVox).
    Genesis Sega Genesis controller, which can be used similar to a BoosterGrip, giving an extra button.
    Genesis Sega Genesis controller, which can be used similar to a Booster Grip, giving an extra button.
    CompuMate ¹Spectravideo CompuMate (if either left or right is set, CompuMate is used for both).
    LightgunAtari XG-1 compatible Light Gun.
    Mindlink ¹Mindlink controller.
    MindLink ¹MindLink controller.
    KidVidKid Vid Voice Module, limited support (Right Keyboard controller buttons 1, 2 and 3 start the games, default mapping is 8, 9 and 0).
    QuadTariQuadTari controller, limited support (see below).
    diff --git a/src/emucore/AmigaMouse.hxx b/src/emucore/AmigaMouse.hxx index 71cd0ca32..b24c95cce 100644 --- a/src/emucore/AmigaMouse.hxx +++ b/src/emucore/AmigaMouse.hxx @@ -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 diff --git a/src/emucore/AtariMouse.hxx b/src/emucore/AtariMouse.hxx index 563b606f9..0ff5fc787 100644 --- a/src/emucore/AtariMouse.hxx +++ b/src/emucore/AtariMouse.hxx @@ -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 diff --git a/src/emucore/Booster.hxx b/src/emucore/Booster.hxx index eed210d38..9c98787e8 100644 --- a/src/emucore/Booster.hxx +++ b/src/emucore/Booster.hxx @@ -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: /** diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx index 8f7448fc7..22d12cc08 100644 --- a/src/emucore/Control.cxx +++ b/src/emucore/Control.cxx @@ -107,10 +107,10 @@ string Controller::getName(const Type type) static const std::array 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)]; diff --git a/src/emucore/Lightgun.hxx b/src/emucore/Lightgun.hxx index 1b3b223d1..503de5de3 100644 --- a/src/emucore/Lightgun.hxx +++ b/src/emucore/Lightgun.hxx @@ -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; diff --git a/src/emucore/TrakBall.hxx b/src/emucore/TrakBall.hxx index 3ecfdf403..2b0ce777f 100644 --- a/src/emucore/TrakBall.hxx +++ b/src/emucore/TrakBall.hxx @@ -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 diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index e51e499e2..e825cfe97 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -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"); diff --git a/src/gui/QuadTariDialog.cxx b/src/gui/QuadTariDialog.cxx index 194445bdf..2307169db 100644 --- a/src/gui/QuadTariDialog.cxx +++ b/src/gui/QuadTariDialog.cxx @@ -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"); diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx index d49a3c255..46efdc497 100644 --- a/src/gui/StellaSettingsDialog.cxx +++ b/src/gui/StellaSettingsDialog.cxx @@ -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");