[Commits] [wesnoth/wesnoth] 126358: add display_context pointer to resources

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 126358f50cdd0ce38df7014e8fdc9ca2e3270cc7
      https://github.com/wesnoth/wesnoth/commit/126358f50cdd0ce38df7014e8fdc9ca2e3270cc7
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M src/display.cpp
    M src/resources.cpp
    M src/resources.hpp

  Log Message:
  -----------
  add display_context pointer to resources

This should be removed soon, it is just a short term corrective
measure for an editor segfault introduced in prior commits. The
plan is to correct the segfaults, then refactor this away.


  Commit: da552fc10e3744d63567b3d3fd4cba61743cb2e1
      https://github.com/wesnoth/wesnoth/commit/da552fc10e3744d63567b3d3fd4cba61743cb2e1
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    A src/display_context.cpp
    M src/display_context.hpp
    M src/map_location.cpp
    M src/reports.cpp
    M src/tod_manager.cpp

  Log Message:
  -----------
  fixup segfaulting editor, favoring display_context over game_board

Currently, the editor does not generate game_board objects, and
leaves the pointer resources::gameboard null. This commit makes
map_location, reports, and tod_manager, three things used in
editor mode, use the display_context pointer instead of the
game_board pointer. We also move a function to display_context,
which finds a const unit * to a visible unit at a hex.


  Commit: 3b70c87f5be05ea507cad2f366f10a19d67eaebc
      https://github.com/wesnoth/wesnoth/commit/3b70c87f5be05ea507cad2f366f10a19d67eaebc
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/display.cpp
    A src/display_context.cpp
    M src/display_context.hpp
    M src/map_location.cpp
    M src/reports.cpp
    M src/resources.cpp
    M src/resources.hpp
    M src/tod_manager.cpp

  Log Message:
  -----------
  Merge branch 'fixup_segfaulting_editor'


Compare: https://github.com/wesnoth/wesnoth/compare/6558bdc785bb...3b70c87f5be0