upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 17:59:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename remove_from_carryover_on_leaders_loss_

Browse Source 
to remove_from_carryover_on_defeat_
This commit is contained in:
gfgtdf 2014-05-19 04:34:03 +02:00
parent 12d190ff9f
commit d948a04d9d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/play_controller.cpp
View File

@ -131,7 +131,7 @@ play_controller::play_controller(const config& level, game_state& state_of_game,
savenames_(),
wml_commands_(),
victory_when_enemies_defeated_(true),
remove_from_carryover_on_leaders_loss_(true),
remove_from_carryover_on_defeat_(true),
end_level_data_(),
victory_music_(),
defeat_music_(),
@ -1427,7 +1427,7 @@ void play_controller::check_victory()
// run rarely so do it the expensive way.
gui_->invalidate_all();
if (remove_from_carryover_on_leaders_loss_)
if (remove_from_carryover_on_defeat_)
{
tm.set_lost();
}

6
src/play_controller.hpp
View File

@ -127,8 +127,8 @@ public:
void set_victory_when_enemies_defeated(bool e)
{ victory_when_enemies_defeated_ = e; }
void set_remove_from_carryover_on_leaders_loss(bool e)
{ remove_from_carryover_on_leaders_loss_ = e; }
void set_remove_from_carryover_on_defeat(bool e)
{ remove_from_carryover_on_defeat_= e; }
end_level_data& get_end_level_data() {
return end_level_data_;
}
@ -282,7 +282,7 @@ private:
std::vector<const_item_ptr> wml_commands_;
bool victory_when_enemies_defeated_;
bool remove_from_carryover_on_leaders_loss_;
bool remove_from_carryover_on_defeat_;
end_level_data end_level_data_;
std::vector<std::string> victory_music_;
std::vector<std::string> defeat_music_;

2
src/playsingle_controller.cpp
View File

@ -370,7 +370,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(
}
set_victory_when_enemies_defeated(level_["victory_when_enemies_defeated"].to_bool(true));
set_remove_from_carryover_on_leaders_loss(level_["remove_from_carryover_on_leaders_loss"].to_bool(true));
set_remove_from_carryover_on_defeat(level_["remove_from_carryover_on_defeat"].to_bool(true));
end_level_data &end_level = get_end_level_data();
end_level.carryover_percentage = level_["carryover_percentage"].to_int(game_config::gold_carryover_percentage);
end_level.carryover_add = level_["carryover_add"].to_bool();