[Commits] [wesnoth/wesnoth] 987f01: Revert recent map code changes related to map mask...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 987f0157c20b43ad8425befde76e0e61c88a43be
      https://github.com/wesnoth/wesnoth/commit/987f0157c20b43ad8425befde76e0e61c88a43be
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-08-16 (Sun, 16 Aug 2015)

  Changed paths:
    M data/test/scenarios/feeding.cfg
    M src/editor/map/editor_map.cpp
    M src/game_events/action_wml.cpp
    M src/generators/default_map_generator_job.cpp
    M src/map.cpp
    M src/map.hpp

  Log Message:
  -----------
  Revert recent map code changes related to map mask handling

They break some unit tests and we can't seem to decide whether the tests
are truly at fault (that is beyond the fact that they _should_ certainly
use [terrain] instead of [terrain_mask]) or whether the issue that the
author was trying to fix at the beginning was an issue in the first
place.

This reverts the following commits:

 * commit 6b78073b49bcebf00b919b89550b773119ce2f1c
 * commit 2f650419dad963f7adf562b06f6ad319cabceffb
 * commit a436c46f13564b84effd0481fc4d41c340bc9ec2
 * commit fcf8b72efd310a2f76a0bb665d55eb3081fc1d68
 * commit 079692d42457a7b9251bfe319a65d8341217d0b7
 * commit 730d83729687f7107bc68582686ccdf0720b7b42