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

refactor is_observer out of check_victory

Browse Source 
This is a minor change to victory_when_enemies_defeated condition.

Old logic: If there are no not defeated sides which are enemies
of eachother (i.e. there is still a battle going on),
BUT victory_when_enemies_defeated = false, and either we found
a not defeated local human player, or we are a multiplayer observer
(there are no locally controlled sides), then don't end the level.

New logic: If there are no not defeated sides which are enemies,
BUT victory when enemies defeated = false, and EITHER we found a
not defeated local human player, OR there is a not defeated remote
human player AND no local human side assigned at all,
then don't end the level.

I think this more precisely the behavior we want. is_observer
doesn't belong in this function, and with the introduction of
defeat_condition, UMC will pretty much always be able to get the
behavior they want, so I'm much more comfortable to introduce this
change now than I would be otherwise.
This commit is contained in:
Chris Beck 2014-05-20 01:10:31 -04:00
parent aa83190e07
commit 1bd43bb6a9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/play_controller.cpp
View File

@ -1400,6 +1400,7 @@ void play_controller::check_victory()
return;
}
std::set<unsigned> not_defeated;
for (unit_map::const_iterator i = units_.begin(),
i_end = units_.end(); i != i_end; ++i)
{
@ -1412,6 +1413,8 @@ void play_controller::check_victory()
not_defeated.insert(i->side());
}
}
bool there_is_a_local_human = false;
BOOST_FOREACH(team& tm, this->teams_)
{
if(tm.defeat_condition() == team::NEVER)
@ -1432,11 +1435,16 @@ void play_controller::check_victory()
tm.set_lost();
}
}
if (tm.is_human()) {
there_is_a_local_human = true;
}
}
check_end_level();
bool found_player = false;
bool found_network_player = false;
for (std::set<unsigned>::iterator n = not_defeated.begin(); n != not_defeated.end(); ++n) {
size_t side = *n - 1;
@ -1451,6 +1459,10 @@ void play_controller::check_victory()
if (teams_[side].is_human()) {
found_player = true;
}
if (teams_[side].is_network()) {
found_network_player = true;
}
}
if (found_player) {
@ -1460,9 +1472,10 @@ void play_controller::check_victory()
DBG_NG << "victory_when_enemies_defeated: " << victory_when_enemies_defeated_ << std::endl;
DBG_NG << "found_player: " << found_player << std::endl;
DBG_NG << "is_observer: " << is_observer() << std::endl;
DBG_NG << "found_network_player: " << found_network_player << std::endl;
DBG_NG << "there_is_a_local_human: " << there_is_a_local_human << std::endl;
if (!victory_when_enemies_defeated_ && (found_player || is_observer())) {
if (!victory_when_enemies_defeated_ && (found_player || (!there_is_a_local_human && found_network_player))) {
// This level has asked not to be ended by this condition.
return;
}