From 2abebac958fec6329fa87f5169054f3ddfaf024b Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 15 May 2007 19:15:09 +0000 Subject: [PATCH] Syatematic use of _main.cfg and _final.cfg: campaigns are now packages, Warning: you will lose if (a) you are running under Windows, and (b) your compiler isn't GNU C or Borland C or something else with native dirent(3) support, and (c) our untested internal dirent(3) implementation is broken. --- .../_main.cfg} | 0 .../{Eastern_Invasion.cfg => Eastern_Invasion/_main.cfg} | 0 .../{Heir_To_The_Throne.cfg => Heir_To_The_Throne/_main.cfg} | 0 .../{Northern_Rebirth.cfg => Northern_Rebirth/_main.cfg} | 0 .../{Sceptre_of_Fire.cfg => Sceptre_of_Fire/_main.cfg} | 0 .../_main.cfg} | 0 .../_main.cfg} | 0 .../{The_South_Guard.cfg => The_South_Guard/_main.cfg} | 0 data/campaigns/{Two_Brothers.cfg => Two_Brothers/_main.cfg} | 0 .../_main.cfg} | 0 data/game.cfg | 2 +- data/{terrain-graphics.cfg => terrain-graphics/_final.cfg} | 4 ++-- 12 files changed, 3 insertions(+), 3 deletions(-) rename data/campaigns/{Descent_Into_Darkness.cfg => Descent_Into_Darkness/_main.cfg} (100%) rename data/campaigns/{Eastern_Invasion.cfg => Eastern_Invasion/_main.cfg} (100%) rename data/campaigns/{Heir_To_The_Throne.cfg => Heir_To_The_Throne/_main.cfg} (100%) rename data/campaigns/{Northern_Rebirth.cfg => Northern_Rebirth/_main.cfg} (100%) rename data/campaigns/{Sceptre_of_Fire.cfg => Sceptre_of_Fire/_main.cfg} (100%) rename data/campaigns/{Son_Of_The_Black_Eye.cfg => Son_Of_The_Black_Eye/_main.cfg} (100%) rename data/campaigns/{The_Rise_Of_Wesnoth.cfg => The_Rise_Of_Wesnoth/_main.cfg} (100%) rename data/campaigns/{The_South_Guard.cfg => The_South_Guard/_main.cfg} (100%) rename data/campaigns/{Two_Brothers.cfg => Two_Brothers/_main.cfg} (100%) rename data/campaigns/{Under_the_Burning_Suns.cfg => Under_the_Burning_Suns/_main.cfg} (100%) rename data/{terrain-graphics.cfg => terrain-graphics/_final.cfg} (99%) diff --git a/data/campaigns/Descent_Into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/_main.cfg similarity index 100% rename from data/campaigns/Descent_Into_Darkness.cfg rename to data/campaigns/Descent_Into_Darkness/_main.cfg diff --git a/data/campaigns/Eastern_Invasion.cfg b/data/campaigns/Eastern_Invasion/_main.cfg similarity index 100% rename from data/campaigns/Eastern_Invasion.cfg rename to data/campaigns/Eastern_Invasion/_main.cfg diff --git a/data/campaigns/Heir_To_The_Throne.cfg b/data/campaigns/Heir_To_The_Throne/_main.cfg similarity index 100% rename from data/campaigns/Heir_To_The_Throne.cfg rename to data/campaigns/Heir_To_The_Throne/_main.cfg diff --git a/data/campaigns/Northern_Rebirth.cfg b/data/campaigns/Northern_Rebirth/_main.cfg similarity index 100% rename from data/campaigns/Northern_Rebirth.cfg rename to data/campaigns/Northern_Rebirth/_main.cfg diff --git a/data/campaigns/Sceptre_of_Fire.cfg b/data/campaigns/Sceptre_of_Fire/_main.cfg similarity index 100% rename from data/campaigns/Sceptre_of_Fire.cfg rename to data/campaigns/Sceptre_of_Fire/_main.cfg diff --git a/data/campaigns/Son_Of_The_Black_Eye.cfg b/data/campaigns/Son_Of_The_Black_Eye/_main.cfg similarity index 100% rename from data/campaigns/Son_Of_The_Black_Eye.cfg rename to data/campaigns/Son_Of_The_Black_Eye/_main.cfg diff --git a/data/campaigns/The_Rise_Of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth.cfg rename to data/campaigns/The_Rise_Of_Wesnoth/_main.cfg diff --git a/data/campaigns/The_South_Guard.cfg b/data/campaigns/The_South_Guard/_main.cfg similarity index 100% rename from data/campaigns/The_South_Guard.cfg rename to data/campaigns/The_South_Guard/_main.cfg diff --git a/data/campaigns/Two_Brothers.cfg b/data/campaigns/Two_Brothers/_main.cfg similarity index 100% rename from data/campaigns/Two_Brothers.cfg rename to data/campaigns/Two_Brothers/_main.cfg diff --git a/data/campaigns/Under_the_Burning_Suns.cfg b/data/campaigns/Under_the_Burning_Suns/_main.cfg similarity index 100% rename from data/campaigns/Under_the_Burning_Suns.cfg rename to data/campaigns/Under_the_Burning_Suns/_main.cfg diff --git a/data/game.cfg b/data/game.cfg index 20b3029c05d..2c5516d0b4b 100644 --- a/data/game.cfg +++ b/data/game.cfg @@ -7,7 +7,7 @@ {fonts.cfg} {english.cfg} -{terrain-graphics.cfg} +{terrain-graphics/} {units.cfg} {campaigns/} diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics/_final.cfg similarity index 99% rename from data/terrain-graphics.cfg rename to data/terrain-graphics/_final.cfg index 9067fcd09a1..24931fed7fb 100644 --- a/data/terrain-graphics.cfg +++ b/data/terrain-graphics/_final.cfg @@ -1,3 +1,5 @@ +# This file needs to be processt *after* all others in this directory +# # The following flags are defined to have a meaning # # * base : the corresponding tile has already graphics for the terrain @@ -12,8 +14,6 @@ # the proper way to calculate the propabilities is described here # http://www.wesnoth.org/wiki/Terrain_Graphics_Probability -{terrain-graphics} - #----------------------------------------------------------------- # forest/pine<->Castle|Encampment special cases, also used by some other # terrain