[Commits] [wesnoth/wesnoth] 88ca72: Skip the GUI2 FLG dialog in the automatic multipla...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 88ca728080de150dc659d5b8100e040def0f61bd
      https://github.com/wesnoth/wesnoth/commit/88ca728080de150dc659d5b8100e040def0f61bd
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M join.lua
    M src/gui/dialogs/dialog.cpp

  Log Message:
  -----------
  Skip the GUI2 FLG dialog in the automatic multiplayer test


  Commit: 446de553bd3c4fb54c57fcb1b1f614fac4b68f84
      https://github.com/wesnoth/wesnoth/commit/446de553bd3c4fb54c57fcb1b1f614fac4b68f84
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M src/playturn_network_adapter.cpp

  Log Message:
  -----------
  Fix UB in the playturn_network_adapter class

Comparing iterators from distinct containers is undefined behavior.


  Commit: 6016bdf2f249e8a65769fbe44e0d63c29110c6d7
      https://github.com/wesnoth/wesnoth/commit/6016bdf2f249e8a65769fbe44e0d63c29110c6d7
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M join.lua

  Log Message:
  -----------
  Fix two bugs causing multiplayer tests to fail

After finding a game, in some circumstances the join script got the
leader select dialog after only yielding once. Because the loop that
checks when the dialog appears was a repeat-until loop and not a while
loop, it was always run at least once, making the script yield even when
the dialog was already shown. That caused the dialog to close with a
"not shown" status that resulted in exiting the game.

MP tests run two games, not one. A MP wait screen is shown between the
games to the joining player (but not to the host, see
src/game_initialization/playcampaign.cpp:352 ). The join script ended up
quitting between the games. Fixed by simply duplicating code to make the
join script play two games.


Compare: https://github.com/wesnoth/wesnoth/compare/2f905128564f...6016bdf2f249