piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-28 09:59:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #1119 'Add "frame step" hotkey'

Browse Source
This commit is contained in:
gal20
2021-07-30 19:09:12 +03:00
committed by Nadia Holmquist Pedersen
parent aaa97c9242
commit 1bda85383f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/qt_sdl/InputConfigDialog.cpp
View File

@ -92,7 +92,7 @@ InputConfigDialog::InputConfigDialog(QWidget* parent) : QDialog(parent), ui(new
addonsJoyMap[i] = Config::HKJoyMapping[hk_addons[i]]; addonsJoyMap[i] = Config::HKJoyMapping[hk_addons[i]];
} }
for (int i = 0; i < 8; i++) for (int i = 0; i < 9; i++)
{ {
hkGeneralKeyMap[i] = Config::HKKeyMapping[hk_general[i]]; hkGeneralKeyMap[i] = Config::HKKeyMapping[hk_general[i]];
hkGeneralJoyMap[i] = Config::HKJoyMapping[hk_general[i]]; hkGeneralJoyMap[i] = Config::HKJoyMapping[hk_general[i]];
@ -100,7 +100,7 @@ InputConfigDialog::InputConfigDialog(QWidget* parent) : QDialog(parent), ui(new
populatePage(ui->tabInput, 12, dskeylabels, keypadKeyMap, keypadJoyMap); populatePage(ui->tabInput, 12, dskeylabels, keypadKeyMap, keypadJoyMap);
populatePage(ui->tabAddons, 2, hk_addons_labels, addonsKeyMap, addonsJoyMap); populatePage(ui->tabAddons, 2, hk_addons_labels, addonsKeyMap, addonsJoyMap);
populatePage(ui->tabHotkeysGeneral, 8, hk_general_labels, hkGeneralKeyMap, hkGeneralJoyMap); populatePage(ui->tabHotkeysGeneral, 9, hk_general_labels, hkGeneralKeyMap, hkGeneralJoyMap);
int njoy = SDL_NumJoysticks(); int njoy = SDL_NumJoysticks();
if (njoy > 0) if (njoy > 0)
@ -183,7 +183,7 @@ void InputConfigDialog::on_InputConfigDialog_accepted()
Config::HKJoyMapping[hk_addons[i]] = addonsJoyMap[i]; Config::HKJoyMapping[hk_addons[i]] = addonsJoyMap[i];
} }
for (int i = 0; i < 8; i++) for (int i = 0; i < 9; i++)
{ {
Config::HKKeyMapping[hk_general[i]] = hkGeneralKeyMap[i]; Config::HKKeyMapping[hk_general[i]] = hkGeneralKeyMap[i];
Config::HKJoyMapping[hk_general[i]] = hkGeneralJoyMap[i]; Config::HKJoyMapping[hk_general[i]] = hkGeneralJoyMap[i];

2
src/frontend/qt_sdl/InputConfigDialog.h
View File

@ -64,7 +64,7 @@ private:
int keypadKeyMap[12], keypadJoyMap[12]; int keypadKeyMap[12], keypadJoyMap[12];
int addonsKeyMap[2], addonsJoyMap[2]; int addonsKeyMap[2], addonsJoyMap[2];
int hkGeneralKeyMap[8], hkGeneralJoyMap[8]; int hkGeneralKeyMap[9], hkGeneralJoyMap[9];
}; };