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

cli: fix boost input detection 

until now, the boost key was hardcoded to 'o' even when the config
said otherwise, and not treated in case of a joypad at all.
when triggered with the o key, it even behaved differently than
the gtk ui - the boost wasn't released together with the key,
but only when pressed again, so it was more like a shortcut for
"disable fps limiter".

this change implements the desired outcome of the second part of PR #822,
but without introducing more hacks and relying on magic values.

closes #822
This commit is contained in:
rofl0r 2024-10-27 17:30:21 +00:00
parent 58bbe693e1
commit 3ddb2669a9
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/frontend/interface/draw_sdl_window.cpp
View File

@ -255,7 +255,6 @@ EXPORTED int desmume_draw_window_init(BOOL auto_pause, BOOL use_opengl_if_possib
// TODO: Make configurable instead.
load_default_config(cli_kb_cfg);
ctrls_cfg.boost = 0;
ctrls_cfg.sdl_quit = 0;
ctrls_cfg.auto_pause = auto_pause;
ctrls_cfg.focused = 1;

3
desmume/src/frontend/posix/cli/main.cpp
View File

@ -546,7 +546,6 @@ int main(int argc, char ** argv) {
osd = new OSDCLASS(-1);
#endif
ctrls_cfg.boost = 0;
ctrls_cfg.sdl_quit = 0;
ctrls_cfg.auto_pause = my_config.auto_pause;
ctrls_cfg.focused = 1;
@ -577,7 +576,7 @@ int main(int argc, char ** argv) {
#ifdef DISPLAY_FPS
now = SDL_GetTicks();
#endif
if ( !my_config.disable_limiter && !ctrls_cfg.boost) {
if ( !my_config.disable_limiter && !(ctrls_cfg.keypad & KEYMASK_(KEY_BOOST - 1))) {
#ifndef DISPLAY_FPS
now = SDL_GetTicks();
#endif

10
desmume/src/frontend/posix/shared/ctrlssdl.cpp
View File

@ -430,7 +430,6 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) {
break;
/* Joystick button pressed */
/* FIXME: Add support for BOOST */
case SDL_JOYBUTTONDOWN:
key_code = ((event->jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255);
key = lookup_joy_key( key_code );
@ -536,15 +535,6 @@ process_ctrls_event( SDL_Event& event,
driver->AddLine("Fake mic disabled");
break;
#endif
case SDLK_o:
cfg->boost = !cfg->boost;
if (cfg->boost)
driver->AddLine("Boost mode enabled");
else
driver->AddLine("Boost mode disabled");
break;
case SDLK_LSHIFT:
shift_pressed &= ~1;
break;

1
desmume/src/frontend/posix/shared/ctrlssdl.h
View File

@ -89,7 +89,6 @@ struct ctrls_event_config {
int auto_pause;
int focused;
int sdl_quit;
int boost;
int fake_mic;
void *screen_texture;
void (*resize_cb)(u16 width, u16 height, void *screen_texture);