[wesnoth-commits] [wesnoth/wesnoth] a5a1fe: Make map_file= search for a maps directory in the ...

Steve Cotton noreply at github.com
Thu Dec 26 18:01:31 UTC 2019 

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

  Changed paths:
    M changelog.md
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
    M data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg
    M data/campaigns/Dead_Water/scenarios/07_Bilheld.cfg
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/scenarios/13_Epilogue.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/04_Spring_of_Reprisal.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/05_Schism.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07a_A_Small_Favor.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07b_A_Small_Favor2.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07c_A_Small_Favor3.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/08_Alone_at_Last.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/09_Descent_into_Darkness.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Endless_Night.cfg
    M data/campaigns/Eastern_Invasion/scenarios/01_The_Outpost.cfg
    M data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
    M data/campaigns/Eastern_Invasion/scenarios/03_An_Unexpected_Appearance.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04b_The_Undead_Border_Patrol.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
    M data/campaigns/Eastern_Invasion/scenarios/06_Two_Paths.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07b_Undead_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/08_Training_the_Ogres.cfg
    M data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
    M data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
    M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg
    M data/campaigns/Eastern_Invasion/scenarios/14_Approaching_Weldyn.cfg
    M data/campaigns/Eastern_Invasion/scenarios/15_The_Council.cfg
    M data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
    M data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg
    M data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg
    M data/campaigns/Eastern_Invasion/scenarios/18_Epilogue.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
    M data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
    M data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
    M data/campaigns/Liberty/scenarios/06_The_Hunters.cfg
    M data/campaigns/Liberty/scenarios/07_Glory.cfg
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
    M data/campaigns/Northern_Rebirth/scenarios/02_02_Meeting_With_Dwarves.cfg
    M data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06b_Slave_of_the_Undead.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07b_Protecting_the_Master.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/03_Bandits.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/04_Becalmed.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/12_Walking_Trees.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/13_Together_Again.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/15_Mountain_Pass.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/16_The_Mage.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/19_Lava_and_Stone.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/07_The_Desert_of_Death.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/13_The_Dwarvish_Stand.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/17_The_Human_Attack.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/04_High_Pass.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Fear.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_Forbidden_Forest.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_The_Siege_of_Kal_Kartha.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_The_Court_of_Karrag.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_Epilogue.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/18_A_Spy_in_the_Woods.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Into_the_Depths.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
    M src/filesystem_common.cpp

  Log Message:
  -----------
  Make map_file= search for a maps directory in the [binary_path] (#4633)

For both [scenario]map_file= and [replace_map]map_file=, this allows both of
these to have the same effect:

* map_file=campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map
* map_file=01_The_Elves_Besieged.map

This allows a lot of copies of the campaign/add-on's name to be omitted. Thus
it's no longer necessary to change every scenario's .cfg file to rename an
add-on, or to move a campaign between UMC and mainline.

This makes [binary_path] a misnomer, as it now also handles a text-based type
of file, however that's going to be the correct path for campaigns or add-ons
that use the standard layout with images/, maps/, scenarios/, etc.

This commit has the change itself, in filesystem_common.cpp, and the updates
for most of the campaigns. DM, LoW, UtBS and WoV are omitted from this, as they
all use a macro to do the same effect:

 #define MEMOIRS_MAP NAME
-    map_file=campaigns/Delfadors_Memoirs/maps/{NAME}
+    map_file={NAME}
 #enddef


  Commit: 84ab0601173b2b359c3b075dfda73b7639660802
      https://github.com/wesnoth/wesnoth/commit/84ab0601173b2b359c3b075dfda73b7639660802
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2019-12-26 (Thu, 26 Dec 2019)

  Changed paths:
    M src/filesystem.cpp
    M src/tests/test_filesystem.cpp

  Log Message:
  -----------
  Log a warning if a file is found in more than one [binary_path]

The Boost-based C++ unit tests generate three messages about duplicates,
however as those tests don't run in strict mode this doesn't cause a
failure (and it's not the only warning-level message in those tests).

(cherry picked from commit 0bbbdff1906bba10069c5a8b0e261fb7a469fb88)


Compare: https://github.com/wesnoth/wesnoth/compare/74f6442879c4...84ab0601173b

More information about the Commits mailing list