[Commits] [wesnoth/wesnoth] 781276: Moves drawing of map borders to WML and improves t...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 781276709df0926428d96c78c4a897635fbe2602
      https://github.com/wesnoth/wesnoth/commit/781276709df0926428d96c78c4a897635fbe2602
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M changelog
    M data/core/images/terrain/off-map/alpha.png
    A data/core/images/terrain/off-map/border-corner_bottom_left_even.png
    A data/core/images/terrain/off-map/border-corner_bottom_left_odd.png
    A data/core/images/terrain/off-map/border-corner_bottom_right_even.png
    A data/core/images/terrain/off-map/border-corner_bottom_right_odd.png
    A data/core/images/terrain/off-map/border-corner_top_left.png
    A data/core/images/terrain/off-map/border-corner_top_left_even.png
    A data/core/images/terrain/off-map/border-corner_top_left_odd.png
    A data/core/images/terrain/off-map/border-corner_top_right_even.png
    A data/core/images/terrain/off-map/border-corner_top_right_odd.png
    A data/core/images/terrain/off-map/border-editor.png
    M data/core/images/terrain/off-map/border-n-ne-se-s.png
    M data/core/images/terrain/off-map/border-n-ne-se.png
    M data/core/images/terrain/off-map/border-n-ne.png
    M data/core/images/terrain/off-map/border-n.png
    M data/core/images/terrain/off-map/border-ne-se-s-sw-nw-n.png
    M data/core/images/terrain/off-map/border-ne-se-s-sw.png
    M data/core/images/terrain/off-map/border-ne-se-s.png
    M data/core/images/terrain/off-map/border-ne-se.png
    M data/core/images/terrain/off-map/border-ne.png
    M data/core/images/terrain/off-map/border-nw-n-ne-se.png
    M data/core/images/terrain/off-map/border-nw-n-ne.png
    M data/core/images/terrain/off-map/border-nw-n.png
    M data/core/images/terrain/off-map/border-nw.png
    M data/core/images/terrain/off-map/border-s-sw-nw-n.png
    M data/core/images/terrain/off-map/border-s-sw-nw.png
    M data/core/images/terrain/off-map/border-s-sw.png
    M data/core/images/terrain/off-map/border-s.png
    M data/core/images/terrain/off-map/border-se-s-sw-nw.png
    M data/core/images/terrain/off-map/border-se-s-sw.png
    M data/core/images/terrain/off-map/border-se-s.png
    M data/core/images/terrain/off-map/border-se.png
    M data/core/images/terrain/off-map/border-sw-nw-n-ne.png
    M data/core/images/terrain/off-map/border-sw-nw-n.png
    M data/core/images/terrain/off-map/border-sw-nw.png
    M data/core/images/terrain/off-map/border-sw.png
    M data/core/images/terrain/off-map/border.png
    M data/core/terrain-graphics.cfg
    A data/core/terrain-graphics/borders.cfg
    M data/core/terrain.cfg
    M src/display.cpp
    M src/image_modifications.cpp

  Log Message:
  -----------
  Moves drawing of map borders to WML and improves the fake map border

This makes both the standard map border as well as the fake map border terrain be drawn using the same WML rules, which allows them to connect seamlessly with each other.

A dummy IPF ~NO_TOD_SHIFT() is added and used as an easy way to prevent the ToD color-shifting of the border images. This can and probably should be implemented differently in the future, but for now it's a very simple and effective workaround.

This does remove themability of the map border, but that feature is currently unused (even in UMC) and it can be re-implemented differently if the feature is needed. There is also other cleanup still needed regarding themes; the off-map background still remains themable, and the WML for specifying the border tiles still remains in the theme .cfg files.

The call to display::draw_border() which was used to draw the hard-coded map borders is now commented out but not yet removed.