[wesnoth-commits] [wesnoth/wesnoth] 54c4c5: Fix [replace_map]map_file= when called in a presta...

[Steve Cotton]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 54c4c5c0457fc9791e6c00109d239330ae8b2c92
      https://github.com/wesnoth/wesnoth/commit/54c4c5c0457fc9791e6c00109d239330ae8b2c92
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-17 (Tue, 17 Dec 2019)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  Fix [replace_map]map_file= when called in a prestart event (#4647)

Fixes 8080271231adddb3a3e88297d5fc52d37e3de7d7's Eternal Night. The northern
parts of both 10 and 10a are the same, but 10a is extended southwards; this
caused some confusion thinking that the map-load hadn't changed anything.

The regexp code is removed, as gfgtdf comments in #4633: "I'm quite sure that I
wrote that code but I don't remember why, I was probably just extra cautious.
In particular with the existence of wesnoth.read_file nowdays there is little
point in these checks."

Removing the regexp code allowed merging with the codepath for handling
[scenario]map_file=, which will allow the main issue of #4633 (searching other
folders for maps) to automatically affect [replace_map] too.