0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply patch 3197 by jamit, add flags to handle refogging properly

Browse source
This commit is contained in:
Jérémy Rosen 2012-03-31 16:33:14 +00:00
parent 1c3b73182e
commit 794713802a
4 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -166,6 +166,7 @@ Version 1.11.0-svn:
* Negative drain amounts will not take a unit below 1 health
* Added [show_if] support to [objectives] [note]
* New tags: [lift_fog] and [reset_fog]
* New keys: reset_maps= and reset_view= added to [modify_side].
* Using more than 4 multiply effects no longer wraps to negative integers
* Added: support for ranges of sides in SSF
* The [filter_vision] tag of the SUF now uses a SSF

39
src/game_events.cpp
View file

@ -756,8 +756,11 @@ WML_HANDLER_FUNCTION(place_shroud, /*event_info*/,cfg)
}
/* Implements the lifting and resetting of fog via WML.
* Setting reset to true causes the current fog to be discarded, which causes
* all tiles to be fogged for the specified teams (normally only used when
* clear is false).
*/
static void toggle_fog(const bool clear, const vconfig& cfg)
static void toggle_fog(const bool clear, const vconfig& cfg, const bool reset=false)
{
// Filter the sides.
const vconfig &ssf = cfg.child("filter_side");
@ -777,6 +780,9 @@ static void toggle_fog(const bool clear, const vconfig& cfg)
t.add_fog_override(locs);
else
t.remove_fog_override(locs);
// Should this side reset fog?
if ( reset )
t.refog();
}
// Flag a screen update.
@ -792,6 +798,7 @@ WML_HANDLER_FUNCTION(lift_fog, /*event_info*/, cfg)
WML_HANDLER_FUNCTION(reset_fog, /*event_info*/,cfg)
{
toggle_fog(false, cfg);
toggle_fog(false, cfg, cfg["reset_view"].to_bool(false));
}
WML_HANDLER_FUNCTION(tunnel, /*event_info*/, cfg)
@ -980,6 +987,8 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
{
std::vector<team> &teams = *resources::teams;
bool invalidate_screen = false;
std::string team_name = cfg["team_name"];
std::string user_team_name = cfg["user_team_name"];
std::string controller = cfg["controller"];
@ -1031,10 +1040,17 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
config::attribute_value shroud = cfg["shroud"];
if (!shroud.empty()) {
teams[team_index].set_shroud(shroud.to_bool(true));
invalidate_screen = true;
}
// Reset shroud
if ( cfg["reset_maps"].to_bool(false) ) {
teams[team_index].reshroud();
invalidate_screen = true;
}
// Merge shroud data
if (!shroud_data.empty()) {
teams[team_index].merge_shroud_map_data(shroud_data);
invalidate_screen = true;
}
// Set whether team is hidden in status table
config::attribute_value hidden = cfg["hidden"];
@ -1045,6 +1061,12 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
config::attribute_value fog = cfg["fog"];
if (!fog.empty()) {
teams[team_index].set_fog(fog.to_bool(true));
invalidate_screen = true;
}
// Reset fog
if ( cfg["reset_view"].to_bool(false) ) {
teams[team_index].refog();
invalidate_screen = true;
}
// Set income per village
config::attribute_value village_gold = cfg["village_gold"];
@ -1063,16 +1085,14 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
config::attribute_value color = cfg["color"];
if(!color.empty()) {
teams[team_index].set_color(color);
resources::screen->recalculate_minimap();
resources::screen->invalidate_all();
invalidate_screen = true;
}
// Add shared view to current team
config::attribute_value share_view = cfg["share_view"];
if (!share_view.empty()){
teams[team_index].set_share_view(share_view.to_bool(true));
team::clear_caches();
resources::screen->recalculate_minimap();
resources::screen->invalidate_all();
invalidate_screen = true;
}
// Add shared maps to current team
// IMPORTANT: this MUST happen *after* share_view is changed
@ -1080,11 +1100,16 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
if (!share_maps.empty()){
teams[team_index].set_share_maps(share_maps.to_bool(true));
team::clear_caches();
resources::screen->recalculate_minimap();
resources::screen->invalidate_all();
invalidate_screen = true;
}
}
// Flag an update of the screen, if needed.
if ( invalidate_screen ) {
resources::screen->recalculate_minimap();
resources::screen->invalidate_all();
}
}
WML_HANDLER_FUNCTION(modify_turns, /*event_info*/, cfg)

5
src/team.cpp
View file

@ -268,11 +268,6 @@ void team::team_info::write(config& cfg) const
cfg.add_child("ai",ai::manager::to_config(side));
}
void team::merge_shroud_map_data(const std::string& shroud_data)
{
shroud_.merge(shroud_data);
}
team::team() :
savegame_config(),
gold_(0),

3
src/team.hpp
View file

@ -224,12 +224,13 @@ public:
bool clear_shroud(const map_location& loc) { return shroud_.clear(loc.x+1,loc.y+1); }
void place_shroud(const map_location& loc) { shroud_.place(loc.x+1,loc.y+1); }
bool clear_fog(const map_location& loc) { return fog_.clear(loc.x+1,loc.y+1); }
void reshroud() { shroud_.reset(); }
void refog() { fog_.reset(); }
void set_shroud(bool shroud) { shroud_.set_enabled(shroud); }
void set_fog(bool fog) { fog_.set_enabled(fog); }
/** Merge a WML shroud map with the shroud data of this player. */
void merge_shroud_map_data(const std::string& shroud_data);
void merge_shroud_map_data(const std::string& shroud_data) { shroud_.merge(shroud_data); }
bool knows_about_team(size_t index, bool is_multiplayer) const;
bool copy_ally_shroud();