When we enforce run-behind due to multiplayer, show "Network connecte…

…d" on the pause screen

Core/Core.cpp

@@ -105,7 +105,11 @@ void Core_Stop() {
 
 bool Core_ShouldRunBehind() {
 	// Enforce run-behind if ad-hoc connected
-	return g_Config.bRunBehindPauseMenu || __NetAdhocConnected();
+	return g_Config.bRunBehindPauseMenu || Core_MustRunBehind();
+}
+
+bool Core_MustRunBehind() {
+	return __NetAdhocConnected();
 }
 
 bool Core_IsStepping() {

Core/Core.h

@@ -39,6 +39,7 @@ void Core_SetGraphicsContext(GraphicsContext *ctx);
 void Core_EnableStepping(bool step, const char *reason = nullptr, u32 relatedAddress = 0);
 
 bool Core_ShouldRunBehind();
+bool Core_MustRunBehind();
 
 bool Core_NextFrame();
 void Core_DoSingleStep();

Core/HLE/proAdhoc.cpp

@@ -2267,7 +2267,7 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
 		socklen_t addrLen = sizeof(LocalIP);
 		memset(&LocalIP, 0, addrLen);
 		getsockname((int)metasocket, &LocalIP, &addrLen);
-		g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network Initialized"), 1.0);
+		g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network initialized"), 1.0);
 		return 0;
 	} else {
 		return SOCKET_ERROR;

UI/PauseScreen.cpp

@@ -36,6 +36,7 @@
 #include "Core/Reporting.h"
 #include "Core/SaveState.h"
 #include "Core/System.h"
+#include "Core/Core.h"
 #include "Core/Config.h"
 #include "Core/RetroAchievements.h"
 #include "Core/ELF/ParamSFO.h"
@@ -441,15 +442,20 @@ void GamePauseScreen::CreateViews() {
 		rightColumnItems->Add(new Choice(pa->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
 	}
 
-	ViewGroup *playControls = rightColumnHolder->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
-	playControls->SetTag("debug");
-	playControls->Add(new Spacer(new LinearLayoutParams(1.0f)));
-	playButton_ = playControls->Add(new Button("", g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"), new LinearLayoutParams(0.0f, G_RIGHT)));
-	playButton_->OnClick.Add([=](UI::EventParams &e) {
-		g_Config.bRunBehindPauseMenu = !g_Config.bRunBehindPauseMenu;
-		playButton_->SetImageID(g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"));
-		return UI::EVENT_DONE;
-	});
+	if (!Core_MustRunBehind()) {
+		ViewGroup *playControls = rightColumnHolder->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
+		playControls->SetTag("debug");
+		playControls->Add(new Spacer(new LinearLayoutParams(1.0f)));
+		playButton_ = playControls->Add(new Button("", g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"), new LinearLayoutParams(0.0f, G_RIGHT)));
+		playButton_->OnClick.Add([=](UI::EventParams &e) {
+			g_Config.bRunBehindPauseMenu = !g_Config.bRunBehindPauseMenu;
+			playButton_->SetImageID(g_Config.bRunBehindPauseMenu ? ImageID("I_PAUSE") : ImageID("I_PLAY"));
+			return UI::EVENT_DONE;
+		});
+	} else {
+		auto nw = GetI18NCategory(I18NCat::NETWORKING);
+		rightColumnHolder->Add(new TextView(nw->T("Network connected")));
+	}
 	rightColumnHolder->Add(new Spacer(10.0f));
 }
 

assets/lang/ar_AE.ini

@@ -912,7 +912,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = ‎الشبكة تُطلق
+Network connected = Network connected
+Network initialized = ‎الشبكة تُطلق
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/az_AZ.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/bg_BG.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/ca_ES.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/cz_CZ.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Síť zavedena
+Network connected = Network connected
+Network initialized = Síť zavedena
 Please change your Port Offset = Please change your port offset
 Port offset = Odchylka portu (0 = Kompatibilita s PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/da_DK.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Netværk er initialiseret
+Network connected = Network connected
+Network initialized = Netværk er initialiseret
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP kompatibilitet)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/de_DE.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Ungültige IP oder Hostnamen
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Netzwerk initialisiert
+Network connected = Network connected
+Network initialized = Netzwerk initialisiert
 Please change your Port Offset = Bitte ändern sie Ihren Port-Offset
 Port offset = Portverschiebung (0 = PSP Kompatibilität)
 Open PPSSPP Multiplayer Wiki Page = PPSSPP Ad-Hoc Wiki Seite

assets/lang/dr_ID.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/en_US.ini

@@ -898,7 +898,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/es_ES.ini

@@ -905,7 +905,8 @@ Hostname = Nombre del host
 Invalid IP or hostname = IP o nombre del host inválido
 Minimum Timeout = Tiempo de espera mínimo (en ms, 0 por defecto)
 Misc = Otros ajustes (por defecto = compatibilidad)
-Network Initialized = Juego en red iniciado
+Network connected = Network connected
+Network initialized = Juego en red iniciado
 Please change your Port Offset = Por favor cambia el offset del puerto.
 Port offset = Variar puerto de red (0 = compatible con PSP)
 Open PPSSPP Multiplayer Wiki Page = Página wiki sobre PPSSPP Ad-Hoc

assets/lang/es_LA.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = IP o nombre de host no válido
 Minimum Timeout = Tiempo de espera mínimo (en ms, 0 = por defecto)
 Misc = Otros ajustes (por defecto = compatibilidad con PSP)
-Network Initialized = Juego en red iniciado
+Network connected = Network connected
+Network initialized = Juego en red iniciado
 Please change your Port Offset = Por favor cambia el offset del puerto.
 Port offset = Variar puerto de red (0 = compatibilidad con PSP)
 Open PPSSPP Multiplayer Wiki Page = Página wiki sobre PPSSPP Ad-Hoc

assets/lang/fa_IR.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/fi_FI.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/fr_FR.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = IP ou nom de domaine invalide
 Minimum Timeout = Temps d'expiration minimum (forçage en ms, 0 = par défaut)
 Misc = Divers (par défaut = compatibilité PSP)
-Network Initialized = Réseau initialisé !
+Network connected = Network connected
+Network initialized = Réseau initialisé !
 Please change your Port Offset = Veuillez changer votre décalage de port
 Port offset = Décalage de port (0 = compatibilité PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/gl_ES.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Rede inicializada
+Network connected = Network connected
+Network initialized = Rede inicializada
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/gr_EL.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Μη έγκυρη IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Δίκτυο Εκκινήθηκε
+Network connected = Network connected
+Network initialized = Δίκτυο Εκκινήθηκε
 Please change your Port Offset = Please change your port offset
 Port offset = Offset πήλης(0 = για συμβατότητα PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/he_IL.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/he_IL_invert.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/hr_HR.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Nevažeći IP ili domaćin
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Veza Uspostavljena
+Network connected = Network connected
+Network initialized = Veza Uspostavljena
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP kompatibilnost)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/hu_HU.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Érvénytelen IP vagy kiszolgáló név
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Hálózat inicializálva
+Network connected = Network connected
+Network initialized = Hálózat inicializálva
 Please change your Port Offset = Please change your port offset
 Port offset = Port eltolás/offset (0 = PSP kompatibilitás)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/id_ID.ini

@@ -904,7 +904,8 @@ Hostname = Nama Host
 Invalid IP or hostname = IP atau nama host tidak valid
 Minimum Timeout = Batas waktu minimum (batas dalam ms, 0 = bawaan)
 Misc = Lain-lain (bawaan= kompatibilitas PSP)
-Network Initialized = Jaringan terinisiasi
+Network connected = Network connected
+Network initialized = Jaringan terinisiasi
 Please change your Port Offset = Harap ubah letak port Anda
 Port offset = Letak port (0 = kecocokan dengan PSP)
 Open PPSSPP Multiplayer Wiki Page = Halaman Wiki PPSSPP Ad-Hoc

assets/lang/it_IT.ini

@@ -875,7 +875,8 @@ Hostname = Nome host
 Invalid IP or hostname = Indirizzo IP o nome del dominio non valido
 Minimum Timeout = Timeout minimo (forza in ms, 0 = predefinito)
 Misc = Varie (predefinito = compatibilità PSP)
-Network Initialized = Rete inizializzata
+Network connected = Network connected
+Network initialized = Rete inizializzata
 Please change your Port Offset = Prego, cambiare l'offset della porta
 Port offset = Offset Porta (0 = compatibilità PSP)
 Open PPSSPP Multiplayer Wiki Page = Pagina Wiki Ad-Hoc PPSSPP

assets/lang/ja_JP.ini

@@ -874,7 +874,8 @@ Hostname = ホストネーム
 Invalid IP or hostname = 無効なIPまたはホスト名
 Minimum Timeout = 最小タイムアウト (低遅延をオーバーライド、単位ms)
 Misc = その他 (デフォルト = PSP互換)
-Network Initialized = ネットワークを初期化
+Network connected = Network connected
+Network initialized = ネットワークを初期化
 Please change your Port Offset = ポートオフセットを変更してください
 Port offset = ポートオフセット (0 = PSP互換)
 Open PPSSPP Multiplayer Wiki Page = PPSSPPのアドホック接続Wikiページを開く (英語)

assets/lang/jv_ID.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Jaringan diinisiasi
+Network connected = Network connected
+Network initialized = Jaringan diinisiasi
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/ko_KR.ini

@@ -874,7 +874,8 @@ Hostname = 호스트 이름
 Invalid IP or hostname = 잘못된 IP 또는 호스트 이름
 Minimum Timeout = 최소 시간 초과 (ms 단위로 재정의, 0 = 기본값)
 Misc = 기타 (기본값 = PSP 호환성)
-Network Initialized = 네트워크 초기화
+Network connected = Network connected
+Network initialized = 네트워크 초기화
 Please change your Port Offset = 포트 오프셋을 변경하세요.
 Port offset = 포트 오프셋 (0 = PSP 호환성)
 Open PPSSPP Multiplayer Wiki Page = PPSSPP 멀티플레이어 위키 페이지 열기

assets/lang/lo_LA.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = ເລີ່ມການເຮັດວຽກລະບົບເຄື່ອຂ່າຍແລ້ວ
+Network connected = Network connected
+Network initialized = ເລີ່ມການເຮັດວຽກລະບົບເຄື່ອຂ່າຍແລ້ວ
 Please change your Port Offset = Please change your port offset
 Port offset = ພອຣ໌ດຊົດເຊີຍ (0 = ຄ່າເລີ່ມຕົ້ນຂອງ PSP)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/lt-LT.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/ms_MY.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/nl_NL.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Netwerk geïnitialiseerd
+Network connected = Network connected
+Network initialized = Netwerk geïnitialiseerd
 Please change your Port Offset = Please change your port offset
 Port offset = Poortoffset (0 = PSP-compatibiliteit)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/no_NO.ini

@@ -904,7 +904,8 @@ Hostname = Hostname
 Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
-Network Initialized = Network initialized
+Network connected = Network connected
+Network initialized = Network initialized
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset(0 = PSP compatibility)
 Open PPSSPP Multiplayer Wiki Page = Open PPSSPP Multiplayer Wiki Page

assets/lang/pl_PL.ini

@@ -910,7 +910,8 @@ Hostname = Nazwa hosta
 Invalid IP or hostname = Niepoprawny adres IP lub nazwa hosta
 Minimum Timeout = Minimalny czas oczekiwania (podaj w ms, domyślnie 0)
 Misc = Inne (domyślnie = Kompatybilność z PSP)
-Network Initialized = Sieć została zainicjowana
+Network connected = Network connected
+Network initialized = Sieć została zainicjowana
 Please change your Port Offset = Proszę zmienić port
 Port offset = Zmień port (0 = zgodne z PSP)
 Open PPSSPP Multiplayer Wiki Page = Przejdź do strony PPSSPP pomocy dla wielu graczy.

assets/lang/pt_BR.ini

@@ -898,7 +898,8 @@ Hostname = Nome do hospedeiro
 Invalid IP or hostname = IP ou nome do hospedeiro inválido
 Minimum Timeout = Tempo mínimo pra encerrar (substituição em ms, 0 = padrão)
 Misc = Miscelânea (padrão = compatibilidade com o PSP)
-Network Initialized = Rede inicializada
+Network connected = Network connected
+Network initialized = Rede inicializada
 Please change your Port Offset = Por favor mude seu deslocamento da porta
 Port offset = Deslocamento da porta (0 = Compatibilidade com o PSP)
 Open PPSSPP Multiplayer Wiki Page = Abrir a Página do Multiplayer do Wiki do PPSSPP