[Commits] [wesnoth/wesnoth] 4747c1: revert PR 98

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4747c19acfb9ee3ed91c6bddbf31f09970968313
      https://github.com/wesnoth/wesnoth/commit/4747c19acfb9ee3ed91c6bddbf31f09970968313
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M src/carryover.cpp
    M src/carryover.hpp
    M src/game_end_exceptions.cpp
    M src/game_end_exceptions.hpp
    M src/game_events/action_wml.cpp
    M src/playcampaign.cpp

  Log Message:
  -----------
  revert PR 98

This is a parallel commit to PR 243, on master instead of 1.12
branch.

The commit is significantly different because this feature got
swept up in a different refactor of playcampaign / carryover. I
didn't test the feature extensively on this branch, this might not
be necessary at all. I'm simply making the sister commit anyways
so that we have something concrete to discuss when deciding
whether to merge either or both of these pull requests.

I do think the feature is of questionable value and adds
complexity to an already confusing part of the engine, and should
therefore be considered for removal.


  Commit: 4b402a2e3c067ffe1ee70000c63722a11080123e
      https://github.com/wesnoth/wesnoth/commit/4b402a2e3c067ffe1ee70000c63722a11080123e
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M src/carryover.cpp
    M src/carryover.hpp
    M src/game_end_exceptions.cpp
    M src/game_end_exceptions.hpp
    M src/game_events/action_wml.cpp
    M src/playcampaign.cpp

  Log Message:
  -----------
  Merge pull request #244 from cbeck88/remove_carryover_wml_master

revert PR 98


Compare: https://github.com/wesnoth/wesnoth/compare/923b03a4bd49...4b402a2e3c06