[Wesnoth-cvs-commits] wesnoth/data multiplayer.cfg

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/12/11 20:29:02

Modified files:
        data           : multiplayer.cfg 

Log message:
        Fix separators in multiplayer factions. Also add an id along the way so 
that we can later on send ids instead of translated names.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/multiplayer.cfg.diff?tr1=1.97&tr2=1.98&r1=text&r2=text

Patches:
Index: wesnoth/data/multiplayer.cfg
diff -u wesnoth/data/multiplayer.cfg:1.97 wesnoth/data/multiplayer.cfg:1.98
--- wesnoth/data/multiplayer.cfg:1.97   Sun Dec  5 19:27:10 2004
+++ wesnoth/data/multiplayer.cfg        Sat Dec 11 20:29:02 2004
@@ -20,12 +20,14 @@
 name= _ "Default"
 
 [multiplayer_side]
-       name= _ "&random-enemy.png,Random"
+       id=Random
+       name={MENU_IMG_TXT "random-enemy.png" _"Random"}
        random_faction=yes
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&human-lieutenant.png,Loyalists"
+       id=Loyalists
+       name={MENU_IMG_TXT "human-lieutenant.png" _"Loyalists"}
        type=Lieutenant
        leader=Lieutenant,Swordsman,Pikeman,Shock Trooper,Longbowman,White 
Mage,Red Mage
        recruit=Cavalryman,Horseman,Spearman,Fencer,Heavy 
Infantryman,Bowman,Mage,Naga
@@ -37,7 +39,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&elvish-captain.png,Rebels"
+       id=Rebels
+       name={MENU_IMG_TXT "elvish-captain.png" _"Rebels"}
        type=Elvish Captain
        leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish 
Druid,Elvish Sorceress,Red Mage
        recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish 
Scout,Wose,Merman
@@ -49,7 +52,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&orcish-warrior.png,Northerners"
+       id=Northeners
+       name={MENU_IMG_TXT "orcish-warrior.png" _"Northerners"}
        type=Orcish Warrior
        leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish 
Slayer
        recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish 
Assassin,Naga,Goblin Spearman
@@ -61,7 +65,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&undead-necromancer.png,Undead"
+       id=Undead
+       name={MENU_IMG_TXT "undead-necromancer.png" _"Undead"}
        type=Necromancer
        leader=Necromancer,Revenant,Deathblade,Bone Shooter
        recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark 
Adept,Ghoul
@@ -73,7 +78,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&dwarf-warrior.png,Knalgan Alliance"
+       id=Knalgan Alliance
+       name={MENU_IMG_TXT "dwarf-warrior.png" (_"Knalgan Alliance")}
        type=Dwarvish Steelclad
        leader=Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish 
Thunderguard,Rogue,Trapper,Bandit
        recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish 
Thunderer,Thief,Poacher,Footpad,Thug,Gryphon Rider
@@ -85,7 +91,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&drake-flare.png,Drakes"
+       id=Drakes
+       name={MENU_IMG_TXT "drake-flare.png" _"Drakes"}
        type=Drake Flare
        leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake 
Warrior,Saurian Soothsayer,Saurian Icecaster
        recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter,Saurian 
Skirmisher,Saurian Tribalist
@@ -102,12 +109,14 @@
 name= _ "Classic"
 
 [multiplayer_side]
-       name= _ "&random-enemy.png,Random"
+       id=Random
+       name={MENU_IMG_TXT "random-enemy.png" _"Random"}
        random_faction=yes
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&human-lieutenant.png,Humans"
+       id=Humans
+       name={MENU_IMG_TXT "human-lieutenant.png" _"Humans"}
        type=Lieutenant
        leader=Lieutenant,Swordsman,Pikeman,Shock Trooper,Longbowman,White 
Mage,Red Mage,Rogue
        recruit=Cavalryman,Horseman,Spearman,Fencer,Heavy 
