0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reapply patch #2642 as the random-leader crash has been fixed

Browse source
This commit is contained in:
Alexander van Gessel 2012-04-08 17:14:19 +01:00
parent 2316d75f6b
commit 315f067901
8 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -93,6 +93,7 @@ Version 1.11.0-svn:
(bug #10784)
* Changes to the time of day schedules of Fallenstar Lake and Silverhead
Crossing
* Random leader is default selection when picking faction
* Music and sound effects:
* Replaced some of the wolf hit sounds with lower-pitched ones
* Terrain:

2
data/multiplayer/factions/drakes-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Drakes"
image="units/drakes/flare.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Drake Flare
type=random
leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior,Saurian Oracle,Saurian Soothsayer
random_leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior
recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter,Saurian Skirmisher,Saurian Augur

2
data/multiplayer/factions/knalgans-default.cfg
View file

@ -4,7 +4,7 @@
name=_"Knalgan Alliance"
image="units/dwarves/steelclad.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Dwarvish Steelclad
type=random
leader=Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Trapper
recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish Thunderer,Thief,Poacher,Footpad,Gryphon Rider
terrain_liked=Hh, Ha, Mm

2
data/multiplayer/factions/loyalists-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Loyalists"
image="units/human-loyalists/lieutenant.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Lieutenant
type=random
leader=Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage
random_leader=Lieutenant,Swordsman,Pikeman,Javelineer,Longbowman,White Mage,Red Mage
recruit=Cavalryman,Horseman,Spearman,Fencer,Heavy Infantryman,Bowman,Mage,Merman Fighter

2
data/multiplayer/factions/northerners-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Northerners"
image="units/orcs/warrior.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Orcish Warrior
type=random
leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer
recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Naga Fighter,Goblin Spearman
terrain_liked=Hh, Ha, Mm, Ss

2
data/multiplayer/factions/rebels-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Rebels"
image="units/elves-wood/captain.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Elvish Captain
type=random
leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage,Elder Wose
random_leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage
recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish Scout,Wose,Merman Hunter

2
data/multiplayer/factions/undead-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Undead"
image="units/undead-necromancers/dark-sorcerer.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=Dark Sorcerer
type=random
leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage
random_leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter
recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark Adept,Ghoul

6
src/leader_list.cpp
View file

@ -91,6 +91,7 @@ void leader_list_manager::update_leader_list(int side_index)
}
const std::string default_leader = side["type"];
const std::string random_leader = "random";
size_t default_index = 0;
std::vector<std::string>::const_iterator itor;
@ -106,7 +107,10 @@ void leader_list_manager::update_leader_list(int side_index)
leaders_.push_back(default_leader);
}
leaders_.push_back("random");
if (default_leader != random_leader) {
leaders_.push_back(random_leader);
}
populate_leader_combo(default_index);
}