Skip to content
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
2 changes: 1 addition & 1 deletion code/localization/localize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bool *Lcl_unexpected_tstring_check = nullptr;
// NOTE: with map storage of XSTR strings, the indexes no longer need to be contiguous,
// but internal strings should still increment XSTR_SIZE to avoid collisions.
// retail XSTR_SIZE = 1570
// #define XSTR_SIZE 1882 // This is the next available ID
// #define XSTR_SIZE 1883 // This is the next available ID

// struct to allow for strings.tbl-determined x offset
// offset is 0 for english, by default
Expand Down
3 changes: 3 additions & 0 deletions code/missionui/missionscreencommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ void common_buttons_init(UI_WINDOW *ui_window)
if ( brief_only_allow_briefing() ) {
Common_buttons[Current_screen-1][gr_screen.res][COMMON_SS_REGION].button.disable();
Common_buttons[Current_screen-1][gr_screen.res][COMMON_WEAPON_REGION].button.disable();
if (Show_locked_status_scramble_missions) {
ui_window->add_XSTR("Ships/Weapons Are Locked For This Mission", 1882, Common_buttons[Current_screen-1][gr_screen.res][COMMON_WEAPON_BUTTON].xt, Common_buttons[Current_screen-1][gr_screen.res][COMMON_WEAPON_BUTTON].yt + 30, &Common_buttons[Current_screen-1][gr_screen.res][COMMON_WEAPON_BUTTON].button, UI_XSTR_COLOR_GREEN);
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions code/mod_table/mod_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ bool Preload_briefing_icon_models;
EscapeKeyBehaviorInOptions escape_key_behavior_in_options;
bool Fix_asteroid_bounding_box_check;
bool Disable_intro_movie;
bool Show_locked_status_scramble_missions;


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

if (optional_string("$Show locked status for scramble missions:")) {
stuff_boolean(&Show_locked_status_scramble_missions);
}

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

// if we've been through once already and are at the same place, force a move
Expand Down Expand Up @@ -1733,6 +1738,7 @@ void mod_table_reset()
escape_key_behavior_in_options = EscapeKeyBehaviorInOptions::DEFAULT;
Fix_asteroid_bounding_box_check = false;
Disable_intro_movie = false;
Show_locked_status_scramble_missions = 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 @@ -180,6 +180,7 @@ 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;
extern bool Show_locked_status_scramble_missions;

void mod_table_init();
void mod_table_post_process();
Expand Down
Loading