[Commits] [wesnoth/wesnoth] e89f52: bug #23188: check the game events for NULL when ca...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: e89f52ca5c9443494250932634d21e72e49e913c
      https://github.com/wesnoth/wesnoth/commit/e89f52ca5c9443494250932634d21e72e49e913c
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M src/team.cpp

  Log Message:
  -----------
  bug #23188: check the game events for NULL when capturing villages

This is a minor change in that village capture events won't be
fired during team building, whereas in 1.12 it appears that they
would be.


  Commit: 48ea3d2f3bbcb36d36fe09a43b2ebba4b152a0b9
      https://github.com/wesnoth/wesnoth/commit/48ea3d2f3bbcb36d36fe09a43b2ebba4b152a0b9
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M src/actions/heal.cpp
    M src/ai/actions.cpp
    M src/ai/manager.cpp
    M src/game_end_exceptions.cpp
    M src/game_end_exceptions.hpp
    M src/game_events/action_wml.cpp
    M src/game_initialization/playcampaign.cpp
    M src/game_launcher.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey_handler_mp.cpp
    M src/menu_events.cpp
    M src/mouse_events.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/playturn.cpp
    M src/playturn.hpp
    M src/replay.cpp
    M src/replay.hpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp
    M src/savegame.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/side_actions.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


  Commit: 520210b47e9c1907e81361212a9f60dc8322dcab
      https://github.com/wesnoth/wesnoth/commit/520210b47e9c1907e81361212a9f60dc8322dcab
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M src/playsingle_controller.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/23fdebae11e2...520210b47e9c