[Commits] [wesnoth/wesnoth] ac0385: add a unit test for recall list manager object

GitHub noreply at github.com
Sun Dec 28 19:06:11 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ac0385d666e28b028cfeff28ea40bd91cc917263
      https://github.com/wesnoth/wesnoth/commit/ac0385d666e28b028cfeff28ea40bd91cc917263
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  Changed paths:
    M src/SConscript
    A src/tests/test_recall_list.cpp

  Log Message:
  -----------
  add a unit test for recall list manager object


  Commit: 8539cb77cd69a7ca5a6624b5d157c88b3a2acc70
      https://github.com/wesnoth/wesnoth/commit/8539cb77cd69a7ca5a6624b5d157c88b3a2acc70
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  Changed paths:
    M src/dialogs.cpp

  Log Message:
  -----------
  add some debugging output to recall dialog when dismissing units


  Commit: 924fb820588eb9e156aa3fb144c2c265111fe994
      https://github.com/wesnoth/wesnoth/commit/924fb820588eb9e156aa3fb144c2c265111fe994
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

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

  Log Message:
  -----------
  partially fix 23076 (don't hold std::vector<unit> in recall dialog)

After this commit 9e7dc5ba008298d823c13cff214f7477601b5efd which
introduced reference counted unit pointers, the recall dialog
began to fail assertions. The problem was that it was making
private copies of all units, and when units get deleted this list
got out of sync. I'm not totally sure exactly what mechanism was
making it work before, but this commit which shares the units list
between the different gui elements prevents the assertion failure.

Note that there is still a bug, in that the unit preview pane at
left still gets out of sync somehow...


  Commit: 696bbfe2bffc5850e080a8bb2efb6ec31e27d0c6
      https://github.com/wesnoth/wesnoth/commit/696bbfe2bffc5850e080a8bb2efb6ec31e27d0c6
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  Changed paths:
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/menu_events.cpp

  Log Message:
  -----------
  fully fix bug #23076

This commit keeps the various UI elements of the recall, unit list
dialogs in sync by passing a smart pointer to the underlying set
of units between them. This seems to fix all of the problems
mentioned in 23076, preventing assertion failures and mismatches
between the unit list and the preview pane.


  Commit: 4cd2f6b88bf99f80cc9d78663c130f4f6463e189
      https://github.com/wesnoth/wesnoth/commit/4cd2f6b88bf99f80cc9d78663c130f4f6463e189
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-12-28 (Sun, 28 Dec 2014)

  Changed paths:
    M src/SConscript
    M src/actions/attack.cpp
    M src/actions/attack.hpp
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/menu_events.cpp
    A src/tests/test_recall_list.cpp

  Log Message:
  -----------
  Merge branch 'test_recall_list'


Compare: https://github.com/wesnoth/wesnoth/compare/95c94bc19239...4cd2f6b88bf9


More information about the Commits mailing list