[wesnoth-commits] [wesnoth/wesnoth] fef425: fix different carryover when loading startofscenar...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fef4254c84c3e7c8a63250809408971e0c795b1e
      https://github.com/wesnoth/wesnoth/commit/fef4254c84c3e7c8a63250809408971e0c795b1e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M src/carryover.cpp
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  fix different carryover when loading startofscenario-save

this removes a hack in connect_engine.cpp that set save_id to a value to make sure that other connect_engine.cpp code does not chnge it later to the plyers id, (it did so at some point iirc).

Instead we update carryover.cpp to make sure that a side with no save_id  (or id since save_id defaults to id) is not carried over to the next scenario,

fixes #3152


  Commit: 9bf7a4c8fb4cf4c0ace3e745c855a26fcdf04626
      https://github.com/wesnoth/wesnoth/commit/9bf7a4c8fb4cf4c0ace3e745c855a26fcdf04626
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M changelog.md
    M data/gui/window/wml_message.cfg

  Log Message:
  -----------
  GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits

[ci skip]

Fixes #2912


Compare: https://github.com/wesnoth/wesnoth/compare/fb54b0376d0f...9bf7a4c8fb4c
      **NOTE:** This service 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.