Multiplayer: Various disconnection fixes (dkfans#4795)

rainlizard · web-flow · commit 55d4fce51492 · 2026-05-21T11:04:32.000+02:00
diff --git a/lang/gtext_chi.po b/lang/gtext_chi.po
@@ -6922,9 +6922,9 @@ msgid "%s has disconnected."
 msgstr "%s 已断开连接。"
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "对手已断开连接"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_cht.po b/lang/gtext_cht.po
@@ -6918,9 +6918,9 @@ msgid "%s has disconnected."
 msgstr "%s 已中斷連線。"
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "對手已中斷連線"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_cze.po b/lang/gtext_cze.po
@@ -7293,9 +7293,9 @@ msgid "%s has disconnected."
 msgstr "%s se odpojil."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Soupeř se odpojil"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_dut.po b/lang/gtext_dut.po
@@ -7294,9 +7294,9 @@ msgid "%s has disconnected."
 msgstr "%s is losgekoppeld."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Tegenstander is losgekoppeld"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_eng.pot b/lang/gtext_eng.pot
@@ -5903,8 +5903,8 @@ msgid "%s has disconnected."
 msgstr ""
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
+msgctxt "Unused"
+msgid "unused"
 msgstr ""
 
 #: guitext:1119
diff --git a/lang/gtext_fre.po b/lang/gtext_fre.po
@@ -7551,9 +7551,9 @@ msgid "%s has disconnected."
 msgstr "%s s'est déconnecté."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Adversaire déconnecté"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_ger.po b/lang/gtext_ger.po
@@ -7580,9 +7580,9 @@ msgid "%s has disconnected."
 msgstr "%s wurde getrennt."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Gegner getrennt"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_ita.po b/lang/gtext_ita.po
@@ -7413,9 +7413,9 @@ msgid "%s has disconnected."
 msgstr "%s si è disconnesso."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Avversario disconnesso"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_jpn.po b/lang/gtext_jpn.po
@@ -7257,9 +7257,9 @@ msgid "%s has disconnected."
 msgstr "%s の接続が切断されました。"
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "対戦相手の接続が切断されました"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_kor.po b/lang/gtext_kor.po
@@ -7301,9 +7301,9 @@ msgid "%s has disconnected."
 msgstr "%s 님의 연결이 끊겼습니다."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "상대의 연결이 끊겼습니다"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_lat.po b/lang/gtext_lat.po
@@ -7324,9 +7324,9 @@ msgid "%s has disconnected."
 msgstr "%s disiunctus est."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Adversarius disiunctus est"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_pol.po b/lang/gtext_pol.po
@@ -7401,9 +7401,9 @@ msgid "%s has disconnected."
 msgstr "%s rozłączył się."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Przeciwnik rozłączył się"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_por.po b/lang/gtext_por.po
@@ -7525,9 +7525,9 @@ msgid "%s has disconnected."
 msgstr "%s desconectou-se."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Oponente desconectado"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_rus.po b/lang/gtext_rus.po
@@ -6704,9 +6704,9 @@ msgid "%s has disconnected."
 msgstr "%s отключился."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Противник отключился"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_spa.po b/lang/gtext_spa.po
@@ -7556,9 +7556,9 @@ msgid "%s has disconnected."
 msgstr "%s se ha desconectado."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Oponente desconectado"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_swe.po b/lang/gtext_swe.po
@@ -7320,9 +7320,9 @@ msgid "%s has disconnected."
 msgstr "%s har kopplats från."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Motståndare frånkopplad"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/lang/gtext_ukr.po b/lang/gtext_ukr.po
@@ -7375,9 +7375,9 @@ msgid "%s has disconnected."
 msgstr "%s від'єднався."
 
 #: guitext:1118
-msgctxt "Network game message"
-msgid "Opponent disconnected"
-msgstr "Суперник від'єднався"
+msgctxt "Unused"
+msgid "unused"
+msgstr "unused"
 
 #: guitext:1119
 msgctxt "Network game message"
diff --git a/src/config_strings.h b/src/config_strings.h
@@ -466,7 +466,7 @@ enum GUIStrings {
     GUIStr_NetAiTookOver,
     GUIStr_NetPlayerLeftGame,
     GUIStr_NetPlayerDisconnected,
-    GUIStr_NetOpponentDisconnected,
+    GUIStr_NetUnused,
     GUIStr_NetHostConnectionLost,
     GuiStrEnd
 };
diff --git a/src/front_input.c b/src/front_input.c
@@ -843,7 +843,7 @@ static short get_global_inputs(void)
             SYNCMSG("Finished level %d. Total turns taken: %u (%02u:%02u:%02u at %d fps). Real time elapsed: %02u:%02u:%02u:%03u.",
                 game.loaded_level_number, get_gameturn(), GameT.Hours, GameT.Minutes, GameT.Seconds, turns_per_second, Timer.Hours, Timer.Minutes, Timer.Seconds, Timer.MSeconds);
         }
-        set_players_packet_action(player, PckA_FinishGame, 0, 0, 0, 0);
+        set_players_packet_action(player, PckA_FinishGame, player->victory_state, 0, 0, 0);
         return true;
   }
   if ( is_game_key_pressed(Gkey_DumpToOldPos, true, false) )
@@ -884,7 +884,7 @@ static TbBool get_level_lost_inputs(void)
         return true;
     if (is_game_key_pressed(Gkey_FinishLevel, true, false))
     {
-        set_players_packet_action(player, PckA_FinishGame, 0,0,0,0);
+        set_players_packet_action(player, PckA_FinishGame, player->victory_state, 0, 0, 0);
     }
     if (player->view_type == PVT_MapScreen)
     {
diff --git a/src/net_game.c b/src/net_game.c
diff --git a/src/packets.c b/src/packets.c
