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

Remove scaling by zoom_factor in unit height adjustment calculation (resolves #5974).

Browse source 
It appears double zoom_factor scaling results in units being drawn way off their actual hex at high zoom, for tiles with a large (~20 pixels) unit height offset parameter.
This commit is contained in:
Wedge009 2021-09-13 22:47:23 +10:00
parent a8d6f65c7a
commit af629b7131
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/units/drawer.cpp
View file

@ -348,9 +348,10 @@ void unit_drawer::redraw_unit (const unit & u) const
const t_translation::terrain_code terrain_dst = map.get_terrain(dst);
const terrain_type& terrain_dst_info = map.get_terrain_info(terrain_dst);
int height_adjust_unit = static_cast<int>((terrain_info.unit_height_adjust() * (1.0 - adjusted_params.offset) +
terrain_dst_info.unit_height_adjust() * adjusted_params.offset) *
zoom_factor);
// height_adjust_unit is not scaled by zoom_factor here otherwise it results in a squared offset that results in #5974
// It appears the tiles and units are scaled together somewhere else
int height_adjust_unit = static_cast<int>(terrain_info.unit_height_adjust() * (1.0 - adjusted_params.offset) +
terrain_dst_info.unit_height_adjust() * adjusted_params.offset);
if (is_flying && height_adjust_unit < 0) {
height_adjust_unit = 0;
}