[Commits] [wesnoth/wesnoth] 13fca9: fixup play_controller initialization order

[GitHub]

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

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

  Log Message:
  -----------
  fixup play_controller initialization order


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

  Changed paths:
    A src/display_context.hpp
    M src/game_board.hpp

  Log Message:
  -----------
  define display_context interface, implement in game_board


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

  Changed paths:
    M src/editor/map/map_context.hpp

  Log Message:
  -----------
  editor map context implements display_context interface


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

  Changed paths:
    M src/display.cpp
    M src/display.hpp
    M src/editor/editor_controller.cpp
    M src/editor/editor_display.cpp
    M src/editor/editor_display.hpp
    M src/editor/map/context_manager.cpp
    M src/game_display.cpp

  Log Message:
  -----------
  display uses display_context internally, not 3 private pointers

Also refactor editor and game_display to use this.

To achieve this it turns out we also have to add a "dummy display
context" unique to the editor code, which it can use to initalize
editor display, because after refactor NULL doesn't cut it
anymore. This appears in src/editor/editor_display.?pp, might
want to branch into its own file later.


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

  Changed paths:
    M src/display.cpp
    M src/display.hpp
    A src/display_context.hpp
    M src/editor/editor_controller.cpp
    M src/editor/editor_display.cpp
    M src/editor/editor_display.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/map_context.hpp
    M src/game_board.hpp
    M src/game_display.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp

  Log Message:
  -----------
  Merge branch 'add_display_context'


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

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj

  Log Message:
  -----------
  update projectfiles to include display_context.hpp


Compare: https://github.com/wesnoth/wesnoth/compare/35b8730f8caf...522988c68928