[Commits] [wesnoth/wesnoth] 0f5876: change fake_unit class to fake_unit_ptr

GitHub noreply at github.com
Mon Jun 23 15:19:15 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 0f5876fe38067c9783f41ab769e485dd8705e30e
      https://github.com/wesnoth/wesnoth/commit/0f5876fe38067c9783f41ab769e485dd8705e30e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/move.cpp
    M src/actions/undo.cpp
    R src/fake_unit.cpp
    R src/fake_unit.hpp
    M src/fake_unit_manager.cpp
    M src/fake_unit_manager.hpp
    A src/fake_unit_ptr.cpp
    A src/fake_unit_ptr.hpp
    M src/game_display.cpp
    M src/game_events/action_wml.cpp
    M src/mouse_events.cpp
    M src/unit.cpp
    M src/unit_display.cpp
    M src/unit_display.hpp
    M src/whiteboard/attack.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/recall.cpp
    M src/whiteboard/recruit.cpp
    M src/whiteboard/typedefs.hpp

  Log Message:
  -----------
  change fake_unit class to fake_unit_ptr

This is consistent with the introduction of the UnitPtr class.
fake_units really aren't different from units, the only difference
is their life time / allocation and ownership. Since we are trying
to use reference counting for all units (to make them safe to use
with animations), the fake units need to be managed by a reference
counted pointer also. This is the easiest way to achieve that.

I also remove some odd code the [move_units_fake] handler --
there was explicit code to remove the fake units from the fake
unit manager, but this is redundant as it is the responsibility
of the destructor.

Code Blocks and VC project files are updated, but
Code::Blocks Scons and Xcode are not.


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

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/move.cpp
    M src/actions/undo.cpp
    R src/fake_unit.cpp
    R src/fake_unit.hpp
    M src/fake_unit_manager.cpp
    M src/fake_unit_manager.hpp
    A src/fake_unit_ptr.cpp
    A src/fake_unit_ptr.hpp
    M src/game_display.cpp
    M src/game_events/action_wml.cpp
    M src/mouse_events.cpp
    M src/unit.cpp
    M src/unit_display.cpp
    M src/unit_display.hpp
    M src/whiteboard/attack.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/recall.cpp
    M src/whiteboard/recruit.cpp
    M src/whiteboard/typedefs.hpp

  Log Message:
  -----------
  Merge branch 'fake_unit_ptr'


Compare: https://github.com/wesnoth/wesnoth/compare/54e0bd92c902...c1f3af2cbd33


More information about the Commits mailing list