Author: anonymissimus
Date: Wed Jun 8 20:59:59 2011
New Revision: 49795
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49795&view=rev
Log:
renamed a tod getter function
Modified:
trunk/src/game_display.cpp
trunk/src/game_events.cpp
trunk/src/reports.cpp
trunk/src/terrain_filter.cpp
trunk/src/tod_manager.cpp
trunk/src/tod_manager.hpp
Modified: trunk/src/game_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.cpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/game_display.cpp (original)
+++ trunk/src/game_display.cpp Wed Jun 8 20:59:59 2011
@@ -418,7 +418,7 @@
const time_of_day& game_display::get_time_of_day(const map_location& loc) const
{
- return tod_manager_.get_time_of_day(loc);
+ return tod_manager_.get_time_of_day_with_areas(loc);
}
bool game_display::has_time_area() const
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Wed Jun 8 20:59:59 2011
@@ -753,7 +753,7 @@
const map_location loc = cfg_to_loc(cfg, -999, -999);
int turn = cfg["turn"];
// using 0 will use the current turn
- const time_of_day& tod =
resources::tod_manager->get_time_of_day(loc,turn);
+ const time_of_day& tod =
resources::tod_manager->get_time_of_day_with_areas(loc,turn);
std::string variable = cfg["variable"];
if(variable.empty()) {
Modified: trunk/src/reports.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/reports.cpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/reports.cpp (original)
+++ trunk/src/reports.cpp Wed Jun 8 20:59:59 2011
@@ -588,7 +588,7 @@
tod = resources::tod_manager->get_time_of_day();
} else if (viewing_team.fogged(mouseover_hex)) {
// Don't show illuminated time on fogged tiles.
- tod = resources::tod_manager->get_time_of_day(mouseover_hex);
+ tod =
resources::tod_manager->get_time_of_day_with_areas(mouseover_hex);
} else {
tod = resources::tod_manager->time_of_day_at(mouseover_hex);
}
Modified: trunk/src/terrain_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain_filter.cpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/terrain_filter.cpp (original)
+++ trunk/src/terrain_filter.cpp Wed Jun 8 20:59:59 2011
@@ -212,7 +212,7 @@
time_of_day tod(dummy_cfg);
if(!tod_type.empty() || !tod_id.empty()) {
if(flat_) {
- tod = resources::tod_manager->get_time_of_day(loc);
+ tod =
resources::tod_manager->get_time_of_day_with_areas(loc);
} else {
tod = resources::tod_manager->time_of_day_at(loc);
}
Modified: trunk/src/tod_manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tod_manager.cpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/tod_manager.cpp (original)
+++ trunk/src/tod_manager.cpp Wed Jun 8 20:59:59 2011
@@ -105,7 +105,7 @@
if(!resources::game_map->on_board(loc)) {
return get_time_of_day_turn(times_, for_turn, currentTime_);
}
- return get_time_of_day(loc, for_turn);
+ return get_time_of_day_with_areas(loc, for_turn);
}
const time_of_day& tod_manager::get_previous_time_of_day() const
@@ -113,7 +113,7 @@
return get_time_of_day_turn(times_, turn_ - 1, currentTime_);
}
-const 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_with_areas(const map_location&
loc, int n_turn) const
{
if(n_turn == 0)
n_turn = turn_;
@@ -224,7 +224,7 @@
const unit_map& units = *resources::units;
int light_modif =
map.get_terrain_info(map.get_terrain(loc)).light_modification();
- time_of_day tod = get_time_of_day(loc, for_turn);
+ time_of_day tod = get_time_of_day_with_areas(loc, for_turn);
int light = tod.lawful_bonus + light_modif;
int illum_light = light;
Modified: trunk/src/tod_manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tod_manager.hpp?rev=49795&r1=49794&r2=49795&view=diff
==============================================================================
--- trunk/src/tod_manager.hpp (original)
+++ trunk/src/tod_manager.hpp Wed Jun 8 20:59:59 2011
@@ -46,7 +46,7 @@
* Returns time of day object in the turn at a location.
* If nturn = 0 use current turn
*/
- const time_of_day& get_time_of_day(const map_location& loc, int
n_turn = 0) const;
+ const time_of_day& get_time_of_day_with_areas(const
map_location& loc, int n_turn = 0) const;
static bool is_start_ToD(const std::string&);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
