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

Optimize local ToD access by using reference

Browse source
This commit is contained in:
Ali El Gariani 2010-07-20 19:46:04 +00:00
parent 569386d5e1
commit ffab40fb13
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/tod_manager.cpp
View file

@ -119,22 +119,19 @@ const time_of_day& tod_manager::get_previous_time_of_day() const
return get_time_of_day_turn(turn_ - 1);
}
time_of_day tod_manager::get_time_of_day(const map_location& loc, int n_turn) const
const time_of_day& tod_manager::get_time_of_day(const map_location& loc, int n_turn) const
{
time_of_day res = get_time_of_day_turn(n_turn ? n_turn : turn_);
if (loc.valid()) {
for (std::vector<area_time_of_day>::const_reverse_iterator
i = areas_.rbegin(), i_end = areas_.rend(); i != i_end; ++i)
{
if (i->hexes.count(loc) != 1) continue;
VALIDATE(i->times.size(), _("No time of day has been defined."));
res = i->times[(n_turn - 1) % i->times.size()];
break;
return i->times[(n_turn - 1) % i->times.size()];
}
}
return res;
return get_time_of_day_turn(n_turn ? n_turn : turn_);
}
bool tod_manager::is_start_ToD(const std::string& random_start_time)

2
src/tod_manager.hpp
View file

@ -43,7 +43,7 @@ class tod_manager : public savegame::savegame_config
* Returns time of day object in the turn at a location.
* If nturn = 0 use current turn
*/
time_of_day get_time_of_day(const map_location& loc, int n_turn = 0) const;
const time_of_day& get_time_of_day(const map_location& loc, int n_turn = 0) const;
/**
* Sets global time of day in this turn.
*/