swars: Creaded play_post_mission_fmv()

Reordered the code so that FMVs are played from one place,
then created a function for this purpose.

Author: mefistotelis

conf/wrappers_game.conf

@@ -271,8 +271,6 @@ init_person_thing		W	v	p
 update_mission_time		W	v	i
 load_missions			W	v	i
 load_objectives_text	W	i	p
-compound_mission_immediate_start_next	W	v
-tweak_for_compound_mission_m84	W	v
 init_mission_states		W	v
 check_delete_open_mission	W	v	ii
 mission_over			W	v

src/game.c

@@ -839,13 +839,6 @@ void play_smacker(ushort vid_type)
     char fname[FILENAME_MAX];
     TbScreenMode scr_md_fmvid;
 
-    // TODO MAPNO case for a specific map, remove
-    if (current_map == 51)
-    {
-        overall_scale = get_overall_scale_max();
-        unkn_flags_01 &= ~0x01;
-        return;
-    }
     update_danger_music(2);
 
     sprint_fmv_filename(vid_type, fname, sizeof(fname));
@@ -4858,26 +4851,21 @@ void restart_back_into_mission(ushort missi)
     }
 }
 
-void compound_mission_immediate_start_next(void)
+void compound_mission_brief_store_next(void)
 {
     ushort old_missi, new_missi;
 
     old_missi = ingame.CurrentMission;
     new_missi = mission_list[old_missi].SuccessTrigger[0];
     brief_store[open_brief - 1].Mission = new_missi;
     replace_mission_state_slot(old_missi, new_missi);
-
-    restart_back_into_mission(new_missi);
 }
 
-// deprecated - use compound_mission_immediate_start_next()
-void tweak_for_compound_mission_m84(void)
+void compound_mission_immediate_start_next(void)
 {
-#if 0
-    asm volatile ("call ASM_tweak_for_compound_mission_m84\n"
-        :  :  : "eax" );
-#endif
-    compound_mission_immediate_start_next();
+    ushort missi;
+    missi = brief_store[open_brief - 1].Mission;
+    restart_back_into_mission(missi);
 }
 
 short test_missions(ubyte flag)
@@ -6362,8 +6350,37 @@ ubyte check_open_next_mission(ushort mslot, sbyte state)
     return OMiSta_NONE;
 }
 
-// TODO it does more than the delete; rename or divide
-void check_delete_open_mission(ushort mslot, sbyte state)
+void play_post_mission_fmv(ubyte misend)
+{
+    switch (misend)
+    {
+    case OMiSta_EndSuccess:
+        play_smacker(MPly_MissiComplete);
+        break;
+    case OMiSta_ContImmSuccess:
+        // Reload the palette, potentially damaged by fading
+        show_black_screen();
+        LbFileLoadAt("qdata/pal.pal", display_palette);
+        // The setup_screen_mode() within play_smacker() will
+        // automatically switch current pal to display_palette
+        play_smacker_then_back_to_engine(MPly_MPartComplete);
+        break;
+    case OMiSta_EndFailed:
+        play_smacker(MPly_MissiFail);
+        break;
+    case OMiSta_ContSuccess:
+        break;
+    case OMiSta_ContFailed:
+        break;
+    case OMiSta_CampaignDone:
+        init_outro();
+        overall_scale = get_overall_scale_max();
+        unkn_flags_01 &= ~0x01;
+        break;
+    }
+}
+
+ubyte check_delete_open_mission(ushort mslot, sbyte state)
 {
     ushort missi;
     TbBool conds_met;
@@ -6389,19 +6406,13 @@ void check_delete_open_mission(ushort mslot, sbyte state)
         if (conds_met) {
             mission_fire_success_triggers(missi);
         }
-        play_smacker(MPly_MissiComplete);
         remove_mission_state_slot(mslot);
         break;
     case OMiSta_ContImmSuccess:
         if (conds_met) {
             mission_fire_success_triggers(missi);
         }
-        show_black_screen();
-        LbFileLoadAt("qdata/pal.pal", display_palette);
-        // The setup_screen_mode() within play_smacker() will
-        // automatically switch current pal to display_palette
-        play_smacker_then_back_to_engine(MPly_MPartComplete);
-        compound_mission_immediate_start_next();
+        compound_mission_brief_store_next();
         break;
     case OMiSta_EndFailed:
         if (conds_met) {
@@ -6413,6 +6424,7 @@ void check_delete_open_mission(ushort mslot, sbyte state)
     case OMiSta_ContFailed:
         break;
     }
+    return misend;
 }
 
 void mission_over(void)
