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

Terrains tiles are now cut according to the hexagonal shape,

Browse source 
to avoid some graphical glitches.
This commit is contained in:
Philippe Plantier 2004-08-05 19:36:43 +00:00
parent 98b7a7917d
commit 07e5ee173d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/image.cpp
View file

@ -207,7 +207,7 @@ surface locator::load_image_file() const
surface locator::load_image_sub_file() const
{
const surface mother_surface(get_image(val_.filename_, UNSCALED, NO_ADJUST_COLOUR));
const surface mask(get_image(game_config::terrain_mask_image, UNSCALED, NO_ADJUST_COLOUR));
const surface mask(get_image(game_config::terrain_mask_image, UNMASKED, NO_ADJUST_COLOUR));
if(mother_surface == NULL)
return surface(NULL);
@ -398,7 +398,16 @@ surface get_unmasked(const locator i_locator, COLOUR_ADJUSTMENT adj)
{
surface image(get_image(i_locator, UNSCALED));
surface res(scale_surface(image, zoom, zoom));
// Re-cut scaled tiles according to a mask. Check if the surface we try
// to get is not the mask itself, to avoid an infinite loop.
surface res;
if(i_locator != locator(game_config::terrain_mask_image)) {
const surface hex(get_image(game_config::terrain_mask_image,
UNMASKED, NO_ADJUST_COLOUR));
res = mask_surface(scale_surface(image, zoom, zoom), hex);
} else {
res = scale_surface(image, zoom, zoom);
}
return res;
}

1
src/image.hpp
View file

@ -66,6 +66,7 @@ namespace image {
locator& operator=(const locator &a);
bool operator==(const locator &a) const { return index_ == a.index_; }
bool operator!=(const locator &a) const { return index_ != a.index_; }
bool operator<(const locator &a) const { return index_ < a.index_; }
const std::string &get_filename() const { return val_.filename_; }