Author: anonymissimus
Date: Mon Oct 24 00:56:34 2011
New Revision: 51599
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51599&view=rev
Log:
created play_controller::get_end_level_data_const() returning a const ref
and converted get_end_level_data() calls where appropriate so that
it's easier to sort out where it can be modified and where not.
Modified:
trunk/src/play_controller.hpp
trunk/src/playcampaign.cpp
trunk/src/playmp_controller.cpp
trunk/src/playsingle_controller.cpp
Modified: trunk/src/play_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.hpp?rev=51599&r1=51598&r2=51599&view=diff
==============================================================================
--- trunk/src/play_controller.hpp (original)
+++ trunk/src/play_controller.hpp Mon Oct 24 00:56:34 2011
@@ -113,8 +113,12 @@
void set_victory_when_enemies_defeated(bool e)
{ victory_when_enemies_defeated_ = e; }
- end_level_data &get_end_level_data()
- { return end_level_data_; }
+ end_level_data& get_end_level_data() {
+ return end_level_data_;
+ }
+ const end_level_data& get_end_level_data_const() const {
+ return end_level_data_;
+ }
/**
* Checks to see if a side has won, and throws an end_level_exception.
Modified: trunk/src/playcampaign.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playcampaign.cpp?rev=51599&r1=51598&r2=51599&view=diff
==============================================================================
--- trunk/src/playcampaign.cpp (original)
+++ trunk/src/playcampaign.cpp Mon Oct 24 00:56:34 2011
@@ -128,7 +128,7 @@
LOG_NG << "created objects... " << (SDL_GetTicks() -
playcontroller.get_ticks()) << "\n";
LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
- end_level = playcontroller.get_end_level_data();
+ end_level = playcontroller.get_end_level_data_const();
if (res == DEFEAT) {
if (resources::persist != NULL)
@@ -164,7 +164,7 @@
playmp_controller playcontroller(*level, state_of_game, ticks,
num_turns,
game_config, disp.video(), skip_replay, io_type == IO_SERVER);
LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
- end_level = playcontroller.get_end_level_data();
+ end_level = playcontroller.get_end_level_data_const();
//Check if the player started as mp client and changed to host
if (io_type == IO_CLIENT && playcontroller.is_host())
io_type = IO_SERVER;
Modified: trunk/src/playmp_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playmp_controller.cpp?rev=51599&r1=51598&r2=51599&view=diff
==============================================================================
--- trunk/src/playmp_controller.cpp (original)
+++ trunk/src/playmp_controller.cpp Mon Oct 24 00:56:34 2011
@@ -333,7 +333,7 @@
set_end_scenario_button();
- if ( get_end_level_data().reveal_map ) {
+ if ( get_end_level_data_const().reveal_map ) {
// switch to observer viewpoint
gui_->set_team(0,true);
gui_->recalculate_minimap();
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=51599&r1=51598&r2=51599&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Mon Oct 24 00:56:34 2011
@@ -253,7 +253,7 @@
std::ostringstream &report, int player_gold, int remaining_gold,
int finishing_bonus_per_turn, int turns_left, int finishing_bonus)
{
- end_level_data &end_level = get_end_level_data();
+ const end_level_data &end_level = get_end_level_data_const();
report << _("Remaining gold: ")
<< remaining_gold << "\n";
if(end_level.gold_bonus) {
@@ -940,7 +940,7 @@
if (t.persistent()) ++persistent_teams;
}
- end_level_data &end_level = get_end_level_data();
+ const end_level_data &end_level = get_end_level_data_const();
if (persistent_teams > 0 && (has_next_scenario ||
gamestate_.classification().campaign_type == "test"))
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
