Removed preference to disable halos

There's really no reason to have this anymore. It was (AFAIK) introduced years ago
as a performance-saving measure, then was moved to Advanced Preferences in 1.13 since
modern PCs mostly have no issues.
This commit is contained in:
Charles Dang 2018-06-29 15:05:51 +11:00
parent de8077add6
commit 8587a14cde
6 changed files with 4 additions and 29 deletions

View file

@ -90,6 +90,7 @@
* Passing relative paths to --user-data-dir is deprecated (part of PR#4449),
* On windows, relative paths that start with `.\` are not deprecated
* Removed incomplete joystick support.
* Removed option to disable unit and item halos.
## Version 1.15.1
### Editor

View file

@ -165,14 +165,6 @@
default=yes
[/advanced_preference]
[advanced_preference]
field=show_halos
name= _ "Show haloing effects"
description= _ "Show special unit graphical effects"
type=boolean
default=yes
[/advanced_preference]
[advanced_preference]
field=show_deprecation
name= _ "Show deprecation messages in-game"

View file

@ -2499,7 +2499,7 @@ void display::draw(bool update,bool force) {
* draw_invalidated() also invalidates the halos, so also needs to be
* ran if invalidated_.empty() == true.
*/
if(!invalidated_.empty() || preferences::show_haloes()) {
if(!invalidated_.empty()) {
draw_invalidated();
invalidated_.clear();
}

View file

@ -354,7 +354,7 @@ void halo_impl::remove(int handle)
void halo_impl::unrender(std::set<map_location> invalidated_locations)
{
if(preferences::show_haloes() == false || haloes.empty()) {
if(haloes.empty()) {
return;
}
//assert(invalidated_haloes.empty());
@ -429,7 +429,7 @@ void halo_impl::unrender(std::set<map_location> invalidated_locations)
void halo_impl::render()
{
if(preferences::show_haloes() == false || haloes.empty() ||
if(haloes.empty() ||
invalidated_haloes.empty()) {
return;
}

View file

@ -39,8 +39,6 @@ namespace {
bool message_private_on = false;
bool haloes = true;
std::map<std::string, std::set<std::string>> completed_campaigns;
std::set<std::string> encountered_units_set;
std::set<t_translation::terrain_code> encountered_terrains_set;
@ -81,7 +79,6 @@ manager::manager() :
set_music_volume(music_volume());
set_sound_volume(sound_volume());
set_show_haloes(preferences::get("show_haloes", true));
if (!preferences::get("remember_timer_settings", false)) {
preferences::erase("mp_countdown_init_time");
preferences::erase("mp_countdown_reservoir_time");
@ -871,17 +868,6 @@ void set_message_private(bool value)
message_private_on = value;
}
bool show_haloes()
{
return haloes;
}
void set_show_haloes(bool value)
{
haloes = value;
preferences::set("show_haloes", value);
}
compression::format save_compression_format()
{
const std::string& choice =

View file

@ -195,10 +195,6 @@ class acquaintance;
bool message_private();
void set_message_private(bool value);
bool show_haloes();
void set_show_haloes(bool value);
// Multiplayer functions
std::string get_chat_timestamp(const std::time_t& t);
bool chat_timestamping();