[Commits] [wesnoth/wesnoth] 8be428: Honor special locations in terrain mask

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8be428e9463daab3730550c79794c8af87ce19b1
      https://github.com/wesnoth/wesnoth/commit/8be428e9463daab3730550c79794c8af87ce19b1
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M changelog
    M src/map/map.cpp

  Log Message:
  -----------
  Honor special locations in terrain mask

A [terrain_mask] is simply a map. It can be smaller than the map, and can be offset. As a map, it can give special locations which can be used to position units, and queried by WML. With this change the names are properly applied to the underlying map, offset relative to the [terrain_mask]. A name given in the [terrain_mask] replaces that name in the underlying map, regardless of the original location. A map file can define only one name per location. A name can have only one location; but a location can have any number of names. To define additional names for a location, stack [terrain_mask] maps giving each. Once placed on the map, a name cannot be removed.


  Commit: b9a97d893d40136e32ee3b508dddde9464ce9dc4
      https://github.com/wesnoth/wesnoth/commit/b9a97d893d40136e32ee3b508dddde9464ce9dc4
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M changelog
    M src/map/map.cpp

  Log Message:
  -----------
  Merge pull request #775 from GregoryLundberg/GL_terrain_mask_positions

Honor special locations in terrain mask


Compare: https://github.com/wesnoth/wesnoth/compare/dc89612dc4cd...b9a97d893d40