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

aligned Booster Grip buttons naming

This commit is contained in:
thrust26 2019-04-14 16:20:09 +02:00
parent d54f106a3a
commit 937ecca8c1
2 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/index.html
View File

@ -788,12 +788,12 @@
</tr> </tr>
<tr> <tr>
<td>Trigger Button</td> <td>Top Booster Button</td>
<td>4</td> <td>4</td>
</tr> </tr>
<tr> <tr>
<td>Booster Button</td> <td>Handle Grip Trigger</td>
<td>5</td> <td>5</td>
</tr> </tr>
</table> </table>
@ -832,12 +832,12 @@
</tr> </tr>
<tr> <tr>
<td>Trigger Button</td> <td>Top Booster Button</td>
<td>6</td> <td>6</td>
</tr> </tr>
<tr> <tr>
<td>Booster Button</td> <td>Handle Grip Trigger</td>
<td>7</td> <td>7</td>
</tr> </tr>
</table> </table>
@ -888,7 +888,7 @@
<tr> <tr>
<td>Paddle 1 Fire</td> <td>Paddle 1 Fire</td>
<td>Same as 'Joy0 Booster'</td> <td>Same as 'Joy0 Top Booster Button'</td>
</tr> </tr>
</table> </table>
</td> </td>
@ -927,7 +927,7 @@
<tr> <tr>
<td>Paddle 3 Fire</td> <td>Paddle 3 Fire</td>
<td>Same as 'Joy1 Booster'</td> <td>Same as 'Joy1 Top Booster Button'</td>
</tr> </tr>
</table> </table>
</td> </td>
@ -1036,7 +1036,7 @@
<tr> <tr>
<td>Button 'C'</td> <td>Button 'C'</td>
<td>Same as 'Joy0 Booster'</td> <td>Same as 'Joy0 Top Booster Button'</td>
</tr> </tr>
</table> </table>
</td> </td>
@ -1075,7 +1075,7 @@
<tr> <tr>
<td>Button 'C'</td> <td>Button 'C'</td>
<td>Same as 'Joy1 Booster'</td> <td>Same as 'Joy1 Top Booster Button'</td>
</tr> </tr>
</table> </table>
</td> </td>

198
src/emucore/EventHandler.cxx
View File

