[Commits] [wesnoth/wesnoth] 6666dc: fixup safebool syntax in halo::handle

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6666dca651ee4fab8750edc961d478662fc74cd8
      https://github.com/wesnoth/wesnoth/commit/6666dca651ee4fab8750edc961d478662fc74cd8
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/halo.cpp
    M src/halo.hpp
    M src/unit_drawer.cpp

  Log Message:
  -----------
  fixup safebool syntax in halo::handle

There was a subtle flaw introduced by using safebool in halo_record,
but defining the handle as a pointer to this -- the pointer also
is castable to bool so it makes mistakes very easy. We replace the
safe bool stuff with a function "valid" of halo_record, and fixup
the places that were supposed to be using this test.

Also move the NO_HALO variable back to the header.

fixes up commit 82c6b98907d9709aef0d23a3846c1e75ac48e1d5


  Commit: 2b42441214e67628be61cf3af86b90342d2e6c5f
      https://github.com/wesnoth/wesnoth/commit/2b42441214e67628be61cf3af86b90342d2e6c5f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M src/playcampaign.cpp
    M src/saved_game.cpp
    M src/saved_game.hpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/06a3a859fae8...2b42441214e6