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

made it so units moving through water will be submerged as they move

Browse source
This commit is contained in:
Dave White 2004-08-14 05:14:00 +00:00
parent a7aa5def0b
commit 9acf309805
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/unit_display.cpp
View file

@ -34,8 +34,10 @@ void move_unit_between(display& disp, const gamemap& map, const gamemap::locatio
const int src_height_adjust = u.is_flying() ? 0 : int(map.get_terrain_info(src_terrain).unit_height_adjust() * disp.zoom());
const int dst_height_adjust = u.is_flying() ? 0 : int(map.get_terrain_info(dst_terrain).unit_height_adjust() * disp.zoom());
const double src_submerge = u.is_flying() ? 0 : int(map.get_terrain_info(src_terrain).unit_submerge());
const double dst_submerge = u.is_flying() ? 0 : int(map.get_terrain_info(dst_terrain).unit_submerge());
const double src_submerge = u.is_flying() ? 0.0 : map.get_terrain_info(src_terrain).unit_submerge();
const double dst_submerge = u.is_flying() ? 0.0 : map.get_terrain_info(dst_terrain).unit_submerge();
std::cerr << "submerge: " << src_submerge << " -> " << dst_submerge << "\n";
const gamemap::TERRAIN terrain = map.get_terrain(b);
const int nsteps = disp.turbo() ? 3 : 10*u.movement_cost(map,terrain);
@ -113,7 +115,7 @@ void move_unit_between(display& disp, const gamemap& map, const gamemap::locatio
}
const int height_adjust = src_height_adjust + (dst_height_adjust-src_height_adjust)*(i/nsteps);
const double submerge = src_submerge + (dst_submerge-src_submerge)*(i/nsteps);
const double submerge = src_submerge + (dst_submerge-src_submerge)*(double(i)/double(nsteps));
const int xpos = static_cast<int>(xloc);
const int ypos = static_cast<int>(yloc) - height_adjust;