[Commits] [wesnoth/wesnoth] 6ec86c: fixup 0f5876fe38067c9783f41ab769e485dd8705e30e

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6ec86c98a24691ce6e08bec4cf59cbae346c4416
      https://github.com/wesnoth/wesnoth/commit/6ec86c98a24691ce6e08bec4cf59cbae346c4416
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  fixup 0f5876fe38067c9783f41ab769e485dd8705e30e

There was a small mistake here: The unit constructor
which takes a unit type first and 3 other parameters,
has the 4th one being an optional gender, and the
third a bool. fake_unit had a constructor mapping to
this, which sets the third to false. I over looked
this when factoring out fake_unit, but it only
generates a warning to cast enum to bool on MSVC
compilers.


  Commit: 0982d9dc580deb4b110011ef53f2d2de615325a3
      https://github.com/wesnoth/wesnoth/commit/0982d9dc580deb4b110011ef53f2d2de615325a3
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M src/gui/dialogs/game_cache_options.cpp
    M src/mp_game_settings.cpp
    M src/mp_game_settings.hpp
    M src/multiplayer.cpp
    M src/multiplayer_configure.cpp
    M src/multiplayer_configure.hpp
    M src/multiplayer_connect_engine.cpp
    M src/play_controller.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/e13775f31e55...0982d9dc580d