[Commits] [wesnoth/wesnoth] f9dadb: Restored resources::units in a limited context

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f9dadbb80aa5aaaa0cba44a5c865c16fa959ef4c
      https://github.com/wesnoth/wesnoth/commit/f9dadbb80aa5aaaa0cba44a5c865c16fa959ef4c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M src/editor/controller/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/play_controller.cpp
    M src/resources.cpp
    M src/resources.hpp

  Log Message:
  -----------
  Restored resources::units in a limited context

This is a partial revert of ed15163b95317. Most place still use resources::gameboard->units(), but
they should still point to the same place.

This was done since the editor doesn't have a game_board and needs a way to specify a global unit_map.


  Commit: 7364d728600ecd518053e09ac5495551042cb4a9
      https://github.com/wesnoth/wesnoth/commit/7364d728600ecd518053e09ac5495551042cb4a9
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M src/editor/map/context_manager.cpp

  Log Message:
  -----------
  Editor: properly set resources::filter_con


  Commit: 4bc0ac0041c3e7bf928d8057ac94fc508e6ef0e4
      https://github.com/wesnoth/wesnoth/commit/4bc0ac0041c3e7bf928d8057ac94fc508e6ef0e4
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M src/variable.cpp

  Log Message:
  -----------
  Variable: remove asserts on resources::gamedata absence

In the case of as_nonempty_range, the function was rewritten to remove absolute reliance on gamedata.
In the other case, we simply silently return now.


  Commit: eaea9be1177398b2fe1d06739c2eb43d1bd204e0
      https://github.com/wesnoth/wesnoth/commit/eaea9be1177398b2fe1d06739c2eb43d1bd204e0
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M src/units/abilities.cpp

  Log Message:
  -----------
  Unit: re-deployed resources::units for ability handling (bug #23834)

This ensures that units can be fetched even if a game board isn't present.
This also removed an unnecessary assert for the presence of resources::tod_manager (it wasn't used).


  Commit: 0d9806df59b17048b216fe5d7553afef47f96ce1
      https://github.com/wesnoth/wesnoth/commit/0d9806df59b17048b216fe5d7553afef47f96ce1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M src/gui/core/canvas.cpp

  Log Message:
  -----------
  GUI2/Canvas: fixed comment formatting causing a compiler warning


Compare: https://github.com/wesnoth/wesnoth/compare/fb3cae64dfed...0d9806df59b1