0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unused field display::highlighted_locations_.

Browse source
This commit is contained in:
Guillaume Melquiond 2009-08-16 17:18:10 +00:00
parent e99dab13f4
commit 682aae09ff
3 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/display.cpp
View file

@ -111,7 +111,6 @@ display::display(CVideo& video, const gamemap* map, const config& theme_cfg, con
mouseover_hex_overlay_(0),
selectedHex_(),
mouseoverHex_(),
highlighted_locations_(),
keys_(),
#if TDRAWING_BUFFER_USES_VECTOR
drawing_buffer_(LAYER_LAST_LAYER),
@ -1282,32 +1281,6 @@ void display::enable_menu(const std::string& item, bool enable)
}
}
void display::add_highlighted_loc(const map_location &hex)
{
// Only invalidate and insert if this is a new addition,
// for efficiency.
if (highlighted_locations_.find(hex) == highlighted_locations_.end()) {
highlighted_locations_.insert(hex);
invalidate(hex);
}
}
void display::clear_highlighted_locs()
{
invalidate(highlighted_locations_);
highlighted_locations_.clear();
}
void display::remove_highlighted_loc(const map_location &hex)
{
std::set<map_location>::iterator it = highlighted_locations_.find(hex);
// Only invalidate and remove if the hex was found, for efficiency.
if (it != highlighted_locations_.end()) {
highlighted_locations_.erase(it);
invalidate(hex);
}
}
void display::announce(const std::string message, const SDL_Color& colour)
{
font::add_floating_label(message,

14
src/display.hpp
View file

@ -382,19 +382,6 @@ public:
void set_idle_anim_rate(int rate);
double idle_anim_rate() const { return idle_anim_rate_; }
/**
* Add a location to highlight.
*
* Note that this has nothing to do with selecting hexes,
* it is pure highlighting. These hexes will be highlighted
* slightly darker than the currently selected hex.
*/
void add_highlighted_loc(const map_location &hex);
void clear_highlighted_locs();
void remove_highlighted_loc(const map_location &hex);
void bounds_check_position();
void bounds_check_position(int& xpos, int& ypos);
@ -616,7 +603,6 @@ protected:
surface mouseover_hex_overlay_;
map_location selectedHex_;
map_location mouseoverHex_;
std::set<map_location> highlighted_locations_;
CKey keys_;
public:

2
src/editor/editor_display.cpp
View file

@ -65,8 +65,6 @@ image::TYPE editor_display::get_image_type(const map_location& loc)
{
if (brush_locations_.find(loc) != brush_locations_.end()) {
return image::BRIGHTENED;
} else if (highlighted_locations_.find(loc) != highlighted_locations_.end()) {
return image::SEMI_BRIGHTENED;
} else if (map().in_selection(loc)) {
return image::SEMI_BRIGHTENED;
}