summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Firehawke <34792592+Firehawke@users.noreply.github.com>2020-09-15 18:12:02 -0700
committer GitHub <noreply@github.com>2020-09-16 11:12:02 +1000
commit25397ebfdab0c5c045c3d72b8f8589e1a627c2d4 (patch)
tree776dcb409b96ad10cf3e50b91f68befb1e6b8fca
parentea60f78b23d94cd9c57f3de619f51e57503cddc1 (diff)
Docs: Overhaul the default keys list (#7222)
* Docs: Overhaul the default keys list * Second phase of documenting default inputs better, also change Score to Take Score in Mahjong inputs * Phase two of default keys docs adjustment.
-rw-r--r--docs/source/usingmame/defaultkeys.rst717
-rw-r--r--src/emu/inpttype.ipp6
2 files changed, 616 insertions, 107 deletions
diff --git a/docs/source/usingmame/defaultkeys.rst b/docs/source/usingmame/defaultkeys.rst
index 73bcb1c12fe..cbd2630803f 100644
--- a/docs/source/usingmame/defaultkeys.rst
+++ b/docs/source/usingmame/defaultkeys.rst
@@ -1,106 +1,615 @@
.. _default-keys:
-Default Keys
-============
-
-All the keys below are fully configurable in the user interface. This list shows the standard keyboard configuration.
-
-
-================ ===============================================================================
- Key | Action
----------------- -------------------------------------------------------------------------------
-**Tab** | Toggles the configuration menu.
-**~** | Toggles the On Screen Display. When the on-screen display is
- | visible, you can use the following keys to control it:
- |
- | * **Up** - select previous parameter to modify
- | * **Down** - select next parameter to modify
- | * **Left** - decrease the value of the selected parameter
- | * **Right** - increase the value of the selected parameter
- | * **Enter** - reset parameter value to its default
- | * **Control+Left** - decrease the value by 10x
- | * **Shift+Left** - decrease the value by 0.1x
- | * **Alt+Left** - decrease the value by the smallest amount
- | * **Control+Right** - increase the value by 10x
- | * **Shift+Right** - increase the value by 0.1x
- | * **Alt+Right** - increase the value by the smallest amount
- |
- | If you are running with -debug, this key sends a 'break' in emulation.
-**P** | Pauses the game.
-**Shift+P** | While paused, advances to next frame. If rewind is enabled, a new rewind save state is also captured.
-**Shift+~** | While paused, loads the most recent rewind save state.
-**F2** | Service Mode for games that support it.
-**F3** | Resets the game.
-**Shift+F3** | Performs a "hard reset", which tears everything down and re-creates it
- | from scratch. This is a more thorough and complete reset than the reset
- | you get from hitting F3.
-**LCtrl+F3** | [SDL ONLY] - Toggle uneven stretch.
-**F4** | Shows the game palette, decoded GFX, and any tilemaps. Use the Enter key to
- | switch between the three modes (palette, graphics, and tilemaps). Press F4
- | again to turn off the display. The key controls in each mode vary slightly:
- |
- | Palette/colortable mode:
- | * **[ ]** - switch between palette and colortable modes
- | * **Up/Down** - scroll up/down one line at a time
- | * **Page Up/Page Down** - scroll up/down one page at a time
- | * **Home/End** - move to top/bottom of list
- | * **-/+** - increase/decrease the number of colors per row
- | * **Enter** - switch to graphics viewer
- |
- | Graphics mode:
- | * **[ ]** - switch between different graphics sets
- | * **Up/Down** - scroll up/down one line at a time
- | * **Page Up/Page Down** - scroll up/down one page at a time
- | * **Home/End** - move to top/bottom of list
- | * **Left/Right** - change color displayed
- | * **R** - rotate tiles 90 degrees clockwise
- | * **-/+** - increase/decrease the number of tiles per row
- | * **Enter** - switch to tilemap viewer
- |
- | Tilemap mode:
- | * **[ ]** - switch between different tilemaps
- | * **Up/Down/Left/Right** - scroll 8 pixels at a time
- | * **Shift+Up/Down/Left/Right** - scroll 1 pixel at a time
- | * **Control+Up/Down/Left/Right** - scroll 64 pixels at a time
- | * **R** - rotate tilemap view 90 degrees clockwise
- | * **-/+** - increase/decrease the zoom factor
- | * **Enter** - switch to palette/colortable mode
- |
- | Note: Not all games have decoded graphics and/or tilemaps.
-**LCtrl+F4** | [*SDL ONLY*] - Toggles keeping aspect ratio.
-**LCtrl+F5** | [*SDL ONLY*] - Toggle Filter.
-**Alt+Ctrl+F5** | [*NON SDL MS WINDOWS ONLY*] - Toggle HLSL Post-Processing.
-**F6** | Toggle cheat mode (if started with "-cheat").
-**LCtrl+F6** | Decrease Prescaling.
-**F7** | Load a save state. You will be requested to press a key to determine which
- | save state you wish to load.
- |
- | *Note that the save state feature is not supported for a large number of*
- | *drivers. If support is not enabled for a given driver, you will receive*
- | *a warning when attempting to save or load.*
-**LCtrl+F7** | Increase Prescaling.
-**Shift+F7** | Create a save state. Requires an additional keypress to identify the state,
- | similar to the load option above.
-**F8** | Decrease frame skip on the fly.
-**F9** | Increase frame skip on the fly.
-**F10** | Toggle speed throttling.
-**F11** | Toggles speed display.
-**Shift+F11** | Toggles internal profiler display (if compiled in).
-**Alt+F11** | Record HLSL Rendered Video.
-**F12** | Saves a screen snapshot.
-**Alt+F12** | Take HLSL Rendered Snapshot.
-**Insert** | [*WINDOW ONLY, NON-SDL*] Fast forward. While held, runs game with
- | throttling disabled and with the maximum frameskip.
-**Page DN** | [*SDL ONLY*] Fast forward. While held, runs the game with throttling
- | disabled and with the maximum frameskip.
-**Alt+ENTER** | Toggles between full-screen and windowed mode.
-**Scroll Lock** | Default mapping for the **uimodekey**.
- |
- | This key allows users to disable and enable the emulated keyboard
- | in machines that require it. All emulations which require emulated
- | keyboards will start in that mode and you can only access the internal
- | UI (hitting TAB) by first hitting this key. You can change the initial
- | status of the emulated keyboard as presented upon start by using
- | **-ui_active** as detailed below.
-**Escape** | Exits emulator.
-================ ===============================================================================
+Controls Foreword
+=================
+
+MAME supports a vast array of different types of machines, with a
+significantly different array of inputs across them. This means that some
+keyboard keys, mouse buttons, and joystick buttons will be used for multiple
+functions. As a result, the control charts below are separated by machine-types
+to make it easier to find what you're looking for.
+
+All of the controls below are fully configurable in the user interface. These
+charts show the default configuration.
+
+Note that the defaults shown here are arranged by US ANSI key positioning. If
+you are using a different layout, the keys will vary.
+
+MAME Controls
+=============
+
+The controls here cover MAME functions such as MAME's menus, machine pause,
+and saving/loading save states.
+
+
+**Tab**
+ Toggles the configuration menu.
+ Switches to the next UI panel.
+**~** (tilde key)
+ Toggles the On Screen Display.
+
+ If you are running with -debug, this key sends a 'break' in emulation.
+
+ When the on-screen display is visible, you can use the following
+ keys to control it:
+
+ * **Up** - select previous parameter to modify.
+ * **Down** - select next parameter to modify.
+ * **Left** - decrease the value of the selected parameter.
+ * **Right** - increase the value of the selected parameter.
+ * **Enter** - reset parameter value to its default.
+ * **Control+Left** - decrease the value by 10x.
+ * **Shift+Left** - decrease the value by 0.1x.
+ * **Alt+Left** - decrease the value by the smallest amount.
+ * **Control+Right** - increase the value by 10x.
+ * **Shift+Right** - increase the value by 0.1x.
+ * **Alt+Right** - increase the value by the smallest amount.
+ * **End** - temporarily hide the On Screen Display.
+ * **Home** - bring the On Screen Display back after hiding it.
+**Up Arrow**
+ Highlight previous UI menu option.
+**Down Arrow**
+ Highlight next UI menu option.
+**Left Arrow**
+ Change current UI option setting when an arrow is present on it.
+**Right Arrow**
+ Change current UI option setting when an arrow is present on it.
+**Home**
+ Highlight first UI menu option.
+**End**
+ Select last UI menu option.
+**Left Shift+Tab**
+ Select previous UI panel.
+**Enter**/**Joystick 1 Button 1**
+ Select currently highlighted UI menu option.
+**Space**
+ Show comment on currently highlighted UI menu option.
+**Delete**
+ Clear/reset to default when highlighting an entry on the input
+ configuration, cheat options, and plugin options pages.
+**[**
+ UI Previous Group
+**]**
+ UI Next Group
+**P**
+ Pauses the emulated machine.
+**Shift+P**
+ While paused, advances to next frame. If rewind is enabled, a new rewind
+ save state is also captured.
+**Shift+~**
+ While paused, loads the most recent rewind save state.
+**-** *(not numeric keypad)*
+ Volume Down for machines that have a volume control.
+**=** *(not numeric keypad)*
+ Volume Up for machines that have a volume control.
+**F1**
+ Power the machine on for machines that have specific power button behavior.
+**F2**
+ Power the machine off for machines that have specific power button behavior.
+
+ Service Mode button for machines that support that.
+**F3**
+ Soft resets the machine.
+**Shift+F3**
+ Performs a "hard reset", which tears everything down and re-creates it from
+ scratch. This is a more thorough and complete reset than the reset you get
+ from hitting F3.
+**LCtrl+F3**
+ Toggle uneven stretch. (*SDL ONLY*)
+**F4**
+ Shows the game palette, decoded graphics tiles/characters and any tilemaps.
+
+ Use the Enter key to switch between the three modes (palette, graphics, and
+ tilemaps).
+
+ Press F4 again to turn off the display.
+ The key controls in each mode vary slightly:
+
+ Palette/colortable mode:
+
+ * **[** **]** - switch between palette devices.
+ * **Up**/**Down** - scroll up/down one line at a time.
+ * **Page Up**/**Page Down** - scroll up/down one page at a time.
+ * **Home**/**End** - move to top/bottom of list.
+ * **-**/**+** - increase/decrease the number of colors per row.
+ * **Enter** - switch to graphics viewer.
+
+ Graphics mode:
+
+ * **[** **]** - switch between different graphics sets.
+ * **Up**/**Down** - scroll up/down one line at a time.
+ * **Page Up**/**Page Down** - scroll up/down one page at a time.
+ * **Home**/**End** - move to top/bottom of list.
+ * **Left**/**Right** - change color displayed.
+ * **R** - rotate tiles 90 degrees clockwise.
+ * **-**/**+** - increase/decrease the number of tiles per row.
+ * **Enter** - switch to tilemap viewer.
+
+ Tilemap mode:
+
+ * **[** **]** - switch between different tilemaps.
+ * **Up**/**Down**/**Left**/**Right** - scroll 8 pixels at a time.
+ * **Shift+Up**/**Down**/**Left**/**Right** - scroll 1 pixel at a time.
+ * **Control+Up**/**Down**/**Left**/**Right** - scroll 64 pixels at a time.
+ * **R** - rotate tilemap view 90 degrees clockwise.
+ * **-**/**+** - increase/decrease the zoom factor.
+ * **Enter** - switch to palette/colortable mode.
+
+ Note: Not all games have decoded graphics and/or tilemaps.
+**LCtrl+F4**
+ Toggles keeping aspect ratio.
+ (*SDL MAME only*)
+**LCtrl+F5**
+ Toggle Filter. (*SDL ONLY*)
+ (*SDL MAME only*)
+**Alt+Ctrl+F5**
+ Toggle HLSL Post-Processing.
+ (*Windows non-SDL MAME only*)
+**F6**
+ Toggle cheat mode. (if started with "-cheat")
+**LCtrl+F6**
+ Decrease Prescaling.
+**LCtrl+F7**
+ Increase Prescaling.
+**F7**
+ Load a save state. You will be prompted to press a key or select from the
+ menu to determine which save state you wish to load.
+
+ *Note that the save state feature is not supported for a large number of
+ drivers. If a given driver is not known to work perfectly, you will
+ receive a warning that the save state may not be valid when attempting to
+ save or load.*
+**Shift+F7**
+ Create a save state. Requires an additional keypress to identify the state,
+ similar to the load option above. If an existing save state is present, it
+ will also appear in the selection menu to allow overwriting of that save
+ state.
+**F8**
+ Decrease frame skipping on the fly.
+**F9**
+ Increase frame skipping on the fly.
+**F10**
+ Toggle speed throttling.
+**F11**
+ Toggles speed display.
+**Shift+F11**
+ Toggles internal profiler display (if compiled in).
+**Alt+F11**
+ Record HLSL Rendered Video.
+**F12**
+ Saves a screen snapshot.
+**Left Shift+F12**
+ Begin recording MNG video.
+**Left Control+Left Shift+F12**
+ Begin recording AVI video.
+**Alt+F12**
+ Take HLSL Rendered Snapshot.
+**Insert**
+ Fast forward. While held, runs game with throttling disabled and with the
+ maximum frameskip.
+ (*Windows non-SDL MAME only*)
+**Page DN**
+ Fast forward. While held, runs game with throttling disabled and with the
+ maximum frameskip.
+ (*Windows non-SDL MAME only*)
+**Alt+ENTER**
+ Toggles between full-screen and windowed mode.
+**Scroll Lock**/**Forward Delete** (Mac Desktop)/**fn-Delete** (Mac Laptop)
+ Default mapping for the **uimodekey**.
+
+ This key toggles MAME's response to user interface keys such as the
+ (by default) **Tab** key being used for menus. All emulated machines
+ which require emulated keyboards will start with UI controls disabled by
+ default and you can only access the internal UI by first hitting this
+ **uimodekey** key. You can change the initial status of the emulated
+ keyboard as presented upon start by using
+ :ref:`-uimodekey<mame-commandline-uimodekey>`
+**Escape**
+ Exits emulator.
+ Cancel current UI option.
+
+
+.. _default-arcade-keys:
+
+Default Arcade Machine Controls
+===============================
+
+All the controls below are fully configurable in the user interface. This list
+shows the standard keyboard configuration.
+
+**5**
+ Coin slot 1
+**6**
+ Coin slot 2
+**7**
+ Coin slot 3
+**8**
+ Coin slot 4
+**1**
+ Player 1 start or 1 player mode
+**2**
+ Player 2 start or 2 players mode
+**3**
+ Player 3 start or 3 players mode
+**4**
+ Player 4 start or 4 players mode
+**Backspace**
+ Bill 1 (For machines that have a bill receptor/note reader)
+**9**
+ Service 1 (Service buttons are typically used to give free credits or to
+ navigate the internal operator service menus)
+**0**
+ Service 2
+**-** (not numeric keypad)
+ Service 3
+**=** (not numeric keypad)
+ Service 4
+**Up Arrow**
+ Player 1 Up
+**Down Arrow**
+ Player 1 Down
+**Left Arrow**
+ Player 1 Left
+**Right Arrow**
+ Player 1 Right
+**E**
+ Up on Left Stick for dual-stick machines (e.g. Robotron)
+**D**
+ Down on Left Stick for dual-stick machines (e.g. Robotron)
+**S**
+ Left on Left Stick for dual-stick machines (e.g. Robotron)
+**F**
+ Right on Left Stick for dual-stick machines (e.g. Robotron)
+**I**
+ Up on Right Stick for dual-stick machines (e.g. Robotron)
+**K**
+ Down on Right Stick for dual-stick machines (e.g. Robotron)
+**J**
+ Left on Right Stick for dual-stick machines (e.g. Robotron)
+**L**
+ Right on Right Stick for dual-stick machines (e.g. Robotron)
+**Ctrl**/**Mouse B0**/**Gun 1 Button 0**
+ Player 1 Button 1
+**Alt**/**Mouse B2**/**Gun 1 Button 1**
+ Player 1 Button 2
+**Spacebar**/**Mouse B1**/**Joystick 1 Button 1 or B**
+ Player 1 Button 3
+**Shift**
+ Player 1 Button 4
+**Z**
+ Player 1 Button 5
+**X**
+ Player 1 Button 6
+**C**
+ Player 1 Button 7
+**V**
+ Player 1 Button 8
+**B**
+ Player 1 Button 9
+**N**
+ Player 1 Button 10
+**M**
+ Player 1 Button 11
+**,**
+ Player 1 Button 12
+**.**
+ Player 1 Button 13
+**/**
+ Player 1 Button 14
+**Right Shift**
+ Player 1 Button 15
+**9**
+ Service
+**0**
+ Book-Keeping
+
+
+.. _default-mahjong-hanafuda-keys:
+
+Default Mahjong and Hanafuda Keys
+=================================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+
+**5**
+ Coin slot 1
+**6**
+ Coin slot 2
+**7**
+ Coin slot 3
+**8**
+ Coin slot 4
+**1**
+ Player 1 start or 1 player mode
+**2**
+ Player 2 start or 2 players mode
+**3**
+ Player 3 start or 3 players mode
+
+ Mahjong Bet
+**4**
+ Player 4 start or 4 players mode
+**Backspace**
+ Bill 1 (For machines that have a bill receptor/note reader)
+**9**
+ Service 1 (Service buttons are typically used to give free credits or to
+ navigate the internal operator service menus)
+**0**
+ Service 2
+**-** (not numeric keypad)
+ Service 3
+**=** (not numeric keypad)
+ Service 4
+**Ctrl**
+ Mahjong Kan
+**Alt**
+ Mahjong Pon
+**Spacebar**
+ Mahjong Chi
+**Shift**
+ Mahjong Reach
+**Z**
+ Mahjong Ron
+**A**
+ Player 1 Mahjong/Hanafuda A
+**B**
+ Player 1 Mahjong/Hanafuda B
+**C**
+ Player 1 Mahjong/Hanafuda C
+**D**
+ Player 1 Mahjong/Hanafuda D
+**E**
+ Player 1 Mahjong/Hanafuda E
+**F**
+ Player 1 Mahjong/Hanafuda F
+**G**
+ Player 1 Mahjong/Hanafuda G
+**H**
+ Player 1 Mahjong/Hanafuda H
+**I**
+ Player 1 Mahjong I
+**J**
+ Player 1 Mahjong J
+**K**
+ Player 1 Mahjong K
+**L**
+ Player 1 Mahjong L
+**M**
+ Player 1 Mahjong M
+**N**
+ Player 1 Mahjong N
+**O**
+ Player 1 Taiwanese Mahjong O
+**P**
+ Player 1 Taiwanese Mahjong P
+**Q**
+ Player 1 Taiwanese Mahjong Q
+**Right Alt**
+ Player 1 Mahjong/Hanafuda Last Chance
+**Right Ctrl**
+ Player 1 Mahjong/Hanafuda Take Score
+**Right Shift**
+ Player 1 Mahjong/Hanafuda Double Up
+**Y**
+ Player 1 Mahjong/Hanafuda Flip/Flop
+**Enter**
+ Player 1 Mahjong/Hanafuda Big
+**Backspace**
+ Player 1 Mahjong/Hanafuda Small
+**9**
+ Service 1 (Service buttons are typically used to give free credits or to
+ navigate the internal operator service menus)
+**0**
+ Book-Keeping
+
+
+.. _default-gambling-keys:
+
+Default Gambling Keys
+=====================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+
+**5**
+ Coin slot 1
+**6**
+ Coin slot 2
+**7**
+ Coin slot 3
+**8**
+ Coin slot 4
+**1**
+ Player 1 start or 1 player mode
+**Backspace**
+ Bill 1 (For machines that have a bill receptor/note reader)
+**Q**
+ Key In
+**W**
+ Key Out
+**9**
+ Service 1 (Service buttons are typically used to give free credits or to
+ navigate the internal operator service menus)
+**0**
+ Service 2
+ Book-Keeping (for machines that have this functionality)
+**-** (not numeric keypad)
+ Service 3
+**=** (not numeric keypad)
+ Service 4
+**2**
+ Deal
+**L**
+ Stand
+**M**
+ Bet
+**I**
+ Payout
+**O**
+ Door
+**D**
+ Half Gamble
+**3**
+ Double Up
+**4**
+ Take Score
+**A**
+ High
+**S**
+ Low
+
+.. _default-blackjack-keys:
+
+Default Blackjack Keys
+======================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+
+**5**
+ Coin slot 1
+**6**
+ Coin slot 2
+**7**
+ Coin slot 3
+**8**
+ Coin slot 4
+**1**
+ Player 1 start or 1 player mode
+**Backspace**
+ Bill 1 (For machines that have a bill receptor/note reader)
+**Q**
+ Key In
+**W**
+ Key Out
+**9**
+ Service 1 (Service buttons are typically used to give free credits or to
+ navigate the internal operator service menus)
+**0**
+ Service 2
+ Book-Keeping (for machines that have this functionality)
+**-** (not numeric keypad)
+ Service 3
+**=** (not numeric keypad)
+ Service 4
+**2**
+ Deal
+**L**
+ Stand
+**M**
+ Bet
+**I**
+ Payout
+**O**
+ Door
+**D**
+ Half Gamble
+**3**
+ Double Up
+**4**
+ Take Score
+**A**
+ High
+**S**
+ Low
+
+
+.. _default-poker-keys:
+
+Default Poker Keys
+==================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+
+**2**
+ Deal
+**Z**
+ Hold 1
+**X**
+ Hold 2
+**C**
+ Hold 3
+**V**
+ Hold 4
+**B**
+ Hold 5
+**N**
+ Cancel
+**1**
+ Bet
+
+
+.. _default-slots-keys:
+
+Default Slots Keys
+==================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+
+**X**
+ Stop Reel 1
+**C**
+ Stop Reel 2
+**V**
+ Stop Reel 3
+**B**
+ Stop Reel 4
+**Z**
+ Stop All Reels
+
+.. _default-computer-keys:
+
+Default Computer Keys
+=====================
+
+All the keys below are fully configurable in the user interface. This list shows
+the standard keyboard configuration.
+
+Note that controls can vary widely by computer type, so not all keys are shown
+here. See the "Input (this Machine)" section of MAME's configuration menu for
+details for the machine you are currently using.
+
+
+**Tab**
+ Toggles the configuration menu.
+**Scroll Lock**/**Forward Delete** (Mac Desktop)/**fn-Delete** (Mac Laptop)
+ Default mapping for the **uimodekey**.
+
+ This key toggles MAME's response to user interface keys such as the
+ (by default) **Tab** key being used for menus. All emulated machines
+ which require emulated keyboards will start with UI controls disabled by
+ default and you can only access the internal UI by first hitting this
+ **uimodekey** key. You can change the initial status of the emulated
+ keyboard as presented upon start by using
+ :ref:`-uimodekey<mame-commandline-uimodekey>`
+**F2**
+ Start tape for machines that have cassette tape drives.
+**Shift+F2**
+ Stop tape for machines that have cassette tape drives.
+**Left Shift+Scroll Lock**
+ Pastes from system clipboard into the emulated machine.
+**Alphanumeric Keys**
+ These keys are mapped to their equivalents in the emulated machine by
+ default.
+
+
+.. _default-othermachine-keys:
+
+Other Machines
+==============
+
+All the keys are fully configurable in the user interface.
+
+Note that controls can vary widely by machine type, so default keys are not
+shown here and defaults will vary considerably based on the manufacturer and
+style. See the "Input (this Machine)" section of MAME's configuration menu for
+details for the machine you are currently using.
+
diff --git a/src/emu/inpttype.ipp b/src/emu/inpttype.ipp
index cef6f36d1f4..686888cf1b2 100644
--- a/src/emu/inpttype.ipp
+++ b/src/emu/inpttype.ipp
@@ -75,7 +75,7 @@ namespace {
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_RON, "P1 Mahjong Ron", input_seq(KEYCODE_Z) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_BET, "P1 Mahjong Bet", input_seq(KEYCODE_3) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_LAST_CHANCE, "P1 Mahjong Last Chance", input_seq(KEYCODE_RALT) ) \
- INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_SCORE, "P1 Mahjong Score", input_seq(KEYCODE_RCONTROL) ) \
+ INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_SCORE, "P1 Mahjong Take Score", input_seq(KEYCODE_RCONTROL) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_DOUBLE_UP, "P1 Mahjong Double Up", input_seq(KEYCODE_RSHIFT) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_FLIP_FLOP, "P1 Mahjong Flip Flop", input_seq(KEYCODE_Y) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, MAHJONG_BIG, "P1 Mahjong Big", input_seq(KEYCODE_ENTER) ) \
@@ -103,7 +103,7 @@ namespace {
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_HALF, "Half Gamble", input_seq(KEYCODE_D) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_DEAL, "Deal", input_seq(KEYCODE_2) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_D_UP, "Double Up", input_seq(KEYCODE_3) ) \
- INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_TAKE, "Take", input_seq(KEYCODE_4) ) \
+ INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_TAKE, "Take Score", input_seq(KEYCODE_4) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_STAND, "Stand", input_seq(KEYCODE_L) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_BET, "Bet", input_seq(KEYCODE_M) ) \
INPUT_PORT_DIGITAL_TYPE( 1, PLAYER1, GAMBLE_KEYIN, "Key In", input_seq(KEYCODE_Q) ) \
@@ -194,7 +194,7 @@ namespace {
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_RON, "P2 Mahjong Ron", input_seq() ) \
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_BET, "P2 Mahjong Bet", input_seq() ) \
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_LAST_CHANCE, "P2 Mahjong Last Chance", input_seq() ) \
- INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_SCORE, "P2 Mahjong Score", input_seq() ) \
+ INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_SCORE, "P2 Mahjong Take Score", input_seq() ) \
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_DOUBLE_UP, "P2 Mahjong Double Up", input_seq() ) \
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_FLIP_FLOP, "P2 Mahjong Flip Flop", input_seq() ) \
INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, MAHJONG_BIG, "P2 Mahjong Big", input_seq() ) \