[Commits] [wesnoth/wesnoth] e7b632: partly revert e454252f2

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: e7b632332fe291bc2304d62cf262d9c7dcd9165e
      https://github.com/wesnoth/wesnoth/commit/e7b632332fe291bc2304d62cf262d9c7dcd9165e
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  partly revert e454252f2

there are multiple reasons why i think this should be reverted:
1) this wasn't tested enough, especialy we don't even know, whether all mainline campaigns are compatible
(this can be easily fixed, but only if one know which campaigns are effected which requires testing)
2) after renaming remove_from_carryover_on_leaders_loss to remove_from_carryover_on_defeat it sounds wrong that this can result in removing units on victory.
3) this seemed to break many UMC addons.

Note that this only removes one check for defeat_condition before [endlevel].
Especialy if for example side 1 gets defeated by defeat_condition in turn 1 but the game still goes on due to multiple other non defeated sides, but then the game ends with [endlevel] result=victory in turn 2, the units will be removed from carryover (unless specified otherwise)
This was also the pre 1.11.13 behaviour.
Also note that we cannot remove the 'defeated' side in case of [endlevel]result=victory, becasue [endlevel] doesn't sepcify which sides have victory/defeat.


  Commit: 168f490153cf40ad3c5709787a964faa9d5ad859
      https://github.com/wesnoth/wesnoth/commit/168f490153cf40ad3c5709787a964faa9d5ad859
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  Merge pull request #258 from gfgtdf/check_victory_3

partly revert e454252f2


Compare: https://github.com/wesnoth/wesnoth/compare/9ce28102bffe...168f490153cf