Infantryman,Bowman,Mage,Thief
@@ -119,7 +128,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&elvish-captain.png,Elves"
+       id=Elves
+       name={MENU_IMG_TXT "elvish-captain.png" _"Elves"}
        type=Elvish Captain
        leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish 
Druid,Elvish Sorceress
        recruit=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Merman
@@ -131,7 +141,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&orcish-warrior.png,Orcs"
+       id=Orcs
+       name={MENU_IMG_TXT "orcish-warrior.png" _"Orcs"}
        type=Orcish Warrior
        leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish 
Slayer
        recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish 
Assassin,Naga,Goblin Spearman
@@ -143,7 +154,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&undead-necromancer.png,Undead"
+       id=Undead
+       name={MENU_IMG_TXT "undead-necromancer.png" _"Undead"}
        type=Necromancer
        leader=Necromancer,Revenant,Deathblade,Bone Shooter
        recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark 
Adept,Ghoul
@@ -155,7 +167,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&dwarf-warrior.png,Dwarves"
+       id=Dwarves
+       name={MENU_IMG_TXT "dwarf-warrior.png" _"Dwarves"}
        type=Dwarvish Steelclad
        leader=Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish Thunderguard
        recruit=Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish Thunderer,Dwarvish 
Guardsman
@@ -167,7 +180,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&drake-flare.png,Drakes"
+       id=Drakes
+       name={MENU_IMG_TXT "drake-flare.png" _"Drakes"}
        type=Drake Flare
        leader=Drake Flare,Fire Drake,Drake Slasher,Drake Gladiator,Drake 
Warrior
        recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter
@@ -179,7 +193,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&saurian-soothsayer.png,Saurian"
+       id=Saurian
+       name={MENU_IMG_TXT "saurian-soothsayer.png" _"Saurian"}
        type=Saurian Soothsayer
        leader=Saurian Soothsayer,Saurian Icecaster
        recruit=Saurian Skirmisher,Saurian Tribalist
@@ -196,12 +211,14 @@
 name= _ "Age of Heroes"
 
 [multiplayer_side]
-       name= _ "&random-enemy.png,Random"
+       id=Random
+       name={MENU_IMG_TXT "random-enemy.png" _"Random"}
        random_faction=yes
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&human-general.png,Loyalists"
+       id=Loyalists
+       name={MENU_IMG_TXT "human-general.png" _"Loyalists"}
        type=General
        leader=General,Royal Guard,Halbardier,Iron Mauler,Master Bowman,Mage of 
Light,Arch Mage,Silver Mage
        
recruit=Cavalryman,Dragoon,Horseman,Lancer,Knight,Spearman,Swordsman,Pikeman,Fencer,Duelist,Heavy
 Infantryman,Shock Trooper,Bowman,Longbowman,Mage,Red Mage,White Mage,Naga,Sea 
Hag,Ogre,Lieutenant
@@ -213,7 +230,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&elvish-marshal.png,Rebels"
+       id=Rebels
+       name={MENU_IMG_TXT "elvish-marshal.png" _"Rebels"}
        type=Elvish Marshal
        leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish 
Sharpshooter,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress
        recruit=Elvish Fighter,Elvish Hero,Elvish Captain,Elvish Archer,Elvish 
Marksman,Elvish Ranger,Mage,Red Mage,White Mage,Elvish Shaman,Elvish 
Druid,Elvish Scout,Elvish Rider,Wose,Elder Wose,Merman,Triton
@@ -225,7 +243,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&orcish-warlord.png,Northerners"
+       id=Northerners
+       name={MENU_IMG_TXT "orcish-warlord.png" _"Northerners"}
        type=Orcish Warlord
        leader=Orcish Warlord,Troll Warrior,Troll Rocklobber,Orcish 
Crossbowman,Orcish Slayer
        recruit=Orcish Grunt,Orcish Warrior,Troll Whelp,Troll,Wolf Rider,Goblin 
