From debc47ffd1ab17d76433601d573bd7203301ea63 Mon Sep 17 00:00:00 2001 From: xLuigiGamerx <88401287+xLuigiGamerx@users.noreply.github.com> Date: Sun, 17 May 2026 04:26:57 +0300 Subject: [PATCH] Translations and removal of the extended reports option --- lang/Czech.ini | 1 - lang/Dutch.ini | 2 +- lang/English.ini | 1 - lang/French.ini | 2 +- lang/German.ini | 1 - lang/Italian.ini | 4 +++- lang/Japanese.ini | 2 +- lang/Polish.ini | 2 +- lang/Portuguese.ini | 2 +- lang/Russian.ini | 2 +- lang/Spanish.ini | 2 +- src/pc/configfile.c | 2 -- src/pc/configfile.h | 1 - src/pc/controller/controller_sdl.c | 15 --------------- src/pc/pc_main.h | 1 - 15 files changed, 10 insertions(+), 30 deletions(-) diff --git a/lang/Czech.ini b/lang/Czech.ini index 600964e2a..ded78d345 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -102,7 +102,6 @@ N64_BINDS = "N64 Ovládání" EXTRA_BINDS = "Extra Ovládání" BACKGROUND_GAMEPAD = "Ovladač v pozadí" DISABLE_GAMEPADS = "Zakažte gamepady" -EXTENDED_REPORTS = "Rozšířené zprávy" GAMEPAD = "Použít ovladač" DEADZONE = "Deadzone" RUMBLE_STRENGTH = "Síla vibrace" diff --git a/lang/Dutch.ini b/lang/Dutch.ini index fb329ed5b..f9877156b 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ is in debug vrij vliegen gegaan." IMPORT_MOD_SUCCESS = "\\#a0ffa0\\Geimporteerd mod\n\\#dcdcdc\\'@'" IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\Geimporteerd DynOS pack\n\\#dcdcdc\\'@'" IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Geïmporteerd paletvoorinstelling\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Geïmporteerde controllertoewijzingsdatabase\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\gefaalt om \n\\#dcdcdc\\'@' te importeren." IMPORT_FAIL_INGAME = "\\#ffa0a0\\Kan niet importen in een spel." COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\Kon niet met CoopNet verbinden." @@ -101,7 +102,6 @@ N64_BINDS = "N64 Toetsen" EXTRA_BINDS = "Extra Toetsen" BACKGROUND_GAMEPAD = "Achtergrond Gamepad" DISABLE_GAMEPADS = "Gamepads uitschakelen" -EXTENDED_REPORTS = "Uitgebreide rapporten" GAMEPAD = "Gamepad" DEADZONE = "Doode-zone" RUMBLE_STRENGTH = "Rommel Kracht" diff --git a/lang/English.ini b/lang/English.ini index 627b6c755..d5db1a5b3 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -102,7 +102,6 @@ N64_BINDS = "N64 Binds" EXTRA_BINDS = "Extra Binds" BACKGROUND_GAMEPAD = "Background Gamepad" DISABLE_GAMEPADS = "Disable Gamepads" -EXTENDED_REPORTS = "Extended Reports" GAMEPAD = "Gamepad" DEADZONE = "Deadzone" RUMBLE_STRENGTH = "Rumble Strength" diff --git a/lang/French.ini b/lang/French.ini index 948e25f18..b20042a15 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ a activé le mode vol (débug) " IMPORT_MOD_SUCCESS = "\\#a0ffa0\\Le mod\n\\#dcdcdc\\'@'\\#a0ffa0\\\na été importé." IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\Le pack DynOS\n\\#dcdcdc\\'@'\n\\#a0ffa0\\a été importé." IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Préréglage de palette importé\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Base de données de mappage des manettes importées\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\L'importation de\n\\#dcdcdc\\'@'\\#ffa0a0\\\na échoué." IMPORT_FAIL_INGAME = "\\#ffa0a0\\L'importation ne peut pas se faire pendant la partie." COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\La connexion à CoopNet a échouée!" @@ -101,7 +102,6 @@ N64_BINDS = "Touches N64" EXTRA_BINDS = "Touches Supplémentaires" BACKGROUND_GAMEPAD = "Manette en arrière plan" DISABLE_GAMEPADS = "Désactiver les manettes de jeu" -EXTENDED_REPORTS = "Rapports détaillés" GAMEPAD = "Manette" DEADZONE = "Zone Morte" RUMBLE_STRENGTH = "Vibrations" diff --git a/lang/German.ini b/lang/German.ini index cc4938d04..586a41e79 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -101,7 +101,6 @@ CONTROLS = "STEUERUNG" N64_BINDS = "N64-Einstellungen" EXTRA_BINDS = "Zusätzliche Einstellungen" BACKGROUND_GAMEPAD = "Hintergrund-Gamepad" -EXTENDED_REPORTS = "Erweiterte Berichte" DISABLE_GAMEPADS = "Gamepads deaktivieren" GAMEPAD = "Gamepad" DEADZONE = "Tote Zone" diff --git a/lang/Italian.ini b/lang/Italian.ini index d258eaf39..4a21447c7 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ è entrato nello stato di debug di volo libero" IMPORT_MOD_SUCCESS = "\\#a0ffa0\\importata la mod\n\\#dcdcdc\\'@'" IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\Importato il pacchetto DynOS\n\\#dcdcdc\\'@'" IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Importata la preimpostazione di palette\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Database della mappatura controller importata\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\Impossibile importare\n\\#dcdcdc\\'@'" IMPORT_FAIL_INGAME = "\\#ffa0a0\\Impossibile importare durante la partita" COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\Impossibile connettersi a CoopNet!" @@ -96,14 +97,15 @@ DECELERATION = "Decelerazione" [CONTROLS] CONTROLS = "CONTROLLI" + N64_BINDS = "Comandi N64" EXTRA_BINDS = "Comandi Extra" BACKGROUND_GAMEPAD = "Attivi in Background" -EXTENDED_REPORTS = "Rapporti estesi" DISABLE_GAMEPADS = "Disabilita i Gamepad" GAMEPAD = "Controller" DEADZONE = "Zona Morta" RUMBLE_STRENGTH = "Intesità Vibrazione" + CHAT = "Chat" PLAYERS = "Giocatori" D_UP = "D Su" diff --git a/lang/Japanese.ini b/lang/Japanese.ini index ecae47eae..937b512f5 100644 --- a/lang/Japanese.ini +++ b/lang/Japanese.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@がデバッグ飛行モードに入った" IMPORT_MOD_SUCCESS = "\\#a0ffa0\\MODをインポートしました:\n\\#dcdcdc\\@" IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\DynOSパックをインポートしました:\n\\#dcdcdc\\@" IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\パレットプリセットをインポートしました:\n\\#dcdcdc\\@" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\コントローラーのマッピングデータベースをインポートしました\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\インポートに失敗しました:\n\\#dcdcdc\\@" IMPORT_FAIL_INGAME = "\\#ffa0a0\\ゲーム中はMODをインポートできません" COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\CoopNetに接続できませんでした！" @@ -100,7 +101,6 @@ CONTROLS = "CONTROLS" N64_BINDS = "ニンテンドウ64のボタン割り当て" EXTRA_BINDS = "追加のボタン割り当て" BACKGROUND_GAMEPAD = "バックグラウンドでのコントローラー認識" -EXTENDED_REPORTS = "拡張レポート" DISABLE_GAMEPADS = "コントローラーを無効化" GAMEPAD = "コントローラー" DEADZONE = "デッドゾーン" diff --git a/lang/Polish.ini b/lang/Polish.ini index 9b30e4bb4..d6e9ffbb0 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "Gracz @ włączył debugowy stan latania" IMPORT_MOD_SUCCESS = "\\#a0ffa0\\Zaimportowano Modyfikację\n\\#c8c8c8\\'@'" IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\Zaimportowano paczkę DynOS\n\\#c8c8c8\\'@'" IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Zaimportowano preset palety\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Zaimportowana baza danych mapowań kontrolerów\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\Nie udało się zaimportować\n\\#c8c8c8\\'@'" IMPORT_FAIL_INGAME = "\\#ffa0a0\\Nie można importować podczas gry" COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\Nie udało się połączyć z CoopNetem!" @@ -100,7 +101,6 @@ CONTROLS = "STEROWANIE" N64_BINDS = "Przypisania N64" EXTRA_BINDS = "Dodatkowe Przypisania" BACKGROUND_GAMEPAD = "Gamepad w Tle" -EXTENDED_REPORTS = "Rozszerzone raporty" DISABLE_GAMEPADS = "Wyłącz Gamepady" GAMEPAD = "Gamepad" DEADZONE = "Martwa Strefa" diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index 6ebd0826d..37de7cb16 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ entrou no modo de voo livre de debug" IMPORT_MOD_SUCCESS = "\\#dcdcdc\\'@'\n\\#a0ffa0\\Mod importado" IMPORT_DYNOS_SUCCESS = "\\#dcdcdc\\'@'\n\\#a0ffa0\\Pacote DynOS importado" IMPORT_PALETTE_SUCCESS = "\\#dcdcdc\\'@'\n\\#a0ffa0\\Paleta importada" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Base de dados de mapeamento importado para controle\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#dcdcdc\\'@'\n\\#ffa0a0\\Erro ao importar" IMPORT_FAIL_INGAME = "\\#ffa0a0\\Não é possível importar\ndurante o jogo" COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\Não foi possível se conectar à CoopNet!" @@ -100,7 +101,6 @@ CONTROLS = "CONTROLES" N64_BINDS = "N64" EXTRA_BINDS = "Outros" BACKGROUND_GAMEPAD = "Controle de fundo" -EXTENDED_REPORTS = "Relatórios detalhados" DISABLE_GAMEPADS = "Desativar controles" GAMEPAD = "Controle" DEADZONE = "Zona morta" diff --git a/lang/Russian.ini b/lang/Russian.ini index b0ca5c266..ba97c6beb 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ вошел в режим полета при отладке" IMPORT_MOD_SUCCESS = "\\#a0ffa0\\Импортирован мод\n\\#dcdcdc\\'@'" IMPORT_DYNOS_SUCCESS = "\\#a0ffa0\\Импортированнан пакет DynOS\n\\#dcdcdc\\'@'" IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Импортированный предустановленный набор палитр\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\База данных контроллеров загружена\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\\#ffa0a0\\Не удалось импортировать\n\\#dcdcdc\\'@'" IMPORT_FAIL_INGAME = "\\#ffa0a0\\Невозможно импортировать во время игры" COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\Не удалось установить соединение с CoopNet!" @@ -99,7 +100,6 @@ CONTROLS = "CONTROLS" N64_BINDS = "Кнопки N64" EXTRA_BINDS = "Дополнительные кнопки" BACKGROUND_GAMEPAD = "Фоновый ввод" -EXTENDED_REPORTS = "Расширенные отчеты" DISABLE_GAMEPADS = "Отключить геймпады" GAMEPAD = "Геймпад" DEADZONE = "Mёртвая зона" diff --git a/lang/Spanish.ini b/lang/Spanish.ini index a43ae2133..cf75da6da 100644 --- a/lang/Spanish.ini +++ b/lang/Spanish.ini @@ -18,6 +18,7 @@ DEBUG_FLY = "@ Está en estado de vuelo libre debug." IMPORT_MOD_SUCCESS = "El mod \\#dcdcdc\\'@'\\#a0ffa0\\\nha sido importado con éxito." IMPORT_DYNOS_SUCCESS = "El pack de DynOS \\#dcdcdc\\'@'\\#a0ffa0\\\nha sido importado con éxito." IMPORT_PALETTE_SUCCESS = "\\#a0ffa0\\Paleta importada\n\\#dcdcdc\\'@'" +IMPORT_DATABASE_SUCCESS = "\\#a0ffa0\\Base de datos de asignación de mandos importados\n\\#dcdcdc\\'@'" IMPORT_FAIL = "\n\\#ffa0a0\\Error al importar el archivo. \\#dcdcdc\\\n'@'" IMPORT_FAIL_INGAME = "\\#ffa0a0\\No se pueden importar archivos\nen medio de una partida." COOPNET_CONNECTION_FAILED = "\\#ffa0a0\\¡No se ha podido conectar a CoopNet!" @@ -101,7 +102,6 @@ N64_BINDS = "Botones de N64" EXTRA_BINDS = "Botones Adicionales" BACKGROUND_GAMEPAD = "Mando en segundo plano" DISABLE_GAMEPADS = "Desactivar mandos" -EXTENDED_REPORTS = "Informes ampliados" GAMEPAD = "Mando" DEADZONE = "Zona muerta" RUMBLE_STRENGTH = "Intensidad de vibración" diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 7f210a52c..6e9bf03d1 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -129,7 +129,6 @@ unsigned int configStickDeadzone = 16; unsigned int configRumbleStrength = 50; unsigned int configGamepadNumber = 0; bool configBackgroundGamepad = true; -bool configExtendedReports = false; bool configDisableGamepads = false; bool configUseStandardKeyBindingsChat = false; bool configSmoothScrolling = false; @@ -276,7 +275,6 @@ static const struct ConfigOption options[] = { {.name = "rumble_strength", .type = CONFIG_TYPE_UINT, .uintValue = &configRumbleStrength}, {.name = "gamepad_number", .type = CONFIG_TYPE_UINT, .uintValue = &configGamepadNumber}, {.name = "background_gamepad", .type = CONFIG_TYPE_UINT, .boolValue = &configBackgroundGamepad}, - {.name = "extended_reports", .type = CONFIG_TYPE_BOOL, .boolValue = &configExtendedReports}, #ifndef HANDHELD {.name = "disable_gamepads", .type = CONFIG_TYPE_BOOL, .boolValue = &configDisableGamepads}, #endif diff --git a/src/pc/configfile.h b/src/pc/configfile.h index 5fad17db6..3bd46e918 100644 --- a/src/pc/configfile.h +++ b/src/pc/configfile.h @@ -103,7 +103,6 @@ extern unsigned int configStickDeadzone; extern unsigned int configRumbleStrength; extern unsigned int configGamepadNumber; extern bool configBackgroundGamepad; -extern bool configExtendedReports; extern bool configDisableGamepads; extern bool configUseStandardKeyBindingsChat; extern bool configSmoothScrolling; diff --git a/src/pc/controller/controller_sdl.c b/src/pc/controller/controller_sdl.c index a9c5050a8..465493b64 100644 --- a/src/pc/controller/controller_sdl.c +++ b/src/pc/controller/controller_sdl.c @@ -39,7 +39,6 @@ static SDL_GameController *sdl_cntrl = NULL; static SDL_Joystick *sdl_joystick = NULL; static SDL_Haptic *sdl_haptic = NULL; -static bool sExtendedReports = false; static bool sBackgroundGamepad = false; static u32 num_joy_binds = 0; @@ -114,13 +113,6 @@ static void controller_sdl_bind(void) { } static void controller_sdl_init(void) { - // Allows extended reports on PS4 and PS5 controllers - if (configExtendedReports) { - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); - } - sExtendedReports = configExtendedReports; - // Allows game to be controlled by gamepad when not in focus if (configBackgroundGamepad) { SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); @@ -269,13 +261,6 @@ static void controller_sdl_read(OSContPad *pad) { // remember buttons that changed from 0 to 1 last_mouse = (mouse_prev ^ mouse) & mouse; - if (configExtendedReports != sExtendedReports) { - sExtendedReports = configExtendedReports; - char* hint = sExtendedReports ? "1" : "0"; - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, hint); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, hint); - } - if (configBackgroundGamepad != sBackgroundGamepad) { sBackgroundGamepad = configBackgroundGamepad; SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, sBackgroundGamepad ? "1" : "0"); diff --git a/src/pc/pc_main.h b/src/pc/pc_main.h index 7c6bbbe74..92969e4bc 100644 --- a/src/pc/pc_main.h +++ b/src/pc/pc_main.h @@ -40,7 +40,6 @@ extern u8 gLuaVolumeLevel; extern u8 gLuaVolumeSfx; extern u8 gLuaVolumeEnv; -extern struct GfxWindowManagerAPI* wm_api; void produce_one_dummy_frame(void (*callback)(), u8 clearColorR, u8 clearColorG, u8 clearColorB); void game_deinit(void); void game_exit(void);