From 08c59e58820abce8ba983b9ec2f0805194823af0 Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 28 Dec 2011 02:24:51 +0000 Subject: [PATCH] Added controller map to the documentation, stating how physical computer controllers are mapped to virtual console controllers. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2302 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- docs/index.html | 98 +++++++++++++++++++++++++++++++++++++++++ src/emucore/Driving.cxx | 2 +- 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 74028d428..44475a7dc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -28,6 +28,7 @@
  • Locating Game Images (aka, ROMs)
  • Playing a Game
  • Keyboard Layout
    • +
  • Controller Map
  • Advanced Configuration
    @@ -1558,6 +1559,103 @@ +

    6. Controller Map

    +
    + +

    Some Atari (virtual) controllers are simulated with more than one computer controller, and + there are several special cases where controllers are active in certain modes only, as the table + below shows. Items marked as (+ extra) indicate that the computer controller may not have + enough buttons/axes/etc to fully emulate the device, so extra functionality must be mapped to other + controllers.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     Computer
    Virtual
    Controller    		KeyboardJoystickMouse
    (auto mode)    		Mouse
    (specific axis)    		Stelladaptor/
    2600-daptor
    Joystick ✓ ✓ ✓ ✕ ✓
    Paddles ✓ ✓ ✓ ✓ (+ extra) ✓
    Booster ✓ ✓ ✓ (+ extra) ✕ ✓ (+ extra)
    Genesis ✓ ✓ (+ extra) ✕ ✕ ✕
    Keyboard ✓ ✓ ✕ ✕ ✕
    Driving ✓ ✓ ✓ ✕ ✓
    Trackball/mouse ✕ ✕ ✓ ✓ (axis ignored) ✕
    AtariVox N/A N/A N/A N/A N/A
    SaveKey N/A N/A N/A N/A N/A
    +
    +

    diff --git a/src/emucore/Driving.cxx b/src/emucore/Driving.cxx index a6a53c2c9..9a6529af5 100644 --- a/src/emucore/Driving.cxx +++ b/src/emucore/Driving.cxx @@ -117,7 +117,7 @@ void Driving::update() void Driving::setMouseControl( MouseAxisControl xaxis, MouseAxisControl yaxis, int ctrlID) { - // In 'automatic' mode, both axes on the mouse map to a single normal joystick + // In 'automatic' mode, only the X-axis is used if(xaxis == Controller::Automatic || yaxis == Controller::Automatic) { myControlID = ((myJack == Left && (ctrlID == 0 || ctrlID == 1)) ||