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

Recent commits used the wrong solution to fix a glitch.

Browse source 
2007-07-04T22:59:57Z!esr@thyrsus.com and [[SVN:18656 ]] were not right.
This caused halos to be no longer properly invalidated.

This commit restores reverts both commits and fixes the right hand
side glitch properly.

Also fixes a stupid error where border was casted to an integer instead
of the entire expression.
This commit is contained in:
Mark de Wever 2007-07-14 21:11:42 +00:00
parent add73571cf
commit eccd348c59
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/display.cpp
View file

@ -258,18 +258,22 @@ void display::get_rect_hex_bounds(SDL_Rect rect, gamemap::location &topleft, gam
{
// change the coordinates of the rect send to be relative
// to the map area instead of the screen area
const SDL_Rect& map_rect = map_outside_area();
const SDL_Rect& map_rect = map_area();
rect.x -= map_rect.x;
rect.y -= map_rect.y;
// only move the left side, the right side should remain
// at the same coordinates, so fix that
rect.w += map_rect.x;
rect.h += map_rect.y;
const int tile_width = hex_width();
// adjust for the border
topleft.x = -static_cast<int>(border) + (xpos_ + rect.x) / tile_width;
topleft.y = -static_cast<int>(border) + (ypos_ + rect.y - (is_odd(topleft.x) ? zoom_/2 : 0)) / zoom_;
topleft.x = static_cast<int>(-border + (xpos_ + rect.x) / tile_width);
topleft.y = static_cast<int>(-border + (ypos_ + rect.y - (is_odd(topleft.x) ? zoom_/2 : 0)) / zoom_);
bottomright.x = -static_cast<int>(border) + (xpos_ + rect.x + rect.w) / tile_width;
bottomright.y = -static_cast<int>(border) + ((ypos_ + rect.y + rect.h) - (is_odd(bottomright.x) ? zoom_/2 : 0)) / zoom_;
bottomright.x = static_cast<int>(-border + (xpos_ + rect.x + rect.w) / tile_width);
bottomright.y = static_cast<int>(-border + ((ypos_ + rect.y + rect.h) - (is_odd(bottomright.x) ? zoom_/2 : 0)) / zoom_);
// This routine does a rough approximation so might be off by one
// to be sure enough tiles are incuded the boundries are increased
@ -319,8 +323,6 @@ gamemap::location display::minimap_location_on(int x, int y)
void display::get_visible_hex_bounds(gamemap::location &topleft, gamemap::location &bottomright) const
{
SDL_Rect r = map_area();
r.x=0;
r.y=0;
get_rect_hex_bounds(r, topleft, bottomright);
}