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

attempt to fix bug where teleporting units ...

Browse source 
...would have the tiles they can move to displayed incorrectly
This commit is contained in:
uid68803 2004-02-23 18:03:06 +00:00
parent 0d15101b5a
commit 9aa50b4f70
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pathfind.cpp
View file

@ -149,7 +149,7 @@ void find_routes(const gamemap& map, const gamestatus& status,
int move_left,
std::map<gamemap::location,paths::route>& routes,
std::vector<team>& teams,
bool ignore_zocs, bool allow_teleport, int turns_left)
bool ignore_zocs, bool allow_teleport, int turns_left, bool starting_pos)
{
team& current_team = teams[u.side()-1];
@ -157,8 +157,10 @@ void find_routes(const gamemap& map, const gamestatus& status,
std::vector<gamemap::location> locs(6);
get_adjacent_tiles(loc,&locs[0]);
//check for teleporting units
if(allow_teleport && map.underlying_terrain(map[loc.x][loc.y]) == gamemap::TOWER) {
//check for teleporting units -- we must be on a vacant (or occupied by this unit)
//tower, that is controlled by our team to be able to teleport.
if(allow_teleport && map.underlying_terrain(map[loc.x][loc.y]) == gamemap::TOWER &&
current_team.owns_tower(loc) && (starting_pos || units.count(loc) == 0)) {
const std::vector<gamemap::location>& towers = map.towers();
//if we are on a tower, see all friendly towers that we can
@ -230,7 +232,7 @@ void find_routes(const gamemap& map, const gamestatus& status,
if(new_route.move_left > 0) {
find_routes(map,status,gamedata,units,u,currentloc,
zoc_move_left,routes,teams,ignore_zocs,
allow_teleport,new_turns_left);
allow_teleport,new_turns_left,false);
}
}
}
@ -254,7 +256,7 @@ paths::paths(const gamemap& map, const gamestatus& status,
routes[loc].move_left = i->second.movement_left();
find_routes(map,status,gamedata,units,i->second,loc,
i->second.movement_left(),routes,teams,
ignore_zocs,allow_teleport,additional_turns);
ignore_zocs,allow_teleport,additional_turns,true);
}
int route_turns_to_complete(const unit& u, const gamemap& map,

1
src/playturn.cpp
View file

@ -1486,6 +1486,7 @@ void turn_info::create_unit()
i != gameinfo_.unit_types.end(); ++i) {
options.push_back(i->first);
unit_choices.push_back(unit(&i->second,1,false));
unit_choices.back().new_turn();
}
const int choice = gui::show_dialog(gui_,NULL,"","Create unit (debug):",