summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--docs/source/usingmame/defaultkeys.rst12
-rw-r--r--src/mame/saitek/gk2000.cpp1
-rw-r--r--src/osd/mac/window.cpp4
-rw-r--r--src/osd/sdl/osdsdl.cpp28
-rw-r--r--src/osd/sdl/window.cpp4
5 files changed, 25 insertions, 24 deletions
diff --git a/docs/source/usingmame/defaultkeys.rst b/docs/source/usingmame/defaultkeys.rst
index f558c42cdef..6ed8d0148de 100644
--- a/docs/source/usingmame/defaultkeys.rst
+++ b/docs/source/usingmame/defaultkeys.rst
@@ -141,9 +141,6 @@ and saving/loading save states.
state.
**Left Shift+F6**
Create a quick save state.
-**Left Ctrl+F6**
- Decrease Prescaling.
- (*SDL MAME only*)
**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.
@@ -154,15 +151,18 @@ and saving/loading save states.
save or load.*
**Left Shift+F7**
Load a quick save state.
-**Left Ctrl+F7**
- Increase Prescaling.
- (*SDL MAME only*)
**F8**
Decrease frame skipping on the fly.
**Left Shift+F8**
Toggle cheat mode. (if started with “-cheat”)
+**Left Alt+F8**
+ Decrease Prescaling.
+ (*SDL MAME only*)
**F9**
Increase frame skipping on the fly.
+**Left Alt+F9**
+ Increase Prescaling.
+ (*SDL MAME only*)
**F10**
Toggle speed throttling.
**Left Alt+F10**
diff --git a/src/mame/saitek/gk2000.cpp b/src/mame/saitek/gk2000.cpp
index e8678dd7dd9..621f3e868e6 100644
--- a/src/mame/saitek/gk2000.cpp
+++ b/src/mame/saitek/gk2000.cpp
@@ -17,6 +17,7 @@ A13 MCU is used in:
- Saitek GK 2000 (86071220X12)
- Saitek Travel Champion 2080 (86071220X12)
- Saitek Mephisto Champion (suspected)
+- Saitek Mephisto Mythos (86142221X34)
- Tandy (Radio Shack) Mega 2050X (86071221X12)
- Tandy (Radio Shack) Master 2200X (suspected)
diff --git a/src/osd/mac/window.cpp b/src/osd/mac/window.cpp
index b3ab9083a90..d3ec18b94a7 100644
--- a/src/osd/mac/window.cpp
+++ b/src/osd/mac/window.cpp
@@ -223,7 +223,7 @@ void mac_window_info::modify_prescale(int dir)
{
int new_prescale = prescale();
- if (dir > 0 && prescale() < 3)
+ if (dir > 0 && prescale() < 8)
new_prescale = prescale() + 1;
if (dir < 0 && prescale() > 1)
new_prescale = prescale() - 1;
@@ -243,7 +243,7 @@ void mac_window_info::modify_prescale(int dir)
notify_changed();
m_prescale = new_prescale;
}
- machine().ui().popup_time(1, "Prescale %d", prescale());
+ machine().ui().popup_time(1, "Prescale %d/8", prescale());
}
}
diff --git a/src/osd/sdl/osdsdl.cpp b/src/osd/sdl/osdsdl.cpp
index f9778f0ab52..2d3e5e4f02c 100644
--- a/src/osd/sdl/osdsdl.cpp
+++ b/src/osd/sdl/osdsdl.cpp
@@ -343,10 +343,10 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_PGDN);
break;
- // OSD hotkeys use LCTRL and start at F3, they start at
- // F3 because F1-F2 are hardcoded into many drivers to
+ // OSD hotkeys use LALT/LCTRL and start at F3, they start
+ // at F3 because F1-F2 are hardcoded into many drivers to
// various dipswitches, and pressing them together with
- // LCTRL will still press/toggle these dipswitches.
+ // LALT/LCTRL will still press/toggle these dipswitches.
// LALT-F10 to toggle OpenGL filtering
case IPT_OSD_5:
@@ -359,26 +359,26 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, input_seq::not_code, KEYCODE_LALT);
break;
- // LCTRL-F6 to decrease OpenGL prescaling
+ // LALT-F8 to decrease OpenGL prescaling
case IPT_OSD_6:
entry.configure_osd("DECREASE_PRESCALE", N_p("input-name", "Decrease Prescaling"));
- entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, KEYCODE_LCONTROL);
+ entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F8, KEYCODE_LALT);
break;
- // add a Not LCTRL condition to the save state key
- case IPT_UI_SAVE_STATE:
- entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT);
+ // add a Not LALT condition to the frameskip dec key
+ case IPT_UI_FRAMESKIP_DEC:
+ entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F8, input_seq::not_code, KEYCODE_LALT, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT);
break;
- // LCTRL-F7 to increase OpenGL prescaling
+ // LALT-F9 to increase OpenGL prescaling
case IPT_OSD_7:
entry.configure_osd("INCREASE_PRESCALE", N_p("input-name", "Increase Prescaling"));
- entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, KEYCODE_LCONTROL);
+ entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F9, KEYCODE_LALT);
break;
- // add a Not LCTRL condition to the load state key
- case IPT_UI_LOAD_STATE:
- entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT);
+ // add a Not LALT condition to the load state key
+ case IPT_UI_FRAMESKIP_INC:
+ entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F9, input_seq::not_code, KEYCODE_LALT);
break;
// LSHIFT-LALT-F12 for fullscreen video (BGFX)
@@ -695,7 +695,7 @@ void sdl_osd_interface::check_osd_inputs()
if (USE_OPENGL)
{
- //FIXME: on a per window basis
+ // FIXME: on a per window basis
if (machine().ui_input().pressed(IPT_OSD_5))
{
video_config.filter = !video_config.filter;
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 41f0c5af2be..41f3b1addc7 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -266,7 +266,7 @@ void sdl_window_info::modify_prescale(int dir)
{
int new_prescale = prescale();
- if (dir > 0 && prescale() < 3)
+ if (dir > 0 && prescale() < 20)
new_prescale = prescale() + 1;
if (dir < 0 && prescale() > 1)
new_prescale = prescale() - 1;
@@ -286,7 +286,7 @@ void sdl_window_info::modify_prescale(int dir)
m_prescale = new_prescale;
notify_changed();
}
- machine().ui().popup_time(1, "Prescale %d", prescale());
+ machine().ui().popup_time(1, "Prescale %d/20", prescale());
}
}