[Commits] [wesnoth/wesnoth] ac6815: fix bug 21400: unit::absolute_image being used for...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ac6815cc42e5319165bafdd1f08bef3627019464
      https://github.com/wesnoth/wesnoth/commit/ac6815cc42e5319165bafdd1f08bef3627019464
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  fix bug 21400: unit::absolute_image being used for unit animations

absolute_image defaults to be the image_icon of a unit, it is
properly used in the sidebar or in relation to portraits of a unit
it only takes the value of "image" when there is no image_icon.

prior to this commit, absolute_image was being used a default
value for animation frames. for many units this is okay, and results
in the base frame being used, but in the cases highlighted by
doofus1 it's broken and results in a portrait being blitted onto
the game map, when image would be a better alternative. This commit
replaces the uses of this in the unit, with either the unit's image
or image_icon, but prioritizing image if both are available.


  Commit: e2dbbf83494bf23cf3960bd54d442d8db64642e8
      https://github.com/wesnoth/wesnoth/commit/e2dbbf83494bf23cf3960bd54d442d8db64642e8
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  Merge pull request #298 from cbeck88/fixbug_21400

fix bug 21400: unit::absolute_image being used for unit animations


Compare: https://github.com/wesnoth/wesnoth/compare/1a4cd8dd4bd3...e2dbbf83494b