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

Display: simplified a few things

Browse source
This commit is contained in:
Charles Dang 2017-07-19 15:55:05 +11:00
parent 3376ef04e3
commit beae56a4ea
1 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/display.cpp
View file

@ -88,12 +88,10 @@ unsigned int display::last_zoom_ = SmallZoom;
void display::add_overlay(const map_location& loc, const std::string& img, const std::string& halo, const std::string& team_name, const std::string& item_id, bool visible_under_fog)
{
if (halo_man_) {
halo::handle halo_handle;
if(halo != "") {
halo_handle = halo_man_->add(get_location_x(loc) + hex_size() / 2,
get_location_y(loc) + hex_size() / 2, halo, loc);
}
if(halo_man_) {
const halo::handle halo_handle = halo_man_->add(
get_location_x(loc) + hex_size() / 2,
get_location_y(loc) + hex_size() / 2, halo, loc);
overlays_->emplace(loc, overlay(img, halo, halo_handle, team_name, item_id, visible_under_fog));
}
@ -1822,13 +1820,7 @@ void display::bounds_check_position()
{
const unsigned int orig_zoom = zoom_;
if(zoom_ < MinZoom) {
zoom_ = MinZoom;
}
if(zoom_ > MaxZoom) {
zoom_ = MaxZoom;
}
zoom_ = utils::clamp(zoom_, MinZoom, MaxZoom);
bounds_check_position(xpos_, ypos_);
@ -1842,24 +1834,11 @@ void display::bounds_check_position(int& xpos, int& ypos) const
const int tile_width = hex_width();
// Adjust for the border 2 times
const int xend = static_cast<int>(tile_width * (get_map().w() + 2 * theme_.border().size) + tile_width/3);
const int yend = static_cast<int>(zoom_ * (get_map().h() + 2 * theme_.border().size) + zoom_/2);
const int xend = static_cast<int>(tile_width * (get_map().w() + 2 * theme_.border().size) + tile_width / 3);
const int yend = static_cast<int>(zoom_ * (get_map().h() + 2 * theme_.border().size) + zoom_ / 2);
if(xpos > xend - map_area().w) {
xpos = xend - map_area().w;
}
if(ypos > yend - map_area().h) {
ypos = yend - map_area().h;
}
if(xpos < 0) {
xpos = 0;
}
if(ypos < 0) {
ypos = 0;
}
xpos = utils::clamp(xpos, 0, xend - map_area().w);
ypos = utils::clamp(ypos, 0, yend - map_area().h);
}
double display::turbo_speed() const