[Wesnoth-cvs-commits] wesnoth/data utils.cfg campaigns/Eastern_Invasi...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/12/11 17:04:55

Modified files:
        data           : utils.cfg 
        data/campaigns : Eastern_Invasion.cfg Heir_To_The_Throne.cfg 
                         Son_Of_The_Black_Eye.cfg The_Dark_Hordes.cfg 
                         The_Rise_of_Wesnoth.cfg 

Log message:
        added improved version of silene's macros to hide column separators 
from campaign writers, use them in all campaigns, and switch from , to = as 
separator to match C++ code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Eastern_Invasion.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Heir_To_The_Throne.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/The_Dark_Hordes.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: wesnoth/data/campaigns/Eastern_Invasion.cfg
diff -u wesnoth/data/campaigns/Eastern_Invasion.cfg:1.8 
wesnoth/data/campaigns/Eastern_Invasion.cfg:1.9
--- wesnoth/data/campaigns/Eastern_Invasion.cfg:1.8     Thu Nov 25 06:37:41 2004
+++ wesnoth/data/campaigns/Eastern_Invasion.cfg Sat Dec 11 17:04:55 2004
@@ -7,9 +7,9 @@
        define=CAMPAIGN_EASTERN_INVASION
        first_scenario=The_Outpost
        difficulties=EASY,NORMAL,HARD
-       difficulty_descriptions="&human-spearman.png," + _"Spearman" + "," + 
_"(easiest)" +
-               ";*&human-swordman.png," + _"Swordsman" +
-               ";&human-royalguard.png," + _"Royal Guard" + "," + _"(hardest)"
+       difficulty_descriptions={MENU_IMG_TXT2 human-spearman.png _"Spearman" 
_"(easiest)"} +
+               ";*" + {MENU_IMG_TXT human-swordman.png _"Swordsman"} +
+               ";" + {MENU_IMG_TXT2 human-royalguard.png (_"Royal Guard") 
_"(hardest)"}
        description= _ "Lead the loyal armies of Wesnoth in battle against the 
undead hordes from the East."
        image=portraits/Eastern_Invasion/dacyn.png
 [/campaign]
Index: wesnoth/data/campaigns/Heir_To_The_Throne.cfg
diff -u wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.6 
wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.7
--- wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.6   Thu Nov 25 06:37:41 2004
+++ wesnoth/data/campaigns/Heir_To_The_Throne.cfg       Sat Dec 11 17:04:55 2004
@@ -7,9 +7,9 @@
        define=CAMPAIGN_HEIR_TO_THE_THRONE
        first_scenario=The_Elves_Besieged
        difficulties=EASY,NORMAL,HARD
-       difficulty_descriptions="&elvish-fighter.png," + _"Fighter" + "," + 
_"(easiest)" +
-               ";*&elvish-hero.png," + _"Hero" +
-               ";&elvish-champion.png," + _"Champion" + "," + _"(hardest)"
+       difficulty_descriptions={MENU_IMG_TXT2 elvish-fighter.png _"Fighter" 
_"(easiest)"} +
+        ";*" + {MENU_IMG_TXT elvish-hero.png _"Hero"} + ";" +
+        {MENU_IMG_TXT2 elvish-champion.png _"Champion" _"(hardest)"}
        description= _ "Fight to gain back the throne of Wesnoth, of which you 
are the legitimate heir."
        image=portraits/Heir_To_The_Throne/konrad.png
 [/campaign]
Index: wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg
diff -u wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.6 
wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.7
--- wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.6 Thu Nov 25 06:37:41 2004
+++ wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg     Sat Dec 11 17:04:55 2004
@@ -6,9 +6,9 @@
        define=CAMPAIGN_SON_OF_THE_BLACK_EYE
        first_scenario=End_Of_Peace
        difficulties=EASY,NORMAL,HARD
-       difficulty_descriptions="&orcish-grunt.png," + _"Grunt" + "," + 
_"(easiest)" +
-               ";*&orcish-warrior.png," + _"Warrior" +
-               ";&orcish-warlord.png," + _"Warlord" + "," + _"(hardest)"
+       difficulty_descriptions={MENU_IMG_TXT2 orcish-grunt.png _"Grunt" 
_"(easiest)"} +
+               ";*" + {MENU_IMG_TXT orcish-warrior.png _"Warrior"} +
+               ";" + {MENU_IMG_TXT2 orcish-warlord.png _"Warlord" _"(hardest)"}
        icon=orcish-ruler.png
        image=items/orcish-flag.png
 [/campaign]
Index: wesnoth/data/campaigns/The_Dark_Hordes.cfg
diff -u wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.5 
wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.6
--- wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.5      Thu Nov 25 06:37:41 2004
+++ wesnoth/data/campaigns/The_Dark_Hordes.cfg  Sat Dec 11 17:04:55 2004
@@ -7,9 +7,9 @@
        define=CAMPAIGN_THE_DARK_HORDES
        first_scenario=A_New_Chance
        difficulties=EASY,NORMAL,HARD
-       difficulty_descriptions="&undead-initiate.png," + _"Apprentice" + "," + 
_"(easiest)" +
-               ";*&undead-necromancer.png," + _"Master" +
-               ";&undead-lich.png," + _"Dark Lord" + "," + _"(hardest)"
+       difficulty_descriptions={MENU_IMG_TXT2 undead-initiate.png 
_"Apprentice" _"(easiest)"} +
+               ";*" + {MENU_IMG_TXT undead-necromancer.png _"Master"} +
+               ";" + {MENU_IMG_TXT2 undead-lich.png (_"Dark Lord") 
_"(hardest)"}
 [/campaign]
 
 #ifdef CAMPAIGN_THE_DARK_HORDES
Index: wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg
diff -u wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.9 
wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.10
--- wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.9  Sun Dec  5 23:07:41 2004
+++ wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg      Sat Dec 11 17:04:55 2004
@@ -6,9 +6,9 @@
        define=CAMPAIGN_THE_RISE_OF_WESNOTH
        first_scenario=A_Summer_of_Storms
        difficulties=EASY,NORMAL,HARD
-       difficulty_descriptions="&noble-fighter.png," + _"Fighter" + "," + 
_"(easiest)" +
-               ";*&noble-commander.png," + _"Commander" +
-               ";&noble-lord.png," + _"Lord" + "," + _"(hardest)"
+       difficulty_descriptions={MENU_IMG_TXT2 noble-fighter.png _"Fighter" 
_"(easiest)"} +
+               ";*" + {MENU_IMG_TXT noble-commander.png _"Commander"} +
+               ";" + {MENU_IMG_TXT2 noble-lord.png _"Lord"  _"(hardest)"}
        icon=noble-lord.png
        description= _ "Lead Prince Haldric through the destruction of the 
Green Isle and across the Ocean to establish the very kingdom of Wesnoth 
itself. The confrontation with Lich-Lord Jevyan awaits..."
        image=campaigns/The_Rise_of_Wesnoth/story/the_duel.png
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.12 wesnoth/data/utils.cfg:1.13
--- wesnoth/data/utils.cfg:1.12 Tue Oct 19 18:55:51 2004
+++ wesnoth/data/utils.cfg      Sat Dec 11 17:04:54 2004
@@ -167,3 +167,8 @@
 [/event]
 #enddef
 
+#define MENU_IMG_TXT IMG TXT
+"&"+{IMG}+"="+{TXT}#enddef
+
+#define MENU_IMG_TXT2 IMG TXT1 TXT2
+"&"+{IMG}+"="+{TXT1}+"="+{TXT2}#enddef