Skip to content
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.

Sign up for GitHub

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

Clarify the description of safe mode proximity distance option #37180

Merged
merged 1 commit into from
Jan 19, 2020
Merged

Clarify the description of safe mode proximity distance option #37180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ void options_manager::add_options_general()
);

add( "SAFEMODEPROXIMITY", "general", translate_marker( "Safe mode proximity distance" ),
translate_marker( "If safe mode is enabled, distance to hostiles at which safe mode should show a warning. 0 = Max player view distance." ),
translate_marker( "If safe mode is enabled, distance to hostiles at which safe mode should show a warning. 0 = Max player view distance. This option only has effect when no safe mode rule is specified. Otherwise, edit the default rule in Safe Mode Manager instead of this value." ),
0, MAX_VIEW_DISTANCE, 0
);

Expand Down
3 changes: 2 additions & 1 deletion src/safemode_ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ void safemode::show( const std::string &custom_name_in, bool is_safemode_in )
}
} else if( action == "ADD_DEFAULT_RULESET" ) {
changes_made = true;
current_tab.push_back( rules_class( "*", true, false, Creature::A_HOSTILE, 0 ) );
current_tab.push_back( rules_class( "*", true, false, Creature::A_HOSTILE,
get_option<int>( "SAFEMODEPROXIMITY" ) ) );
line = current_tab.size() - 1;
} else if( action == "ADD_RULE" ) {
changes_made = true;
Expand Down