Pause load bug fix, third time is the charm (dkfans#4834)

Author: rainlizard

src/game_saves.c

@@ -42,6 +42,7 @@
 #include "game_merge.h"
 #include "frontmenu_ingame_map.h"
 #include "gui_boxmenu.h"
+#include "net_exchange_gameplay.h"
 #include "packets.h"
 #include "keeperfx.hpp"
 #include "api.h"
@@ -408,8 +409,8 @@ TbBool load_game(long slot_num)
     LbFileClose(fh);
     snprintf(game.campaign_fname, sizeof(game.campaign_fname), "%s", campaign.fname);
     reinit_level_after_load();
+    initialize_packet_history();
     clear_packets();
-    game.skip_initial_input_turns = 0;
     process_pause_packet(0, 0);
     clear_flag(game.operation_flags, GOF_Paused);
     clear_flag(game.operation_flags, GOF_WorldInfluence);

src/net_input_lag.c

@@ -27,7 +27,6 @@ enum InputLagMode {
 TbBool input_lag_skips_initial_processing(void)
 {
     if ((game.system_flags & GSF_NetworkActive) == 0) {
-        game.skip_initial_input_turns = 0;
         return false;
     }
     if ((game.operation_flags & GOF_Paused) != 0) {

src/packets.c

@@ -344,7 +344,6 @@ void process_pause_packet(long curr_pause, long new_pause)
       set_flag_value(game.operation_flags, GOF_Paused, curr_pause);
       if ((game.operation_flags & GOF_Paused) != 0) {
           set_flag_value(game.operation_flags, GOF_WorldInfluence, new_pause);
-          game.skip_initial_input_turns = 0;
           if ((game.system_flags & GSF_NetworkActive) != 0) {
               game.skip_initial_input_turns = game.input_lag_turns + 1;
           }
@@ -1633,15 +1632,16 @@ void process_packets(void)
             return;
         }
     }
-    MULTIPLAYER_LOG("process_packets: Loading packets from packet history");
-    load_old_packets();
-
-    if (input_lag_skips_initial_processing())
-    {
+    if (input_lag_skips_initial_processing()) {
         clear_packets();
         return;
     }
 
+    if ((game.system_flags & GSF_NetworkActive) != 0) {
+        MULTIPLAYER_LOG("process_packets: Loading packets from packet history");
+        load_old_packets();
+    }
+
     if ((game.system_flags & GSF_NetworkActive) != 0 && checksums_different()) {
         set_flag(game.system_flags, GSF_NetGameNoSync);
         clear_flag(game.system_flags, GSF_NetSeedNoSync);