[Commits] [wesnoth/wesnoth] 9c9f8f: split wesnoth.synchronize_choice function

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9c9f8f5a6e1245188007d47e4e5a4da4b56946ad
      https://github.com/wesnoth/wesnoth/commit/9c9f8f5a6e1245188007d47e4e5a4da4b56946ad
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/push_check.hpp

  Log Message:
  -----------
  split wesnoth.synchronize_choice function

previously there was one function which sometimes returned a wml table
and sometimes a map integer to wml tables dependent on its parameters.

Now there are 2 different functions: wesnoth.synchronize_choice and
wesnoth.synchronize_choices. the first one handles the case where you just
want to get a choice from one side and thus it returns just one wml
table. The second function handles the case where you want to get
choices from multiple sides. that function retruns a table of wml
tables.

I also added an optional string parameter to that function specifying
the type of that choice (this is useful to make replays more robust and
readable)


  Commit: cce53d5aa99075a3f62b1edbb6869c9f32c64de4
      https://github.com/wesnoth/wesnoth/commit/cce53d5aa99075a3f62b1edbb6869c9f32c64de4
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/scripting/lua_gui2.cpp

  Log Message:
  -----------
  fix a compiler warning


  Commit: 663db4f70fb2193647e4a247286e91bee5998b50
      https://github.com/wesnoth/wesnoth/commit/663db4f70fb2193647e4a247286e91bee5998b50
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/actions/attack.cpp
    M src/persist_var.cpp
    M src/replay.cpp
    M src/replay.hpp

  Log Message:
  -----------
  show notification when waiting for remote choices.

The game now shows a notification when waiting for a remove user choice
(like for example a unit advancement choice) for longer than 2 seconds.
This does not work during prestart events yet.


  Commit: 3c11aa63f89ccb4e02f2dcca2eb5a8b49a22ab44
      https://github.com/wesnoth/wesnoth/commit/3c11aa63f89ccb4e02f2dcca2eb5a8b49a22ab44
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/attack.cpp
    M src/game_events/action_wml.cpp
    M src/persist_var.cpp
    M src/replay.cpp
    M src/replay.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/synced_checkup.cpp
    M src/synced_commands.cpp
    A src/synced_user_choice.cpp
    A src/synced_user_choice.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  move get_user_choice function to a new file


  Commit: de3db534477ce989904b3b3627a7791a0b4c084f
      https://github.com/wesnoth/wesnoth/commit/de3db534477ce989904b3b3627a7791a0b4c084f
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/synced_context.cpp
    M src/synced_user_choice.cpp
    M src/synced_user_choice.hpp

  Log Message:
  -----------
  refactor get_user_choice

this prepares a patch to implement wait dialogs for user choices during
prestart events.


  Commit: 3ed4eed9fcf493110615c39b2ad3f8a7f464b3b8
      https://github.com/wesnoth/wesnoth/commit/3ed4eed9fcf493110615c39b2ad3f8a7f464b3b8
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    A data/gui/default/window/synced_choice_wait.cfg
    M src/CMakeLists.txt
    M src/SConscript
    A src/gui/dialogs/synced_choice_wait.cpp
    A src/gui/dialogs/synced_choice_wait.hpp
    M src/synced_user_choice.cpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  wait dialog for user choices during prestart events

gna.org/bugs/?23297

If we are waiting for a synced user choice during a prestart events we
now show a gui2 dialog that informs the player about why the client is
waiting and also offers the player the option to quit the game.


  Commit: 61fabacd36a489a90c454299fe6780426e6fef63
      https://github.com/wesnoth/wesnoth/commit/61fabacd36a489a90c454299fe6780426e6fef63
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  fix compiler warnings.


  Commit: c7c1b750fc385f706b336e8966f43e2b5c10efb3
      https://github.com/wesnoth/wesnoth/commit/c7c1b750fc385f706b336e8966f43e2b5c10efb3
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/synced_user_choice.cpp

  Log Message:
  -----------
  fix compiler wanring.


  Commit: fd2e513dc99bf2a358920217c834b9fbc4661044
      https://github.com/wesnoth/wesnoth/commit/fd2e513dc99bf2a358920217c834b9fbc4661044
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M src/synced_user_choice.cpp

  Log Message:
  -----------
  simplify user_choice_notifer_ingame


Compare: https://github.com/wesnoth/wesnoth/compare/4c034d770576...fd2e513dc99b