From 507c6dc09fd5968b0945be6419bf0eea55158177 Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Tue, 12 Sep 2017 10:20:00 -0400 Subject: [PATCH] Removing now-obsolete and always-confusing swap_input option. --- configuration.c | 1 - configuration.h | 1 - intl/msg_hash_chs.c | 5 ----- intl/msg_hash_chs.h | 4 ---- intl/msg_hash_cht.c | 5 ----- intl/msg_hash_cht.h | 4 ---- intl/msg_hash_de.c | 5 ----- intl/msg_hash_de.h | 4 ---- intl/msg_hash_eo.h | 4 ---- intl/msg_hash_es.h | 8 -------- intl/msg_hash_fr.h | 4 ---- intl/msg_hash_it.h | 4 ---- intl/msg_hash_ja.c | 5 ----- intl/msg_hash_ja.h | 4 ---- intl/msg_hash_ko.c | 5 ----- intl/msg_hash_ko.h | 4 ---- intl/msg_hash_lbl.h | 2 -- intl/msg_hash_nl.h | 4 ---- intl/msg_hash_pl.h | 4 ---- intl/msg_hash_pt_br.c | 5 ----- intl/msg_hash_pt_br.h | 6 ------ intl/msg_hash_pt_pt.h | 4 ---- intl/msg_hash_ru.h | 4 ---- intl/msg_hash_us.c | 5 ----- intl/msg_hash_us.h | 4 ---- intl/msg_hash_vn.c | 5 ----- intl/msg_hash_vn.h | 4 ---- menu/cbs/menu_cbs_sublabel.c | 4 ---- menu/menu_displaylist.c | 4 ---- menu/menu_setting.c | 16 ---------------- msg_hash.h | 1 - 31 files changed, 139 deletions(-) diff --git a/configuration.c b/configuration.c index 32022ddaec..192b4a7fdc 100644 --- a/configuration.c +++ b/configuration.c @@ -1163,7 +1163,6 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("netplay_allow_slaves", &settings->bools.netplay_allow_slaves, true, netplay_allow_slaves, false); SETTING_BOOL("netplay_require_slaves", &settings->bools.netplay_require_slaves, true, netplay_require_slaves, false); SETTING_BOOL("netplay_stateless_mode", &settings->bools.netplay_stateless_mode, true, netplay_stateless_mode, false); - SETTING_BOOL("netplay_client_swap_input", &settings->bools.netplay_swap_input, true, netplay_client_swap_input, false); SETTING_BOOL("netplay_use_mitm_server", &settings->bools.netplay_use_mitm_server, true, netplay_use_mitm_server, false); for (user = 0; user < MAX_USERS; user++) { diff --git a/configuration.h b/configuration.h index 26bd4333f4..656ceb4758 100644 --- a/configuration.h +++ b/configuration.h @@ -174,7 +174,6 @@ typedef struct settings bool netplay_allow_slaves; bool netplay_require_slaves; bool netplay_stateless_mode; - bool netplay_swap_input; bool netplay_nat_traversal; bool netplay_use_mitm_server; bool netplay_request_devices[MAX_USERS]; diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index d68d51b247..7679ca039e 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -1641,11 +1641,6 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 15611c9c26..96dedaf02a 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -1016,8 +1016,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY, "在线游戏") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES, "在线游戏检查帧数") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "在线玩家P2使用C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "在线游戏延迟帧数") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2775,8 +2773,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c index a08736ee89..b7f4704d16 100644 --- a/intl/msg_hash_cht.c +++ b/intl/msg_hash_cht.c @@ -1638,11 +1638,6 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 9b3fe87236..26da038535 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -1016,8 +1016,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY, "連線遊戲") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES, "連線遊戲檢查幀數") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "連線玩家P2使用C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "連線遊戲延遲幀數") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2769,8 +2767,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index 6f56a0dd5a..e3ba246104 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -1772,11 +1772,6 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Der Benutzername der Person, die RetroArch verwendet. \n" "Wird in Online-Spielen verwendet."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "Verwendet Tastenbelegung für Spieler 1, \n" - "wenn du Teilnehmer an einem Netplay-Spiel bist."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "Der Port der Host-IP-Adresse. \n" diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index fcef9ae95a..24102e7db8 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -1033,8 +1033,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Eingabeverzögerung") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Erlaubte Eingabeverzögerung") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay-Spieler 2 verwendet Client 1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay-Verzögerung") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2855,8 +2853,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Speichere Spielstände in Ordnern ab, die nach dem verwendeten Core benannt sind." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Verwende die Tastenbelegung für Spieler 1, wenn Du ein Client im Netplay bist.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL zum Core-Verzeichnis auf dem libretro-Buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 7c53ff8d87..ed0bd3c2d3 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -928,8 +928,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY, "Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES, "Netplay Check Frames") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Uses C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Delay Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2636,8 +2634,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 5d1978fde4..d6d79897ad 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -1586,10 +1586,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Rango de latencia en frames" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Juego en red: P2 Usa Control 1" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Juego en red: retrasar frames" @@ -4826,10 +4822,6 @@ MSG_HASH( MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Ordenar guardados rápidos en carpetas nombradas por núcleo" ) -MSG_HASH( - MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Al ser cliente de juego en red, usar controles de jugador 1" - ) MSG_HASH( MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL de la carpeta del actualizador de núcleos en el buildbot Libretro" diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 2adb722d69..e1718820ca 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1021,8 +1021,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Latence d'entrées minimale") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Intervalle de latence d'entées") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Joueur #2 contrôle manette #1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Delay Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2807,8 +2805,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 544312f035..6fdc93e95b 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -1033,8 +1033,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Input della latenza del Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Input Latency Frames Range") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Utilizza C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Delay Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2853,8 +2851,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Ordina i salva stati in cartelle dopo che un core viene utilizzato." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Quando sei un client su netplay, utilizza i tasti di comando per il giocatore 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL alla directory di aggiornamento del core nel buildbot di Libretro.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 54531b7640..3b0549d32e 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -1670,11 +1670,6 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 44bba48fb9..41e4a4e984 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1063,8 +1063,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "入力遅延フレーム数") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "入力遅延フレーム範囲") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "ネットプレイのP2がC1を使用") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "ネットプレイの延期フレーム") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2837,8 +2835,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index 7d77c2d7bc..59a545ec72 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -1723,11 +1723,6 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 669e5042a3..165957ad4d 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -1007,8 +1007,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "입력 대기 프레임") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "입력 대기 프레임 범위") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "넷플레이 P2 사용 C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "넷플레이 지연 프레임") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2771,8 +2769,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "코어 이름 폴더별로 저장된 상태저장파일 정렬." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "클라이어트로 넷플레이 접속시 사용자 1 키설정 사용.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "Libretro 빌드봇 상의 코어 업데이터 디렉토리 URL.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index c1af294f93..fe05843ca6 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -625,8 +625,6 @@ MSG_HASH(MENU_ENUM_LABEL_NETPLAY, "netplay") MSG_HASH(MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES, "netplay_check_frames") -MSG_HASH(MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT, - "netplay_client_swap_input") MSG_HASH(MENU_ENUM_LABEL_NETPLAY_REQUEST_DEVICE_I, "netplay_request_device_%u") MSG_HASH(MENU_ENUM_LABEL_NETPLAY_SHARE_ANALOG, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 9a825cd3f1..091fef82ca 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -926,8 +926,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY, "Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES, "Netplay Check Frames") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Uses C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Vertraging Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2640,8 +2638,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 7342c499c3..e6ce124eda 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -1045,8 +1045,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Wejściowe klatki opóźnień") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Zakres latencji wejściowych klatek") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Używa C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay opóźnij klatki") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2867,8 +2865,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sortuj stany zachowywania w folderach nazwanych po używanym rdzeniu." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "Adres URL do głównego katalogu Updater na kompilatorze Libretro.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 3f60fba684..249bd6a268 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -1828,11 +1828,6 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "o RetroArch. \n" "Será utilizado para jogos online."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "Ao ser o cliente de Netplay, use os \n" - "vínculos de teclas do jogador 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "A porta do endereço de IP do hospedeiro. \n" diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 1356946958..4ac6591373 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -1160,9 +1160,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Faixa de Quadros de Latência de Entrada" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "J2 do Netplay Usa C1" - ) MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Atraso de Quadros do Netplay" ) @@ -3581,9 +3578,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Ordenar os Estados de Jogo em pastas com o nome do núcleo utilizado." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Ao se tornar cliente do Netplay, use os vínculos de teclas para o Jogador 1." - ) MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL para o diretório de atualização de núcleos no buildbot do Libreto." ) diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index a1b320918c..e8195322ec 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -1005,8 +1005,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Entrada de Latência de Quadros") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Alcance da Entrada de latência de Quadros") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "J2 do Netplay Usa C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Atraso de Quadros do Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2749,8 +2747,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Ordenar salvamento de estados em pastas com o nome do Core usado." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Ao se tornar cliente do netplay, use uma lista de teclas para o Jogador 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL para o diretório de atualização do Core no buildbot do Libreto.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 5729476995..75a5e97a11 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1030,8 +1030,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Кадры задержки ввода") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Диапазон кадров задержки ввода") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 использует C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Задержка кадров Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2822,8 +2820,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Сортировать файлы сохранений в каталогах, названные после использования ядра." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "Будучи клиентом netplay, использовать привязки клавиш для Игрока 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL каталога обновлений ядра на билдботе Libretro.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 9219d9276d..687f62f22c 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1753,11 +1753,6 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index e7bf5fe488..05a173a8de 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1045,8 +1045,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Input Latency Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Input Latency Frames Range") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Uses C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Delay Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2895,8 +2893,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_REQUEST_DEVICE_I, "Request to play with the given input device.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index a74b461a32..0ad27d0640 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -1671,11 +1671,6 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "The username of the person running RetroArch. \n" "This will be used for playing online games."); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - snprintf(s, len, - "When being client over netplay, use \n" - "keybinds for player 1."); - break; case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT: snprintf(s, len, "The port of the host IP address. \n" diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index b2c1cc254a..cebdf1d67a 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -1019,8 +1019,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "Input Latency Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, "Input Latency Frames Range") -MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - "Netplay P2 Uses C1") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "Netplay Delay Frames") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -2799,8 +2797,6 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE, "Sort save states in folders named after the core used." ) -MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT, - "When being client over netplay, use keybinds for Player 1.") MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL, "URL to core updater directory on the Libretro buildbot.") MSG_HASH(MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 734da03336..2bd0baac54 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -229,7 +229,6 @@ default_sublabel_macro(action_bind_sublabel_scan_directory, MENU_ default_sublabel_macro(action_bind_sublabel_video_swap_interval, MENU_ENUM_SUBLABEL_VIDEO_SWAP_INTERVAL) default_sublabel_macro(action_bind_sublabel_sort_savefiles_enable, MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE) default_sublabel_macro(action_bind_sublabel_sort_savestates_enable, MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE) -default_sublabel_macro(action_bind_sublabel_netplay_client_swap_input, MENU_ENUM_SUBLABEL_NETPLAY_CLIENT_SWAP_INPUT) default_sublabel_macro(action_bind_sublabel_core_updater_buildbot_url, MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL) default_sublabel_macro(action_bind_sublabel_input_overlay_show_physical_inputs, MENU_ENUM_SUBLABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS) default_sublabel_macro(action_bind_sublabel_input_overlay_show_physical_inputs_port, MENU_ENUM_SUBLABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT) @@ -886,9 +885,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_updater_buildbot_assets_url); break; - case MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT: - BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_client_swap_input); - break; case MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_sort_savefiles_enable); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 2bfbdc7bf4..a8ee118243 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5533,10 +5533,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_NETPLAY_NAT_TRAVERSAL, PARSE_ONLY_BOOL, false) != -1) count++; - if (menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT, - PARSE_ONLY_BOOL, false) != -1) - count++; if (menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_NETPLAY_SHARE_DIGITAL, PARSE_ONLY_UINT, false) != -1) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 46ff6b660c..a8df105bd6 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6909,22 +6909,6 @@ static bool setting_append_list( SD_FLAG_NONE); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - CONFIG_BOOL( - list, list_info, - &settings->bools.netplay_swap_input, - MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT, - MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, - netplay_client_swap_input, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - CONFIG_UINT( list, list_info, &settings->uints.netplay_share_digital, diff --git a/msg_hash.h b/msg_hash.h index 75854a31aa..367d196df1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1156,7 +1156,6 @@ enum msg_hash_enums MENU_LABEL(SSH_ENABLE), MENU_LABEL(SAMBA_ENABLE), MENU_LABEL(BLUETOOTH_ENABLE), - MENU_LABEL(NETPLAY_CLIENT_SWAP_INPUT), MENU_LABEL(NETPLAY_DELAY_FRAMES), MENU_LABEL(NETPLAY_PUBLIC_ANNOUNCE), MENU_LABEL(NETPLAY_START_AS_SPECTATOR),