[Commits] [wesnoth/wesnoth] aabeae: replace fight_on_without_leader with defeat_condit...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: aabeae68f905fd2191bc4e21c3a1b6439de18a29
      https://github.com/wesnoth/wesnoth/commit/aabeae68f905fd2191bc4e21c3a1b6439de18a29
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/play_controller.cpp
    M src/scripting/lua.cpp
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  replace fight_on_without_leader with defeat_condition

[side] now has an attribute defeat_condition which can be "no_leader"(default), "no_units" or "never"
"no_leader" behaves liek it behaved before.
"no_units" behaves like fight_on_without_leader=yes behaved before
"never" is new and causes the side to never get defeated, this usually means the scenariodesigner has to end the scenario with [endlevel]

Conflicts:
	src/play_controller.cpp
	src/team.cpp


  Commit: 3d6c602b7eb51950d7941f88ddfbdfe0fa4e0a1f
      https://github.com/wesnoth/wesnoth/commit/3d6c602b7eb51950d7941f88ddfbdfe0fa4e0a1f
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/play_controller.cpp
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  add "always" defeat_condition

Conflicts:
	src/play_controller.cpp


  Commit: a365475b8c3425e4d6455917afed25ef38285519
      https://github.com/wesnoth/wesnoth/commit/a365475b8c3425e4d6455917afed25ef38285519
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-23 (Fri, 23 May 2014)

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

  Log Message:
  -----------
  rename remove_from_carryover_on_leaders_loss_

to remove_from_carryover_on_defeat_


  Commit: 386893d6dff7e6d0df2c04871532c6169ffddc9b
      https://github.com/wesnoth/wesnoth/commit/386893d6dff7e6d0df2c04871532c6169ffddc9b
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/team.cpp

  Log Message:
  -----------
  rename values of [side]defeat_condition=

most likely defeat_condition= will re renamed too defeat= too.


  Commit: 0111ffbcd042dcc20777968cdfc85eecae715fad
      https://github.com/wesnoth/wesnoth/commit/0111ffbcd042dcc20777968cdfc85eecae715fad
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/game_events/action_wml.cpp
    M src/game_events/pump.cpp
    M src/game_events/pump.hpp

  Log Message:
  -----------
  add "write_to" parameter to wml_message

"write_to" lets the wmldev specify to where the message should be
written. Defaults to the previous behaviour.

The intention is for example that one might want to give a summary  as a
chat message and a very detailed information in the stderr file.


  Commit: 9f2eb63b5235ebacf11bb2da25ed1bd1a2673a27
      https://github.com/wesnoth/wesnoth/commit/9f2eb63b5235ebacf11bb2da25ed1bd1a2673a27
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/game_events/action_wml.cpp
    M src/game_events/pump.cpp
    M src/game_events/pump.hpp

  Log Message:
  -----------
  replace write_to with to_chat in [wml_message]

as shadowm suggested, because we are never in the situation that we want
this information in the chat but not in the stderr.


  Commit: 5085495316be30a07b433959a490721b4c86c7ab
      https://github.com/wesnoth/wesnoth/commit/5085495316be30a07b433959a490721b4c86c7ab
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/minimap.hpp

  Log Message:
  -----------
  #include <map.hpp> -> #include "map.hpp"


  Commit: 2744fa130d6ebd05bda1c3dac40c50bdc232137e
      https://github.com/wesnoth/wesnoth/commit/2744fa130d6ebd05bda1c3dac40c50bdc232137e
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M src/hotkey/hotkey_item.cpp

  Log Message:
  -----------
  don't load null hotkeys

this prevents a possible segfault because otherwise add_hotkey calls hotkey::set_scope_active(new_scope) where new_scope is SCOPE_COUNT.


Compare: https://github.com/wesnoth/wesnoth/compare/31e140d1fa09...2744fa130d6e