[Commits] [wesnoth/wesnoth] 3496ac: Fix bug #21759

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 3496ac8f6e99f4587c79ef19a0c8157d729305f3
      https://github.com/wesnoth/wesnoth/commit/3496ac8f6e99f4587c79ef19a0c8157d729305f3
  Author: Duthlet <peacefulwesnoth at gmail.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M src/playmp_controller.cpp

  Log Message:
  -----------
  Fix bug #21759

Removed duplicate code that caused timer to be refreshed an additional
time if time runs out. The usual refreshing in
playmp_controller::after_human_turn is already called in this case as
well (after turn ends). The duplicate code gave the bonuses before the
turn ended, and after that the turn was ended (giving turn bonus again)
only if there was no random seed incoming from the server.


  Commit: abd718f31e23bfd88200ac02d501cc2ff304b06d
      https://github.com/wesnoth/wesnoth/commit/abd718f31e23bfd88200ac02d501cc2ff304b06d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-30 (Sun, 30 Mar 2014)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M src/playmp_controller.cpp

  Log Message:
  -----------
  Merge branch 'fixbug21759the2nd' of https://github.com/Duthlet/wesnoth into 1.12

Conflicts:
	changelog


Compare: https://github.com/wesnoth/wesnoth/compare/1b02de8bb7ee...abd718f31e23