@@ -6421,6 +6433,8 @@ void mission_over(void)
     asm volatile ("call ASM_mission_over\n"
         :  :  : "eax" );
 #else
+    ubyte misend;
+
     ingame.DisplayMode = DpM_UNKN_37;
     LbMouseChangeSprite(0);
     StopCD();
@@ -6443,12 +6457,6 @@ void mission_over(void)
     if (mission_state[mslot] == 0)
         mission_state[mslot] = ingame.MissionStatus;
 
-    if (mission_state[mslot] == 1)
-    {
-        if (mission_is_final_at_game_end(last_missi))
-            init_outro();
-    }
-
     lstate = 0;
     if (mission_state[mslot] == 1)
     {
@@ -6464,7 +6472,7 @@ void mission_over(void)
         ingame.Credits += cr_award;
         if (email != 0)
             queue_up_new_mail(0, -email);
-        check_delete_open_mission(mslot, 1);
+        misend = check_delete_open_mission(mslot, 1);
     }
     else if (mission_state[mslot] == -1)
     {
@@ -6477,8 +6485,18 @@ void mission_over(void)
         ingame.fld_unkC57++;
         if (email != 0)
             queue_up_new_mail(0, -email);
-        check_delete_open_mission(mslot, -1);
-        play_smacker(MPly_MissiFail);
+        misend = check_delete_open_mission(mslot, -1);
+    }
+
+    if (misend == OMiSta_EndSuccess) {
+        if (mission_is_final_at_game_end(last_missi))
+            misend = OMiSta_CampaignDone;
+    }
+
+    play_post_mission_fmv(misend);
+
+    if (misend == OMiSta_ContImmSuccess) {
+        compound_mission_immediate_start_next();
     }
 
     ingame.GameOver = 0;

src/game.h

@@ -123,6 +123,8 @@ enum OpenMissionEndStatus {
   OMiSta_ContFailed,
   /** Mission completed successfully, but is a part of multi-mission chain with immediately starting next mission */
   OMiSta_ContImmSuccess,
+  /** Final mission completed successfully, campaign finished. */
+  OMiSta_CampaignDone,
 };
 
 enum MissionFMVPlay {

src/swars.sx

@@ -169927,180 +169927,6 @@ open_new_mission:	/* 0x0A523C */
 		ret
 
 
-/*----------------------------------------------------------------*/
-GLOBAL_FUNC(ASM_compound_mission_immediate_start_next)	/* 0x0A52AC */
-/*----------------------------------------------------------------*/
-		push   %ebx
-		push   %ecx
-		push   %edx
-		push   %esi
-		push   %edi
-		xor    %ah,%ah
-		mov    display_palette,%edx
-		mov    %ah,mission_result
-		mov    $aQdataPal_pal_2,%eax
-		call   ac_LbFileLoadAt
-		mov    display_palette,%edx
-		push   %edx
-		call   ac_LbPaletteSet
-		add    $0x4,%esp
-		mov    $0x41,%eax
-		mov    $0x1,%ebx
-		call   ac_change_current_map
-		call   ac_unkn_lights_func_11
-		mov    data_19f432,%dx
-		mov    ingame__CurrentMission,%cx
-		mov    $0x2,%eax
-		cmp    %cx,%dx
-		je     jump_a531b
-		mov    ingame__CurrentMission,%si
-	jump_a530b:
-		mov    data_19f432(%eax),%dx
-		add    $0x2,%eax
-		inc    %ebx
-		cmp    %si,%dx
-		jne    jump_a530b
-	jump_a531b:
-		mov    ingame__MyGroup,%eax
-		sar    $0x10,%eax
-		cmp    $0x58,%eax
-		jne    jump_a5348
-		mov    old_mission_brief,%eax
-		sar    $0x10,%eax
-		lea    -0x1(%eax),%edx
-		mov    %edx,%eax
-		movb   $0x65,data_1c6e74(%edx,%eax,4)
-		movw   $0x65,ingame__CurrentMission
-		jmp    jump_a5369
-	jump_a5348:
-		mov    old_mission_brief,%edx
-		sar    $0x10,%edx
-		dec    %edx
-		mov    $0x66,%edi
-		mov    %edx,%eax
-		mov    $0x66,%cl
-		mov    %di,ingame__CurrentMission
-		mov    %cl,data_1c6e74(%edx,%eax,4)
-	jump_a5369:
-		mov    ingame__CurrentMission,%ax
-		xor    %edx,%edx
-		mov    %ax,mission_open(,%ebx,2)
-		mov    %dx,mission_state(,%ebx,2)
-		mov    ingame__MyGroup,%ebx
-		sar    $0x10,%ebx
-		lea    0x0(,%ebx,4),%eax
-		add    %ebx,%eax
-		shl    $0x2,%eax
-		sub    %ebx,%eax
-		xor    %dl,%dl
-		mov    %dl,data_1974c1(,%eax,4)
-		mov    ingame_m2,%eax
-		sar    $0x10,%eax
-		cmp    $0x2,%eax
-		jne    jump_a53b4
-		mov    %dl,execute_commands
-	jump_a53b4:
-		xor    %ebx,%ebx
-		mov    $0x1,%eax
-		mov    %ebx,engn_yc
-		call   ac_init_game
-		xor    %eax,%eax
-		mov    $0xd15c1234,%ecx
-		mov    pktrec_mode,%al
-		mov    %ecx,EXPORT_SYMBOL(lbSeed)
-		cmp    $0x1,%eax
-		jne    jump_a53e7
-		call   ac_PacketRecord_Close
-		call   ac_PacketRecord_OpenWrite
-	jump_a53e7:
-		pop    %edi
-		pop    %esi
-		pop    %edx
-		pop    %ecx
-		pop    %ebx
-		ret
-
-
-/*----------------------------------------------------------------*/
-GLOBAL_FUNC(ASM_tweak_for_compound_mission_m84)	/* 0x0A53F0 */
-/*----------------------------------------------------------------*/
-		push   %ebx
-		push   %ecx
-		push   %edx
-		push   %esi
-		xor    %ah,%ah
-		mov    EXPORT_SYMBOL(lbDisplay)+100,%bx # lbDisplay.ScreenMode
-		mov    %ah,mission_result
-		call   ac_show_black_screen
-		mov    $aQdataPal_pal_3,%eax
-		mov    display_palette,%edx
-		call   ac_LbFileLoadAt
-		mov    display_palette,%edx
-		push   %edx
-		call   ac_LbPaletteSet
-		add    $0x4,%esp
-		xor    %eax,%eax
-		call   ac_play_smacker
-		mov    $aQdataPal_pal_4,%eax
-		mov    display_palette,%edx
-		call   ac_LbFileLoadAt
-		xor    %eax,%eax
-		mov    %bx,%ax
-		call   ac_setup_screen_mode
-		mov    $0xb,%eax
-		call   ac_change_current_map
-		call   ac_unkn_lights_func_11
-		mov    data_19f432,%dx
-		mov    ingame__CurrentMission,%bx
-		mov    $0x2,%eax
-		cmp    %bx,%dx
-		je     jump_a5485
-		mov    ingame__CurrentMission,%cx
-	jump_a5476:
-		mov    data_19f432(%eax),%dx
-		add    $0x2,%eax
-		cmp    %cx,%dx
-		jne    jump_a5476
-	jump_a5485:
-		mov    old_mission_brief,%ebx
-		sar    $0x10,%ebx
-		dec    %ebx
-		mov    $0x58,%esi
-		mov    %ebx,%edx
-		mov    $0x58,%cl
-		mov    %si,ingame__CurrentMission
-		mov    %cl,data_1c6e74(%ebx,%edx,4)
-		xor    %ebx,%edx
-		mov    %si,mission_open(%eax)
-		mov    %dx,mission_state(%eax)
-		mov    ingame_m2,%eax
-		xor    %ch,%ch
-		sar    $0x10,%eax
-		mov    %ch,data_198ee1
-		cmp    $0x2,%eax
-		jne    jump_a54d1
-		mov    %ch,execute_commands
-	jump_a54d1:
-		xor    %ebx,%ebx
-		mov    $0x1,%eax
-		mov    %ebx,engn_yc
-		call   ac_init_game
-		xor    %eax,%eax
-		mov    $0xd15c1234,%ecx
-		mov    pktrec_mode,%al
-		mov    %ecx,EXPORT_SYMBOL(lbSeed)
-		cmp    $0x1,%eax
-		jne    jump_a5504
-		call   ac_PacketRecord_Close
-		call   ac_PacketRecord_OpenWrite
-	jump_a5504:
-		pop    %esi
-		pop    %edx
-		pop    %ecx
-		pop    %ebx
-		ret
-
-
 vtable_a5ea0:
 		.long   func_a605c
 		.long   func_a606d