[Commits] [wesnoth/wesnoth] 064dcc: fixup carryover_on_defeat

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 064dcc3d4eaa65ff1dcb08e928651f7d5d72da10
      https://github.com/wesnoth/wesnoth/commit/064dcc3d4eaa65ff1dcb08e928651f7d5d72da10
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/game_end_exceptions.cpp
    M src/game_end_exceptions.hpp
    M src/play_controller.cpp
    M src/playcampaign.cpp
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  fixup carryover_on_defeat

we need to save the preceed_to_next_scenario value for linger saves. We
don't really need it for the next scenario in the carryover though.


  Commit: 3da7515e5596c851afced8f5386eb5bf61101236
      https://github.com/wesnoth/wesnoth/commit/3da7515e5596c851afced8f5386eb5bf61101236
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M changelog
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/7828466e1a40...3da7515e5596