[Commits] [wesnoth/wesnoth] 5053fe: fix bug #21916, ready blocked at inappropriate tim...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5053fe1563dcd68d15bc473a000ca18ce728fea3
      https://github.com/wesnoth/wesnoth/commit/5053fe1563dcd68d15bc473a000ca18ce728fea3
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_connect_engine.hpp

  Log Message:
  -----------
  fix bug #21916, ready blocked at inappropriate times

the first problem was that the "wait" object and "connect" objects
didn't agree about when the joining player should be choosing their
faction. we follow the mp::wait object's convention, that it happens
exactly when "allow_changes = yes".

the second problem was that params.saved_game was checked by
mp::connect_engine at the wrong time. (specifically the side_engine)

it was checked at the time of making a new config for the side, so
that the config sent to the joining clients would have
allow_changes = no in a save game, but not in the constructor of the
side engine, which would have the default/input value regardless of
the saved game status. the result is that the host and clients are
out of sync about whether allow_changes is true for a given side.


  Commit: 6a3b12df4503e9a11f65c42226adc90133c9de16
      https://github.com/wesnoth/wesnoth/commit/6a3b12df4503e9a11f65c42226adc90133c9de16
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: 961a778d15e6e8597e649c51610778ec46a953fd
      https://github.com/wesnoth/wesnoth/commit/961a778d15e6e8597e649c51610778ec46a953fd
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg

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


Compare: https://github.com/wesnoth/wesnoth/compare/9ec2cdec3c89...961a778d15e6