@ -1269,114 +1269,114 @@ void EventHandler::setState(EventHandlerState state)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = { EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = {
{ Event::ConsoleSelect, "Select", "", true }, { Event::ConsoleSelect, "Select", "", true },
{ Event::ConsoleReset, "Reset", "", true }, { Event::ConsoleReset, "Reset", "", true },
{ Event::ConsoleColor, "Color TV", "", true }, { Event::ConsoleColor, "Color TV", "", true },
{ Event::ConsoleBlackWhite, "Black & White TV", "", true }, { Event::ConsoleBlackWhite, "Black & White TV", "", true },
{ Event::ConsoleColorToggle, "Swap Color / B&W TV", "", true }, { Event::ConsoleColorToggle, "Swap Color / B&W TV", "", true },
{ Event::Console7800Pause, "7800 Pause Key", "", true }, { Event::Console7800Pause, "7800 Pause Key", "", true },
{ Event::ConsoleLeftDiffA, "P0 Difficulty A", "", true }, { Event::ConsoleLeftDiffA, "P0 Difficulty A", "", true },
{ Event::ConsoleLeftDiffB, "P0 Difficulty B", "", true }, { Event::ConsoleLeftDiffB, "P0 Difficulty B", "", true },
{ Event::ConsoleLeftDiffToggle, "P0 swap Difficulty", "", true }, { Event::ConsoleLeftDiffToggle, "P0 swap Difficulty", "", true },
{ Event::ConsoleRightDiffA, "P1 Difficulty A", "", true }, { Event::ConsoleRightDiffA, "P1 Difficulty A", "", true },
{ Event::ConsoleRightDiffB, "P1 Difficulty B", "", true }, { Event::ConsoleRightDiffB, "P1 Difficulty B", "", true },
{ Event::ConsoleRightDiffToggle, "P1 swap Difficulty", "", true }, { Event::ConsoleRightDiffToggle, "P1 swap Difficulty", "", true },
{ Event::SaveState, "Save state", "", false }, { Event::SaveState, "Save state", "", false },
{ Event::ChangeState, "Change state", "", false }, { Event::ChangeState, "Change state", "", false },
{ Event::LoadState, "Load state", "", false }, { Event::LoadState, "Load state", "", false },
{ Event::TakeSnapshot, "Snapshot", "", false }, { Event::TakeSnapshot, "Snapshot", "", false },
{ Event::Fry, "Fry cartridge", "", false }, { Event::Fry, "Fry cartridge", "", false },
{ Event::VolumeDecrease, "Decrease volume", "", false }, { Event::VolumeDecrease, "Decrease volume", "", false },
{ Event::VolumeIncrease, "Increase volume", "", false }, { Event::VolumeIncrease, "Increase volume", "", false },
{ Event::SoundToggle, "Toggle sound", "", false }, { Event::SoundToggle, "Toggle sound", "", false },
{ Event::VidmodeDecrease, "Previous video mode", "", false }, { Event::VidmodeDecrease, "Previous video mode", "", false },
{ Event::VidmodeIncrease, "Next video mode", "", false }, { Event::VidmodeIncrease, "Next video mode", "", false },
{ Event::PauseMode, "Pause", "", false }, { Event::PauseMode, "Pause", "", false },
{ Event::OptionsMenuMode, "Enter options menu UI", "", false }, { Event::OptionsMenuMode, "Enter options menu UI", "", false },
{ Event::CmdMenuMode, "Toggle command menu UI", "", false }, { Event::CmdMenuMode, "Toggle command menu UI", "", false },
{ Event::TimeMachineMode, "Toggle time machine UI", "", false }, { Event::TimeMachineMode, "Toggle time machine UI", "", false },
{ Event::DebuggerMode, "Toggle debugger mode", "", false }, { Event::DebuggerMode, "Toggle debugger mode", "", false },
{ Event::LauncherMode, "Enter ROM launcher", "", false }, { Event::LauncherMode, "Enter ROM launcher", "", false },
{ Event::Quit, "Quit", "", false }, { Event::Quit, "Quit", "", false },
{ Event::JoystickZeroUp, "P0 Joystick Up", "", true }, { Event::JoystickZeroUp, "P0 Joystick Up", "", true },
{ Event::JoystickZeroDown, "P0 Joystick Down", "", true }, { Event::JoystickZeroDown, "P0 Joystick Down", "", true },
{ Event::JoystickZeroLeft, "P0 Joystick Left", "", true }, { Event::JoystickZeroLeft, "P0 Joystick Left", "", true },
{ Event::JoystickZeroRight, "P0 Joystick Right", "", true }, { Event::JoystickZeroRight, "P0 Joystick Right", "", true },
{ Event::JoystickZeroFire, "P0 Joystick Fire", "", true }, { Event::JoystickZeroFire, "P0 Joystick Fire", "", true },
{ Event::JoystickZeroFire5, "P0 Booster Top Trigger", "", true }, { Event::JoystickZeroFire5, "P0 Booster Top Booster Button", "", true },
{ Event::JoystickZeroFire9, "P0 Booster Handle Grip", "", true }, { Event::JoystickZeroFire9, "P0 Booster Handle Grip Trigger", "", true },
{ Event::JoystickOneUp, "P1 Joystick Up", "", true }, { Event::JoystickOneUp, "P1 Joystick Up", "", true },
{ Event::JoystickOneDown, "P1 Joystick Down", "", true }, { Event::JoystickOneDown, "P1 Joystick Down", "", true },
{ Event::JoystickOneLeft, "P1 Joystick Left", "", true }, { Event::JoystickOneLeft, "P1 Joystick Left", "", true },
{ Event::JoystickOneRight, "P1 Joystick Right", "", true }, { Event::JoystickOneRight, "P1 Joystick Right", "", true },
{ Event::JoystickOneFire, "P1 Joystick Fire", "", true }, { Event::JoystickOneFire, "P1 Joystick Fire", "", true },
{ Event::JoystickOneFire5, "P1 Booster Top Trigger", "", true }, { Event::JoystickOneFire5, "P1 Booster Top Booster Button", "", true },
{ Event::JoystickOneFire9, "P1 Booster Handle Grip", "", true }, { Event::JoystickOneFire9, "P1 Booster Handle Grip Trigger", "", true },
{ Event::PaddleZeroAnalog, "Paddle 0 Analog", "", true }, { Event::PaddleZeroAnalog, "Paddle 0 Analog", "", true },
{ Event::PaddleZeroDecrease, "Paddle 0 Decrease", "", true }, { Event::PaddleZeroDecrease, "Paddle 0 Decrease", "", true },
{ Event::PaddleZeroIncrease, "Paddle 0 Increase", "", true }, { Event::PaddleZeroIncrease, "Paddle 0 Increase", "", true },
{ Event::PaddleZeroFire, "Paddle 0 Fire", "", true }, { Event::PaddleZeroFire, "Paddle 0 Fire", "", true },
{ Event::PaddleOneAnalog, "Paddle 1 Analog", "", true }, { Event::PaddleOneAnalog, "Paddle 1 Analog", "", true },
{ Event::PaddleOneDecrease, "Paddle 1 Decrease", "", true }, { Event::PaddleOneDecrease, "Paddle 1 Decrease", "", true },
{ Event::PaddleOneIncrease, "Paddle 1 Increase", "", true }, { Event::PaddleOneIncrease, "Paddle 1 Increase", "", true },
{ Event::PaddleOneFire, "Paddle 1 Fire", "", true }, { Event::PaddleOneFire, "Paddle 1 Fire", "", true },
{ Event::PaddleTwoAnalog, "Paddle 2 Analog", "", true }, { Event::PaddleTwoAnalog, "Paddle 2 Analog", "", true },
{ Event::PaddleTwoDecrease, "Paddle 2 Decrease", "", true }, { Event::PaddleTwoDecrease, "Paddle 2 Decrease", "", true },
{ Event::PaddleTwoIncrease, "Paddle 2 Increase", "", true }, { Event::PaddleTwoIncrease, "Paddle 2 Increase", "", true },
{ Event::PaddleTwoFire, "Paddle 2 Fire", "", true }, { Event::PaddleTwoFire, "Paddle 2 Fire", "", true },
{ Event::PaddleThreeAnalog, "Paddle 3 Analog", "", true }, { Event::PaddleThreeAnalog, "Paddle 3 Analog", "", true },
{ Event::PaddleThreeDecrease, "Paddle 3 Decrease", "", true }, { Event::PaddleThreeDecrease, "Paddle 3 Decrease", "", true },
{ Event::PaddleThreeIncrease, "Paddle 3 Increase", "", true }, { Event::PaddleThreeIncrease, "Paddle 3 Increase", "", true },
{ Event::PaddleThreeFire, "Paddle 3 Fire", "", true }, { Event::PaddleThreeFire, "Paddle 3 Fire", "", true },
{ Event::KeyboardZero1, "P0 Keyboard 1", "", true }, { Event::KeyboardZero1, "P0 Keyboard 1", "", true },
{ Event::KeyboardZero2, "P0 Keyboard 2", "", true }, { Event::KeyboardZero2, "P0 Keyboard 2", "", true },
{ Event::KeyboardZero3, "P0 Keyboard 3", "", true }, { Event::KeyboardZero3, "P0 Keyboard 3", "", true },
{ Event::KeyboardZero4, "P0 Keyboard 4", "", true }, { Event::KeyboardZero4, "P0 Keyboard 4", "", true },
{ Event::KeyboardZero5, "P0 Keyboard 5", "", true }, { Event::KeyboardZero5, "P0 Keyboard 5", "", true },
{ Event::KeyboardZero6, "P0 Keyboard 6", "", true }, { Event::KeyboardZero6, "P0 Keyboard 6", "", true },
{ Event::KeyboardZero7, "P0 Keyboard 7", "", true }, { Event::KeyboardZero7, "P0 Keyboard 7", "", true },
{ Event::KeyboardZero8, "P0 Keyboard 8", "", true }, { Event::KeyboardZero8, "P0 Keyboard 8", "", true },
{ Event::KeyboardZero9, "P0 Keyboard 9", "", true }, { Event::KeyboardZero9, "P0 Keyboard 9", "", true },
{ Event::KeyboardZeroStar, "P0 Keyboard *", "", true }, { Event::KeyboardZeroStar, "P0 Keyboard *", "", true },
{ Event::KeyboardZero0, "P0 Keyboard 0", "", true }, { Event::KeyboardZero0, "P0 Keyboard 0", "", true },
{ Event::KeyboardZeroPound, "P0 Keyboard #", "", true }, { Event::KeyboardZeroPound, "P0 Keyboard #", "", true },
{ Event::KeyboardOne1, "P1 Keyboard 1", "", true }, { Event::KeyboardOne1, "P1 Keyboard 1", "", true },
{ Event::KeyboardOne2, "P1 Keyboard 2", "", true }, { Event::KeyboardOne2, "P1 Keyboard 2", "", true },
{ Event::KeyboardOne3, "P1 Keyboard 3", "", true }, { Event::KeyboardOne3, "P1 Keyboard 3", "", true },
{ Event::KeyboardOne4, "P1 Keyboard 4", "", true }, { Event::KeyboardOne4, "P1 Keyboard 4", "", true },
{ Event::KeyboardOne5, "P1 Keyboard 5", "", true }, { Event::KeyboardOne5, "P1 Keyboard 5", "", true },
{ Event::KeyboardOne6, "P1 Keyboard 6", "", true }, { Event::KeyboardOne6, "P1 Keyboard 6", "", true },
{ Event::KeyboardOne7, "P1 Keyboard 7", "", true }, { Event::KeyboardOne7, "P1 Keyboard 7", "", true },
{ Event::KeyboardOne8, "P1 Keyboard 8", "", true }, { Event::KeyboardOne8, "P1 Keyboard 8", "", true },
{ Event::KeyboardOne9, "P1 Keyboard 9", "", true }, { Event::KeyboardOne9, "P1 Keyboard 9", "", true },
{ Event::KeyboardOneStar, "P1 Keyboard *", "", true }, { Event::KeyboardOneStar, "P1 Keyboard *", "", true },
{ Event::KeyboardOne0, "P1 Keyboard 0", "", true }, { Event::KeyboardOne0, "P1 Keyboard 0", "", true },
{ Event::KeyboardOnePound, "P1 Keyboard #", "", true }, { Event::KeyboardOnePound, "P1 Keyboard #", "", true },
{ Event::Combo1, "Combo 1", "", false }, { Event::Combo1, "Combo 1", "", false },
{ Event::Combo2, "Combo 2", "", false }, { Event::Combo2, "Combo 2", "", false },
{ Event::Combo3, "Combo 3", "", false }, { Event::Combo3, "Combo 3", "", false },
{ Event::Combo4, "Combo 4", "", false }, { Event::Combo4, "Combo 4", "", false },
{ Event::Combo5, "Combo 5", "", false }, { Event::Combo5, "Combo 5", "", false },
{ Event::Combo6, "Combo 6", "", false }, { Event::Combo6, "Combo 6", "", false },
{ Event::Combo7, "Combo 7", "", false }, { Event::Combo7, "Combo 7", "", false },
{ Event::Combo8, "Combo 8", "", false }, { Event::Combo8, "Combo 8", "", false },
{ Event::Combo9, "Combo 9", "", false }, { Event::Combo9, "Combo 9", "", false },
{ Event::Combo10, "Combo 10", "", false }, { Event::Combo10, "Combo 10", "", false },
{ Event::Combo11, "Combo 11", "", false }, { Event::Combo11, "Combo 11", "", false },
{ Event::Combo12, "Combo 12", "", false }, { Event::Combo12, "Combo 12", "", false },
{ Event::Combo13, "Combo 13", "", false }, { Event::Combo13, "Combo 13", "", false },
{ Event::Combo14, "Combo 14", "", false }, { Event::Combo14, "Combo 14", "", false },
{ Event::Combo15, "Combo 15", "", false }, { Event::Combo15, "Combo 15", "", false },
{ Event::Combo16, "Combo 16", "", false } { Event::Combo16, "Combo 16", "", false }
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -