Skip to content

Commit 07bcfba

Browse files
committed
swars: While loading mission, do not assume reload
1 parent 26f5548 commit 07bcfba

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/game.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,9 @@ void load_level_pc(short level, short missi, ubyte reload)
17091709
LOGERR("Next level index is not positive, load skipped");
17101710
return;
17111711
}
1712+
LOGSYNC("Next level %hd prev level %hd mission %hd reload 0x%x",
1713+
next_level, prev_level, missi, (uint)reload);
1714+
17121715
/* XXX: This fixes the inter-mission memory corruption bug
17131716
* mefisto: No idea what "the" bug is, to be tested and described properly (or re-enabled)
17141717
*/
@@ -4744,7 +4747,9 @@ void prep_single_mission(void)
47444747
void restart_back_into_mission(ushort missi)
47454748
{
47464749
ushort mapno;
4750+
ubyte reload;
47474751

4752+
reload = (missi == ingame.CurrentMission);
47484753
mapno = mission_list[missi].MapNo;
47494754
mission_result = 0;
47504755
ingame.CurrentMission = missi;
@@ -4754,7 +4759,7 @@ void restart_back_into_mission(ushort missi)
47544759
if (ingame.GameMode == GamM_Unkn2)
47554760
execute_commands = 0;
47564761
engn_yc = 0;
4757-
init_game(1);
4762+
init_game(reload);
47584763
lbSeed = 0xD15C1234;
47594764
if (pktrec_mode == PktR_RECORD)
47604765
{

0 commit comments

Comments
 (0)