Skip to content

Commit

Permalink
remove redundant cutscene_mark_viewable()
Browse files Browse the repository at this point in the history
This is already done in `movie::play()` and shouldn't be done again if a script overrides the function.  The extra calls were added in 251285c and cbccf65 (the former copied from the latter), originally as an unsuccessful attempt to fix Mantis 61.
  • Loading branch information
Goober5000 committed Sep 4, 2024
1 parent eeeadda commit 50ce85e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion code/mission/missioncampaign.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,6 @@ void mission_campaign_maybe_play_movie(int type)
return;

movie::play(filename); //Play the movie!
cutscene_mark_viewable( filename );
}

/**
Expand Down
1 change: 0 additions & 1 deletion code/missionui/missionscreencommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ void common_maybe_play_cutscene(int movie_type, bool restart_music, int music)
common_music_close();
music_off = true;
movie::play(The_mission.cutscenes[i].filename); //Play the movie!
cutscene_mark_viewable( The_mission.cutscenes[i].filename );
}
}
}
Expand Down

0 comments on commit 50ce85e

Please sign in to comment.