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

fix to make capture events mutating like other events

Browse source
This commit is contained in:
Dave White 2005-09-18 23:32:23 +00:00
parent 30a1ec8875
commit 8f4d5a8031
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/actions.cpp
View file

@ -1106,11 +1106,11 @@ int village_owner(const gamemap::location& loc, const std::vector<team>& teams)
return -1;
}
void get_village(const gamemap::location& loc, std::vector<team>& teams,
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
size_t team_num, const unit_map& units)
{
if(team_num < teams.size() && teams[team_num].owns_village(loc)) {
return;
return false;
}
const bool has_leader = find_leader(units,int(team_num+1)) != units.end();
@ -1125,12 +1125,14 @@ void get_village(const gamemap::location& loc, std::vector<team>& teams,
}
if(team_num >= teams.size()) {
return;
return false;
}
if(has_leader) {
teams[team_num].get_village(loc);
return teams[team_num].get_village(loc);
}
return false;
}
unit_map::iterator find_leader(unit_map& units, int side)
@ -1902,19 +1904,21 @@ size_t move_unit(display* disp, const game_data& gamedata,
move_recorder->add_movement(steps.front(),steps.back());
}
bool event_mutated = false;
int orig_village_owner = -1;
if(map.is_village(steps.back())) {
orig_village_owner = village_owner(steps.back(),teams);
if (size_t(orig_village_owner) != team_num) {
if(size_t(orig_village_owner) != team_num) {
ui->second.set_movement(0);
get_village(steps.back(),teams,team_num,units);
event_mutated = get_village(steps.back(),teams,team_num,units);
}
}
bool event_mutated = false;
if (game_events::fire("moveto",steps.back()))
if(game_events::fire("moveto",steps.back())) {
event_mutated = true;
}
if(undo_stack != NULL) {
if(event_mutated || should_clear_stack) {

4
src/actions.hpp
View file

@ -109,8 +109,8 @@ void attack(display& gui, const gamemap& map,
int village_owner(const gamemap::location& loc, const std::vector<team>& teams);
//makes it so the village at the given location is owned by the given
//0-based team number
void get_village(const gamemap::location& loc, std::vector<team>& teams,
//0-based team number. Returns true if getting the village triggered a mutating event
bool get_village(const gamemap::location& loc, std::vector<team>& teams,
size_t team_num, const unit_map& units);
//given the 1-based side, will find the leader of that side,

4
src/team.cpp
View file

@ -316,10 +316,10 @@ void team::write(config& cfg) const
cfg["shroud_data"] = shroud_.write();
}
void team::get_village(const gamemap::location& loc)
bool team::get_village(const gamemap::location& loc)
{
villages_.insert(loc);
game_events::fire("capture",loc);
return game_events::fire("capture",loc);
}
void team::lose_village(const gamemap::location& loc)

2
src/team.hpp
View file

@ -107,7 +107,7 @@ public:
void write(config& cfg) const;
void get_village(const gamemap::location&);
bool get_village(const gamemap::location&);
void lose_village(const gamemap::location&);
void clear_villages();
const std::set<gamemap::location>& villages() const;