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

Merge pull request #316 from cbeck88/fixup_graphics

Browse source 
when zooming in, use scale_surface_sharp for units, terrain (1.12 branch)
This commit is contained in:
Chris Beck 2014-11-06 01:28:20 -05:00
commit 2a0a319233
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/image.cpp
View file

@ -731,7 +731,12 @@ static surface get_hexed(const locator& i_locator)
static surface get_scaled_to_hex(const locator& i_locator)
{
surface img = get_image(i_locator, HEXED);
return scale_surface(img, zoom, zoom);
if (zoom < tile_size) {
return scale_surface(img, zoom, zoom);
} else {
return scale_surface_sharp(img, zoom, zoom);
}
}
static surface get_tod_colored(const locator& i_locator)
@ -748,7 +753,11 @@ static surface get_scaled_to_zoom(const locator& i_locator)
surface res(get_image(i_locator, UNSCALED));
// For some reason haloes seems to have invalid images, protect against crashing
if(!res.null()) {
return scale_surface(res, ((res.get()->w * zoom) / tile_size), ((res.get()->h * zoom) / tile_size));
if (zoom < tile_size) {
return scale_surface(res, ((res.get()->w * zoom) / tile_size), ((res.get()->h * zoom) / tile_size));
} else {
return scale_surface_sharp(res, ((res.get()->w * zoom) / tile_size), ((res.get()->h * zoom) / tile_size));
}
} else {
return surface(NULL);
}