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

removed the turn_ member from tod_manager...

Browse source 
...and added a turn argument to the corresponding functions
This commit is contained in:
Eugen Jiresch 2009-06-05 13:27:07 +00:00
parent 2c285c93da
commit 5a0b4d3c7a
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/tod_manager.cpp
View file

@ -19,20 +19,18 @@
#include "gamestatus.hpp"
tod_manager::tod_manager(const config& time_cfg):
turn_(1),
currentTime_(0)
{
std::string turn_at = time_cfg["turn_at"];
std::string current_tod = time_cfg["current_tod"];
std::string random_start_time = time_cfg["random_start_time"];
int turn = 1;
if(turn_at.empty() == false) {
turn_ = atoi(turn_at.c_str());
turn = atoi(turn_at.c_str());
}
time_of_day::parse_times(time_cfg,times_);
set_start_ToD(const_cast<config&>(time_cfg),NULL);
set_start_ToD(const_cast<config&>(time_cfg), turn, NULL);
foreach (const config &t, time_cfg.child_range("time_area")) {
this->add_time_area(t);
@ -82,14 +80,14 @@ bool tod_manager::set_time_of_day(int newTime)
return true;
}
time_of_day tod_manager::get_previous_time_of_day() const
time_of_day tod_manager::get_previous_time_of_day(int current_turn) const
{
return get_time_of_day_turn(turn_-1);
return get_time_of_day_turn(current_turn-1, current_turn);
}
time_of_day tod_manager::get_time_of_day(int illuminated, const map_location& loc, int n_turn) const
time_of_day tod_manager::get_time_of_day(int illuminated, const map_location& loc, int n_turn, int current_turn) const
{
time_of_day res = get_time_of_day_turn(n_turn);
time_of_day res = get_time_of_day_turn(n_turn, current_turn);
if(loc.valid()) {
for(std::vector<area_time_of_day>::const_iterator i = areas_.begin(); i != areas_.end(); ++i) {
@ -110,9 +108,9 @@ time_of_day tod_manager::get_time_of_day(int illuminated, const map_location& lo
return res;
}
time_of_day tod_manager::get_time_of_day(int illuminated, const map_location& loc) const
time_of_day tod_manager::get_time_of_day(int illuminated, const map_location& loc, int current_turn) const
{
return get_time_of_day(illuminated,loc,turn_);
return get_time_of_day(illuminated,loc,current_turn);
}
bool tod_manager::is_start_ToD(const std::string& random_start_time)
@ -160,7 +158,7 @@ void tod_manager::remove_time_area(const std::string& area_id)
}
}
void tod_manager::set_start_ToD(config &level, game_state* s_o_g)
void tod_manager::set_start_ToD(config &level, int current_turn, game_state* s_o_g)
{
if (!level["current_tod"].empty())
{
@ -191,7 +189,7 @@ void tod_manager::set_start_ToD(config &level, game_state* s_o_g)
{
// We have to set right ToD for oldsaves
set_time_of_day((turn_ - 1) % times_.size());
set_time_of_day((current_turn - 1) % times_.size());
}
// Setting ToD to level data
@ -201,11 +199,11 @@ void tod_manager::set_start_ToD(config &level, game_state* s_o_g)
}
time_of_day tod_manager::get_time_of_day_turn(int nturn) const
time_of_day tod_manager::get_time_of_day_turn(int nturn, int current_turn) const
{
VALIDATE(times_.size(), _("No time of day has been defined."));
int time = (currentTime_ + nturn - turn_)% times_.size();
int time = (currentTime_ + nturn - current_turn)% times_.size();
if (time < 0)
{

11
src/tod_manager.hpp
View file

@ -36,15 +36,15 @@ class tod_manager : public savegame_config
/** Returns time of day object for current turn. */
time_of_day get_time_of_day() const;
time_of_day get_previous_time_of_day() const;
time_of_day get_time_of_day(int illuminated, const map_location& loc) const;
time_of_day get_previous_time_of_day(int current_turn) const;
time_of_day get_time_of_day(int illuminated, const map_location& loc, int current_turn) const;
/**
* Returns time of day object in the turn.
*
* It first tries to look for specified. If no area time specified in
* location, it returns global time.
*/
time_of_day get_time_of_day(int illuminated, const map_location& loc, int n_turn) const;
time_of_day get_time_of_day(int illuminated, const map_location& loc, int n_turn, int current_turn) const;
/**
* Sets global time of day in this turn.
* Time is a number between 0 and n-1, where n is number of ToDs.
@ -84,14 +84,14 @@ class tod_manager : public savegame_config
void remove_time_area(const std::string& id);
private:
void set_start_ToD(config&, game_state*);
void set_start_ToD(config&, int current_turn, game_state*);
/**
* Returns time of day object in the turn.
*
* Correct time is calculated from current time.
*/
time_of_day get_time_of_day_turn(int nturn) const;
time_of_day get_time_of_day_turn(int nturn, int current_turn) const;
void next_time_of_day();
struct area_time_of_day {
@ -109,7 +109,6 @@ class tod_manager : public savegame_config
std::set<map_location> hexes;
};
size_t turn_; //track the current turn in order to determine the time for a specific turn
int currentTime_;
std::vector<time_of_day> times_;
std::vector<area_time_of_day> areas_;