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

fix to bug in tiles_adjacent()

Browse source
This commit is contained in:
uid68803 2004-01-29 20:48:18 +00:00
parent 901fdd21a6
commit e03cd639f4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pathfind.cpp
View file

@ -97,12 +97,12 @@ bool tiles_adjacent(const gamemap::location& a, const gamemap::location& b)
{
//two tiles are adjacent if y is different by 1, and x by 0, or if
//x is different by 1 and y by 0, or if x and y are each different by 1,
//and the x value of the hex with the greater y value is odd
//and the x value of the hex with the greater y value is even
const int xdiff = abs(a.x - b.x);
const int ydiff = abs(a.y - b.y);
return ydiff == 1 && a.x == b.x || xdiff == 1 && a.y == b.y ||
xdiff == 1 && ydiff == 1 && (a.y > b.y ? is_odd(a.x) : is_odd(b.x));
xdiff == 1 && ydiff == 1 && (a.y > b.y ? is_even(a.x) : is_even(b.x));
}
size_t distance_between(const gamemap::location& a, const gamemap::location& b)

1
src/show_dialog.cpp
View file

@ -732,6 +732,7 @@ void fade_logo(display& screen, int xpos, int ypos)
SDL_SetAlpha(logo,SDL_SRCALPHA,255);
screen.blit_surface(xpos,ypos,logo);
update_rect(xpos,ypos,logo->w,logo->h);
screen.video().flip();
}
TITLE_RESULT show_title(display& screen)