[wesnoth-commits] [wesnoth/wesnoth] bc9953: partly revert cleanup to fix merging conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: bc9953f0f29410df816ec5f1dc3e2d2ab0be0c6e
      https://github.com/wesnoth/wesnoth/commit/bc9953f0f29410df816ec5f1dc3e2d2ab0be0c6e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M src/actions/attack.cpp

  Log Message:
  -----------
  partly revert cleanup to fix merging conflict


  Commit: b4196af8c06f3ab167d6b2d645975d85feea87fb
      https://github.com/wesnoth/wesnoth/commit/b4196af8c06f3ab167d6b2d645975d85feea87fb
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M src/actions/attack.cpp
    M src/actions/attack.hpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_attack.hpp
    M src/mouse_events.cpp

  Log Message:
  -----------
  refactor battle_context

this has multiple advantages:;
1) it fixes #3594, an assertion failue that happend when a unit with
only one attack attacked when that one attack was disabled.
2) It now creates each pair or battle_context_unit_stats only once for
each pauir of attacks, previsouly the coud would create multiple
temporary battle_context_unit_stats objects to for exampel check
"disabled"
3) It simplifies the code by removing special handling of some cases.


Compare: https://github.com/wesnoth/wesnoth/compare/663da0e0532b...b4196af8c06f
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.