Multiplayer: add torture screen back in (dkfans#4855)

Author: rainlizard

src/front_lvlstats.c

@@ -329,7 +329,7 @@ void frontstats_set_timer(void)
 
 void frontstats_update(void)
 {
-    scrolling_offset++;
+    scrolling_offset += game.delta_time;
     LbTextSetFont(frontend_font[1]);
     int h = LbTextLineHeight();
     if (h+4 < scrolling_offset)

src/front_torture.c

@@ -247,7 +247,7 @@ void fronttorture_input(void)
     {
         player = get_player(plyr_idx);
         pckt = get_packet(plyr_idx);
-        if ((pckt->action != 0) && (player->victory_state == VicS_WonLevel))
+        if (pckt->action != 0)
             break;
     }
     if (plyr_idx < PLAYERS_COUNT)

src/frontend.cpp

@@ -416,6 +416,7 @@ short old_menu_mouse_y;
 unsigned char menu_ids[3];
 unsigned char new_objective;
 int frontend_menu_state;
+int skip_high_score_screen;
 int load_game_scroll_offset;
 unsigned char video_gamma_correction;
 
@@ -427,7 +428,7 @@ struct TbSpriteSheet * winfont = NULL;
 unsigned long playing_bad_descriptive_speech;
 unsigned long playing_good_descriptive_speech;
 long scrolling_index;
-long scrolling_offset;
+float scrolling_offset;
 long packet_left_button_double_clicked[6];
 long packet_left_button_click_space_count[6];
 char frontend_alliances;
@@ -2674,6 +2675,7 @@ FrontendMenuState frontend_setup_state(FrontendMenuState nstate)
           time_last_played_demo = LbTimerClock();
           fe_high_score_table_from_main_menu = true;
           clear_flag(game.system_flags, GSF_NetworkActive);
+          skip_high_score_screen = 0;
           set_pointer_graphic_menu();
           break;
       case FeSt_FELOAD_GAME:
@@ -3642,8 +3644,9 @@ FrontendMenuState get_menu_state_when_back_from_substate(FrontendMenuState subst
     case FeSt_DRAG:
         return FeSt_TORTURE;
     case FeSt_LEVEL_STATS:
-        if (network_is_active())
+        if (network_is_active() || skip_high_score_screen) {
             return FeSt_NET_SESSION;
+        }
         lvnum = get_loaded_level_number();
         if (is_multiplayer_level(lvnum))
             return get_menu_state_based_on_last_level(lvnum);

src/frontend.h

@@ -273,6 +273,7 @@ extern short old_menu_mouse_y;
 extern unsigned char menu_ids[3];
 extern unsigned char new_objective;
 extern int frontend_menu_state;
+extern int skip_high_score_screen;
 extern int load_game_scroll_offset;
 extern unsigned char video_gamma_correction;
 extern MenuID vid_change_query_menu;
@@ -287,7 +288,7 @@ extern struct TbSpriteSheet *winfont;
 extern unsigned long playing_bad_descriptive_speech;
 extern unsigned long playing_good_descriptive_speech;
 extern long scrolling_index;
-extern long scrolling_offset;
+extern float scrolling_offset;
 extern long packet_left_button_double_clicked[6];
 extern long packet_left_button_click_space_count[6];
 extern char frontend_alliances;

src/main.cpp

@@ -245,6 +245,7 @@ TbBool should_use_delta_time_on_menu()
         case FeSt_NET_SERVICE: /**< Network service selection, where player can select Serial/Modem/IPX/TCP IP/1 player. */
         case FeSt_NET_SESSION: /**< Network session selection screen, where list of games is displayed, with possibility to join or create own game. */
         case FeSt_NET_START: /**< Network game start screen (the menu with chat), when created new session or joined existing session. */
+        case FeSt_LEVEL_STATS:
         case FeSt_HIGH_SCORES:
         case FeSt_FEDEFINE_KEYS:
         case FeSt_FEOPTIONS:
@@ -3883,6 +3884,7 @@ static TbBool wait_at_frontend(void)
           break;
     case FeSt_START_MPLEVEL:
           set_flag(game.system_flags, GSF_NetworkActive);
+          skip_high_score_screen = 1;
           game.game_kind = GKind_MultiGame;
           player = get_my_player();
           player->is_active = 1;

src/packets.c

@@ -646,20 +646,21 @@ TbBool process_players_global_packet_action(PlayerNumber plyr_idx)
         free_swipe_graphic();
       }
       if (network_is_active()) {
+        if (victory_state == VicS_WonLevel) {
+          player->victory_state = VicS_WonLevel;
+          get_my_player()->additional_flags |= PlaAF_UnlockedLordTorture;
+          quit_game = 1;
+          return 0;
+        }
         TbBool host_packet = player->packet_num == get_host_player_id();
         if (!my_player) {
-          if ((victory_state == VicS_WonLevel) || (host_packet && (player->victory_state != VicS_LostLevel))) {
+          if (host_packet && (player->victory_state != VicS_LostLevel)) {
             get_my_player()->additional_flags &= ~PlaAF_UnlockedLordTorture;
             quit_game = 1;
           }
           return 0;
         } else if (host_packet && (victory_state == VicS_LostLevel) && network_human_contenders_remain()) {
           return 0;
-        } else if (host_packet && (victory_state == VicS_WonLevel)) {
-          player->additional_flags &= ~PlaAF_UnlockedLordTorture;
-          LbNetwork_Stop();
-          quit_game = 1;
-          return 0;
         }
       }
       switch (victory_state)