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

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b745bd756e07a86babbdbaf2a4ccbe9f6d74dc1e
      https://github.com/wesnoth/wesnoth/commit/b745bd756e07a86babbdbaf2a4ccbe9f6d74dc1e
  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: 5253d2de56739cb29d5a72c57722ceb216cf48d1
      https://github.com/wesnoth/wesnoth/commit/5253d2de56739cb29d5a72c57722ceb216cf48d1
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M changelog

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


  Commit: fd6038a7460ecc254fa1f43b2b8532a6222671c7
      https://github.com/wesnoth/wesnoth/commit/fd6038a7460ecc254fa1f43b2b8532a6222671c7
  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 '1.12' of https://github.com/wesnoth/wesnoth into 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/c70ecc9b650c...fd6038a7460e