diff --git a/command.c b/command.c index 57bf6d8226..780d8bd7f9 100644 --- a/command.c +++ b/command.c @@ -2559,9 +2559,6 @@ TODO: Add a setting for these tweaks */ #endif } break; - case CMD_EVENT_NETPLAY_FLIP_PLAYERS: - netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, NULL); - break; case CMD_EVENT_NETPLAY_GAME_WATCH: netplay_driver_ctl(RARCH_NETPLAY_CTL_GAME_WATCH, NULL); break; diff --git a/command.h b/command.h index dd5099f9bc..86efe07bb0 100644 --- a/command.h +++ b/command.h @@ -179,8 +179,6 @@ enum event_command CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, /* Deinitializes netplay system. */ CMD_EVENT_NETPLAY_DEINIT, - /* Flip netplay players. */ - CMD_EVENT_NETPLAY_FLIP_PLAYERS, /* Switch between netplay gaming and watching. */ CMD_EVENT_NETPLAY_GAME_WATCH, /* Initializes BSV movie. */ diff --git a/config.def.keybinds.h b/config.def.keybinds.h index b7f0a32e86..6da85fd5bb 100644 --- a/config.def.keybinds.h +++ b/config.def.keybinds.h @@ -85,7 +85,6 @@ static const struct retro_keybind retro_keybinds_1[] = { { true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, - { true, RARCH_NETPLAY_FLIP, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_SLOWMOTION, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, @@ -160,7 +159,6 @@ static const struct retro_keybind retro_keybinds_1[] = { { true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_F8, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_F9, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_F12, NO_BTN, NO_BTN, 0, AXIS_NONE }, - { true, RARCH_NETPLAY_FLIP, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_i, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_SLOWMOTION, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION, RETROK_e, NO_BTN, NO_BTN, 0, AXIS_NONE }, { true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE }, diff --git a/input/input_driver.c b/input/input_driver.c index ccde131684..cc335ee6fd 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -312,7 +312,6 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT), DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE), DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK), - DECLARE_META_BIND(2, netplay_flip_players_1_2, RARCH_NETPLAY_FLIP, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP), DECLARE_META_BIND(2, netplay_game_watch, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH), DECLARE_META_BIND(2, slowmotion, RARCH_SLOWMOTION, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION), DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY), diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 7679ca039e..037ef8a9dd 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -1743,10 +1743,6 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Increment cheat index.\n"); diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index acbb65a432..d3406b6af0 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -820,8 +820,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "视频录制开关") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "静音开关") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "联机游戏踢出用户") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "联机游戏切换 游戏/围观 模式") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c index b7f4704d16..141e8cefad 100644 --- a/intl/msg_hash_cht.c +++ b/intl/msg_hash_cht.c @@ -1740,10 +1740,6 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "儲存即時存檔."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "踢掉連線遊戲的使用者."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Increment cheat index.\n"); diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index afc6d20f74..9bfd9ccd6d 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -820,8 +820,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "視訊錄製開關") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "靜音開關") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "連線遊戲踢出用戶") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "連線遊戲切換 遊戲/圍觀 模式") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index e3ba246104..6516deaac2 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -1887,10 +1887,6 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Speichert Save-State."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay-Benutzer vertauschen."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Cheat-Index erhöhen.\n"); diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 37612685e8..f6a955b233 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -827,8 +827,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Videoaufzeichnung starten/beenden") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Audio stumm-/lautschalten") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay-Benutzer vertauschen") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Zwischen Spieler- und Beobachter-Modus wechseln") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index ed0bd3c2d3..d226535b81 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Movie record toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Audio mute toggle") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay flip users") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, "On-screen keyboard toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 0e17b15373..953fe8f754 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1091,10 +1091,6 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Guarda rápidamente la partida."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Cambia los usuarios en red."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Aumenta el índice de trucos.\n"); diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 4c9a6fd920..7fe797b1c7 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -821,8 +821,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Activer l'enregistrement") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Sourdine") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Intervertir les joueurs en réseau") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Changer de mode joueur/spectateur") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index fd996f0714..2de0760c3c 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -968,14 +968,6 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; - case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: - snprintf(s, len, - "Increment cheat index.\n"); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_MINUS: snprintf(s, len, "Decrement cheat index.\n"); diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 6f0991f6ba..4f278884f2 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -827,8 +827,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Pulsante registratore Film") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Pulsante per disattivare l'audio ") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay flip users") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Pulsante Netplay per la modalità giocatore/spettatore") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 3b0549d32e..2a10f855f1 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -1772,10 +1772,6 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Increment cheat index.\n"); diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index dfca14e55d..d0cda9e1b6 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -857,8 +857,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "録画") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "消音") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "ネットプレイのユーザ交換") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "ネットプレイの観覧を切り替え") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index 59a545ec72..13cf53b5eb 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -1838,10 +1838,6 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; case MENU_ENUM_LABEL_NETPLAY_GAME_WATCH: snprintf(s, len, "Netplay toggle play/spectate mode."); diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 856ff99e87..f3b19f49d6 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -807,8 +807,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "동영상 기록 시작/중지") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "음소거 켜기/끄기") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "넷플레이 사용자 전환") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "넷플레이 플레이/관전 전환") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 091fef82ca..a5da2b8547 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Movie record toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Audio mute toggle") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay flip users") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, "On-screen keyboard toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 249bd6a268..351d9dfa50 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -1947,10 +1947,6 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Salvar Estado de Jogo."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Inverter usuários do Netplay."); - break; case MENU_ENUM_LABEL_NETPLAY_GAME_WATCH: snprintf(s, len, "Alternar modo jogador/espectador do Netplay."); diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index da773ae151..a4fce37db7 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -854,9 +854,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Alternar áudio mudo" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Inverter usuários do Netplay" - ) MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Alternar modo jogador/espectador do Netplay" ) diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c index 3877ade922..3a17806f42 100644 --- a/intl/msg_hash_pt_pt.c +++ b/intl/msg_hash_pt_pt.c @@ -870,10 +870,6 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Salva Savestates."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay inverte usuários."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Incrementa o índice de cheats.\n"); diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 3fae18f8ff..ce40ff2277 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -807,8 +807,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Alternar gravação de filme") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Alternar áudio mudo") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Giro de usuários do Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Alternar modo jogar/olhar no Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 6fda0576d8..5a6c95e9cf 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -830,8 +830,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Переключатель записи видео") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Отключения звука") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Отключить пользователей Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Переключить режим игры/наблюдателя Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 687f62f22c..76acd00503 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1868,10 +1868,6 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; case MENU_ENUM_LABEL_NETPLAY_GAME_WATCH: snprintf(s, len, "Netplay toggle play/spectate mode."); diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c7351cef3f..39f94f37b2 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -879,8 +879,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Movie record toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Audio mute toggle") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay flip users") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Netplay toggle play/spectate mode") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 0ad27d0640..1445de4166 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -1773,10 +1773,6 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Saves state."); break; - case MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS: - snprintf(s, len, - "Netplay flip users."); - break; case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS: snprintf(s, len, "Increment cheat index.\n"); diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index bd69234fcd..5677932f90 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -819,8 +819,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, "Movie record toggle") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, "Âm thanh mute toggle") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, - "Netplay flip users") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, "Netplay toggle play/spectate mode") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, diff --git a/msg_hash.h b/msg_hash.h index f2b189018b..cf2123bcbc 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -614,7 +614,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, - MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, @@ -1112,7 +1111,6 @@ enum msg_hash_enums MENU_LABEL(UNDO_LOAD_STATE), MENU_LABEL(UNDO_SAVE_STATE), - MENU_LABEL(NETPLAY_FLIP_PLAYERS), MENU_LABEL(NETPLAY_GAME_WATCH), MENU_LABEL(CHEAT_INDEX_MINUS), MENU_LABEL(CHEAT_INDEX_PLUS), diff --git a/network/netplay/netplay.h b/network/netplay/netplay.h index 4111b5a0ad..712f66dc27 100644 --- a/network/netplay/netplay.h +++ b/network/netplay/netplay.h @@ -32,7 +32,6 @@ typedef struct netplay netplay_t; enum rarch_netplay_ctl_state { RARCH_NETPLAY_CTL_NONE = 0, - RARCH_NETPLAY_CTL_FLIP_PLAYERS, RARCH_NETPLAY_CTL_GAME_WATCH, RARCH_NETPLAY_CTL_POST_FRAME, RARCH_NETPLAY_CTL_PRE_FRAME, diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index dfe332a5ce..e2124fc7d9 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -744,36 +744,7 @@ bool netplay_command(netplay_t* netplay, struct netplay_connection *connection, } /** - * netplay_flip_users: - * @netplay : pointer to netplay object - * - * Flip who controls user 1 and 2. - */ -static void netplay_flip_users(netplay_t *netplay) -{ - /* Must be in the future because we may have - * already sent this frame's data */ - uint32_t flip_frame = netplay->self_frame_count + 1; - uint32_t flip_frame_net = htonl(flip_frame); - size_t i; - - for (i = 0; i < netplay->connections_size; i++) - { - struct netplay_connection *connection = &netplay->connections[i]; - if (connection->active && connection->mode >= NETPLAY_CONNECTION_CONNECTED) - { - netplay_command(netplay, connection, NETPLAY_CMD_FLIP_PLAYERS, - &flip_frame_net, sizeof flip_frame_net, "flip users", - "Successfully flipped users.\n"); - } - } - - netplay->flip ^= true; - netplay->flip_frame = flip_frame; -} - -/** - * netplay_frontend_paused +* netplay_frontend_paused * @netplay : pointer to netplay object * @paused : true if frontend is paused * @@ -1397,10 +1368,6 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data) case RARCH_NETPLAY_CTL_PRE_FRAME: ret = netplay_pre_frame(netplay_data); goto done; - case RARCH_NETPLAY_CTL_FLIP_PLAYERS: - if (netplay_data->is_server) - netplay_flip_users(netplay_data); - break; case RARCH_NETPLAY_CTL_GAME_WATCH: netplay_toggle_play_spectate(netplay_data); break; diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index bc73f9eab9..028ae12f80 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -1121,48 +1121,6 @@ static bool netplay_get_cmd(netplay_t *netplay, break; } - case NETPLAY_CMD_FLIP_PLAYERS: - if (cmd_size != sizeof(uint32_t)) - { - RARCH_ERR("CMD_FLIP_PLAYERS received an unexpected command size.\n"); - return netplay_cmd_nak(netplay, connection); - } - - RECV(&flip_frame, sizeof(flip_frame)) - { - RARCH_ERR("Failed to receive CMD_FLIP_PLAYERS argument.\n"); - return netplay_cmd_nak(netplay, connection); - } - - if (netplay->is_server) - { - RARCH_ERR("NETPLAY_CMD_FLIP_PLAYERS from a client.\n"); - return netplay_cmd_nak(netplay, connection); - } - - flip_frame = ntohl(flip_frame); - - if (flip_frame < netplay->server_frame_count) - { - RARCH_ERR("Host asked us to flip users in the past. Not possible ...\n"); - return netplay_cmd_nak(netplay, connection); - } - - netplay->flip ^= true; - netplay->flip_frame = flip_frame; - - /* Force a rewind to assure the flip happens: This just prevents us - * from skipping other past the flip because our prediction was - * correct */ - if (flip_frame < netplay->self_frame_count) - netplay->force_rewind = true; - - RARCH_LOG("%s.\n", msg_hash_to_str(MSG_NETPLAY_USERS_HAS_FLIPPED)); - runloop_msg_queue_push( - msg_hash_to_str(MSG_NETPLAY_USERS_HAS_FLIPPED), 1, 180, false); - - break; - case NETPLAY_CMD_SPECTATE: { uint32_t client_num; @@ -2021,24 +1979,6 @@ void netplay_handle_slaves(netplay_t *netplay) } } -/** - * netplay_flip_port - * - * Should we flip ports 0 and 1? - */ -bool netplay_flip_port(netplay_t *netplay) -{ - size_t frame = netplay->self_frame_count; - - if (netplay->flip_frame == 0) - return false; - - if (netplay->is_replay) - frame = netplay->replay_frame_count; - - return netplay->flip ^ (frame < netplay->flip_frame); -} - /** * netplay_announce_nat_traversal * diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h index e5250899c7..eada25d118 100644 --- a/network/netplay/netplay_private.h +++ b/network/netplay/netplay_private.h @@ -176,9 +176,6 @@ enum netplay_cmd /* Misc. commands */ - /* Swap inputs between player 1 and player 2 */ - NETPLAY_CMD_FLIP_PLAYERS = 0x0060, - /* Sends multiple config requests over, * See enum netplay_cmd_cfg */ NETPLAY_CMD_CFG = 0x0061, @@ -505,7 +502,7 @@ struct netplay bool can_poll; /* Force a rewind to other_frame_count/other_ptr. This is for synchronized - * events, such as player flipping or savestate loading. */ + * events, such as restarting or savestate loading. */ bool force_rewind; /* Force a reset */ @@ -526,12 +523,6 @@ struct netplay /* Counter for timeouts */ unsigned timeout_cnt; - /* User flipping - * Flipping state. If frame >= flip_frame, we apply the flip. - * If not, we apply the opposite, effectively creating a trigger point. */ - bool flip; - uint32_t flip_frame; - /* Netplay pausing */ bool local_paused; bool remote_paused; @@ -906,13 +897,6 @@ int netplay_poll_net_input(netplay_t *netplay, bool block); */ void netplay_handle_slaves(netplay_t *netplay); -/** - * netplay_flip_port - * - * Should we flip ports 0 and 1? - */ -bool netplay_flip_port(netplay_t *netplay); - /** * netplay_announce_nat_traversal * diff --git a/retroarch.c b/retroarch.c index bb56980c44..a18c677e68 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2692,20 +2692,13 @@ static enum runloop_state runloop_check_state( #ifdef HAVE_NETWORKING /* Check Netplay */ { - static bool old_netplay_flip = false; static bool old_netplay_watch = false; - bool netplay_flip = BIT256_GET( - current_input, RARCH_NETPLAY_FLIP); bool netplay_watch = BIT256_GET( current_input, RARCH_NETPLAY_GAME_WATCH); - if (netplay_flip && !old_netplay_flip) - netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, NULL); - if (netplay_watch && !old_netplay_watch) netplay_driver_ctl(RARCH_NETPLAY_CTL_GAME_WATCH, NULL); - old_netplay_flip = netplay_flip; old_netplay_watch = netplay_watch; } #endif