[Commits] [wesnoth/wesnoth] 811aee: fix OOS caused by [replace_map] map_file=...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 811aeeffad643f49a08eea1a16af2acdd23e4180
      https://github.com/wesnoth/wesnoth/commit/811aeeffad643f49a08eea1a16af2acdd23e4180
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  fix OOS caused by [replace_map] map_file=...


  Commit: 1aea4da8cf4d83efa83a9afd2f808b03f9e25f6c
      https://github.com/wesnoth/wesnoth/commit/1aea4da8cf4d83efa83a9afd2f808b03f9e25f6c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M src/game_events/action_wml.hpp
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_events/pump.cpp
    M src/game_events/pump.hpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/play_controller.cpp
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Attempt to fix broken [event] in [unit_type]

This reverts commit c5e31e83f171dee025b24cba662dd3c21faff684.
This reverts commit 8447ebbb88c480301624a33dd1789a533dd0150e.

[event] in [unit_type] was broken during a refactor of the gamestate
initilisation that also involved the commits above. The commits above
didn't directly cause this bug but reverting them makes fixing this bug
much easier.

We fix the bug by initilizing the game_events manager before creating the
units.


  Commit: 1d7efd019d9895d661e181416d044dbc657706c1
      https://github.com/wesnoth/wesnoth/commit/1d7efd019d9895d661e181416d044dbc657706c1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_events/menu_item.cpp
    M src/game_events/menu_item.hpp
    M src/game_events/wmi_container.cpp
    M src/game_events/wmi_container.hpp
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Revert "initialize wml menu item handlers when they are set, not in ctor"

This reverts commit eaa078a86db006887bd4d2d4b9f335560e916248.

This attempts to fix gna.org/bugs/?23545 but is reintroduces
https://gna.org/bugs/?23115 so the commit that casues that one will
also be reverted.


  Commit: 222de8124b0c51eba49c16d9db1598b043d54259
      https://github.com/wesnoth/wesnoth/commit/222de8124b0c51eba49c16d9db1598b043d54259
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_events/menu_item.cpp
    M src/game_events/menu_item.hpp
    M src/game_events/wmi_container.cpp
    M src/game_events/wmi_container.hpp

  Log Message:
  -----------
  Revert "fixup wml menu items: track the lifetime of the manager"

This reverts commit 6fc1ac1bb224cddec5ccbb7f7865b69b1b093a01.

This should fix https://gna.org/bugs/?23115, i reverted the original fix
because it introduced another bug.


  Commit: be80269e83696003348d889740761b1a5be5f8f3
      https://github.com/wesnoth/wesnoth/commit/be80269e83696003348d889740761b1a5be5f8f3
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M src/game_events/handlers.cpp
    M src/game_events/manager.cpp
    M src/game_events/manager.hpp
    M src/game_state.cpp

  Log Message:
  -----------
  fix possible assertion failure in gamestate initialisation


Compare: https://github.com/wesnoth/wesnoth/compare/b0a302b8d8ae...be80269e8369