Knight,Goblin Pillager,Orcish Archer,Orcish Crossbowman,Orcish Assassin,Orcish 
Slayer,Naga,Sea Hag,Goblin Spearman,Goblin Impaler
@@ -237,7 +256,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&undead-lich.png,Undead"
+       id=Undead
+       name={MENU_IMG_TXT "undead-lich.png" _"Undead"}
        type=Lich
        leader=Lich,Revenant,Deathblade,Soul Shooter
        recruit=Skeleton,Revenant,Deathblade,Skeleton Archer,Bone 
Shooter,Walking Corpse,Soulless,Ghost,Wraith,Shadow,Vampire Bat,Blood 
Bat,Ghoul,Necrophage,Dark Adept,Necromancer
@@ -249,7 +269,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&dwarf-lord.png,Knalgan Alliance"
+       id=Knalgan Alliance
+       name={MENU_IMG_TXT "dwarf-lord.png" (_"Knalgan Alliance")}
        type=Dwarvish Lord
        leader=Dwarvish Lord,Dwarvish Sentinel,Dwarvish 
Dragonguard,Assassin,Trapper,Bandit
        recruit=Dwarvish Guardsman,Dwarvish Stalwart,Dwarvish Fighter,Dwarvish 
Steelclad,Dwarvish Ulfserker,Dwarvish Berserker,Dwarvish Thunderer,Dwarvish 
Thunderguard,Thief,Rogue,Poacher,Trapper,Footpad,Outlaw,Thug,Bandit,Gryphon 
Rider,Gryphon Master
@@ -261,7 +282,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&drake-flare.png,Drakes"
+       id=Drakes
+       name={MENU_IMG_TXT "drake-flare.png" _"Drakes"}
        type=Drake Flameheart
        leader=Drake Flameheart,Inferno Drake,Drake Slasher,Drake 
Gladiator,Drake Warrior,Saurian Soothsayer,Saurian Icecaster
        recruit=Drake Burner,Fire Drake,Drake Clasher,Drake Glider,Drake 
Fighter,Saurian Skirmisher,Saurian Tribalist,Drake Warrior,Drake Flare,Drake 
Gladiator,Sky Drake,Drake Slasher,Saurian Ambusher,Saurian Soothsayer,Saurian 
Icecaster
@@ -279,12 +301,14 @@
 name= _ "Great War"
 
 [multiplayer_side]
-       name= _ "&random-enemy.png,Random"
+       id=Random
+       name={MENU_IMG_TXT "random-enemy.png" _"Random"}
        random_faction=yes
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&white-mage.png,Alliance of Light"
+       id=Alliance of Light
+       name={MENU_IMG_TXT "white-mage.png" (_"Alliance of Light")}
        type=White Mage
        leader=White Mage,Red Mage,Elvish Captain,Elvish Hero,Elvish 
Ranger,Elvish Marksman,Elvish Druid,Elvish 
Sorceress,Lieutenant,Pikeman,Swordsman,Shock Trooper,Longbowman,Dwarvish 
Steelclad,Dwarvish Stalwart,Dwarvish Thunderguard
        recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish 
Scout,Merman,Cavalryman,Horseman,Spearman,Fencer,Heavy 
Infantryman,Bowman,Dwarvish Fighter,Dwarvish Guardsman,Dwarvish Ulfserker
@@ -296,7 +320,8 @@
 [/multiplayer_side]
 
 [multiplayer_side]
-       name= _ "&undead-necromancer.png,Alliance of Darkness"
+       id=Alliance of Darkness
+       name={MENU_IMG_TXT "undead-necromancer.png" (_"Alliance of Darkness")}
        type=Necromancer
        leader=Necromancer,Revenant,Bone Shooter,Deathblade,Orcish 
Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish 
Slayer,Rogue,Bandit,Trapper,Saurian Soothsayer,Saurian Icecaster
        recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark 
Adept,Ghoul,Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish 
Assassin,Saurian Skirmisher,Naga,Thug,Thief,Poacher,Footpad,Saurian Tribalist