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

Revert "Prevent minimap scrolling if viewport is locked"

Browse source 
This reverts commit 2f8b997cb8.

This needs to be redone in a less sloppy way that doesn't functions not
returning an actual value per their declaration or mass code
reindentations.
This commit is contained in:
Ignacio R. Morelle 2014-06-01 23:39:58 -04:00
parent 2f8b997cb8
commit 2349cf1981
1 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/display.cpp
View file

@ -795,35 +795,32 @@ int display::get_location_y(const map_location& loc) const
map_location display::minimap_location_on(int x, int y)
{
if(!view_locked_ || force) {
//TODO: don't return location for this,
// instead directly scroll to the clicked pixel position
//TODO: don't return location for this,
// instead directly scroll to the clicked pixel position
if (!point_in_rect(x, y, minimap_area())) {
return map_location();
}
// we transform the coordinates from minimap to the full map image
// probably more adjustments to do (border, minimap shift...)
// but the mouse and human capacity to evaluate the rectangle center
// is not pixel precise.
int px = (x - minimap_location_.x) * get_map().w()*hex_width() / minimap_location_.w;
int py = (y - minimap_location_.y) * get_map().h()*hex_size() / minimap_location_.h;
map_location loc = pixel_position_to_hex(px, py);
if (loc.x < 0)
loc.x = 0;
else if (loc.x >= get_map().w())
loc.x = get_map().w() - 1;
if (loc.y < 0)
loc.y = 0;
else if (loc.y >= get_map().h())
loc.y = get_map().h() - 1;
return loc;
if (!point_in_rect(x, y, minimap_area())) {
return map_location();
}
// we transform the coordinates from minimap to the full map image
// probably more adjustments to do (border, minimap shift...)
// but the mouse and human capacity to evaluate the rectangle center
// is not pixel precise.
int px = (x - minimap_location_.x) * get_map().w()*hex_width() / minimap_location_.w;
int py = (y - minimap_location_.y) * get_map().h()*hex_size() / minimap_location_.h;
map_location loc = pixel_position_to_hex(px, py);
if (loc.x < 0)
loc.x = 0;
else if (loc.x >= get_map().w())
loc.x = get_map().w() - 1;
if (loc.y < 0)
loc.y = 0;
else if (loc.y >= get_map().h())
loc.y = get_map().h() - 1;
return loc;
}
int display::screenshot(std::string filename, bool map_screenshot)