Author: boucman
Date: Sat Mar 31 16:07:21 2012
New Revision: 53715
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53715&view=rev
Log:
patch 3200 by jamit: save fog removers in savefiles
Modified:
trunk/src/play_controller.cpp
trunk/src/team.cpp
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=53715&r1=53714&r2=53715&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Sat Mar 31 16:07:21 2012
@@ -540,7 +540,7 @@
gui_->update_tod();
for(std::vector<team>::iterator t = teams_.begin(); t != teams_.end();
++t) {
- clear_shroud(t - teams_.begin() + 1, true);
+ clear_shroud(t - teams_.begin() + 1);
}
}
@@ -646,7 +646,7 @@
sound::play_sound(tod.sounds, sound::SOUND_SOURCES);
if (!recorder.is_skipping()){
- clear_shroud(team_index + 1, true);
+ clear_shroud(team_index + 1, !loading_game_);
gui_->invalidate_all();
}
Modified: trunk/src/team.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.cpp?rev=53715&r1=53714&r2=53715&view=diff
==============================================================================
--- trunk/src/team.cpp (original)
+++ trunk/src/team.cpp Sat Mar 31 16:07:21 2012
@@ -302,11 +302,20 @@
info_.read(cfg);
fog_.set_enabled(cfg["fog"].to_bool());
+ fog_.read(cfg["fog_data"]);
shroud_.set_enabled(cfg["shroud"].to_bool());
shroud_.read(cfg["shroud_data"]);
LOG_NG << "team::team(...): team_name: " << info_.team_name
<< ", shroud: " << uses_shroud() << ", fog: " << uses_fog() <<
".\n";
+
+ // Load the WML-cleared fog.
+ const config &fog_override = cfg.child("fog_override");
+ if ( fog_override ) {
+ const std::vector<map_location> fog_vector =
+ parse_location_range(fog_override["x"],
fog_override["y"], true);
+ fog_clearer_.insert(fog_vector.begin(), fog_vector.end());
+ }
// To ensure some minimum starting gold,
// gold is the maximum of 'gold' and what is given in the config file
@@ -348,6 +357,9 @@
}
cfg["shroud_data"] = shroud_.write();
+ cfg["fog_data"] = fog_.write();
+ if ( !fog_clearer_.empty() )
+ write_location_range(fog_clearer_,
cfg.add_child("fog_override"));
cfg["countdown_time"] = countdown_time_;
cfg["action_bonus_count"] = action_bonus_count_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
