[Commits] [wesnoth/wesnoth] f42ea8: fix [allow_undo] in menu event commands

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f42ea8097c15bf6fa5c7e81915dd0b83d1f8f2b7
      https://github.com/wesnoth/wesnoth/commit/f42ea8097c15bf6fa5c7e81915dd0b83d1f8f2b7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M src/actions/undo.cpp
    M src/actions/undo.hpp
    M src/actions/undo_action.hpp
    M src/synced_commands.cpp

  Log Message:
  -----------
  fix [allow_undo] in menu event commands

This was disabled in a previous commit


  Commit: 4df00e47c50b68fbeaac756028bb6a3d42cabfa1
      https://github.com/wesnoth/wesnoth/commit/4df00e47c50b68fbeaac756028bb6a3d42cabfa1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M src/actions/undo_action.hpp

  Log Message:
  -----------
  fixup


  Commit: aad4e7d600087fafe1c83ff830b95ef28737c265
      https://github.com/wesnoth/wesnoth/commit/aad4e7d600087fafe1c83ff830b95ef28737c265
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M src/game_initialization/mp_game_utils.cpp

  Log Message:
  -----------
  fixup 'disable most mp_configure settings when force_lock_settings=yes'

this was a merging error.


  Commit: 99d88e0910fa66c090d5cbabf30b26f5e9c07c1c
      https://github.com/wesnoth/wesnoth/commit/99d88e0910fa66c090d5cbabf30b26f5e9c07c1c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M src/actions/undo.cpp
    M src/playmp_controller.cpp
    M src/synced_context.cpp

  Log Message:
  -----------
  Fix an OOS

Previously it could happen that a client would wait for a remote user
imput while still having a non-empty undo stack. Becasue of this the
client would not send the move that issued the user input (because the
client thinks it is undoable) to the other clients which then never gave
the user input.

This resulted in a situation where the game could not proceed and had to
be aborted.

Fixed it by calling resources::undo_stack->clear() as soon as we know
that a remote user input is needed
(synced_context::set_is_simultaneously()). Also added some assertions to
guard against this situation.


  Commit: c2071fca132b5f2fa4a2801399ae190127ae3678
      https://github.com/wesnoth/wesnoth/commit/c2071fca132b5f2fa4a2801399ae190127ae3678
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  Fix another OOS

Previously it could happen that moves of the previous turn were not
sended yet to other players during 'side X turn' and similar events.
This caused OOS because "change_controller_wml" could be sended before
the the moves of the previous turn.

I also removed a virtual froma function that didn't need to be virtual.


Compare: https://github.com/wesnoth/wesnoth/compare/6b28e1ae8964...c2071fca132b