removed duplicate wrapper function get_village...
...by adding a default parameter for the other one
This commit is contained in:
parent
94b5489259
commit
dc7e63fe76
2 changed files with 1 additions and 10 deletions
|
@ -1249,12 +1249,6 @@ int village_owner(const gamemap::location& loc, const std::vector<team>& teams)
|
|||
return -1;
|
||||
}
|
||||
|
||||
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
|
||||
size_t team_num, const unit_map& units)
|
||||
{
|
||||
return get_village(loc,teams,team_num,units,NULL);
|
||||
}
|
||||
|
||||
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
|
||||
size_t team_num, const unit_map& units, int *action_timebonus)
|
||||
{
|
||||
|
|
|
@ -204,10 +204,7 @@ int village_owner(const gamemap::location& loc, const std::vector<team>& teams);
|
|||
//makes it so the village at the given location is owned by the given
|
||||
//0-based team number. Returns true if getting the village triggered a mutating event
|
||||
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
|
||||
size_t team_num, const unit_map& units);
|
||||
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
|
||||
size_t team_num, const unit_map& units, int *time_bonus);
|
||||
|
||||
size_t team_num, const unit_map& units, int *time_bonus = NULL);
|
||||
|
||||
//given the 1-based side, will find the leader of that side,
|
||||
//and return an iterator to the leader
|
||||
|
|
Loading…
Add table
Reference in a new issue