Skip to content

Add disable intro movie flag #6688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/mod_table/mod_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ color Overhead_line_colors[MAX_SHIP_SECONDARY_BANKS];
bool Preload_briefing_icon_models;
EscapeKeyBehaviorInOptions escape_key_behavior_in_options;
bool Fix_asteroid_bounding_box_check;
bool Disable_intro_movie;


#ifdef WITH_DISCORD
Expand Down Expand Up @@ -1489,6 +1490,10 @@ void parse_mod_table(const char *filename)
stuff_boolean(&Fix_asteroid_bounding_box_check);
}

if (optional_string("$Disable intro cutscene:")) {
stuff_boolean(&Disable_intro_movie);
}

// end of options ----------------------------------------

// if we've been through once already and are at the same place, force a move
Expand Down Expand Up @@ -1716,6 +1721,7 @@ void mod_table_reset()
Preload_briefing_icon_models = false;
escape_key_behavior_in_options = EscapeKeyBehaviorInOptions::DEFAULT;
Fix_asteroid_bounding_box_check = false;
Disable_intro_movie = false;
}

void mod_table_set_version_flags()
Expand Down
1 change: 1 addition & 0 deletions code/mod_table/mod_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ extern color Overhead_line_colors[MAX_SHIP_SECONDARY_BANKS];
extern bool Preload_briefing_icon_models;
extern EscapeKeyBehaviorInOptions escape_key_behavior_in_options;
extern bool Fix_asteroid_bounding_box_check;
extern bool Disable_intro_movie;

void mod_table_init();
void mod_table_post_process();
Expand Down
2 changes: 1 addition & 1 deletion freespace2/freespace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6874,7 +6874,7 @@ int game_main(int argc, char *argv[])
output_sexps("sexps.html");
}

bool skip_intro = false;
bool skip_intro = Disable_intro_movie;
if (scripting::hooks::OnIntroAboutToPlay->isActive()) {
skip_intro = scripting::hooks::OnIntroAboutToPlay->isOverride();
scripting::hooks::OnIntroAboutToPlay->run();
Expand Down
Loading