Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Bring back the old combo behavior, make the new behavior a checkbox (strict combo order).

Browse Source
This commit is contained in:
Henrik Rydgård 2024-01-29 18:05:03 +01:00
parent c29f81da36
commit 04ea4987b0
47 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/Config.cpp
View File

@ -836,6 +836,7 @@ static const ConfigSetting controlSettings[] = {
ConfigSetting("AnalogTriggerThreshold", &g_Config.fAnalogTriggerThreshold, 0.75f, CfgFlag::DEFAULT),
ConfigSetting("AllowMappingCombos", &g_Config.bAllowMappingCombos, false, CfgFlag::DEFAULT),
ConfigSetting("StrictComboOrder", &g_Config.bStrictComboOrder, false, CfgFlag::DEFAULT),
ConfigSetting("LeftStickHeadScale", &g_Config.fLeftStickHeadScale, 1.0f, CfgFlag::PER_GAME),
ConfigSetting("RightStickHeadScale", &g_Config.fRightStickHeadScale, 1.0f, CfgFlag::PER_GAME),

1
Core/Config.h
View File

@ -407,6 +407,7 @@ public:
// Sets whether combo mapping is enabled.
bool bAllowMappingCombos;
bool bStrictComboOrder;
bool bMouseControl;
bool bMapMouse; // Workaround for mapping screen:|

4
Core/ControlMapper.cpp
View File

@ -365,7 +365,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
continue;
}
// Stop reverse ordering from triggering.
if (iter->second.timestamp < curTime) {
if (g_Config.bStrictComboOrder && iter->second.timestamp < curTime) {
all = false;
break;
} else {
@ -416,7 +416,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
if (iter != curInput_.end()) {
// Stop reverse ordering from triggering.
if (iter->second.timestamp < curTime) {
if (g_Config.bStrictComboOrder && iter->second.timestamp < curTime) {
product = 0.0f;
break;
} else {

1
UI/ControlMappingScreen.cpp
View File

@ -262,6 +262,7 @@ void ControlMappingScreen::CreateViews() {
return UI::EVENT_DONE;
});
leftColumn->Add(new CheckBox(&g_Config.bAllowMappingCombos, km->T("Allow combo mappings")));
leftColumn->Add(new CheckBox(&g_Config.bStrictComboOrder, km->T("Strict combo input order")));
leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f)));
AddStandardBack(leftColumn);

1
assets/lang/ar_AE.ini
View File

@ -728,6 +728,7 @@ Map Mouse = ‎خريطة الفأرة
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = ‎يمكنك ضغط علي زر الخروج للإلغاء.
[MainMenu]

1
assets/lang/az_AZ.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/bg_BG.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/ca_ES.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Mapejar ratolí
Replace = Reemplaçar
Show PSP = Mostra PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Podeu prémer ESC per cancel·lar.
[MainMenu]

1
assets/lang/cz_CZ.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/da_DK.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Du kan trykke Esc for at afbryde.
[MainMenu]

1
assets/lang/de_DE.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Maus zuweisen
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Drücken Sie ESC zum abbrechen.
[MainMenu]

1
assets/lang/dr_ID.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/en_US.ini
View File

@ -744,6 +744,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/es_ES.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Mapear ratón
Replace = Remplazar
Show PSP = Mostrar PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Puedes presionar ESC para cancelar.
[MainMenu]

1
assets/lang/es_LA.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Asignar ratón
Replace = Reemplazar
Show PSP = Mostrar PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Puedes presionar Esc para cancelar.
[MainMenu]

1
assets/lang/fa_IR.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/fi_FI.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Kartoita hiiri
Replace = Korvaa
Show PSP = Näytä PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Voit peruuttaa painamalla Esc.
[MainMenu]

1
assets/lang/fr_FR.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Assigner un contrôle de souris
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Vous pouvez presser "Échap" pour annuler.
[MainMenu]

1
assets/lang/gl_ES.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/gr_EL.ini
View File

@ -720,6 +720,7 @@ Map Mouse = ΡύΘμιση ποντικού
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Μπορείτε να πατήσετε Esc για ακύρωση.
[MainMenu]

1
assets/lang/he_IL.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/he_IL_invert.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/hr_HR.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Postavi miš
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Možes pritisnuti ESC za odustati.
[MainMenu]

1
assets/lang/hu_HU.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Egér társítása
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Megszakításhoz használj ESC-et.
[MainMenu]

1
assets/lang/id_ID.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Tetapkan mouse
Replace = Timpa
Show PSP = Tampilkan PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Kamu dapat membatalkan dengan menekan ESC.
[MainMenu]

1
assets/lang/it_IT.ini
View File

@ -721,6 +721,7 @@ Map Mouse = Mappa Mouse
Replace = Sostituisci
Show PSP = Mostra PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Puoi premere Esc per annullare.
[MainMenu]

1
assets/lang/ja_JP.ini
View File

@ -720,6 +720,7 @@ Map Mouse = マウスの割り当て指定
Replace = 置き換える
Show PSP = PSP画像を表示
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Escを押すとキャンセルできます。
[MainMenu]

1
assets/lang/jv_ID.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/ko_KR.ini
View File

@ -720,6 +720,7 @@ Map Mouse = 마우스 매핑
Replace = 교체
Show PSP = PSP 표시
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Esc를 눌러 취소할 수 있습니다.
[MainMenu]

1
assets/lang/lo_LA.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = ເຈົ້າສາມາດກົດ Esc ເພື່ອຍົກເລີກ.
[MainMenu]

1
assets/lang/lt-LT.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/ms_MY.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/nl_NL.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Muis indelen
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Druk op Esc om te annuleren.
[MainMenu]

1
assets/lang/no_NO.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/pl_PL.ini
View File

@ -725,6 +725,7 @@ Map Mouse = Mapuj mysz
Replace = Zamień
Show PSP = Pokaż PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Możesz zamknąć to okienko naciskając Esc.
[MainMenu]

1
assets/lang/pt_BR.ini
View File

@ -744,6 +744,7 @@ Map Mouse = Mapear o mouse
Replace = Substituir
Show PSP = Mostrar o PSP
Standard PSP controls = Controles padrão do PSP
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Você pode pressionar o Esc pra cancelar.
[MainMenu]

1
assets/lang/pt_PT.ini
View File

@ -744,6 +744,7 @@ Map Mouse = Mapear o Rato
Replace = Substituir
Show PSP = Mostrar a PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Podes pressionar a tecla Esc para cancelar.
[MainMenu]

1
assets/lang/ro_RO.ini
View File

@ -721,6 +721,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/ru_RU.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Назначить мышь
Replace = Заменить
Show PSP = Показать вид PSP
Standard PSP controls = Стандартное управление PSP
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Для отмены вы можете нажать Esc.
[MainMenu]

1
assets/lang/sv_SE.ini
View File

@ -721,6 +721,7 @@ Map Mouse = Mappa mus
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Tryck ESC för att avbryta.
[MainMenu]

1
assets/lang/tg_PH.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Map mouse
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = You can press Esc to cancel.
[MainMenu]

1
assets/lang/th_TH.ini
View File

@ -726,6 +726,7 @@ Map Mouse = ตั้งค่าปุ่มเมาส์
Replace = แทนที่
Show PSP = แสดง PSP
Standard PSP controls = การควบคุม PSP ขั้นพื้นฐาน
Strict combo input order = Strict combo input order
You can press ESC to cancel. = คุณสามารถกด ESC เพื่อยกเลิกได้
[MainMenu]

1
assets/lang/tr_TR.ini
View File

@ -722,6 +722,7 @@ Map Mouse = Mouse eşleştir
Replace = Değiştir
Show PSP = PSP'yi Göster
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = İptal etmek için Esc'ye basabilirsiniz.
[MainMenu]

1
assets/lang/uk_UA.ini
View File

@ -720,6 +720,7 @@ Map Mouse = Карта миші
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = Ви можете натиснути Esc, щоб скасувати.
[MainMenu]

1
assets/lang/vi_VN.ini
View File

@ -720,6 +720,7 @@ Map Mouse = bản đồ chuột
Replace = Replace
Show PSP = Show PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = bạn có thể nhấp Esc để hủy.
[MainMenu]

1
assets/lang/zh_CN.ini
View File

@ -720,6 +720,7 @@ Map Mouse = 鼠标映射
Replace = 替换现有
Show PSP = PSP 布局
Standard PSP controls = PSP基本按键
Strict combo input order = Strict combo input order
You can press ESC to cancel. = 可以按下Esc键取消
[MainMenu]

1
assets/lang/zh_TW.ini
View File

@ -720,6 +720,7 @@ Map Mouse = 對應滑鼠
Replace = 取代
Show PSP = 顯示 PSP
Standard PSP controls = Standard PSP controls
Strict combo input order = Strict combo input order
You can press ESC to cancel. = 您可以按下 ESC 取消
[MainMenu]