Author: euschn
Date: Tue Jun 23 16:55:22 2009
New Revision: 36362
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36362&view=rev
Log:
added const modifier to to the tod_manager_ member of game_savegame
Modified:
trunk/src/savegame.cpp
trunk/src/savegame.hpp
Modified: trunk/src/savegame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/savegame.cpp?rev=36362&r1=36361&r2=36362&view=diff
==============================================================================
--- trunk/src/savegame.cpp (original)
+++ trunk/src/savegame.cpp Tue Jun 23 16:55:22 2009
@@ -865,9 +865,9 @@
autosave_savegame::autosave_savegame(game_state &gamestate, const config&
level_cfg,
game_display& gui,
const std::vector<team>& teams,
- const unit_map& units,
tod_manager& gamestatus,
+ const unit_map& units,
const tod_manager& tod_mng,
const gamemap& map,
const bool compress_saves)
- : game_savegame(gamestate, level_cfg, gui, teams, units, gamestatus,
map, compress_saves)
+ : game_savegame(gamestate, level_cfg, gui, teams, units, tod_mng, map,
compress_saves)
{
set_error_message(_("Could not auto save the game. Please save the game
manually."));
}
@@ -895,9 +895,9 @@
oos_savegame::oos_savegame(game_state &gamestate, const config& level_cfg,
game_display& gui,
const std::vector<team>& teams,
- const unit_map& units,
tod_manager& gamestatus,
+ const unit_map& units,
const tod_manager& tod_mng,
const gamemap& map,
const bool compress_saves)
- : game_savegame(gamestate, level_cfg, gui, teams, units, gamestatus,
map, compress_saves)
+ : game_savegame(gamestate, level_cfg, gui, teams, units, tod_mng, map,
compress_saves)
{}
int oos_savegame::show_save_dialog(CVideo& video, const std::string& message,
const gui::DIALOG_TYPE /*dialog_type*/)
@@ -923,12 +923,12 @@
game_savegame::game_savegame(game_state &gamestate, const config& level_cfg,
game_display& gui,
const std::vector<team>& teams,
- const unit_map& units,
tod_manager& gamestatus,
+ const unit_map& units,
const tod_manager& tod_mng,
const gamemap& map,
const bool compress_saves)
: savegame(gamestate, compress_saves, _("Save Game")),
level_cfg_(level_cfg), gui_(gui),
teams_(teams), units_(units),
- tod_manager_(gamestatus), map_(map)
+ tod_manager_(tod_mng), map_(map)
{}
void game_savegame::create_filename()
Modified: trunk/src/savegame.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/savegame.hpp?rev=36362&r1=36361&r2=36362&view=diff
==============================================================================
--- trunk/src/savegame.hpp (original)
+++ trunk/src/savegame.hpp Tue Jun 23 16:55:22 2009
@@ -228,7 +228,7 @@
public:
game_savegame(game_state& gamestate, const config& level_cfg,
game_display& gui, const std::vector<team>& teams,
- const unit_map& units, tod_manager& gamestatus,
+ const unit_map& units, const tod_manager& tod_mng,
const gamemap& map, const bool compress_saves);
private:
@@ -246,7 +246,7 @@
game_display& gui_;
const std::vector<team>& teams_;
const unit_map& units_;
- tod_manager& tod_manager_; //FIXME: make to_config() const so we can
call it on const references
+ const tod_manager& tod_manager_;
const gamemap& map_;
};
@@ -267,7 +267,7 @@
public:
autosave_savegame(game_state &gamestate, const config& level_cfg,
game_display& gui, const
std::vector<team>& teams,
- const unit_map& units, tod_manager&
gamestatus,
+ const unit_map& units, const
tod_manager& tod_mng,
const gamemap& map, const bool
compress_saves);
void autosave(const bool disable_autosave, const int autosave_max,
const int infinite_autosaves);
@@ -281,7 +281,7 @@
public:
oos_savegame(game_state &gamestate, const config& level_cfg,
game_display& gui, const std::vector<team>&
teams,
- const unit_map& units, tod_manager& gamestatus,
+ const unit_map& units, const tod_manager&
tod_mng,
const gamemap& map, const bool compress_saves);
private:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
