[Commits] [wesnoth/wesnoth] 69e346: fix bug 21400: image_icon being selected as defaul...

[GitHub]

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

  Changed paths:
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_animation_component.cpp
    M src/unit_drawer.cpp

  Log Message:
  -----------
  fix bug 21400: image_icon being selected as default frame image

This commit makes unit "image" be prioritized over "image_icon"
when an animation frame isn't given an image.


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

  Changed paths:
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_animation_component.cpp
    M src/unit_drawer.cpp

  Log Message:
  -----------
  Merge pull request #301 from cbeck88/fixbug_21400_master

fix bug 21400: image_icon being selected as default frame image


Compare: https://github.com/wesnoth/wesnoth/compare/b2581bcb7c13...625ef07086cf