[Commits] [wesnoth/wesnoth] 00e50f: partly revert e454252f2

GitHub noreply at github.com
Tue Oct 14 22:36:06 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 00e50f5620b311f983c2905e03d1ec8982082a40
      https://github.com/wesnoth/wesnoth/commit/00e50f5620b311f983c2905e03d1ec8982082a40
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-10-15 (Wed, 15 Oct 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.





More information about the Commits mailing list