[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/fonts.cfg data/game.cfg data/scena...
|
From: |
Philippe Plantier |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth data/fonts.cfg data/game.cfg data/scena... |
|
Date: |
Sun, 27 Mar 2005 18:06:19 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 05/03/27 23:06:17
Modified files:
data : fonts.cfg game.cfg scenario-test.cfg
schedules.cfg terrain-graphics.cfg terrain.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
data/scenarios/Eastern_Invasion: Approaching_Weldyn.cfg
Captured.cfg Crossing.cfg
Elven_Alliance.cfg
Escape_Tunnel.cfg
Evacuation.cfg Lake_Vrug.cfg
Mal-Ravanals_Capital.cfg
Northern_Outpost.cfg
Ogre_Training.cfg Reject.cfg
The_Drowned_Plains.cfg
The_Duel.cfg The_Outpost.cfg
Throne_Room.cfg
Tribal_Warfare.cfg
Two_Paths.cfg
Undead_Border_Patrol.cfg
Undead_Crossing.cfg
Unexpected_Appearance.cfg
Weldyn_Attack.cfg
data/scenarios/Heir_To_The_Throne: A_Choice_Must_Be_Made.cfg
Battle_for_Wesnoth.cfg
Bay_of_Pearls.cfg
Blackwater_Port.cfg
Crossroads.cfg
Dwarven_Doors.cfg
Elven_Council.cfg
Elves_Besieged.cfg
Epilogue.cfg Ford_of_Abez.cfg
Gryphon_Mountain.cfg
Hasty_Alliance.cfg
Home_Clan.cfg
Home_North_Elves.cfg
Isle_of_Anduin.cfg
Isle_of_the_Damned.cfg
Mountain_Pass.cfg
Muff_Malal_Peninsula.cfg
Northern_Winter.cfg
Plunging_Into_the_Darkness.cfg
Princess_of_Wesnoth.cfg
Return_to_Wesnoth.cfg
Sceptre.cfg Snow_Plains.cfg
Swamp_Of_Dread.cfg
The_Lost_General.cfg
The_Siege_of_Elensefar.cfg
Valley_of_Death.cfg
Valley_of_Statues.cfg
data/scenarios/Son_Of_The_Black_Eye: Black_Flag.cfg
Clash_Of_Armies.cfg
Desert_Of_Death.cfg
End_Of_Peace.cfg
Saving_Inarix.cfg
Shan_Taum_The_Smug.cfg
Silent_Forest.cfg
The_Siege_Of_Barag_Gor.cfg
To_The_Harbour_Of_Tirigaz.cfg
Towards_Mountains_of_Haag.cfg
data/scenarios/The_Dark_Hordes: A_New_Chance.cfg
Brother_Against_Brother.cfg
Confrontation.cfg
Crelanus_Book.cfg
Inside_The_Tower.cfg
Mages_And_Elves.cfg
The_Skull_of_Agarash.cfg
Underground_Pool.cfg
data/scenarios/The_Rise_of_Wesnoth: A_Beach.cfg
A_Final_Spring.cfg
A_Harrowing_Escape.cfg
A_New_Land.cfg
A_Spy_in_the_Woods.cfg
A_Summer_of_Storms.cfg
Clearwater_Port.cfg
Cursed_Isle.cfg
Elf_Lords.cfg Epilogue.cfg
Fallen_Lich_Point.cfg
Peoples_in_Decline.cfg
Return_of_the_Fleet.cfg
Return_to_Oldwood.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg Sewer.cfg
Southbay_in_Winter.cfg
Temple_of_the_Deep.cfg
The_Dragon.cfg The_Fall.cfg
The_Midlands.cfg
The_Oldwood.cfg The_Plan.cfg
The_River_Road.cfg
The_Vanguard.cfg
Troll_Hole.cfg
trow-intro.cfg
data/themes : default.cfg dfool.cfg editor.cfg
data/units : Ancient_Lich.cfg Ancient_Wose.cfg Arch_Mage.cfg
Assassin.cfg Bandit.cfg Battle_Princess.cfg
Blood_Bat.cfg Bone_Shooter.cfg Bowman.cfg
Cavalier.cfg Cavalryman.cfg Cave_Spider.cfg
Chocobone.cfg Cockatrice.cfg Commander.cfg
Cuttle_Fish.cfg Dark_Adept.cfg Dark_Queen.cfg
Dark_Sorcerer.cfg Dark_Spirit.cfg
Death_Knight.cfg Deathblade.cfg Deathmaster.cfg
Demilich.cfg Direwolf_Rider.cfg Dragoon.cfg
Drake_Burner.cfg Drake_Clasher.cfg
Drake_Fighter.cfg Drake_Fire.cfg
Drake_Flameheart.cfg Drake_Flare.cfg
Drake_Gladiator.cfg Drake_Glider.cfg
Drake_Inferno.cfg Drake_Sky.cfg
Drake_Slasher.cfg Drake_Warrior.cfg Draug.cfg
Duelist.cfg Dwarvish_Berserker.cfg
Dwarvish_Dragonguard.cfg Dwarvish_Fighter.cfg
Dwarvish_Guardsman.cfg Dwarvish_Lord.cfg
Dwarvish_Runemaster.cfg Dwarvish_Sentinel.cfg
Dwarvish_Stalwart.cfg Dwarvish_Steelclad.cfg
Dwarvish_Thunderer.cfg
Dwarvish_Thunderguard.cfg
Dwarvish_Ulfserker.cfg Elder_Mage.cfg
Elder_Wose.cfg Elvish_Archer.cfg
Elvish_Avenger.cfg Elvish_Captain.cfg
Elvish_Champion.cfg Elvish_Druid.cfg
Elvish_Enchantress.cfg Elvish_Fighter.cfg
Elvish_Hero.cfg Elvish_High_Lord.cfg
Elvish_Lady.cfg Elvish_Lord.cfg
Elvish_Marksman.cfg Elvish_Marshal.cfg
Elvish_Outrider.cfg Elvish_Ranger.cfg
Elvish_Rider.cfg Elvish_Scout.cfg
Elvish_Shaman.cfg Elvish_Sharpshooter.cfg
Elvish_Shyde.cfg Elvish_Sorceress.cfg
Elvish_Sylph.cfg Fencer.cfg Fighter.cfg
Fire_Dragon.cfg Fireball.cfg Footpad.cfg
Galleon.cfg Gate.cfg General.cfg Ghost.cfg
Ghoul.cfg Giant_Mudcrawler.cfg
Giant_Scorpion.cfg Goblin_Impaler.cfg
Goblin_Knight.cfg Goblin_Pillager.cfg
Goblin_Spearman.cfg Grand_Knight.cfg
Grand_Marshal.cfg Great_Mage.cfg
Great_Troll.cfg Gryphon.cfg Gryphon_Master.cfg
Gryphon_Rider.cfg Halbardier.cfg
Heavy_Infantryman.cfg Horse_Lord.cfg
Horseman.cfg Initiate.cfg Iron_Mauler.cfg
Javelineer.cfg Knight.cfg Lancer.cfg Lich.cfg
Lieutenant.cfg Longbowman.cfg Lord.cfg Mage.cfg
Mage_of_Light.cfg Master_Bowman.cfg
Mermaid_Diviner.cfg Mermaid_Enchantress.cfg
Mermaid_Initiate.cfg Mermaid_Priestess.cfg
Mermaid_Siren.cfg Merman.cfg
Merman_Entangler.cfg Merman_Fighter.cfg
Merman_Hoplite.cfg Merman_Javelineer.cfg
Merman_Netcaster.cfg Merman_Spearman.cfg
Merman_Triton.cfg Merman_Warrior.cfg
Mounted_Captain.cfg Mounted_Commander.cfg
Mounted_Fighter.cfg Mounted_Warrior.cfg
Mudcrawler.cfg Naga-Fighter.cfg
Naga-Myrmidon.cfg Naga-Warrior.cfg Naga.cfg
Necromancer.cfg Necrophage.cfg Nightgaunt.cfg
Noble_Commander.cfg Noble_Fighter.cfg
Noble_Lord.cfg Noble_Youth.cfg Ogre.cfg
Orcish_Archer.cfg Orcish_Assassin.cfg
Orcish_Crossbowman.cfg Orcish_Grunt.cfg
Orcish_Leader.cfg Orcish_Ruler.cfg
Orcish_Shaman.cfg Orcish_Slayer.cfg
Orcish_Sovereign.cfg Orcish_Warlord.cfg
Orcish_Warrior.cfg Outlaw.cfg
Outlaw_Princess.cfg Outlaw_Queen.cfg
Paladin.cfg Peasant.cfg Pikeman.cfg
Pirate_Galleon.cfg Poacher.cfg Princess.cfg
Red_Mage.cfg Revenant.cfg Rogue.cfg
Royal_Guard.cfg Saurian.cfg
Saurian_Ambusher.cfg Saurian_Flanker.cfg
Saurian_Icecaster.cfg Saurian_Skirmisher.cfg
Saurian_Soothsayer.cfg Saurian_Tribalist.cfg
Saurian_Warrior.cfg Sea_Hag.cfg Sea_Orc.cfg
Sea_Serpent.cfg Sergeant.cfg Shadow.cfg
Shock_Trooper.cfg Silver_Mage.cfg
Skeletal_Dragon.cfg Skeleton.cfg
Skeleton_Archer.cfg Sleeping_Gryphon.cfg
Soul_Shooter.cfg Soulless.cfg Spearman.cfg
Spectre.cfg Swordsman.cfg Tentacle.cfg
Thief.cfg Thug.cfg Transport_Galleon.cfg
Trapper.cfg Triton.cfg Troll.cfg Troll_Hero.cfg
Troll_Rocklobber.cfg Troll_Warrior.cfg
Troll_Whelp.cfg Vampire_Bat.cfg
Vampire_Lady.cfg Walking_Corpse.cfg
Wall_Guard.cfg Warrior_King.cfg Watch_Tower.cfg
White_Mage.cfg Wolf_Rider.cfg Wose.cfg
Wraith.cfg Yeti.cfg Young_Ogre.cfg Youth.cfg
doc/doxygen : doxygen.cpp
po/wesnoth : fr.po
src : Makefile.am actions.cpp ai.cpp ai_move.cpp
config.cpp config.hpp dialogs.cpp display.cpp
filesystem.cpp game.cpp game_events.cpp
game_events.hpp gamestatus.cpp gamestatus.hpp
gettext.cpp gettext.hpp help.cpp intro.cpp
language.cpp language.hpp map.hpp mapgen.cpp
multiplayer_connect.cpp multiplayer_create.cpp
multiplayer_ui.cpp network_worker.cpp
playlevel.cpp playturn.cpp preferences.cpp
publish_campaign.cpp race.cpp race.hpp
replay.cpp statistics.cpp team.cpp team.hpp
terrain.cpp terrain.hpp theme.cpp unit.cpp
unit_types.cpp unit_types.hpp variable.hpp
src/editor : editor.cpp
src/serialization: binary_wml.cpp parser.cpp preprocessor.cpp
string_utils.cpp string_utils.hpp
src/server : server.cpp
Added files:
src : tstring.cpp tstring.hpp variable.cpp
src/serialization: tokenizer.cpp tokenizer.hpp
Log message:
* Made serialized data be saved as untranslated. To achieve this, added
the
t_string class, which encapsulates a translatable string.
* Completely rewrote the (text) WML parser, making it use a tokenizer /
parser
architecture. The parser is now much more strict and validates a WML
grammar.
- Change to the WML syntax: pluses are now ignored, spaces are now
forbidden
in WML keys
* Rewrote the way the variables are interpolated. There is no more
default
interpolation, however, the vconfig class was added, which provides a
variable-interpolating proxy to config objects.
* There is still an important known bug: this is impossible to load
textmode
save games now, because the statistics module saves some WML with
spaces in
keys, which the parser refuses. I am commiting anyway to respect the
string
freeze; the fix for this bug will come tomorrow
Hoping I do not break everything...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/fonts.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/game.cfg.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenario-test.cfg.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/schedules.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Eastern_Invasion.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Heir_To_The_Throne.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/The_Dark_Hordes.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/default.cfg.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/dfool.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/themes/editor.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ancient_Lich.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ancient_Wose.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Arch_Mage.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Assassin.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Bandit.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Battle_Princess.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Blood_Bat.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Bone_Shooter.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Bowman.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cavalier.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cavalryman.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cave_Spider.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Chocobone.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cockatrice.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Commander.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cuttle_Fish.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Adept.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Queen.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Sorcerer.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Spirit.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Death_Knight.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Deathblade.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Deathmaster.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Demilich.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Direwolf_Rider.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dragoon.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Burner.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Clasher.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Fighter.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Fire.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Flameheart.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Flare.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Gladiator.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Glider.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Inferno.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Sky.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Slasher.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Warrior.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Draug.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Duelist.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Berserker.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Dragonguard.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Fighter.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Guardsman.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Lord.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Runemaster.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Sentinel.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Stalwart.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Steelclad.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Thunderer.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Thunderguard.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Ulfserker.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elder_Mage.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elder_Wose.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Archer.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Avenger.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Captain.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Champion.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Druid.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Enchantress.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Fighter.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Hero.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_High_Lord.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Lady.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Lord.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Marksman.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Marshal.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Outrider.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Ranger.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Rider.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Scout.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Shaman.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sharpshooter.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Shyde.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sorceress.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sylph.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fencer.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fighter.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fire_Dragon.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fireball.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Footpad.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Galleon.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gate.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/General.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ghost.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ghoul.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Giant_Mudcrawler.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Giant_Scorpion.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Impaler.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Knight.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Pillager.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Spearman.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Grand_Knight.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Grand_Marshal.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Great_Mage.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Great_Troll.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gryphon.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gryphon_Master.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gryphon_Rider.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Halbardier.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Heavy_Infantryman.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Horse_Lord.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Horseman.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Initiate.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Iron_Mauler.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Javelineer.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Knight.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lancer.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lich.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lieutenant.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Longbowman.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lord.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mage.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mage_of_Light.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Master_Bowman.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Diviner.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Enchantress.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Initiate.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Priestess.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Siren.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Entangler.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Fighter.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Hoplite.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Javelineer.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Netcaster.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Spearman.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Triton.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Warrior.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mounted_Captain.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mounted_Commander.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mounted_Fighter.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mounted_Warrior.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mudcrawler.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Fighter.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Myrmidon.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Warrior.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Necromancer.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Necrophage.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Nightgaunt.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Noble_Commander.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Noble_Fighter.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Noble_Lord.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Noble_Youth.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ogre.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Archer.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Assassin.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Crossbowman.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Grunt.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Leader.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Ruler.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Shaman.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Slayer.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Sovereign.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Warlord.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Warrior.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Outlaw.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Outlaw_Princess.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Outlaw_Queen.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Paladin.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Peasant.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Pikeman.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Pirate_Galleon.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Poacher.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Princess.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Red_Mage.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Revenant.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Rogue.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Royal_Guard.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Ambusher.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Flanker.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Icecaster.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Skirmisher.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Soothsayer.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Tribalist.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Warrior.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Hag.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Orc.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Serpent.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sergeant.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Shadow.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Shock_Trooper.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Silver_Mage.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Skeletal_Dragon.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Skeleton.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Skeleton_Archer.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sleeping_Gryphon.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Soul_Shooter.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Soulless.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Spearman.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Spectre.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Swordsman.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Tentacle.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Thief.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Thug.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Transport_Galleon.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Trapper.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Triton.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Hero.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Rocklobber.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Warrior.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Whelp.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Vampire_Bat.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Vampire_Lady.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Walking_Corpse.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Wall_Guard.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Warrior_King.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Watch_Tower.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/White_Mage.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Wolf_Rider.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Wose.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Wraith.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Yeti.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Young_Ogre.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Youth.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/doc/doxygen/doxygen.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fr.po.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tstring.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tstring.hpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.201&tr2=1.202&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_move.cpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.cpp.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.hpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.311&tr2=1.312&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.219&tr2=1.220&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.137&tr2=1.138&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.hpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.hpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.hpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.hpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.196&tr2=1.197&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.352&tr2=1.353&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/publish_campaign.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.cpp.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/statistics.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/team.cpp.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/team.hpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.cpp.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.hpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/theme.cpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/tokenizer.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/tokenizer.hpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/binary_wml.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/preprocessor.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
Patches:
Index: wesnoth/data/campaigns/Eastern_Invasion.cfg
diff -u wesnoth/data/campaigns/Eastern_Invasion.cfg:1.9
wesnoth/data/campaigns/Eastern_Invasion.cfg:1.10
--- wesnoth/data/campaigns/Eastern_Invasion.cfg:1.9 Sat Dec 11 17:04:55 2004
+++ wesnoth/data/campaigns/Eastern_Invasion.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[campaign]
id=eastern_invasion
rank=40
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
icon=human-general.png
name= _ "The Eastern Invasion"
define=CAMPAIGN_EASTERN_INVASION
Index: wesnoth/data/campaigns/Heir_To_The_Throne.cfg
diff -u wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.7
wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.8
--- wesnoth/data/campaigns/Heir_To_The_Throne.cfg:1.7 Sat Dec 11 17:04:55 2004
+++ wesnoth/data/campaigns/Heir_To_The_Throne.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[campaign]
id=heir_throne
rank=10
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
icon=konrad-commander.png
name= _ "Heir to the Throne"
define=CAMPAIGN_HEIR_TO_THE_THRONE
Index: wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg
diff -u wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.7
wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.8
--- wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg:1.7 Sat Dec 11 17:04:55 2004
+++ wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[campaign]
id=son_of_the_black_eye
rank=30
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Son of the Black Eye (chapter I)"
define=CAMPAIGN_SON_OF_THE_BLACK_EYE
first_scenario=End_Of_Peace
Index: wesnoth/data/campaigns/The_Dark_Hordes.cfg
diff -u wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.6
wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.7
--- wesnoth/data/campaigns/The_Dark_Hordes.cfg:1.6 Sat Dec 11 17:04:55 2004
+++ wesnoth/data/campaigns/The_Dark_Hordes.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[campaign]
id=dark_hordes
rank=20
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
icon=undead-initiate.png
name= _ "The Dark Hordes"
define=CAMPAIGN_THE_DARK_HORDES
Index: wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg
diff -u wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.10
wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.11
--- wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg:1.10 Sat Dec 11 17:04:55 2004
+++ wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[campaign]
id=The_Rise_of_Wesnoth
rank=50
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Rise of Wesnoth"
define=CAMPAIGN_THE_RISE_OF_WESNOTH
first_scenario=A_Summer_of_Storms
Index: wesnoth/data/fonts.cfg
diff -u wesnoth/data/fonts.cfg:1.2 wesnoth/data/fonts.cfg:1.3
--- wesnoth/data/fonts.cfg:1.2 Tue Mar 15 22:13:32 2005
+++ wesnoth/data/fonts.cfg Sun Mar 27 23:06:15 2005
@@ -1,24 +1,26 @@
[fonts]
# This is marked as translatable, to allow translators to provide
different font orders
- order=_ "Vera.ttf,Bepa-Roman.ttf,FreeSans.ttf,sazanami.ttf"
+ order=_ "Vera.ttf,Bepa-Roman.ttf,FreeSans.ttf,sazanami-gothic.ttf"
+ # order=_ "sazanami-gothic.ttf"
+
[font]
- name=Vera.ttf
-
codepoints=32-126,160-255,262-263,268-270,273,286-287,321-322,338-339,350-353,376,381-382,402,710-711
+ name="Vera.ttf"
+
codepoints="32-126,160-255,262-263,268-270,273,286-287,321-322,338-339,350-353,376,381-382,402,710-711"
[/font]
[font]
- name=Bepa-Roman.ttf
-
codepoints=32-126,160-255,260-265,268-273,280-287,292-293,304-305,308-311,313-328,332-353,356-357,364-369,376-382,402,1024-1119
+ name="Bepa-Roman.ttf"
+
codepoints="32-126,160-255,260-265,268-273,280-287,292-293,304-305,308-311,313-328,332-353,356-357,364-369,376-382,402,1024-1119"
[/font]
[font]
- name=FreeSans.ttf
-
codepoints=32-126,160-384,386-393,395-396,398-403,409,413-415,421,423-425,427,429-430,452-483,486-493,496-501,504-539,542-543,550-563,592-596,598-601,603-604,608-609,613-618,621,623-627,629,633-639,642-645,647-649,652-654,656,668,670,672,710-711,714-715,728-733,768-772,774-776,778-780,783,785-788,806-808,884-885,890,894,900-906,908,910-929,931-974,1024-1119,1164-1220,1223-1224,1227-1228,1232-1269,1272-1273,1329-1366,1370-1374,1377-1415,1417-1418,1456-1465,1467-1476,1488-1514,1792-1805,1808-1836,1840-1866,2305-2306,2309-2315,2317,2320-2321,2323-2355,2357-2361,2364-2371,2373,2375-2377,2379-2381,2384-2385,2406-2416,2433-2435,2437-2444,2447-2448,2451-2472,2474-2480,2482,2486-2489,2492,2494-2500,2503-2504,2507-2509,2519,2524-2525,2527-2531,2534-2554,2565-2570,2575-2576,2579-2600,2602-2608,2610-2611,2613-2614,2616-2617,2620,2622-2626,2631-2632,2635-2637,2649-2652,2654,2662-2672,2674-2676,2689-2690,2693-2699,2709-2728,2730-2736,2738-2739,2741-2745,2749-2755,2759-2760,2763-2764,2768,2790-2799,2818-2819,2821-2823,2825,2827,2831,2835,2837-2840,2842,2844-2845,2847-2849,2858-2859,2863-2864,2866-2867,2870-2873,2878-2883,2887,2912,2918-2927,2946-2947,2949-2954,2958-2960,2962-2965,2969-2970,2972,2974-2975,2979-2980,2984-2986,2990-2997,2999-3001,3006-3009,3014-3016,3018-3021,3031,3034-3037,3041,3203,3205-3210,3214-3216,3218-3226,3228,3230-3240,3248-3251,3302-3311,3458-3459,3461,3465-3467,3473,3476,3481-3484,3486,3488-3490,3492-3493,3495-3499,3501-3505,3507-3515,3517,3520-3526,3530,3535-3540,3542,3544-3545,3551,7936-7957,7960-7965,7968-8005,8008-8013,8016-8023,8025,8027,8029,8031-8061,8064-8116,8118-8132,8134-8147,8150-8155,8157-8175,8178-8180,8182-8190,8208,8211-8212,8216-8227,8230,8240-8247,8249-8253,8260,8263-8265,8267,8304-8305,8308-8313,8320-8329,8359-8360,8362,8364,8459-8460,8464-8466,8470,8475-8476,8482,8486-8488,8490-8493,8496-8499,8531-8575,8592-8597,8629,8656-8660,8704,8706-8707,8709-8713,8719-8723,8727,8730,8733-8734,8736,8743-8750,8756,8764,8766,8769-8771,8777,8800,8804-8805,8853-8855,8869,8960,9674,9834,12289-12291,12293,12295-12305,12308-12309,12353-12435,12441,12443,12449-12542,63033-63041,63166,63171,63196,64256-64262,64285-64310,64312-64316,64318,64320-64321,64323-64324,64326-64335,65533
+ name="FreeSans.ttf"
+
codepoints="32-126,160-384,386-393,395-396,398-403,409,413-415,421,423-425,427,429-430,452-483,486-493,496-501,504-539,542-543,550-563,592-596,598-601,603-604,608-609,613-618,621,623-627,629,633-639,642-645,647-649,652-654,656,668,670,672,710-711,714-715,728-733,768-772,774-776,778-780,783,785-788,806-808,884-885,890,894,900-906,908,910-929,931-974,1024-1119,1164-1220,1223-1224,1227-1228,1232-1269,1272-1273,1329-1366,1370-1374,1377-1415,1417-1418,1456-1465,1467-1476,1488-1514,1792-1805,1808-1836,1840-1866,2305-2306,2309-2315,2317,2320-2321,2323-2355,2357-2361,2364-2371,2373,2375-2377,2379-2381,2384-2385,2406-2416,2433-2435,2437-2444,2447-2448,2451-2472,2474-2480,2482,2486-2489,2492,2494-2500,2503-2504,2507-2509,2519,2524-2525,2527-2531,2534-2554,2565-2570,2575-2576,2579-2600,2602-2608,2610-2611,2613-2614,2616-2617,2620,2622-2626,2631-2632,2635-2637,2649-2652,2654,2662-2672,2674-2676,2689-2690,2693-2699,2709-2728,2730-2736,2738-2739,2741-2745,2749-2755,2759-2760,2763-2764,2768,2790-2799,2818-2819,2821-2823,2825,2827,2831,2835,2837-2840,2842,2844-2845,2847-2849,2858-2859,2863-2864,2866-2867,2870-2873,2878-2883,2887,2912,2918-2927,2946-2947,2949-2954,2958-2960,2962-2965,2969-2970,2972,2974-2975,2979-2980,2984-2986,2990-2997,2999-3001,3006-3009,3014-3016,3018-3021,3031,3034-3037,3041,3203,3205-3210,3214-3216,3218-3226,3228,3230-3240,3248-3251,3302-3311,3458-3459,3461,3465-3467,3473,3476,3481-3484,3486,3488-3490,3492-3493,3495-3499,3501-3505,3507-3515,3517,3520-3526,3530,3535-3540,3542,3544-3545,3551,7936-7957,7960-7965,7968-8005,8008-8013,8016-8023,8025,8027,8029,8031-8061,8064-8116,8118-8132,8134-8147,8150-8155,8157-8175,8178-8180,8182-8190,8208,8211-8212,8216-8227,8230,8240-8247,8249-8253,8260,8263-8265,8267,8304-8305,8308-8313,8320-8329,8359-8360,8362,8364,8459-8460,8464-8466,8470,8475-8476,8482,8486-8488,8490-8493,8496-8499,8531-8575,8592-8597,8629,8656-8660,8704,8706-8707,8709-8713,8719-8723,8727,8730,8733-8734,8736,8743-8750,8756,8764,8766,8769-8771,8777,8800,8804-8805,8853-8855,8869,8960,9674,9834,12289-12291,12293,12295-12305,12308-12309,12353-12435,12441,12443,12449-12542,63033-63041,63166,63171,63196,64256-64262,64285-64310,64312-64316,64318,64320-64321,64323-64324,64326-64335,65533"
[/font]
[font]
- name=sazanami-gothic.ttf
+ name="sazanami-gothic.ttf"
# Being large for codepoints: include characters
# page-per-page, and non on a per-character basis, or else the
# list would be huge.
-
codepoints=32-126,160-255,305,321-322,331,338-339,402,593,602,658,710-711,714-715,728,730,732,913-929,931-937,945-969,977,981,1025,1040-1103,1105,12288-12543,12800-40959,63744-64255,65280-65439,65537-65991
+
codepoints="32-126,160-255,305,321-322,331,338-339,402,593,602,658,710-711,714-715,728,730,732,913-929,931-937,945-969,977,981,1025,1040-1103,1105,12288-12543,12800-40959,63744-64255,65280-65439,65537-65991"
[/font]
[/fonts]
Index: wesnoth/data/game.cfg
diff -u wesnoth/data/game.cfg:1.148 wesnoth/data/game.cfg:1.149
--- wesnoth/data/game.cfg:1.148 Wed Mar 23 03:45:35 2005
+++ wesnoth/data/game.cfg Sun Mar 27 23:06:15 2005
@@ -524,10 +524,10 @@
[movetype]
name=smallfoot
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=3
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=3
grassland=1
sand=2
forest=2
@@ -539,12 +539,12 @@
tundra=3
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=80
+ deep_water=80
+ shallow_water=80
+ swamp_water=80
grassland=60
sand=70
forest=50
@@ -569,10 +569,10 @@
[movetype]
name=orcishfoot
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=3
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=3
grassland=1
sand=2
forest=2
@@ -584,12 +584,12 @@
tundra=3
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=70
+ deep_water=80
+ shallow_water=80
+ swamp_water=70
grassland=60
sand=70
forest=50
@@ -614,10 +614,10 @@
[movetype]
name=largefoot
- [movement costs]
- deep water=100
- shallow water=2
- swamp water=2
+ [movement_costs]
+ deep_water=100
+ shallow_water=2
+ swamp_water=2
grassland=1
sand=2
forest=2
@@ -629,12 +629,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=80
+ deep_water=80
+ shallow_water=80
+ swamp_water=80
grassland=70
sand=70
forest=60
@@ -658,10 +658,10 @@
[movetype]
name=armoredfoot
- [movement costs]
- deep water=100
- shallow water=4
- swamp water=4
+ [movement_costs]
+ deep_water=100
+ shallow_water=4
+ swamp_water=4
grassland=1
sand=2
forest=2
@@ -673,12 +673,12 @@
canyon=100
cavewall=100
tundra=4
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=90
- swamp water=90
+ deep_water=80
+ shallow_water=90
+ swamp_water=90
grassland=70
sand=80
forest=60
@@ -702,10 +702,10 @@
[movetype]
name=elusivefoot
- [movement costs]
- deep water=100
- shallow water=2
- swamp water=2
+ [movement_costs]
+ deep_water=100
+ shallow_water=2
+ swamp_water=2
grassland=1
sand=2
forest=2
@@ -717,12 +717,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=70
- shallow water=60
- swamp water=60
+ deep_water=70
+ shallow_water=60
+ swamp_water=60
grassland=40
sand=60
forest=30
@@ -747,10 +747,10 @@
[movetype]
name=mounted
- [movement costs]
- deep water=100
- shallow water=4
- swamp water=4
+ [movement_costs]
+ deep_water=100
+ shallow_water=4
+ swamp_water=4
grassland=1
sand=2
forest=3
@@ -762,12 +762,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=80
+ deep_water=80
+ shallow_water=80
+ swamp_water=80
grassland=60
sand=70
forest=70
@@ -791,10 +791,10 @@
[movetype]
name=woodland
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=2
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=2
grassland=1
sand=2
forest=1
@@ -806,12 +806,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=60
+ deep_water=80
+ shallow_water=80
+ swamp_water=60
grassland=60
sand=70
forest=30
@@ -836,10 +836,10 @@
[movetype]
name=woodlandfloat
flies=true
- [movement costs]
- deep water=2
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=2
+ shallow_water=1
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -851,12 +851,12 @@
cave=2
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=70
- shallow water=60
- swamp water=60
+ deep_water=70
+ shallow_water=60
+ swamp_water=60
grassland=50
sand=60
forest=30
@@ -880,10 +880,10 @@
[movetype]
name=treefolk
- [movement costs]
- deep water=100
- shallow water=2
- swamp water=2
+ [movement_costs]
+ deep_water=100
+ shallow_water=2
+ swamp_water=2
grassland=1
sand=2
forest=1
@@ -895,12 +895,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=90
- shallow water=80
- swamp water=70
+ deep_water=90
+ shallow_water=80
+ swamp_water=70
grassland=80
sand=80
forest=60
@@ -925,10 +925,10 @@
[movetype]
name=fly
flies=true
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -940,12 +940,12 @@
canyon=1
cavewall=100
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=50
- swamp water=50
+ deep_water=50
+ shallow_water=50
+ swamp_water=50
grassland=50
sand=50
forest=50
@@ -970,10 +970,10 @@
[movetype]
name=deepsea
- [movement costs]
- deep water=1
- shallow water=2
- swamp water=2
+ [movement_costs]
+ deep_water=1
+ shallow_water=2
+ swamp_water=2
grassland=4
sand=4
forest=5
@@ -985,12 +985,12 @@
tundra=2
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=40
- shallow water=50
- swamp water=40
+ deep_water=40
+ shallow_water=50
+ swamp_water=40
grassland=70
sand=70
forest=70
@@ -1014,10 +1014,10 @@
[movetype]
name=swimmer
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=1
grassland=2
sand=2
forest=5
@@ -1029,12 +1029,12 @@
tundra=2
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=40
- swamp water=40
+ deep_water=50
+ shallow_water=40
+ swamp_water=40
grassland=70
sand=70
forest=70
@@ -1058,10 +1058,10 @@
[movetype]
name=naga
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=1
grassland=2
sand=1
forest=3
@@ -1073,12 +1073,12 @@
tundra=2
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=40
- swamp water=40
+ deep_water=50
+ shallow_water=40
+ swamp_water=40
grassland=70
sand=60
forest=70
@@ -1103,10 +1103,10 @@
[movetype]
name=float
flies=true
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=2
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=2
grassland=200
sand=200
forest=200
@@ -1118,12 +1118,12 @@
cave=200
canyon=200
cavewall=200
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=50
- swamp water=60
+ deep_water=50
+ shallow_water=50
+ swamp_water=60
grassland=0
sand=0
forest=0
@@ -1147,10 +1147,10 @@
[movetype]
name=mountainfoot
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=3
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=3
grassland=1
sand=1
forest=1
@@ -1162,12 +1162,12 @@
cave=1
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=80
+ deep_water=80
+ shallow_water=80
+ swamp_water=80
grassland=70
sand=70
forest=70
@@ -1191,10 +1191,10 @@
[movetype]
name=dwarvishfoot
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=3
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=3
grassland=1
sand=1
forest=1
@@ -1206,12 +1206,12 @@
cave=1
canyon=100
cavewall=100
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=80
+ deep_water=80
+ shallow_water=80
+ swamp_water=80
grassland=70
sand=70
forest=70
@@ -1235,10 +1235,10 @@
[movetype]
name=undeadfoot
- [movement costs]
- deep water=4
- shallow water=3
- swamp water=2
+ [movement_costs]
+ deep_water=4
+ shallow_water=3
+ swamp_water=2
grassland=1
sand=2
forest=2
@@ -1250,12 +1250,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=90
- shallow water=80
- swamp water=70
+ deep_water=90
+ shallow_water=80
+ swamp_water=70
grassland=60
sand=70
forest=50
@@ -1281,10 +1281,10 @@
[movetype]
name=undeadfly
flies=true
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -1296,12 +1296,12 @@
canyon=1
cavewall=100
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=50
- swamp water=50
+ deep_water=50
+ shallow_water=50
+ swamp_water=50
grassland=50
sand=50
forest=50
@@ -1327,10 +1327,10 @@
[movetype]
name=undeadspirit
flies=true
- [movement costs]
- deep water=4
- shallow water=3
- swamp water=1
+ [movement_costs]
+ deep_water=4
+ shallow_water=3
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -1342,12 +1342,12 @@
canyon=1
cavewall=100
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=50
- swamp water=50
+ deep_water=50
+ shallow_water=50
+ swamp_water=50
grassland=50
sand=50
forest=50
@@ -1373,10 +1373,10 @@
[movetype]
name=spirit
flies=true
- [movement costs]
- deep water=4
- shallow water=3
- swamp water=1
+ [movement_costs]
+ deep_water=4
+ shallow_water=3
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -1388,12 +1388,12 @@
canyon=1
cavewall=100
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=50
- shallow water=50
- swamp water=50
+ deep_water=50
+ shallow_water=50
+ swamp_water=50
grassland=50
sand=50
forest=50
@@ -1419,10 +1419,10 @@
[movetype]
name=lizard
flies=false
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=1
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=1
grassland=1
sand=1
forest=2
@@ -1434,12 +1434,12 @@
canyon=100
cavewall=100
tundra=4
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=100
- shallow water=60
- swamp water=40
+ deep_water=100
+ shallow_water=60
+ swamp_water=40
grassland=60
sand=40
forest=40
@@ -1464,10 +1464,10 @@
[movetype]
name=none
flies=false
- [movement costs]
- deep water=200
- shallow water=200
- swamp water=200
+ [movement_costs]
+ deep_water=200
+ shallow_water=200
+ swamp_water=200
grassland=200
sand=200
forest=200
@@ -1479,12 +1479,12 @@
cave=200
canyon=200
cavewall=200
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=200
- shallow water=200
- swamp water=200
+ deep_water=200
+ shallow_water=200
+ swamp_water=200
grassland=50
sand=50
forest=50
@@ -1510,10 +1510,10 @@
[movetype]
name=scuttlefoot
flies=false
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=2
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=2
grassland=1
sand=2
forest=2
@@ -1525,12 +1525,12 @@
canyon=100
cavewall=100
tundra=2
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=70
- swamp water=60
+ deep_water=80
+ shallow_water=70
+ swamp_water=60
grassland=60
sand=60
forest=50
@@ -1558,10 +1558,10 @@
# Drakes are huge (easy targets) flying beast, but are different
# from the classical flying unit: to fight they have to land
# They love caves and mountains, and above all: warmth
- [movement costs]
- deep water=1
- shallow water=1
- swamp water=1
+ [movement_costs]
+ deep_water=1
+ shallow_water=1
+ swamp_water=1
grassland=1
sand=1
forest=1
@@ -1573,12 +1573,12 @@
canyon=1
cavewall=100
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=80
- shallow water=80
- swamp water=70
+ deep_water=80
+ shallow_water=80
+ swamp_water=70
grassland=70
sand=60
forest=60
@@ -1606,10 +1606,10 @@
# These Drakes have crippled wings - they don't fly
# But they have thicker hides
# Do a bit worse in Swamps as they can't hop to dry spots
- [movement costs]
- deep water=100
- shallow water=3
- swamp water=3
+ [movement_costs]
+ deep_water=100
+ shallow_water=3
+ swamp_water=3
grassland=1
sand=1
forest=2
@@ -1621,12 +1621,12 @@
canyon=100
cavewall=100
tundra=3
- [/movement costs]
+ [/movement_costs]
[defense]
- deep water=90
- shallow water=80
- swamp water=80
+ deep_water=90
+ shallow_water=80
+ swamp_water=80
grassland=70
sand=60
forest=60
Index: wesnoth/data/scenario-test.cfg
diff -u wesnoth/data/scenario-test.cfg:1.39 wesnoth/data/scenario-test.cfg:1.40
--- wesnoth/data/scenario-test.cfg:1.39 Tue Feb 8 20:35:54 2005
+++ wesnoth/data/scenario-test.cfg Sun Mar 27 23:06:15 2005
@@ -136,6 +136,17 @@
y=15,15,17
letter=C
[/terrain]
+
+ {VARIABLE_OP xx1 random 10..20}
+ {VARIABLE_OP yy1 random 10..17}
+
+ #{UNIT (Orcish Warlord) (Bozo) ( "Orcish bozo" ) 2 $xx1 $yy1}
+ {UNIT (Orcish Warlord) (Bozo) ( "Orcish bozo" ) 2 10 10}
+
+ [message]
+ speaker=Bozo
+ message="Mwahahahahah !"
+ [/message]
[/event]
[item]
Index: wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.13
wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.14
--- wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.13 Sun Mar
20 18:40:48 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Approaching_Weldyn
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Approaching Weldyn"
map_data="{maps/Eastern_Invasion/Approaching_Weldyn}"
turns=24
Index: wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.34
wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.35
--- wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.34 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Captured
-textdomain=wesnoth-ei
+#textdomain wesnoth-ei
name= _ "Captured"
map_data="{maps/Eastern_Invasion/Captured}"
Index: wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.15
wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.16
--- wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.15 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Crossing
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Crossing"
map_data="{maps/Eastern_Invasion/The_Crossing}"
turns=24
Index: wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.13
wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.14
--- wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.13 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Elven_Alliance
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "An Elven Alliance"
map_data="{maps/Eastern_Invasion/An_Elven_Alliance}"
turns=18
Index: wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.27
wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.28
--- wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.27 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Escape_Tunnel
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Escape Tunnel"
map_data="{maps/Eastern_Invasion/The_Escape_Tunnel}"
turns=24
Index: wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.28
wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.29
--- wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.28 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Evacuation
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Evacuation"
map_data="{maps/Eastern_Invasion/Evacuation}"
turns=12
Index: wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.18
wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.19
--- wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.18 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Lake
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Lake Vrug"
map_data="{maps/Eastern_Invasion/Lake_Vrug}"
turns=18
Index: wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.15
wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.16
--- wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.15
Sun Mar 20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Mal-Ravanals_Capital
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Mal-Ravanal's Capital"
map_data="{maps/Eastern_Invasion/Mal-Ravanals_Capital}"
turns=36
Index: wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.31
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.32
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.31 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Northern_Outpost
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Northern Outpost"
map_data="{maps/Eastern_Invasion/Northern_Outpost}"
turns=18
Index: wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.14
wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.14 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Ogre
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Training the Ogres"
map_data="{maps/Eastern_Invasion/Training_the_Ogres}"
Index: wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.13
wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.14
--- wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.13 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg Sun Mar 27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Reject
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Weldyn Besieged"
map_data="{maps/Eastern_Invasion/Weldyn_Besieged}"
turns=24
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.11
wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.12
--- wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.11 Mon Feb
28 23:56:56 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Drowned_Plains
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Drowned Plains"
map_data="{maps/Eastern_Invasion/Drowned_Plains}"
turns=24
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.15
wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.16
--- wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.15 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Duel
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Duel"
map_data="{maps/Eastern_Invasion/The_Arena}"
turns=-1
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.17
wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.18
--- wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.17 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Outpost
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Outpost"
map_data="{maps/Eastern_Invasion/The_Outpost}"
turns=16
Index: wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg:1.12
wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg:1.13
--- wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg:1.12 Mon Feb
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Throne
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Council"
map_data="{maps/Eastern_Invasion/Throne_Room}"
turns=1
Index: wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.19
wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.20
--- wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.19 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Tribe
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Xenophobia"
map_data="{maps/Eastern_Invasion/Tribal_Warfare}"
turns=36
Index: wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.20
wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.21
--- wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.20 Sun Mar 20
18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Two_Paths
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Two Paths"
map_data="{maps/Eastern_Invasion/Two_Paths}"
music=wesnoth-3.ogg
Index: wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.12
wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.13
--- wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.12
Sun Mar 20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Undead_Border_Patrol
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "The Undead Border Patrol"
map_data="{maps/Eastern_Invasion/The_Undead_Border_Patrol}"
turns=18
Index: wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.15
wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.16
--- wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.15 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Undead_Crossing
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Undead Crossing"
map_data="{maps/Eastern_Invasion/Undead_Crossing}"
turns=18
Index: wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.14
wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.14
Sun Mar 20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Unexpected_Appearance
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "An Unexpected Appearance"
map_data="{maps/Eastern_Invasion/An_Unexpected_Appearance}"
music=wesnoth-2.ogg
Index: wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.30
wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.31
--- wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.30 Sun Mar
20 18:40:49 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Weldyn_Attack
- textdomain=wesnoth-ei
+ #textdomain wesnoth-ei
name= _ "Weldyn under Attack"
map_data="{maps/Eastern_Invasion/Weldyn_under_Attack}"
turns=18
Index: wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.20
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.20
Thu Mar 24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Choice_Must_Be_Made
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "A Choice Must Be Made"
map_data="{maps/Heir_To_The_Throne/A_Choice_Must_Be_Made}"
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.12
wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.13
--- wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.12
Sun Mar 20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=battle_for_wesnoth
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Battle for Wesnoth"
map_data="{maps/Heir_To_The_Throne/Battle_for_Wesnoth}"
turns=60
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.28
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.29
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.28 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Bay_of_Pearls
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Bay of Pearls"
map_data="{maps/Heir_To_The_Throne/Bay_of_Pearls}"
music="wesnoth-1.ogg"
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.28
wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.29
--- wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.28 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Blackwater_Port
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Blackwater Port"
map_data="{maps/Heir_To_The_Throne/Blackwater_Port}"
music=wesnoth-4.ogg
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.31
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.32
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.31 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Crossroads
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Crossroads"
map_data="{maps/Heir_To_The_Throne/Crossroads}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.23
wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.24
--- wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.23 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Dwarven_Doors
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Dwarven Doors"
map_data="{maps/Heir_To_The_Throne/Dwarven_Doors}"
{TURNS 21 18 15}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.17 Mon Feb
21 08:08:24 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Elven_Council
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Elven Council"
map_data="ffffffffffffffffffff
ffffffffffcfffffffff
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.30
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.31
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.30 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Elves_Besieged
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Elves Besieged"
map_data="{maps/Heir_To_The_Throne/Elves_Besieged}"
turns=16
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.5
wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.6
--- wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.5 Mon Feb 21
08:08:25 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=httt_epilogue
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Epilogue"
map_data="12"
turns=10
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.23
wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.24
--- wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.23 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Ford_of_Abez
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Ford of Abez"
map_data="{maps/Heir_To_The_Throne/Ford_of_Abez}"
{TURNS 27 24 21}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.21
wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.22
--- wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.21 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Gryphon_Mountain
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Gryphon Mountain"
map_data="{maps/Heir_To_The_Throne/Gryphon_Mountain}"
{TURNS 27 24 21}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.22
wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.22 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Hasty_Alliance
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Hasty Alliance"
map_data="{maps/Heir_To_The_Throne/Hasty_Alliance}"
{TURNS 33 30 27}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.23
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.24
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.23 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=trial_clans
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Test of the Clan"
map_data="{maps/Heir_To_The_Throne/Home_Clan}"
music=wesnoth-1.ogg
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.19
wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.19 Thu Mar
24 10:18:37 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=North_Elves
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Home of the North Elves"
map_data="{maps/Heir_To_The_Throne/Home_North_Elves}"
{TURNS 21 18 15}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.26
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.27
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.26 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Isle_of_Anduin
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Isle of Anduin"
map_data="{maps/Heir_To_The_Throne/Isle_of_Anduin}"
music=wesnoth-8.ogg
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.31
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.32
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.31
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Isle_of_the_Damned
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
next_scenario=The_Siege_of_Elensefar
name= _ "Isle of the Damned"
map_data="{maps/Heir_To_The_Throne/Isle_of_the_Damned}"
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.20
wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.20 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Mountain_Pass
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Mountain Pass"
{TURNS 27 24 21}
map_data="{maps/Heir_To_The_Throne/Mountain_Pass}"
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.24
wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.25
--- wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.24
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Muff_Malals_Peninsula
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Muff Malal's Peninsula"
map_data="{maps/Heir_To_The_Throne/Muff_Malal_Peninsula}"
{TURNS 27 24 21}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.20
wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.21
--- wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.20 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Northern_Winter
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Northern Winter"
map_data="{maps/Heir_To_The_Throne/Northern_Winter}"
music=wesnoth-1.ogg
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.19
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.20
---
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.19
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
Sun Mar 27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Plunging_into_the_Darkness
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Plunging into the Darkness"
map_data="{maps/Heir_To_The_Throne/Plunging_Into_the_Darkness}"
{TURNS 19 16 13}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.34
wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.35
--- wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.34
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Princess_of_Wesnoth
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Princess of Wesnoth"
map_data="{maps/Heir_To_The_Throne/Princess_of_Wesnoth}"
{TURNS 31 28 25}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.21
wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.22
--- wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.21
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=return_to_wesnoth
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Return to Wesnoth"
map_data="{maps/Heir_To_The_Throne/Return_to_Wesnoth}"
{TURNS 31 28 25}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.23
wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.24
--- wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.23 Sun Mar 20
13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Scepter
-textdomain=wesnoth-httt
+#textdomain wesnoth-httt
name= _ "The Scepter of Fire"
scenario_generation=cave
next_scenario=A_Choice_Must_Be_Made
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.17 Sun Mar
20 18:06:43 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Snow_Plains
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Snow Plains"
map_data="{maps/Heir_To_The_Throne/Snow_Plains}"
{TURNS 43 40 37}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.15 Sun Mar
20 13:15:45 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Swamp_Of_Dread
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "Swamp Of Dread"
map_data="{maps/Heir_To_The_Throne/Swamp_Of_Dread}"
{TURNS 33 30 27}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.18
wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.19
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.18 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Lost_General
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Lost General"
map_data="{maps/Heir_To_The_Throne/The_Lost_General}"
{TURNS 67 64 61}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.33
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.34
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.33
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
Sun Mar 27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Siege_of_Elensefar
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Siege of Elensefar"
map_data="{maps/Heir_To_The_Throne/The_Siege_of_Elensefar}"
{TURNS 35 32 29}
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.26
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.27
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.26 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Valley_of_Death-The_Princesss_Revenge
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Valley of Death - The Princess's Revenge"
map_data="{maps/Heir_To_The_Throne/Valley_of_Death}"
turns=12
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.17
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=valley_statue
- textdomain=wesnoth-httt
+ #textdomain wesnoth-httt
name= _ "The Valley of Statues"
map_data="mmmmmmHhggggggggggghhhHmmmmmm
mmmmmHHhggtgC1CgtghhhHHmmmmmm
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.19
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.20
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.19 Sun Mar
20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg Sun Mar 27
23:06:16 2005
@@ -3,7 +3,7 @@
[scenario]
id="Black_Flag"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Black Flag"
map_data="{maps/Son_Of_The_Black_Eye/Black_Flag}"
turns=18
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.23
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.24
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.23
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg Sun Mar
27 23:06:16 2005
@@ -4,7 +4,7 @@
[scenario]
id=Clash_of_armies
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Clash of Armies"
map_data="{maps/Son_Of_The_Black_Eye/Clash_Of_Armies}"
turns=24
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.19
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.20
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.19
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg Sun Mar
27 23:06:16 2005
@@ -4,7 +4,7 @@
[scenario]
id="Desert_Of_Death"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "The Desert of Death"
map_data="{maps/Son_Of_The_Black_Eye/Desert_Of_Death}"
turns=30
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.21
wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.22
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.21 Sun Mar
20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg Sun Mar
27 23:06:16 2005
@@ -3,7 +3,7 @@
[scenario]
id="End_Of_Peace"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "End Of Peace"
map_data="{maps/Son_Of_The_Black_Eye/End_Of_Peace}"
turns=24
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.23
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.24
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.23 Sun Mar
20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg Sun Mar
27 23:06:16 2005
@@ -72,7 +72,7 @@
[scenario]
id="Saving_Inarix"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name="Saving Inarix"
map_data="{maps/Son_Of_The_Black_Eye/Saving_Inarix}"
turns=16
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.22
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.23
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.22
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg Sun Mar
27 23:06:16 2005
@@ -4,7 +4,7 @@
[scenario]
id="Shan_Taum_The_Smug"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Shan Taum The Smug"
map_data="{maps/Son_Of_The_Black_Eye/Shan_Taum_The_Smug}"
turns=20
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.20
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.21
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.20 Sun Mar
20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg Sun Mar
27 23:06:16 2005
@@ -4,7 +4,7 @@
[scenario]
id="Silent_Forest"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Silent Forest"
map_data="{maps/Son_Of_The_Black_Eye/Silent_Forest}"
turns=30
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
diff -u
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.19
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.20
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.19
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
[scenario]
id="The_Siege_Of_Barag_Gor"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "The Siege Of Barag Gór"
map_data="{maps/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor}"
turns=18
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg
diff -u
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.19
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.20
---
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.19
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg
Sun Mar 27 23:06:16 2005
@@ -3,7 +3,7 @@
[scenario]
id="To_the_harbour_of_Tirigaz"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "To the harbour of Tirigaz"
map_data="{maps/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz}"
turns=20
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg
diff -u
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.24
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.25
---
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.24
Sun Mar 20 11:33:27 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg
Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
[scenario]
id="Toward_Mountains_of_Haag"
- textdomain=wesnoth-sotbe
+ #textdomain wesnoth-sotbe
name= _ "Toward Mountains of Haag"
map_data="{maps/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag}"
turns=18
Index: wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.17
wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.18
--- wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.17 Sun Mar
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="A_New_Chance"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "A New Chance"
map_data="{maps/The_Dark_Hordes/A_New_Chance}"
Index: wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg:1.13
wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg:1.14
--- wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg:1.13
Sun Mar 20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="Brother_Against_Brother"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Brother Against Brother"
map_data="{maps/The_Dark_Hordes/Brother_Against_Brother}"
turns=28
Index: wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.12
wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.13
--- wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.12 Sun Mar
20 15:50:37 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="Confrontation"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Confrontation"
map_data="{maps/The_Dark_Hordes/Confrontation}"
turns=40
Index: wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.15
wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.16
--- wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.15 Sun Mar
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="Crelanus_Book"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Crelanu's Book"
map_data="{maps/The_Dark_Hordes/Crelanus_Book}"
turns=30
Index: wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg:1.14
wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg:1.15
--- wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg:1.14 Sun Mar
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Inside_The_Tower
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Inside the Tower"
map_data="{maps/The_Dark_Hordes/Inside_The_Tower}"
turns=70
Index: wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg:1.11
wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg:1.12
--- wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg:1.11 Sun Mar
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="Mages_And_Elves"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Mages and Elves"
map_data="{maps/The_Dark_Hordes/Mages_And_Elves}"
turns=40
Index: wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:1.13
wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:1.14
--- wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:1.13
Sun Mar 20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id="Skull_Agarash"
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "The Skull of Agarash"
map_data="{maps/The_Dark_Hordes/The_Skull_of_Agarash}"
turns=32
Index: wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.7
wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.8
--- wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg:1.7 Sun Mar
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Underground_Pool
- textdomain=wesnoth-tdh
+ #textdomain wesnoth-tdh
name= _ "Underground Pool"
map_data="{maps/The_Dark_Hordes/Underground_Pool}"
turns=48
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.27 Wed Mar 23
07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Beach
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Lizard Beach"
map_data="{maps/The_Rise_of_Wesnoth/A_Beach}"
{TURNS 35 32 29}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.43
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.44
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.43 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Final_Spring
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "A Final Spring"
map_data="{maps/The_Rise_of_Wesnoth/A_Final_Spring}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.31
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Harrowing_Escape
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "A Harrowing Escape"
map_data="{maps/The_Rise_of_Wesnoth/A_Harrowing_Escape}"
{TURNS 48 45 42}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.28 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_New_Land
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "A New Land"
map_data="{maps/The_Rise_of_Wesnoth/A_New_Land}"
turns=48
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.25
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Spy_in_the_Woods
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "A Spy in the Woods"
map_data="{maps/The_Rise_of_Wesnoth/Elf_Lords}"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.24
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=A_Summer_of_Storms
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "A Summer of Storms"
map_data="{maps/The_Rise_of_Wesnoth/A_Summer_of_Storms}"
{TURNS 31 28 25}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.43
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.44
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.43 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Clearwater_Port
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Clearwater Port"
map_data="{maps/The_Rise_of_Wesnoth/Clearwater_Port}"
turns=32
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.30 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Cursed_Isle
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Cursed Isle"
map_data="{maps/The_Rise_of_Wesnoth/Cursed_Isle}"
{TURNS 37 34 31}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.26 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Elf_Lords
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Ka'lian"
map_data="{maps/The_Rise_of_Wesnoth/Elf_Lords}"
turns=30
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.15
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.16
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.15 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Epilogue
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Epilogue"
map_data="{maps/The_Rise_of_Wesnoth/The_Plan}"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.35
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.36
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.35
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Fallen_Lich_Point
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Fallen Lich Point"
map_data="{maps/The_Rise_of_Wesnoth/Fallen_Lich_Point}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.34
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Peoples_in_Decline
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Peoples in Decline"
map_data="{maps/The_Rise_of_Wesnoth/Peoples_in_Decline}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.38
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.39
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.38
Thu Mar 24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Return_of_the_Fleet
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Return of the Fleet"
map_data="{maps/The_Rise_of_Wesnoth/Return_of_the_Fleet}"
{TURNS 45 42 39}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.27
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Return_to_Oldwood
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Return to Oldwood"
map_data="{maps/The_Rise_of_Wesnoth/The_Oldwood}"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.29 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Sun Mar
27 23:06:16 2005
@@ -1,7 +1,7 @@
[scenario]
id=Rise_of_Wesnoth
name= _ "Rise of Wesnoth"
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
map_data="{maps/The_Rise_of_Wesnoth/Rise_of_Wesnoth}"
{TURNS 45 42 39}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.31 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Rough_Landing
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Rough Landing"
map_data="{maps/The_Rise_of_Wesnoth/Rough_Landing}"
{TURNS 35 32 29}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.34 Wed Mar 23
07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg Sun Mar 27
23:06:16 2005
@@ -1,7 +1,7 @@
[scenario]
#The Calgary Flames won game 1 when I started this, and they just won game 3,
hence, Fire Wizards
id=Sewer
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Sewer of Southbay"
map_data="{maps/The_Rise_of_Wesnoth/Sewer}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.24
Sun Mar 20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Southbay_in_Winter
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Southbay in Winter"
map_data="{maps/The_Rise_of_Wesnoth/Southbay_in_Winter}"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.38
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.39
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.38
Wed Mar 23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Temple_in_the_Deep
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Temple in the Deep"
map_data="{maps/The_Rise_of_Wesnoth/Temple_in_the_Deep}"
{TURNS 35 32 29}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.29 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Dragon
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Dragon"
map_data="{maps/The_Rise_of_Wesnoth/The_Dragon}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.28 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Fall
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Fall"
map_data="{maps/The_Rise_of_Wesnoth/The_Fall}"
{TURNS 23 20 17}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.32
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.33
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.32 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Midlands
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Midlands"
map_data="{maps/The_Rise_of_Wesnoth/The_Midlands}"
{TURNS 45 42 39}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.37
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.38
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.37 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Oldwood
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Oldwood"
map_data="{maps/The_Rise_of_Wesnoth/The_Oldwood}"
{TURNS 35 32 29}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.13
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.14
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.13 Sun Mar
20 09:36:16 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Plan
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Plan"
map_data="{maps/The_Rise_of_Wesnoth/The_Plan}"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.31 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg Sun Mar
27 23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_River_Road
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Swamp of Esten"
map_data="{maps/The_Rise_of_Wesnoth/The_River_Road}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.36
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.37
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.36 Thu Mar
24 10:18:38 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=The_Vanguard
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "The Vanguard"
map_data="{maps/The_Rise_of_Wesnoth/The_Vanguard}"
{TURNS 41 38 35}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.26 Wed Mar
23 07:40:09 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg Sun Mar 27
23:06:16 2005
@@ -1,6 +1,6 @@
[scenario]
id=Troll_Hole
- textdomain=wesnoth-trow
+ #textdomain wesnoth-trow
name= _ "Troll Hole"
map_data="{maps/The_Rise_of_Wesnoth/Troll_Hole}"
{TURNS 39 36 33}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.10
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.11
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.10 Sun Jan
9 21:35:47 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg Sun Mar 27
23:06:16 2005
@@ -53,7 +53,7 @@
background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
[/part]
[part]
- story= _ "The new Crown Prince departed, with the largest army ever
assembled on the Isle to make war with the Wesfolk. This where our story
begins. . ."
+ story= _ "The new Crown Prince departed, with the largest army ever
assembled on the Isle to make war with the Wesfolk. This is where our story
begins. . ."
background=campaigns/Heir_To_The_Throne/story/story1.png
[/part]
[part]
Index: wesnoth/data/schedules.cfg
diff -u wesnoth/data/schedules.cfg:1.16 wesnoth/data/schedules.cfg:1.17
--- wesnoth/data/schedules.cfg:1.16 Tue Oct 5 09:52:51 2004
+++ wesnoth/data/schedules.cfg Sun Mar 27 23:06:15 2005
@@ -1,6 +1,6 @@
#define DAWN
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=dawn
name= _ "Dawn"
image=misc/schedule-dawn.png
@@ -8,7 +8,7 @@
green=-20
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=morning
name= _ "Morning"
image=misc/schedule-morning.png
@@ -20,14 +20,14 @@
#define MORNING
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=morning
name= _ "Morning"
image=misc/schedule-morning.png
lawful_bonus=25
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=morning
name= _ "Morning"
image=misc/schedule-morning.png
@@ -37,14 +37,14 @@
#define AFTERNOON
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=afternoon
name= _ "Afternoon"
image=misc/schedule-afternoon.png
lawful_bonus=25
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=afternoon
name= _ "Afternoon"
image=misc/schedule-afternoon.png
@@ -54,7 +54,7 @@
#define DUSK
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=dusk
name= _ "Dusk"
image=misc/schedule-dusk.png
@@ -62,7 +62,7 @@
blue=-20
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=afternoon
name= _ "Afternoon"
image=misc/schedule-afternoon.png
@@ -74,7 +74,7 @@
#define FIRST_WATCH
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=first_watch
name= _ "First Watch"
image=misc/schedule-firstwatch.png
@@ -84,7 +84,7 @@
blue=-10
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=dusk
name= _ "Dusk"
image=misc/schedule-dusk.png
@@ -96,7 +96,7 @@
#define SECOND_WATCH
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=second_watch
name= _ "Second Watch"
image=misc/schedule-secondwatch.png
@@ -106,7 +106,7 @@
blue=-10
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=dusk
name= _ "Dusk"
image=misc/schedule-dusk.png
@@ -118,14 +118,14 @@
#define UNDERGROUND
[time]
-textdomain=wesnoth
+#textdomain wesnoth
id=underground
name= _ "Underground"
image=misc/schedule-underground.png
lawful_bonus=-25
[/time]
[illuminated_time]
-textdomain=wesnoth
+#textdomain wesnoth
id=underground
name= _ "Underground"
image=misc/schedule-underground-illum.png
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.59
wesnoth/data/terrain-graphics.cfg:1.60
--- wesnoth/data/terrain-graphics.cfg:1.59 Fri Mar 25 15:11:41 2005
+++ wesnoth/data/terrain-graphics.cfg Sun Mar 27 23:06:15 2005
@@ -24,6 +24,29 @@
base=45,82
[/image]
[/terrain_graphics]
+#[terrain_graphics]
+# map="
+#. *
+# * *
+#* 1 *
+# 1 1
+#* 1 *
+# 1 1
+#* * *
+# * *"
+# [tile]
+# pos=1
+# type=m
+# no_flag="base"
+# set_flag="base"
+# [/tile]
+# probability=50
+# [image]
+# name=bigblank
+# position=vertical
+# base=36,108
+# [/image]
+#[/terrain_graphics]
# Loads the macros used in the file
{terrain-graphics}
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.57 wesnoth/data/terrain.cfg:1.58
--- wesnoth/data/terrain.cfg:1.57 Fri Mar 25 15:11:41 2005
+++ wesnoth/data/terrain.cfg Sun Mar 27 23:06:15 2005
@@ -17,7 +17,7 @@
[terrain]
symbol_image=ocean
-id=deep water
+id=deep_water
name= _ "Deep Water"
char=s
submerge=0.5
@@ -26,7 +26,7 @@
[terrain]
symbol_image=coast
-id=shallow water
+id=shallow_water
name= _ "Shallow Water"
char=c
submerge=0.4
@@ -35,7 +35,7 @@
[terrain]
symbol_image=village-coast
-id=mermen village
+id=mermen_village
name= _ "Village"
char=Z
aliasof=c
@@ -47,7 +47,7 @@
[terrain]
symbol_image=swampwater
-id=swamp water
+id=swamp_water
name= _ "Swamp"
char=w
submerge=0.4
@@ -56,7 +56,7 @@
[terrain]
symbol_image=village-swampwater
-id=swamp village
+id=swamp_village
name= _ "Village"
char=Y
aliasof=tw
@@ -169,7 +169,7 @@
[terrain]
symbol_image=village-human
-id=human village
+id=human_village
name= _ "Village"
char=v
aliasof=t
@@ -177,10 +177,10 @@
gives_income=true
[/terrain]
-#temporary symbol_image until a hill/mountain village graphic emerges
+#temporary symbol_image until a hill/mountain_village graphic emerges
[terrain]
symbol_image=village-human
-id=hill village
+id=hill_village
name= _ "Village"
char=a
aliasof=th
@@ -188,10 +188,10 @@
gives_income=true
[/terrain]
-#temporary symbol_image until a hill/mountain village graphic emerges
+#temporary symbol_image until a hill/mountain_village graphic emerges
[terrain]
symbol_image=village-snow
-id=snow-hill village
+id=snow-hill_village
name= _ "Village"
char=A
light=true
@@ -201,10 +201,10 @@
light=true
[/terrain]
-#temporary symbol_image until a hill/mountain village graphic emerges
+#temporary symbol_image until a hill/mountain_village graphic emerges
[terrain]
symbol_image=village-human
-id=mountain village
+id=mountain_village
name= _ "Village"
char=b
aliasof=tm
@@ -214,7 +214,7 @@
[terrain]
symbol_image=village-desert
-id=desert village
+id=desert_village
name= _ "Desert Village"
char=B
aliasof=tI
@@ -225,7 +225,7 @@
[terrain]
symbol_image=village-desert2
-id=desert village
+id=desert_village
name= _ "Desert Village"
char=U
aliasof=tI
@@ -236,7 +236,7 @@
[terrain]
symbol_image=village-tropical-forest
-id=Tropical forest village
+id=tropical_forest_village
name= _ "Tropical Forest Village"
char=L
aliasof=tG
@@ -266,7 +266,7 @@
[terrain]
symbol_image=village-snow
-id=snow village
+id=snow_village
name= _ "Snow Village"
char=V
aliasof=tS
@@ -284,7 +284,7 @@
[terrain]
symbol_image=snow-hills
-id=snow hills
+id=snow_hills
name= _ "Snow Hills"
light=true
char=H
@@ -293,7 +293,7 @@
[terrain]
symbol_image=desert-hills
-id=desert hills
+id=desert_hills
name= _ "Desert Hills"
char=J
aliasof=h
@@ -308,7 +308,7 @@
[terrain]
symbol_image=desert-mountains
-id=desert mountains
+id=desert_mountains
name= _ "Desert Mountains"
char=M
aliasof=m
@@ -323,7 +323,7 @@
[terrain]
symbol_image=snow-forest
-id=snow forest
+id=snow_forest
light=true
name= _ "Snow Forest"
aliasof=f
@@ -332,7 +332,7 @@
[terrain]
symbol_image=tropical-forest
-id=tropical forest
+id=tropical_forest
name= _ "Tropical Forest"
aliasof=f
char=T
@@ -355,7 +355,7 @@
[terrain]
symbol_image=village-cave
-id=underground village
+id=underground_village
name= _ "Village"
char=D
aliasof=tu
@@ -384,7 +384,7 @@
[terrain]
symbol_image=cave-floor1
-id=dwarven castle
+id=dwarven_castle
name= _ "Dwarven castle"
char=o
aliasof=C
Index: wesnoth/data/themes/default.cfg
diff -u wesnoth/data/themes/default.cfg:1.83
wesnoth/data/themes/default.cfg:1.84
--- wesnoth/data/themes/default.cfg:1.83 Fri Mar 25 20:55:56 2005
+++ wesnoth/data/themes/default.cfg Sun Mar 27 23:06:16 2005
@@ -31,21 +31,21 @@
[screen]
# this is only useful as a ref for other rects
id=screen
- rect=0,0,1024,768
+ rect="0,0,1024,768"
[/screen]
[panel]
id=top-panel
image=misc/top-bg.png
ref=screen
- rect==,=,=,+26
+ rect="=,=,=,+26"
xanchor=top
yanchor=fixed
[/panel]
[main_map]
id=main-map
- rect==,+0,+882,768
+ rect="=,+0,+882,768"
xanchor=left
yanchor=top
[/main_map]
@@ -54,21 +54,21 @@
[panel]
id=top-right-panel
image=misc/rightside.png
- rect=+0,=-1,1024,+284
+ rect="+0,=-1,1024,+284"
xanchor=right
yanchor=fixed
[/panel]
[panel]
id=middle-right-panel
image=misc/rightside-bg.png
- rect==,+0,=,+421
+ rect="=,+0,=,+421"
xanchor=right
yanchor=top
[/panel]
[panel]
id=bottom-right-panel
image=misc/rightside-bottom.png
- rect==,+0,=,768
+ rect="=,+0,=,768"
xanchor=right
yanchor=bottom
[/panel]
@@ -79,7 +79,7 @@
image=lite
items=objectives,statistics,unitlist,separator,statustable,save,load,preferences,chatlog,help,quit
ref=top-panel
- rect==+3,=+1,+100,=-4
+ rect="=+3,=+1,+100,=-4"
xanchor=fixed
yanchor=fixed
[/menu]
@@ -89,7 +89,7 @@
title= _ "Actions"
image=lite
items=undo,redo,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,delayshroud,updateshroud,endturn
- rect=+2,=,+100,=
+ rect="+2,=,+100,="
xanchor=fixed
yanchor=fixed
[/menu]
@@ -101,7 +101,7 @@
[mini_map]
id=mini-map
ref=top-right-panel
- rect==+10,=+7,=-7,+143
+ rect="=+10,=+7,=-7,+143"
xanchor=right
yanchor=fixed
[/mini_map]
@@ -111,7 +111,7 @@
title= _ "End Turn"
items=endturn
ref=bottom-right-panel
- rect==+17,=+7
+ rect="=+17,=+7"
xanchor=right
yanchor=bottom
[/menu]
@@ -120,42 +120,42 @@
id=turn-panel
image=misc/status-bg.png
ref=actions-menu
- rect=+5,=+1,+95,+19
+ rect="+5,=+1,+95,+19"
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=gold-panel
image=misc/status-bg.png
- rect=+5,=,+95,=
+ rect="+5,=,+95,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=villages-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=units-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=upkeep-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=income-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
@@ -166,7 +166,7 @@
font_size={FONT_TINY}
text= _ "HP"
ref=top-right-panel
- rect==+84,=+209,+54,+12
+ rect="=+84,=+209,+54,+12"
xanchor=right
yanchor=fixed
[/label]
@@ -175,7 +175,7 @@
font_size={FONT_TINY}
text= _ "XP"
# FIXME: should be ref=unit-hp
- rect==,+14,=,+12
+ rect="=,+14,=,+12"
xanchor=right
yanchor=fixed
[/label]
@@ -185,7 +185,7 @@
icon=misc/gold.png
text= _ "gold"
ref=gold-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -194,7 +194,7 @@
icon=misc/villages.png
text= _ "villages"
ref=villages-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -203,7 +203,7 @@
icon=misc/units.png
text= _ "units"
ref=units-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -212,7 +212,7 @@
icon=misc/upkeep.png
text= _ "upkeep"
ref=upkeep-panel
- rect==+5,=+1,+32,+16
+ rect="=+5,=+1,+32,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -221,7 +221,7 @@
icon=misc/income.png
text= _ "income"
ref=income-panel
- rect==+5,=+1,+32,+16
+ rect="=+5,=+1,+32,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -231,7 +231,7 @@
[time_of_day]
id=image-tod
ref=top-right-panel
- rect==+10,=+159,=-7,+39
+ rect="=+10,=+159,=-7,+39"
xanchor=right
yanchor=fixed
[/time_of_day]
@@ -240,7 +240,7 @@
[side_playing]
id=icon-sideplaying
ref=turn-panel
- rect==+3,=+2,+15,+16
+ rect="=+3,=+2,+15,+16"
xanchor=proportional
yanchor=fixed
[/side_playing]
@@ -249,7 +249,7 @@
[turn]
id=turn
font_size={FONT_SMALL}
- rect=+4,=,+68,+16
+ rect="+4,=,+68,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -259,7 +259,7 @@
id=gold
font_size={FONT_SMALL}
ref=gold-icon
- rect=+4,=,+65,+16
+ rect="+4,=,+65,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -269,7 +269,7 @@
id=villages
font_size={FONT_SMALL}
ref=villages-icon
- rect=+4,=,+55,+16
+ rect="+4,=,+55,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -279,7 +279,7 @@
id=num-units
font_size={FONT_SMALL}
ref=units-icon
- rect=+4,=,+55,+16
+ rect="+4,=,+55,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -289,7 +289,7 @@
id=status-upkeep
font_size={FONT_SMALL}
ref=upkeep-icon
- rect=+4,=,+40,+16
+ rect="+4,=,+40,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -299,7 +299,7 @@
id=status-income
font_size={FONT_SMALL}
ref=income-icon
- rect=+4,=,+40,+16
+ rect="+4,=,+40,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -308,14 +308,14 @@
[terrain]
id=status-terrain
font_size={FONT_SMALL}
- rect=+5,=,+120,+16
+ rect="+5,=,+120,+16"
xanchor=proportional
yanchor=fixed
[/terrain]
[position]
id=status-position
font_size={FONT_SMALL}
- rect=+5,=,+105,+16
+ rect="+5,=,+105,+16"
xanchor=proportional
yanchor=fixed
[/position]
@@ -323,7 +323,7 @@
[observers]
id=observers
font_size={FONT_SMALL}
- rect=+4,=-1,+16,+16
+ rect="+4,=-1,+16,+16"
xanchor=proportional
yanchor=fixed
[/observers]
@@ -332,7 +332,7 @@
[unit_image]
id=unit-image
ref=top-right-panel
- rect==+9,=+215,+72,+72
+ rect="=+9,=+215,+72,+72"
xanchor=right
yanchor=fixed
[/unit_image]
@@ -340,21 +340,21 @@
id=unit-description
font_size={FONT_NORMAL}
ref=middle-right-panel
- rect==+9,=+3,=-2,+18
+ rect="=+9,=+3,=-2,+18"
xanchor=right
yanchor=fixed
[/unit_description]
[unit_type]
id=unit-type
font_size={FONT_SMALL}
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_type]
[unit_level]
id=unit-level
font_size={FONT_SMALL}
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
prefix= _ "statuspanel^level"
prefix_literal=" "
xanchor=right
@@ -363,21 +363,21 @@
[unit_alignment]
id=unit-alignment
font_size={FONT_SMALL}
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
id=unit-traits
font_size={FONT_SMALL}
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
id=unit-abilities
font_size={FONT_SMALL}
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_abilities]
@@ -385,7 +385,7 @@
id=unit-moves
font_size={FONT_SMALL}
ref=unit-abilities
- rect==,+0,=+2,+16
+ rect="=,+0,=+2,+16"
prefix= _ "statuspanel^movement"
prefix_literal=": "
xanchor=right
@@ -395,7 +395,7 @@
id=unit-hp
font_size={FONT_SMALL}
ref=label-hp
- rect==,+0,+54,+14
+ rect="=,+0,+54,+14"
#prefix=hp
#prefix_literal=" "
xanchor=right
@@ -405,7 +405,7 @@
id=unit-xp
font_size={FONT_SMALL}
ref=label-xp
- rect==,+0,+54,+14
+ rect="=,+0,+54,+14"
#prefix=xp
#prefix_literal=" "
xanchor=right
@@ -415,7 +415,7 @@
id=unit-weapons
font_size={FONT_SMALL}
ref=unit-moves
- rect==,+0,=,594
+ rect="=,+0,=,594"
xanchor=right
yanchor=fixed
[/unit_weapons]
@@ -423,7 +423,7 @@
id=unit-status
font_size={FONT_SMALL}
ref=unit-xp
- rect==+1,+3,=,+16
+ rect="=+1,+3,=,+16"
xanchor=right
yanchor=fixed
[/unit_status]
@@ -443,25 +443,25 @@
[change]
id=turn-panel
- rect=+65,=+1,+95,+19
+ rect="+65,=+1,+95,+19"
[/change]
[change]
id=upkeep-panel
- rect=+5,=,+100,=
+ rect="+5,=,+100,="
[/change]
[change]
id=income-panel
- rect=+5,=,+89,=
+ rect="+5,=,+89,="
[/change]
[change]
id=status-upkeep
- rect=+4,=,+55,+16
+ rect="+4,=,+55,+16"
[/change]
[change]
id=status-income
- rect=+3,=,+45,+16
+ rect="+3,=,+45,+16"
[/change]
[remove]
@@ -470,7 +470,7 @@
[change]
id=status-position
- rect=+15,=,+145,+16
+ rect="+15,=,+145,+16"
[/change]
[/partialresolution]
@@ -481,22 +481,22 @@
[change]
id=top-panel
- rect==,=,=,+13
+ rect="=,=,=,+13"
[/change]
[change]
id=main-map
- rect==,+0,+946,768
+ rect="=,+0,+946,768"
[/change]
[change]
id=top-right-panel
- rect=+0,=-1,1024,+125
+ rect="+0,=-1,1024,+125"
[/change]
[change]
id=middle-right-panel
- rect==,+0,=,768
+ rect="=,+0,=,768"
[/change]
[remove]
@@ -505,18 +505,18 @@
[change]
id=menu-main
- rect==+1,=,+5,=-2
+ rect="=+1,=,+5,=-2"
[/change]
[change]
id=actions-menu
title= _ "Act."
- rect==+21,=,+5,=
+ rect="=+21,=,+5,="
[/change]
[change]
id=mini-map
- rect==+5,=+3,=-4,+64
+ rect="=+5,=+3,=-4,+64"
[/change]
[add]
@@ -526,7 +526,7 @@
font_size={FONT320_SMALL}
items=zoomin
ref=top-panel
- rect=980,=,+6,=
+ rect="980,=,+6,="
xanchor=right
yanchor=top
[/menu]
@@ -535,7 +535,7 @@
title=-
font_size={FONT320_SMALL}
items=zoomout
- rect==+11,=,+6,=
+ rect="=+11,=,+6,="
xanchor=right
yanchor=top
[/menu]
@@ -545,179 +545,179 @@
id=button-endturn
title= _ "short end-turn^End"
ref=top-panel
- rect=1002,=,=-2,=
+ rect="1002,=,=-2,="
yanchor=top
[/change]
[change]
id=turn-panel
ref=top-panel
- rect==+120,=+1,+80,=-1
+ rect="=+120,=+1,+80,=-1"
[/change]
[change]
id=gold-panel
- rect=+5,=,+80,=
+ rect="+5,=,+80,="
[/change]
[change]
id=villages-panel
- rect=+5,=,+80,=
+ rect="+5,=,+80,="
[/change]
[change]
id=units-panel
- rect=+5,=,+80,=
+ rect="+5,=,+80,="
[/change]
[change]
id=upkeep-panel
- rect=+5,=,+80,=
+ rect="+5,=,+80,="
[/change]
[change]
id=income-panel
- rect=+5,=,+80,=
+ rect="+5,=,+80,="
[/change]
[change]
id=label-hp
font_size={FONT320_TINY}
- rect==+40,=+93,+12,+8
+ rect="=+40,=+93,+12,+8"
[/change]
[change]
id=label-xp
font_size={FONT320_TINY}
ref=label-hp
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=gold-icon
- rect==+3,=+1,+8,+8
+ rect="=+3,=+1,+8,+8"
[/change]
[change]
id=villages-icon
- rect==+3,=+1,+8,+8
+ rect="=+3,=+1,+8,+8"
[/change]
[change]
id=units-icon
- rect==+3,=+1,+8,+8
+ rect="=+3,=+1,+8,+8"
[/change]
[change]
id=upkeep-icon
- rect==+3,=+1,+16,+8
+ rect="=+3,=+1,+16,+8"
[/change]
[change]
id=income-icon
- rect==+3,=+1,+16,+8
+ rect="=+3,=+1,+16,+8"
[/change]
[change]
id=image-tod
- rect==+5,=+71,=-4,+17
+ rect="=+5,=+71,=-4,+17"
[/change]
[change]
id=icon-sideplaying
- rect==+3,=+1,+8,+8
+ rect="=+3,=+1,+8,+8"
[/change]
[change]
id=turn
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=gold
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=villages
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=num-units
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=status-upkeep
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=status-income
font_size={FONT320_SMALL}
- rect=+4,=,+58,+8
+ rect="+4,=,+58,+8"
[/change]
[change]
id=status-position
font_size={FONT320_SMALL}
- rect=+5,=,+130,+8
+ rect="+5,=,+130,+8"
[/change]
[change]
id=observers
- rect=+5,=,+8,+8
+ rect="+5,=,+8,+8"
[/change]
[change]
id=unit-image
- rect==+12,=+100,+20,+20
+ rect="=+12,=+100,+20,+20"
[/change]
[change]
id=unit-description
font_size={FONT320_NORMAL}
- rect==+6,=,=-2,+10
+ rect="=+6,=,=-2,+10"
[/change]
[change]
id=unit-type
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-level
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-alignment
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-traits
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-abilities
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-moves
font_size={FONT320_SMALL}
- rect==,+0,=,+8
+ rect="=,+0,=,+8"
[/change]
[change]
id=unit-hp
font_size={FONT320_SMALL}
ref=label-hp
- rect=+0,=,1022,+8
+ rect="+0,=,1022,+8"
[/change]
[change]
id=unit-xp
font_size={FONT320_SMALL}
ref=label-xp
- rect=+0,=,1022,+8
+ rect="+0,=,1022,+8"
[/change]
[change]
id=unit-weapons
font_size={FONT320_SMALL}
- rect==,+0,=,768
+ rect="=,+0,=,768"
[/change]
[change]
id=unit-status
font_size={FONT320_SMALL}
ref=label-xp
- rect==,+2,=,+8
+ rect="=,+2,=,+8"
[/change]
[/partialresolution]
Index: wesnoth/data/themes/dfool.cfg
diff -u wesnoth/data/themes/dfool.cfg:1.1 wesnoth/data/themes/dfool.cfg:1.2
--- wesnoth/data/themes/dfool.cfg:1.1 Fri Mar 25 20:25:05 2005
+++ wesnoth/data/themes/dfool.cfg Sun Mar 27 23:06:16 2005
@@ -17,14 +17,14 @@
[screen]
# this is only useful as a ref for other rects
id=screen
- rect=0,0,1024,768
+ rect="0,0,1024,768"
[/screen]
[panel]
id=top-panel
image=misc/top-bg.png
ref=screen
- rect==,=,=-142,+26
+ rect="=,=,=-142,+26"
xanchor=left
yanchor=fixed
[/panel]
@@ -34,7 +34,7 @@
ref=screen
id=time-of-day-panel
image=misc/timeofday.png
- rect=-142,=,=,+49
+ rect="-142,=,=,+49"
xanchor=right
yanchor=fixed
[/panel]
@@ -42,7 +42,7 @@
[panel]
id=minimap-panel
image=misc/minimap.png
- rect==,+0,=,=+154
+ rect="=,+0,=,=+154"
xanchor=right
yanchor=fixed
[/panel]
@@ -50,7 +50,7 @@
[panel]
id=terrain-panel
image=misc/rightside-bg.png
- rect==,+0,=,=+33
+ rect="=,+0,=,=+33"
xanchor=right
yanchor=fixed
[/panel]
@@ -58,7 +58,7 @@
[panel]
id=unit-panel
image=misc/unit.png
- rect==,+0,=,=+80
+ rect="=,+0,=,=+80"
xanchor=right
yanchor=fixed
[/panel]
@@ -66,7 +66,7 @@
[panel]
id=middle-right-panel
image=misc/rightside-bg.png
- rect==,+0,=,=+425
+ rect="=,+0,=,=+425"
xanchor=right
yanchor=top
[/panel]
@@ -75,14 +75,14 @@
ref=screen
id=bottom-right-panel
image=misc/rightside-bottom.png
- rect=-142,-30,=,=
+ rect="-142,-30,=,="
xanchor=right
yanchor=bottom
[/panel]
[main_map]
id=main-map
- rect==,+0,+882,768
+ rect="=,+0,+882,768"
xanchor=left
yanchor=top
ref=top-panel
@@ -91,7 +91,7 @@
[mini_map]
id=mini-map
ref=minimap-panel
- rect==+10,=+5,=-6,=-3
+ rect="=+10,=+5,=-6,=-3"
xanchor=right
yanchor=fixed
[/mini_map]
@@ -102,7 +102,7 @@
image=lite
items=objectives,statistics,unitlist,separator,statustable,save,load,preferences,chatlog,help,quit
ref=top-panel
- rect==+3,=+1,+100,=-4
+ rect="=+3,=+1,+100,=-4"
xanchor=fixed
yanchor=fixed
[/menu]
@@ -112,7 +112,7 @@
title= _ "Actions"
image=lite
items=undo,redo,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,delayshroud,updateshroud,endturn
- rect=+2,=,+100,=
+ rect="+2,=,+100,="
xanchor=fixed
yanchor=fixed
[/menu]
@@ -127,7 +127,7 @@
title= _ "End Turn"
items=endturn
ref=bottom-right-panel
- rect==+17,=+5
+ rect="=+17,=+5"
xanchor=right
yanchor=bottom
[/menu]
@@ -136,28 +136,28 @@
ref=actions-menu
id=villages-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=income-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=gold-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
[panel]
id=upkeep-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
@@ -165,7 +165,7 @@
[panel]
id=units-panel
image=misc/status-bg.png
- rect=+5,=,+85,=
+ rect="+5,=,+85,="
xanchor=proportional
yanchor=fixed
[/panel]
@@ -173,7 +173,7 @@
[label]
id=turn-panel
ref=time-of-day-panel
- rect==-60,=+3,+58,+19
+ rect="=-60,=+3,+58,+19"
xanchor=right
yanchor=fixed
[/label]
@@ -184,7 +184,7 @@
id=label-hp
font_size=10
text= _ "HP"
- rect==+84,=+13,+54,+12
+ rect="=+84,=+13,+54,+12"
xanchor=right
yanchor=fixed
[/label]
@@ -193,7 +193,7 @@
id=label-xp
font_size=10
text= _ "XP"
- rect==+84,=+44,=+54,+12
+ rect="=+84,=+44,=+54,+12"
xanchor=right
yanchor=fixed
[/label]
@@ -203,7 +203,7 @@
icon=misc/gold.png
text= _ "gold"
ref=gold-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -212,7 +212,7 @@
icon=misc/villages.png
text= _ "villages"
ref=villages-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -221,7 +221,7 @@
icon=misc/units.png
text= _ "units"
ref=units-panel
- rect==+5,=+1,+16,+16
+ rect="=+5,=+1,+16,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -230,7 +230,7 @@
icon=misc/upkeep.png
text= _ "upkeep"
ref=upkeep-panel
- rect==+5,=+1,+32,+16
+ rect="=+5,=+1,+32,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -239,7 +239,7 @@
icon=misc/income.png
text= _ "income"
ref=income-panel
- rect==+5,=+1,+32,+16
+ rect="=+5,=+1,+32,+16"
xanchor=proportional
yanchor=fixed
[/label]
@@ -249,7 +249,7 @@
[time_of_day]
id=image-tod
ref=time-of-day-panel
- rect==+10,=+5,=-3,=-6
+ rect="=+10,=+5,=-3,=-6"
xanchor=right
yanchor=fixed
[/time_of_day]
@@ -258,7 +258,7 @@
[side_playing]
id=icon-sideplaying
ref=turn-panel
- rect==+3,=+2,+15,+16
+ rect="=+3,=+2,+15,+16"
xanchor=right
yanchor=fixed
[/side_playing]
@@ -267,7 +267,7 @@
[turn]
id=turn
font_size=12
- rect=+4,=,+48,+16
+ rect="+4,=,+48,+16"
xanchor=right
yanchor=fixed
prefix=
@@ -277,7 +277,7 @@
id=gold
font_size=12
ref=gold-icon
- rect=+4,=,+65,+16
+ rect="+4,=,+65,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -287,7 +287,7 @@
id=villages
font_size=12
ref=villages-icon
- rect=+4,=,+55,+16
+ rect="+4,=,+55,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -297,7 +297,7 @@
id=num-units
font_size=12
ref=units-icon
- rect=+4,=,+55,+16
+ rect="+4,=,+55,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -307,7 +307,7 @@
id=status-upkeep
font_size=12
ref=upkeep-icon
- rect=+4,=,+40,+16
+ rect="+4,=,+40,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -317,7 +317,7 @@
id=status-income
font_size=12
ref=income-icon
- rect=+4,=,+40,+16
+ rect="+4,=,+40,+16"
xanchor=proportional
yanchor=fixed
prefix=
@@ -328,7 +328,7 @@
ref=top-panel
id=observers
font_size=12
- rect=+4,=-1,+16,+16
+ rect="+4,=-1,+16,+16"
xanchor=right
yanchor=fixed
[/observers]
@@ -337,7 +337,7 @@
ref=terrain-panel
id=status-terrain
font_size=12
- rect==+9,=+1,=-5,=+15
+ rect="=+9,=+1,=-5,=+15"
xanchor=right
yanchor=fixed
[/terrain]
@@ -345,7 +345,7 @@
ref=terrain-panel
id=status-position
font_size=12
- rect==+9,=+17,=-5,=-2
+ rect="=+9,=+17,=-5,=-2"
xanchor=right
yanchor=fixed
[/position]
@@ -354,7 +354,7 @@
[unit_image]
id=unit-image
ref=unit-panel
- rect==+7,=+3,+72,+72
+ rect="=+7,=+3,+72,+72"
xanchor=right
yanchor=fixed
[/unit_image]
@@ -362,21 +362,21 @@
id=unit-description
font_size=14
ref=middle-right-panel
- rect==+9,=+3,=-2,+18
+ rect="=+9,=+3,=-2,+18"
xanchor=right
yanchor=fixed
[/unit_description]
[unit_type]
id=unit-type
font_size=12
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_type]
[unit_level]
id=unit-level
font_size=12
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
prefix= _ "statuspanel^level"
prefix_literal=" "
xanchor=right
@@ -385,21 +385,21 @@
[unit_alignment]
id=unit-alignment
font_size=12
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_alignment]
[unit_traits]
id=unit-traits
font_size=12
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_traits]
[unit_abilities]
id=unit-abilities
font_size=12
- rect==,+0,=,+16
+ rect="=,+0,=,+16"
xanchor=right
yanchor=fixed
[/unit_abilities]
@@ -407,7 +407,7 @@
id=unit-moves
font_size=12
ref=unit-abilities
- rect==,+0,=+2,+16
+ rect="=,+0,=+2,+16"
prefix= _ "statuspanel^movement"
prefix_literal=": "
xanchor=right
@@ -417,7 +417,7 @@
id=unit-hp
font_size=12
ref=label-hp
- rect==,+0,+54,+14
+ rect="=,+0,+54,+14"
#prefix=hp
#prefix_literal=" "
xanchor=right
@@ -427,7 +427,7 @@
id=unit-xp
font_size=12
ref=label-xp
- rect==,+0,+54,+14
+ rect="=,+0,+54,+14"
#prefix=xp
#prefix_literal=" "
xanchor=right
@@ -437,7 +437,7 @@
id=unit-weapons
font_size=12
ref=unit-moves
- rect==,+0,=,594
+ rect="=,+0,=,594"
xanchor=right
yanchor=fixed
[/unit_weapons]
@@ -445,7 +445,7 @@
id=unit-status
font_size=12
ref=unit-xp
- rect==+1,+3,=,+16
+ rect="=+1,+3,=,+16"
xanchor=right
yanchor=fixed
[/unit_status]
@@ -466,7 +466,7 @@
[change]
id=villages-panel
- rect=+65,=,+85,=
+ rect="+65,=,+85,="
[/change]
[/partialresolution]
Index: wesnoth/data/themes/editor.cfg
diff -u wesnoth/data/themes/editor.cfg:1.26 wesnoth/data/themes/editor.cfg:1.27
--- wesnoth/data/themes/editor.cfg:1.26 Sat Mar 5 19:03:55 2005
+++ wesnoth/data/themes/editor.cfg Sun Mar 27 23:06:16 2005
@@ -9,7 +9,7 @@
[theme]
name=editor
-textdomain=wesnoth-editor
+#textdomain wesnoth-editor
[hotkey]
command="zoomin"
Index: wesnoth/data/units/Ancient_Lich.cfg
diff -u wesnoth/data/units/Ancient_Lich.cfg:1.18
wesnoth/data/units/Ancient_Lich.cfg:1.19
--- wesnoth/data/units/Ancient_Lich.cfg:1.18 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Ancient_Lich.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Ancient Lich
name= _ "Ancient Lich"
race=undead
-image=undead-ancient-lich.png
-image_defensive=undead-ancient-lich-defend.png
+image="undead-ancient-lich.png"
+image_defensive="undead-ancient-lich-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/jevyan.png
#endif
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=undead-ancient-lich-attack.png
+ image="undead-ancient-lich-attack.png"
[/frame]
[/attack]
[attack]
@@ -42,13 +42,13 @@
[frame]
begin=-250
end=0
- image=undead-ancient-lich-attack.png
+ image="undead-ancient-lich-attack.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Ancient_Wose.cfg
diff -u wesnoth/data/units/Ancient_Wose.cfg:1.11
wesnoth/data/units/Ancient_Wose.cfg:1.12
--- wesnoth/data/units/Ancient_Wose.cfg:1.11 Sun Jan 9 04:30:52 2005
+++ wesnoth/data/units/Ancient_Wose.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Ancient Wose
name= _ "Ancient Wose"
race=wose
-image=wose-ancient.png
-image_defensive=wose-ancient-defend.png
+image="wose-ancient.png"
+image_defensive="wose-ancient-defend.png"
ability=ambush,regenerates
hitpoints=80
movement_type=treefolk
@@ -24,7 +24,7 @@
[frame]
begin=-200
end=100
- image="wose-ancient-attack.png"
+ image=""wose-ancient-attack.png""
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Arch_Mage.cfg
diff -u wesnoth/data/units/Arch_Mage.cfg:1.30
wesnoth/data/units/Arch_Mage.cfg:1.31
--- wesnoth/data/units/Arch_Mage.cfg:1.30 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Arch_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Arch Mage"
race=human
gender=male,female
-image=arch-mage.png
-image_defensive=arch-mage-defend.png
+image="arch-mage.png"
+image_defensive="arch-mage-defend.png"
hitpoints=57
movement_type=smallfoot
[resistance]
@@ -28,12 +28,12 @@
[frame]
begin=-175
end=-50
- image=arch-mage-staff-1.png
+ image="arch-mage-staff-1.png"
[/frame]
[frame]
begin=-50
end=50
- image=arch-mage-staff-2.png
+ image="arch-mage-staff-2.png"
[/frame]
[sound]
time=-60
@@ -50,33 +50,33 @@
[frame]
begin=-240
end=-180
- image=arch-mage-fireball-1.png
+ image="arch-mage-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=arch-mage-fireball-2.png
+ image="arch-mage-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=arch-mage-fireball-3.png
+ image="arch-mage-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=arch-mage-fireball-2.png
+ image="arch-mage-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=arch-mage-fireball-1.png
+ image="arch-mage-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -86,8 +86,8 @@
begin=-250
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
@@ -96,8 +96,8 @@
name= _ "female^Arch Mage"
race=human
gender=female
- image=arch-mage+female.png
- image_defensive=arch-mage+female-defend.png
+ image="arch-mage+female.png"
+ image_defensive="arch-mage+female-defend.png"
hitpoints=57
movement_type=smallfoot
[resistance]
@@ -121,12 +121,12 @@
[frame]
begin=-175
end=-50
- image=arch-mage+female-staff-1.png
+ image="arch-mage+female-staff-1.png"
[/frame]
[frame]
begin=-50
end=50
- image=arch-mage+female-staff-2.png
+ image="arch-mage+female-staff-2.png"
[/frame]
[sound]
time=-60
@@ -143,33 +143,33 @@
[frame]
begin=-240
end=-180
- image=arch-mage+female-fireball-1.png
+ image="arch-mage+female-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=arch-mage+female-fireball-2.png
+ image="arch-mage+female-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=arch-mage+female-fireball-3.png
+ image="arch-mage+female-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=arch-mage+female-fireball-2.png
+ image="arch-mage+female-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=arch-mage+female-fireball-1.png
+ image="arch-mage+female-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -179,8 +179,8 @@
begin=-250
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Assassin.cfg
diff -u wesnoth/data/units/Assassin.cfg:1.14
wesnoth/data/units/Assassin.cfg:1.15
--- wesnoth/data/units/Assassin.cfg:1.14 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Assassin.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Assassin"
race=human
gender=male,female
-image=assassin.png
-image_defensive=assassin-defend.png
+image="assassin.png"
+image_defensive="assassin-defend.png"
hitpoints=42
movement_type=elusivefoot
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=assassin-attack.png
+ image="assassin-attack.png"
[/frame]
[sound]
time=-250
@@ -39,7 +39,7 @@
[frame]
begin=-100
end=100
- image=assassin-attack2.png
+ image="assassin-attack2.png"
[/frame]
[sound]
time=-250
@@ -58,18 +58,18 @@
[frame]
begin=-150
end=0
- image=assassin-throwknife1.png
+ image="assassin-throwknife1.png "
[/frame]
[frame]
begin=0
end=150
- image=assassin-throwknife2.png
+ image="assassin-throwknife2.png "
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
@@ -82,8 +82,8 @@
name= _ "female^Assassin"
race=human
gender=female
- image=assassin+female.png
- image_defensive=assassin+female-defend.png
+ image="assassin+female.png"
+ image_defensive="assassin+female-defend.png"
hitpoints=42
movement_type=elusivefoot
movement=6
@@ -107,7 +107,7 @@
[frame]
begin=-100
end=100
- image=assassin+female-attack.png
+ image="assassin+female-attack.png"
[/frame]
[sound]
time=-250
@@ -118,7 +118,7 @@
[frame]
begin=-100
end=100
- image=assassin+female-attack2.png
+ image="assassin+female-attack2.png"
[/frame]
[sound]
time=-250
@@ -137,18 +137,18 @@
[frame]
begin=-150
end=0
- image=assassin+female-throwknife1.png
+ image="assassin+female-throwknife1.png "
[/frame]
[frame]
begin=0
end=150
- image=assassin+female-throwknife2.png
+ image="assassin+female-throwknife2.png "
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Bandit.cfg
diff -u wesnoth/data/units/Bandit.cfg:1.7 wesnoth/data/units/Bandit.cfg:1.8
--- wesnoth/data/units/Bandit.cfg:1.7 Sun Sep 26 21:08:57 2004
+++ wesnoth/data/units/Bandit.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Bandit
name= _ "Bandit"
race=human
-image=neutral-bandit.png
-image_defensive=neutral-bandit-defend.png
+image="neutral-bandit.png"
+image_defensive="neutral-bandit-defend.png"
hitpoints=50
movement_type=smallfoot
movement=5
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=neutral-bandit-attack.png
+ image="neutral-bandit-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Battle_Princess.cfg
diff -u wesnoth/data/units/Battle_Princess.cfg:1.16
wesnoth/data/units/Battle_Princess.cfg:1.17
--- wesnoth/data/units/Battle_Princess.cfg:1.16 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Battle_Princess.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "female^Princess"
gender=female
race=human
-image=human-battleprincess.png
-image_defensive=human-battleprincess-defend.png
-image_leading=human-battleprincess-leading.png
+image="human-battleprincess.png"
+image_defensive="human-battleprincess-defend.png"
+image_leading="human-battleprincess-leading.png"
profile=portraits/Heir_To_The_Throne/lisar.png
hitpoints=52
movement_type=elusivefoot
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=human-battleprincess-attack.png
+ image="human-battleprincess-attack.png"
[/frame]
[sound]
time=-250
@@ -41,9 +41,9 @@
id=Battle Princess
name= _ "Princess"
race=human
-image=human-battleprincess.png
-image_defensive=human-battleprincess-defend.png
-image_leading=human-battleprincess-leading.png
+image="human-battleprincess.png"
+image_defensive="human-battleprincess-defend.png"
+image_leading="human-battleprincess-leading.png"
profile=portraits/Heir_To_The_Throne/lisar.png
hitpoints=52
movement_type=elusivefoot
@@ -66,7 +66,7 @@
[frame]
begin=-100
end=100
- image=human-battleprincess-attack.png
+ image="human-battleprincess-attack.png"
[/frame]
[sound]
time=-250
@@ -88,8 +88,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/variation]
Index: wesnoth/data/units/Blood_Bat.cfg
diff -u wesnoth/data/units/Blood_Bat.cfg:1.11
wesnoth/data/units/Blood_Bat.cfg:1.12
--- wesnoth/data/units/Blood_Bat.cfg:1.11 Thu Oct 14 07:13:20 2004
+++ wesnoth/data/units/Blood_Bat.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Blood Bat
name= _ "Blood Bat"
race=undead
-image=undead-bloodbat.png
-image_defensive=undead-bloodbat-defend.png
+image="undead-bloodbat.png"
+image_defensive="undead-bloodbat-defend.png"
hitpoints=24
movement_type=undeadfly
movement=9
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=undead-bloodbat-attack.png
+ image="undead-bloodbat-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Bone_Shooter.cfg
diff -u wesnoth/data/units/Bone_Shooter.cfg:1.18
wesnoth/data/units/Bone_Shooter.cfg:1.19
--- wesnoth/data/units/Bone_Shooter.cfg:1.18 Mon Jan 3 17:40:33 2005
+++ wesnoth/data/units/Bone_Shooter.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Bone Shooter
name= _ "Bone Shooter"
race=undead
-image=undead-boneshooter.png
-image_defensive=undead-boneshooter-defend.png
+image="undead-boneshooter.png"
+image_defensive="undead-boneshooter-defend.png"
hitpoints=40
movement_type=undeadfoot
movement=5
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=undead-boneshooter-attack.png
+ image="undead-boneshooter-attack.png"
[/frame]
[/attack]
@@ -44,12 +44,12 @@
[frame]
begin=-400
end=-200
- image=undead-boneshooter-attack1.png
+ image="undead-boneshooter-attack1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=undead-boneshooter-attack2.png
+ image="undead-boneshooter-attack2.png"
[/frame]
[sound]
@@ -66,8 +66,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/bone-n.png
- image_diagonal=projectiles/bone-ne.png
+ image="projectiles/bone-n.png"
+ image_diagonal="projectiles/bone-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Bowman.cfg
diff -u wesnoth/data/units/Bowman.cfg:1.6 wesnoth/data/units/Bowman.cfg:1.7
--- wesnoth/data/units/Bowman.cfg:1.6 Sun Sep 26 21:08:57 2004
+++ wesnoth/data/units/Bowman.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Bowman"
race=human
gender=male
-image=human-bowman.png
-image_defensive=human-bowman-defend.png
+image="human-bowman.png"
+image_defensive="human-bowman-defend.png"
hitpoints=33
movement_type=smallfoot
movement=5
@@ -22,7 +22,7 @@
[frame]
begin=-100
end=100
- image=human-bowman-attack-sword.png
+ image="human-bowman-attack-sword.png"
[/frame]
[sound]
@@ -54,29 +54,29 @@
[frame]
begin=-400
end=-300
- image=human-bowman-attack1.png
+ image="human-bowman-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=human-bowman-attack2.png
+ image="human-bowman-attack2.png"
[/frame]
[frame]
begin=-200
end=-100
- image=human-bowman-attack3.png
+ image="human-bowman-attack3.png"
[/frame]
[frame]
begin=-100
end=0
- image=human-bowman.png
+ image="human-bowman.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Cavalier.cfg
diff -u wesnoth/data/units/Cavalier.cfg:1.6 wesnoth/data/units/Cavalier.cfg:1.7
--- wesnoth/data/units/Cavalier.cfg:1.6 Tue Nov 9 07:40:19 2004
+++ wesnoth/data/units/Cavalier.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Cavalier
name= _ "Cavalier"
race=human
-image=human-cavalier.png
-image_moving=human-cavalier-moving.png
-image_defensive=human-cavalier-defend.png
+image="human-cavalier.png"
+image_moving="human-cavalier-moving.png"
+image_defensive="human-cavalier-defend.png"
hitpoints=68
movement_type=mounted
movement=9
@@ -36,12 +36,12 @@
[frame]
begin=-200
end=-100
- image=human-cavalier-moving.png
+ image="human-cavalier-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-cavalier-attack.png
+ image="human-cavalier-attack.png"
[/frame]
[/attack]
[attack]
@@ -57,7 +57,7 @@
[frame]
begin=-200
end=-100
- image=human-cavalier-range1.png
+ image="human-cavalier-range1.png"
[/frame]
[sound]
@@ -68,14 +68,14 @@
[frame]
begin=-100
end=50
- image=human-cavalier-range2.png
+ image="human-cavalier-range2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Cavalryman.cfg
diff -u wesnoth/data/units/Cavalryman.cfg:1.4
wesnoth/data/units/Cavalryman.cfg:1.5
--- wesnoth/data/units/Cavalryman.cfg:1.4 Sun Sep 26 21:08:57 2004
+++ wesnoth/data/units/Cavalryman.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Cavalryman
name= _ "Cavalryman"
race=human
-image=human-scout.png
-image_moving=human-scout-moving.png
-image_defensive=human-scout-defend.png
+image="human-scout.png"
+image_moving="human-scout-moving.png"
+image_defensive="human-scout-defend.png"
hitpoints=38
movement_type=mounted
movement=8
@@ -37,12 +37,12 @@
[frame]
begin=-200
end=-100
- image=human-scout-moving.png
+ image="human-scout-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-scout-attack.png
+ image="human-scout-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Cave_Spider.cfg
diff -u wesnoth/data/units/Cave_Spider.cfg:1.12
wesnoth/data/units/Cave_Spider.cfg:1.13
--- wesnoth/data/units/Cave_Spider.cfg:1.12 Thu Dec 2 05:49:06 2004
+++ wesnoth/data/units/Cave_Spider.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Giant Spider
name= _ "Giant Spider"
race=monster
-image=cavespider.png
-image_defensive=cavespider-defend.png
+image="cavespider.png"
+image_defensive="cavespider-defend.png"
hitpoints=54
movement_type=mountainfoot
movement=6
@@ -30,8 +30,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/web.png
- image_diagonal=projectiles/web.png
+ image="projectiles/web.png"
+ image_diagonal="projectiles/web.png"
[/missile_frame]
range=long
damage=8
Index: wesnoth/data/units/Chocobone.cfg
diff -u wesnoth/data/units/Chocobone.cfg:1.8
wesnoth/data/units/Chocobone.cfg:1.9
--- wesnoth/data/units/Chocobone.cfg:1.8 Sun Sep 26 21:08:57 2004
+++ wesnoth/data/units/Chocobone.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Chocobone
name= _ "Chocobone"
race=undead
-image=undead-chocobone.png
-image_moving=undead-chocobone-moving.png
-image_defensive=undead-chocobone-defend.png
+image="undead-chocobone.png"
+image_moving="undead-chocobone-moving.png"
+image_defensive="undead-chocobone-defend.png"
hitpoints=45
movement_type=undeadfoot
movement=9
@@ -26,12 +26,12 @@
[frame]
begin=-200
end=-100
- image=undead-chocobone-moving.png
+ image="undead-chocobone-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=undead-chocobone-attack.png
+ image="undead-chocobone-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Cockatrice.cfg
diff -u wesnoth/data/units/Cockatrice.cfg:1.9
wesnoth/data/units/Cockatrice.cfg:1.10
--- wesnoth/data/units/Cockatrice.cfg:1.9 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Cockatrice.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Cockatrice
name= _ "Cockatrice"
race=monster
-image=cockatrice.png
-image_defensive=cockatrice-defend.png
+image="cockatrice.png"
+image_defensive="cockatrice-defend.png"
hitpoints=42
movement_type=smallfoot
movement=5
@@ -27,18 +27,18 @@
[frame]
begin=-300
end=-100
- image=cockatrice-attack1.png
+ image="cockatrice-attack1.png"
[/frame]
[frame]
begin=-100
end=100
- image=cockatrice-attack2.png
+ image="cockatrice-attack2.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/gaze.png
- image_diagonal=projectiles/gaze.png
+ image="projectiles/gaze.png"
+ image_diagonal="projectiles/gaze.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Commander.cfg
diff -u wesnoth/data/units/Commander.cfg:1.18
wesnoth/data/units/Commander.cfg:1.19
--- wesnoth/data/units/Commander.cfg:1.18 Mon Mar 21 16:48:32 2005
+++ wesnoth/data/units/Commander.cfg Sun Mar 27 23:06:16 2005
@@ -2,10 +2,10 @@
id=Commander
name= _ "Commander"
race=human
-image=konrad-commander.png
-image_defensive=konrad-commander-defend.png
-image_defensive_long=konrad-commander-ranged-defend.png
-image_leading=konrad-commander-leading.png
+image="konrad-commander.png"
+image_defensive="konrad-commander-defend.png"
+image_defensive_long="konrad-commander-ranged-defend.png"
+image_leading="konrad-commander-leading.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=45
ability=leadership
@@ -28,12 +28,12 @@
[frame]
begin=-250
end=-200
- image=konrad-commander.png
+ image="konrad-commander.png"
[/frame]
[frame]
begin=-100
end=100
- image="konrad-commander-attack.png"
+ image=""konrad-commander-attack.png""
[/frame]
[sound]
@@ -50,7 +50,7 @@
[frame]
begin=-100
end=100
- image="konrad-commander-ranged.png"
+ image=""konrad-commander-ranged.png""
[/frame]
[sound]
@@ -67,8 +67,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -77,10 +77,10 @@
id=Commander
name= _ "Commander"
race=human
-image=konrad-commander.png
-image_defensive=konrad-commander-defend.png
-image_defensive_long=konrad-commander-ranged-defend.png
-image_leading=konrad-commander-leading.png
+image="konrad-commander.png"
+image_defensive="konrad-commander-defend.png"
+image_defensive_long="konrad-commander-ranged-defend.png"
+image_leading="konrad-commander-leading.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=45
ability=leadership
@@ -103,12 +103,12 @@
[frame]
begin=-250
end=-200
- image=konrad-commander.png
+ image="konrad-commander.png"
[/frame]
[frame]
begin=-100
end=100
- image="konrad-commander-attack.png"
+ image=""konrad-commander-attack.png""
[/frame]
[sound]
@@ -131,8 +131,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/variation]
Index: wesnoth/data/units/Cuttle_Fish.cfg
diff -u wesnoth/data/units/Cuttle_Fish.cfg:1.17
wesnoth/data/units/Cuttle_Fish.cfg:1.18
--- wesnoth/data/units/Cuttle_Fish.cfg:1.17 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Cuttle_Fish.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Cuttle Fish
name= _ "Cuttle Fish"
race=monster
-image=cuttlefish.png
-image_defensive=cuttlefish-defend.png
+image="cuttlefish.png"
+image_defensive="cuttlefish-defend.png"
hitpoints=52
movement_type=deepsea
movement=8
@@ -25,28 +25,28 @@
[frame]
begin=-100
end=100
- image=cuttlefish-attack.png
+ image="cuttlefish-attack.png"
[/frame]
[/animation]
[animation]
[frame]
begin=-100
end=100
- image=cuttlefish-attack-2.png
+ image="cuttlefish-attack-2.png"
[/frame]
[/animation]
[animation]
[frame]
begin=-100
end=100
- image=cuttlefish-attack-3.png
+ image="cuttlefish-attack-3.png"
[/frame]
[/animation]
[animation]
[frame]
begin=-100
end=100
- image=cuttlefish-attack-4.png
+ image="cuttlefish-attack-4.png"
[/frame]
[/animation]
[/attack]
@@ -61,13 +61,13 @@
[frame]
begin=-300
end=-100
- image=cuttlefish-attack-ink.png
+ image="cuttlefish-attack-ink.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/ink.png
- image_diagonal=projectiles/ink.png
+ image="projectiles/ink.png"
+ image_diagonal="projectiles/ink.png"
[/missile_frame]
[sound]
time=-180
Index: wesnoth/data/units/Dark_Adept.cfg
diff -u wesnoth/data/units/Dark_Adept.cfg:1.17
wesnoth/data/units/Dark_Adept.cfg:1.18
--- wesnoth/data/units/Dark_Adept.cfg:1.17 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Dark_Adept.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dark Adept
name= _ "Dark Adept"
race=human
-image=undead-adept.png
-image_defensive=undead-adept-defend.png
+image="undead-adept.png"
+image_defensive="undead-adept-defend.png"
hitpoints=28
movement_type=smallfoot
[resistance]
@@ -29,13 +29,13 @@
[frame]
begin=-300
end=-200
- image=undead-adept-attack.png
+ image="undead-adept-attack.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Dark_Queen.cfg
diff -u wesnoth/data/units/Dark_Queen.cfg:1.6
wesnoth/data/units/Dark_Queen.cfg:1.7
--- wesnoth/data/units/Dark_Queen.cfg:1.6 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Dark_Queen.cfg Sun Mar 27 23:06:16 2005
@@ -3,7 +3,7 @@
name= _ "female^Dark Queen"
gender=female
race=human
-image=human-queen.png
+image="human-queen.png"
profile=portraits/Heir_To_The_Throne/asheviere.png
hitpoints=48
movement_type=smallfoot
@@ -39,8 +39,8 @@
icon=attacks/dark-missile.png
[missile_frame]
begin=-200
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Dark_Sorcerer.cfg
diff -u wesnoth/data/units/Dark_Sorcerer.cfg:1.1
wesnoth/data/units/Dark_Sorcerer.cfg:1.2
--- wesnoth/data/units/Dark_Sorcerer.cfg:1.1 Wed Mar 16 20:24:37 2005
+++ wesnoth/data/units/Dark_Sorcerer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dark Sorcerer
name= _ "Dark Sorcerer"
race=human
-image=undead-sorcerer.png
-image_defensive=undead-sorcerer-defend.png
+image="undead-sorcerer.png"
+image_defensive="undead-sorcerer-defend.png"
hitpoints=80
movement_type=smallfoot
movement=5
@@ -24,12 +24,12 @@
[frame]
begin=-100
end=100
- image=undead-sorcerer-staff1.png
+ image="undead-sorcerer-staff1.png"
[/frame]
[frame]
begin=-100
end=100
- image=undead-sorcerer-staff2.png
+ image="undead-sorcerer-staff2.png"
[/frame]
[sound]
time=-100
@@ -47,19 +47,19 @@
[frame]
begin=-400
end=-300
- image=undead-sorcerer-ranged1.png
+ image="undead-sorcerer-ranged1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=undead-sorcerer-ranged2.png
+ image="undead-sorcerer-ranged2.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Dark_Spirit.cfg
diff -u wesnoth/data/units/Dark_Spirit.cfg:1.7
wesnoth/data/units/Dark_Spirit.cfg:1.8
--- wesnoth/data/units/Dark_Spirit.cfg:1.7 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Dark_Spirit.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dark Spirit
name= _ "Dark Spirit"
race=undead
-image=undead-darkspirit.png
-image_defensive=undead-darkspirit-defend.png
+image="undead-darkspirit.png"
+image_defensive="undead-darkspirit-defend.png"
hitpoints=48
movement_type=undeadfly
movement=9
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=undead-darkspirit-attack.png
+ image="undead-darkspirit-attack.png"
[/frame]
[sound]
time=-100
@@ -41,13 +41,13 @@
[frame]
begin=-250
end=50
- image=undead-darkspirit-attack1.png
+ image="undead-darkspirit-attack1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Death_Knight.cfg
diff -u wesnoth/data/units/Death_Knight.cfg:1.15
wesnoth/data/units/Death_Knight.cfg:1.16
--- wesnoth/data/units/Death_Knight.cfg:1.15 Mon Dec 20 16:51:36 2004
+++ wesnoth/data/units/Death_Knight.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Death Knight
name= _ "Death Knight"
race=undead
-image=undead-deathknight.png
-image_defensive=undead-deathknight-defend.png
-image_leading=undead-deathknight-leading.png
+image="undead-deathknight.png"
+image_defensive="undead-deathknight-defend.png"
+image_leading="undead-deathknight-leading.png"
hitpoints=66
movement_type=undeadfoot
movement=5
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=undead-deathknight-attack.png
+ image="undead-deathknight-attack.png"
[/frame]
[sound]
time=-250
@@ -43,12 +43,12 @@
[frame]
begin=-200
end=-100
- image=undead-deathknight-attack-crossbow-1.png
+ image="undead-deathknight-attack-crossbow-1.png"
[/frame]
[frame]
begin=-100
end=0
- image=undead-deathknight-attack-crossbow-2.png
+ image="undead-deathknight-attack-crossbow-2.png"
[/frame]
[sound]
@@ -65,8 +65,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Deathblade.cfg
diff -u wesnoth/data/units/Deathblade.cfg:1.1
wesnoth/data/units/Deathblade.cfg:1.2
--- wesnoth/data/units/Deathblade.cfg:1.1 Tue Nov 30 09:59:15 2004
+++ wesnoth/data/units/Deathblade.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Deathblade
name= _ "Deathblade"
race=undead
-image=undead-deathblade.png
-image_defensive=undead-deathblade-defend.png
+image="undead-deathblade.png"
+image_defensive="undead-deathblade-defend.png"
hitpoints=32
movement_type=undeadfoot
movement=6
@@ -33,17 +33,17 @@
[frame]
begin=-400
end=-250
- image=undead-deathblade-attack1.png
+ image="undead-deathblade-attack1.png"
[/frame]
[frame]
begin=-250
end=-150
- image=undead-deathblade-attack2.png
+ image="undead-deathblade-attack2.png"
[/frame]
[frame]
begin=-150
end=0
- image=undead-deathblade-attack3.png
+ image="undead-deathblade-attack3.png"
[/frame]
[sound]
@@ -51,4 +51,5 @@
sound=sword-swish.wav
[/sound]
[/attack]
-[/unit]
\ No newline at end of file
+[/unit]
+
Index: wesnoth/data/units/Deathmaster.cfg
diff -u wesnoth/data/units/Deathmaster.cfg:1.11
wesnoth/data/units/Deathmaster.cfg:1.12
--- wesnoth/data/units/Deathmaster.cfg:1.11 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Deathmaster.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Deathmaster
name= _ "Deathmaster"
race=undead
-image=undead-deathmaster.png
-image_defensive=undead-deathmaster-defend.png
+image="undead-deathmaster.png"
+image_defensive="undead-deathmaster-defend.png"
hitpoints=60
movement_type=undeadfoot
movement=5
@@ -24,12 +24,12 @@
[frame]
begin=-100
end=0
- image=undead-deathmaster-attack1.png
+ image="undead-deathmaster-attack1.png"
[/frame]
[frame]
begin=0
end=100
- image=undead-deathmaster-attack2.png
+ image="undead-deathmaster-attack2.png"
[/frame]
[sound]
time=-100
@@ -47,35 +47,35 @@
[frame]
begin=-300
end=-250
- image=undead-deathmaster-ranged1.png
+ image="undead-deathmaster-ranged1.png"
[/frame]
[missile_frame]
[frame]
begin=-250
end=-200
- image=undead-deathmaster-ranged2.png
+ image="undead-deathmaster-ranged2.png"
[/frame]
[/missile_frame]
[frame]
begin=-200
end=-150
- image=undead-deathmaster-ranged3.png
+ image="undead-deathmaster-ranged3.png"
[/frame]
[frame]
begin=-150
end=-100
- image=undead-deathmaster-ranged4.png
+ image="undead-deathmaster-ranged4.png"
[/frame]
[frame]
begin=-100
end=50
- image=undead-deathmaster-ranged1.png
+ image="undead-deathmaster-ranged1.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Demilich.cfg
diff -u wesnoth/data/units/Demilich.cfg:1.10
wesnoth/data/units/Demilich.cfg:1.11
--- wesnoth/data/units/Demilich.cfg:1.10 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Demilich.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Demilich
name= _ "Demilich"
race=undead
-image=undead-demilich.png
-image_defensive=undead-demilich-defend.png
+image="undead-demilich.png"
+image_defensive="undead-demilich-defend.png"
hitpoints=80
movement_type=undeadfoot
movement=6
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=undead-demilich-attack.png
+ image="undead-demilich-attack.png"
[/frame]
[/attack]
[attack]
@@ -39,23 +39,23 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[frame]
begin=-300
end=-200
- image=undead-demilich-ranged1.png
+ image="undead-demilich-ranged1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=undead-demilich-ranged2.png
+ image="undead-demilich-ranged2.png"
[/frame]
[frame]
begin=-100
end=50
- image=undead-demilich-ranged1.png
+ image="undead-demilich-ranged1.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Direwolf_Rider.cfg
diff -u wesnoth/data/units/Direwolf_Rider.cfg:1.6
wesnoth/data/units/Direwolf_Rider.cfg:1.7
--- wesnoth/data/units/Direwolf_Rider.cfg:1.6 Sun Jan 9 06:46:47 2005
+++ wesnoth/data/units/Direwolf_Rider.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Direwolf Rider
name= _ "Direwolf Rider"
race=goblin
-image=goblin-direwolver.png
-image_defensive=goblin-direwolver-defend.png
+image="goblin-direwolver.png"
+image_defensive="goblin-direwolver-defend.png"
hitpoints=55
movement_type=orcishfoot
movement=10
@@ -24,7 +24,7 @@
[frame]
begin=-150
end=100
- image=goblin-direwolver-attack.png
+ image="goblin-direwolver-attack.png"
[/frame]
[/attack]
[attack]
@@ -37,7 +37,7 @@
[frame]
begin=-150
end=100
- image=goblin-direwolver-attack.png
+ image="goblin-direwolver-attack.png"
[/frame]
[sound]
time=-150
Index: wesnoth/data/units/Dragoon.cfg
diff -u wesnoth/data/units/Dragoon.cfg:1.19 wesnoth/data/units/Dragoon.cfg:1.20
--- wesnoth/data/units/Dragoon.cfg:1.19 Sat Nov 6 00:18:24 2004
+++ wesnoth/data/units/Dragoon.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Dragoon
name= _ "Dragoon"
race=human
-image=human-dragoon.png
-image_moving=human-dragoon-moving.png
-image_defensive=human-dragoon-defend.png
+image="human-dragoon.png"
+image_moving="human-dragoon-moving.png"
+image_defensive="human-dragoon-defend.png"
hitpoints=58
movement_type=mounted
movement=9
@@ -36,12 +36,12 @@
[frame]
begin=-200
end=-100
- image=human-dragoon-moving.png
+ image="human-dragoon-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-dragoon-attack.png
+ image="human-dragoon-attack.png"
[/frame]
[/attack]
[attack]
@@ -57,7 +57,7 @@
[frame]
begin=-200
end=-100
- image=human-dragoon-ranged1.png
+ image="human-dragoon-ranged1.png"
[/frame]
[sound]
@@ -68,14 +68,14 @@
[frame]
begin=-100
end=50
- image=human-dragoon-ranged2.png
+ image="human-dragoon-ranged2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Drake_Burner.cfg
diff -u wesnoth/data/units/Drake_Burner.cfg:1.21
wesnoth/data/units/Drake_Burner.cfg:1.22
--- wesnoth/data/units/Drake_Burner.cfg:1.21 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Burner.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Burner
name= _ "Drake Burner"
race=drake
-image=drake-burner.png
-image_defensive=drake-burner-defend.png
-image_moving=drake-burner-flying.png
+image="drake-burner.png"
+image_defensive="drake-burner-defend.png"
+image_moving="drake-burner-flying.png"
hitpoints=45
movement_type=drakefly
movement=5
@@ -27,7 +27,7 @@
[frame]
begin=-200
end=-50
- image=drake-burner-attack-close.png
+ image="drake-burner-attack-close.png"
[/frame]
[sound]
@@ -46,14 +46,14 @@
[frame]
begin=-250
end=-150
- image=drake-burner-attack-ranged1.png
+ image="drake-burner-attack-ranged1.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=13,-6
[/frame]
[frame]
begin=-150
end=-50
- image=drake-burner-attack-ranged2.png
+ image="drake-burner-attack-ranged2.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=13,-6
[/frame]
@@ -65,8 +65,8 @@
begin=-150
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/unit]
\ No newline at end of file
Index: wesnoth/data/units/Drake_Clasher.cfg
diff -u wesnoth/data/units/Drake_Clasher.cfg:1.15
wesnoth/data/units/Drake_Clasher.cfg:1.16
--- wesnoth/data/units/Drake_Clasher.cfg:1.15 Thu Mar 10 21:05:37 2005
+++ wesnoth/data/units/Drake_Clasher.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Clasher
name= _ "Drake Clasher"
race=drake
-image=drake-clasher.png
-image_defensive=drake-clasher-defend.png
-#image_moving=drake-clasher-flying.png
+image="drake-clasher.png"
+image_defensive="drake-clasher-defend.png"
+#image_moving="drake-clasher-flying.png"
hitpoints=48
movement_type=drakefoot
movement=5
@@ -27,7 +27,7 @@
[frame]
begin=-150
end=0
- image=drake-clasher-attack-sword.png
+ image="drake-clasher-attack-sword.png"
[/frame]
[sound]
time=-150
@@ -45,7 +45,7 @@
[frame]
begin=-200
end=-50
- image=drake-clasher-attack-spear.png
+ image="drake-clasher-attack-spear.png"
[/frame]
[/attack]
Index: wesnoth/data/units/Drake_Fighter.cfg
diff -u wesnoth/data/units/Drake_Fighter.cfg:1.18
wesnoth/data/units/Drake_Fighter.cfg:1.19
--- wesnoth/data/units/Drake_Fighter.cfg:1.18 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Fighter
name= _ "Drake Fighter"
race=drake
-image=drake-fighter.png
-image_defensive=drake-fighter-defend.png
-image_moving=drake-fighter-flying.png
+image="drake-fighter.png"
+image_defensive="drake-fighter-defend.png"
+image_moving="drake-fighter-flying.png"
hitpoints=39
movement_type=drakefly
movement=6
@@ -27,12 +27,12 @@
[frame]
begin=-200
end=-50
- image=drake-fighter-attack-close1.png
+ image="drake-fighter-attack-close1.png"
[/frame]
[frame]
begin=-50
end=100
- image=drake-fighter-attack-close2.png
+ image="drake-fighter-attack-close2.png"
[/frame]
[sound]
time=-150
@@ -50,14 +50,14 @@
[frame]
begin=-250
end=-150
- image=drake-fighter-attack-fire1.png
+ image="drake-fighter-attack-fire1.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=10,0
[/frame]
[frame]
begin=-150
end=-50
- image=drake-fighter-attack-fire2.png
+ image="drake-fighter-attack-fire2.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=10,0
[/frame]
@@ -69,8 +69,8 @@
begin=-150
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Drake_Fire.cfg
diff -u wesnoth/data/units/Drake_Fire.cfg:1.17
wesnoth/data/units/Drake_Fire.cfg:1.18
--- wesnoth/data/units/Drake_Fire.cfg:1.17 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Fire.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Fire Drake
name= _ "Fire Drake"
race=drake
-image=drake-fire.png
-image_defensive=drake-fire-defend.png
-image_moving=drake-fire-flying.png
+image="drake-fire.png"
+image_defensive="drake-fire-defend.png"
+image_moving="drake-fire-flying.png"
hitpoints=57
movement_type=drakefly
movement=5
@@ -30,7 +30,7 @@
[frame]
begin=-150
end=0
- image=drake-fire-attack-close.png
+ image="drake-fire-attack-close.png"
[/frame]
[sound]
time=-150
@@ -48,7 +48,7 @@
[frame]
begin=-250
end=-50
- image=drake-fire-attack-ranged.png
+ image="drake-fire-attack-ranged.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=12,-2
[/frame]
@@ -60,8 +60,8 @@
begin=-175
end=25
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Drake_Flameheart.cfg
diff -u wesnoth/data/units/Drake_Flameheart.cfg:1.17
wesnoth/data/units/Drake_Flameheart.cfg:1.18
--- wesnoth/data/units/Drake_Flameheart.cfg:1.17 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Flameheart.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
id=Drake Flameheart
name= _ "Drake Flameheart"
race=drake
-image=drake-flameheart.png
-image_defensive=drake-flameheart-defend.png
-image_moving=drake-flameheart-flying.png
-image_leading=drake-flameheart-lead.png
+image="drake-flameheart.png"
+image_defensive="drake-flameheart-defend.png"
+image_moving="drake-flameheart-flying.png"
+image_leading="drake-flameheart-lead.png"
hitpoints=88
movement_type=drakefly
movement=5
@@ -29,17 +29,17 @@
[frame]
begin=-350
end=-250
- image=drake-flameheart-attack-close1.png
+ image="drake-flameheart-attack-close1.png"
[/frame]
[frame]
begin=-250
end=-150
- image=drake-flameheart-lead.png
+ image="drake-flameheart-lead.png"
[/frame]
[frame]
begin=-150
end=0
- image=drake-flameheart-attack-close2.png
+ image="drake-flameheart-attack-close2.png"
[/frame]
[sound]
@@ -59,7 +59,7 @@
[frame]
begin=-250
end=-50
- image=drake-flameheart-attack-ranged.png
+ image="drake-flameheart-attack-ranged.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=12,-8
[/frame]
@@ -71,8 +71,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
[/unit]
\ No newline at end of file
Index: wesnoth/data/units/Drake_Flare.cfg
diff -u wesnoth/data/units/Drake_Flare.cfg:1.15
wesnoth/data/units/Drake_Flare.cfg:1.16
--- wesnoth/data/units/Drake_Flare.cfg:1.15 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Flare.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
id=Drake Flare
name= _ "Drake Flare"
race=drake
-image=drake-flare.png
-image_defensive=drake-flare-defend.png
-image_moving=drake-flare-flying.png
-image_leading=drake-flare-lead.png
+image="drake-flare.png"
+image_defensive="drake-flare-defend.png"
+image_moving="drake-flare-flying.png"
+image_leading="drake-flare-lead.png"
hitpoints=65
ability=leadership
movement_type=drakefly
@@ -29,7 +29,7 @@
[frame]
begin=-200
end=-50
- image=drake-flare-attack-close.png
+ image="drake-flare-attack-close.png"
[/frame]
[sound]
@@ -49,7 +49,7 @@
[frame]
begin=-250
end=-50
- image=drake-flare-attack-ranged.png
+ image="drake-flare-attack-ranged.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=8,0
[/frame]
@@ -61,8 +61,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/unit]
\ No newline at end of file
Index: wesnoth/data/units/Drake_Gladiator.cfg
diff -u wesnoth/data/units/Drake_Gladiator.cfg:1.11
wesnoth/data/units/Drake_Gladiator.cfg:1.12
--- wesnoth/data/units/Drake_Gladiator.cfg:1.11 Wed Feb 9 05:21:57 2005
+++ wesnoth/data/units/Drake_Gladiator.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Gladiator
name= _ "Drake Gladiator"
race=drake
-image=drake-gladiator.png
-image_defensive=drake-gladiator-defend.png
-#image_moving=drake-gladiator-flying.png
+image="drake-gladiator.png"
+image_defensive="drake-gladiator-defend.png"
+#image_moving="drake-gladiator-flying.png"
hitpoints=70
movement_type=drakefoot
movement=5
@@ -31,7 +31,7 @@
[frame]
begin=-200
end=-50
- image=drake-gladiator-attack-sword.png
+ image="drake-gladiator-attack-sword.png"
[/frame]
[sound]
time=-150
@@ -49,7 +49,7 @@
[frame]
begin=-150
end=-50
- image=drake-gladiator-attack-spear.png
+ image="drake-gladiator-attack-spear.png"
[/frame]
[sound]
@@ -68,7 +68,7 @@
[frame]
begin=-100
end=0
- image=drake-gladiator-attack-mace.png
+ image="drake-gladiator-attack-mace.png"
[/frame]
[sound]
time=-50
Index: wesnoth/data/units/Drake_Glider.cfg
diff -u wesnoth/data/units/Drake_Glider.cfg:1.16
wesnoth/data/units/Drake_Glider.cfg:1.17
--- wesnoth/data/units/Drake_Glider.cfg:1.16 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Glider.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Glider
name= _ "Drake Glider"
race=drake
-image=drake-glider.png
-image_defensive=drake-glider-defend.png
-image_moving=drake-glider-flying.png
+image="drake-glider.png"
+image_defensive="drake-glider-defend.png"
+image_moving="drake-glider-flying.png"
hitpoints=32
movement_type=drakefly
movement=8
@@ -28,12 +28,12 @@
[frame]
begin=-200
end=-50
- image=drake-glider-attack-close1.png
+ image="drake-glider-attack-close1.png"
[/frame]
[frame]
begin=-50
end=100
- image=drake-glider-attack-close2.png
+ image="drake-glider-attack-close2.png"
[/frame]
[sound]
time=-50
@@ -51,7 +51,7 @@
[frame]
begin=-200
end=-50
- image=drake-glider-ranged-attack.png
+ image="drake-glider-ranged-attack.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=14,-3
[/frame]
@@ -63,8 +63,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Drake_Inferno.cfg
diff -u wesnoth/data/units/Drake_Inferno.cfg:1.13
wesnoth/data/units/Drake_Inferno.cfg:1.14
--- wesnoth/data/units/Drake_Inferno.cfg:1.13 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Inferno.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Inferno Drake
name= _ "Inferno Drake"
race=drake
-image=drake-inferno.png
-image_defensive=drake-inferno-defend.png
-image_moving=drake-inferno-flying.png
+image="drake-inferno.png"
+image_defensive="drake-inferno-defend.png"
+image_moving="drake-inferno-flying.png"
hitpoints=74
movement_type=drakefly
movement=5
@@ -30,7 +30,7 @@
[frame]
begin=-200
end=-50
- image=drake-inferno-attack-close.png
+ image="drake-inferno-attack-close.png"
[/frame]
[sound]
time=-150
@@ -48,7 +48,7 @@
[frame]
begin=-250
end=-50
- image=drake-inferno-attack-ranged.png
+ image="drake-inferno-attack-ranged.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=16,-6
[/frame]
@@ -60,8 +60,8 @@
begin=-200
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Drake_Sky.cfg
diff -u wesnoth/data/units/Drake_Sky.cfg:1.17
wesnoth/data/units/Drake_Sky.cfg:1.18
--- wesnoth/data/units/Drake_Sky.cfg:1.17 Sat Feb 19 22:59:08 2005
+++ wesnoth/data/units/Drake_Sky.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Sky Drake
name= _ "Sky Drake"
race=drake
-image=drake-sky.png
-image_defensive=drake-sky-defend.png
-image_moving=drake-sky-defend.png
+image="drake-sky.png"
+image_defensive="drake-sky-defend.png"
+image_moving="drake-sky-defend.png"
hitpoints=40
movement_type=fly
movement=9
@@ -32,12 +32,12 @@
[frame]
begin=-200
end=-50
- image=drake-sky-attack-melee1.png
+ image="drake-sky-attack-melee1.png"
[/frame]
[frame]
begin=-50
end=100
- image=drake-sky-attack-melee2.png
+ image="drake-sky-attack-melee2.png"
[/frame]
[sound]
time=-50
@@ -55,7 +55,7 @@
[frame]
begin=-200
end=-50
- image=drake-sky-attack-ranged-fire.png
+ image="drake-sky-attack-ranged-fire.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=14,-3
[/frame]
@@ -67,8 +67,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Drake_Slasher.cfg
diff -u wesnoth/data/units/Drake_Slasher.cfg:1.13
wesnoth/data/units/Drake_Slasher.cfg:1.14
--- wesnoth/data/units/Drake_Slasher.cfg:1.13 Wed Feb 16 00:31:54 2005
+++ wesnoth/data/units/Drake_Slasher.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Slasher
name= _ "Drake Slasher"
race=drake
-image=drake-slasher.png
-image_defensive=drake-slasher-defend.png
-#image_moving=drake-slasher-flying.png
+image="drake-slasher.png "
+image_defensive="drake-slasher-defend.png "
+#image_moving="drake-slasher-flying.png "
hitpoints=64
movement_type=drakefoot
movement=5
@@ -27,7 +27,7 @@
[frame]
begin=-150
end=-50
- image=drake-slasher-slash.png
+ image="drake-slasher-slash.png "
[/frame]
[sound]
time=-150
@@ -47,7 +47,7 @@
[frame]
begin=-200
end=-50
- image=drake-slasher-pierce.png
+ image="drake-slasher-pierce.png "
[/frame]
[sound]
Index: wesnoth/data/units/Drake_Warrior.cfg
diff -u wesnoth/data/units/Drake_Warrior.cfg:1.22
wesnoth/data/units/Drake_Warrior.cfg:1.23
--- wesnoth/data/units/Drake_Warrior.cfg:1.22 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Drake_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Drake Warrior
name= _ "Drake Warrior"
race=drake
-image=drake-warrior.png
-image_defensive=drake-warrior-defend.png
-image_moving=drake-warrior-flying.png
+image="drake-warrior.png"
+image_defensive="drake-warrior-defend.png"
+image_moving="drake-warrior-flying.png"
hitpoints=55
movement_type=drakefly
movement=6
@@ -27,12 +27,12 @@
[frame]
begin=-200
end=-50
- image=drake-warrior-attack-close1.png
+ image="drake-warrior-attack-close1.png"
[/frame]
[frame]
begin=-50
end=100
- image=drake-warrior-attack-close2.png
+ image="drake-warrior-attack-close2.png"
[/frame]
[sound]
time=-150
@@ -50,7 +50,7 @@
[frame]
begin=-200
end=-50
- image=drake-warrior-attack-ranged.png
+ image="drake-warrior-attack-ranged.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=10,-2
[/frame]
@@ -62,8 +62,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Draug.cfg
diff -u wesnoth/data/units/Draug.cfg:1.2 wesnoth/data/units/Draug.cfg:1.3
--- wesnoth/data/units/Draug.cfg:1.2 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Draug.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Draug
name= _ "Draug"
race=undead
-image=undead-draug.png
-image_defensive=undead-draug-defend.png
+image="undead-draug.png"
+image_defensive="undead-draug-defend.png"
hitpoints=50
movement_type=undeadfoot
movement=5
@@ -29,12 +29,12 @@
[frame]
begin=-100
end=0
- image=undead-draug-attack1.png
+ image="undead-draug-attack1.png"
[/frame]
[frame]
begin=0
end=100
- image=undead-draug-attack2.png
+ image="undead-draug-attack2.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Duelist.cfg
diff -u wesnoth/data/units/Duelist.cfg:1.17 wesnoth/data/units/Duelist.cfg:1.18
--- wesnoth/data/units/Duelist.cfg:1.17 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Duelist.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Duelist
name= _ "Duelist"
race=human
-image=human-duelist.png
-image_defensive=human-duelist-defend.png
+image="human-duelist.png"
+image_defensive="human-duelist-defend.png"
hitpoints=44
movement_type=elusivefoot
movement=7
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image="human-duelist-attack.png"
+ image=""human-duelist-attack.png""
[/frame]
[sound]
time=-250
@@ -45,13 +45,13 @@
[frame]
begin=-200
end=50
- image=human-duelist-ranged.png
+ image="human-duelist-ranged.png"
[/frame]
[missile_frame]
begin=-50
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Dwarvish_Berserker.cfg
diff -u wesnoth/data/units/Dwarvish_Berserker.cfg:1.24
wesnoth/data/units/Dwarvish_Berserker.cfg:1.25
--- wesnoth/data/units/Dwarvish_Berserker.cfg:1.24 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Dwarvish_Berserker.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Berserker
name= _ "Dwarvish Berserker"
race=dwarf
-image=dwarf-berserker.png
-image_defensive=dwarf-berserker-defend.png
+image="dwarf-berserker.png"
+image_defensive="dwarf-berserker-defend.png"
hitpoints=48
movement_type=dwarvishfoot
movement=5
@@ -33,7 +33,7 @@
[frame]
begin=-100
end=100
- image=dwarf-berserker-attack.png
+ image="dwarf-berserker-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Dwarvish_Dragonguard.cfg
diff -u wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.9
wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.10
--- wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.9 Wed Mar 2 22:36:43 2005
+++ wesnoth/data/units/Dwarvish_Dragonguard.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Dragonguard
name= _ "Dwarvish Dragonguard"
race=dwarf
-image=dwarf-dragonguard.png
-image_defensive=dwarf-dragonguard-defend.png
+image="dwarf-dragonguard.png"
+image_defensive="dwarf-dragonguard-defend.png"
hitpoints=52
movement_type=dwarvishfoot
movement=4
@@ -25,7 +25,7 @@
[frame]
begin=-150
end=-50
- image=dwarf-dragonguard-attack-close.png
+ image="dwarf-dragonguard-attack-close.png"
[/frame]
[sound]
@@ -44,7 +44,7 @@
[frame]
begin=-350
end=600
- image=dwarf-dragonguard-attack-ranged.png
+ image="dwarf-dragonguard-attack-ranged.png"
[/frame]
[sound]
time=-150
@@ -53,8 +53,8 @@
[missile_frame]
begin=-150
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Dwarvish_Fighter.cfg
diff -u wesnoth/data/units/Dwarvish_Fighter.cfg:1.22
wesnoth/data/units/Dwarvish_Fighter.cfg:1.23
--- wesnoth/data/units/Dwarvish_Fighter.cfg:1.22 Fri Mar 18 23:27:27 2005
+++ wesnoth/data/units/Dwarvish_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Fighter
name= _ "Dwarvish Fighter"
race=dwarf
-image=dwarf-fighter.png
-image_defensive=dwarf-fighter-defend.png
+image="dwarf-fighter.png"
+image_defensive="dwarf-fighter-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/burin.png
#endif
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=dwarf-fighter-attack.png
+ image="dwarf-fighter-attack.png"
[/frame]
[sound]
@@ -44,7 +44,7 @@
[frame]
begin=-100
end=150
- image=dwarf-fighter-attack-mace.png
+ image="dwarf-fighter-attack-mace.png"
[/frame]
[sound]
Index: wesnoth/data/units/Dwarvish_Guardsman.cfg
diff -u wesnoth/data/units/Dwarvish_Guardsman.cfg:1.11
wesnoth/data/units/Dwarvish_Guardsman.cfg:1.12
--- wesnoth/data/units/Dwarvish_Guardsman.cfg:1.11 Tue Mar 1 00:35:08 2005
+++ wesnoth/data/units/Dwarvish_Guardsman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Guardsman
name= _ "Dwarvish Guardsman"
race=dwarf
-image=dwarf-guard.png
-image_defensive=dwarf-guard-defend.png
+image="dwarf-guard.png"
+image_defensive="dwarf-guard-defend.png"
hitpoints=35
movement_type=dwarvishfoot
[defense]
@@ -30,7 +30,7 @@
[frame]
begin=-200
end=100
- image=dwarf-guard-attack.png
+ image="dwarf-guard-attack.png"
[/frame]
[/attack]
@@ -43,7 +43,7 @@
[frame]
begin=-100
end=50
- image=dwarf-guard-attack.png
+ image="dwarf-guard-attack.png"
[/frame]
[sound]
time=-150
@@ -52,8 +52,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Dwarvish_Lord.cfg
diff -u wesnoth/data/units/Dwarvish_Lord.cfg:1.26
wesnoth/data/units/Dwarvish_Lord.cfg:1.27
--- wesnoth/data/units/Dwarvish_Lord.cfg:1.26 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Dwarvish_Lord.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Lord
name= _ "Dwarvish Lord"
race=dwarf
-image=dwarf-lord.png
-image_defensive=dwarf-lord-defend.png
+image="dwarf-lord.png"
+image_defensive="dwarf-lord-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/burin.png
#endif
@@ -33,7 +33,7 @@
[frame]
begin=-100
end=100
- image=dwarf-lord-attack.png
+ image="dwarf-lord-attack.png"
[/frame]
[sound]
time=-250
@@ -49,7 +49,7 @@
[frame]
begin=-150
end=100
- image=dwarf-lord-attack-mace.png
+ image="dwarf-lord-attack-mace.png"
[/frame]
[sound]
time=-150
@@ -65,13 +65,13 @@
[frame]
begin=-150
end=50
- image=dwarf-lord-ranged.png
+ image="dwarf-lord-ranged.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/hatchet-n.png
- image_diagonal=projectiles/hatchet-ne.png
+ image="projectiles/hatchet-n.png"
+ image_diagonal="projectiles/hatchet-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Dwarvish_Runemaster.cfg
diff -u wesnoth/data/units/Dwarvish_Runemaster.cfg:1.8
wesnoth/data/units/Dwarvish_Runemaster.cfg:1.9
--- wesnoth/data/units/Dwarvish_Runemaster.cfg:1.8 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Dwarvish_Runemaster.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Runemaster
name= _ "Dwarvish Runemaster"
race=dwarf
-image=dwarf-runemaster.png
-image_defensive=dwarf-runemaster-defend.png
+image="dwarf-runemaster.png"
+image_defensive="dwarf-runemaster-defend.png"
hitpoints=75
movement_type=dwarvishfoot
movement=5
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=dwarf-runemaster-attack.png
+ image="dwarf-runemaster-attack.png"
[/frame]
[sound]
time=-100
@@ -54,7 +54,7 @@
[missile_frame]
begin=-110
end=15
- image=projectiles/lightning-bolt.png
+ image="projectiles/lightning-bolt.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Dwarvish_Sentinel.cfg
diff -u wesnoth/data/units/Dwarvish_Sentinel.cfg:1.3
wesnoth/data/units/Dwarvish_Sentinel.cfg:1.4
--- wesnoth/data/units/Dwarvish_Sentinel.cfg:1.3 Tue Mar 1 00:36:09 2005
+++ wesnoth/data/units/Dwarvish_Sentinel.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Sentinel
name= _ "Dwarvish Sentinel"
race=dwarf
-image=dwarf-sentinel.png
-image_defensive=dwarf-sentinel-defend.png
+image="dwarf-sentinel.png"
+image_defensive="dwarf-sentinel-defend.png"
hitpoints=45
movement_type=dwarvishfoot
[defense]
@@ -32,7 +32,7 @@
[frame]
begin=-200
end=100
- image=dwarf-sentinel-attack.png
+ image="dwarf-sentinel-attack.png"
[/frame]
[/attack]
@@ -45,7 +45,7 @@
[frame]
begin=-100
end=50
- image=dwarf-sentinel-attack.png
+ image="dwarf-sentinel-attack.png"
[/frame]
[sound]
time=-150
@@ -54,8 +54,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Dwarvish_Stalwart.cfg
diff -u wesnoth/data/units/Dwarvish_Stalwart.cfg:1.9
wesnoth/data/units/Dwarvish_Stalwart.cfg:1.10
--- wesnoth/data/units/Dwarvish_Stalwart.cfg:1.9 Wed Mar 2 22:42:02 2005
+++ wesnoth/data/units/Dwarvish_Stalwart.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Stalwart
name= _ "Dwarvish Stalwart"
race=dwarf
-image=dwarf-stalwart.png
-image_defensive=dwarf-stalwart-defend.png
+image="dwarf-stalwart.png"
+image_defensive="dwarf-stalwart-defend.png"
hitpoints=37
movement_type=dwarvishfoot
[defense]
@@ -32,7 +32,7 @@
[frame]
begin=-200
end=100
- image=dwarf-stalwart-attack.png
+ image="dwarf-stalwart-attack.png"
[/frame]
[/attack]
@@ -45,7 +45,7 @@
[frame]
begin=-100
end=50
- image=dwarf-stalwart-attack.png
+ image="dwarf-stalwart-attack.png"
[/frame]
[sound]
time=-150
@@ -54,8 +54,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Dwarvish_Steelclad.cfg
diff -u wesnoth/data/units/Dwarvish_Steelclad.cfg:1.13
wesnoth/data/units/Dwarvish_Steelclad.cfg:1.14
--- wesnoth/data/units/Dwarvish_Steelclad.cfg:1.13 Fri Oct 29 22:16:52 2004
+++ wesnoth/data/units/Dwarvish_Steelclad.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Steelclad
name= _ "Dwarvish Steelclad"
race=dwarf
-image=dwarf-warrior.png
-image_defensive=dwarf-warrior-defend.png
+image="dwarf-warrior.png"
+image_defensive="dwarf-warrior-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/burin.png
#endif
@@ -33,7 +33,7 @@
[frame]
begin=-100
end=100
- image=dwarf-warrior-attack.png
+ image="dwarf-warrior-attack.png"
[/frame]
[sound]
time=-200
@@ -50,7 +50,7 @@
[frame]
begin=-150
end=100
- image=dwarf-warrior-attack-mace.png
+ image="dwarf-warrior-attack-mace.png"
[/frame]
[sound]
time=-150
Index: wesnoth/data/units/Dwarvish_Thunderer.cfg
diff -u wesnoth/data/units/Dwarvish_Thunderer.cfg:1.15
wesnoth/data/units/Dwarvish_Thunderer.cfg:1.16
--- wesnoth/data/units/Dwarvish_Thunderer.cfg:1.15 Fri Mar 18 23:26:44 2005
+++ wesnoth/data/units/Dwarvish_Thunderer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Thunderer
name= _ "Dwarvish Thunderer"
race=dwarf
-image=dwarf-thunderer.png
-image_defensive=dwarf-thunderer-defend.png
+image="dwarf-thunderer.png"
+image_defensive="dwarf-thunderer-defend.png"
hitpoints=37
movement_type=dwarvishfoot
movement=4
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=dwarf-thunderer-attack.png
+ image="dwarf-thunderer-attack.png"
[/frame]
[sound]
@@ -51,13 +51,13 @@
[frame]
begin=-350
end=600
- image=dwarf-thunderer-attack1.png
+ image="dwarf-thunderer-attack1.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Dwarvish_Thunderguard.cfg
diff -u wesnoth/data/units/Dwarvish_Thunderguard.cfg:1.12
wesnoth/data/units/Dwarvish_Thunderguard.cfg:1.13
--- wesnoth/data/units/Dwarvish_Thunderguard.cfg:1.12 Wed Mar 2 22:36:43 2005
+++ wesnoth/data/units/Dwarvish_Thunderguard.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Thunderguard
name= _ "Dwarvish Thunderguard"
race=dwarf
-image=dwarf-thunderguard.png
-image_defensive=dwarf-thunderguard-defend.png
+image="dwarf-thunderguard.png"
+image_defensive="dwarf-thunderguard-defend.png"
hitpoints=42
movement_type=dwarvishfoot
movement=4
@@ -26,13 +26,13 @@
[frame]
begin=-150
end=-50
- image=dwarf-thunderguard-attack1.png
+ image="dwarf-thunderguard-attack1.png"
[/frame]
[frame]
begin=-50
end=50
- image=dwarf-thunderguard-attack2.png
+ image="dwarf-thunderguard-attack2.png"
[/frame]
[sound]
@@ -58,13 +58,13 @@
[frame]
begin=-350
end=600
- image=dwarf-thunderguard-attack.png
+ image="dwarf-thunderguard-attack.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Dwarvish_Ulfserker.cfg
diff -u wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.7
wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.8
--- wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.7 Fri Mar 18 23:25:22 2005
+++ wesnoth/data/units/Dwarvish_Ulfserker.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Dwarvish Ulfserker
name= _ "Dwarvish Ulfserker"
race=dwarf
-image=dwarf-ulfserker.png
-image_defensive=dwarf-ulfserker-defend.png
+image="dwarf-ulfserker.png"
+image_defensive="dwarf-ulfserker-defend.png"
hitpoints=40
movement_type=dwarvishfoot
movement=5
@@ -33,7 +33,7 @@
[frame]
begin=-100
end=100
- image=dwarf-ulfserker-attack.png
+ image="dwarf-ulfserker-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Elder_Mage.cfg
diff -u wesnoth/data/units/Elder_Mage.cfg:1.26
wesnoth/data/units/Elder_Mage.cfg:1.27
--- wesnoth/data/units/Elder_Mage.cfg:1.26 Sun Feb 20 11:01:09 2005
+++ wesnoth/data/units/Elder_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Elder Mage
name= _ "Elder Mage"
race=human
-image=elder-mage.png
-image_defensive=elder-mage-defend.png
+image="elder-mage.png"
+image_defensive="elder-mage-defend.png"
profile=portraits/Heir_To_The_Throne/delfador.png
hitpoints=55
movement_type=smallfoot
@@ -32,7 +32,7 @@
[frame]
begin=-100
end=100
- image=elder-mage-attack.png
+ image="elder-mage-attack.png"
[/frame]
[/attack]
[attack]
@@ -46,7 +46,7 @@
[frame]
begin=-600
end=0
- image=elder-mage-ranged.png
+ image="elder-mage-ranged.png"
halo=halo/elder-mage-halo1.png:100,halo/elder-mage-halo2.png:100,halo/elder-mage-halo3.png:100,halo/elder-mage-halo4.png:100,halo/elder-mage-halo5.png:100,halo/elder-mage-halo6.png:100
halo_x,halo_y=13,-376
[/frame]
@@ -57,8 +57,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/lightning-n.png
- image_diagonal=projectiles/lightning-ne.png
+ image="projectiles/lightning-n.png"
+ image_diagonal="projectiles/lightning-ne.png"
halo=halo/elder-mage-halo7.png
halo_x,halo_y=13,-26
[/missile_frame]
Index: wesnoth/data/units/Elder_Wose.cfg
diff -u wesnoth/data/units/Elder_Wose.cfg:1.5
wesnoth/data/units/Elder_Wose.cfg:1.6
--- wesnoth/data/units/Elder_Wose.cfg:1.5 Sat Sep 18 19:11:53 2004
+++ wesnoth/data/units/Elder_Wose.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Elder Wose
name= _ "Elder Wose"
race=wose
-image=wose-elder.png
-image_defensive=wose-elder-defend.png
+image="wose-elder.png"
+image_defensive="wose-elder-defend.png"
ability=ambush,regenerates
hitpoints=60
movement_type=treefolk
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image="wose-elder-attack.png"
+ image=""wose-elder-attack.png""
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Archer.cfg
diff -u wesnoth/data/units/Elvish_Archer.cfg:1.19
wesnoth/data/units/Elvish_Archer.cfg:1.20
--- wesnoth/data/units/Elvish_Archer.cfg:1.19 Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/Elvish_Archer.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "Elvish Archer"
race=elf
gender=male,female
-image=elvish-archer.png
-image_long=elvish-archer-bow.png
-image_defensive=elvish-archer-defend.png
-image_defensive_long=elvish-archer-bow-defend.png
+image="elvish-archer.png"
+image_long="elvish-archer-bow.png"
+image_defensive="elvish-archer-defend.png"
+image_defensive_long="elvish-archer-bow-defend.png"
hitpoints=29
movement_type=woodland
movement=6
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=elvish-archer-attack.png
+ image="elvish-archer-attack.png"
[/frame]
[sound]
@@ -56,24 +56,24 @@
[frame]
begin=-400
end=-250
- image=elvish-archer-attack1.png
+ image="elvish-archer-attack1.png"
[/frame]
[frame]
begin=-250
end=-150
- image=elvish-archer-attack2.png
+ image="elvish-archer-attack2.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-archer-attack3.png
+ image="elvish-archer-attack3.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -82,10 +82,10 @@
name= _ "female^Elvish Archer"
race=elf
gender=female
- image=elvish-archer+female.png
- image_long=elvish-archer+female-bow.png
- image_defensive=elvish-archer+female-defend.png
- image_defensive_long=elvish-archer+female-bow-defend.png
+ image="elvish-archer+female.png"
+ image_long="elvish-archer+female-bow.png"
+ image_defensive="elvish-archer+female-defend.png"
+ image_defensive_long="elvish-archer+female-bow-defend.png"
hitpoints=29
movement_type=woodland
movement=6
@@ -103,7 +103,7 @@
[frame]
begin=-100
end=100
- image=elvish-archer+female-attack.png
+ image="elvish-archer+female-attack.png"
[/frame]
[sound]
@@ -135,24 +135,24 @@
[frame]
begin=-400
end=-250
- image=elvish-archer+female-attack1.png
+ image="elvish-archer+female-attack1.png"
[/frame]
[frame]
begin=-250
end=-150
- image=elvish-archer+female-attack2.png
+ image="elvish-archer+female-attack2.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-archer+female-attack3.png
+ image="elvish-archer+female-attack3.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Elvish_Avenger.cfg
diff -u wesnoth/data/units/Elvish_Avenger.cfg:1.22
wesnoth/data/units/Elvish_Avenger.cfg:1.23
--- wesnoth/data/units/Elvish_Avenger.cfg:1.22 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Avenger.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "Elvish Avenger"
race=elf
gender=male,female
-image=elvish-avenger.png
-image_long=elvish-avenger-bow.png
-image_defensive=elvish-avenger-defend.png
-image_defensive_long=elvish-avenger-bow-defend.png
+image="elvish-avenger.png"
+image_long="elvish-avenger-bow.png"
+image_defensive="elvish-avenger-defend.png"
+image_defensive_long="elvish-avenger-bow-defend.png"
hitpoints=60
movement_type=woodland
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=elvish-avenger-attack.png
+ image="elvish-avenger-attack.png"
[/frame]
[sound]
time=-250
@@ -55,34 +55,34 @@
[frame]
begin=-525
end=-450
- image=elvish-avenger-bow.png
+ image="elvish-avenger-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-avenger-attack1.png
+ image="elvish-avenger-attack1.png"
[/frame]
[frame]
begin=-300
end=-150
- image=elvish-avenger-attack2.png
+ image="elvish-avenger-attack2.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-avenger-attack3.png
+ image="elvish-avenger-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-avenger-bow.png
+ image="elvish-avenger-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -91,10 +91,10 @@
name= _ "female^Elvish Avenger"
race=elf
gender=female
- image=elvish-avenger+female.png
- image_long=elvish-avenger+female-bow.png
- image_defensive=elvish-avenger+female-defend.png
- image_defensive_long=elvish-avenger+female-bow-defend.png
+ image="elvish-avenger+female.png"
+ image_long="elvish-avenger+female-bow.png"
+ image_defensive="elvish-avenger+female-defend.png"
+ image_defensive_long="elvish-avenger+female-bow-defend.png"
hitpoints=60
movement_type=woodland
movement=6
@@ -116,7 +116,7 @@
[frame]
begin=-100
end=100
- image=elvish-avenger+female-attack.png
+ image="elvish-avenger+female-attack.png"
[/frame]
[sound]
time=-250
@@ -143,34 +143,34 @@
[frame]
begin=-525
end=-450
- image=elvish-avenger+female-bow.png
+ image="elvish-avenger+female-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-avenger+female-attack1.png
+ image="elvish-avenger+female-attack1.png"
[/frame]
[frame]
begin=-300
end=-150
- image=elvish-avenger+female-attack2.png
+ image="elvish-avenger+female-attack2.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-avenger+female-attack3.png
+ image="elvish-avenger+female-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-avenger+female-bow.png
+ image="elvish-avenger+female-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Elvish_Captain.cfg
diff -u wesnoth/data/units/Elvish_Captain.cfg:1.14
wesnoth/data/units/Elvish_Captain.cfg:1.15
--- wesnoth/data/units/Elvish_Captain.cfg:1.14 Thu Nov 11 00:00:36 2004
+++ wesnoth/data/units/Elvish_Captain.cfg Sun Mar 27 23:06:16 2005
@@ -2,11 +2,11 @@
id=Elvish Captain
name= _ "Elvish Captain"
race=elf
-image=elvish-captain.png
-image_long=elvish-captain-bow.png
-image_defensive=elvish-captain-defend.png
-image_defensive_long=elvish-captain-bow-defend.png
-image_leading=elvish-captain-leading.png
+image="elvish-captain.png"
+image_long="elvish-captain-bow.png"
+image_defensive="elvish-captain-defend.png"
+image_defensive_long="elvish-captain-bow-defend.png"
+image_leading="elvish-captain-leading.png"
hitpoints=44
ability=leadership
movement_type=woodland
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=elvish-captain-attack.png
+ image="elvish-captain-attack.png"
[/frame]
[sound]
time=-250
@@ -55,34 +55,34 @@
[frame]
begin=-600
end=-450
- image=elvish-captain-bow.png
+ image="elvish-captain-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-captain-bow-attack1.png
+ image="elvish-captain-bow-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-captain-bow-attack2.png
+ image="elvish-captain-bow-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-captain-bow-attack3.png
+ image="elvish-captain-bow-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-captain-bow.png
+ image="elvish-captain-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Champion.cfg
diff -u wesnoth/data/units/Elvish_Champion.cfg:1.14
wesnoth/data/units/Elvish_Champion.cfg:1.15
--- wesnoth/data/units/Elvish_Champion.cfg:1.14 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Champion.cfg Sun Mar 27 23:06:16 2005
@@ -2,10 +2,10 @@
id=Elvish Champion
name= _ "Elvish Champion"
race=elf
-image=elvish-champion.png
-image_defensive=elvish-champion-defend.png
-image_long=elvish-champion-bow.png
-image_defensive_long=elvish-champion-bow-defend.png
+image="elvish-champion.png"
+image_defensive="elvish-champion-defend.png"
+image_long="elvish-champion-bow.png"
+image_defensive_long="elvish-champion-bow-defend.png"
hitpoints=70
movement_type=woodland
movement=5
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=elvish-champion-attack.png
+ image="elvish-champion-attack.png"
[/frame]
[sound]
@@ -56,34 +56,34 @@
[frame]
begin=-600
end=-450
- image=elvish-champion-bow.png
+ image="elvish-champion-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-champion-bow-attack1.png
+ image="elvish-champion-bow-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-champion-bow-attack2.png
+ image="elvish-champion-bow-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-champion-bow-attack3.png
+ image="elvish-champion-bow-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-champion-bow.png
+ image="elvish-champion-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Druid.cfg
diff -u wesnoth/data/units/Elvish_Druid.cfg:1.27
wesnoth/data/units/Elvish_Druid.cfg:1.28
--- wesnoth/data/units/Elvish_Druid.cfg:1.27 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Elvish_Druid.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "female^Elvish Druid"
race=elf
gender=female
-image=elvish-druid.png
-image_defensive=elvish-druid-defend.png
-image_healing=elvish-druid-healing.png
-image_halo_healing=elvish-druid-healing1.png:90,elvish-druid-healing2.png:90,elvish-druid-healing3.png:90,elvish-druid-healing4.png:90,elvish-druid-healing5.png:90,elvish-druid-healing6.png:90,elvish-druid-healing7.png:90,elvish-druid-healing8.png:90
+image="elvish-druid.png"
+image_defensive="elvish-druid-defend.png"
+image_healing="elvish-druid-healing.png"
+image_halo_healing="elvish-druid-healing1.png:90,elvish-druid-healing2.png:90,elvish-druid-healing3.png:90,elvish-druid-healing4.png:90,elvish-druid-healing5.png:90,elvish-druid-healing6.png:90,elvish-druid-healing7.png:90,elvish-druid-healing8.png:90"
hitpoints=36
movement_type=woodland
movement=5
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=elvish-druid-attack.png
+ image="elvish-druid-attack.png"
[/frame]
[sound]
time=-100
@@ -49,13 +49,13 @@
[frame]
begin=-250
end=0
- image=elvish-druid-ranged.png
+ image="elvish-druid-ranged.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/entangle.png
- image_diagonal=projectiles/entangle.png
+ image="projectiles/entangle.png"
+ image_diagonal="projectiles/entangle.png"
[/missile_frame]
[/attack]
@@ -69,13 +69,13 @@
[frame]
begin=-250
end=0
- image=elvish-druid-ranged.png
+ image="elvish-druid-ranged.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/thorns.png
- image_diagonal=projectiles/thorns-ne.png
+ image="projectiles/thorns.png"
+ image_diagonal="projectiles/thorns-ne.png"
[/missile_frame]
[sound]
time=-150
Index: wesnoth/data/units/Elvish_Enchantress.cfg
diff -u wesnoth/data/units/Elvish_Enchantress.cfg:1.4
wesnoth/data/units/Elvish_Enchantress.cfg:1.5
--- wesnoth/data/units/Elvish_Enchantress.cfg:1.4 Sat Dec 4 06:19:59 2004
+++ wesnoth/data/units/Elvish_Enchantress.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "female^Elvish Enchantress"
race=elf
gender=female
-image=elvish-enchantress.png
-image_defensive=elvish-enchantress-defend.png
-image_defensive_long=elvish-enchantress-ranged-defend.png
+image="elvish-enchantress.png"
+image_defensive="elvish-enchantress-defend.png"
+image_defensive_long="elvish-enchantress-ranged-defend.png"
hitpoints=47
movement_type=woodland
[resistance]
@@ -32,27 +32,27 @@
[frame]
begin=-250
end=-200
- image=elvish-enchantress-melee1.png
+ image="elvish-enchantress-melee1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=elvish-enchantress-melee2.png
+ image="elvish-enchantress-melee2.png"
[/frame]
[frame]
begin=-100
end=25
- image=elvish-enchantress-melee3.png
+ image="elvish-enchantress-melee3.png"
[/frame]
[frame]
begin=25
end=100
- image=elvish-enchantress-melee4.png
+ image="elvish-enchantress-melee4.png"
[/frame]
[frame]
begin=100
end=150
- image=elvish-enchantress-melee5.png
+ image="elvish-enchantress-melee5.png"
[/frame]
[sound]
time=-100
@@ -71,45 +71,45 @@
[frame]
begin=-450
end=-380
- image=elvish-enchantress-entangle1.png
+ image="elvish-enchantress-entangle1.png"
[/frame]
[frame]
begin=-380
end=-310
- image=elvish-enchantress-entangle2.png
+ image="elvish-enchantress-entangle2.png"
[/frame]
[frame]
begin=-310
end=-240
- image=elvish-enchantress-entangle3.png
+ image="elvish-enchantress-entangle3.png"
[/frame]
[frame]
begin=-240
end=-170
- image=elvish-enchantress-entangle4.png
+ image="elvish-enchantress-entangle4.png"
[/frame]
[frame]
begin=-170
end=-100
- image=elvish-enchantress-entangle5.png
+ image="elvish-enchantress-entangle5.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/entangle.png
- image_diagonal=projectiles/entangle.png
+ image="projectiles/entangle.png"
+ image_diagonal="projectiles/entangle.png"
[/missile_frame]
[frame]
begin=-100
end=-30
- image=elvish-enchantress-entangle6.png
+ image="elvish-enchantress-entangle6.png"
[/frame]
[frame]
begin=-30
end=40
- image=elvish-enchantress-entangle7.png
+ image="elvish-enchantress-entangle7.png"
[/frame]
[/attack]
@@ -124,34 +124,34 @@
[frame]
begin=-450
end=-380
- image=elvish-enchantress-attack1.png
+ image="elvish-enchantress-attack1.png"
[/frame]
[frame]
begin=-380
end=-310
- image=elvish-enchantress-attack2.png
+ image="elvish-enchantress-attack2.png"
[/frame]
[frame]
begin=-310
end=-240
- image=elvish-enchantress-attack3.png
+ image="elvish-enchantress-attack3.png"
[/frame]
[frame]
begin=-240
end=-170
- image=elvish-enchantress-attack4.png
+ image="elvish-enchantress-attack4.png"
[/frame]
[frame]
begin=-170
end=-100
- image=elvish-enchantress-attack5.png
+ image="elvish-enchantress-attack5.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/icemissile-n.png
- image_diagonal=projectiles/icemissile-ne.png
+ image="projectiles/icemissile-n.png"
+ image_diagonal="projectiles/icemissile-ne.png"
halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100,
halo_x,halo_y=0,0
[/missile_frame]
@@ -159,12 +159,12 @@
[frame]
begin=-100
end=-30
- image=elvish-enchantress-attack6.png
+ image="elvish-enchantress-attack6.png"
[/frame]
[frame]
begin=-30
end=40
- image=elvish-enchantress-attack7.png
+ image="elvish-enchantress-attack7.png"
[/frame]
[/attack]
Index: wesnoth/data/units/Elvish_Fighter.cfg
diff -u wesnoth/data/units/Elvish_Fighter.cfg:1.12
wesnoth/data/units/Elvish_Fighter.cfg:1.13
--- wesnoth/data/units/Elvish_Fighter.cfg:1.12 Thu Nov 11 00:00:36 2004
+++ wesnoth/data/units/Elvish_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -2,10 +2,10 @@
id=Elvish Fighter
name= _ "Elvish Fighter"
race=elf
-image=elvish-fighter.png
-image_long=elvish-fighter-bow.png
-image_defensive=elvish-fighter-defend.png
-image_defensive_long=elvish-fighter-bow-defend.png
+image="elvish-fighter.png"
+image_long="elvish-fighter-bow.png"
+image_defensive="elvish-fighter-defend.png"
+image_defensive_long="elvish-fighter-bow-defend.png"
hitpoints=32
movement_type=woodland
{LESS_NIMBLE_ELF}
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=elvish-fighter-attack.png
+ image="elvish-fighter-attack.png"
[/frame]
[sound]
@@ -57,37 +57,37 @@
[frame]
begin=-600
end=-450
- image=elvish-fighter-bow.png
+ image="elvish-fighter-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-fighter-bow-attack1.png
+ image="elvish-fighter-bow-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-fighter-bow-attack2.png
+ image="elvish-fighter-bow-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-fighter-bow-attack2.png
+ image="elvish-fighter-bow-attack2.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-fighter-bow.png
+ image="elvish-fighter-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Hero.cfg
diff -u wesnoth/data/units/Elvish_Hero.cfg:1.13
wesnoth/data/units/Elvish_Hero.cfg:1.14
--- wesnoth/data/units/Elvish_Hero.cfg:1.13 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Hero.cfg Sun Mar 27 23:06:16 2005
@@ -2,10 +2,10 @@
id=Elvish Hero
name= _ "Elvish Hero"
race=elf
-image=elvish-hero.png
-image_long=elvish-hero-bow.png
-image_defensive=elvish-hero-defend.png
-image_defensive_long=elvish-hero-bow-defend.png
+image="elvish-hero.png"
+image_long="elvish-hero-bow.png"
+image_defensive="elvish-hero-defend.png"
+image_defensive_long="elvish-hero-bow-defend.png"
hitpoints=48
movement_type=woodland
movement=5
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=elvish-hero-attack.png
+ image="elvish-hero-attack.png"
[/frame]
[sound]
@@ -56,34 +56,34 @@
[frame]
begin=-600
end=-450
- image=elvish-hero-bow.png
+ image="elvish-hero-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-hero-bow-attack1.png
+ image="elvish-hero-bow-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-hero-bow-attack2.png
+ image="elvish-hero-bow-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-hero-bow-attack3.png
+ image="elvish-hero-bow-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-hero-bow.png
+ image="elvish-hero-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_High_Lord.cfg
diff -u wesnoth/data/units/Elvish_High_Lord.cfg:1.9
wesnoth/data/units/Elvish_High_Lord.cfg:1.10
--- wesnoth/data/units/Elvish_High_Lord.cfg:1.9 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Elvish_High_Lord.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Elvish High Lord
name= _ "Elvish High Lord"
race=elf
-image=elvish-high-lord.png
-image_defensive=elvish-high-lord-defend.png
-image_defensive_long=elvish-high-lord-ranged-defend.png
+image="elvish-high-lord.png"
+image_defensive="elvish-high-lord-defend.png"
+image_defensive_long="elvish-high-lord-ranged-defend.png"
profile=portraits/Heir_To_The_Throne/kalenz.png
hitpoints=63
movement_type=woodland
@@ -26,12 +26,12 @@
[frame]
begin=-150
end=-50
- image=elvish-high-lord-attack-sword-1.png
+ image="elvish-high-lord-attack-sword-1.png"
[/frame]
[frame]
begin=-50
end=50
- image=elvish-high-lord-attack-sword-2.png
+ image="elvish-high-lord-attack-sword-2.png"
[/frame]
[sound]
time=-75
@@ -48,21 +48,21 @@
[frame]
begin=-300
end=-200
- image=elvish-high-lord-ranged1.png
+ image="elvish-high-lord-ranged1.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=14,-4
[/frame]
[frame]
begin=-200
end=-100
- image=elvish-high-lord-ranged2.png
+ image="elvish-high-lord-ranged2.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=14,-16
[/frame]
[frame]
begin=-100
end=0
- image=elvish-high-lord-ranged3.png
+ image="elvish-high-lord-ranged3.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=28,0
[/frame]
@@ -74,8 +74,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
halo=halo/fireball7.png
halo_x,halo_y=15,-4
[/missile_frame]
Index: wesnoth/data/units/Elvish_Lady.cfg
diff -u wesnoth/data/units/Elvish_Lady.cfg:1.6
wesnoth/data/units/Elvish_Lady.cfg:1.7
--- wesnoth/data/units/Elvish_Lady.cfg:1.6 Sun Feb 20 11:01:09 2005
+++ wesnoth/data/units/Elvish_Lady.cfg Sun Mar 27 23:06:16 2005
@@ -4,7 +4,7 @@
name= _ "female^Elvish Lady"
gender=female
race=elf
-image=parandra.png
+image="parandra.png"
hitpoints=30
movement_type=fly
movement=6
Index: wesnoth/data/units/Elvish_Lord.cfg
diff -u wesnoth/data/units/Elvish_Lord.cfg:1.23
wesnoth/data/units/Elvish_Lord.cfg:1.24
--- wesnoth/data/units/Elvish_Lord.cfg:1.23 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Elvish_Lord.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Elvish Lord
name= _ "Elvish Lord"
race=elf
-image=elvish-lord.png
-image_defensive=elvish-lord-defend.png
+image="elvish-lord.png"
+image_defensive="elvish-lord-defend.png"
profile=portraits/Heir_To_The_Throne/kalenz.png
hitpoints=51
movement_type=woodland
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=elvish-lord-melee.png
+ image="elvish-lord-melee.png"
[/frame]
[sound]
time=-250
@@ -42,14 +42,14 @@
[frame]
begin=-300
end=-100
- image=elvish-lord-ranged1.png
+ image="elvish-lord-ranged1.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-16,-20
[/frame]
[frame]
begin=-100
end=0
- image=elvish-lord-ranged2.png
+ image="elvish-lord-ranged2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=15,-4
[/frame]
@@ -61,8 +61,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
halo=halo/fireball7.png
halo_x,halo_y=15,-4
[/missile_frame]
Index: wesnoth/data/units/Elvish_Marksman.cfg
diff -u wesnoth/data/units/Elvish_Marksman.cfg:1.20
wesnoth/data/units/Elvish_Marksman.cfg:1.21
--- wesnoth/data/units/Elvish_Marksman.cfg:1.20 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Marksman.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "Elvish Marksman"
race=elf
gender=male,female
-image=elvish-marksman.png
-image_long=elvish-marksman-bow.png
-image_defensive=elvish-marksman-defend.png
-image_defensive_long=elvish-marksman-bow-defend.png
+image="elvish-marksman.png"
+image_long="elvish-marksman-bow.png"
+image_defensive="elvish-marksman-defend.png"
+image_defensive_long="elvish-marksman-bow-defend.png"
hitpoints=37
movement_type=woodland
movement=6
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=elvish-marksman-attack.png
+ image="elvish-marksman-attack.png"
[/frame]
[sound]
time=-250
@@ -44,32 +44,32 @@
[frame]
begin=-475
end=-400
- image=elvish-marksman-bow.png
+ image="elvish-marksman-bow.png"
[/frame]
[frame]
begin=-400
end=-325
- image=elvish-marksman-attack1.png
+ image="elvish-marksman-attack1.png"
[/frame]
[frame]
begin=-325
end=-250
- image=elvish-marksman-attack2.png
+ image="elvish-marksman-attack2.png"
[/frame]
[frame]
begin=-250
end=-150
- image=elvish-marksman-attack3.png
+ image="elvish-marksman-attack3.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-marksman-attack4.png
+ image="elvish-marksman-attack4.png"
[/frame]
[frame]
begin=0
end=75
- image=elvish-marksman-bow.png
+ image="elvish-marksman-bow.png"
[/frame]
[sound]
@@ -86,8 +86,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -96,10 +96,10 @@
name= _ "female^Elvish Marksman"
race=elf
gender=female
- image=elvish-marksman+female.png
- image_long=elvish-marksman+female-bow.png
- image_defensive=elvish-marksman+female-defend.png
- image_defensive_long=elvish-marksman+female-bow-defend.png
+ image="elvish-marksman+female.png"
+ image_long="elvish-marksman+female-bow.png"
+ image_defensive="elvish-marksman+female-defend.png"
+ image_defensive_long="elvish-marksman+female-bow-defend.png"
hitpoints=37
movement_type=woodland
movement=6
@@ -120,7 +120,7 @@
[frame]
begin=-100
end=100
- image=elvish-marksman+female-attack.png
+ image="elvish-marksman+female-attack.png"
[/frame]
[sound]
time=-250
@@ -137,32 +137,32 @@
[frame]
begin=-475
end=-400
- image=elvish-marksman+female-bow.png
+ image="elvish-marksman+female-bow.png"
[/frame]
[frame]
begin=-400
end=-325
- image=elvish-marksman+female-attack1.png
+ image="elvish-marksman+female-attack1.png"
[/frame]
[frame]
begin=-325
end=-250
- image=elvish-marksman+female-attack2.png
+ image="elvish-marksman+female-attack2.png"
[/frame]
[frame]
begin=-250
end=-150
- image=elvish-marksman+female-attack3.png
+ image="elvish-marksman+female-attack3.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-marksman+female-attack4.png
+ image="elvish-marksman+female-attack4.png"
[/frame]
[frame]
begin=0
end=75
- image=elvish-marksman+female-bow.png
+ image="elvish-marksman+female-bow.png"
[/frame]
[sound]
@@ -179,8 +179,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Elvish_Marshal.cfg
diff -u wesnoth/data/units/Elvish_Marshal.cfg:1.17
wesnoth/data/units/Elvish_Marshal.cfg:1.18
--- wesnoth/data/units/Elvish_Marshal.cfg:1.17 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Marshal.cfg Sun Mar 27 23:06:16 2005
@@ -2,11 +2,11 @@
id=Elvish Marshal
name= _ "Elvish Marshal"
race=elf
-image=elvish-marshal.png
-image_long=elvish-marshal-bow.png
-image_defensive=elvish-marshal-defend.png
-image_defensive_long=elvish-marshal-bow-defend.png
-image_leading=elvish-marshal-leading.png
+image="elvish-marshal.png"
+image_long="elvish-marshal-bow.png"
+image_defensive="elvish-marshal-defend.png"
+image_defensive_long="elvish-marshal-bow-defend.png"
+image_leading="elvish-marshal-leading.png"
hitpoints=62
ability=leadership
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=elvish-marshal-attack.png
+ image="elvish-marshal-attack.png"
[/frame]
[sound]
time=-250
@@ -47,27 +47,27 @@
[frame]
begin=-600
end=-450
- image=elvish-marshal-bow.png
+ image="elvish-marshal-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-marshal-attack1.png
+ image="elvish-marshal-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-marshal-attack2.png
+ image="elvish-marshal-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-marshal-attack3.png
+ image="elvish-marshal-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-marshal-bow.png
+ image="elvish-marshal-bow.png"
[/frame]
[sound]
@@ -84,8 +84,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Outrider.cfg
diff -u wesnoth/data/units/Elvish_Outrider.cfg:1.17
wesnoth/data/units/Elvish_Outrider.cfg:1.18
--- wesnoth/data/units/Elvish_Outrider.cfg:1.17 Thu Nov 11 00:00:36 2004
+++ wesnoth/data/units/Elvish_Outrider.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Elvish Outrider
name= _ "Elvish Outrider"
race=elf
-image=elvish-outrider.png
-image_defensive=elvish-outrider-defend.png
+image="elvish-outrider.png"
+image_defensive="elvish-outrider-defend.png"
hitpoints=50
movement_type=woodland
movement=10
@@ -32,7 +32,7 @@
[frame]
begin=-100
end=100
- image=elvish-outrider-attack.png
+ image="elvish-outrider-attack.png"
[/frame]
[sound]
time=-100
@@ -48,12 +48,12 @@
[frame]
begin=-300
end=-150
- image=elvish-outrider-attack1.png
+ image="elvish-outrider-attack1.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-outrider-attack2.png
+ image="elvish-outrider-attack2.png"
[/frame]
[sound]
time=-100
@@ -69,8 +69,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Elvish_Ranger.cfg
diff -u wesnoth/data/units/Elvish_Ranger.cfg:1.22
wesnoth/data/units/Elvish_Ranger.cfg:1.23
--- wesnoth/data/units/Elvish_Ranger.cfg:1.22 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Ranger.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
id=Elvish Ranger
race=elf
gender=male,female
-image=elvish-ranger.png
-image_long=elvish-ranger-bow.png
-image_defensive=elvish-ranger-defend.png
-image_defensive_long=elvish-ranger-bow-defend.png
+image="elvish-ranger.png"
+image_long="elvish-ranger-bow.png"
+image_defensive="elvish-ranger-defend.png"
+image_defensive_long="elvish-ranger-bow-defend.png"
hitpoints=42
movement_type=woodland
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=elvish-ranger-attack.png
+ image="elvish-ranger-attack.png"
[/frame]
[sound]
@@ -57,34 +57,34 @@
[frame]
begin=-525
end=-450
- image=elvish-ranger-bow.png
+ image="elvish-ranger-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-ranger-attack1.png
+ image="elvish-ranger-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-ranger-attack2.png
+ image="elvish-ranger-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-ranger-attack3.png
+ image="elvish-ranger-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-ranger-bow.png
+ image="elvish-ranger-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -93,10 +93,10 @@
id=Elvish Ranger
race=elf
gender=female
- image=elvish-ranger+female.png
- image_long=elvish-ranger+female-bow.png
- image_defensive=elvish-ranger+female-defend.png
- image_defensive_long=elvish-ranger+female-bow-defend.png
+ image="elvish-ranger+female.png"
+ image_long="elvish-ranger+female-bow.png"
+ image_defensive="elvish-ranger+female-defend.png"
+ image_defensive_long="elvish-ranger+female-bow-defend.png"
hitpoints=42
movement_type=woodland
movement=6
@@ -118,7 +118,7 @@
[frame]
begin=-100
end=100
- image=elvish-ranger+female-attack.png
+ image="elvish-ranger+female-attack.png"
[/frame]
[sound]
@@ -146,34 +146,34 @@
[frame]
begin=-525
end=-450
- image=elvish-ranger+female-bow.png
+ image="elvish-ranger+female-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=elvish-ranger+female-attack1.png
+ image="elvish-ranger+female-attack1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=elvish-ranger+female-attack2.png
+ image="elvish-ranger+female-attack2.png"
[/frame]
[frame]
begin=-200
end=0
- image=elvish-ranger+female-attack3.png
+ image="elvish-ranger+female-attack3.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-ranger+female-bow.png
+ image="elvish-ranger+female-bow.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Elvish_Rider.cfg
diff -u wesnoth/data/units/Elvish_Rider.cfg:1.6
wesnoth/data/units/Elvish_Rider.cfg:1.7
--- wesnoth/data/units/Elvish_Rider.cfg:1.6 Thu Nov 11 00:00:36 2004
+++ wesnoth/data/units/Elvish_Rider.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Elvish Rider
name= _ "Elvish Rider"
race=elf
-image=elvish-rider.png
-image_defensive=elvish-rider-defend.png
-image_moving=elvish-rider-moving.png
+image="elvish-rider.png"
+image_defensive="elvish-rider-defend.png"
+image_moving="elvish-rider-moving.png"
hitpoints=42
movement_type=woodland
movement=10
@@ -36,12 +36,12 @@
[frame]
begin=-200
end=-100
- image=elvish-rider-moving.png
+ image="elvish-rider-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=elvish-rider-attack.png
+ image="elvish-rider-attack.png"
[/frame]
[sound]
time=-200
@@ -57,12 +57,12 @@
[frame]
begin=-300
end=-150
- image=elvish-rider-attack1.png
+ image="elvish-rider-attack1.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-rider-attack2.png
+ image="elvish-rider-attack2.png"
[/frame]
[sound]
time=-100
@@ -78,8 +78,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
Index: wesnoth/data/units/Elvish_Scout.cfg
diff -u wesnoth/data/units/Elvish_Scout.cfg:1.16
wesnoth/data/units/Elvish_Scout.cfg:1.17
--- wesnoth/data/units/Elvish_Scout.cfg:1.16 Thu Nov 11 00:00:36 2004
+++ wesnoth/data/units/Elvish_Scout.cfg Sun Mar 27 23:06:16 2005
@@ -1,9 +1,9 @@
[unit]
id=Elvish Scout
name= _ "Elvish Scout"
-image=elvish-scout.png
-image_defensive=elvish-scout-defend.png
-image_moving=elvish-scout-moving.png
+image="elvish-scout.png"
+image_defensive="elvish-scout-defend.png"
+image_moving="elvish-scout-moving.png"
race=elf
hitpoints=32
movement_type=woodland
@@ -37,12 +37,12 @@
[frame]
begin=-200
end=-100
- image=elvish-scout-moving.png
+ image="elvish-scout-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=elvish-scout-attack.png
+ image="elvish-scout-attack.png"
[/frame]
[sound]
time=-200
@@ -58,12 +58,12 @@
[frame]
begin=-300
end=-150
- image=elvish-scout-attack1.png
+ image="elvish-scout-attack1.png"
[/frame]
[frame]
begin=-150
end=0
- image=elvish-scout-attack2.png
+ image="elvish-scout-attack2.png"
[/frame]
[sound]
time=-100
@@ -77,8 +77,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Shaman.cfg
diff -u wesnoth/data/units/Elvish_Shaman.cfg:1.29
wesnoth/data/units/Elvish_Shaman.cfg:1.30
--- wesnoth/data/units/Elvish_Shaman.cfg:1.29 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Elvish_Shaman.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "female^Elvish Shaman"
race=elf
gender=female
-image=elvish-shaman.png
-image_defensive=elvish-shaman-defend.png
-image_healing=null
-image_halo_healing=elvish-shaman-heal1.png:70,elvish-shaman-heal2.png:70,elvish-shaman-heal3.png:70,elvish-shaman-heal4.png:70,elvish-shaman-heal5.png:70,elvish-shaman-heal6.png:70,elvish-shaman-heal7.png:70,elvish-shaman-heal8.png:70,elvish-shaman-heal9.png:70
+image="elvish-shaman.png"
+image_defensive="elvish-shaman-defend.png"
+image_healing="null"
+image_halo_healing="elvish-shaman-heal1.png:70,elvish-shaman-heal2.png:70,elvish-shaman-heal3.png:70,elvish-shaman-heal4.png:70,elvish-shaman-heal5.png:70,elvish-shaman-heal6.png:70,elvish-shaman-heal7.png:70,elvish-shaman-heal8.png:70,elvish-shaman-heal9.png:70"
hitpoints=26
ability=heals
movement_type=woodland
@@ -31,7 +31,7 @@
[frame]
begin=-100
end=100
- image=elvish-shaman-attack.png
+ image="elvish-shaman-attack.png"
[/frame]
[sound]
time=-100
@@ -49,13 +49,13 @@
[frame]
begin=-250
end=0
- image=elvish-shaman-attack2.png
+ image="elvish-shaman-attack2.png"
[/frame]
[missile_frame]
begin=-250
end=0
- image=projectiles/entangle.png
- image_diagonal=projectiles/entangle.png
+ image="projectiles/entangle.png"
+ image_diagonal="projectiles/entangle.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Elvish_Sharpshooter.cfg
diff -u wesnoth/data/units/Elvish_Sharpshooter.cfg:1.19
wesnoth/data/units/Elvish_Sharpshooter.cfg:1.20
--- wesnoth/data/units/Elvish_Sharpshooter.cfg:1.19 Sun Feb 27 09:24:54 2005
+++ wesnoth/data/units/Elvish_Sharpshooter.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "Elvish Sharpshooter"
race=elf
gender=male,female
-image=elvish-sharpshooter.png
-image_long=elvish-sharpshooter-bow.png
-image_defensive=elvish-sharpshooter-defend.png
-image_defensive_long=elvish-sharpshooter-bow-defend.png
+image="elvish-sharpshooter.png"
+image_long="elvish-sharpshooter-bow.png"
+image_defensive="elvish-sharpshooter-defend.png"
+image_defensive_long="elvish-sharpshooter-bow-defend.png"
hitpoints=45
movement_type=woodland
movement=6
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=elvish-sharpshooter-attack.png
+ image="elvish-sharpshooter-attack.png"
[/frame]
[sound]
@@ -45,32 +45,32 @@
[frame]
begin=-445
end=-380
- image=elvish-sharpshooter-bow.png
+ image="elvish-sharpshooter-bow.png"
[/frame]
[frame]
begin=-380
end=-305
- image=elvish-sharpshooter-attack1.png
+ image="elvish-sharpshooter-attack1.png"
[/frame]
[frame]
begin=-305
end=-230
- image=elvish-sharpshooter-attack2.png
+ image="elvish-sharpshooter-attack2.png"
[/frame]
[frame]
begin=-230
end=-130
- image=elvish-sharpshooter-attack3.png
+ image="elvish-sharpshooter-attack3.png"
[/frame]
[frame]
begin=-130
end=0
- image=elvish-sharpshooter-attack4.png
+ image="elvish-sharpshooter-attack4.png"
[/frame]
[frame]
begin=0
end=65
- image=elvish-sharpshooter-bow.png
+ image="elvish-sharpshooter-bow.png"
[/frame]
[sound]
@@ -87,8 +87,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -97,10 +97,10 @@
name= _ "female^Elvish Sharpshooter"
race=elf
gender=female
- image=elvish-sharpshooter+female.png
- image_long=elvish-sharpshooter+female-bow.png
- image_defensive=elvish-sharpshooter+female-defend.png
- image_defensive_long=elvish-sharpshooter+female-bow-defend.png
+ image="elvish-sharpshooter+female.png"
+ image_long="elvish-sharpshooter+female-bow.png"
+ image_defensive="elvish-sharpshooter+female-defend.png"
+ image_defensive_long="elvish-sharpshooter+female-bow-defend.png"
hitpoints=45
movement_type=woodland
movement=6
@@ -121,7 +121,7 @@
[frame]
begin=-100
end=100
- image=elvish-sharpshooter+female-attack.png
+ image="elvish-sharpshooter+female-attack.png"
[/frame]
[sound]
@@ -139,32 +139,32 @@
[frame]
begin=-445
end=-380
- image=elvish-sharpshooter+female-bow.png
+ image="elvish-sharpshooter+female-bow.png"
[/frame]
[frame]
begin=-380
end=-305
- image=elvish-sharpshooter+female-attack1.png
+ image="elvish-sharpshooter+female-attack1.png"
[/frame]
[frame]
begin=-305
end=-230
- image=elvish-sharpshooter+female-attack2.png
+ image="elvish-sharpshooter+female-attack2.png"
[/frame]
[frame]
begin=-230
end=-130
- image=elvish-sharpshooter+female-attack3.png
+ image="elvish-sharpshooter+female-attack3.png"
[/frame]
[frame]
begin=-130
end=0
- image=elvish-sharpshooter+female-attack4.png
+ image="elvish-sharpshooter+female-attack4.png"
[/frame]
[frame]
begin=0
end=65
- image=elvish-sharpshooter+female-bow.png
+ image="elvish-sharpshooter+female-bow.png"
[/frame]
[sound]
@@ -181,8 +181,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Elvish_Shyde.cfg
diff -u wesnoth/data/units/Elvish_Shyde.cfg:1.28
wesnoth/data/units/Elvish_Shyde.cfg:1.29
--- wesnoth/data/units/Elvish_Shyde.cfg:1.28 Wed Mar 16 16:31:43 2005
+++ wesnoth/data/units/Elvish_Shyde.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "female^Elvish Shyde"
race=elf
gender=female
-image=elvish-shyde.png
-image_healing=null
-image_halo_healing=elvish-shyde-healing1.png:100,elvish-shyde-healing2.png:100,elvish-shyde-healing3.png:100,elvish-shyde-healing4.png:100,elvish-shyde-healing5.png:100,elvish-shyde-healing6.png:100,elvish-shyde-healing7.png:100,elvish-shyde-healing8.png:100,elvish-shyde-healing9.png:100,elvish-shyde-healing10.png:100,elvish-shyde-healing11.png:100,elvish-shyde-healing12.png:100
-image_defensive=elvish-shyde-defend.png
+image="elvish-shyde.png"
+image_healing="null"
+image_halo_healing="elvish-shyde-healing1.png:100,elvish-shyde-healing2.png:100,elvish-shyde-healing3.png:100,elvish-shyde-healing4.png:100,elvish-shyde-healing5.png:100,elvish-shyde-healing6.png:100,elvish-shyde-healing7.png:100,elvish-shyde-healing8.png:100,elvish-shyde-healing9.png:100,elvish-shyde-healing10.png:100,elvish-shyde-healing11.png:100,elvish-shyde-healing12.png:100"
+image_defensive="elvish-shyde-defend.png"
halo=halo/shyde-stationary-halo1.png:150,halo/shyde-stationary-halo2.png:150,halo/shyde-stationary-halo3.png:150,halo/shyde-stationary-halo4.png:150,halo/shyde-stationary-halo5.png:150,halo/shyde-stationary-halo6.png:150
hitpoints=46
movement_type=woodlandfloat
@@ -33,17 +33,17 @@
[frame]
begin=-200
end=-100
- image=elvish-shyde-ftouch-attack1.png
+ image="elvish-shyde-ftouch-attack1.png"
[/frame]
[frame]
begin=-100
end=0
- image=elvish-shyde-ftouch-attack2.png
+ image="elvish-shyde-ftouch-attack2.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-shyde-ftouch-attack3.png
+ image="elvish-shyde-ftouch-attack3.png"
[/frame]
[/attack]
@@ -58,13 +58,13 @@
[frame]
begin=-200
end=-100
- image=elvish-shyde-ftouch-attack3.png
+ image="elvish-shyde-ftouch-attack3.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/entangle.png
- image_diagonal=projectiles/entangle.png
+ image="projectiles/entangle.png"
+ image_diagonal="projectiles/entangle.png"
[/missile_frame]
[/attack]
@@ -78,13 +78,13 @@
[frame]
begin=-200
end=-100
- image=elvish-shyde-ftouch-attack3.png
+ image="elvish-shyde-ftouch-attack3.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/thorns.png
- image_diagonal=projectiles/thorns-ne.png
+ image="projectiles/thorns.png"
+ image_diagonal="projectiles/thorns-ne.png"
[/missile_frame]
[sound]
time=-150
Index: wesnoth/data/units/Elvish_Sorceress.cfg
diff -u wesnoth/data/units/Elvish_Sorceress.cfg:1.4
wesnoth/data/units/Elvish_Sorceress.cfg:1.5
--- wesnoth/data/units/Elvish_Sorceress.cfg:1.4 Sat Dec 4 06:19:59 2004
+++ wesnoth/data/units/Elvish_Sorceress.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "female^Elvish Sorceress"
race=elf
gender=female
-image=elvish-sorceress.png
-image_defensive=elvish-sorceress-defend.png
-image_defensive_long=elvish-sorceress-ranged-defend.png
+image="elvish-sorceress.png"
+image_defensive="elvish-sorceress-defend.png"
+image_defensive_long="elvish-sorceress-ranged-defend.png"
hitpoints=41
movement_type=woodland
[resistance]
@@ -32,27 +32,27 @@
[frame]
begin=-250
end=-200
- image=elvish-sorceress-melee1.png
+ image="elvish-sorceress-melee1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=elvish-sorceress-melee2.png
+ image="elvish-sorceress-melee2.png"
[/frame]
[frame]
begin=-100
end=25
- image=elvish-sorceress-melee3.png
+ image="elvish-sorceress-melee3.png"
[/frame]
[frame]
begin=25
end=100
- image=elvish-sorceress-melee4.png
+ image="elvish-sorceress-melee4.png"
[/frame]
[frame]
begin=100
end=150
- image=elvish-sorceress-melee5.png
+ image="elvish-sorceress-melee5.png"
[/frame]
[sound]
time=-100
@@ -71,45 +71,45 @@
[frame]
begin=-450
end=-380
- image=elvish-sorceress-entangle1.png
+ image="elvish-sorceress-entangle1.png"
[/frame]
[frame]
begin=-380
end=-310
- image=elvish-sorceress-entangle2.png
+ image="elvish-sorceress-entangle2.png"
[/frame]
[frame]
begin=-310
end=-240
- image=elvish-sorceress-entangle3.png
+ image="elvish-sorceress-entangle3.png"
[/frame]
[frame]
begin=-240
end=-170
- image=elvish-sorceress-entangle4.png
+ image="elvish-sorceress-entangle4.png"
[/frame]
[frame]
begin=-170
end=-100
- image=elvish-sorceress-entangle5.png
+ image="elvish-sorceress-entangle5.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/entangle.png
- image_diagonal=projectiles/entangle.png
+ image="projectiles/entangle.png"
+ image_diagonal="projectiles/entangle.png"
[/missile_frame]
[frame]
begin=-100
end=-30
- image=elvish-sorceress-entangle6.png
+ image="elvish-sorceress-entangle6.png"
[/frame]
[frame]
begin=-30
end=40
- image=elvish-sorceress-entangle7.png
+ image="elvish-sorceress-entangle7.png"
[/frame]
[/attack]
@@ -124,34 +124,34 @@
[frame]
begin=-450
end=-380
- image=elvish-sorceress-attack1.png
+ image="elvish-sorceress-attack1.png"
[/frame]
[frame]
begin=-380
end=-310
- image=elvish-sorceress-attack2.png
+ image="elvish-sorceress-attack2.png"
[/frame]
[frame]
begin=-310
end=-240
- image=elvish-sorceress-attack3.png
+ image="elvish-sorceress-attack3.png"
[/frame]
[frame]
begin=-240
end=-170
- image=elvish-sorceress-attack4.png
+ image="elvish-sorceress-attack4.png"
[/frame]
[frame]
begin=-170
end=-100
- image=elvish-sorceress-attack5.png
+ image="elvish-sorceress-attack5.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/icemissile-n.png
- image_diagonal=projectiles/icemissile-ne.png
+ image="projectiles/icemissile-n.png"
+ image_diagonal="projectiles/icemissile-ne.png"
halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100,
halo_x,halo_y=0,0
[/missile_frame]
@@ -159,12 +159,12 @@
[frame]
begin=-100
end=-30
- image=elvish-sorceress-attack6.png
+ image="elvish-sorceress-attack6.png"
[/frame]
[frame]
begin=-30
end=40
- image=elvish-sorceress-attack7.png
+ image="elvish-sorceress-attack7.png"
[/frame]
[/attack]
Index: wesnoth/data/units/Elvish_Sylph.cfg
diff -u wesnoth/data/units/Elvish_Sylph.cfg:1.4
wesnoth/data/units/Elvish_Sylph.cfg:1.5
--- wesnoth/data/units/Elvish_Sylph.cfg:1.4 Sat Dec 4 06:19:59 2004
+++ wesnoth/data/units/Elvish_Sylph.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "female^Elvish Sylph"
race=elf
gender=female
-image=elvish-sylph.png
-image_defensive=elvish-sylph-defend.png
+image="elvish-sylph.png"
+image_defensive="elvish-sylph-defend.png"
hitpoints=55
movement_type=woodlandfloat
[resistance]
@@ -32,17 +32,17 @@
[frame]
begin=-200
end=-100
- image=elvish-sylph-ftouch-attack1.png
+ image="elvish-sylph-ftouch-attack1.png"
[/frame]
[frame]
begin=-100
end=0
- image=elvish-sylph-ftouch-attack2.png
+ image="elvish-sylph-ftouch-attack2.png"
[/frame]
[frame]
begin=0
end=100
- image=elvish-sylph-ftouch-attack3.png
+ image="elvish-sylph-ftouch-attack3.png"
[/frame]
[/attack]
@@ -58,24 +58,24 @@
[frame]
begin=-210
end=-140
- image=elvish-sylph-gossamer-attack1.png
+ image="elvish-sylph-gossamer-attack1.png"
[/frame]
[frame]
begin=-140
end=-70
- image=elvish-sylph-gossamer-attack2.png
+ image="elvish-sylph-gossamer-attack2.png"
[/frame]
[frame]
begin=-70
end=0
- image=elvish-sylph-gossamer-attack3.png
+ image="elvish-sylph-gossamer-attack3.png"
[/frame]
[missile_frame]
begin=-300
end=50
- image=projectiles/web.png
- image_diagonal=projectiles/web.png
+ image="projectiles/web.png"
+ image_diagonal="projectiles/web.png"
[/missile_frame]
[/attack]
@@ -90,24 +90,24 @@
[frame]
begin=-320
end=-240
- image=elvish-sylph-attack1.png
+ image="elvish-sylph-attack1.png"
[/frame]
[frame]
begin=-240
end=-160
- image=elvish-sylph-attack2.png
+ image="elvish-sylph-attack2.png"
[/frame]
[frame]
begin=-160
end=-80
- image=elvish-sylph-attack3.png
+ image="elvish-sylph-attack3.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/icemissile-n.png
- image_diagonal=projectiles/icemissile-ne.png
+ image="projectiles/icemissile-n.png"
+ image_diagonal="projectiles/icemissile-ne.png"
halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100,
halo_x,halo_y=10,-2
[/missile_frame]
@@ -115,12 +115,12 @@
[frame]
begin=-80
end=0
- image=elvish-sylph-attack4.png
+ image="elvish-sylph-attack4.png"
[/frame]
[frame]
begin=0
end=80
- image=elvish-sylph-attack5.png
+ image="elvish-sylph-attack5.png"
[/frame]
[/attack]
Index: wesnoth/data/units/Fencer.cfg
diff -u wesnoth/data/units/Fencer.cfg:1.12 wesnoth/data/units/Fencer.cfg:1.13
--- wesnoth/data/units/Fencer.cfg:1.12 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Fencer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Fencer
name= _ "Fencer"
race=human
-image=human-fencer.png
-image_defensive=human-fencer-defend.png
+image="human-fencer.png"
+image_defensive="human-fencer-defend.png"
hitpoints=28
movement_type=elusivefoot
movement=6
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image="human-fencer-attack.png"
+ image=""human-fencer-attack.png""
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Fighter.cfg
diff -u wesnoth/data/units/Fighter.cfg:1.9 wesnoth/data/units/Fighter.cfg:1.10
--- wesnoth/data/units/Fighter.cfg:1.9 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Fighter
name= _ "Fighter"
race=human
-image=konrad-fighter.png
-image_defensive=konrad-fighter-defend.png
+image="konrad-fighter.png"
+image_defensive="konrad-fighter-defend.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=32
movement_type=smallfoot
@@ -25,12 +25,12 @@
[frame]
begin=-250
end=-100
- image=konrad-fighter.png
+ image="konrad-fighter.png"
[/frame]
[frame]
begin=-100
end=50
- image="konrad-fighter-attack.png"
+ image=""konrad-fighter-attack.png""
[/frame]
[sound]
@@ -43,8 +43,8 @@
id=Fighter
name= _ "Fighter"
race=human
-image=konrad-fighter.png
-image_defensive=konrad-fighter-defend.png
+image="konrad-fighter.png"
+image_defensive="konrad-fighter-defend.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=32
movement_type=smallfoot
@@ -66,12 +66,12 @@
[frame]
begin=-250
end=-100
- image=konrad-fighter.png
+ image="konrad-fighter.png"
[/frame]
[frame]
begin=-100
end=50
- image="konrad-fighter-attack.png"
+ image=""konrad-fighter-attack.png""
[/frame]
[sound]
@@ -94,8 +94,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/variation]
Index: wesnoth/data/units/Fire_Dragon.cfg
diff -u wesnoth/data/units/Fire_Dragon.cfg:1.9
wesnoth/data/units/Fire_Dragon.cfg:1.10
--- wesnoth/data/units/Fire_Dragon.cfg:1.9 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Fire_Dragon.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Fire Dragon
name= _ "Fire Dragon"
race=monster
-image=fire-dragon.png
-image_defensive=fire-dragon-defend.png
+image="fire-dragon.png"
+image_defensive="fire-dragon-defend.png"
ability=leadership
hitpoints=101
movement_type=drakefly
@@ -27,7 +27,7 @@
[frame]
begin=-150
end=100
- image=fire-dragon-attack-bite.png
+ image="fire-dragon-attack-bite.png"
[/frame]
[sound]
time=-150
@@ -46,7 +46,7 @@
[frame]
begin=-100
end=100
- image=fire-dragon-attack-tail.png
+ image="fire-dragon-attack-tail.png"
[/frame]
[sound]
time=-100
@@ -65,7 +65,7 @@
[frame]
begin=-250
end=50
- image=fire-dragon-attack-breath.png
+ image="fire-dragon-attack-breath.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png,halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=26,-2
[/frame]
@@ -79,8 +79,8 @@
begin=-100
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-big-n.png
- image_diagonal=projectiles/fireball-big-nw.png
+ image="projectiles/fireball-big-n.png"
+ image_diagonal="projectiles/fireball-big-nw.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Fireball.cfg
diff -u wesnoth/data/units/Fireball.cfg:1.6 wesnoth/data/units/Fireball.cfg:1.7
--- wesnoth/data/units/Fireball.cfg:1.6 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Fireball.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
[unit]
id=Fireball
name= _ "Fireball"
-image=projectiles/fireball-nw.png
-image_defensive=projectiles/fireball-nw.png
+image="projectiles/fireball-nw.png"
+image_defensive="projectiles/fireball-nw.png"
hitpoints=1
movement_type=fly
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=projectiles/fireball-nw.png
+ image="projectiles/fireball-nw.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Footpad.cfg
diff -u wesnoth/data/units/Footpad.cfg:1.9 wesnoth/data/units/Footpad.cfg:1.10
--- wesnoth/data/units/Footpad.cfg:1.9 Wed Jan 12 06:59:57 2005
+++ wesnoth/data/units/Footpad.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Footpad"
race=human
gender=male,female
-image=neutral-footpad.png
-image_defensive=neutral-footpad-defend.png
+image="neutral-footpad.png"
+image_defensive="neutral-footpad-defend.png"
hitpoints=28
movement_type=elusivefoot
movement=7
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=neutral-footpad-attack.png
+ image="neutral-footpad-attack.png"
[/frame]
[sound]
@@ -48,19 +48,19 @@
[frame]
begin=-250
end=-50
- image=neutral-footpad-attack1.png
+ image="neutral-footpad-attack1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-footpad-attack2.png
+ image="neutral-footpad-attack2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
@@ -69,8 +69,8 @@
name= _ "female^Footpad"
race=human
gender=female
- image=neutral-footpad+female.png
- image_defensive=neutral-footpad+female-defend.png
+ image="neutral-footpad+female.png"
+ image_defensive="neutral-footpad+female-defend.png"
hitpoints=28
movement_type=elusivefoot
movement=7
@@ -92,7 +92,7 @@
[frame]
begin=-100
end=100
- image=neutral-footpad+female-attack.png
+ image="neutral-footpad+female-attack.png"
[/frame]
[sound]
@@ -114,19 +114,19 @@
[frame]
begin=-250
end=-50
- image=neutral-footpad+female-attack1.png
+ image="neutral-footpad+female-attack1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-footpad+female-attack2.png
+ image="neutral-footpad+female-attack2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Galleon.cfg
diff -u wesnoth/data/units/Galleon.cfg:1.5 wesnoth/data/units/Galleon.cfg:1.6
--- wesnoth/data/units/Galleon.cfg:1.5 Tue Oct 19 20:48:32 2004
+++ wesnoth/data/units/Galleon.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
[unit]
id=Galleon
name= _ "Galleon"
-image=galleon.png
+image="galleon.png"
hitpoints=1
#set movement to fly so it appears above water
movement_type=fly
Index: wesnoth/data/units/Gate.cfg
diff -u wesnoth/data/units/Gate.cfg:1.6 wesnoth/data/units/Gate.cfg:1.7
--- wesnoth/data/units/Gate.cfg:1.6 Sat Feb 19 22:59:08 2005
+++ wesnoth/data/units/Gate.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[unit]
id=Gate
name= _ "Gate"
-image=terrain/cavewall.png
+image="terrain/cavewall.png"
hitpoints=4
movement_type=none
[resistance]
Index: wesnoth/data/units/General.cfg
diff -u wesnoth/data/units/General.cfg:1.23 wesnoth/data/units/General.cfg:1.24
--- wesnoth/data/units/General.cfg:1.23 Sun Dec 19 16:29:44 2004
+++ wesnoth/data/units/General.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=General
name= _ "General"
race=human
-image=human-general.png
-image_defensive=human-general-defend.png
-image_leading=human-general-leading.png
+image="human-general.png"
+image_defensive="human-general-defend.png"
+image_leading="human-general-leading.png"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/gweddry.png
#endif
@@ -33,13 +33,13 @@
[frame]
begin=-175
end=100
- image=human-general-attack-sword1.png
+ image="human-general-attack-sword1.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-general-attack-sword2.png
+ image="human-general-attack-sword2.png"
[/frame]
[sound]
@@ -56,7 +56,7 @@
[frame]
begin=-150
end=100
- image=human-general-attack-crossbow.png
+ image="human-general-attack-crossbow.png"
[/frame]
[sound]
@@ -73,8 +73,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Ghost.cfg
diff -u wesnoth/data/units/Ghost.cfg:1.17 wesnoth/data/units/Ghost.cfg:1.18
--- wesnoth/data/units/Ghost.cfg:1.17 Wed Jan 19 07:56:28 2005
+++ wesnoth/data/units/Ghost.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Ghost
name= _ "Ghost"
race=undead
-image=undead-ghost.png
-image_defensive=undead-ghost-defend.png
+image="undead-ghost.png"
+image_defensive="undead-ghost-defend.png"
hitpoints=17
movement_type=undeadspirit
movement=7
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=undead-ghost-attack.png
+ image="undead-ghost-attack.png"
[/frame]
[/attack]
[attack]
@@ -36,13 +36,13 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[frame]
begin=-250
end=50
- image=undead-ghost-attack1.png
+ image="undead-ghost-attack1.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Ghoul.cfg
diff -u wesnoth/data/units/Ghoul.cfg:1.8 wesnoth/data/units/Ghoul.cfg:1.9
--- wesnoth/data/units/Ghoul.cfg:1.8 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Ghoul.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Ghoul
name= _ "Ghoul"
race=undead
-image=undead-ghoul.png
-image_defensive=undead-ghoul-defend.png
+image="undead-ghoul.png"
+image_defensive="undead-ghoul-defend.png"
hitpoints=28
movement_type=undeadfoot
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-300
end=50
- image=undead-ghoul-attack.png
+ image="undead-ghoul-attack.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Giant_Mudcrawler.cfg
diff -u wesnoth/data/units/Giant_Mudcrawler.cfg:1.7
wesnoth/data/units/Giant_Mudcrawler.cfg:1.8
--- wesnoth/data/units/Giant_Mudcrawler.cfg:1.7 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Giant_Mudcrawler.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Giant Mudcrawler
name= _ "Giant Mudcrawler"
race=Monster
-image=giant-mudcrawler.png
-image_defensive=giant-mudcrawler-defend.png
+image="giant-mudcrawler.png"
+image_defensive="giant-mudcrawler-defend.png"
#ability=regenerates
hitpoints=36
movement_type=scuttlefoot
@@ -26,12 +26,12 @@
[frame]
begin=-300
end=-200
- image=giant-mudcrawler-attack1.png
+ image="giant-mudcrawler-attack1.png"
[/frame]
[frame]
begin=-200
end=-50
- image=giant-mudcrawler-attack2.png
+ image="giant-mudcrawler-attack2.png"
[/frame]
[sound]
time=-300
@@ -48,8 +48,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Giant_Scorpion.cfg
diff -u wesnoth/data/units/Giant_Scorpion.cfg:1.8
wesnoth/data/units/Giant_Scorpion.cfg:1.9
--- wesnoth/data/units/Giant_Scorpion.cfg:1.8 Sat Sep 4 16:59:21 2004
+++ wesnoth/data/units/Giant_Scorpion.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Giant Scorpion
name= _ "Giant Scorpion"
race=monster
-image=scorpion.png
-image_defensive=scorpion-defend.png
+image="scorpion.png"
+image_defensive="scorpion-defend.png"
hitpoints=40
movement_type=scuttlefoot
movement=8
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=scorpion-sting-attack.png
+ image="scorpion-sting-attack.png"
[/frame]
[/attack]
[attack]
@@ -46,7 +46,7 @@
[frame]
begin=-100
end=100
- image=scorpion-pincers-attack.png
+ image="scorpion-pincers-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Goblin_Impaler.cfg
diff -u wesnoth/data/units/Goblin_Impaler.cfg:1.5
wesnoth/data/units/Goblin_Impaler.cfg:1.6
--- wesnoth/data/units/Goblin_Impaler.cfg:1.5 Wed Dec 8 04:38:07 2004
+++ wesnoth/data/units/Goblin_Impaler.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Goblin Impaler
name= _ "Goblin Impaler"
race=goblin
-image=goblin-impaler.png
-image_defensive=goblin-impaler-defend.png
+image="goblin-impaler.png"
+image_defensive="goblin-impaler-defend.png"
hitpoints=26
movement_type=orcishfoot
movement=4
@@ -27,12 +27,12 @@
[frame]
begin=-200
end=-65
- image=goblin-impaler-attack1.png
+ image="goblin-impaler-attack1.png"
[/frame]
[frame]
begin=-65
end=100
- image=goblin-impaler-attack2.png
+ image="goblin-impaler-attack2.png"
[/frame]
[/attack]
[attack]
@@ -49,18 +49,18 @@
[frame]
begin=-400
end=-300
- image=goblin-impaler-attack-ranged1.png
+ image="goblin-impaler-attack-ranged1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=goblin-impaler-attack-ranged2.png
+ image="goblin-impaler-attack-ranged2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Goblin_Knight.cfg
diff -u wesnoth/data/units/Goblin_Knight.cfg:1.16
wesnoth/data/units/Goblin_Knight.cfg:1.17
--- wesnoth/data/units/Goblin_Knight.cfg:1.16 Sun Jan 9 06:46:47 2005
+++ wesnoth/data/units/Goblin_Knight.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Goblin Knight
name= _ "Goblin Knight"
race=goblin
-image=goblin-knight.png
-image_defensive=goblin-knight-defend.png
+image="goblin-knight.png"
+image_defensive="goblin-knight-defend.png"
hitpoints=45
movement_type=orcishfoot
movement=9
@@ -24,7 +24,7 @@
[frame]
begin=-150
end=100
- image=goblin-knight-attack.png
+ image="goblin-knight-attack.png"
[/frame]
[sound]
time=-150
Index: wesnoth/data/units/Goblin_Pillager.cfg
diff -u wesnoth/data/units/Goblin_Pillager.cfg:1.14
wesnoth/data/units/Goblin_Pillager.cfg:1.15
--- wesnoth/data/units/Goblin_Pillager.cfg:1.14 Thu Dec 2 05:49:06 2004
+++ wesnoth/data/units/Goblin_Pillager.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Goblin Pillager
name= _ "Goblin Pillager"
race=goblin
-image=goblin-pillager.png
-image_defensive=goblin-pillager-defend.png
+image="goblin-pillager.png"
+image_defensive="goblin-pillager-defend.png"
hitpoints=40
movement_type=orcishfoot
movement=9
@@ -24,7 +24,7 @@
[frame]
begin=-150
end=100
- image=goblin-pillager-attack.png
+ image="goblin-pillager-attack.png"
[/frame]
[sound]
time=-100
@@ -42,13 +42,13 @@
[frame]
begin=-200
end=100
- image=goblin-pillager-attack2.png
+ image="goblin-pillager-attack2.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/web.png
- image_diagonal=projectiles/web.png
+ image="projectiles/web.png"
+ image_diagonal="projectiles/web.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Goblin_Spearman.cfg
diff -u wesnoth/data/units/Goblin_Spearman.cfg:1.6
wesnoth/data/units/Goblin_Spearman.cfg:1.7
--- wesnoth/data/units/Goblin_Spearman.cfg:1.6 Wed Dec 8 04:38:07 2004
+++ wesnoth/data/units/Goblin_Spearman.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Goblin Spearman
name= _ "Goblin Spearman"
race=goblin
-image=goblin-spearman.png
-image_defensive=goblin-spearman-defend.png
+image="goblin-spearman.png"
+image_defensive="goblin-spearman-defend.png"
hitpoints=16
movement_type=orcishfoot
movement=4
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=goblin-spearman-melee.png
+ image="goblin-spearman-melee.png"
[/frame]
[/attack]
[attack]
@@ -43,13 +43,13 @@
[frame]
begin=-100
end=100
- image=goblin-spearman-ranged.png
+ image="goblin-spearman-ranged.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Grand_Knight.cfg
diff -u wesnoth/data/units/Grand_Knight.cfg:1.8
wesnoth/data/units/Grand_Knight.cfg:1.9
--- wesnoth/data/units/Grand_Knight.cfg:1.8 Wed Dec 15 08:38:29 2004
+++ wesnoth/data/units/Grand_Knight.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Grand Knight
name= _ "Grand Knight"
race=human
-image=grand-knight.png
-image_moving=grand-knight-defend.png
+image="grand-knight.png"
+image_moving="grand-knight-defend.png"
hitpoints=78
movement_type=mounted
movement=7
@@ -25,7 +25,7 @@
[frame]
begin=-200
end=100
- image=grand-knight-attack-sword.png
+ image="grand-knight-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -42,7 +42,7 @@
[frame]
begin=-200
end=100
- image=grand-knight-moving.png
+ image="grand-knight-moving.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Grand_Marshal.cfg
diff -u wesnoth/data/units/Grand_Marshal.cfg:1.5
wesnoth/data/units/Grand_Marshal.cfg:1.6
--- wesnoth/data/units/Grand_Marshal.cfg:1.5 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Grand_Marshal.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Grand Marshal
name= _ "Grand Marshal"
race=human
-image=human-marshal.png
-image_defensive=human-marshal-defense.png
-image_leading=human-marshal-leading.png
+image="human-marshal.png"
+image_defensive="human-marshal-defense.png"
+image_leading="human-marshal-leading.png"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/gweddry.png
#endif
@@ -29,13 +29,13 @@
[frame]
begin=-175
end=100
- image=human-marshal-attack-sword1.png
+ image="human-marshal-attack-sword1.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-marshal-attack-sword2.png
+ image="human-marshal-attack-sword2.png"
[/frame]
[sound]
@@ -52,7 +52,7 @@
[frame]
begin=-150
end=100
- image=human-marshal-attack-crossbow.png
+ image="human-marshal-attack-crossbow.png"
[/frame]
[sound]
@@ -69,8 +69,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Great_Mage.cfg
diff -u wesnoth/data/units/Great_Mage.cfg:1.26
wesnoth/data/units/Great_Mage.cfg:1.27
--- wesnoth/data/units/Great_Mage.cfg:1.26 Sun Feb 20 17:11:59 2005
+++ wesnoth/data/units/Great_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Great Mage"
race=human
gender=male,female
-image=great-mage.png
-image_defensive=great-mage-defend.png
+image="great-mage.png"
+image_defensive="great-mage-defend.png"
hitpoints=65
movement_type=smallfoot
[resistance]
@@ -28,12 +28,12 @@
[frame]
begin=-175
end=-50
- image=great-mage-staff-1.png
+ image="great-mage-staff-1.png"
[/frame]
[frame]
begin=-50
end=50
- image=great-mage-staff-2.png
+ image="great-mage-staff-2.png"
[/frame]
[sound]
time=-60
@@ -50,33 +50,33 @@
[frame]
begin=-240
end=-180
- image=great-mage-fireball-1.png
+ image="great-mage-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=great-mage-fireball-2.png
+ image="great-mage-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=great-mage-fireball-3.png
+ image="great-mage-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=great-mage-fireball-2.png
+ image="great-mage-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=great-mage-fireball-1.png
+ image="great-mage-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -86,8 +86,8 @@
begin=-250
end=50
halo=halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30,halo/fireball-big-halo3.png:30,halo/fireball-big-halo4.png:30,halo/fireball-big-halo5.png:30,halo/fireball-big-halo6.png:30,halo/fireball-big-halo7.png:30,halo/fireball-big-halo8.png:30,halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30
- image=projectiles/fireball-huge-n.png
- image_diagonal=projectiles/fireball-huge-nw.png
+ image="projectiles/fireball-huge-n.png"
+ image_diagonal="projectiles/fireball-huge-nw.png"
[/missile_frame]
[/attack]
@@ -96,8 +96,8 @@
name= _ "female^Great Mage"
race=human
gender=female
- image=great-mage+female.png
- image_defensive=great-mage+female-defend.png
+ image="great-mage+female.png"
+ image_defensive="great-mage+female-defend.png"
hitpoints=65
movement_type=smallfoot
[resistance]
@@ -121,12 +121,12 @@
[frame]
begin=-175
end=-50
- image=great-mage+female-staff-1.png
+ image="great-mage+female-staff-1.png"
[/frame]
[frame]
begin=-50
end=50
- image=great-mage+female-staff-2.png
+ image="great-mage+female-staff-2.png"
[/frame]
[sound]
time=-60
@@ -143,33 +143,33 @@
[frame]
begin=-240
end=-180
- image=great-mage+female-fireball-1.png
+ image="great-mage+female-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=great-mage+female-fireball-2.png
+ image="great-mage+female-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=great-mage+female-fireball-3.png
+ image="great-mage+female-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=great-mage+female-fireball-2.png
+ image="great-mage+female-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=great-mage+female-fireball-1.png
+ image="great-mage+female-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -179,8 +179,8 @@
begin=-250
end=50
halo=halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30,halo/fireball-big-halo3.png:30,halo/fireball-big-halo4.png:30,halo/fireball-big-halo5.png:30,halo/fireball-big-halo6.png:30,halo/fireball-big-halo7.png:30,halo/fireball-big-halo8.png:30,halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30
- image=projectiles/fireball-huge-n.png
- image_diagonal=projectiles/fireball-huge-nw.png
+ image="projectiles/fireball-huge-n.png"
+ image_diagonal="projectiles/fireball-huge-nw.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Great_Troll.cfg
diff -u wesnoth/data/units/Great_Troll.cfg:1.3
wesnoth/data/units/Great_Troll.cfg:1.4
--- wesnoth/data/units/Great_Troll.cfg:1.3 Sun Jan 9 04:36:37 2005
+++ wesnoth/data/units/Great_Troll.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Great Troll
name= _ "Great Troll"
race=troll
-image=great-troll.png
-image_defensive=great-troll-defend.png
+image="great-troll.png"
+image_defensive="great-troll-defend.png"
ability=regenerates
hitpoints=80
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=great-troll-attack.png
+ image="great-troll-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Gryphon.cfg
diff -u wesnoth/data/units/Gryphon.cfg:1.12 wesnoth/data/units/Gryphon.cfg:1.13
--- wesnoth/data/units/Gryphon.cfg:1.12 Tue Mar 1 00:32:33 2005
+++ wesnoth/data/units/Gryphon.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Gryphon
name= _ "Gryphon"
race=monster
-image=gryphon.png
-image_defensive=gryphon-defend.png
+image="gryphon.png"
+image_defensive="gryphon-defend.png"
hitpoints=44
movement_type=fly
movement=9
@@ -27,12 +27,12 @@
[frame]
begin=-200
end=-50
- image=gryphon-attack1.png
+ image="gryphon-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=gryphon-attack2.png
+ image="gryphon-attack2.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Gryphon_Master.cfg
diff -u wesnoth/data/units/Gryphon_Master.cfg:1.5
wesnoth/data/units/Gryphon_Master.cfg:1.6
--- wesnoth/data/units/Gryphon_Master.cfg:1.5 Tue Mar 1 00:32:33 2005
+++ wesnoth/data/units/Gryphon_Master.cfg Sun Mar 27 23:06:16 2005
@@ -2,10 +2,10 @@
id=Gryphon Master
name= _ "Gryphon Master"
race=human
-image=gryphon-master.png
-image_defensive=gryphon-master-defend.png
+image="gryphon-master.png"
+image_defensive="gryphon-master-defend.png"
# no dedicated frame for moves, but attack1 "works"
-image_moving=gryphon-master-attack1.png
+image_moving="gryphon-master-attack1.png"
hitpoints=46
movement_type=fly
movement=10
@@ -29,12 +29,12 @@
[frame]
begin=-200
end=-50
- image=gryphon-master-attack1.png
+ image="gryphon-master-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=gryphon-master-attack2.png
+ image="gryphon-master-attack2.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Gryphon_Rider.cfg
diff -u wesnoth/data/units/Gryphon_Rider.cfg:1.17
wesnoth/data/units/Gryphon_Rider.cfg:1.18
--- wesnoth/data/units/Gryphon_Rider.cfg:1.17 Tue Mar 1 00:32:33 2005
+++ wesnoth/data/units/Gryphon_Rider.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Gryphon Rider
name= _ "Gryphon Rider"
race=human
-image=gryphon-rider.png
-image_defensive=gryphon-rider-defend.png
+image="gryphon-rider.png"
+image_defensive="gryphon-rider-defend.png"
hitpoints=34
movement_type=fly
movement=9
@@ -27,7 +27,7 @@
[frame]
begin=-150
end=100
- image=gryphon-rider-attack.png
+ image="gryphon-rider-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Halbardier.cfg
diff -u wesnoth/data/units/Halbardier.cfg:1.22
wesnoth/data/units/Halbardier.cfg:1.23
--- wesnoth/data/units/Halbardier.cfg:1.22 Fri Dec 10 21:13:09 2004
+++ wesnoth/data/units/Halbardier.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Halbardier
name= _ "Halberdier"
race=human
-image=human-halbardier.png
+image="human-halbardier.png"
hitpoints=72
movement_type=smallfoot
[resistance]
@@ -27,12 +27,12 @@
[frame]
begin=-200
end=-100
- image=human-halberdier-pierce-1.png
+ image="human-halberdier-pierce-1.png"
[/frame]
[frame]
begin=-100
end=100
- image=human-halberdier-pierce-2.png
+ image="human-halberdier-pierce-2.png"
[/frame]
[/attack]
[attack]
Index: wesnoth/data/units/Heavy_Infantryman.cfg
diff -u wesnoth/data/units/Heavy_Infantryman.cfg:1.4
wesnoth/data/units/Heavy_Infantryman.cfg:1.5
--- wesnoth/data/units/Heavy_Infantryman.cfg:1.4 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Heavy_Infantryman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Heavy Infantryman
name= _ "Heavy Infantryman"
race=human
-image=human-heavyinfantry.png
-image_defensive=human-heavyinfantry-defend.png
+image="human-heavyinfantry.png"
+image_defensive="human-heavyinfantry-defend.png"
hitpoints=38
movement_type=armoredfoot
movement=4
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=human-heavyinfantry-attack.png
+ image="human-heavyinfantry-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Horse_Lord.cfg
diff -u wesnoth/data/units/Horse_Lord.cfg:1.2
wesnoth/data/units/Horse_Lord.cfg:1.3
--- wesnoth/data/units/Horse_Lord.cfg:1.2 Sat Nov 27 15:36:01 2004
+++ wesnoth/data/units/Horse_Lord.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Horse Lord
name= _ "Horse Lord"
race=human
-image=owaec-lord.png
-image_moving=owaec-lord-moving.png
-image_defensive=owaec-lord-defend.png
+image="owaec-lord.png"
+image_moving="owaec-lord-moving.png"
+image_defensive="owaec-lord-defend.png"
hitpoints=64
movement_type=mounted
movement=7
@@ -26,12 +26,12 @@
[frame]
begin=-200
end=-100
- image=owaec-lord-moving.png
+ image="owaec-lord-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-lord-attack-sword.png
+ image="owaec-lord-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -49,12 +49,12 @@
[frame]
begin=-200
end=-100
- image=owaec-lord-moving.png
+ image="owaec-lord-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-lord-attack-morningstar.png
+ image="owaec-lord-attack-morningstar.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Horseman.cfg
diff -u wesnoth/data/units/Horseman.cfg:1.14
wesnoth/data/units/Horseman.cfg:1.15
--- wesnoth/data/units/Horseman.cfg:1.14 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Horseman.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Horseman
name= _ "Horseman"
race=human
-image=horseman.png
-image_moving=horseman-moving.png
-image_defensive=horseman-defend.png
+image="horseman.png"
+image_moving="horseman-moving.png"
+image_defensive="horseman-defend.png"
hitpoints=38
movement_type=mounted
movement=8
@@ -26,12 +26,12 @@
[frame]
begin=-200
end=-100
- image=horseman-moving.png
+ image="horseman-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=horseman-attack.png
+ image="horseman-attack.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Initiate.cfg
diff -u wesnoth/data/units/Initiate.cfg:1.10
wesnoth/data/units/Initiate.cfg:1.11
--- wesnoth/data/units/Initiate.cfg:1.10 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Initiate.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Initiate
name= _ "Initiate"
race=undead
-image=undead-initiate.png
-image_defensive=undead-initiate-defend.png
+image="undead-initiate.png"
+image_defensive="undead-initiate-defend.png"
hitpoints=36
movement_type=undeadfoot
movement=5
@@ -26,18 +26,18 @@
[frame]
begin=-350
end=-250
- image=undead-initiate-attack1.png
+ image="undead-initiate-attack1.png"
[/frame]
[frame]
begin=-250
end=-50
- image=undead-initiate-attack2.png
+ image="undead-initiate-attack2.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-150
Index: wesnoth/data/units/Iron_Mauler.cfg
diff -u wesnoth/data/units/Iron_Mauler.cfg:1.6
wesnoth/data/units/Iron_Mauler.cfg:1.7
--- wesnoth/data/units/Iron_Mauler.cfg:1.6 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Iron_Mauler.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Iron Mauler
name= _ "Iron Mauler"
race=human
-image=human-siegetrooper.png
-image_defensive=human-siegetrooper-defend.png
+image="human-siegetrooper.png"
+image_defensive="human-siegetrooper-defend.png"
hitpoints=64
movement_type=armoredfoot
movement=4
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=human-siegetrooper-melee.png
+ image="human-siegetrooper-melee.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Javelineer.cfg
diff -u wesnoth/data/units/Javelineer.cfg:1.1
wesnoth/data/units/Javelineer.cfg:1.2
--- wesnoth/data/units/Javelineer.cfg:1.1 Wed Dec 8 06:41:29 2004
+++ wesnoth/data/units/Javelineer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Javelineer
name= _ "Javelineer"
race=human
-image=human-javelineer.png
-image_defensive=human-javelineer-defend.png
+image="human-javelineer.png"
+image_defensive="human-javelineer-defend.png"
hitpoints=45
movement_type=smallfoot
movement=5
@@ -25,22 +25,22 @@
[frame]
begin=-100
end=-60
- image=human-javelineer-attack-melee-1.png
+ image="human-javelineer-attack-melee-1.png"
[/frame]
[frame]
begin=-60
end=-10
- image=human-javelineer-attack-melee-2.png
+ image="human-javelineer-attack-melee-2.png"
[/frame]
[frame]
begin=-10
end=60
- image=human-javelineer-attack-melee-3.png
+ image="human-javelineer-attack-melee-3.png"
[/frame]
[frame]
begin=60
end=100
- image=human-javelineer-attack-melee-1.png
+ image="human-javelineer-attack-melee-1.png"
[/frame]
[/attack]
[attack]
@@ -56,28 +56,28 @@
[frame]
begin=-210
end=-160
- image=human-javelineer-attack-ranged-1.png
+ image="human-javelineer-attack-ranged-1.png"
[/frame]
[frame]
begin=-160
end=-110
- image=human-javelineer-attack-ranged-2.png
+ image="human-javelineer-attack-ranged-2.png"
[/frame]
[frame]
begin=-110
end=-50
- image=human-javelineer-attack-ranged-3.png
+ image="human-javelineer-attack-ranged-3.png"
[/frame]
[frame]
begin=-50
end=100
- image=human-javelineer-attack-ranged-4.png
+ image="human-javelineer-attack-ranged-4.png"
[/frame]
[missile_frame]
begin=-120
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Knight.cfg
diff -u wesnoth/data/units/Knight.cfg:1.10 wesnoth/data/units/Knight.cfg:1.11
--- wesnoth/data/units/Knight.cfg:1.10 Wed Aug 18 21:14:27 2004
+++ wesnoth/data/units/Knight.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Knight
name= _ "Knight"
race=human
-image=knight.png
-image_moving=knight-moving.png
-image_defensive=knight-defend.png
+image="knight.png"
+image_moving="knight-moving.png"
+image_defensive="knight-defend.png"
hitpoints=58
movement_type=mounted
movement=8
@@ -25,7 +25,7 @@
[frame]
begin=-200
end=100
- image=knight-attack.png
+ image="knight-attack.png"
[/frame]
[sound]
time=-200
@@ -42,7 +42,7 @@
[frame]
begin=-200
end=100
- image=knight-moving.png
+ image="knight-moving.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Lancer.cfg
diff -u wesnoth/data/units/Lancer.cfg:1.5 wesnoth/data/units/Lancer.cfg:1.6
--- wesnoth/data/units/Lancer.cfg:1.5 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Lancer.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Lancer
name= _ "Lancer"
race=human
-image=lancer.png
-image_defensive=lancer-defend.png
-image_moving=lancer-attack.png
+image="lancer.png"
+image_defensive="lancer-defend.png"
+image_moving="lancer-attack.png"
hitpoints=48
movement_type=mounted
movement=10
@@ -26,7 +26,7 @@
[frame]
begin=-150
end=100
- image=lancer-attack.png
+ image="lancer-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Lich.cfg
diff -u wesnoth/data/units/Lich.cfg:1.22 wesnoth/data/units/Lich.cfg:1.23
--- wesnoth/data/units/Lich.cfg:1.22 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Lich.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Lich
name= _ "Lich"
race=undead
-image=undead-lich.png
-image_defensive=undead-lich-defend.png
+image="undead-lich.png"
+image_defensive="undead-lich-defend.png"
hitpoints=66
movement_type=undeadfoot
movement=6
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=undead-lich-melee.png
+ image="undead-lich-melee.png"
[/frame]
[/attack]
[attack]
@@ -39,18 +39,18 @@
[frame]
begin=-300
end=-200
- image=undead-adept-ranged1.png
+ image="undead-adept-ranged1.png"
[/frame]
[frame]
begin=-200
end=0
- image=undead-lich-ranged2.png
+ image="undead-lich-ranged2.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Lieutenant.cfg
diff -u wesnoth/data/units/Lieutenant.cfg:1.15
wesnoth/data/units/Lieutenant.cfg:1.16
--- wesnoth/data/units/Lieutenant.cfg:1.15 Sun Dec 19 16:29:44 2004
+++ wesnoth/data/units/Lieutenant.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Lieutenant
name= _ "Lieutenant"
race=human
-image=human-lieutenant.png
-image_defensive=human-lieutenant-defend.png
-image_leading=human-lieutenant-leading.png
+image="human-lieutenant.png"
+image_defensive="human-lieutenant-defend.png"
+image_leading="human-lieutenant-leading.png"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/gweddry.png
#endif
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=human-lieutenant-attack-sword.png
+ image="human-lieutenant-attack-sword.png"
[/frame]
[sound]
@@ -46,7 +46,7 @@
[frame]
begin=-150
end=100
- image=human-lieutenant-attack-crossbow.png
+ image="human-lieutenant-attack-crossbow.png"
[/frame]
[sound]
@@ -63,8 +63,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Longbowman.cfg
diff -u wesnoth/data/units/Longbowman.cfg:1.4
wesnoth/data/units/Longbowman.cfg:1.5
--- wesnoth/data/units/Longbowman.cfg:1.4 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Longbowman.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "Longbowman"
race=human
gender=male
-image=human-longbowman.png
-image_defensive=human-longbowman-defend-close.png
-image_defensive_long=human-longbowman-defend.png
+image="human-longbowman.png"
+image_defensive="human-longbowman-defend-close.png"
+image_defensive_long="human-longbowman-defend.png"
hitpoints=45
movement_type=smallfoot
movement=5
@@ -23,7 +23,7 @@
[frame]
begin=-100
end=100
- image=human-longbowman-attack-sword.png
+ image="human-longbowman-attack-sword.png"
[/frame]
[sound]
@@ -55,19 +55,19 @@
[frame]
begin=-400
end=-250
- image=human-longbowman-attack1.png
+ image="human-longbowman-attack1.png"
[/frame]
[frame]
begin=-250
end=0
- image=human-longbowman-attack2.png
+ image="human-longbowman-attack2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Lord.cfg
diff -u wesnoth/data/units/Lord.cfg:1.19 wesnoth/data/units/Lord.cfg:1.20
--- wesnoth/data/units/Lord.cfg:1.19 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Lord.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Lord
name= _ "Lord"
race=human
-image=konrad-lord.png
-image_defensive=konrad-lord-defend.png
-image_leading=konrad-lord-leading.png
+image="konrad-lord.png"
+image_defensive="konrad-lord-defend.png"
+image_leading="konrad-lord-leading.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=68
ability=leadership
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=konrad-lord-attack.png
+ image="konrad-lord-attack.png"
[/frame]
[sound]
@@ -45,12 +45,12 @@
[frame]
begin=-200
end=-100
- image=konrad-lord-bow1.png
+ image="konrad-lord-bow1.png"
[/frame]
[frame]
begin=-100
end=-0
- image=konrad-lord-bow2.png
+ image="konrad-lord-bow2.png"
[/frame]
[sound]
@@ -67,8 +67,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
@@ -77,9 +77,9 @@
id=Lord
name= _ "Lord"
race=human
-image=konrad-lord.png
-image_defensive=konrad-lord-defend.png
-image_leading=konrad-lord-leading.png
+image="konrad-lord.png"
+image_defensive="konrad-lord-defend.png"
+image_leading="konrad-lord-leading.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=68
ability=leadership
@@ -102,7 +102,7 @@
[frame]
begin=-100
end=100
- image=konrad-lord-attack.png
+ image="konrad-lord-attack.png"
[/frame]
[sound]
@@ -125,8 +125,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/variation]
Index: wesnoth/data/units/Mage.cfg
diff -u wesnoth/data/units/Mage.cfg:1.30 wesnoth/data/units/Mage.cfg:1.31
--- wesnoth/data/units/Mage.cfg:1.30 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Mage"
race=human
gender=male,female
-image=mage.png
-image_defensive=mage-defend.png
+image="mage.png"
+image_defensive="mage-defend.png"
hitpoints=24
movement_type=smallfoot
movement=5
@@ -25,12 +25,12 @@
[frame]
begin=-100
end=-20
- image=mage-attack-staff1.png
+ image="mage-attack-staff1.png"
[/frame]
[frame]
begin=-20
end=100
- image=mage-attack-staff2.png
+ image="mage-attack-staff2.png"
[/frame]
[sound]
time=-100
@@ -51,25 +51,25 @@
[frame]
begin=-400
end=-350
- image=mage-attack-magic1.png
+ image="mage-attack-magic1.png"
[/frame]
[frame]
begin=-350
end=0
- image=mage-attack-magic2.png
+ image="mage-attack-magic2.png"
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png
halo_x,halo_y=6,-19
[/frame]
[frame]
begin=0
end=50
- image=mage-attack-magic1.png
+ image="mage-attack-magic1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png
halo_x,halo_y=7,-17
[/missile_frame]
@@ -80,8 +80,8 @@
name= _ "female^Mage"
race=human
gender=female
- image=mage+female.png
- image_defensive=mage+female-defend.png
+ image="mage+female.png"
+ image_defensive="mage+female-defend.png"
hitpoints=24
movement_type=smallfoot
movement=5
@@ -102,12 +102,12 @@
[frame]
begin=-100
end=-20
- image=mage+female-attack-staff-1.png
+ image="mage+female-attack-staff-1.png"
[/frame]
[frame]
begin=-20
end=100
- image=mage+female-attack-staff-2.png
+ image="mage+female-attack-staff-2.png"
[/frame]
[sound]
time=-100
@@ -128,25 +128,25 @@
[frame]
begin=-400
end=-350
- image=mage+female-attack-magic1.png
+ image="mage+female-attack-magic1.png"
[/frame]
[frame]
begin=-350
end=0
- image=mage+female-attack-magic2.png
+ image="mage+female-attack-magic2.png"
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png
halo_x,halo_y=6,-19
[/frame]
[frame]
begin=0
end=50
- image=mage+female-attack-magic1.png
+ image="mage+female-attack-magic1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png
halo_x,halo_y=7,-17
[/missile_frame]
Index: wesnoth/data/units/Mage_of_Light.cfg
diff -u wesnoth/data/units/Mage_of_Light.cfg:1.24
wesnoth/data/units/Mage_of_Light.cfg:1.25
--- wesnoth/data/units/Mage_of_Light.cfg:1.24 Tue Feb 8 12:20:35 2005
+++ wesnoth/data/units/Mage_of_Light.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "Mage of Light"
race=human
gender=male,female
-image=white-cleric.png
-image_defensive=white-cleric-defend.png
-image_healing=white-cleric-magic1.png
-image_halo_healing=white-cleric-magic1.png:100,white-cleric-magic2.png:100,white-cleric-magic3.png:100,white-cleric-magic4.png:100,white-cleric-magic5.png:100,white-cleric-magic6.png:100
+image="white-cleric.png"
+image_defensive="white-cleric-defend.png"
+image_healing="white-cleric-magic1.png"
+image_halo_healing="white-cleric-magic1.png:100,white-cleric-magic2.png:100,white-cleric-magic3.png:100,white-cleric-magic4.png:100,white-cleric-magic5.png:100,white-cleric-magic6.png:100"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/dacyn.png
#endif
@@ -39,7 +39,7 @@
[frame]
begin=-100
end=100
- image=white-cleric-attack-melee.png
+ image="white-cleric-attack-melee.png"
[/frame]
[/attack]
[attack]
@@ -52,24 +52,24 @@
[missile_frame]
begin=-180
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
[/missile_frame]
[frame]
begin=-50
end=0
- image=white-cleric-magic1.png
+ image="white-cleric-magic1.png"
[/frame]
[frame]
begin=0
end=50
- image=white-cleric-magic3.png
+ image="white-cleric-magic3.png"
[/frame]
[frame]
begin=50
end=100
- image=white-cleric-magic5.png
+ image="white-cleric-magic5.png"
[/frame]
[/attack]
@@ -78,10 +78,10 @@
name= _ "female^Mage of Light"
race=human
gender=female
- image=white-cleric+female.png
- image_defensive=white-cleric+female-defend.png
- image_healing=white-cleric+female-magic1.png
-
image_halo_healing=white-cleric+female-magic1.png:100,white-cleric+female-magic2.png:100,white-cleric+female-magic3.png:100,white-cleric+female-magic4.png:100,white-cleric+female-magic5.png:100,white-cleric+female-magic6.png:100
+ image="white-cleric+female.png"
+ image_defensive="white-cleric+female-defend.png"
+ image_healing="white-cleric+female-magic1.png"
+
image_halo_healing="white-cleric+female-magic1.png:100,white-cleric+female-magic2.png:100,white-cleric+female-magic3.png:100,white-cleric+female-magic4.png:100,white-cleric+female-magic5.png:100,white-cleric+female-magic6.png:100"
halo=halo/white-cleric-aura.png
ability=illuminates,cures
hitpoints=42
@@ -111,7 +111,7 @@
[frame]
begin=-100
end=100
- image=white-cleric+female-attack-melee.png
+ image="white-cleric+female-attack-melee.png"
[/frame]
[/attack]
[attack]
@@ -124,24 +124,24 @@
[missile_frame]
begin=-180
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
[/missile_frame]
[frame]
begin=-50
end=0
- image=white-cleric+female-magic1.png
+ image="white-cleric+female-magic1.png"
[/frame]
[frame]
begin=0
end=50
- image=white-cleric+female-magic3.png
+ image="white-cleric+female-magic3.png"
[/frame]
[frame]
begin=50
end=100
- image=white-cleric+female-magic5.png
+ image="white-cleric+female-magic5.png"
[/frame]
[/attack]
[/female]
Index: wesnoth/data/units/Master_Bowman.cfg
diff -u wesnoth/data/units/Master_Bowman.cfg:1.8
wesnoth/data/units/Master_Bowman.cfg:1.9
--- wesnoth/data/units/Master_Bowman.cfg:1.8 Mon Dec 20 00:38:57 2004
+++ wesnoth/data/units/Master_Bowman.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Master Bowman"
race=human
gender=male
-image=human-masterbowman.png
-image_defensive=human-masterbowman-defend.png
+image="human-masterbowman.png"
+image_defensive="human-masterbowman-defend.png"
hitpoints=46
movement_type=smallfoot
movement=5
@@ -38,22 +38,22 @@
[frame]
begin=-400
end=-300
- image=human-masterbowman-attack-ranged1.png
+ image="human-masterbowman-attack-ranged1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=human-masterbowman-attack-ranged2.png
+ image="human-masterbowman-attack-ranged2.png"
[/frame]
[frame]
begin=-200
end=-100
- image=human-masterbowman-attack-ranged3.png
+ image="human-masterbowman-attack-ranged3.png"
[/frame]
[frame]
begin=-100
end=0
- image=human-masterbowman-attack-ranged4.png
+ image="human-masterbowman-attack-ranged4.png"
[/frame]
[sound]
@@ -70,8 +70,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Mermaid_Diviner.cfg
diff -u wesnoth/data/units/Mermaid_Diviner.cfg:1.4
wesnoth/data/units/Mermaid_Diviner.cfg:1.5
--- wesnoth/data/units/Mermaid_Diviner.cfg:1.4 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Mermaid_Diviner.cfg Sun Mar 27 23:06:16 2005
@@ -3,7 +3,7 @@
name= _ "female^Mermaid Diviner"
race=merman
gender=female
-image=mermaid-diviner.png
+image="mermaid-diviner.png"
halo=halo/white-cleric-aura.png
ability=illuminates,cures
hitpoints=41
@@ -44,8 +44,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Mermaid_Enchantress.cfg
diff -u wesnoth/data/units/Mermaid_Enchantress.cfg:1.6
wesnoth/data/units/Mermaid_Enchantress.cfg:1.7
--- wesnoth/data/units/Mermaid_Enchantress.cfg:1.6 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Mermaid_Enchantress.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "female^Mermaid Enchantress"
race=merman
gender=female
-image=mermaid-enchantress.png
-image_defensive=mermaid-enchantress-defend.png
+image="mermaid-enchantress.png"
+image_defensive="mermaid-enchantress-defend.png"
hitpoints=38
movement_type=swimmer
movement=6
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=mermaid-enchantress-staff-attack.png
+ image="mermaid-enchantress-staff-attack.png"
[/frame]
[sound]
time=-100
@@ -44,43 +44,43 @@
[frame]
begin=-450
end=-400
- image=mermaid-enchantress-water-attack1.png
+ image="mermaid-enchantress-water-attack1.png"
[/frame]
[frame]
begin=-400
end=-350
- image=mermaid-enchantress-water-attack2.png
+ image="mermaid-enchantress-water-attack2.png"
[/frame]
[frame]
begin=-350
end=-300
- image=mermaid-enchantress-water-attack3.png
+ image="mermaid-enchantress-water-attack3.png"
[/frame]
[frame]
begin=-300
end=-225
- image=mermaid-enchantress-water-attack4.png
+ image="mermaid-enchantress-water-attack4.png"
[/frame]
[frame]
begin=-225
end=-140
- image=mermaid-enchantress-water-attack5.png
+ image="mermaid-enchantress-water-attack5.png"
[/frame]
[missile_frame]
begin=-165
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[frame]
begin=-140
end=-75
- image=mermaid-enchantress-water-attack6.png
+ image="mermaid-enchantress-water-attack6.png"
[/frame]
[frame]
begin=-75
end=0
- image=mermaid-enchantress-water-attack7.png
+ image="mermaid-enchantress-water-attack7.png"
[/frame]
[sound]
time=-75
Index: wesnoth/data/units/Mermaid_Initiate.cfg
diff -u wesnoth/data/units/Mermaid_Initiate.cfg:1.7
wesnoth/data/units/Mermaid_Initiate.cfg:1.8
--- wesnoth/data/units/Mermaid_Initiate.cfg:1.7 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Mermaid_Initiate.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "female^Mermaid Initiate"
race=merman
gender=female
-image=mermaid-initiate.png
-image_defensive=mermaid-initiate-defend.png
+image="mermaid-initiate.png"
+image_defensive="mermaid-initiate-defend.png"
hitpoints=27
movement_type=swimmer
movement=6
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=mermaid-initiate-staff-attack.png
+ image="mermaid-initiate-staff-attack.png"
[/frame]
[sound]
time=-100
@@ -44,43 +44,43 @@
[frame]
begin=-450
end=-400
- image=mermaid-initiate-water-attack1.png
+ image="mermaid-initiate-water-attack1.png"
[/frame]
[frame]
begin=-400
end=-350
- image=mermaid-initiate-water-attack2.png
+ image="mermaid-initiate-water-attack2.png"
[/frame]
[frame]
begin=-350
end=-300
- image=mermaid-initiate-water-attack3.png
+ image="mermaid-initiate-water-attack3.png"
[/frame]
[frame]
begin=-300
end=-225
- image=mermaid-initiate-water-attack4.png
+ image="mermaid-initiate-water-attack4.png"
[/frame]
[frame]
begin=-225
end=-140
- image=mermaid-initiate-water-attack5.png
+ image="mermaid-initiate-water-attack5.png"
[/frame]
[missile_frame]
begin=-165
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[frame]
begin=-140
end=-75
- image=mermaid-initiate-water-attack6.png
+ image="mermaid-initiate-water-attack6.png"
[/frame]
[frame]
begin=-75
end=0
- image=mermaid-initiate-water-attack7.png
+ image="mermaid-initiate-water-attack7.png"
[/frame]
[sound]
time=-75
Index: wesnoth/data/units/Mermaid_Priestess.cfg
diff -u wesnoth/data/units/Mermaid_Priestess.cfg:1.3
wesnoth/data/units/Mermaid_Priestess.cfg:1.4
--- wesnoth/data/units/Mermaid_Priestess.cfg:1.3 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Mermaid_Priestess.cfg Sun Mar 27 23:06:16 2005
@@ -3,7 +3,7 @@
name= _ "female^Mermaid Priestess"
race=merman
gender=female
-image=mermaid-priestess.png
+image="mermaid-priestess.png"
ability=cures
hitpoints=31
movement_type=swimmer
@@ -42,8 +42,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Mermaid_Siren.cfg
diff -u wesnoth/data/units/Mermaid_Siren.cfg:1.8
wesnoth/data/units/Mermaid_Siren.cfg:1.9
--- wesnoth/data/units/Mermaid_Siren.cfg:1.8 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Mermaid_Siren.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Siren"
race=merman
gender=female
-image=mermaid-siren.png
-image_defensive=mermaid-siren-defend.png
+image="mermaid-siren.png"
+image_defensive="mermaid-siren-defend.png"
hitpoints=49
movement_type=swimmer
movement=7
@@ -32,34 +32,34 @@
[frame]
begin=-200
end=-150
- image=mermaid-siren-naia-touch-attack1.png
+ image="mermaid-siren-naia-touch-attack1.png"
[/frame]
[frame]
begin=-150
end=-95
- image=mermaid-siren-naia-touch-attack2.png
+ image="mermaid-siren-naia-touch-attack2.png"
[/frame]
[frame]
begin=-95
end=-30
- image=mermaid-siren-naia-touch-attack3.png
+ image="mermaid-siren-naia-touch-attack3.png"
halo=halo/mermaid-siren-naia-touch-halo.png
[/frame]
[frame]
begin=-30
end=65
- image=mermaid-siren-naia-touch-attack4.png
+ image="mermaid-siren-naia-touch-attack4.png"
halo=halo/mermaid-siren-naia-touch-halo.png
[/frame]
[frame]
begin=65
end=115
- image=mermaid-siren-naia-touch-attack2.png
+ image="mermaid-siren-naia-touch-attack2.png"
[/frame]
[frame]
begin=115
end=150
- image=mermaid-siren-naia-touch-attack1.png
+ image="mermaid-siren-naia-touch-attack1.png"
[/frame]
[/attack]
@@ -74,43 +74,43 @@
[frame]
begin=-450
end=-400
- image=mermaid-siren-water-attack1.png
+ image="mermaid-siren-water-attack1.png"
[/frame]
[frame]
begin=-400
end=-350
- image=mermaid-siren-water-attack2.png
+ image="mermaid-siren-water-attack2.png"
[/frame]
[frame]
begin=-350
end=-300
- image=mermaid-siren-water-attack3.png
+ image="mermaid-siren-water-attack3.png"
[/frame]
[frame]
begin=-300
end=-225
- image=mermaid-siren-water-attack4.png
+ image="mermaid-siren-water-attack4.png"
[/frame]
[frame]
begin=-225
end=-140
- image=mermaid-siren-water-attack5.png
+ image="mermaid-siren-water-attack5.png"
[/frame]
[missile_frame]
begin=-165
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[frame]
begin=-140
end=-75
- image=mermaid-siren-water-attack6.png
+ image="mermaid-siren-water-attack6.png"
[/frame]
[frame]
begin=-75
end=0
- image=mermaid-siren-water-attack7.png
+ image="mermaid-siren-water-attack7.png"
[/frame]
[sound]
time=-75
Index: wesnoth/data/units/Merman.cfg
diff -u wesnoth/data/units/Merman.cfg:1.14 wesnoth/data/units/Merman.cfg:1.15
--- wesnoth/data/units/Merman.cfg:1.14 Wed Feb 16 01:02:04 2005
+++ wesnoth/data/units/Merman.cfg Sun Mar 27 23:06:16 2005
@@ -5,8 +5,8 @@
obsolete=1
name= _ "Merman"
race=merman
-image=merman.png
-image_defensive=merman-defend.png
+image="merman.png"
+image_defensive="merman-defend.png"
hitpoints=30
movement_type=swimmer
movement=6
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=merman-attack.png
+ image="merman-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Merman_Entangler.cfg
diff -u wesnoth/data/units/Merman_Entangler.cfg:1.2
wesnoth/data/units/Merman_Entangler.cfg:1.3
--- wesnoth/data/units/Merman_Entangler.cfg:1.2 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Merman_Entangler.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Merman Entangler
name= _ "Merman Entangler"
race=merman
-image=merman-entangler.png
+image="merman-entangler.png"
hitpoints=55
movement_type=swimmer
movement=7
@@ -33,8 +33,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/web.png
- image_diagonal=projectiles/web.png
+ image="projectiles/web.png"
+ image_diagonal="projectiles/web.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Merman_Fighter.cfg
diff -u wesnoth/data/units/Merman_Fighter.cfg:1.2
wesnoth/data/units/Merman_Fighter.cfg:1.3
--- wesnoth/data/units/Merman_Fighter.cfg:1.2 Tue Oct 26 08:53:21 2004
+++ wesnoth/data/units/Merman_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Merman Fighter
name= _ "Merman Fighter"
race=merman
-image=merman-fighter.png
-image_defensive=merman-fighter-defend.png
+image="merman-fighter.png"
+image_defensive="merman-fighter-defend.png"
hitpoints=32
movement_type=swimmer
[defense]
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=merman-fighter-attack.png
+ image="merman-fighter-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Merman_Hoplite.cfg
diff -u wesnoth/data/units/Merman_Hoplite.cfg:1.5
wesnoth/data/units/Merman_Hoplite.cfg:1.6
--- wesnoth/data/units/Merman_Hoplite.cfg:1.5 Thu Jan 20 22:43:31 2005
+++ wesnoth/data/units/Merman_Hoplite.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Merman Hoplite
name= _ "Merman Hoplite"
race=merman
-image=merman-hoplite.png
-image_defensive=merman-hoplite-defend.png
+image="merman-hoplite.png"
+image_defensive="merman-hoplite-defend.png"
hitpoints=52
movement_type=swimmer
[defense]
@@ -40,7 +40,7 @@
[frame]
begin=-100
end=100
- image=merman-hoplite-attack.png
+ image="merman-hoplite-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Merman_Javelineer.cfg
diff -u wesnoth/data/units/Merman_Javelineer.cfg:1.1
wesnoth/data/units/Merman_Javelineer.cfg:1.2
--- wesnoth/data/units/Merman_Javelineer.cfg:1.1 Tue Oct 19 02:14:34 2004
+++ wesnoth/data/units/Merman_Javelineer.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Merman Javelineer
name= _ "Merman Javelineer"
race=merman
-image=merman-javelineer.png
+image="merman-javelineer.png"
hitpoints=55
movement_type=swimmer
movement=6
@@ -31,8 +31,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Merman_Netcaster.cfg
diff -u wesnoth/data/units/Merman_Netcaster.cfg:1.2
wesnoth/data/units/Merman_Netcaster.cfg:1.3
--- wesnoth/data/units/Merman_Netcaster.cfg:1.2 Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Merman_Netcaster.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Merman Netcaster
name= _ "Merman Netcaster"
race=merman
-image=merman-netcaster.png
+image="merman-netcaster.png"
hitpoints=42
movement_type=swimmer
movement=7
@@ -33,8 +33,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/web.png
- image_diagonal=projectiles/web.png
+ image="projectiles/web.png"
+ image_diagonal="projectiles/web.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Merman_Spearman.cfg
diff -u wesnoth/data/units/Merman_Spearman.cfg:1.1
wesnoth/data/units/Merman_Spearman.cfg:1.2
--- wesnoth/data/units/Merman_Spearman.cfg:1.1 Tue Oct 19 02:14:34 2004
+++ wesnoth/data/units/Merman_Spearman.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Merman Spearman
name= _ "Merman Spearman"
race=merman
-image=merman-spearman.png
+image="merman-spearman.png"
hitpoints=45
movement_type=swimmer
movement=6
@@ -31,8 +31,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Merman_Triton.cfg
diff -u wesnoth/data/units/Merman_Triton.cfg:1.3
wesnoth/data/units/Merman_Triton.cfg:1.4
--- wesnoth/data/units/Merman_Triton.cfg:1.3 Sun Oct 31 08:27:05 2004
+++ wesnoth/data/units/Merman_Triton.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Merman Triton
name= _ "Merman Triton"
race=merman
-image=merman-triton.png
-image_defensive=merman-triton-defend.png
+image="merman-triton.png"
+image_defensive="merman-triton-defend.png"
hitpoints=60
movement_type=swimmer
[defense]
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=merman-triton-attack-pierce.png
+ image="merman-triton-attack-pierce.png"
[/frame]
[/attack]
[attack]
@@ -39,7 +39,7 @@
[frame]
begin=-100
end=100
- image=merman-triton-attack-blade.png
+ image="merman-triton-attack-blade.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Merman_Warrior.cfg
diff -u wesnoth/data/units/Merman_Warrior.cfg:1.4
wesnoth/data/units/Merman_Warrior.cfg:1.5
--- wesnoth/data/units/Merman_Warrior.cfg:1.4 Tue Oct 26 09:59:28 2004
+++ wesnoth/data/units/Merman_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Merman Warrior
name= _ "Merman Warrior"
race=merman
-image=merman-warrior.png
-image_defensive=merman-warrior-defend.png
+image="merman-warrior.png"
+image_defensive="merman-warrior-defend.png"
hitpoints=48
movement_type=swimmer
[defense]
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=merman-warrior-attack.png
+ image="merman-warrior-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Mounted_Captain.cfg
diff -u wesnoth/data/units/Mounted_Captain.cfg:1.4
wesnoth/data/units/Mounted_Captain.cfg:1.5
--- wesnoth/data/units/Mounted_Captain.cfg:1.4 Thu Jan 13 23:01:52 2005
+++ wesnoth/data/units/Mounted_Captain.cfg Sun Mar 27 23:06:16 2005
@@ -5,9 +5,9 @@
obsolete=1
name= _ "Mounted Captain"
race=human
-image=owaec-captain.png
-image_moving=owaec-captain-moving.png
-image_defensive=owaec-captain-defend.png
+image="owaec-captain.png"
+image_moving="owaec-captain-moving.png"
+image_defensive="owaec-captain-defend.png"
hitpoints=36
movement_type=mounted
movement=7
@@ -29,12 +29,12 @@
[frame]
begin=-200
end=-100
- image=owaec-captain-moving.png
+ image="owaec-captain-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-captain-attack-sword.png
+ image="owaec-captain-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -52,12 +52,12 @@
[frame]
begin=-200
end=-100
- image=owaec-captain-moving.png
+ image="owaec-captain-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-captain-attack-morningstar.png
+ image="owaec-captain-attack-morningstar.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Mounted_Commander.cfg
diff -u wesnoth/data/units/Mounted_Commander.cfg:1.4
wesnoth/data/units/Mounted_Commander.cfg:1.5
--- wesnoth/data/units/Mounted_Commander.cfg:1.4 Thu Jan 13 23:01:52 2005
+++ wesnoth/data/units/Mounted_Commander.cfg Sun Mar 27 23:06:16 2005
@@ -5,9 +5,9 @@
obsolete=1
name= _ "Mounted Commander"
race=human
-image=owaec-commander.png
-image_moving=owaec-commander-moving.png
-image_defensive=owaec-commander-defend.png
+image="owaec-commander.png"
+image_moving="owaec-commander-moving.png"
+image_defensive="owaec-commander-defend.png"
hitpoints=48
movement_type=mounted
movement=7
@@ -29,12 +29,12 @@
[frame]
begin=-200
end=-100
- image=owaec-commander-moving.png
+ image="owaec-commander-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-commander-attack-sword.png
+ image="owaec-commander-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -52,12 +52,12 @@
[frame]
begin=-200
end=-100
- image=owaec-commander-moving.png
+ image="owaec-commander-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-commander-attack-morningstar.png
+ image="owaec-commander-attack-morningstar.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Mounted_Fighter.cfg
diff -u wesnoth/data/units/Mounted_Fighter.cfg:1.2
wesnoth/data/units/Mounted_Fighter.cfg:1.3
--- wesnoth/data/units/Mounted_Fighter.cfg:1.2 Tue Dec 7 22:49:05 2004
+++ wesnoth/data/units/Mounted_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Mounted Fighter
name= _ "Mounted Fighter"
race=human
-image=owaec-captain.png
-image_moving=owaec-captain-moving.png
-image_defensive=owaec-captain-defend.png
+image="owaec-captain.png"
+image_moving="owaec-captain-moving.png"
+image_defensive="owaec-captain-defend.png"
hitpoints=36
movement_type=mounted
movement=7
@@ -26,12 +26,12 @@
[frame]
begin=-200
end=-100
- image=owaec-captain-moving.png
+ image="owaec-captain-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-captain-attack-sword.png
+ image="owaec-captain-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -49,12 +49,12 @@
[frame]
begin=-200
end=-100
- image=owaec-captain-moving.png
+ image="owaec-captain-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-captain-attack-morningstar.png
+ image="owaec-captain-attack-morningstar.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Mounted_Warrior.cfg
diff -u wesnoth/data/units/Mounted_Warrior.cfg:1.1
wesnoth/data/units/Mounted_Warrior.cfg:1.2
--- wesnoth/data/units/Mounted_Warrior.cfg:1.1 Tue Dec 7 22:48:10 2004
+++ wesnoth/data/units/Mounted_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Mounted Warrior
name= _ "Mounted Warrior"
race=human
-image=owaec-commander.png
-image_moving=owaec-commander-moving.png
-image_defensive=owaec-commander-defend.png
+image="owaec-commander.png"
+image_moving="owaec-commander-moving.png"
+image_defensive="owaec-commander-defend.png"
hitpoints=48
movement_type=mounted
movement=7
@@ -26,12 +26,12 @@
[frame]
begin=-200
end=-100
- image=owaec-commander-moving.png
+ image="owaec-commander-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-commander-attack-sword.png
+ image="owaec-commander-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -49,12 +49,12 @@
[frame]
begin=-200
end=-100
- image=owaec-commander-moving.png
+ image="owaec-commander-moving.png"
[/frame]
[frame]
begin=-100
end=100
- image=owaec-commander-attack-morningstar.png
+ image="owaec-commander-attack-morningstar.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Mudcrawler.cfg
diff -u wesnoth/data/units/Mudcrawler.cfg:1.7
wesnoth/data/units/Mudcrawler.cfg:1.8
--- wesnoth/data/units/Mudcrawler.cfg:1.7 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Mudcrawler.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Mudcrawler
name= _ "Mudcrawler"
race=Monster
-image=mudcrawler.png
-image_defensive=mudcrawler-defend.png
+image="mudcrawler.png"
+image_defensive="mudcrawler-defend.png"
#ability=regenerates
hitpoints=20
movement_type=scuttlefoot
@@ -26,13 +26,13 @@
[frame]
begin=-100
end=100
- image=mudcrawler-attack.png
+ image="mudcrawler-attack.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Naga-Fighter.cfg
diff -u wesnoth/data/units/Naga-Fighter.cfg:1.4
wesnoth/data/units/Naga-Fighter.cfg:1.5
--- wesnoth/data/units/Naga-Fighter.cfg:1.4 Mon Mar 21 04:33:07 2005
+++ wesnoth/data/units/Naga-Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Naga Fighter"
race=naga
gender=male,female
-image=naga-fighter.png
-image_defensive=naga-fighter-defend.png
+image="naga-fighter.png"
+image_defensive="naga-fighter-defend.png"
hitpoints=30
movement_type=naga
movement=7
@@ -25,7 +25,7 @@
[frame]
begin=-90
end=100
- image=naga-fighter-attack.png
+ image="naga-fighter-attack.png"
[/frame]
[sound]
time=-90
@@ -38,8 +38,8 @@
name= _ "Nagini Fighter"
race=naga
gender=female
- image=naga-fighter+female.png
- image_defensive=naga-fighter+female-defend.png
+ image="naga-fighter+female.png"
+ image_defensive="naga-fighter+female-defend.png"
hitpoints=30
movement_type=naga
movement=7
@@ -60,7 +60,7 @@
[frame]
begin=-90
end=100
- image=naga-fighter+female-attack.png
+ image="naga-fighter+female-attack.png"
[/frame]
[sound]
time=-90
Index: wesnoth/data/units/Naga-Myrmidon.cfg
diff -u wesnoth/data/units/Naga-Myrmidon.cfg:1.2
wesnoth/data/units/Naga-Myrmidon.cfg:1.3
--- wesnoth/data/units/Naga-Myrmidon.cfg:1.2 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Naga-Myrmidon.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Naga Myrmidon"
race=naga
gender=male,female
-image=naga-myrmidon.png
-image_defensive=naga-myrmidon-defend.png
+image="naga-myrmidon.png"
+image_defensive="naga-myrmidon-defend.png"
hitpoints=49
movement_type=naga
[defense]
@@ -29,7 +29,7 @@
[frame]
begin=-50
end=80
- image=naga-myrmidon-attack.png
+ image="naga-myrmidon-attack.png"
[/frame]
[sound]
time=-50
@@ -42,8 +42,8 @@
name= _ "Nagini Myrmidon"
race=naga
gender=female
- image=naga-myrmidon+female.png
- image_defensive=naga-myrmidon+female-defend.png
+ image="naga-myrmidon+female.png"
+ image_defensive="naga-myrmidon+female-defend.png"
hitpoints=49
movement_type=naga
[defense]
@@ -68,7 +68,7 @@
[frame]
begin=-50
end=80
- image=naga-myrmidon+female-attack.png
+ image="naga-myrmidon+female-attack.png"
[/frame]
[sound]
time=-50
Index: wesnoth/data/units/Naga-Warrior.cfg
diff -u wesnoth/data/units/Naga-Warrior.cfg:1.2
wesnoth/data/units/Naga-Warrior.cfg:1.3
--- wesnoth/data/units/Naga-Warrior.cfg:1.2 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Naga-Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Naga Warrior"
race=naga
gender=male,female
-image=naga-warrior.png
-image_defensive=naga-warrior-defend.png
+image="naga-warrior.png"
+image_defensive="naga-warrior-defend.png"
hitpoints=40
movement_type=naga
[defense]
@@ -29,7 +29,7 @@
[frame]
begin=-50
end=100
- image=naga-warrior-attack.png
+ image="naga-warrior-attack.png"
[/frame]
[sound]
time=-50
@@ -42,8 +42,8 @@
name= _ "Nagini Warrior"
race=naga
gender=female
- image=naga-warrior+female.png
- image_defensive=naga-warrior+female-defend.png
+ image="naga-warrior+female.png"
+ image_defensive="naga-warrior+female-defend.png"
hitpoints=40
movement_type=naga
[defense]
@@ -68,7 +68,7 @@
[frame]
begin=-50
end=100
- image=naga-warrior+female-attack.png
+ image="naga-warrior+female-attack.png"
[/frame]
[sound]
time=-50
Index: wesnoth/data/units/Naga.cfg
diff -u wesnoth/data/units/Naga.cfg:1.14 wesnoth/data/units/Naga.cfg:1.15
--- wesnoth/data/units/Naga.cfg:1.14 Wed Feb 16 01:02:04 2005
+++ wesnoth/data/units/Naga.cfg Sun Mar 27 23:06:16 2005
@@ -6,8 +6,8 @@
name= _ "female^Naga"
race=naga
gender=female
-image=naga.png
-image_defensive=naga-defend.png
+image="naga.png"
+image_defensive="naga-defend.png"
hitpoints=27
movement_type=swimmer
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=naga-attack.png
+ image="naga-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Necromancer.cfg
diff -u wesnoth/data/units/Necromancer.cfg:1.17
wesnoth/data/units/Necromancer.cfg:1.18
--- wesnoth/data/units/Necromancer.cfg:1.17 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Necromancer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Necromancer
name= _ "Necromancer"
race=human
-image=undead-necromancer.png
-image_defensive=undead-necromancer-defend.png
+image="undead-necromancer.png"
+image_defensive="undead-necromancer-defend.png"
hitpoints=58
movement_type=smallfoot
movement=5
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=undead-necromancer-attack.png
+ image="undead-necromancer-attack.png"
[/frame]
[sound]
time=-100
@@ -42,13 +42,13 @@
[frame]
begin=-300
end=-200
- image=undead-necromancer-attack2.png
+ image="undead-necromancer-attack2.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Necrophage.cfg
diff -u wesnoth/data/units/Necrophage.cfg:1.6
wesnoth/data/units/Necrophage.cfg:1.7
--- wesnoth/data/units/Necrophage.cfg:1.6 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Necrophage.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Necrophage
name= _ "Necrophage"
race=undead
-image=undead-necrophage.png
-image_defensive=undead-necrophage-defend.png
+image="undead-necrophage.png"
+image_defensive="undead-necrophage-defend.png"
hitpoints=42
movement_type=undeadfoot
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-300
end=50
- image=undead-necrophage-attack.png
+ image="undead-necrophage-attack.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Nightgaunt.cfg
diff -u wesnoth/data/units/Nightgaunt.cfg:1.11
wesnoth/data/units/Nightgaunt.cfg:1.12
--- wesnoth/data/units/Nightgaunt.cfg:1.11 Wed Oct 6 13:50:46 2004
+++ wesnoth/data/units/Nightgaunt.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Nightgaunt
name= _ "Nightgaunt"
race=undead
-image=undead-nightgaunt.png
-image_defensive=undead-nightgaunt-defend.png
+image="undead-nightgaunt.png"
+image_defensive="undead-nightgaunt-defend.png"
hitpoints=32
movement_type=undeadspirit
movement=7
@@ -26,12 +26,12 @@
[frame]
begin=-150
end=0
- image=undead-nightgaunt-attack.png
+ image="undead-nightgaunt-attack.png"
[/frame]
[frame]
begin=0
end=150
- image=undead-nightgaunt-attack2.png
+ image="undead-nightgaunt-attack2.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Noble_Commander.cfg
diff -u wesnoth/data/units/Noble_Commander.cfg:1.6
wesnoth/data/units/Noble_Commander.cfg:1.7
--- wesnoth/data/units/Noble_Commander.cfg:1.6 Fri Mar 25 00:48:00 2005
+++ wesnoth/data/units/Noble_Commander.cfg Sun Mar 27 23:06:16 2005
@@ -3,11 +3,11 @@
name= _ "Noble Commander"
race=human
gender=male
-image=noble-commander.png
-image_defensive=noble-commander-defend.png
-image_long=noble-commander-bow.png
-image_defensive_long=noble-commander-bow.png
-image_leading=noble-commander-leading.png
+image="noble-commander.png"
+image_defensive="noble-commander-defend.png"
+image_long="noble-commander-bow.png"
+image_defensive_long="noble-commander-bow.png"
+image_leading="noble-commander-leading.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/haldric.png
#endif
@@ -34,7 +34,7 @@
[frame]
begin=-100
end=50
- image="noble-commander-attack-sword.png"
+ image=""noble-commander-attack-sword.png""
[/frame]
[sound]
time=-250
@@ -52,28 +52,28 @@
[frame]
begin=-600
end=-450
- image=noble-commander-bow.png
+ image="noble-commander-bow.png"
[/frame]
[frame]
begin=-450
end=-300
- image=noble-commander-attack-ranged1.png
+ image="noble-commander-attack-ranged1.png"
[/frame]
[frame]
begin=-300
end=-200
- image=noble-commander-attack-ranged2.png
+ image="noble-commander-attack-ranged2.png"
[/frame]
[frame]
begin=-200
end=0
- image=noble-commander-attack-ranged3.png
+ image="noble-commander-attack-ranged3.png"
[/frame]
[frame]
begin=0
end=100
- image=noble-commander-bow.png
+ image="noble-commander-bow.png"
[/frame]
[sound]
@@ -89,8 +89,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Noble_Fighter.cfg
diff -u wesnoth/data/units/Noble_Fighter.cfg:1.6
wesnoth/data/units/Noble_Fighter.cfg:1.7
--- wesnoth/data/units/Noble_Fighter.cfg:1.6 Thu Mar 24 22:06:24 2005
+++ wesnoth/data/units/Noble_Fighter.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Noble Fighter"
race=human
gender=male
-image=noble-fighter.png
-image_defensive=noble-fighter-defend.png
+image="noble-fighter.png"
+image_defensive="noble-fighter-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/haldric.png
#endif
@@ -29,12 +29,12 @@
[frame]
begin=-200
end=-75
- image=noble-fighter-attack.png
+ image="noble-fighter-attack.png"
[/frame]
[frame]
begin=-75
end=50
- image=noble-fighter-attack2.png
+ image="noble-fighter-attack2.png"
[/frame]
[sound]
Index: wesnoth/data/units/Noble_Lord.cfg
diff -u wesnoth/data/units/Noble_Lord.cfg:1.4
wesnoth/data/units/Noble_Lord.cfg:1.5
--- wesnoth/data/units/Noble_Lord.cfg:1.4 Fri Oct 29 21:36:46 2004
+++ wesnoth/data/units/Noble_Lord.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "Noble Lord"
race=human
gender=male
-image=noble-lord.png
-image_defensive=noble-lord-defend.png
-image_leading=noble-lord-leading.png
+image="noble-lord.png"
+image_defensive="noble-lord-defend.png"
+image_leading="noble-lord-leading.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/haldric.png
#endif
@@ -31,7 +31,7 @@
[frame]
begin=-100
end=50
- image="noble-lord-attack-sword.png"
+ image=""noble-lord-attack-sword.png""
[/frame]
[sound]
@@ -49,17 +49,17 @@
[frame]
begin=-300
end=-200
- image=noble-lord-attack-ranged1.png
+ image="noble-lord-attack-ranged1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=noble-lord-attack-ranged2.png
+ image="noble-lord-attack-ranged2.png"
[/frame]
[frame]
begin=-100
end=0
- image=noble-lord-attack-ranged1.png
+ image="noble-lord-attack-ranged1.png"
[/frame]
[sound]
@@ -75,8 +75,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Noble_Youth.cfg
diff -u wesnoth/data/units/Noble_Youth.cfg:1.7
wesnoth/data/units/Noble_Youth.cfg:1.8
--- wesnoth/data/units/Noble_Youth.cfg:1.7 Thu Mar 24 05:30:05 2005
+++ wesnoth/data/units/Noble_Youth.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Noble Youth"
race=human
gender=male
-image=noble-youth.png
-image_defensive=noble-youth-defend.png
+image="noble-youth.png"
+image_defensive="noble-youth-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/haldric.png
#endif
@@ -29,12 +29,12 @@
[frame]
begin=-200
end=-75
- image=noble-youth-attack.png
+ image="noble-youth-attack.png"
[/frame]
[frame]
begin=-75
end=50
- image=noble-youth-attack2.png
+ image="noble-youth-attack2.png"
[/frame]
[sound]
Index: wesnoth/data/units/Ogre.cfg
diff -u wesnoth/data/units/Ogre.cfg:1.9 wesnoth/data/units/Ogre.cfg:1.10
--- wesnoth/data/units/Ogre.cfg:1.9 Sat Nov 27 15:36:01 2004
+++ wesnoth/data/units/Ogre.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Ogre
name= _ "Ogre"
race=ogre
-image=ogre.png
-image_defensive=ogre-defend.png
+image="ogre.png"
+image_defensive="ogre-defend.png"
hitpoints=68
movement_type=largefoot
movement=5
@@ -24,13 +24,13 @@
[frame]
begin=-175
end=-100
- image=ogre-attack1.png
+ image="ogre-attack1.png"
[/frame]
[frame]
begin=-100
end=100
- image=ogre-attack2.png
+ image="ogre-attack2.png"
[/frame]
[sound]
Index: wesnoth/data/units/Orcish_Archer.cfg
diff -u wesnoth/data/units/Orcish_Archer.cfg:1.19
wesnoth/data/units/Orcish_Archer.cfg:1.20
--- wesnoth/data/units/Orcish_Archer.cfg:1.19 Sat Sep 4 16:53:23 2004
+++ wesnoth/data/units/Orcish_Archer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Archer
name= _ "Orcish Archer"
race=orc
-image=orc-archer.png
-image_defensive=orc-archer-defend.png
+image="orc-archer.png"
+image_defensive="orc-archer-defend.png"
hitpoints=32
movement_type=orcishfoot
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=orc-archer-attack2.png
+ image="orc-archer-attack2.png"
[/frame]
[sound]
time=-100
@@ -52,14 +52,14 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
begin=-300
end=0
- image=orc-archer-attack.png
+ image="orc-archer-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Assassin.cfg
diff -u wesnoth/data/units/Orcish_Assassin.cfg:1.17
wesnoth/data/units/Orcish_Assassin.cfg:1.18
--- wesnoth/data/units/Orcish_Assassin.cfg:1.17 Wed Mar 2 22:42:03 2005
+++ wesnoth/data/units/Orcish_Assassin.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Assassin
name= _ "Orcish Assassin"
race=orc
-image=orc-assassin.png
-image_defensive=orc-assassin-defend.png
+image="orc-assassin.png"
+image_defensive="orc-assassin-defend.png"
hitpoints=26
movement_type=elusivefoot
movement=6
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=orc-assassin-attack.png
+ image="orc-assassin-attack.png"
[/frame]
[sound]
time=-100
@@ -42,13 +42,13 @@
[frame]
begin=-150
end=50
- image=orc-assassin-knife.png
+ image="orc-assassin-knife.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Orcish_Crossbowman.cfg
diff -u wesnoth/data/units/Orcish_Crossbowman.cfg:1.10
wesnoth/data/units/Orcish_Crossbowman.cfg:1.11
--- wesnoth/data/units/Orcish_Crossbowman.cfg:1.10 Mon Feb 7 11:52:40 2005
+++ wesnoth/data/units/Orcish_Crossbowman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Crossbowman
name= _ "Orcish Crossbowman"
race=orc
-image=orc-xbowman.png
-image_defensive=orc-xbowman-defend.png
+image="orc-xbowman.png"
+image_defensive="orc-xbowman-defend.png"
hitpoints=43
movement_type=orcishfoot
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=orc-xbowman-attack.png
+ image="orc-xbowman-attack.png"
[/frame]
[sound]
@@ -43,7 +43,7 @@
[frame]
begin=-300
end=0
- image=orc-xbowman-ranged.png
+ image="orc-xbowman-ranged.png"
[/frame]
[sound]
time=-100
@@ -57,8 +57,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Grunt.cfg
diff -u wesnoth/data/units/Orcish_Grunt.cfg:1.12
wesnoth/data/units/Orcish_Grunt.cfg:1.13
--- wesnoth/data/units/Orcish_Grunt.cfg:1.12 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Orcish_Grunt.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Grunt
name= _ "Orcish Grunt"
race=orc
-image=orcish-grunt.png
-image_defensive=orcish-grunt-defend.png
+image="orcish-grunt.png"
+image_defensive="orcish-grunt-defend.png"
hitpoints=38
movement_type=orcishfoot
movement=5
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=orcish-grunt-attack.png
+ image="orcish-grunt-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Orcish_Leader.cfg
diff -u wesnoth/data/units/Orcish_Leader.cfg:1.3
wesnoth/data/units/Orcish_Leader.cfg:1.4
--- wesnoth/data/units/Orcish_Leader.cfg:1.3 Fri Jan 14 05:04:26 2005
+++ wesnoth/data/units/Orcish_Leader.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Leader
name= _ "Orcish Leader"
race=orc
-image=orcish-leader.png
-image_defensive=orcish-leader-defend.png
+image="orcish-leader.png"
+image_defensive="orcish-leader-defend.png"
#profile=misc/kapoue.png
hitpoints=45
ability=leadership
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=orcish-leader-attack.png
+ image="orcish-leader-attack.png"
[/frame]
[sound]
time=-250
@@ -42,19 +42,19 @@
[frame]
begin=-400
end=-300
- image=orcish-leader-ranged-1.png
+ image="orcish-leader-ranged-1.png"
[/frame]
[frame]
begin=-300
end=0
- image=orcish-leader-ranged-2.png
+ image="orcish-leader-ranged-2.png"
[/frame]
[frame]
begin=0
end=100
- image=orcish-leader-ranged-1.png
+ image="orcish-leader-ranged-1.png"
[/frame]
[sound]
@@ -71,8 +71,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Ruler.cfg
diff -u wesnoth/data/units/Orcish_Ruler.cfg:1.11
wesnoth/data/units/Orcish_Ruler.cfg:1.12
--- wesnoth/data/units/Orcish_Ruler.cfg:1.11 Fri Jan 14 05:04:26 2005
+++ wesnoth/data/units/Orcish_Ruler.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Ruler
name= _ "Orcish Ruler"
race=orc
-image=orcish-ruler.png
-image_defensive=orcish-ruler-defend.png
+image="orcish-ruler.png"
+image_defensive="orcish-ruler-defend.png"
#profile=misc/kapoue.png
hitpoints=60
ability=leadership
@@ -26,12 +26,12 @@
[frame]
begin=-100
end=0
- image=orcish-ruler-attack.png
+ image="orcish-ruler-attack.png"
[/frame]
[sound]
time=-250
sound=sword-swish.wav
- image=orcish-ruler-attack.png
+ image="orcish-ruler-attack.png"
[/sound]
[/attack]
[attack]
@@ -43,19 +43,19 @@
[frame]
begin=-400
end=-300
- image=orcish-ruler-ranged-1.png
+ image="orcish-ruler-ranged-1.png"
[/frame]
[frame]
begin=-300
end=0
- image=orcish-ruler-ranged-2.png
+ image="orcish-ruler-ranged-2.png"
[/frame]
[frame]
begin=0
end=100
- image=orcish-ruler-ranged-1.png
+ image="orcish-ruler-ranged-1.png"
[/frame]
[sound]
@@ -72,8 +72,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Shaman.cfg
diff -u wesnoth/data/units/Orcish_Shaman.cfg:1.7
wesnoth/data/units/Orcish_Shaman.cfg:1.8
--- wesnoth/data/units/Orcish_Shaman.cfg:1.7 Wed Dec 29 05:13:26 2004
+++ wesnoth/data/units/Orcish_Shaman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Shaman
name= _ "Orcish Shaman"
race=orc
-image=orcish-shaman-red.png
-image_defensive=orcish-shaman-red-defend.png
+image="orcish-shaman-red.png"
+image_defensive="orcish-shaman-red-defend.png"
hitpoints=18
movement_type=smallfoot
movement=5
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=orcish-shaman-red-attack-staff.png
+ image="orcish-shaman-red-attack-staff.png"
[/frame]
[sound]
time=-100
@@ -42,7 +42,7 @@
[frame]
begin=-250
end=0
- image=orcish-shaman-red-attack-curse.png
+ image="orcish-shaman-red-attack-curse.png"
[/frame]
[sound]
time=-200
@@ -51,8 +51,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
@@ -61,8 +61,8 @@
id=Novice Orcish Shaman
name= _ "Novice Orcish Shaman"
race=orc
-image=orcish-shaman-tan.png
-image_defensive=orcish-shaman-tan-defend.png
+image="orcish-shaman-tan.png"
+image_defensive="orcish-shaman-tan-defend.png"
hitpoints=18
movement_type=smallfoot
movement=5
@@ -84,7 +84,7 @@
[frame]
begin=-100
end=100
- image=orcish-shaman-tan-attack-staff.png
+ image="orcish-shaman-tan-attack-staff.png"
[/frame]
[sound]
time=-100
@@ -101,7 +101,7 @@
[frame]
begin=-250
end=0
- image=orcish-shaman-tan-attack-curse.png
+ image="orcish-shaman-tan-attack-curse.png"
[/frame]
[sound]
time=-200
@@ -110,8 +110,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
@@ -120,8 +120,8 @@
id=Old Orcish Shaman
name= _ "Old Orcish Shaman"
race=orc
-image=orcish-shaman-black.png
-image_defensive=orcish-shaman-black-defend.png
+image="orcish-shaman-black.png"
+image_defensive="orcish-shaman-black-defend.png"
hitpoints=18
movement_type=smallfoot
movement=5
@@ -143,7 +143,7 @@
[frame]
begin=-100
end=100
- image=orcish-shaman-black-attack-staff.png
+ image="orcish-shaman-black-attack-staff.png"
[/frame]
[sound]
time=-100
@@ -160,7 +160,7 @@
[frame]
begin=-250
end=0
- image=orcish-shaman-black-attack-curse.png
+ image="orcish-shaman-black-attack-curse.png"
[/frame]
[sound]
time=-200
@@ -169,8 +169,8 @@
[missile_frame]
begin=-200
end=0
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Slayer.cfg
diff -u wesnoth/data/units/Orcish_Slayer.cfg:1.17
wesnoth/data/units/Orcish_Slayer.cfg:1.18
--- wesnoth/data/units/Orcish_Slayer.cfg:1.17 Wed Mar 2 22:52:19 2005
+++ wesnoth/data/units/Orcish_Slayer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Slayer
name= _ "Orcish Slayer"
race=orc
-image=orc-slayer.png
-image_defensive=orc-slayer-defend.png
+image="orc-slayer.png"
+image_defensive="orc-slayer-defend.png"
hitpoints=36
movement_type=elusivefoot
movement=6
@@ -24,12 +24,12 @@
[frame]
begin=-150
end=0
- image=orc-slayer-attack1.png
+ image="orc-slayer-attack1.png"
[/frame]
[frame]
begin=0
end=150
- image=orc-slayer-attack2.png
+ image="orc-slayer-attack2.png"
[/frame]
[sound]
time=-100
@@ -47,18 +47,18 @@
[frame]
begin=-150
end=-100
- image=orc-slayer.png
+ image="orc-slayer.png"
[/frame]
[frame]
begin=-100
end=0
- image=orc-slayer-ranged.png
+ image="orc-slayer-ranged.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Orcish_Sovereign.cfg
diff -u wesnoth/data/units/Orcish_Sovereign.cfg:1.4
wesnoth/data/units/Orcish_Sovereign.cfg:1.5
--- wesnoth/data/units/Orcish_Sovereign.cfg:1.4 Fri Jan 14 05:04:26 2005
+++ wesnoth/data/units/Orcish_Sovereign.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Sovereign
name= _ "Orcish Sovereign"
race=orc
-image=orcish-sovereign.png
-image_defensive=orcish-sovereign-defend.png
+image="orcish-sovereign.png"
+image_defensive="orcish-sovereign-defend.png"
#profile=misc/kapoue.png
hitpoints=75
ability=leadership
@@ -26,12 +26,12 @@
[frame]
begin=-150
end=-100
- image=orcish-sovereign-attack1.png
+ image="orcish-sovereign-attack1.png"
[/frame]
[frame]
begin=-100
end=0
- image=orcish-sovereign-attack2.png
+ image="orcish-sovereign-attack2.png"
[/frame]
[sound]
time=-250
@@ -47,19 +47,19 @@
[frame]
begin=-400
end=-300
- image=orcish-sovereign-ranged-1.png
+ image="orcish-sovereign-ranged-1.png"
[/frame]
[frame]
begin=-300
end=0
- image=orcish-sovereign-ranged-2.png
+ image="orcish-sovereign-ranged-2.png"
[/frame]
[frame]
begin=0
end=100
- image=orcish-sovereign-ranged-1.png
+ image="orcish-sovereign-ranged-1.png"
[/frame]
[sound]
@@ -76,8 +76,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Warlord.cfg
diff -u wesnoth/data/units/Orcish_Warlord.cfg:1.16
wesnoth/data/units/Orcish_Warlord.cfg:1.17
--- wesnoth/data/units/Orcish_Warlord.cfg:1.16 Tue Jan 11 06:39:47 2005
+++ wesnoth/data/units/Orcish_Warlord.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Warlord
name= _ "Orcish Warlord"
race=orc
-image=orcish-warlord.png
-image_defensive=orcish-warlord-defend.png
+image="orcish-warlord.png"
+image_defensive="orcish-warlord-defend.png"
hitpoints=80
movement_type=orcishfoot
movement=5
@@ -36,17 +36,17 @@
[frame]
begin=-400
end=-300
- image=orcish-warlord-ranged-1.png
+ image="orcish-warlord-ranged-1.png"
[/frame]
[frame]
begin=-300
end=0
- image=orcish-warlord-ranged-2.png
+ image="orcish-warlord-ranged-2.png"
[/frame]
[frame]
begin=0
end=100
- image=orcish-warlord-ranged-1.png
+ image="orcish-warlord-ranged-1.png"
[/frame]
[sound]
@@ -63,8 +63,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Orcish_Warrior.cfg
diff -u wesnoth/data/units/Orcish_Warrior.cfg:1.12
wesnoth/data/units/Orcish_Warrior.cfg:1.13
--- wesnoth/data/units/Orcish_Warrior.cfg:1.12 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Orcish_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Orcish Warrior
name= _ "Orcish Warrior"
race=orc
-image=orcish-warrior.png
-image_defensive=orcish-warrior-defend.png
+image="orcish-warrior.png"
+image_defensive="orcish-warrior-defend.png"
hitpoints=52
movement_type=orcishfoot
movement=5
@@ -24,13 +24,13 @@
[frame]
begin=-150
end=0
- image=orcish-warrior-melee1.png
+ image="orcish-warrior-melee1.png"
[/frame]
#2 frames just waiting the 2nd image
[frame]
begin=0
end=150
- image=orcish-warrior-melee1.png
+ image="orcish-warrior-melee1.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Outlaw.cfg
diff -u wesnoth/data/units/Outlaw.cfg:1.13 wesnoth/data/units/Outlaw.cfg:1.14
--- wesnoth/data/units/Outlaw.cfg:1.13 Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/Outlaw.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Outlaw"
race=human
gender=male,female
-image=neutral-outlaw.png
-image_defensive=neutral-outlaw-defend.png
+image="neutral-outlaw.png"
+image_defensive="neutral-outlaw-defend.png"
hitpoints=40
movement_type=elusivefoot
movement=7
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=neutral-outlaw-attack.png
+ image="neutral-outlaw-attack.png"
[/frame]
[sound]
@@ -54,19 +54,19 @@
[frame]
begin=-250
end=-50
- image=neutral-outlaw-attack1.png
+ image="neutral-outlaw-attack1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw-attack2.png
+ image="neutral-outlaw-attack2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
@@ -75,8 +75,8 @@
name= _ "female^Outlaw"
race=human
gender=female
- image=neutral-outlaw+female.png
- image_defensive=neutral-outlaw+female-defend.png
+ image="neutral-outlaw+female.png"
+ image_defensive="neutral-outlaw+female-defend.png"
hitpoints=40
movement_type=elusivefoot
movement=7
@@ -99,7 +99,7 @@
[frame]
begin=-100
end=100
- image=neutral-outlaw+female-attack.png
+ image="neutral-outlaw+female-attack.png"
[/frame]
[sound]
@@ -122,19 +122,19 @@
[frame]
begin=-250
end=-50
- image=neutral-outlaw+female-attack1.png
+ image="neutral-outlaw+female-attack1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw+female-attack2.png
+ image="neutral-outlaw+female-attack2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Outlaw_Princess.cfg
diff -u wesnoth/data/units/Outlaw_Princess.cfg:1.8
wesnoth/data/units/Outlaw_Princess.cfg:1.9
--- wesnoth/data/units/Outlaw_Princess.cfg:1.8 Fri Mar 25 06:14:59 2005
+++ wesnoth/data/units/Outlaw_Princess.cfg Sun Mar 27 23:06:16 2005
@@ -4,8 +4,8 @@
name= _ "female^Outlaw Princess"
race=human
gender=female
-image=neutral-outlaw-princess.png
-image_defensive=neutral-outlaw-princess.png
+image="neutral-outlaw-princess.png"
+image_defensive="neutral-outlaw-princess.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/jessica.png
#endif
@@ -27,7 +27,7 @@
[frame]
begin=-75
end=50
- image=neutral-outlaw-princess-defend.png
+ image="neutral-outlaw-princess-defend.png"
[/frame]
[/defend]
[defend]
@@ -35,17 +35,17 @@
[frame]
begin=-150
end=-60
- image=neutral-outlaw-princess-defend-1-1.png
+ image="neutral-outlaw-princess-defend-1-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=neutral-outlaw-princess-defend-1-2.png
+ image="neutral-outlaw-princess-defend-1-2.png"
[/frame]
[frame]
begin=60
end=150
- image=neutral-outlaw-princess-defend-1-1.png
+ image="neutral-outlaw-princess-defend-1-1.png"
[/frame]
[/defend]
@@ -60,12 +60,12 @@
[frame]
begin=-150
end=-50
- image=neutral-outlaw-princess-attack-staff1.png
+ image="neutral-outlaw-princess-attack-staff1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw-princess-attack-staff2.png
+ image="neutral-outlaw-princess-attack-staff2.png"
[/frame]
[sound]
@@ -83,12 +83,12 @@
[frame]
begin=-250
end=-50
- image=neutral-outlaw-princess-attack-sling1.png
+ image="neutral-outlaw-princess-attack-sling1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw-princess-attack-sling2.png
+ image="neutral-outlaw-princess-attack-sling2.png"
[/frame]
[sound]
@@ -99,8 +99,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Outlaw_Queen.cfg
diff -u wesnoth/data/units/Outlaw_Queen.cfg:1.7
wesnoth/data/units/Outlaw_Queen.cfg:1.8
--- wesnoth/data/units/Outlaw_Queen.cfg:1.7 Fri Mar 25 09:07:04 2005
+++ wesnoth/data/units/Outlaw_Queen.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "female^Outlaw Queen"
race=human
gender=female
-image=neutral-outlaw-queen.png
-image_defensive=neutral-outlaw-queen.png
-image_leading=neutral-outlaw-queen-leading.png
+image="neutral-outlaw-queen.png"
+image_defensive="neutral-outlaw-queen.png"
+image_leading="neutral-outlaw-queen-leading.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/jessica.png
#endif
@@ -28,7 +28,7 @@
[frame]
begin=-75
end=50
- image=neutral-outlaw-queen-defend.png
+ image="neutral-outlaw-queen-defend.png"
[/frame]
[/defend]
[defend]
@@ -36,17 +36,17 @@
[frame]
begin=-150
end=-60
- image=neutral-outlaw-queen-defend-1-1.png
+ image="neutral-outlaw-queen-defend-1-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=neutral-outlaw-queen-defend-1-2.png
+ image="neutral-outlaw-queen-defend-1-2.png"
[/frame]
[frame]
begin=60
end=150
- image=neutral-outlaw-queen-defend-1-1.png
+ image="neutral-outlaw-queen-defend-1-1.png"
[/frame]
[/defend]
@@ -60,12 +60,12 @@
[frame]
begin=-150
end=-50
- image=neutral-outlaw-queen-attack-staff1.png
+ image="neutral-outlaw-queen-attack-staff1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw-queen-attack-staff2.png
+ image="neutral-outlaw-queen-attack-staff2.png"
[/frame]
[sound]
@@ -83,12 +83,12 @@
[frame]
begin=-250
end=-50
- image=neutral-outlaw-queen-attack-sling1.png
+ image="neutral-outlaw-queen-attack-sling1.png"
[/frame]
[frame]
begin=-50
end=50
- image=neutral-outlaw-queen-attack-sling2.png
+ image="neutral-outlaw-queen-attack-sling2.png"
[/frame]
[sound]
@@ -99,8 +99,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Paladin.cfg
diff -u wesnoth/data/units/Paladin.cfg:1.14 wesnoth/data/units/Paladin.cfg:1.15
--- wesnoth/data/units/Paladin.cfg:1.14 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Paladin.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Paladin
name= _ "Paladin"
race=human
-image=paladin.png
-image_healing=paladin-healing.png
-image_moving=paladin-moving.png
+image="paladin.png"
+image_healing="paladin-healing.png"
+image_moving="paladin-moving.png"
hitpoints=65
movement_type=mounted
movement=8
@@ -30,7 +30,7 @@
[frame]
begin=-200
end=100
- image=paladin-attack-sword.png
+ image="paladin-attack-sword.png"
[/frame]
[sound]
time=-200
@@ -47,7 +47,7 @@
[frame]
begin=-200
end=100
- image=paladin-moving.png
+ image="paladin-moving.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Peasant.cfg
diff -u wesnoth/data/units/Peasant.cfg:1.6 wesnoth/data/units/Peasant.cfg:1.7
--- wesnoth/data/units/Peasant.cfg:1.6 Wed Sep 8 14:06:57 2004
+++ wesnoth/data/units/Peasant.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Peasant"
race=human
gender=male
-image=neutral-peasant.png
-image_defensive=neutral-peasant-defend.png
+image="neutral-peasant.png"
+image_defensive="neutral-peasant-defend.png"
hitpoints=18
movement_type=smallfoot
movement=5
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=neutral-peasant-attack.png
+ image="neutral-peasant-attack.png"
[/frame]
[/attack]
[attack]
@@ -44,13 +44,13 @@
[frame]
begin=-100
end=100
- image=neutral-peasant.png
+ image="neutral-peasant.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/pitchfork-n.png
- image_diagonal=projectiles/pitchfork-ne.png
+ image="projectiles/pitchfork-n.png"
+ image_diagonal="projectiles/pitchfork-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Pikeman.cfg
diff -u wesnoth/data/units/Pikeman.cfg:1.14 wesnoth/data/units/Pikeman.cfg:1.15
--- wesnoth/data/units/Pikeman.cfg:1.14 Wed Dec 8 06:41:29 2004
+++ wesnoth/data/units/Pikeman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Pikeman
name= _ "Pikeman"
race=human
-image=human-pikeman.png
-image_defensive=human-pikeman-defend.png
+image="human-pikeman.png"
+image_defensive="human-pikeman-defend.png"
hitpoints=52
movement_type=smallfoot
[resistance]
@@ -28,12 +28,12 @@
[frame]
begin=-200
end=-100
- image=human-pikeman-attack-1.png
+ image="human-pikeman-attack-1.png"
[/frame]
[frame]
begin=-100
end=0
- image=human-pikeman-attack-2.png
+ image="human-pikeman-attack-2.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Pirate_Galleon.cfg
diff -u wesnoth/data/units/Pirate_Galleon.cfg:1.8
wesnoth/data/units/Pirate_Galleon.cfg:1.9
--- wesnoth/data/units/Pirate_Galleon.cfg:1.8 Wed Feb 9 02:03:54 2005
+++ wesnoth/data/units/Pirate_Galleon.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[unit]
id=Pirate Galleon
name= _ "Pirate Galleon"
-image=pirate-galleon.png
+image="pirate-galleon.png"
hitpoints=35
movement_type=float
movement=5
@@ -23,8 +23,8 @@
[missile_frame]
begin=-50
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Poacher.cfg
diff -u wesnoth/data/units/Poacher.cfg:1.9 wesnoth/data/units/Poacher.cfg:1.10
--- wesnoth/data/units/Poacher.cfg:1.9 Wed Jan 19 07:56:28 2005
+++ wesnoth/data/units/Poacher.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Poacher
name= _ "Poacher"
race=human
-image=neutral-poacher.png
-image_defensive=neutral-poacher-defend.png
+image="neutral-poacher.png"
+image_defensive="neutral-poacher-defend.png"
hitpoints=32
movement_type=smallfoot
movement=5
@@ -17,7 +17,7 @@
#Poachers are better than normal units at woods and swamps
[defense]
forest=40
- swamp water=50
+ swamp_water=50
[/defense]
get_hit_sound=groan.wav
[attack]
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=neutral-poacher-attack.png
+ image="neutral-poacher-attack.png"
[/frame]
[sound]
time=-100
@@ -57,24 +57,24 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
begin=-400
end=-250
- image=neutral-poacher-attack1.png
+ image="neutral-poacher-attack1.png"
[/frame]
[frame]
begin=-250
end=-100
- image=neutral-poacher-attack2.png
+ image="neutral-poacher-attack2.png"
[/frame]
[frame]
begin=-100
end=50
- image=neutral-poacher-attack1.png
+ image="neutral-poacher-attack1.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Princess.cfg
diff -u wesnoth/data/units/Princess.cfg:1.22
wesnoth/data/units/Princess.cfg:1.23
--- wesnoth/data/units/Princess.cfg:1.22 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Princess.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "female^Princess"
gender=female
race=human
-image=human-princess.png
-image_defensive=human-princess-defend.png
-image_leading=human-princess-leading.png
+image="human-princess.png"
+image_defensive="human-princess-defend.png"
+image_leading="human-princess-leading.png"
profile=portraits/Heir_To_The_Throne/lisar.png
hitpoints=48
movement_type=elusivefoot
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=human-princess-attack.png
+ image="human-princess-attack.png"
[/frame]
[sound]
time=-250
@@ -41,9 +41,9 @@
id=Princess
name= _ "Princess"
race=human
-image=scepter-princess.png
-image_defensive=scepter-princess-defend.png
-image_leading=scepter-princess-leading.png
+image="scepter-princess.png"
+image_defensive="scepter-princess-defend.png"
+image_leading="scepter-princess-leading.png"
profile=portraits/Heir_To_The_Throne/lisar.png
hitpoints=48
movement_type=elusivefoot
@@ -66,7 +66,7 @@
[frame]
begin=-100
end=100
- image=scepter-princess-attack-sword.png
+ image="scepter-princess-attack-sword.png"
[/frame]
[sound]
time=-250
@@ -83,17 +83,17 @@
[frame]
begin=-300
end=-200
- image=scepter-princess-attack-scepter-1.png
+ image="scepter-princess-attack-scepter-1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=scepter-princess-attack-scepter-2.png
+ image="scepter-princess-attack-scepter-2.png"
[/frame]
[frame]
begin=-100
end=100
- image=scepter-princess-attack-scepter-3.png
+ image="scepter-princess-attack-scepter-3.png"
[/frame]
[sound]
time=-200
@@ -103,8 +103,8 @@
begin=-100
end=0
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/variation]
Index: wesnoth/data/units/Red_Mage.cfg
diff -u wesnoth/data/units/Red_Mage.cfg:1.29
wesnoth/data/units/Red_Mage.cfg:1.30
--- wesnoth/data/units/Red_Mage.cfg:1.29 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Red_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Red Mage"
race=human
gender=male,female
-image=red-mage.png
-image_defensive=red-mage-defend.png
+image="red-mage.png"
+image_defensive="red-mage-defend.png"
hitpoints=42
movement_type=smallfoot
[resistance]
@@ -28,12 +28,12 @@
[frame]
begin=-100
end=-20
- image=red-mage-attack-staff1.png
+ image="red-mage-attack-staff1.png"
[/frame]
[frame]
begin=-20
end=100
- image=red-mage-attack-staff2.png
+ image="red-mage-attack-staff2.png"
[/frame]
[sound]
time=-100
@@ -50,33 +50,33 @@
[frame]
begin=-240
end=-180
- image=red-mage-fireball-1.png
+ image="red-mage-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=red-mage-fireball-2.png
+ image="red-mage-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=red-mage-fireball-3.png
+ image="red-mage-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=red-mage-fireball-2.png
+ image="red-mage-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=red-mage-fireball-1.png
+ image="red-mage-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -86,8 +86,8 @@
begin=-250
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
@@ -96,8 +96,8 @@
name= _ "female^Red Mage"
race=human
gender=female
- image=red-mage+female.png
- image_defensive=red-mage+female-defend.png
+ image="red-mage+female.png"
+ image_defensive="red-mage+female-defend.png"
hitpoints=42
movement_type=smallfoot
[resistance]
@@ -121,12 +121,12 @@
[frame]
begin=-100
end=-20
- image=red-mage+female-attack-staff1.png
+ image="red-mage+female-attack-staff1.png"
[/frame]
[frame]
begin=-20
end=100
- image=red-mage+female-attack-staff2.png
+ image="red-mage+female-attack-staff2.png"
[/frame]
[sound]
time=-100
@@ -143,33 +143,33 @@
[frame]
begin=-240
end=-180
- image=red-mage+female-fireball-1.png
+ image="red-mage+female-fireball-1.png"
[/frame]
[frame]
begin=-180
end=-120
- image=red-mage+female-fireball-2.png
+ image="red-mage+female-fireball-2.png"
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=-120
end=-60
- image=red-mage+female-fireball-3.png
+ image="red-mage+female-fireball-3.png"
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
halo_x,halo_y=-15,1
[/frame]
[frame]
begin=-60
end=0
- image=red-mage+female-fireball-2.png
+ image="red-mage+female-fireball-2.png"
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
halo_x,halo_y=-11,3
[/frame]
[frame]
begin=0
end=60
- image=red-mage+female-fireball-1.png
+ image="red-mage+female-fireball-1.png"
[/frame]
[sound]
time=-200
@@ -179,8 +179,8 @@
begin=-250
end=50
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2.png:30
- image=projectiles/fireball-n.png
- image_diagonal=projectiles/fireball-nw.png
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
[/missile_frame]
[/attack]
[/female]
Index: wesnoth/data/units/Revenant.cfg
diff -u wesnoth/data/units/Revenant.cfg:1.12
wesnoth/data/units/Revenant.cfg:1.13
--- wesnoth/data/units/Revenant.cfg:1.12 Tue Mar 22 23:35:00 2005
+++ wesnoth/data/units/Revenant.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Revenant
name= _ "Revenant"
race=undead
-image=undead-revenant.png
-image_defensive=undead-revenant-defend.png
+image="undead-revenant.png"
+image_defensive="undead-revenant-defend.png"
hitpoints=40
movement_type=undeadfoot
movement=5
@@ -24,12 +24,12 @@
[frame]
begin=0
end=200
- image=undead-revenant-dying.png
+ image="undead-revenant-dying.png"
[/frame]
[frame]
begin=200
end=400
- image=undead-revenant-dying-2.png
+ image="undead-revenant-dying-2.png"
[/frame]
[/death]
[attack]
@@ -41,7 +41,7 @@
[frame]
begin=-100
end=100
- image=undead-revenant-attack.png
+ image="undead-revenant-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Rogue.cfg
diff -u wesnoth/data/units/Rogue.cfg:1.14 wesnoth/data/units/Rogue.cfg:1.15
--- wesnoth/data/units/Rogue.cfg:1.14 Wed Jan 12 06:59:57 2005
+++ wesnoth/data/units/Rogue.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Rogue"
race=human
gender=male,female
-image=rogue.png
-image_defensive=rogue-defend.png
+image="rogue.png"
+image_defensive="rogue-defend.png"
hitpoints=36
movement_type=elusivefoot
movement=6
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=rogue-attack.png
+ image="rogue-attack.png"
[/frame]
[sound]
time=-250
@@ -44,13 +44,13 @@
[frame]
begin=-200
end=50
- image=rogue-ranged.png
+ image="rogue-ranged.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
@@ -63,8 +63,8 @@
name= _ "female^Rogue"
race=human
gender=female
- image=rogue+female.png
- image_defensive=rogue+female-defend.png
+ image="rogue+female.png"
+ image_defensive="rogue+female-defend.png"
hitpoints=36
movement_type=elusivefoot
movement=6
@@ -87,7 +87,7 @@
[frame]
begin=-100
end=100
- image=rogue+female-attack.png
+ image="rogue+female-attack.png"
[/frame]
[sound]
time=-250
@@ -104,13 +104,13 @@
[frame]
begin=-200
end=50
- image=rogue+female-ranged.png
+ image="rogue+female-ranged.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/dagger-n.png
- image_diagonal=projectiles/dagger-ne.png
+ image="projectiles/dagger-n.png"
+ image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
[sound]
time=-100
Index: wesnoth/data/units/Royal_Guard.cfg
diff -u wesnoth/data/units/Royal_Guard.cfg:1.14
wesnoth/data/units/Royal_Guard.cfg:1.15
--- wesnoth/data/units/Royal_Guard.cfg:1.14 Wed Dec 8 06:41:29 2004
+++ wesnoth/data/units/Royal_Guard.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Royal Guard
name= _ "Royal Guard"
race=human
-image=human-royalguard.png
-image_defensive=human-royalguard-defend.png
+image="human-royalguard.png"
+image_defensive="human-royalguard-defend.png"
hitpoints=75
movement_type=smallfoot
[resistance]
@@ -32,7 +32,7 @@
[frame]
begin=-250
end=0
- image=human-royalguard-attack.png
+ image="human-royalguard-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian.cfg
diff -u wesnoth/data/units/Saurian.cfg:1.10 wesnoth/data/units/Saurian.cfg:1.11
--- wesnoth/data/units/Saurian.cfg:1.10 Thu Jan 13 21:10:23 2005
+++ wesnoth/data/units/Saurian.cfg Sun Mar 27 23:06:16 2005
@@ -5,8 +5,8 @@
name= _ "Saurian"
obsolete=1
race=lizard
-image=saurian-skirmisher.png
-image_defensive=saurian-skirmisher-defend.png
+image="saurian-skirmisher.png"
+image_defensive="saurian-skirmisher-defend.png"
hitpoints=22
movement_type=lizard
movement=7
@@ -29,12 +29,12 @@
[frame]
begin=-150
end=-50
- image=saurian-skirmisher-attack1.png
+ image="saurian-skirmisher-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-skirmisher-attack2.png
+ image="saurian-skirmisher-attack2.png"
[/frame]
[/attack]
[attack]
@@ -51,13 +51,13 @@
[frame]
begin=-100
end=100
- image=saurian-skirmisher-attack3.png
+ image="saurian-skirmisher-attack3.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian_Ambusher.cfg
diff -u wesnoth/data/units/Saurian_Ambusher.cfg:1.3
wesnoth/data/units/Saurian_Ambusher.cfg:1.4
--- wesnoth/data/units/Saurian_Ambusher.cfg:1.3 Thu Nov 25 22:50:23 2004
+++ wesnoth/data/units/Saurian_Ambusher.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Saurian Ambusher
name= _ "Saurian Ambusher"
race=lizard
-image=saurian-ambusher.png
-image_defensive=saurian-ambusher-defend.png
+image="saurian-ambusher.png"
+image_defensive="saurian-ambusher-defend.png"
hitpoints=32
movement_type=lizard
movement=7
@@ -27,12 +27,12 @@
[frame]
begin=-150
end=-50
- image=saurian-ambusher-attack1.png
+ image="saurian-ambusher-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-ambusher-attack2.png
+ image="saurian-ambusher-attack2.png"
[/frame]
[/attack]
[attack]
@@ -49,13 +49,13 @@
[frame]
begin=-100
end=100
- image=saurian-ambusher-ranged.png
+ image="saurian-ambusher-ranged.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian_Flanker.cfg
diff -u wesnoth/data/units/Saurian_Flanker.cfg:1.3
wesnoth/data/units/Saurian_Flanker.cfg:1.4
--- wesnoth/data/units/Saurian_Flanker.cfg:1.3 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Saurian_Flanker.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Saurian Flanker
name= _ "Saurian Flanker"
race=lizard
-image=saurian-flanker.png
-image_defensive=saurian-flanker-defend.png
+image="saurian-flanker.png"
+image_defensive="saurian-flanker-defend.png"
hitpoints=43
movement_type=lizard
movement=7
@@ -28,12 +28,12 @@
[frame]
begin=-150
end=-50
- image=saurian-flanker-attack1.png
+ image="saurian-flanker-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-flanker-attack2.png
+ image="saurian-flanker-attack2.png"
[/frame]
[/attack]
[attack]
@@ -50,18 +50,18 @@
[frame]
begin=-150
end=-50
- image=saurian-flanker-attack1.png
+ image="saurian-flanker-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-flanker-attack-ranged.png
+ image="saurian-flanker-attack-ranged.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian_Icecaster.cfg
diff -u wesnoth/data/units/Saurian_Icecaster.cfg:1.10
wesnoth/data/units/Saurian_Icecaster.cfg:1.11
--- wesnoth/data/units/Saurian_Icecaster.cfg:1.10 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Saurian_Icecaster.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Saurian Icecaster
name= _ "Saurian Icecaster"
race=lizard
-image=saurian-icecaster.png
-image_defensive=saurian-icecaster-defend.png
+image="saurian-icecaster.png"
+image_defensive="saurian-icecaster-defend.png"
hitpoints=25
movement_type=lizard
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=saurian-icecaster-attack.png
+ image="saurian-icecaster-attack.png"
[/frame]
[sound]
time=-100
@@ -47,17 +47,17 @@
[frame]
begin=-300
end=-200
- image=saurian-icecaster-ranged1.png
+ image="saurian-icecaster-ranged1.png"
[/frame]
[frame]
begin=-200
end=-100
- image=saurian-icecaster-ranged2.png
+ image="saurian-icecaster-ranged2.png"
[/frame]
[frame]
begin=-100
end=0
- image=saurian-icecaster-ranged3.png
+ image="saurian-icecaster-ranged3.png"
[/frame]
[sound]
time=-200
@@ -66,8 +66,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian_Skirmisher.cfg
diff -u wesnoth/data/units/Saurian_Skirmisher.cfg:1.3
wesnoth/data/units/Saurian_Skirmisher.cfg:1.4
--- wesnoth/data/units/Saurian_Skirmisher.cfg:1.3 Mon Feb 7 11:52:40 2005
+++ wesnoth/data/units/Saurian_Skirmisher.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
id=Saurian Skirmisher
name= _ "Saurian Skirmisher"
race=lizard
-image=saurian-skirmisher.png
-image_defensive=saurian-skirmisher.png
+image="saurian-skirmisher.png"
+image_defensive="saurian-skirmisher.png"
hitpoints=22
movement_type=lizard
movement=7
@@ -27,12 +27,12 @@
[frame]
begin=-150
end=-50
- image=saurian-skirmisher-attack1.png
+ image="saurian-skirmisher-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-skirmisher-attack2.png
+ image="saurian-skirmisher-attack2.png"
[/frame]
[/attack]
[attack]
@@ -49,13 +49,13 @@
[frame]
begin=-100
end=100
- image=saurian-skirmisher-attack3.png
+ image="saurian-skirmisher-attack3.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Saurian_Soothsayer.cfg
diff -u wesnoth/data/units/Saurian_Soothsayer.cfg:1.10
wesnoth/data/units/Saurian_Soothsayer.cfg:1.11
--- wesnoth/data/units/Saurian_Soothsayer.cfg:1.10 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Saurian_Soothsayer.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Saurian Soothsayer
name= _ "Saurian Soothsayer"
race=lizard
-image=saurian-soothsayer.png
-image_defensive=saurian-soothsayer-defend.png
-image_healing=saurian-soothsayer-healing.png
+image="saurian-soothsayer.png"
+image_defensive="saurian-soothsayer-defend.png"
+image_healing="saurian-soothsayer-healing.png"
hitpoints=25
movement_type=lizard
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=saurian-soothsayer-attack.png
+ image="saurian-soothsayer-attack.png"
[/frame]
[sound]
time=-100
@@ -46,13 +46,13 @@
[frame]
begin=-300
end=-200
- image=saurian-soothsayer-ranged.png
+ image="saurian-soothsayer-ranged.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Saurian_Tribalist.cfg
diff -u wesnoth/data/units/Saurian_Tribalist.cfg:1.11
wesnoth/data/units/Saurian_Tribalist.cfg:1.12
--- wesnoth/data/units/Saurian_Tribalist.cfg:1.11 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Saurian_Tribalist.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
id=Saurian Tribalist
name= _ "Saurian Tribalist"
race=lizard
-image=saurian-tribalist.png
-image_defensive=saurian-tribalist-defend.png
-image_healing=saurian-tribalist-heal.png
+image="saurian-tribalist.png"
+image_defensive="saurian-tribalist-defend.png"
+image_healing="saurian-tribalist-heal.png"
hitpoints=18
movement_type=lizard
movement=6
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=saurian-tribalist-attack.png
+ image="saurian-tribalist-attack.png"
[/frame]
[sound]
time=-100
@@ -46,13 +46,13 @@
[frame]
begin=-300
end=-200
- image=saurian-tribalist-ranged1.png
+ image="saurian-tribalist-ranged1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
[/missile_frame]
[sound]
time=-200
Index: wesnoth/data/units/Saurian_Warrior.cfg
diff -u wesnoth/data/units/Saurian_Warrior.cfg:1.12
wesnoth/data/units/Saurian_Warrior.cfg:1.13
--- wesnoth/data/units/Saurian_Warrior.cfg:1.12 Thu Jan 13 21:10:24 2005
+++ wesnoth/data/units/Saurian_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -5,8 +5,8 @@
name= _ "Saurian Warrior"
obsolete=1
race=lizard
-image=saurian-ambusher.png
-image_defensive=saurian-ambusher-defend.png
+image="saurian-ambusher.png"
+image_defensive="saurian-ambusher-defend.png"
hitpoints=32
movement_type=lizard
movement=7
@@ -29,12 +29,12 @@
[frame]
begin=-150
end=-50
- image=saurian-ambusher-attack1.png
+ image="saurian-ambusher-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=saurian-ambusher-attack2.png
+ image="saurian-ambusher-attack2.png"
[/frame]
[/attack]
[attack]
@@ -51,13 +51,13 @@
[frame]
begin=-100
end=100
- image=saurian-ambusher-ranged.png
+ image="saurian-ambusher-ranged.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Sea_Hag.cfg
diff -u wesnoth/data/units/Sea_Hag.cfg:1.19 wesnoth/data/units/Sea_Hag.cfg:1.20
--- wesnoth/data/units/Sea_Hag.cfg:1.19 Sun Feb 20 15:31:51 2005
+++ wesnoth/data/units/Sea_Hag.cfg Sun Mar 27 23:06:16 2005
@@ -6,8 +6,8 @@
name= _ "female^Sea Hag"
race=naga
gender=female
-image=sea-hag.png
-image_defensive=sea-hag-defend.png
+image="sea-hag.png"
+image_defensive="sea-hag-defend.png"
hitpoints=37
movement_type=swimmer
movement=6
@@ -37,8 +37,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/water-spray.png
- image_diagonal=projectiles/water-spray.png
+ image="projectiles/water-spray.png"
+ image_diagonal="projectiles/water-spray.png"
[/missile_frame]
[sound]
time=-60
Index: wesnoth/data/units/Sea_Orc.cfg
diff -u wesnoth/data/units/Sea_Orc.cfg:1.11 wesnoth/data/units/Sea_Orc.cfg:1.12
--- wesnoth/data/units/Sea_Orc.cfg:1.11 Mon Sep 20 11:36:14 2004
+++ wesnoth/data/units/Sea_Orc.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Sea Orc
name= _ "Sea Orc"
race=orc
-image=sea-orc.png
-image_defensive=sea-orc-defend.png
+image="sea-orc.png"
+image_defensive="sea-orc-defend.png"
hitpoints=31
movement_type=swimmer
movement=5
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=sea-orc-attack.png
+ image="sea-orc-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Sea_Serpent.cfg
diff -u wesnoth/data/units/Sea_Serpent.cfg:1.8
wesnoth/data/units/Sea_Serpent.cfg:1.9
--- wesnoth/data/units/Sea_Serpent.cfg:1.8 Sun Aug 29 23:28:26 2004
+++ wesnoth/data/units/Sea_Serpent.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Sea Serpent
name= _ "Sea Serpent"
race=monster
-image=seaserpent.png
-image_defensive=seaserpent-defend.png
+image="seaserpent.png"
+image_defensive="seaserpent-defend.png"
hitpoints=85
movement_type=deepsea
movement=8
@@ -24,7 +24,7 @@
[frame]
begin=-200
end=100
- image=seaserpent-attack.png
+ image="seaserpent-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Sergeant.cfg
diff -u wesnoth/data/units/Sergeant.cfg:1.4 wesnoth/data/units/Sergeant.cfg:1.5
--- wesnoth/data/units/Sergeant.cfg:1.4 Sun Dec 19 16:29:44 2004
+++ wesnoth/data/units/Sergeant.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Sergeant
name= _ "Sergeant"
race=human
-image=human-sergeant.png
-image_defensive=human-sergeant-defend.png
-image_leading=human-sergeant-leading.png
+image="human-sergeant.png"
+image_defensive="human-sergeant-defend.png"
+image_leading="human-sergeant-leading.png"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/gweddry.png
#endif
@@ -29,7 +29,7 @@
[frame]
begin=-200
end=200
- image=human-sergeant-attack-sword.png
+ image="human-sergeant-attack-sword.png"
[/frame]
[sound]
@@ -46,7 +46,7 @@
[frame]
begin=-150
end=100
- image=human-sergeant-attack-crossbow.png
+ image="human-sergeant-attack-crossbow.png"
[/frame]
[sound]
@@ -63,8 +63,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Shadow.cfg
diff -u wesnoth/data/units/Shadow.cfg:1.16 wesnoth/data/units/Shadow.cfg:1.17
--- wesnoth/data/units/Shadow.cfg:1.16 Wed Oct 6 13:50:46 2004
+++ wesnoth/data/units/Shadow.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Shadow
name= _ "Shadow"
race=undead
-image=undead-shadow.png
-image_defensive=undead-shadow-defend.png
+image="undead-shadow.png"
+image_defensive="undead-shadow-defend.png"
hitpoints=24
movement_type=undeadspirit
movement=7
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=100
- image=undead-shadow-attack.png
+ image="undead-shadow-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Shock_Trooper.cfg
diff -u wesnoth/data/units/Shock_Trooper.cfg:1.9
wesnoth/data/units/Shock_Trooper.cfg:1.10
--- wesnoth/data/units/Shock_Trooper.cfg:1.9 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Shock_Trooper.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Shock Trooper
name= _ "Shock Trooper"
race=human
-image=human-shocktrooper.png
-image_defensive=human-shocktrooper-defend.png
+image="human-shocktrooper.png"
+image_defensive="human-shocktrooper-defend.png"
hitpoints=52
movement_type=armoredfoot
movement=4
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=human-shocktrooper-attack.png
+ image="human-shocktrooper-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Silver_Mage.cfg
diff -u wesnoth/data/units/Silver_Mage.cfg:1.13
wesnoth/data/units/Silver_Mage.cfg:1.14
--- wesnoth/data/units/Silver_Mage.cfg:1.13 Sat Feb 12 00:18:59 2005
+++ wesnoth/data/units/Silver_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Silver Mage"
race=human
gender=male,female
-image=silver-mage.png
-image_defensive=silver-mage-defend.png
+image="silver-mage.png"
+image_defensive="silver-mage-defend.png"
hitpoints=48
movement_type=smallfoot
[resistance]
@@ -25,52 +25,52 @@
[frame]
begin=-500
end=-400
- image=silver-mage-teleport1.png
+ image="silver-mage-teleport1.png"
[/frame]
[frame]
begin=-400
end=-300
- image=silver-mage-teleport2.png
+ image="silver-mage-teleport2.png"
[/frame]
[frame]
begin=-300
end=-200
- image=silver-mage-teleport3.png
+ image="silver-mage-teleport3.png"
[/frame]
[frame]
begin=-200
end=-100
- image=silver-mage-teleport4.png
+ image="silver-mage-teleport4.png"
[/frame]
[frame]
begin=-100
end=0
- image=silver-mage-teleport5.png
+ image="silver-mage-teleport5.png"
[/frame]
[frame]
begin=0
end=100
- image=silver-mage-teleport6.png
+ image="silver-mage-teleport6.png"
[/frame]
[frame]
begin=100
end=200
- image=silver-mage-teleport7.png
+ image="silver-mage-teleport7.png"
[/frame]
[frame]
begin=200
end=300
- image=silver-mage-teleport8.png
+ image="silver-mage-teleport8.png"
[/frame]
[frame]
begin=300
end=400
- image=silver-mage-teleport9.png
+ image="silver-mage-teleport9.png"
[/frame]
[frame]
begin=400
end=500
- image=silver-mage-teleport10.png
+ image="silver-mage-teleport10.png"
[/frame]
[/teleport_anim]
[attack]
@@ -82,7 +82,7 @@
[frame]
begin=-100
end=100
- image=silver-mage-attack-melee.png
+ image="silver-mage-attack-melee.png"
[/frame]
[sound]
time=-100
@@ -103,25 +103,25 @@
[frame]
begin=-400
end=-350
- image=silver-mage-attack-magic1.png
+ image="silver-mage-attack-magic1.png"
[/frame]
[frame]
begin=-350
end=0
- image=silver-mage-attack-magic1.png
+ image="silver-mage-attack-magic1.png"
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png
halo_x,halo_y=19,-15
[/frame]
[frame]
begin=0
end=50
- image=silver-mage-attack-magic1.png
+ image="silver-mage-attack-magic1.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
halo=halo/mage-halo1.png,halo/mage-halo2-big.png,halo/mage-halo3-big.png,halo/mage-halo4-big.png,halo/mage-halo5-big.png,halo/mage-halo6-big.png
halo_x,halo_y=19,-15
[/missile_frame]
@@ -132,8 +132,8 @@
name= _ "female^Silver Mage"
race=human
gender=female
- image=silver-mage+female.png
- image_defensive=silver-mage+female-defend.png
+ image="silver-mage+female.png"
+ image_defensive="silver-mage+female-defend.png"
hitpoints=48
movement_type=smallfoot
[resistance]
@@ -154,52 +154,52 @@
[frame]
begin=-500
end=-400
- image=silver-mage+female-teleport1.png
+ image="silver-mage+female-teleport1.png"
[/frame]
[frame]
begin=-400
end=-300
- image=silver-mage+female-teleport2.png
+ image="silver-mage+female-teleport2.png"
[/frame]
[frame]
begin=-300
end=-200
- image=silver-mage+female-teleport3.png
+ image="silver-mage+female-teleport3.png"
[/frame]
[frame]
begin=-200
end=-100
- image=silver-mage+female-teleport4.png
+ image="silver-mage+female-teleport4.png"
[/frame]
[frame]
begin=-100
end=0
- image=silver-mage+female-teleport5.png
+ image="silver-mage+female-teleport5.png"
[/frame]
[frame]
begin=0
end=100
- image=silver-mage+female-teleport6.png
+ image="silver-mage+female-teleport6.png"
[/frame]
[frame]
begin=100
end=200
- image=silver-mage+female-teleport7.png
+ image="silver-mage+female-teleport7.png"
[/frame]
[frame]
begin=200
end=300
- image=silver-mage+female-teleport8.png
+ image="silver-mage+female-teleport8.png"
[/frame]
[frame]
begin=300
end=400
- image=silver-mage+female-teleport9.png
+ image="silver-mage+female-teleport9.png"
[/frame]
[frame]
begin=400
end=500
- image=silver-mage+female-teleport10.png
+ image="silver-mage+female-teleport10.png"
[/frame]
[/teleport_anim]
[attack]
@@ -211,7 +211,7 @@
[frame]
begin=-100
end=100
- image=silver-mage+female-attack-melee.png
+ image="silver-mage+female-attack-melee.png"
[/frame]
[sound]
time=-100
@@ -232,25 +232,25 @@
[frame]
begin=-400
end=-350
- image=silver-mage+female-attack-magic1.png
+ image="silver-mage+female-attack-magic1.png"
[/frame]
[frame]
begin=-350
end=0
- image=silver-mage+female-attack-magic1.png
+ image="silver-mage+female-attack-magic1.png"
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png
halo_x,halo_y=19,-15
[/frame]
[frame]
begin=0
end=50
- image=silver-mage-attack-magic1.png
+ image="silver-mage-attack-magic1.png"
[/frame]
[missile_frame]
begin=-200
end=50
- image=projectiles/magicmissile-n.png
- image_diagonal=projectiles/magicmissile-ne.png
+ image="projectiles/magicmissile-n.png"
+ image_diagonal="projectiles/magicmissile-ne.png"
halo=halo/mage-halo1.png,halo/mage-halo2-big.png,halo/mage-halo3-big.png,halo/mage-halo4-big.png,halo/mage-halo5-big.png,halo/mage-halo6-big.png
halo_x,halo_y=19,-15
[/missile_frame]
Index: wesnoth/data/units/Skeletal_Dragon.cfg
diff -u wesnoth/data/units/Skeletal_Dragon.cfg:1.3
wesnoth/data/units/Skeletal_Dragon.cfg:1.4
--- wesnoth/data/units/Skeletal_Dragon.cfg:1.3 Tue Oct 19 20:36:11 2004
+++ wesnoth/data/units/Skeletal_Dragon.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Skeletal Dragon"
#not 'race=monster', because we need the not_living attribute
race=undead
-image=skeletal-dragon.png
-image_defensive=skeletal-dragon-defend.png
+image="skeletal-dragon.png"
+image_defensive="skeletal-dragon-defend.png"
hitpoints=86
movement_type=undeadfoot
movement=5
@@ -34,12 +34,12 @@
[frame]
begin=-150
end=-50
- image=skeletal-dragon-attack-jaw1.png
+ image="skeletal-dragon-attack-jaw1.png"
[/frame]
[frame]
begin=-50
end=100
- image=skeletal-dragon-attack-jaw2.png
+ image="skeletal-dragon-attack-jaw2.png"
[/frame]
[/attack]
@@ -52,17 +52,17 @@
[frame]
begin=-200
end=-150
- image=skeletal-dragon-attack-claws1.png
+ image="skeletal-dragon-attack-claws1.png"
[/frame]
[frame]
begin=-150
end=-50
- image=skeletal-dragon-attack-claws2.png
+ image="skeletal-dragon-attack-claws2.png"
[/frame]
[frame]
begin=-50
end=100
- image=skeletal-dragon-attack-claws3.png
+ image="skeletal-dragon-attack-claws3.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Skeleton.cfg
diff -u wesnoth/data/units/Skeleton.cfg:1.15
wesnoth/data/units/Skeleton.cfg:1.16
--- wesnoth/data/units/Skeleton.cfg:1.15 Tue Mar 22 23:35:00 2005
+++ wesnoth/data/units/Skeleton.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Skeleton
name= _ "Skeleton"
race=undead
-image=undead-skeleton.png
-image_defensive=undead-skeleton-defend.png
+image="undead-skeleton.png"
+image_defensive="undead-skeleton-defend.png"
hitpoints=30
movement_type=undeadfoot
movement=5
@@ -19,12 +19,12 @@
[frame]
begin=0
end=200
- image=undead-skeleton-dying.png
+ image="undead-skeleton-dying.png"
[/frame]
[frame]
begin=200
end=400
- image=undead-skeleton-dying-2.png
+ image="undead-skeleton-dying-2.png"
[/frame]
[/death]
@@ -42,12 +42,12 @@
[frame]
begin=-100
end=0
- image=undead-skeleton-attack.png
+ image="undead-skeleton-attack.png"
[/frame]
[frame]
begin=0
end=100
- image=undead-skeleton-attackb.png
+ image="undead-skeleton-attackb.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Skeleton_Archer.cfg
diff -u wesnoth/data/units/Skeleton_Archer.cfg:1.15
wesnoth/data/units/Skeleton_Archer.cfg:1.16
--- wesnoth/data/units/Skeleton_Archer.cfg:1.15 Sun Jan 9 06:02:25 2005
+++ wesnoth/data/units/Skeleton_Archer.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Skeleton Archer
name= _ "Skeleton Archer"
race=undead
-image=undead-archer.png
-image_defensive=undead-archer-defend.png
+image="undead-archer.png"
+image_defensive="undead-archer-defend.png"
hitpoints=30
movement_type=undeadfoot
movement=5
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=undead-archer-attack.png
+ image="undead-archer-attack.png"
[/frame]
[sound]
time=-250
@@ -46,12 +46,12 @@
[frame]
begin=-400
end=-250
- image=undead-archer-attack1.png
+ image="undead-archer-attack1.png"
[/frame]
[frame]
begin=-250
end=0
- image=undead-archer-attack2.png
+ image="undead-archer-attack2.png"
[/frame]
[sound]
@@ -68,8 +68,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Sleeping_Gryphon.cfg
diff -u wesnoth/data/units/Sleeping_Gryphon.cfg:1.8
wesnoth/data/units/Sleeping_Gryphon.cfg:1.9
--- wesnoth/data/units/Sleeping_Gryphon.cfg:1.8 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Sleeping_Gryphon.cfg Sun Mar 27 23:06:16 2005
@@ -2,7 +2,7 @@
id=Sleeping Gryphon
name= _ "Sleeping Gryphon"
race=monster
-image=gryphon-sleeping.png
+image="gryphon-sleeping.png"
hitpoints=44
movement_type=mounted
movement=1
Index: wesnoth/data/units/Soul_Shooter.cfg
diff -u wesnoth/data/units/Soul_Shooter.cfg:1.5
wesnoth/data/units/Soul_Shooter.cfg:1.6
--- wesnoth/data/units/Soul_Shooter.cfg:1.5 Sun Nov 21 09:51:46 2004
+++ wesnoth/data/units/Soul_Shooter.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Soul Shooter
name= _ "Soul Shooter"
race=undead
-image=undead-soulshooter.png
-image_defensive=undead-soulshooter-defend.png
+image="undead-soulshooter.png"
+image_defensive="undead-soulshooter-defend.png"
hitpoints=50
movement_type=undeadfoot
movement=5
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=undead-soulshooter-attack.png
+ image="undead-soulshooter-attack.png"
[/frame]
[/attack]
@@ -44,12 +44,12 @@
[frame]
begin=-400
end=-200
- image=undead-soulshooter-ranged.png
+ image="undead-soulshooter-ranged.png"
[/frame]
[frame]
begin=-200
end=-100
- image=undead-soulshooter-ranged2.png
+ image="undead-soulshooter-ranged2.png"
[/frame]
[sound]
@@ -66,8 +66,8 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/bone-n.png
- image_diagonal=projectiles/bone-ne.png
+ image="projectiles/bone-n.png"
+ image_diagonal="projectiles/bone-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Soulless.cfg
diff -u wesnoth/data/units/Soulless.cfg:1.8 wesnoth/data/units/Soulless.cfg:1.9
--- wesnoth/data/units/Soulless.cfg:1.8 Sat Feb 26 15:44:16 2005
+++ wesnoth/data/units/Soulless.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Soulless
name= _ "Soulless"
race=undead
-image=undead-soulless.png
-image_defensive=undead-soulless-defend.png
+image="undead-soulless.png"
+image_defensive="undead-soulless-defend.png"
hitpoints=28
movement_type=undeadfoot
movement=4
@@ -25,7 +25,7 @@
[frame]
begin=-200
end=100
- image=undead-soulless-melee.png
+ image="undead-soulless-melee.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Spearman.cfg
diff -u wesnoth/data/units/Spearman.cfg:1.17
wesnoth/data/units/Spearman.cfg:1.18
--- wesnoth/data/units/Spearman.cfg:1.17 Sat Mar 26 10:38:44 2005
+++ wesnoth/data/units/Spearman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Spearman
name= _ "Spearman"
race=human
-image=human-spearman.png
-image_defensive=human-spearman-defend-2.png
+image="human-spearman.png"
+image_defensive="human-spearman-defend-2.png"
hitpoints=36
movement_type=smallfoot
movement=5
@@ -19,17 +19,17 @@
[frame]
begin=-100
end=-90
- image=human-spearman-defend-2.png
+ image="human-spearman-defend-2.png"
[/frame]
[frame]
begin=-90
end=90
- image=human-spearman-defend.png
+ image="human-spearman-defend.png"
[/frame]
[frame]
begin=90
end=100
- image=human-spearman-defend-2.png
+ image="human-spearman-defend-2.png"
[/frame]
[/defend]
[attack]
@@ -45,7 +45,7 @@
[frame]
begin=-100
end=100
- image=human-spearman-attack.png
+ image="human-spearman-attack.png"
[/frame]
[/animation]
[animation]
@@ -53,7 +53,7 @@
[frame]
begin=-100
end=100
- image=human-spearman-attack-ne.png
+ image="human-spearman-attack-ne.png"
[/frame]
[/animation]
[animation]
@@ -61,7 +61,7 @@
[frame]
begin=-100
end=100
- image=human-spearman-attack-n.png
+ image="human-spearman-attack-n.png"
[/frame]
[/animation]
[animation]
@@ -69,17 +69,17 @@
[frame]
begin=-150
end=-100
- image=human-spearman-attack-south-1.png
+ image="human-spearman-attack-south-1.png"
[/frame]
[frame]
begin=-100
end=-20
- image=human-spearman-attack-south-2.png
+ image="human-spearman-attack-south-2.png"
[/frame]
[frame]
begin=-20
end=100
- image=human-spearman-attack-south-3.png
+ image="human-spearman-attack-south-3.png"
[/frame]
[/animation]
[/attack]
@@ -97,13 +97,13 @@
[frame]
begin=-100
end=100
- image=human-spearman-attack-ranged.png
+ image="human-spearman-attack-ranged.png"
[/frame]
[missile_frame]
begin=-150
end=0
- image=projectiles/spear-n.png
- image_diagonal=projectiles/spear-ne.png
+ image="projectiles/spear-n.png"
+ image_diagonal="projectiles/spear-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Spectre.cfg
diff -u wesnoth/data/units/Spectre.cfg:1.12 wesnoth/data/units/Spectre.cfg:1.13
--- wesnoth/data/units/Spectre.cfg:1.12 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Spectre.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Spectre
name= _ "Spectre"
race=undead
-image=undead-spectre.png
-image_defensive=undead-spectre-defend.png
+image="undead-spectre.png"
+image_defensive="undead-spectre-defend.png"
hitpoints=33
movement_type=undeadspirit
movement=7
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=undead-spectre-attack.png
+ image="undead-spectre-attack.png"
[/frame]
[sound]
time=-100
@@ -46,13 +46,13 @@
[frame]
begin=-250
end=50
- image=undead-spectre-attack1.png
+ image="undead-spectre-attack1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Swordsman.cfg
diff -u wesnoth/data/units/Swordsman.cfg:1.13
wesnoth/data/units/Swordsman.cfg:1.14
--- wesnoth/data/units/Swordsman.cfg:1.13 Wed Dec 8 06:41:29 2004
+++ wesnoth/data/units/Swordsman.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Swordsman
name= _ "Swordsman"
race=human
-image=human-swordman.png
-image_defensive=human-swordman-defend.png
+image="human-swordman.png"
+image_defensive="human-swordman-defend.png"
hitpoints=52
movement_type=smallfoot
[resistance]
@@ -28,7 +28,7 @@
[frame]
begin=-100
end=100
- image=human-swordman-attack.png
+ image="human-swordman-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Tentacle.cfg
diff -u wesnoth/data/units/Tentacle.cfg:1.3 wesnoth/data/units/Tentacle.cfg:1.4
--- wesnoth/data/units/Tentacle.cfg:1.3 Tue Jan 18 11:02:36 2005
+++ wesnoth/data/units/Tentacle.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Tentacle of the Deep
name= _ "Tentacle of the Deep"
race=monster
-image=deep-tentacle.png
-image_defensive=deep-tentacle-defend.png
+image="deep-tentacle.png"
+image_defensive="deep-tentacle-defend.png"
ability=regenerates
hitpoints=28
movement_type=float
@@ -26,7 +26,7 @@
[frame]
begin=-100
end=50
- image=deep-tentacle-attack.png
+ image="deep-tentacle-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Thief.cfg
diff -u wesnoth/data/units/Thief.cfg:1.10 wesnoth/data/units/Thief.cfg:1.11
--- wesnoth/data/units/Thief.cfg:1.10 Thu Mar 24 00:52:25 2005
+++ wesnoth/data/units/Thief.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "Thief"
race=human
gender=male,female
-image=thief.png
-image_defensive=thief.png
+image="thief.png"
+image_defensive="thief.png"
# Yes, the above line is deliberate - otherwise his solitary defensive frame
flickers in when the defensive animations are not playing. It looks better to
use that only when he is hit.
hitpoints=24
movement_type=elusivefoot
@@ -22,17 +22,17 @@
[frame]
begin=-150
end=-60
- image=thief-defend-1-1.png
+ image="thief-defend-1-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief-defend-1-2.png
+ image="thief-defend-1-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief-defend-1-1.png
+ image="thief-defend-1-1.png"
[/frame]
[/defend]
[defend]
@@ -40,17 +40,17 @@
[frame]
begin=-150
end=-60
- image=thief-defend-2-1.png
+ image="thief-defend-2-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief-defend-2-2.png
+ image="thief-defend-2-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief-defend-2-1.png
+ image="thief-defend-2-1.png"
[/frame]
[/defend]
[defend]
@@ -58,17 +58,17 @@
[frame]
begin=-150
end=-60
- image=thief-defend-3-1.png
+ image="thief-defend-3-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief-defend-3-2.png
+ image="thief-defend-3-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief-defend-3-1.png
+ image="thief-defend-3-1.png"
[/frame]
[/defend]
[defend]
@@ -76,7 +76,7 @@
[frame]
begin=-75
end=50
- image=thief-defend.png
+ image="thief-defend.png"
[/frame]
[/defend]
@@ -90,7 +90,7 @@
[frame]
begin=-100
end=100
- image=thief-attack.png
+ image="thief-attack.png"
[/frame]
[sound]
@@ -104,8 +104,8 @@
name= _ "female^Thief"
race=human
gender=female
- image=thief+female.png
- image_defensive=thief+female.png
+ image="thief+female.png"
+ image_defensive="thief+female.png"
# Yes, the above line is deliberate - otherwise his solitary defensive
frame flickers in when the defensive animations are not playing. It looks
better to use that only when he is hit.
hitpoints=24
movement_type=elusivefoot
@@ -124,17 +124,17 @@
[frame]
begin=-150
end=-60
- image=thief+female-defend-1-1.png
+ image="thief+female-defend-1-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief+female-defend-1-2.png
+ image="thief+female-defend-1-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief+female-defend-1-1.png
+ image="thief+female-defend-1-1.png"
[/frame]
[/defend]
[defend]
@@ -142,17 +142,17 @@
[frame]
begin=-150
end=-60
- image=thief+female-defend-2-1.png
+ image="thief+female-defend-2-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief+female-defend-2-2.png
+ image="thief+female-defend-2-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief+female-defend-2-1.png
+ image="thief+female-defend-2-1.png"
[/frame]
[/defend]
[defend]
@@ -160,17 +160,17 @@
[frame]
begin=-150
end=-60
- image=thief+female-defend-3-1.png
+ image="thief+female-defend-3-1.png"
[/frame]
[frame]
begin=-60
end=60
- image=thief+female-defend-3-2.png
+ image="thief+female-defend-3-2.png"
[/frame]
[frame]
begin=60
end=150
- image=thief+female-defend-3-1.png
+ image="thief+female-defend-3-1.png"
[/frame]
[/defend]
[defend]
@@ -178,7 +178,7 @@
[frame]
begin=-75
end=50
- image=thief+female-defend.png
+ image="thief+female-defend.png"
[/frame]
[/defend]
[attack]
@@ -191,7 +191,7 @@
[frame]
begin=-100
end=100
- image=thief+female-attack.png
+ image="thief+female-attack.png"
[/frame]
[sound]
Index: wesnoth/data/units/Thug.cfg
diff -u wesnoth/data/units/Thug.cfg:1.7 wesnoth/data/units/Thug.cfg:1.8
--- wesnoth/data/units/Thug.cfg:1.7 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Thug.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Thug
name= _ "Thug"
race=human
-image=neutral-thug.png
-image_defensive=neutral-thug-defend.png
+image="neutral-thug.png"
+image_defensive="neutral-thug-defend.png"
hitpoints=36
movement_type=smallfoot
movement=5
@@ -24,7 +24,7 @@
[frame]
begin=-100
end=100
- image=neutral-thug-attack.png
+ image="neutral-thug-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Transport_Galleon.cfg
diff -u wesnoth/data/units/Transport_Galleon.cfg:1.6
wesnoth/data/units/Transport_Galleon.cfg:1.7
--- wesnoth/data/units/Transport_Galleon.cfg:1.6 Wed Feb 9 02:03:54 2005
+++ wesnoth/data/units/Transport_Galleon.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[unit]
id=Transport Galleon
name= _ "Transport Galleon"
-image=pirate-galleon.png
+image="pirate-galleon.png"
hitpoints=30
movement_type=float
movement=6
@@ -23,8 +23,8 @@
[missile_frame]
begin=-50
end=0
- image=projectiles/bullet.png
- image_diagonal=projectiles/bullet.png
+ image="projectiles/bullet.png"
+ image_diagonal="projectiles/bullet.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Trapper.cfg
diff -u wesnoth/data/units/Trapper.cfg:1.8 wesnoth/data/units/Trapper.cfg:1.9
--- wesnoth/data/units/Trapper.cfg:1.8 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Trapper.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Trapper
name= _ "Trapper"
race=human
-image=neutral-trapper.png
-image_defensive=neutral-trapper-defend.png
+image="neutral-trapper.png"
+image_defensive="neutral-trapper-defend.png"
hitpoints=45
movement_type=smallfoot
movement=5
@@ -17,7 +17,7 @@
#Poachers are better than normal units at woods and swamps
[defense]
forest=40
- swamp water=50
+ swamp_water=50
[/defense]
get_hit_sound=groan.wav
[attack]
@@ -29,7 +29,7 @@
[frame]
begin=-100
end=100
- image=neutral-trapper-attack.png
+ image="neutral-trapper-attack.png"
[/frame]
[sound]
time=-100
@@ -57,19 +57,19 @@
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
begin=-400
end=-250
- image=neutral-trapper-attack1.png
+ image="neutral-trapper-attack1.png"
[/frame]
[frame]
begin=-250
end=-100
- image=neutral-trapper-attack2.png
+ image="neutral-trapper-attack2.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Triton.cfg
diff -u wesnoth/data/units/Triton.cfg:1.8 wesnoth/data/units/Triton.cfg:1.9
--- wesnoth/data/units/Triton.cfg:1.8 Wed Feb 16 01:02:04 2005
+++ wesnoth/data/units/Triton.cfg Sun Mar 27 23:06:16 2005
@@ -5,8 +5,8 @@
obsolete=1
name= _ "Triton"
race=merman
-image=merman-king.png
-image_defensive=merman-king-defend.png
+image="merman-king.png"
+image_defensive="merman-king-defend.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/typhon.png
#endif
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image=merman-king-attack.png
+ image="merman-king-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Troll.cfg
diff -u wesnoth/data/units/Troll.cfg:1.16 wesnoth/data/units/Troll.cfg:1.17
--- wesnoth/data/units/Troll.cfg:1.16 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Troll.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Troll
name= _ "Troll"
race=troll
-image=troll-grunt.png
-image_defensive=troll-grunt-defend.png
+image="troll-grunt.png"
+image_defensive="troll-grunt-defend.png"
ability=regenerates
hitpoints=55
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=troll-grunt-attack.png
+ image="troll-grunt-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Troll_Hero.cfg
diff -u wesnoth/data/units/Troll_Hero.cfg:1.3
wesnoth/data/units/Troll_Hero.cfg:1.4
--- wesnoth/data/units/Troll_Hero.cfg:1.3 Sun Jan 9 04:53:37 2005
+++ wesnoth/data/units/Troll_Hero.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Troll Hero
name= _ "Troll Hero"
race=troll
-image=troll-hero.png
-image_defensive=troll-hero-defend.png
+image="troll-hero.png"
+image_defensive="troll-hero-defend.png"
ability=regenerates
hitpoints=60
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=troll-hero-attack.png
+ image="troll-hero-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Troll_Rocklobber.cfg
diff -u wesnoth/data/units/Troll_Rocklobber.cfg:1.2
wesnoth/data/units/Troll_Rocklobber.cfg:1.3
--- wesnoth/data/units/Troll_Rocklobber.cfg:1.2 Mon Sep 20 20:50:56 2004
+++ wesnoth/data/units/Troll_Rocklobber.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Troll Rocklobber
name= _ "Troll Rocklobber"
race=troll
-image=troll-lobber.png
-image_defensive=troll-lobber-defend.png
+image="troll-lobber.png"
+image_defensive="troll-lobber-defend.png"
ability=regenerates
hitpoints=53
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=50
- image=troll-lobber-attack-melee.png
+ image="troll-lobber-attack-melee.png"
[/frame]
[sound]
time=-250
@@ -54,19 +54,19 @@
[frame]
begin=-250
end=-50
- image=troll-lobber-attack-ranged1.png
+ image="troll-lobber-attack-ranged1.png"
[/frame]
[frame]
begin=-50
end=50
- image=troll-lobber-attack-ranged2.png
+ image="troll-lobber-attack-ranged2.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/unit]
\ No newline at end of file
Index: wesnoth/data/units/Troll_Warrior.cfg
diff -u wesnoth/data/units/Troll_Warrior.cfg:1.12
wesnoth/data/units/Troll_Warrior.cfg:1.13
--- wesnoth/data/units/Troll_Warrior.cfg:1.12 Sun Jan 9 04:53:37 2005
+++ wesnoth/data/units/Troll_Warrior.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Troll Warrior
name= _ "Troll Warrior"
race=troll
-image=troll-warrior.png
-image_defensive=troll-warrior-defend.png
+image="troll-warrior.png"
+image_defensive="troll-warrior-defend.png"
ability=regenerates
hitpoints=70
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=100
- image=troll-warrior-attack.png
+ image="troll-warrior-attack.png"
[/frame]
[sound]
time=-100
Index: wesnoth/data/units/Troll_Whelp.cfg
diff -u wesnoth/data/units/Troll_Whelp.cfg:1.12
wesnoth/data/units/Troll_Whelp.cfg:1.13
--- wesnoth/data/units/Troll_Whelp.cfg:1.12 Tue Mar 1 00:28:09 2005
+++ wesnoth/data/units/Troll_Whelp.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Troll Whelp
name= _ "Troll Whelp"
race=troll
-image=troll-whelp.png
-image_defensive=troll-whelp-defend.png
+image="troll-whelp.png"
+image_defensive="troll-whelp-defend.png"
ability=regenerates
hitpoints=42
movement_type=largefoot
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=50
- image=troll-whelp-attack.png
+ image="troll-whelp-attack.png"
[/frame]
[sound]
time=-250
Index: wesnoth/data/units/Vampire_Bat.cfg
diff -u wesnoth/data/units/Vampire_Bat.cfg:1.12
wesnoth/data/units/Vampire_Bat.cfg:1.13
--- wesnoth/data/units/Vampire_Bat.cfg:1.12 Thu Oct 14 07:13:20 2004
+++ wesnoth/data/units/Vampire_Bat.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Vampire Bat
name= _ "Vampire Bat"
race=undead
-image=undead-bat.png
-image_defensive=undead-bat-defend.png
+image="undead-bat.png"
+image_defensive="undead-bat-defend.png"
hitpoints=14
movement_type=undeadfly
movement=8
@@ -25,7 +25,7 @@
[frame]
begin=-100
end=50
- image=undead-bat-attack.png
+ image="undead-bat-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Vampire_Lady.cfg
diff -u wesnoth/data/units/Vampire_Lady.cfg:1.8
wesnoth/data/units/Vampire_Lady.cfg:1.9
--- wesnoth/data/units/Vampire_Lady.cfg:1.8 Sat Feb 12 00:21:20 2005
+++ wesnoth/data/units/Vampire_Lady.cfg Sun Mar 27 23:06:16 2005
@@ -3,8 +3,8 @@
name= _ "female^Vampire Lady"
gender=female
race=undead
-image=undead-vampirelady.png
-image_defensive=undead-vampirelady-defend.png
+image="undead-vampirelady.png"
+image_defensive="undead-vampirelady-defend.png"
hitpoints=52
movement_type=undeadfly
movement=8
@@ -27,7 +27,7 @@
[frame]
begin=-100
end=100
- image=undead-vampirelady-attack.png
+ image="undead-vampirelady-attack.png"
[/frame]
[/attack]
[attack]
@@ -40,20 +40,20 @@
[frame]
begin=-400
end=-200
- image=undead-vampirelady-range.png
+ image="undead-vampirelady-range.png"
halo=halo/blood-halo1.png
halo_x,halo_y=10,-35
[/frame]
[frame]
begin=-200
end=50
- image=undead-vampirelady-range.png
+ image="undead-vampirelady-range.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Walking_Corpse.cfg
diff -u wesnoth/data/units/Walking_Corpse.cfg:1.18
wesnoth/data/units/Walking_Corpse.cfg:1.19
--- wesnoth/data/units/Walking_Corpse.cfg:1.18 Mon Sep 6 20:32:36 2004
+++ wesnoth/data/units/Walking_Corpse.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Walking Corpse
name= _ "Walking Corpse"
race=undead
-image=undead-zombie.png
-image_defensive=undead-zombie-attack.png
+image="undead-zombie.png"
+image_defensive="undead-zombie-attack.png"
hitpoints=18
movement_type=undeadfoot
movement=4
@@ -25,7 +25,7 @@
[frame]
begin=-200
end=100
- image=undead-zombie-attack.png
+ image="undead-zombie-attack.png"
[/frame]
[sound]
time=-200
Index: wesnoth/data/units/Wall_Guard.cfg
diff -u wesnoth/data/units/Wall_Guard.cfg:1.4
wesnoth/data/units/Wall_Guard.cfg:1.5
--- wesnoth/data/units/Wall_Guard.cfg:1.4 Sat Mar 12 19:04:49 2005
+++ wesnoth/data/units/Wall_Guard.cfg Sun Mar 27 23:06:16 2005
@@ -2,13 +2,13 @@
id=Wall Guard
name= _ "Wall Guard"
race=human
-image=human-wallguard.png
-image_defensive=human-wallguard-defense.png
+image="human-wallguard.png"
+image_defensive="human-wallguard-defense.png"
hitpoints=48
- [movement costs]
+ [movement_costs]
castle=1
cavewall=1
- [/movement costs]
+ [/movement_costs]
[defense]
cavewall=30
castle=40
@@ -52,14 +52,14 @@
[frame]
begin=-200
end=100
- image=human-wallguard-attack.png
+ image="human-wallguard-attack.png"
[/frame]
[missile_frame]
begin=-100
end=0
- image=projectiles/missile-n.png
- image_diagonal=projectiles/missile-ne.png
+ image="projectiles/missile-n.png"
+ image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Warrior_King.cfg
diff -u wesnoth/data/units/Warrior_King.cfg:1.4
wesnoth/data/units/Warrior_King.cfg:1.5
--- wesnoth/data/units/Warrior_King.cfg:1.4 Sat Nov 13 20:31:51 2004
+++ wesnoth/data/units/Warrior_King.cfg Sun Mar 27 23:06:16 2005
@@ -3,9 +3,9 @@
name= _ "Warrior King"
race=human
gender=male
-image=warrior-king.png
-image_defensive=warrior-king-defend.png
-image_leading=warrior-king-leading.png
+image="warrior-king.png"
+image_defensive="warrior-king-defend.png"
+image_leading="warrior-king-leading.png"
#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
profile=portraits/The_Rise_of_Wesnoth/eldaric.png
#endif
@@ -30,12 +30,12 @@
[frame]
begin=-200
end=-50
- image=warrior-king-attack1.png
+ image="warrior-king-attack1.png"
[/frame]
[frame]
begin=-50
end=100
- image=warrior-king-attack2.png
+ image="warrior-king-attack2.png"
[/frame]
[sound]
time=-150
Index: wesnoth/data/units/Watch_Tower.cfg
diff -u wesnoth/data/units/Watch_Tower.cfg:1.7
wesnoth/data/units/Watch_Tower.cfg:1.8
--- wesnoth/data/units/Watch_Tower.cfg:1.7 Wed Feb 9 02:03:54 2005
+++ wesnoth/data/units/Watch_Tower.cfg Sun Mar 27 23:06:16 2005
@@ -1,7 +1,7 @@
[unit]
id=Watch Tower
name= _ "Watch Tower"
-image=tower.png
+image="tower.png"
hitpoints=50
movement_type=none
movement=1
@@ -24,8 +24,8 @@
[missile_frame]
begin=-50
end=0
- image=projectiles/stone.png
- image_diagonal=projectiles/stone.png
+ image="projectiles/stone.png"
+ image_diagonal="projectiles/stone.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/White_Mage.cfg
diff -u wesnoth/data/units/White_Mage.cfg:1.19
wesnoth/data/units/White_Mage.cfg:1.20
--- wesnoth/data/units/White_Mage.cfg:1.19 Tue Feb 8 12:20:35 2005
+++ wesnoth/data/units/White_Mage.cfg Sun Mar 27 23:06:16 2005
@@ -3,10 +3,10 @@
name= _ "White Mage"
race=human
gender=male,female
-image=white-mage.png
-image_defensive=white-mage-defend.png
-image_healing=white-mage-magic1.png
-image_halo_healing=white-mage-magic1.png:100,white-mage-magic2.png:100,white-mage-magic3.png:100,white-mage-magic4.png:100,white-mage-magic5.png:100,white-mage-magic6.png:100
+image="white-mage.png"
+image_defensive="white-mage-defend.png"
+image_healing="white-mage-magic1.png"
+image_halo_healing="white-mage-magic1.png:100,white-mage-magic2.png:100,white-mage-magic3.png:100,white-mage-magic4.png:100,white-mage-magic5.png:100,white-mage-magic6.png:100"
#ifdef CAMPAIGN_EASTERN_INVASION
profile=portraits/Eastern_Invasion/dacyn.png
#endif
@@ -34,7 +34,7 @@
[frame]
begin=-100
end=100
- image=white-mage-attack-melee.png
+ image="white-mage-attack-melee.png"
[/frame]
[sound]
time=-100
@@ -51,24 +51,24 @@
[missile_frame]
begin=-180
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+ image_diagonal="projectiles/whitemissile-ne.png"
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
[/missile_frame]
[frame]
begin=-50
end=0
- image=white-mage-magic1.png
+ image="white-mage-magic1.png"
[/frame]
[frame]
begin=0
end=50
- image=white-mage-magic3.png
+ image="white-mage-magic3.png"
[/frame]
[frame]
begin=50
end=100
- image=white-mage-magic5.png
+ image="white-mage-magic5.png"
[/frame]
[/attack]
@@ -77,10 +77,10 @@
name= _ "female^White Mage"
race=human
gender=female
- image=white-mage+female.png
- image_defensive=white-mage+female-defend.png
- image_healing=white-mage+female-magic1.png
-
image_halo_healing=white-mage+female-magic1.png:100,white-mage+female-magic2.png:100,white-mage+female-magic3.png:100,white-mage+female-magic4.png:100,white-mage+female-magic5.png:100,white-mage+female-magic6.png:100
+ image="white-mage+female.png"
+ image_defensive="white-mage+female-defend.png"
+ image_healing="white-mage+female-magic1.png"
+
image_halo_healing="white-mage+female-magic1.png:100,white-mage+female-magic2.png:100,white-mage+female-magic3.png:100,white-mage+female-magic4.png:100,white-mage+female-magic5.png:100,white-mage+female-magic6.png:100"
ability=cures
hitpoints=32
movement_type=smallfoot
@@ -105,7 +105,7 @@
[frame]
begin=-100
end=100
- image=white-mage+female-attack-melee.png
+ image="white-mage+female-attack-melee.png"
[/frame]
[sound]
time=-100
@@ -122,24 +122,24 @@
[missile_frame]
begin=-180
end=0
- image=projectiles/whitemissile-n.png
- image_diagonal=projectiles/whitemissile-ne.png
+ image="projectiles/whitemissile-n.png"
+
image_diagonal="projectiles/whitemissile-ne.png"
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
[/missile_frame]
[frame]
begin=-50
end=0
- image=white-mage+female-magic1.png
+ image="white-mage+female-magic1.png"
[/frame]
[frame]
begin=0
end=50
- image=white-mage+female-magic3.png
+ image="white-mage+female-magic3.png"
[/frame]
[frame]
begin=50
end=100
- image=white-mage+female-magic5.png
+ image="white-mage+female-magic5.png"
[/frame]
[/attack]
[/female]
Index: wesnoth/data/units/Wolf_Rider.cfg
diff -u wesnoth/data/units/Wolf_Rider.cfg:1.15
wesnoth/data/units/Wolf_Rider.cfg:1.16
--- wesnoth/data/units/Wolf_Rider.cfg:1.15 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Wolf_Rider.cfg Sun Mar 27 23:06:16 2005
@@ -2,9 +2,9 @@
id=Wolf Rider
name= _ "Wolf Rider"
race=goblin
-image=wolf-rider.png
-image_moving=wolf-rider-moving.png
-image_defensive=wolf-rider-defend.png
+image="wolf-rider.png"
+image_moving="wolf-rider-moving.png"
+image_defensive="wolf-rider-defend.png"
hitpoints=32
movement_type=orcishfoot
movement=8
@@ -25,7 +25,7 @@
[frame]
begin=-150
end=100
- image=wolf-rider-attack.png
+ image="wolf-rider-attack.png"
[/frame]
[sound]
time=-150
Index: wesnoth/data/units/Wose.cfg
diff -u wesnoth/data/units/Wose.cfg:1.16 wesnoth/data/units/Wose.cfg:1.17
--- wesnoth/data/units/Wose.cfg:1.16 Fri Dec 3 11:15:54 2004
+++ wesnoth/data/units/Wose.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Wose
name= _ "Wose"
race=wose
-image=wose.png
-image_defensive=wose-defend.png
+image="wose.png"
+image_defensive="wose-defend.png"
ability=ambush,regenerates
hitpoints=52
movement_type=treefolk
@@ -24,17 +24,17 @@
[frame]
begin=-125
end=-50
- image="wose-attack-1.png"
+ image=""wose-attack-1.png""
[/frame]
[frame]
begin=-50
end=50
- image="wose-attack-2.png"
+ image=""wose-attack-2.png""
[/frame]
[frame]
begin=50
end=125
- image="wose-attack-1.png"
+ image=""wose-attack-1.png""
[/frame]
[sound]
Index: wesnoth/data/units/Wraith.cfg
diff -u wesnoth/data/units/Wraith.cfg:1.19 wesnoth/data/units/Wraith.cfg:1.20
--- wesnoth/data/units/Wraith.cfg:1.19 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Wraith.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Wraith
name= _ "Wraith"
race=undead
-image=undead-wraith.png
-image_defensive=undead-wraith-defend.png
+image="undead-wraith.png"
+image_defensive="undead-wraith-defend.png"
hitpoints=25
movement_type=undeadspirit
movement=7
@@ -30,7 +30,7 @@
[frame]
begin=-100
end=100
- image="undead-wraith-attack.png"
+ image=""undead-wraith-attack.png""
[/frame]
[sound]
time=-100
@@ -46,13 +46,13 @@
[frame]
begin=-250
end=50
- image=undead-wraith-attack1.png
+ image="undead-wraith-attack1.png"
[/frame]
[missile_frame]
begin=-200
end=0
- image=projectiles/darkmissile-n.png
- image_diagonal=projectiles/darkmissile-ne.png
+ image="projectiles/darkmissile-n.png"
+ image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Yeti.cfg
diff -u wesnoth/data/units/Yeti.cfg:1.5 wesnoth/data/units/Yeti.cfg:1.6
--- wesnoth/data/units/Yeti.cfg:1.5 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Yeti.cfg Sun Mar 27 23:06:16 2005
@@ -2,15 +2,15 @@
id=Yeti
name= _ "Yeti"
race=monster
-image=yeti.png
-image_defensive=yeti-defend.png
+image="yeti.png"
+image_defensive="yeti-defend.png"
hitpoints=142
movement_type=largefoot
movement=5
- [movement costs]
+ [movement_costs]
tundra=1
- [/movement costs]
+ [/movement_costs]
[defense]
tundra=40
[/defense]
@@ -38,12 +38,12 @@
[frame]
begin=-150
end=-50
- image=yeti-attack1.png
+ image="yeti-attack1.png"
[/frame]
[frame]
begin=-50
end=120
- image=yeti-attack2.png
+ image="yeti-attack2.png"
[/frame]
[sound]
time=-80
Index: wesnoth/data/units/Young_Ogre.cfg
diff -u wesnoth/data/units/Young_Ogre.cfg:1.4
wesnoth/data/units/Young_Ogre.cfg:1.5
--- wesnoth/data/units/Young_Ogre.cfg:1.4 Mon Jan 10 05:03:46 2005
+++ wesnoth/data/units/Young_Ogre.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Young Ogre
name= _ "Young Ogre"
race=ogre
-image=young-ogre.png
-image_defensive=young-ogre-defend.png
+image="young-ogre.png"
+image_defensive="young-ogre-defend.png"
hitpoints=42
movement_type=largefoot
movement=5
@@ -28,7 +28,7 @@
[frame]
begin=-200
end=0
- image=young-ogre-attack.png
+ image="young-ogre-attack.png"
[/frame]
[/attack]
[/unit]
Index: wesnoth/data/units/Youth.cfg
diff -u wesnoth/data/units/Youth.cfg:1.7 wesnoth/data/units/Youth.cfg:1.8
--- wesnoth/data/units/Youth.cfg:1.7 Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Youth.cfg Sun Mar 27 23:06:16 2005
@@ -2,8 +2,8 @@
id=Youth
name= _ "Youth"
race=human
-image=konrad-young.png
-image_defensive=konrad-young-defend.png
+image="konrad-young.png"
+image_defensive="konrad-young-defend.png"
profile=portraits/Heir_To_The_Throne/konrad.png
hitpoints=20
movement_type=smallfoot
@@ -26,12 +26,12 @@
[frame]
begin=-250
end=-100
- image=konrad-young.png
+ image="konrad-young.png"
[/frame]
[frame]
begin=-100
end=50
- image="konrad-young-attack.png"
+ image=""konrad-young-attack.png""
[/frame]
[sound]
Index: wesnoth/doc/doxygen/doxygen.cpp
diff -u wesnoth/doc/doxygen/doxygen.cpp:1.1 wesnoth/doc/doxygen/doxygen.cpp:1.2
--- wesnoth/doc/doxygen/doxygen.cpp:1.1 Tue Feb 3 01:32:47 2004
+++ wesnoth/doc/doxygen/doxygen.cpp Sun Mar 27 23:06:16 2005
@@ -188,12 +188,12 @@
*/
// ===========================================================================
-// namespace lobby
+// namespace mp
// ===========================================================================
/**
-\namespace lobby Multiplayer meeting place and game creation.
+\namespace mp Multiplayer meeting place and game creation.
This module controls the multiplayer lobby. The lobby is a section on the
server which
allows players to chat, create games, and join games.
Index: wesnoth/po/wesnoth/fr.po
diff -u wesnoth/po/wesnoth/fr.po:1.76 wesnoth/po/wesnoth/fr.po:1.77
--- wesnoth/po/wesnoth/fr.po:1.76 Mon Mar 21 09:27:59 2005
+++ wesnoth/po/wesnoth/fr.po Sun Mar 27 23:06:16 2005
@@ -3787,13 +3787,16 @@
#: data/units/Ancient_Wose.cfg:3
msgid "Ancient Wose"
-msgstr "Wose vénérable"
+msgstr "Wose ancien"
#: data/units/Ancient_Wose.cfg:7 data/units/Elder_Wose.cfg:7
#: data/units/Wose.cfg:7
msgid "ambush,regenerates"
msgstr "embuscade,régénération"
+# like sticks and feathers ???
+# stewardship ???
+# desecration ???
#: data/units/Ancient_Wose.cfg:16
msgid ""
"Terrible and awe-inspiring, the most ancient of woses grow to a tremendous "
@@ -3806,6 +3809,14 @@
"which is often the only thing which could incur the wrath of these otherwise "
"kind and curious beings."
msgstr ""
+"Terrible et intimidants, les woses les plus anciens ont acquit une taille "
+"énorme. Ils apparaissent rarement en dehors des légendes, où l'on dit
qu'ils "
+"posséder une force immense, écrasant les plus grand des rochers en fine
poudre, "
+"comme si toute l'énergie qu'un arbre utilise pour se développer et fendre
la "
+"pierre année après année était appliquée en un instant. Ces mêmes
légendes "
+"parlent de leur relation aux forêts de ce monde, dont la destruction est "
+"souvent la seule chose qui pourrait provoquer la colère ces derniers. "
+"Autrement, ce sont des êtres aimables et curieux."
#: data/units/Ancient_Wose.cfg:19 data/units/Elder_Wose.cfg:19
#: data/units/Wose.cfg:19
@@ -4879,12 +4890,17 @@
msgid "Sky Drake"
msgstr "Drake du firmament"
+# swiftly swoop ???
#: data/units/Drake_Sky.cfg:18
msgid ""
"Sky drakes are truly the kings of the sky. Using their momentum and fire "
"breath as weapons these drakes are the bane of many. They can swiftly swoop "
"down on prey, and are usually long gone before anyone can stop them."
msgstr ""
+"Les drakes du firmament sont réellement les rois du ciel. Utilisant leur
élan "
+"et leur souffle ardent, ces drakes sont le fléau de beaucoup. Il fondent "
+"rapidement sur leur proies et disparaissent bien avant que quiconque puisse "
+"les arrêter."
#: data/units/Drake_Slasher.cfg:4
msgid "Drake Slasher"
@@ -4926,12 +4942,11 @@
"mais ils sont également capable de souffler le feu légendaire de leurs "
"ancêtres."
-# TODO: traduire Draug ?
#: data/units/Draug.cfg:3
msgid "Draug"
msgstr "Draug"
-# Oh bon sang, il y a des mots que je trouve pas dans mon dico !
+# Traduction libre, j'ai pas tout compris àla VO
#: data/units/Draug.cfg:16
msgid ""
"Towering remains of what once were legendary warriors, the Draug strike fear "
@@ -4941,6 +4956,11 @@
"bought only by strength of arms. The memory of their enemy, and the purpose "
"of their struggle have long faded into oblivion."
msgstr ""
+"Restes de ce qui était autrefois des guerriers légendaires, les Draugs "
+"frappent terreurs les cœurs de ceux qui s'opposent àeux. Ils ne sont pas "
+"animés pas la méchanceté mais sont contraints, dans leur non-vie, ÃÂ
reproduire "
+"pour l'éternité les grandes batailles de leur mémoire, combattant
désespérément "
+"sans même se souvenir du nom de leur ennemis ni du but de leur lutte."
#: data/units/Draug.cfg:24 data/units/Dwarvish_Fighter.cfg:22
#: data/units/Revenant.cfg:24 data/units/Skeleton.cfg:24
@@ -5100,7 +5120,7 @@
"The Sentinel, with his tower shield and great courage, refuses to yield "
"under even the strongest of enemy attacks."
msgstr ""
-"La sentinelle, avec son pavoi et son grand courage, refuse de se rendre même
"
+"La sentinelle, avec son pavois et son grand courage, refuse de se rendre
même "
"face àl'attaque ennemie la plus puissante."
# XXX Nain indéfectible plutôt? Ou autre...
@@ -5363,7 +5383,6 @@
msgstr "Héros elfe"
#: data/units/Elvish_Hero.cfg:19
-#, fuzzy
msgid ""
"Elvish Heroes focus on individual performance on the battlefield, having "
"honed their combat skills to a frightening level. Elvish Heroes prefer "
@@ -5547,9 +5566,10 @@
"le nombre de fois qu'ils peuvent attaquer de un. Les prêtresses possèdent "
"également des capacités curatives basiques."
+# Archer d'élite -> franc-tireur
#: data/units/Elvish_Sharpshooter.cfg:3
msgid "Elvish Sharpshooter"
-msgstr "Archer d'élite elfe"
+msgstr "Franc-tireur elfe"
#: data/units/Elvish_Sharpshooter.cfg:19
#: data/units/Elvish_Sharpshooter.cfg:113
@@ -5559,14 +5579,14 @@
"when firing very quickly. Sharpshooters are excellent at picking off "
"entrenched enemies."
msgstr ""
-"Le meilleur des archers d'élite de tout Wesnoth, les Archers d'élite elfes "
+"Le meilleur des archers d'élite de tout Wesnoth, les franc-tireurs elfes "
"sont incroyablement précis ; il est garanti qu'ils ont 60% de changes de "
-"toucher, même en tirant très rapidement. Les Archers d'élite elfes sont "
+"toucher, même en tirant très rapidement. Les franc-tireurs elfes sont "
"excellents pour éliminer des ennemis retranchés."
#: data/units/Elvish_Sharpshooter.cfg:97
msgid "female^Elvish Sharpshooter"
-msgstr "Archère d'élite elfe"
+msgstr "Franc-tireur elfe"
#: data/units/Elvish_Shyde.cfg:3
msgid "female^Elvish Shyde"
@@ -5743,9 +5763,10 @@
msgid "Gate"
msgstr "Porte"
+# Pas sûr du sens
#: data/units/Gate.cfg:18
msgid "The door will not open for any who are not allied with it."
-msgstr ""
+msgstr "La porte ne s'ouvrira pas pour quiconque n'est pas allié avec elle"
#: data/units/Gate.cfg:20
msgid "bump"
@@ -6553,6 +6574,12 @@
"breathe water leaves them in trepidation of the abyss. They are small, and "
"somewhat frail in form, but often much more nimble than their opponents."
msgstr ""
+"Les nagas appartiennent àl'une des quelques races capables de se mouvoir de
"
+"façon significative dans l'eau, leur donnant accès àun monde entièrement
"
+"interdit aux habitants des terres. Toujours est-il qu'elles ne sont pas de "
+"vraies créatures des profondeurs et sont incapable de respirer sous l'eau. "
+"Elles sont petites et quelque peu frêles, mais souvent beaucoup plus agiles "
+"que leurs adversaires."
#: data/units/Naga-Fighter.cfg:38
msgid "Nagini Fighter"
@@ -6570,6 +6597,11 @@
"only are they potent enemies on any open terrain, but their ability to swim "
"allows them a deadly mobility."
msgstr ""
+"Les plus expérimentés des sabreurs naga se lancent dans la caste des "
+"myrmidons, les maîtres des sabres doubles. Ils frappent aussi rapidement que
"
+"les serpents auxquels ils ressemblent et esquivent les attaques par de "
+"gracieuses danses. Ils sont non seulement des adversaires efficaces sur
terrain "
+"ouvert, mais leur capacité de natation leur permet une mobilité mortelle."
#: data/units/Naga-Myrmidon.cfg:42
msgid "Nagini Myrmidon"
@@ -6583,6 +6615,11 @@
"only are they potent enemies on any open terrain, but their ability to swim "
"allows them a deadly mobility."
msgstr ""
+"Les plus expérimentés des sabreurs naga se lancent dans la caste des "
+"myrmidons, les maîtres des sabres doubles. Ils frappent aussi rapidement que
"
+"les serpents auxquels ils ressemblent et esquivent les attaques par de "
+"gracieuses danses. Ils sont non seulement des adversaires efficaces sur
terrain "
+"ouvert, mais leur capacité de natation leur permet une mobilité mortelle."
#: data/units/Naga-Warrior.cfg:3
msgid "Naga Warrior"
@@ -6597,6 +6634,13 @@
"dodge from blows. This makes them potent on land, but the friction of water "
"greatly impedes their ability to do this."
msgstr ""
+"La plupart des jeunes guerriers nagas rêvent du jour où elles mériteront
leur "
+"deuxième lame. Leur pratique martial utilisant des sabres doubles est "
+"complètement différente de celle des orcs et des autres races, parce que
eux "
+"ont commencé àapprendre l'art d'employer leur forme serpentine pour une "
+"meilleure efficacité, se tordant et se tournant pour esquiver les coups.
Ceci "
+"les rend efficaces sur terre, mais le frottement de l'eau limite "
+"considérablement leurs capacités."
#: data/units/Naga-Warrior.cfg:42
msgid "Nagini Warrior"
@@ -7176,16 +7220,15 @@
msgstr ""
"Les sauriens sont habiles au maniement de la lance. En dépit de leur nature "
"léthargique due àleur sang froid, et de leur relative fragilité, ils sont
"
-"très efficaces en tant qu'éclaireurs, et peuvent naviguer àtravers les "
+"très efficaces en tant qu'éclaireurs, et peuvent évoluer àtravers les "
"terrains accidentés aussi bien qu'autour des ennemis. Les meilleurs des "
"sauriens deviennent des guerriers sauriens."
#: data/units/Saurian_Ambusher.cfg:4
msgid "Saurian Ambusher"
-msgstr ""
+msgstr "Accrocheur saurien"
#: data/units/Saurian_Ambusher.cfg:17
-#, fuzzy
msgid ""
"Saurian Ambushers are highly skilled in the use of the spear. Despite their "
"lethargic cold blooded heritage, and their relative frailty, they are highly "
@@ -7193,19 +7236,19 @@
"opponents. Saurian Ambushers possess the strength to take full advantage of "
"this fact. The best Ambushers go on to become Saurian Flankers"
msgstr ""
-"Les sauriens sont extrêmement habiles au maniement de la lance. En dépit de
"
-"leur nature léthargique due àleur sang froid, et de leur relative "
+"Les accrocheurs sauriens sont extrêmement habiles au maniement de la lance. "
+"En dépit de leur nature léthargique due àleur sang froid, et de leur
relative "
"fragilité, ils sont très efficaces en tant qu'éclaireurs, et peuvent "
-"naviguer àtravers les terrains accidentés aussi bien qu'autour des
ennemis. "
-"Les guerriers sauriens possèdent la force pour pleinement tourner cette "
-"capacité àleur avantage."
+"évoluer àtravers les terrains accidentés aussi bien qu'autour des
ennemis. "
+"Les accrocheurs sauriens possèdent la force pour pleinement tourner cette "
+"capacité àleur avantage. Les meilleurs accrocheurs deviennent des
commandos "
+"sauriens"
#: data/units/Saurian_Flanker.cfg:4
msgid "Saurian Flanker"
-msgstr ""
+msgstr "Commando saurien"
#: data/units/Saurian_Flanker.cfg:18
-#, fuzzy
msgid ""
"Saurian Flankers are highly skilled in the use of the spear. Despite their "
"lethargic cold blooded heritage, and their relative frailty, they are highly "
@@ -7213,10 +7256,10 @@
"opponents. Saurian Flankers possess the strength to take full advantage of "
"this fact."
msgstr ""
-"Les sauriens sont extrêmement habiles au maniement de la lance. En dépit de
"
-"leur nature léthargique due àleur sang froid, et de leur relative "
+"Les commandos sauriens sont extrêmement habiles au maniement de la lance. En
"
+"dépit de leur nature léthargique due àleur sang froid, et de leur
relative "
"fragilité, ils sont très efficaces en tant qu'éclaireurs, et peuvent "
-"naviguer àtravers les terrains accidentés aussi bien qu'autour des
ennemis. "
+"évoluer àtravers les terrains accidentés aussi bien qu'autour des
ennemis. "
"Les guerriers sauriens possèdent la force pour pleinement tourner cette "
"capacité àleur avantage."
@@ -7241,23 +7284,23 @@
msgid "frost blast"
msgstr "rafale de froid"
+# J'ai trouvé « escarmoucheur » dans le dico de l'académie française :)
#: data/units/Saurian_Skirmisher.cfg:4
msgid "Saurian Skirmisher"
-msgstr ""
+msgstr "Escarmoucheur saurien"
#: data/units/Saurian_Skirmisher.cfg:17
-#, fuzzy
msgid ""
"Saurian Skirmishers are skilled in the use of the spear. Despite their "
"lethargic cold blooded heritage, and their relative frailty, they are highly "
"valued as scouts as they can navigate through rough terrain and around "
"opponents. The best Skirmishers go on to become Saurian Ambushers."
msgstr ""
-"Les sauriens sont habiles au maniement de la lance. En dépit de leur nature "
-"léthargique due àleur sang froid et de leur relative fragilité, ils sont "
-"très efficaces en tant qu'éclaireurs, et peuvent naviguer àtravers les "
+"Les escarmoucheurs sauriens sont habiles au maniement de la lance. En dépit
de "
+"leur nature léthargique due àleur sang froid et de leur relative
fragilité, "
+"ils sont très efficaces en tant qu'éclaireurs, et peuvent évoluer ÃÂ
travers les "
"terrains accidentés aussi bien qu'autour des ennemis. Les meilleurs des "
-"sauriens deviennent des guerriers sauriens."
+"escarmoucheurs sauriens deviennent des accrocheurs sauriens."
#: data/units/Saurian_Soothsayer.cfg:4
msgid "Saurian Soothsayer"
@@ -8186,7 +8229,6 @@
msgstr "Écraser ?"
#: src/dialogs.cpp:185
-#, fuzzy
msgid "Save already exists. Do you want to overwrite it ?"
msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
@@ -8236,14 +8278,12 @@
msgstr "Début du scénario"
#: src/dialogs.cpp:384
-#, fuzzy
msgid "Difficulty: "
-msgstr "Difficulté"
+msgstr "Difficulté : "
#: src/dialogs.cpp:386
-#, fuzzy
msgid "Version: "
-msgstr "Version"
+msgstr "Version : "
#: src/dialogs.cpp:401
msgid "No Saved Games"
@@ -8493,7 +8533,7 @@
#: src/game.cpp:1183
msgid "Cannot rescan the filesystem"
-msgstr ""
+msgstr "Impossible de rescanner le système de fichier"
#: src/game.cpp:1194
msgid "Campaign Installed"
@@ -8947,7 +8987,7 @@
#: src/multiplayer_create.cpp:53
msgid "OK"
-msgstr ""
+msgstr "OK"
#: src/multiplayer_create.cpp:54
msgid "Regenerate"
@@ -9001,7 +9041,7 @@
#: src/multiplayer_create.cpp:122
msgid "No eras found"
-msgstr ""
+msgstr "Aucune ère trouvée"
#: src/multiplayer_create.cpp:131
msgid "$login's game"
@@ -9009,7 +9049,7 @@
#: src/multiplayer_create.cpp:161
msgid "Invalid era selected"
-msgstr ""
+msgstr "Ère invalide sélectionnée"
#: src/multiplayer_create.cpp:192
msgid "You must enter a name."
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.88 wesnoth/src/Makefile.am:1.89
--- wesnoth/src/Makefile.am:1.88 Sat Mar 26 15:15:08 2005
+++ wesnoth/src/Makefile.am Sun Mar 27 23:06:16 2005
@@ -98,9 +98,11 @@
thread.cpp \
titlescreen.cpp \
tooltips.cpp \
+ tstring.cpp \
unit.cpp \
unit_display.cpp \
unit_types.cpp \
+ variable.cpp \
video.cpp \
wassert.cpp \
serialization/binary_or_text.cpp \
@@ -108,6 +110,7 @@
serialization/parser.cpp \
serialization/preprocessor.cpp \
serialization/string_utils.cpp \
+ serialization/tokenizer.cpp \
widgets/button.cpp \
widgets/combo.cpp \
widgets/label.cpp \
@@ -188,6 +191,7 @@
thread.hpp \
titlescreen.hpp \
tooltips.hpp \
+ tstring.hpp \
unit.hpp \
unit_display.hpp \
unit_types.hpp \
@@ -200,6 +204,7 @@
serialization/parser.hpp \
serialization/preprocessor.hpp \
serialization/string_utils.hpp \
+ serialization/tokenizer.hpp \
widgets/button.hpp \
widgets/combo.hpp \
widgets/label.hpp \
@@ -278,15 +283,18 @@
thread.cpp \
theme.cpp \
tooltips.cpp \
+ tstring.cpp \
unit.cpp \
unit_display.cpp \
unit_types.cpp \
+ variable.cpp \
video.cpp \
serialization/binary_or_text.cpp \
serialization/binary_wml.cpp \
serialization/parser.cpp \
serialization/preprocessor.cpp \
serialization/string_utils.cpp \
+ serialization/tokenizer.cpp \
widgets/button.cpp \
widgets/file_chooser.cpp \
widgets/label.cpp \
@@ -359,15 +367,18 @@
theme.hpp \
thread.hpp \
tooltips.hpp \
+ tstring.hpp \
unit.hpp \
unit_display.hpp \
unit_types.hpp \
+ variable.hpp \
video.hpp \
serialization/binary_or_text.hpp \
serialization/binary_wml.hpp \
serialization/parser.hpp \
serialization/preprocessor.hpp \
serialization/string_utils.hpp \
+ serialization/tokenizer.hpp \
widgets/button.hpp \
widgets/file_chooser.hpp \
widgets/label.hpp \
@@ -401,6 +412,7 @@
network.cpp \
network_worker.cpp \
thread.cpp \
+ tstring.cpp \
serialization/binary_wml.cpp \
serialization/string_utils.cpp \
zipios++/xcoll.cpp \
@@ -417,6 +429,7 @@
network.hpp \
network_worker.hpp \
thread.hpp \
+ tstring.hpp \
serialization/binary_wml.hpp \
serialization/string_utils.hpp \
zipios++/xcoll.hpp
@@ -439,9 +452,11 @@
network_worker.cpp \
publish_campaign.cpp \
thread.cpp \
+ tstring.cpp \
serialization/binary_wml.cpp \
serialization/parser.cpp \
serialization/string_utils.cpp \
+ serialization/tokenizer.cpp \
zipios++/xcoll.cpp \
variable.hpp \
config.hpp \
@@ -456,7 +471,9 @@
serialization/parser.hpp \
serialization/preprocessor.hpp \
serialization/string_utils.hpp \
+ serialization/tokenizer.hpp \
thread.hpp \
+ tstring.hpp \
zipios++/xcoll.hpp
campaignd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL)
@@ -477,9 +494,11 @@
game_config.cpp \
sdl_utils.cpp \
log.cpp \
+ tstring.cpp \
serialization/parser.cpp \
serialization/preprocessor.cpp \
serialization/string_utils.cpp \
+ serialization/tokenizer.cpp \
zipios++/xcoll.cpp \
variable.hpp \
tools/exploder_composer.hpp \
@@ -488,7 +507,9 @@
serialization/parser.hpp \
serialization/preprocessor.hpp \
serialization/string_utils.hpp \
+ serialization/tokenizer.hpp \
zipios++/xcoll.hpp \
+ tstring.hpp \
gettext.cpp
cutter_SOURCES = \
@@ -502,9 +523,11 @@
game_config.cpp \
sdl_utils.cpp \
log.cpp \
+ tstring.cpp \
serialization/parser.cpp \
serialization/preprocessor.cpp \
serialization/string_utils.cpp \
+ serialization/tokenizer.cpp \
zipios++/xcoll.cpp \
variable.hpp \
tools/exploder_composer.hpp \
@@ -513,7 +536,9 @@
serialization/parser.hpp \
serialization/preprocessor.hpp \
serialization/string_utils.hpp \
+ serialization/tokenizer.hpp \
zipios++/xcoll.hpp \
+ tstring.hpp \
gettext.cpp
exploder_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
@@ -531,6 +556,7 @@
gettext.cpp \
log.cpp \
network.cpp \
+ tstring.cpp \
variable.hpp \
config.hpp \
gettext.hpp \
@@ -538,6 +564,7 @@
game_config.hpp \
log.hpp \
network.hpp \
+ tstring.hpp \
server/variable.cpp \
wesconfig.h
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.201 wesnoth/src/actions.cpp:1.202
--- wesnoth/src/actions.cpp:1.201 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/actions.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.201 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: actions.cpp,v 1.202 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -525,7 +525,7 @@
static std::string unit_dump(std::pair< gamemap::location, unit > const &u)
{
std::stringstream s;
- s << u.second.type().name() << " (" << u.first.x + 1 << ',' <<
u.first.y + 1 << ')';
+ s << u.second.type().id() << " (" << u.first.x + 1 << ',' << u.first.y
+ 1 << ')';
return s.str();
}
@@ -1295,8 +1295,9 @@
const unit& new_unit = get_advanced_unit(info,units,loc,advance_to);
statistics::advance_unit(new_unit);
- preferences::encountered_units().insert(new_unit.type().name());
- LOG_STREAM(info, config) << "Added '" << new_unit.type().name() << "'
to encountered units\n";
+
+ preferences::encountered_units().insert(new_unit.type().id());
+ LOG_STREAM(info, config) << "Added '" << new_unit.type().id() << "' to
encountered units\n";
units.erase(loc);
units.insert(std::pair<gamemap::location,unit>(loc,new_unit));
@@ -1751,7 +1752,7 @@
msg_id = N_("Units sighted! ($friends friendly,
$enemies enemy)");
}
- string_map symbols;
+ utils::string_map symbols;
symbols["friends"] =
lexical_cast<std::string>(nfriends);
symbols["enemies"] =
lexical_cast<std::string>(nenemies);
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.144 wesnoth/src/ai.cpp:1.145
--- wesnoth/src/ai.cpp:1.144 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/ai.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.144 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: ai.cpp,v 1.145 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -224,7 +224,7 @@
for(std::map<std::string,unit_type>::const_iterator i =
gameinfo_.unit_types.begin(); i != gameinfo_.unit_types.end(); ++i)
{
- const std::string& name = i->second.name();
+ const std::string& name = i->second.id();
if(i->second.usage() == usage && recruits.count(name)
&& current_team().gold() - i->second.cost() > min_gold
@@ -726,7 +726,7 @@
for(config::child_list::const_iterator j = protected_units.begin(); j
!= protected_units.end(); ++j) {
for(unit_map::const_iterator u = units_.begin(); u !=
units_.end(); ++u) {
- if(game_events::unit_matches_filter(u,**j)) {
+ if(game_events::unit_matches_filter(u, *j)) {
items.push_back(protected_item(lexical_cast_default<double>((**j)["value"],1.0),lexical_cast_default<int>((**j)["radius"],20),u->first));
}
}
@@ -1269,7 +1269,7 @@
}
if(best_pos.valid()) {
- LOG_AI << "retreating '" <<
i->second.type().name() << "' " << i->first.x << ","
+ LOG_AI << "retreating '" <<
i->second.type().id() << "' " << i->first.x << ","
<< i->first.y << " -> " <<
best_pos.x << "," << best_pos.y << "\n";
move_unit(i->first,best_pos,possible_moves);
return true;
@@ -1377,7 +1377,7 @@
defense /= weighting_sum;
- LOG_AI << "average defense of '" << a.name() << "': " << defense <<
"\n";
+ LOG_AI << "average defense of '" << a.id() << "': " << defense << "\n";
int sum = 0, weight_sum = 0;
@@ -1405,7 +1405,7 @@
const int a_effectiveness_vs_b = average_resistance_against(b,a);
const int b_effectiveness_vs_a = average_resistance_against(a,b);
- LOG_AI << "comparison of '" << a.name() << " vs " << b.name() << ": "
+ LOG_AI << "comparison of '" << a.id() << " vs " << b.id() << ": "
<< a_effectiveness_vs_b << " - " << b_effectiveness_vs_a << "
= "
<< (a_effectiveness_vs_b - b_effectiveness_vs_a) <<
"\n";
return a_effectiveness_vs_b - b_effectiveness_vs_a;
Index: wesnoth/src/ai_move.cpp
diff -u wesnoth/src/ai_move.cpp:1.59 wesnoth/src/ai_move.cpp:1.60
--- wesnoth/src/ai_move.cpp:1.59 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/ai_move.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: ai_move.cpp,v 1.59 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: ai_move.cpp,v 1.60 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -410,7 +410,7 @@
//guardian units stay put
if(u->second.is_guardian()) {
- LOG_AI << u->second.type().name() << " is guardian, staying
still\n";
+ LOG_AI << u->second.type().id() << " is guardian, staying
still\n";
return std::pair<location,location>(u->first,u->first);
}
Index: wesnoth/src/config.cpp
diff -u wesnoth/src/config.cpp:1.135 wesnoth/src/config.cpp:1.136
--- wesnoth/src/config.cpp:1.135 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/config.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: config.cpp,v 1.135 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: config.cpp,v 1.136 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -20,6 +20,10 @@
#include "log.hpp"
#include "variable.hpp"
#include "wassert.hpp"
+#include "gettext.hpp"
+#include "util.hpp"
+
+#include <iostream>
#define ERR_CF LOG_STREAM(err, config)
@@ -204,13 +208,15 @@
delete res;
}
-std::string& config::operator[](const std::string& key)
+t_string& config::operator[](const std::string& key)
{
return values[key];
}
-const std::string& config::operator[](const std::string& key) const
+const t_string& config::operator[](const std::string& key) const
{
+ return get_attribute(key);
+#if 0
const std::string& str = get_attribute(key);
//see if the value is a variable
if (!str.empty() && str[0] == '$') {
@@ -218,15 +224,16 @@
} else {
return str;
}
+#endif
}
-const std::string& config::get_attribute(const std::string& key) const
+const t_string& config::get_attribute(const std::string& key) const
{
const string_map::const_iterator i = values.find(key);
if(i != values.end()) {
return i->second;
} else {
- static const std::string empty_string;
+ static const t_string empty_string;
return empty_string;
}
}
@@ -248,7 +255,7 @@
config* config::find_child(const std::string& key,
const std::string& name,
- const std::string& value)
+ const t_string& value)
{
const child_map::iterator i = children.find(key);
if(i == children.end())
@@ -265,7 +272,7 @@
const config* config::find_child(const std::string& key,
const std::string& name,
- const std::string& value) const
+ const t_string& value) const
{
const child_map::const_iterator i = children.find(key);
if(i == children.end())
@@ -468,7 +475,7 @@
const child_list& child_changes = diff.get_children("change_child");
child_list::const_iterator i;
for(i = child_changes.begin(); i != child_changes.end(); ++i) {
- const size_t index = atoi((**i)["index"].c_str());
+ const size_t index = lexical_cast<size_t>((**i)["index"].str());
for(all_children_iterator j = (*i)->ordered_begin(); j !=
(*i)->ordered_end(); ++j) {
const std::pair<const std::string*,const config*> item
= *j;
@@ -487,7 +494,7 @@
const child_list& child_inserts = diff.get_children("insert_child");
for(i = child_inserts.begin(); i != child_inserts.end(); ++i) {
- const size_t index = atoi((**i)["index"].c_str());
+ const size_t index = lexical_cast<size_t>((**i)["index"].str());
for(all_children_iterator j = (*i)->ordered_begin(); j !=
(*i)->ordered_end(); ++j) {
const std::pair<const std::string*,const config*> item
= *j;
add_child_at(*item.first,*item.second,index);
@@ -496,7 +503,7 @@
const child_list& child_deletes = diff.get_children("delete_child");
for(i = child_deletes.begin(); i != child_deletes.end(); ++i) {
- const size_t index = atoi((**i)["index"].c_str());
+ const size_t index = lexical_cast<size_t>((**i)["index"].str());
for(all_children_iterator j = (*i)->ordered_begin(); j !=
(*i)->ordered_end(); ++j) {
const std::pair<const std::string*,const config*> item
= *j;
Index: wesnoth/src/config.hpp
diff -u wesnoth/src/config.hpp:1.59 wesnoth/src/config.hpp:1.60
--- wesnoth/src/config.hpp:1.59 Wed Mar 23 08:23:05 2005
+++ wesnoth/src/config.hpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: config.hpp,v 1.59 2005/03/23 08:23:05 silene Exp $ */
+/* $Id: config.hpp,v 1.60 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,6 +16,7 @@
#include <map>
#include <string>
#include <vector>
+#include "tstring.hpp"
//This module defines the interface to Wesnoth Markup Language (WML).
//WML is a simple hierarchical text-based file format. The format
@@ -25,7 +26,9 @@
//sent across the network in this format. It is thus used extensively
//throughout the game.
-typedef std::map<std::string,std::string> string_map;
+class t_string;
+
+typedef std::map<std::string,t_string> string_map;
//a config object defines a single node in a WML file, with access to
//child nodes.
@@ -60,15 +63,15 @@
config& add_child(const std::string& key);
config& add_child(const std::string& key, const config& val);
config& add_child_at(const std::string& key, const config& val, size_t
index);
- std::string& operator[](const std::string& key);
- const std::string& operator[](const std::string& key) const;
+ t_string& operator[](const std::string& key);
+ const t_string& operator[](const std::string& key) const;
- const std::string& get_attribute(const std::string& key) const;
+ const t_string& get_attribute(const std::string& key) const;
config* find_child(const std::string& key, const std::string& name,
- const std::string& value);
+ const t_string& value);
const config* find_child(const std::string& key, const std::string&
name,
- const std::string& value) const;
+ const t_string& value) const;
void clear_children(const std::string& key);
void remove_child(const std::string& key, size_t index);
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.94 wesnoth/src/dialogs.cpp:1.95
--- wesnoth/src/dialogs.cpp:1.94 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/dialogs.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.94 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.95 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -59,7 +59,7 @@
if(u == units.end() || u->second.advances() == false)
return;
- LOG_DP << "advance_unit: " << u->second.type().name() << "\n";
+ LOG_DP << "advance_unit: " << u->second.type().id() << "\n";
const std::vector<std::string>& options =
u->second.type().advances_to();
@@ -75,10 +75,10 @@
const config::child_list& mod_options =
u->second.get_modification_advances();
for(config::child_list::const_iterator mod = mod_options.begin(); mod
!= mod_options.end(); ++mod) {
-
sample_units.push_back(::get_advanced_unit(info,units,loc,u->second.type().name()));
+
sample_units.push_back(::get_advanced_unit(info,units,loc,u->second.type().id()));
sample_units.back().add_modification("advance",**mod);
const unit_type& type = sample_units.back().type();
- lang_options.push_back(IMAGE_PREFIX + type.image() +
COLUMN_SEPARATOR + (**mod)["description"]);
+ lang_options.push_back(IMAGE_PREFIX + type.image() +
COLUMN_SEPARATOR + (**mod)["description"].str());
}
LOG_DP << "options: " << options.size() << "\n";
@@ -136,7 +136,7 @@
}
}
- const std::string& chosen_unit = choice < options.size() ?
options[choice] : u->second.type().name();
+ const std::string& chosen_unit = choice < options.size() ?
options[choice] : u->second.type().id();
::advance_unit(info,units,loc,chosen_unit);
u = units.find(loc);
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.311 wesnoth/src/display.cpp:1.312
--- wesnoth/src/display.cpp:1.311 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/display.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.311 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: display.cpp,v 1.312 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -603,12 +603,14 @@
const SDL_Rect screen = screen_area();
SDL_Rect& loc = panel.location(screen);
- if(surf->w != loc.w || surf->h != loc.h) {
- surf.assign(scale_surface(surf,loc.w,loc.h));
- }
+ if(!surf.null()) {
+ if(surf->w != loc.w || surf->h != loc.h) {
+ surf.assign(scale_surface(surf,loc.w,loc.h));
+ }
- video.blit_surface(loc.x,loc.y,surf);
- update_rect(loc);
+ video.blit_surface(loc.x,loc.y,surf);
+ update_rect(loc);
+ }
for(std::vector<gui::button>::iterator b = buttons.begin(); b !=
buttons.end(); ++b) {
if(rects_overlap(b->location(),loc)) {
@@ -627,11 +629,13 @@
if(icon.empty() == false) {
surface surf(image::get_image(icon,image::UNSCALED));
- if(surf->w != loc.w || surf->h != loc.h) {
- surf.assign(scale_surface(surf,loc.w,loc.h));
- }
+ if(!surf.null()) {
+ if(surf->w != loc.w || surf->h != loc.h) {
+ surf.assign(scale_surface(surf,loc.w,loc.h));
+ }
- SDL_BlitSurface(surf,NULL,target,&loc);
+ SDL_BlitSurface(surf,NULL,target,&loc);
+ }
if(text.empty() == false) {
tooltips::add_tooltip(loc,text);
@@ -1048,7 +1052,7 @@
for(std::vector<attack_type>::const_iterator at_it = attacks.begin();
at_it != attacks.end(); ++at_it) {
- const std::string& lang_weapon = at_it->name();
+ const t_string& lang_weapon = at_it->name();
const std::string& lang_type = at_it->type();
const std::string& lang_special = at_it->special();
details << "\n"
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.101 wesnoth/src/editor/editor.cpp:1.102
--- wesnoth/src/editor/editor.cpp:1.101 Sat Mar 26 14:07:18 2005
+++ wesnoth/src/editor/editor.cpp Sun Mar 27 23:06:17 2005
@@ -536,7 +536,7 @@
bool load_successful = true;
std::string msg;
std::string new_map;
- string_map symbols;
+ utils::string_map symbols;
symbols["filename"] = filename;
if (!file_exists(filename) || is_directory(filename)) {
load_successful = false;
@@ -1031,7 +1031,7 @@
}
}
catch (io_exception& e) {
- string_map symbols;
+ utils::string_map symbols;
symbols["msg"] = e.what();
const std::string msg = vgettext("Could not save the map:
$msg",symbols);
gui::show_dialog(gui_, NULL, "", msg, gui::OK_ONLY);
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.65 wesnoth/src/filesystem.cpp:1.66
--- wesnoth/src/filesystem.cpp:1.65 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/filesystem.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.65 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: filesystem.cpp,v 1.66 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -777,7 +777,7 @@
const config::child_list& items = cfg.get_children("binary_path");
for(config::child_list::const_iterator i = items.begin(); i !=
items.end(); ++i) {
- const std::string path = (**i)["path"] + "/";
+ const std::string path = (**i)["path"].str() + "/";
if(binary_paths.count(path) == 0) {
binary_paths.insert(path);
paths_.push_back(path);
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.219 wesnoth/src/game.cpp:1.220
--- wesnoth/src/game.cpp:1.219 Sat Mar 26 14:07:16 2005
+++ wesnoth/src/game.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.219 2005/03/26 14:07:16 silene Exp $ */
+/* $Id: game.cpp,v 1.220 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1133,11 +1133,11 @@
std::replace(title.begin(),title.end(),'_',' ');
}
- options.push_back(IMAGE_PREFIX + (**i)["icon"] +
COLUMN_SEPARATOR +
+ options.push_back(IMAGE_PREFIX + (**i)["icon"].str() +
COLUMN_SEPARATOR +
title + COLUMN_SEPARATOR +
- (**i)["version"] + COLUMN_SEPARATOR +
- (**i)["author"] + COLUMN_SEPARATOR +
- (**i)["downloads"] + COLUMN_SEPARATOR
+
+ (**i)["version"].str() +
COLUMN_SEPARATOR +
+ (**i)["author"].str() +
COLUMN_SEPARATOR +
+ (**i)["downloads"].str() +
COLUMN_SEPARATOR +
format_file_size((**i)["size"]));
}
@@ -1220,7 +1220,7 @@
return;
} else if(data.child("error")) {
gui::show_error_message(disp(), _("The server responded with an
error: \"") +
- (*data.child("error"))["message"] +
'"');
+ (*data.child("error"))["message"].str()
+ '"');
return;
} else if(data.child("message")) {
const int res =
gui::show_dialog(disp(),NULL,_("Terms"),(*data.child("message"))["message"],gui::OK_CANCEL);
@@ -1232,7 +1232,7 @@
config cfg;
get_campaign_info(campaign,cfg);
- std::string& passphrase = cfg["passphrase"];
+ std::string passphrase = cfg["passphrase"];
if(passphrase.empty()) {
passphrase.resize(8);
for(size_t n = 0; n != 8; ++n) {
@@ -1241,6 +1241,7 @@
set_campaign_info(campaign,cfg);
}
+ cfg["passphrase"] = passphrase;
cfg["name"] = campaign;
@@ -1258,7 +1259,7 @@
gui::show_error_message(disp(), _("Connection timed out"));
} else if(data.child("error")) {
gui::show_error_message(disp(), _("The server responded with an
error: \"") +
- (*data.child("error"))["message"] +
'"');
+ (*data.child("error"))["message"].str()
+ '"');
} else if(data.child("message")) {
gui::show_dialog(disp(),NULL,_("Response"),(*data.child("message"))["message"],gui::OK_ONLY);
}
@@ -1283,7 +1284,7 @@
gui::show_error_message(disp(), _("Connection timed out"));
} else if(data.child("error")) {
gui::show_error_message(disp(), _("The server responded with an
error: \"") +
- (*data.child("error"))["message"] +
'"');
+ (*data.child("error"))["message"].str()
+ '"');
} else if(data.child("message")) {
gui::show_dialog(disp(),NULL,_("Response"),(*data.child("message"))["message"],gui::OK_ONLY);
}
@@ -1580,6 +1581,13 @@
textdomain (PACKAGE);
bool res;
+
+ res = font::load_font_config();
+ if(res == false) {
+ std::cerr << "could not initialize fonts\n";
+ return 0;
+ }
+
#ifdef WIN32
res = game.init_config();
if(res == false) {
@@ -1610,12 +1618,6 @@
}
#endif
- res = font::load_font_config();
- if(res == false) {
- std::cerr << "could not initialize fonts\n";
- return 0;
- }
-
const cursor::manager cursor_manager;
#if defined(_X11) && !defined(__APPLE__)
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.137 wesnoth/src/game_events.cpp:1.138
--- wesnoth/src/game_events.cpp:1.137 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/game_events.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.137 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: game_events.cpp,v 1.138 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,9 +27,9 @@
#include "sound.hpp"
#include "unit_display.hpp"
#include "util.hpp"
-#include "variable.hpp"
#include "wassert.hpp"
#include "gettext.hpp"
+#include "variable.hpp"
#include "serialization/string_utils.hpp"
#include <cstdlib>
@@ -44,32 +44,45 @@
#define ERR_NG LOG_STREAM(err, engine)
#define LOG_DP LOG_STREAM(info, display)
+namespace {
+
+display* screen = NULL;
+gamemap* game_map = NULL;
+std::map<gamemap::location,unit>* units = NULL;
+std::vector<team>* teams = NULL;
+game_state* state_of_game = NULL;
+const game_data* game_data_ptr = NULL;
+gamestatus* status_ptr = NULL;
+
+} //end anonymous namespace
+
namespace game_events {
bool conditional_passed(const std::map<gamemap::location,unit>* units,
- const config& cond)
+ const vconfig cond)
{
//an 'or' statement means that if the contained statements are true,
//then it automatically passes
- const config::child_list& or_statements = cond.get_children("or");
- for(config::child_list::const_iterator or_it = or_statements.begin();
or_it != or_statements.end(); ++or_it) {
- if(conditional_passed(units,**or_it)) {
+ const vconfig::child_list& or_statements = cond.get_children("or");
+ for(vconfig::child_list::const_iterator or_it = or_statements.begin();
+ or_it != or_statements.end(); ++or_it) {
+ if(conditional_passed(units,*or_it)) {
return true;
}
}
//if the if statement requires we have a certain unit, then
//check for that.
- const config::child_list& have_unit = cond.get_children("have_unit");
+ const vconfig::child_list& have_unit = cond.get_children("have_unit");
- for(config::child_list::const_iterator u = have_unit.begin(); u !=
have_unit.end(); ++u) {
+ for(vconfig::child_list::const_iterator u = have_unit.begin(); u !=
have_unit.end(); ++u) {
if(units == NULL)
return false;
std::map<gamemap::location,unit>::const_iterator itor;
for(itor = units->begin(); itor != units->end(); ++itor) {
- if(itor->second.hitpoints() > 0 &&
game_events::unit_matches_filter(itor, **u)) {
+ if(itor->second.hitpoints() > 0 &&
game_events::unit_matches_filter(itor, *u)) {
break;
}
}
@@ -81,12 +94,13 @@
//check against each variable statement to see if the variable
//matches the conditions or not
- const config::child_list& variables = cond.get_children("variable");
- for(config::child_list::const_iterator var = variables.begin(); var !=
variables.end(); ++var) {
- const config& values = **var;
+ const vconfig::child_list& variables = cond.get_children("variable");
+ for(vconfig::child_list::const_iterator var = variables.begin(); var !=
variables.end(); ++var) {
+ const vconfig& values = *var;
const std::string& name = values["name"];
- const std::string& value = game_events::get_variable(name);
+ wassert(state_of_game != NULL);
+ const std::string& value = state_of_game->get_variable(name);
const double num_value = atof(value.c_str());
@@ -138,13 +152,6 @@
namespace {
-display* screen = NULL;
-gamemap* game_map = NULL;
-std::map<gamemap::location,unit>* units = NULL;
-std::vector<team>* teams = NULL;
-game_state* state_of_game = NULL;
-const game_data* game_data_ptr = NULL;
-gamestatus* status_ptr = NULL;
std::set<std::string> used_items;
const size_t MaxLoop = 1024;
@@ -166,17 +173,19 @@
class event_handler
{
public:
- event_handler(const config* cfg) : name_((*cfg)["name"]),
- first_time_only_((*cfg)["first_time_only"] != "no"),
- disabled_(false),
- cfg_(cfg)
+ event_handler(const config& cfg) :
+ name_(cfg["name"]),
+ first_time_only_(cfg["first_time_only"] != "no"),
+ disabled_(false),
+ cfg_(&cfg)
{}
- void write(config& cfg) const {
- if(cfg_ == NULL || disabled_)
+ void write(config& cfg) const
+ {
+ if(disabled_)
return;
- cfg = *cfg_;
+ cfg = cfg_.get_config();
}
const std::string& name() const { return name_; }
@@ -186,26 +195,37 @@
void disable() { disabled_ = true; }
bool disabled() const { return disabled_; }
- const config::child_list& first_arg_filters() {
- return cfg_->get_children("filter");
+ const vconfig::child_list first_arg_filters()
+ {
+ return cfg_.get_children("filter");
}
- const config::child_list& second_arg_filters() {
- return cfg_->get_children("filter_second");
+ const vconfig::child_list second_arg_filters()
+ {
+ return cfg_.get_children("filter_second");
}
- bool handle_event(const queued_event& event_info, const config*
cfg=NULL);
+ bool handle_event(const queued_event& event_info,
+ const vconfig cfg = vconfig());
private:
- bool handle_event_command(const queued_event& event_info, const
std::string& cmd, const config& cfg, bool& mutated);
+ bool handle_event_command(const queued_event& event_info, const
std::string& cmd, const vconfig cfg, bool& mutated);
std::string name_;
bool first_time_only_;
bool disabled_;
- const config* cfg_;
+ vconfig cfg_;
};
-std::vector<gamemap::location> multiple_locs(const config& cfg)
+gamemap::location cfg_to_loc(const vconfig cfg)
+{
+ int x = lexical_cast_default(cfg["x"], 0) - 1;
+ int y = lexical_cast_default(cfg["y"], 0) - 1;
+
+ return gamemap::location(x, y);
+}
+
+std::vector<gamemap::location> multiple_locs(const vconfig cfg)
{
return parse_location_range(cfg["x"],cfg["y"]);
}
@@ -214,7 +234,8 @@
//this function handles all the different types of actions that can be
triggered
//by an event.
-bool event_handler::handle_event_command(const queued_event& event_info, const
std::string& cmd, const config& cfg, bool& mutated)
+bool event_handler::handle_event_command(const queued_event& event_info,
+ const std::string& cmd, const vconfig cfg, bool& mutated)
{
log_scope2(engine, "handle_event_command");
LOG_NG << "handling command: '" << cmd << "'\n";
@@ -222,7 +243,7 @@
bool rval = true;
//sub commands that need to be handled in a guaranteed ordering
if(cmd == "command") {
- handle_event(event_info,&cfg);
+ handle_event(event_info, cfg);
}
//allow undo sets the flag saying whether the event has mutated the
game to false
@@ -255,17 +276,17 @@
unit_map::iterator u = units->find(event_info.loc1);
//search for a valid unit filter, and if we have one, look for
the matching unit
- const config* const filter = cfg.child("filter");
- if(filter != NULL) {
+ const vconfig filter = cfg.child("filter");
+ if(!filter.null()) {
for(u = units->begin(); u != units->end(); ++u){
- if(game_events::unit_matches_filter(u,*filter))
+ if(game_events::unit_matches_filter(u, filter))
break;
}
}
//we have found a unit that matches the filter
if(u != units->end()) {
- const gamemap::location dst(cfg);
+ const gamemap::location dst = cfg_to_loc(cfg);
if(game_map->on_board(dst)) {
const gamemap::location vacant_dst =
find_vacant_tile(*game_map,*units,dst);
if(game_map->on_board(vacant_dst)) {
@@ -290,9 +311,9 @@
//remove units from being turned to stone
else if(cmd == "unstone") {
- const config* const filter = cfg.child("filter");
+ const vconfig filter = cfg.child("filter");
for(unit_map::iterator i = units->begin(); i != units->end();
++i) {
- if(i->second.stone() && (filter == NULL ||
game_events::unit_matches_filter(i,*filter))) {
+ if(i->second.stone() && (!filter.null() ||
game_events::unit_matches_filter(i, filter))) {
i->second.remove_flag("stone");
}
}
@@ -451,7 +472,8 @@
if(team_index < teams->size()) {
char value[50];
sprintf(value,"%d",(*teams)[team_index].gold());
- game_events::set_variable(var_name,value);
+ wassert(state_of_game != NULL);
+ state_of_game->set_variable(var_name,value);
}
}
@@ -533,7 +555,7 @@
const std::string win_str = "@";
const std::string lose_str = "#";
- const std::string& summary = cfg["summary"];
+ const t_string& summary = cfg["summary"];
const size_t side = lexical_cast_default<size_t>(cfg["side"],
0);
bool silent = cfg["silent"] == "yes";
@@ -542,80 +564,83 @@
return rval;
}
- std::string win_string = cfg["victory_string"];
+ t_string win_string = cfg["victory_string"];
if(win_string.empty())
win_string = _("Victory:");
- std::string lose_string = cfg["defeat_string"];
+ t_string lose_string = cfg["defeat_string"];
if(lose_string.empty())
lose_string = _("Defeat:");
- std::string win_objectives;
- std::string lose_objectives;
+ t_string win_objectives;
+ t_string lose_objectives;
- const config::child_list& objectives =
cfg.get_children("objective");
- for(config::child_list::const_iterator obj_it =
objectives.begin();
+ const vconfig::child_list objectives =
cfg.get_children("objective");
+ for(vconfig::child_list::const_iterator obj_it =
objectives.begin();
obj_it != objectives.end(); ++obj_it) {
- const std::string& description =
(**obj_it)["description"];
- const std::string& condition = (**obj_it)["condition"];
+ const t_string description = (*obj_it)["description"];
+ const std::string& condition = (*obj_it)["condition"];
LOG_NG << condition << " objective: " << description <<
"\n";
if(condition == "win") {
- win_objectives.append("\n");
- win_objectives.append(win_str);
- win_objectives.append(description);
+ win_objectives += "\n";
+ win_objectives += win_str;
+ win_objectives += description;
} else if(condition == "lose") {
- lose_objectives.append("\n");
- lose_objectives.append(lose_str);
- lose_objectives.append(description);
+ lose_objectives += "\n";
+ lose_objectives += lose_str;
+ lose_objectives += description;
} else {
ERR_NG << "unknown condition '" << condition <<
"', ignoring\n";
}
}
- std::stringstream objs;
+ t_string objs;
if(!summary.empty())
- objs << "*" << summary << "\n";
+ objs += "*" + summary + "\n";
if(!win_objectives.empty()) {
- objs << win_string << "\n";
- objs << win_objectives << "\n";
+ objs += win_string + "\n";
+ objs += win_objectives + "\n";
}
if(!lose_objectives.empty()) {
- objs << lose_string << "\n";
- objs << lose_objectives << "\n";
+ objs += lose_string + "\n";
+ objs += lose_objectives + "\n";
}
if(side == 0) {
for(std::vector<team>::iterator itor = teams->begin();
itor != teams->end(); ++itor) {
- itor->set_objectives(objs.str(), silent);
+ itor->set_objectives(objs, silent);
}
} else {
- (*teams)[side - 1].set_objectives(objs.str(), silent);
+ (*teams)[side - 1].set_objectives(objs, silent);
}
}
//setting a variable
else if(cmd == "set_variable") {
+ wassert(state_of_game != NULL);
+
const std::string& name =
utils::interpolate_variables_into_string(
- cfg.get_attribute("name"));
- std::string& var = game_events::get_variable(name);
- const std::string& value = cfg["value"];
+ cfg.get_attribute("name"), *state_of_game);
+ t_string& var = state_of_game->get_variable(name);
+
+ const t_string& value = cfg["value"];
if(value.empty() == false) {
var = value;
}
const std::string& format =
utils::interpolate_variables_into_string(
- cfg.get_attribute("format"));
+ cfg.get_attribute("format"), *state_of_game);
if(format.empty() == false) {
var = format;
}
const std::string& to_variable =
utils::interpolate_variables_into_string(
- cfg.get_attribute("to_variable"));
+ cfg.get_attribute("to_variable"), *state_of_game);
if(to_variable.empty() == false) {
- var = game_events::get_variable(to_variable);
+ var = state_of_game->get_variable(to_variable);
}
const std::string& add = cfg["add"];
@@ -725,10 +750,10 @@
//if the if statement passed, then execute all 'then'
statements,
//otherwise execute 'else' statements
- const config::child_list& commands =
cfg.get_children(type);
- for(config::child_list::const_iterator cmd =
commands.begin();
+ const vconfig::child_list commands =
cfg.get_children(type);
+ for(vconfig::child_list::const_iterator cmd =
commands.begin();
cmd != commands.end(); ++cmd) {
- handle_event(event_info,*cmd);
+ handle_event(event_info, *cmd);
}
}
}
@@ -744,14 +769,15 @@
//a unit that matches
std::vector<std::string>::iterator ti;
for(ti = types.begin(); ti != types.end(); ++ti) {
- config item = cfg;
+ config item = cfg.get_config();
item["type"] = *ti;
item["side"] = cfg["side"];
item["role"] = "";
+ vconfig filter(&item);
std::map<gamemap::location,unit>::iterator itor;
for(itor = units->begin(); itor != units->end();
++itor) {
- if(game_events::unit_matches_filter(itor,item))
{
+ if(game_events::unit_matches_filter(itor,
filter)) {
itor->second.assign_role(cfg["role"]);
break;
}
@@ -762,52 +788,52 @@
bool found = false;
- if(sides.empty() == false) {
- std::vector<std::string>::const_iterator si;
- for(si = sides.begin(); si != sides.end(); ++si) {
- int side_num = lexical_cast_default<int>(*si,1);
-
- player_info*
player=state_of_game->get_player((*teams)[side_num-1].save_id());
-
- if(!player)
- continue;
-
- //iterate over the units, and try to find one that
matches
- std::vector<unit>::iterator ui;
- for(ui = player->available_units.begin();
- ui != player->available_units.end(); ++ui) {
- if(game_events::unit_matches_filter(*ui, item)) {
- ui->assign_role(cfg["role"]);
- found=true;
- break;
- }
- }
- }
- } else {
- std::map<std::string, player_info>::iterator pi;
- for(pi=state_of_game->players.begin();
- pi!=state_of_game->players.end(); ++pi) {
- std::vector<unit>::iterator ui;
- //iterate over the units, and try to find one that
matches
- for(ui = pi->second.available_units.begin();
- ui != pi->second.available_units.end(); ++ui) {
- if(game_events::unit_matches_filter(*ui, item)) {
- ui->assign_role(cfg["role"]);
- found=true;
- break;
- }
- }
- }
+ if(sides.empty() == false) {
+ std::vector<std::string>::const_iterator si;
+ for(si = sides.begin(); si != sides.end();
++si) {
+ int side_num =
lexical_cast_default<int>(*si,1);
+
+ player_info*
player=state_of_game->get_player((*teams)[side_num-1].save_id());
+
+ if(!player)
+ continue;
+
+ //iterate over the units, and try to
find one that matches
+ std::vector<unit>::iterator ui;
+ for(ui =
player->available_units.begin();
+ ui !=
player->available_units.end(); ++ui) {
+
if(game_events::unit_matches_filter(*ui, filter)) {
+
ui->assign_role(cfg["role"]);
+ found=true;
+ break;
+ }
+ }
+ }
+ } else {
+ std::map<std::string, player_info>::iterator pi;
+ for(pi=state_of_game->players.begin();
+
pi!=state_of_game->players.end(); ++pi) {
+ std::vector<unit>::iterator ui;
+ //iterate over the units, and try to
find one that matches
+ for(ui =
pi->second.available_units.begin();
+ ui !=
pi->second.available_units.end(); ++ui) {
+
if(game_events::unit_matches_filter(*ui, filter)) {
+
ui->assign_role(cfg["role"]);
+ found=true;
+ break;
+ }
+ }
+ }
}
//if we found a unit, we don't have to keep going.
if(found)
- break;
+ break;
}
}
else if(cmd == "removeitem") {
- gamemap::location loc(cfg);
+ gamemap::location loc = cfg_to_loc(cfg);
if(!loc.valid()) {
loc = event_info.loc1;
}
@@ -835,7 +861,7 @@
//hiding units
else if(cmd == "hide_unit") {
- const gamemap::location loc(cfg);
+ const gamemap::location loc = cfg_to_loc(cfg);
screen->hide_unit(loc,true);
screen->draw_tile(loc.x,loc.y);
}
@@ -847,7 +873,7 @@
//adding new items
else if(cmd == "item") {
- gamemap::location loc(cfg);
+ gamemap::location loc = cfg_to_loc(cfg);
const std::string& img = cfg["image"];
const std::string& halo = cfg["halo"];
if(!img.empty() || !halo.empty()) {
@@ -874,7 +900,7 @@
//creating a mask of the terrain
else if(cmd == "terrain_mask") {
- gamemap::location loc(cfg);
+ gamemap::location loc = cfg_to_loc(cfg);
if(loc.x == -1) {
loc.x = 0;
}
@@ -892,7 +918,7 @@
return rval;
}
- game_map->overlay(mask,cfg,loc.x,loc.y);
+ game_map->overlay(mask, cfg.get_parsed_config(), loc.x, loc.y);
screen->recalculate_minimap();
screen->invalidate_all();
screen->rebuild_all();
@@ -900,9 +926,9 @@
//if we should spawn a new unit on the map somewhere
else if(cmd == "unit") {
- unit new_unit(*game_data_ptr,cfg);
- preferences::encountered_units().insert(new_unit.type().name());
- gamemap::location loc(cfg);
+ unit new_unit(*game_data_ptr, cfg.get_parsed_config());
+ preferences::encountered_units().insert(new_unit.type().id());
+ gamemap::location loc = cfg_to_loc(cfg);
if(game_map->on_board(loc)) {
loc = find_vacant_tile(*game_map,*units,loc);
@@ -947,7 +973,7 @@
for(std::vector<unit>::iterator u = avail.begin(); u !=
avail.end(); ++u) {
LOG_NG << "checking unit against filter...\n";
if(game_events::unit_matches_filter(*u,cfg)) {
- gamemap::location loc(cfg);
+ gamemap::location loc = cfg_to_loc(cfg);
recruit_unit(*game_map,index+1,*units,*u,loc,cfg["show"] == "no" ? NULL :
screen,false,true);
avail.erase(u);
break;
@@ -955,7 +981,7 @@
}
}
} else if(cmd == "object") {
- const config* filter = cfg.child("filter");
+ const vconfig filter = cfg.child("filter");
const std::string& id = cfg["id"];
@@ -969,9 +995,9 @@
std::string text;
gamemap::location loc;
- if(filter != NULL) {
+ if(!filter.null()) {
for(unit_map::const_iterator u = units->begin(); u !=
units->end(); ++u) {
- if(game_events::unit_matches_filter(u,*filter))
{
+ if(game_events::unit_matches_filter(u, filter))
{
loc = u->first;
break;
}
@@ -986,10 +1012,10 @@
std::string command_type = "then";
- if(u != units->end() && (filter == NULL ||
game_events::unit_matches_filter(u,*filter))) {
+ if(u != units->end() && (filter.null() ||
game_events::unit_matches_filter(u, filter))) {
text = cfg["description"];
- u->second.add_modification("object",cfg);
+ u->second.add_modification("object",
cfg.get_parsed_config());
screen->select_hex(event_info.loc1);
screen->invalidate_unit();
@@ -1015,10 +1041,10 @@
gui::show_dialog(*screen,surface,caption,text);
}
- const config::child_list& commands =
cfg.get_children(command_type);
- for(config::child_list::const_iterator cmd = commands.begin();
+ const vconfig::child_list commands =
cfg.get_children(command_type);
+ for(vconfig::child_list::const_iterator cmd = commands.begin();
cmd != commands.end(); ++cmd) {
- handle_event(event_info,*cmd);
+ handle_event(event_info, *cmd);
}
}
@@ -1095,14 +1121,14 @@
}
std::vector<std::string> options;
- std::vector<config::const_child_itors> option_events;
+ std::vector<vconfig::child_list> option_events;
+
+ const vconfig::child_list menu_items =
cfg.get_children("option");
+ for(vconfig::child_list::const_iterator mi = menu_items.begin();
+ mi != menu_items.end(); ++mi) {
- const config::child_list& menu_items =
cfg.get_children("option");
- for(config::child_list::const_iterator mi = menu_items.begin();
- mi != menu_items.end(); ++mi) {
- config const &cfg_mi = **mi;
- options.push_back(cfg_mi["message"]);
- option_events.push_back(cfg_mi.child_range("command"));
+ options.push_back((*mi)["message"]);
+ option_events.push_back((*mi).get_children("command"));
}
surface surface(NULL);
@@ -1117,7 +1143,7 @@
//if we're not replaying, or if we are replaying and there is
no choice
//to be made, show the dialog.
if(get_replay_source().at_end() || options.empty()) {
- const std::string msg =
utils::interpolate_variables_into_string(cfg["message"]);
+ const std::string msg =
utils::interpolate_variables_into_string(cfg["message"], *state_of_game);
option_chosen =
gui::show_dialog(*screen,surface,caption,msg,
options.empty() ? gui::MESSAGE :
gui::OK_ONLY,
options.empty() ? NULL : &options);
@@ -1153,9 +1179,11 @@
if(options.empty() == false) {
wassert(size_t(option_chosen) < menu_items.size());
- for(config::const_child_itors events =
option_events[option_chosen];
- events.first != events.second; ++events.first) {
- handle_event(event_info,*events.first);
+ vconfig::child_list events =
option_events[option_chosen];
+ for(vconfig::child_list::const_iterator itor =
events.begin();
+ itor != events.end(); ++itor) {
+
+ handle_event(event_info, *itor);
}
}
}
@@ -1205,15 +1233,16 @@
//adding of new events
else if(cmd == "event") {
- event_handler new_handler(&cfg);
+ event_handler new_handler(cfg.get_config());
events_map.insert(std::pair<std::string,event_handler>(new_handler.name(),new_handler));
}
//unit serialization to and from variables
else if(cmd == "store_unit") {
const config empty_filter;
- const config* filter_ptr = cfg.child("filter");
- const config& filter = filter_ptr != NULL ? *filter_ptr :
empty_filter;
+ vconfig filter = cfg.child("filter");
+ if(filter.null())
+ filter = &empty_filter;
const std::string& variable = cfg["variable"];
@@ -1240,35 +1269,37 @@
}
if(filter["x"].empty() && filter["y"].empty()) {
- std::map<std::string, player_info>& players =
state_of_game->players;
+ std::map<std::string, player_info>& players =
state_of_game->players;
- for(std::map<std::string, player_info>::iterator pi =
players.begin();
- pi!=players.end(); ++pi) {
- std::vector<unit>& avail_units =
pi->second.available_units;
- for(std::vector<unit>::iterator j = avail_units.begin(); j
!= avail_units.end();) {
- if(game_events::unit_matches_filter(*j, filter) ==
false) {
- ++j;
- continue;
- }
-
- config& data = vars.add_child(variable);
- j->write(data);
- data["x"] = "recall";
- data["y"] = "recall";
-
- if(kill_units) {
- j = avail_units.erase(j);
- } else {
- ++j;
- }
- }
- }
+ for(std::map<std::string, player_info>::iterator pi =
players.begin();
+ pi!=players.end(); ++pi) {
+ std::vector<unit>& avail_units =
pi->second.available_units;
+ for(std::vector<unit>::iterator j =
avail_units.begin(); j != avail_units.end();) {
+ if(game_events::unit_matches_filter(*j,
filter) == false) {
+ ++j;
+ continue;
+ }
+
+ config& data = vars.add_child(variable);
+ j->write(data);
+ data["x"] = "recall";
+ data["y"] = "recall";
+
+ if(kill_units) {
+ j = avail_units.erase(j);
+ } else {
+ ++j;
+ }
+ }
+ }
}
}
else if(cmd == "unstore_unit") {
- const config& var = game_events::get_variable_cfg(
-
utils::interpolate_variables_into_string(cfg.get_attribute("variable")));
+ wassert(state_of_game != NULL);
+ const config& var = state_of_game->get_variable_cfg(
+
utils::interpolate_variables_into_string(cfg.get_attribute("variable"),
+ *state_of_game));
try {
const unit u(*game_data_ptr,var);
@@ -1298,16 +1329,17 @@
else if(cmd == "store_starting_location") {
const int side = lexical_cast_default<int>(cfg["side"]);
const gamemap::location& loc =
game_map->starting_position(side);
- static const std::string default_store = "location";
- const std::string& store = cfg["variable"].empty() ?
default_store : cfg["variable"];
- loc.write(game_events::get_variable_cfg(store));
+ static const t_string default_store = "location";
+ const t_string& store = cfg["variable"].empty() ? default_store
: cfg["variable"];
+ wassert(state_of_game != NULL);
+ loc.write(state_of_game->get_variable_cfg(store));
}
else if(cmd == "store_locations") {
log_scope("store_locations");
const std::string& variable = cfg["variable"];
const std::string& terrain = cfg["terrain"];
- const config* const unit_filter = cfg.child("filter");
+ const vconfig unit_filter = cfg.child("filter");
state_of_game->variables.clear_children(variable);
@@ -1327,9 +1359,9 @@
if(std::find(terrain.begin(), terrain.end(), c)
== terrain.end())
continue;
}
- if (unit_filter != NULL) {
+ if (!unit_filter.null()) {
const unit_map::const_iterator u =
units->find(*j);
- if (u == units->end() ||
!game_events::unit_matches_filter(u, *unit_filter))
+ if (u == units->end() ||
!game_events::unit_matches_filter(u, unit_filter))
continue;
}
j->write(state_of_game->variables.add_child(variable));
@@ -1390,16 +1422,19 @@
return rval;
}
-bool event_handler::handle_event(const queued_event& event_info, const config*
cfg)
+bool event_handler::handle_event(const queued_event& event_info, const vconfig
conf)
{
- if(cfg == NULL)
+ vconfig cfg = conf;
+
+ if(cfg.null())
cfg = cfg_;
bool mutated = true;
bool skip_messages = false;
- for(config::all_children_iterator i = cfg->ordered_begin();
- i != cfg->ordered_end(); ++i) {
+ for(config::all_children_iterator i = cfg.get_config().ordered_begin();
+ i != cfg.get_config().ordered_end(); ++i) {
+
const std::pair<const std::string*,const config*> item = *i;
// If the user pressed escape, we skip any message that doesn't
@@ -1410,7 +1445,7 @@
}
}
- if
(!handle_event_command(event_info,*item.first,*item.second,mutated)) {
+ if (!handle_event_command(event_info, *item.first,
vconfig(item.second), mutated)) {
skip_messages = true;
}
else {
@@ -1480,7 +1515,7 @@
return true;
}
-bool filter_loc(const gamemap::location& loc, const config& cfg)
+bool filter_loc(const gamemap::location& loc, const vconfig cfg)
{
const std::string& xloc = cfg["x"];
const std::string& yloc = cfg["y"];
@@ -1496,19 +1531,19 @@
unit_map::iterator unit1 = units->find(ev.loc1);
unit_map::iterator unit2 = units->find(ev.loc2);
- const config::child_list& first_filters = handler.first_arg_filters();
- for(config::child_list::const_iterator ffi = first_filters.begin();
+ const vconfig::child_list first_filters = handler.first_arg_filters();
+ for(vconfig::child_list::const_iterator ffi = first_filters.begin();
ffi != first_filters.end(); ++ffi) {
- if(unit1 == units->end() ||
!game_events::unit_matches_filter(unit1,**ffi)) {
+ if(unit1 == units->end() ||
!game_events::unit_matches_filter(unit1,*ffi)) {
return false;
}
}
- const config::child_list& second_filters = handler.second_arg_filters();
- for(config::child_list::const_iterator sfi = second_filters.begin();
+ const vconfig::child_list second_filters = handler.second_arg_filters();
+ for(vconfig::child_list::const_iterator sfi = second_filters.begin();
sfi != second_filters.end(); ++sfi) {
- if(unit2 == units->end() ||
!game_events::unit_matches_filter(unit2,**sfi)) {
+ if(unit2 == units->end() ||
!game_events::unit_matches_filter(unit2,*sfi)) {
return false;
}
}
@@ -1523,82 +1558,17 @@
return res;
}
-void get_variable_internal(const std::string& key, config& cfg,
- std::string** varout,
config** cfgout)
-{
- //we get the variable from the [variables] section of the game state.
Variables may
- //be in the format
- const std::string::const_iterator itor =
std::find(key.begin(),key.end(),'.');
- if(itor != key.end()) {
- std::string element(key.begin(),itor);
- const std::string sub_key(itor+1,key.end());
-
- size_t index = 0;
- const std::string::iterator index_start =
std::find(element.begin(),element.end(),'[');
- const bool explicit_index = index_start != element.end();
-
- if(explicit_index) {
- const std::string::iterator index_end =
std::find(index_start,element.end(),']');
- const std::string index_str(index_start+1,index_end);
- index = size_t(atoi(index_str.c_str()));
- if(index > MaxLoop) {
- LOG_NG << "get_variable_internal: index greater
than " << MaxLoop
- << ", truncated\n";
- index = MaxLoop;
- }
-
- element = std::string(element.begin(),index_start);
- }
-
- const config::child_list& items = cfg.get_children(element);
-
- //special case -- '.length' on an array returns the size of the
array
- if(explicit_index == false && sub_key == "length") {
- if(items.empty()) {
- if(varout != NULL) {
- static std::string zero_str;
- zero_str = "0";
- *varout = &zero_str;
- }
- } else {
- char buf[50];
-
sprintf(buf,"%d",minimum<int>(MaxLoop,int(items.size())));
- ((*items.back())["__length"] = buf);
- if(varout != NULL) {
- *varout = &(*items.back())["__length"];
- }
- }
-
- return;
- }
-
- while(cfg.get_children(element).size() <= index) {
- cfg.add_child(element);
- }
-
- if(cfgout != NULL) {
- *cfgout = cfg.get_children(element)[index];
- }
-
-
get_variable_internal(sub_key,*cfg.get_children(element)[index],varout,cfgout);
- } else {
- if(varout != NULL) {
- *varout = &cfg[key];
- }
- }
-}
-
} //end anonymous namespace
namespace game_events {
-bool unit_matches_filter(const unit& u, const config& filter)
+bool unit_matches_filter(const unit& u, const vconfig filter)
{
- const bool res = u.matches_filter(filter);
+ const bool res = u.matches_filter(filter.get_parsed_config());
if(res == true) {
- const config::child_list& nots = filter.get_children("not");
- for(config::child_list::const_iterator i = nots.begin(); i !=
nots.end(); ++i) {
- if(unit_matches_filter(u,**i)) {
+ const vconfig::child_list& nots = filter.get_children("not");
+ for(vconfig::child_list::const_iterator i = nots.begin(); i !=
nots.end(); ++i) {
+ if(unit_matches_filter(u,*i)) {
return false;
}
}
@@ -1607,13 +1577,13 @@
return res;
}
-bool unit_matches_filter(unit_map::const_iterator itor, const config& filter)
+bool unit_matches_filter(unit_map::const_iterator itor, const vconfig filter)
{
- const bool res = filter_loc(itor->first,filter) &&
itor->second.matches_filter(filter);
+ const bool res = filter_loc(itor->first,filter) &&
itor->second.matches_filter(filter.get_parsed_config());
if(res == true) {
- const config::child_list& nots = filter.get_children("not");
- for(config::child_list::const_iterator i = nots.begin(); i !=
nots.end(); ++i) {
- if(unit_matches_filter(itor,**i)) {
+ const vconfig::child_list& nots = filter.get_children("not");
+ for(vconfig::child_list::const_iterator i = nots.begin(); i !=
nots.end(); ++i) {
+ if(unit_matches_filter(itor,*i)) {
return false;
}
}
@@ -1622,56 +1592,19 @@
return res;
}
-std::string& get_variable(const std::string& key)
-{
- if(state_of_game != NULL) {
- std::string* res = NULL;
- get_variable_internal(key,state_of_game->variables,&res,NULL);
- if(res != NULL) {
- return *res;
- }
- }
-
- static std::string empty_string;
- return empty_string;
-}
-
-const std::string& get_variable_const(const std::string& key)
-{
- return get_variable(key);
-}
-
-config& get_variable_cfg(const std::string& key)
-{
- if(state_of_game != NULL) {
- config* res = NULL;
- get_variable_internal(key +
".",state_of_game->variables,NULL,&res);
- if(res != NULL) {
- return *res;
- }
- }
-
- static config empty_cfg;
- return empty_cfg;
-}
-
-void set_variable(const std::string& key, const std::string& value)
-{
- state_of_game->variables[key] = value;
-}
-
manager::manager(const config& cfg, display& gui_, gamemap& map_,
std::map<gamemap::location,unit>& units_,
std::vector<team>& teams_,
game_state& state_of_game_, gamestatus& status,
- const game_data& game_data_)
+ const game_data& game_data_) :
+ variable_manager(&state_of_game_)
{
const config::child_list& events_list = cfg.get_children("event");
for(config::child_list::const_iterator i = events_list.begin();
i != events_list.end(); ++i) {
- event_handler new_handler(*i);
+ event_handler new_handler(**i);
events_map.insert(std::pair<std::string,event_handler>(
- new_handler.name(),
new_handler));
+ new_handler.name(), new_handler));
}
teams = &teams_;
Index: wesnoth/src/game_events.hpp
diff -u wesnoth/src/game_events.hpp:1.26 wesnoth/src/game_events.hpp:1.27
--- wesnoth/src/game_events.hpp:1.26 Sat Mar 19 10:26:43 2005
+++ wesnoth/src/game_events.hpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.hpp,v 1.26 2005/03/19 10:26:43 gruikya Exp $ */
+/* $Id: game_events.hpp,v 1.27 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,14 +14,19 @@
#define GAME_EVENTS_H_INCLUDED
class config;
+class t_string;
class display;
+
#include "gamestatus.hpp"
#include "map.hpp"
#include "team.hpp"
#include "unit.hpp"
+#include "variable.hpp"
+#include <vector>
#include <map>
+
//this file defines the game's events mechanism. Events might be units
//moving or fighting, or when victory or defeat occurs. A scenario's
//configuration file will define actions to take when certain events
@@ -46,13 +51,15 @@
std::map<gamemap::location,unit>& units,
std::vector<team>& teams,
game_state& state_of_game, gamestatus& status, const
game_data& data);
~manager();
+
+ variable::manager variable_manager;
};
void write_events(config& cfg);
-bool unit_matches_filter(const unit& u, const config& filter);
-bool unit_matches_filter(unit_map::const_iterator itor, const config& filter);
-bool unit_matches_filter(const unit& u, const config& filter);
+bool unit_matches_filter(const unit& u, const vconfig filter);
+bool unit_matches_filter(unit_map::const_iterator itor, const vconfig filter);
+bool unit_matches_filter(const unit& u, const vconfig filter);
//function to fire an event. Events may have up to two arguments, both of
//which must be locations.
@@ -61,7 +68,7 @@
const gamemap::location& loc2=gamemap::location::null_location);
bool conditional_passed(const std::map<gamemap::location,unit>* units,
- const config& cond);
+ const vconfig cond);
bool pump();
}
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.67 wesnoth/src/gamestatus.cpp:1.68
--- wesnoth/src/gamestatus.cpp:1.67 Sat Mar 26 17:24:42 2005
+++ wesnoth/src/gamestatus.cpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.67 2005/03/26 17:24:42 silene Exp $ */
+/* $Id: gamestatus.cpp,v 1.68 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -33,6 +33,10 @@
#include <iterator>
#include <sstream>
+#define LOG_NG lg::info(lg::engine)
+#define WRN_NG lg::warn(lg::engine)
+#define ERR_NG lg::err(lg::engine)
+
player_info* game_state::get_player(const std::string& id) {
std::map< std::string, player_info >::iterator found = players.find(id);
if (found == players.end()) {
@@ -556,7 +560,7 @@
if(has_snapshot) {
out["turn"] = state.snapshot["turn_at"];
if(state.snapshot["turns"] != "-1") {
- out["turn"] += "/" + state.snapshot["turns"];
+ out["turn"] = out["turn"].str() + "/" +
state.snapshot["turns"].str();
}
}
@@ -570,7 +574,7 @@
p!=state.players.end(); ++p) {
for(std::vector<unit>::const_iterator u =
p->second.available_units.begin(); u != p->second.available_units.end(); ++u) {
if(u->can_recruit()) {
- leader = u->type().name();
+ leader = u->type().id();
}
}
}
@@ -615,3 +619,103 @@
}
}
}
+
+namespace {
+const size_t MaxLoop = 1024;
+}
+
+void game_state::get_variable_internal(const std::string& key, config& cfg,
+ t_string** varout, config** cfgout)
+{
+ //we get the variable from the [variables] section of the game state.
Variables may
+ //be in the format
+ const std::string::const_iterator itor =
std::find(key.begin(),key.end(),'.');
+ if(itor != key.end()) {
+ std::string element(key.begin(),itor);
+ const std::string sub_key(itor+1,key.end());
+
+ size_t index = 0;
+ const std::string::iterator index_start =
std::find(element.begin(),element.end(),'[');
+ const bool explicit_index = index_start != element.end();
+
+ if(explicit_index) {
+ const std::string::iterator index_end =
std::find(index_start,element.end(),']');
+ const std::string index_str(index_start+1,index_end);
+ index = size_t(atoi(index_str.c_str()));
+ if(index > MaxLoop) {
+ LOG_NG << "get_variable_internal: index greater
than " << MaxLoop
+ << ", truncated\n";
+ index = MaxLoop;
+ }
+
+ element = std::string(element.begin(),index_start);
+ }
+
+ const config::child_list& items = cfg.get_children(element);
+
+ //special case -- '.length' on an array returns the size of the
array
+ if(explicit_index == false && sub_key == "length") {
+ if(items.empty()) {
+ if(varout != NULL) {
+ static t_string zero_str = "0";
+ *varout = &zero_str;
+ }
+ } else {
+ int size =
minimum<int>(MaxLoop,int(items.size()));
+ (*items.back())["__length"] =
lexical_cast<std::string>(size);
+
+ if(varout != NULL) {
+ *varout = &(*items.back())["__length"];
+ }
+ }
+
+ return;
+ }
+
+ while(cfg.get_children(element).size() <= index) {
+ cfg.add_child(element);
+ }
+
+ if(cfgout != NULL) {
+ *cfgout = cfg.get_children(element)[index];
+ }
+
+
get_variable_internal(sub_key,*cfg.get_children(element)[index],varout,cfgout);
+ } else {
+ if(varout != NULL) {
+ *varout = &cfg[key];
+ }
+ }
+}
+
+t_string& game_state::get_variable(const std::string& key)
+{
+ t_string* res = NULL;
+ get_variable_internal(key, variables, &res, NULL);
+ if(res != NULL) {
+ return *res;
+ }
+
+ static t_string empty_string;
+ return empty_string;
+}
+
+config& game_state::get_variable_cfg(const std::string& key)
+{
+ config* res = NULL;
+ get_variable_internal(key + ".", variables, NULL, &res);
+
+ if(res != NULL) {
+ return *res;
+ }
+
+ static config empty_cfg;
+ return empty_cfg;
+}
+
+void game_state::set_variable(const std::string& key, const t_string& value)
+{
+ variables[key] = value;
+}
+
+
Index: wesnoth/src/gamestatus.hpp
diff -u wesnoth/src/gamestatus.hpp:1.41 wesnoth/src/gamestatus.hpp:1.42
--- wesnoth/src/gamestatus.hpp:1.41 Sat Mar 26 17:24:42 2005
+++ wesnoth/src/gamestatus.hpp Sun Mar 27 23:06:16 2005
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.hpp,v 1.41 2005/03/26 17:24:42 silene Exp $ */
+/* $Id: gamestatus.hpp,v 1.42 2005/03/27 23:06:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -32,7 +32,7 @@
//the image to be displayed in the game status.
std::string image;
- std::string name;
+ t_string name;
std::string id;
//the image that is to be laid over all images while it's this
@@ -93,7 +93,7 @@
//object which holds all the data needed to start a scenario.
//i.e. this is the object serialized to disk when saving/loading a game.
//is also the object which needs to be created to start a new game
-struct game_state
+struct game_state : public variable_set
{
game_state() : difficulty("NORMAL") {}
std::string label; //name of the game (e.g. name of save file)
@@ -114,6 +114,12 @@
player_info* get_player(const std::string& id);
config variables; //variables that have been set
+
+ //Variable access
+ virtual t_string& get_variable(const std::string& varname);
+ config& get_variable_cfg(const std::string& varname);
+ void set_variable(const std::string& varname, const t_string& value);
+
std::string difficulty; //the difficulty level the game is being played
on.
//if the game is saved mid-level, we have a series of replay steps to
@@ -131,6 +137,10 @@
//the snapshot of the game's current contents. i.e. unless the player
selects
//to view a replay, the game's settings are read in from this object
config snapshot;
+
+private:
+ void get_variable_internal(const std::string& key, config& cfg,
+ t_string** varout, config** cfgout);
};
struct save_info {
Index: wesnoth/src/gettext.cpp
diff -u wesnoth/src/gettext.cpp:1.8 wesnoth/src/gettext.cpp:1.9
--- wesnoth/src/gettext.cpp:1.8 Sun Feb 20 21:45:21 2005
+++ wesnoth/src/gettext.cpp Sun Mar 27 23:06:17 2005
@@ -36,7 +36,7 @@
return msgval;
}
-std::string vgettext (const char *msgid, const string_map& symbols)
+std::string vgettext (const char *msgid, const utils::string_map& symbols)
{
const std::string orig(gettext(msgid));
const std::string msg = utils::interpolate_variables_into_string(orig,
&symbols);
Index: wesnoth/src/gettext.hpp
diff -u wesnoth/src/gettext.hpp:1.6 wesnoth/src/gettext.hpp:1.7
--- wesnoth/src/gettext.hpp:1.6 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/gettext.hpp Sun Mar 27 23:06:17 2005
@@ -4,14 +4,15 @@
// gettext-related declarations
#include "config.hpp"
+#include "serialization/string_utils.hpp"
#include <libintl.h>
#include <string>
-const char* egettext (const char*);
-const char* sgettext (const char*);
-const char* dsgettext (const char * domainname, const char *msgid);
-std::string vgettext (const char*,const string_map&);
+const char* egettext(const char*);
+const char* sgettext(const char*);
+const char* dsgettext(const char * domainname, const char *msgid);
+std::string vgettext(const char*, const utils::string_map&);
#ifdef GETTEXT_DOMAIN
# define _(String) dgettext(GETTEXT_DOMAIN,String)
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.84 wesnoth/src/help.cpp:1.85
--- wesnoth/src/help.cpp:1.84 Sat Mar 26 14:07:16 2005
+++ wesnoth/src/help.cpp Sun Mar 27 23:06:17 2005
@@ -57,7 +57,8 @@
typedef std::vector<section *> section_list;
/// Generate a topic text on the fly.
-class topic_generator {
+class topic_generator
+{
unsigned count;
friend class topic_text;
public:
@@ -75,7 +76,8 @@
/// The text displayed in a topic. It is generated on the fly with the
information
/// contained in generator_.
-class topic_text {
+class topic_text
+{
mutable std::vector< std::string > parsed_text_;
mutable topic_generator *generator_;
public:
@@ -89,7 +91,8 @@
};
/// A topic contains a title, an id and some text.
-struct topic {
+struct topic
+{
topic() {}
topic(const std::string &_title, const std::string &_id)
: title(_title), id(_id) {}
@@ -133,7 +136,8 @@
/// To be used as a function object to locate sections and topics
/// with a specified ID.
-class has_id {
+class has_id
+{
public:
has_id(const std::string &id) : id_(id) {}
bool operator()(const topic &t) { return t.id == id_; }
@@ -144,23 +148,27 @@
};
/// To be used as a function object when sorting topic lists on the title.
-class title_less {
+class title_less
+{
public:
bool operator()(const topic &t1, const topic &t2) { return t1.title <
t2.title; }
};
-struct delete_section {
+struct delete_section
+{
void operator()(section *s) { delete s; }
};
-struct create_section {
+struct create_section
+{
section *operator()(const section *s) { return new section(*s); }
section *operator()(const section &s) { return new section(s); }
};
/// The menu to the left in the help browser, where topics can be
/// navigated through and chosen.
-class help_menu : public gui::menu {
+class help_menu : public gui::menu
+{
public:
help_menu(CVideo &video, const section &toplevel, int max_height=-1);
int process();
@@ -228,13 +236,15 @@
};
/// Thrown when the help system fails to parse something.
-struct parse_error {
+struct parse_error
+{
parse_error(const std::string& msg) : message(msg) {}
std::string message;
};
/// The area where the content is shown in the help browser.
-class help_text_area : public gui::scrollarea {
+class help_text_area : public gui::scrollarea
+{
public:
help_text_area(CVideo &video, const section &toplevel);
/// Display the topic.
@@ -367,7 +377,8 @@
};
/// A help browser widget.
-class help_browser : public gui::widget {
+class help_browser : public gui::widget
+{
public:
help_browser(display &disp, const section &toplevel);
@@ -576,19 +587,22 @@
};
// Helpers for making generation of topics easier.
- std::string jump_to(const unsigned pos) {
+ std::string jump_to(const unsigned pos)
+ {
std::stringstream ss;
ss << "<jump>to=" << pos << "</jump>";
return ss.str();
}
- std::string jump(const unsigned amount) {
+ std::string jump(const unsigned amount)
+ {
std::stringstream ss;
ss << "<jump>amount=" << amount << "</jump>";
return ss.str();
}
- std::string bold(const std::string &s) {
+ std::string bold(const std::string &s)
+ {
std::stringstream ss;
ss << "<bold>text='" << help::escape(s) << "'</bold>";
return ss.str();
@@ -599,7 +613,8 @@
// that create a table. The table spec contains a vector with
// vectors with pairs. The pairs are the markup string that should
// be in a cell, and the width of that cell.
- std::string generate_table(const table_spec &tab, const unsigned int
spacing=font::relative_size(20)) {
+ std::string generate_table(const table_spec &tab, const unsigned int
spacing=font::relative_size(20))
+ {
table_spec::const_iterator row_it;
std::vector<std::pair<std::string, unsigned> >::const_iterator
col_it;
unsigned int num_cols = 0;
@@ -641,7 +656,8 @@
}
// Return the width for the image with filename.
- unsigned image_width(const std::string &filename) {
+ unsigned image_width(const std::string &filename)
+ {
image::locator loc(filename);
surface surf(image::get_image(loc, image::UNSCALED));
if (surf != NULL) {
@@ -650,20 +666,23 @@
return 0;
}
- void push_tab_pair(std::vector<std::pair<std::string, unsigned int> >
&v, const std::string &s) {
+ void push_tab_pair(std::vector<std::pair<std::string, unsigned int> >
&v, const std::string &s)
+ {
v.push_back(std::make_pair(s, font::line_width(s,
normal_font_size)));
}
}
namespace help {
-help_manager::help_manager(const config *cfg, const game_data *gameinfo,
gamemap *_map) {
+help_manager::help_manager(const config *cfg, const game_data *gameinfo,
gamemap *_map)
+{
game_cfg = cfg == NULL ? &dummy_cfg : cfg;
game_info = gameinfo;
map = _map;
}
-void generate_contents() {
+void generate_contents()
+{
toplevel.clear();
hidden_sections.clear();
if (game_cfg != NULL) {
@@ -726,7 +745,8 @@
}
}
-help_manager::~help_manager() {
+help_manager::~help_manager()
+{
game_cfg = NULL;
game_info = NULL;
map = NULL;
@@ -738,7 +758,8 @@
last_num_encountered_terrains = -1;
}
-bool section_is_referenced(const std::string §ion_id, const config &cfg) {
+bool section_is_referenced(const std::string §ion_id, const config &cfg)
+{
const config *toplevel = cfg.child("toplevel");
if (toplevel != NULL) {
const std::vector<std::string> toplevel_refs
@@ -760,7 +781,8 @@
return false;
}
-bool topic_is_referenced(const std::string &topic_id, const config &cfg) {
+bool topic_is_referenced(const std::string &topic_id, const config &cfg)
+{
const config *toplevel = cfg.child("toplevel");
if (toplevel != NULL) {
const std::vector<std::string> toplevel_refs
@@ -783,7 +805,8 @@
}
void parse_config_internal(const config *help_cfg, const config *section_cfg,
- section &sec, int level) {
+ section &sec, int level)
+{
if (level > max_section_level) {
std::cerr << "Maximum section depth has been reached. Maybe
circular dependency?"
<< std::endl;
@@ -850,7 +873,8 @@
}
}
-section parse_config(const config *cfg) {
+section parse_config(const config *cfg)
+{
section sec;
if (cfg != NULL) {
config const *toplevel_cfg = cfg->child("toplevel");
@@ -860,7 +884,8 @@
}
-std::vector<section> generate_sections(const std::string &generator) {
+std::vector<section> generate_sections(const std::string &generator)
+{
std::vector<section> empty_vec;
if (generator == "") {
return empty_vec;
@@ -868,7 +893,8 @@
return empty_vec;
}
-std::vector<topic> generate_topics(const std::string &generator) {
+std::vector<topic> generate_topics(const std::string &generator)
+{
std::vector<topic> res;
if (generator == "units") {
res = generate_unit_topics();
@@ -886,7 +912,8 @@
return res;
}
-std::string generate_topic_text(const std::string &generator) {
+std::string generate_topic_text(const std::string &generator)
+{
std::string empty_string = "";
if (generator == "") {
return empty_string;
@@ -901,24 +928,28 @@
return empty_string;
}
-topic_text::~topic_text() {
+topic_text::~topic_text()
+{
if (generator_ && --generator_->count == 0)
delete generator_;
}
-topic_text::topic_text(topic_text const &t): parsed_text_(t.parsed_text_),
generator_(t.generator_) {
+topic_text::topic_text(topic_text const &t): parsed_text_(t.parsed_text_),
generator_(t.generator_)
+{
if (generator_)
++generator_->count;
}
-topic_text &topic_text::operator=(topic_generator *g) {
+topic_text &topic_text::operator=(topic_generator *g)
+{
if (generator_ && --generator_->count == 0)
delete generator_;
generator_ = g;
return *this;
}
-topic_text::operator std::vector< std::string > const &() const {
+topic_text::operator std::vector< std::string > const &() const
+{
if (generator_) {
parsed_text_ = parse_text((*generator_)());
if (--generator_->count == 0)
@@ -928,7 +959,8 @@
return parsed_text_;
}
-std::vector<topic> generate_weapon_special_topics() {
+std::vector<topic> generate_weapon_special_topics()
+{
std::vector<topic> topics;
if (game_info == NULL) {
return topics;
@@ -966,7 +998,8 @@
return topics;
}
-std::vector<topic> generate_ability_topics() {
+std::vector<topic> generate_ability_topics()
+{
std::vector<topic> topics;
if (game_info == NULL) {
return topics;
@@ -1246,7 +1279,8 @@
}
};
-std::vector<topic> generate_unit_topics() {
+std::vector<topic> generate_unit_topics()
+{
std::vector<topic> topics;
if (game_info == NULL) {
return topics;
@@ -1272,8 +1306,9 @@
return topics;
}
-UNIT_DESCRIPTION_TYPE description_type(const unit_type &type) {
- const std::string id = type.name();
+UNIT_DESCRIPTION_TYPE description_type(const unit_type &type)
+{
+ const std::string id = type.id();
const std::set<std::string> &encountered_units =
preferences::encountered_units();
if (game_config::debug) {
return FULL_DESCRIPTION;
@@ -1305,7 +1340,7 @@
else if (it + 1 != aliased_terrains.end())
alias_ss << ", ";
}
- string_map sm;
+ utils::string_map sm;
sm["terrains"] = alias_ss.str();
ss << utils::interpolate_variables_into_string(
_("This terrain acts as $terrains for movement
and defense purposes."), &sm);
@@ -1323,7 +1358,8 @@
}
};
-std::vector<topic> generate_terrains_topics() {
+std::vector<topic> generate_terrains_topics()
+{
std::vector<topic> res;
std::vector<gamemap::TERRAIN> show_info_about;
if (game_config::debug) {
@@ -1353,7 +1389,8 @@
return res;
}
-std::string generate_traits_text() {
+std::string generate_traits_text()
+{
// Ok, this didn't go as well as I thought since the information
// generated from this is rather short and not suitable for the help
// system. Hence, this method is not used currently :).
@@ -1385,7 +1422,8 @@
}
-std::string generate_about_text() {
+std::string generate_about_text()
+{
std::vector<std::string> about_lines = about::get_text();
std::vector<std::string> res_lines;
std::transform(about_lines.begin(), about_lines.end(),
std::back_inserter(res_lines),
@@ -1397,33 +1435,39 @@
return text;
}
-bool topic::operator==(const topic &t) const {
+bool topic::operator==(const topic &t) const
+{
return t.id == id;
}
-bool topic::operator<(const topic &t) const {
+bool topic::operator<(const topic &t) const
+{
return id < t.id;
}
section::section(const std::string &_title, const std::string &_id, const
topic_list &_topics,
const std::vector<section> &_sections)
- : title(_title), id(_id), topics(_topics) {
+ : title(_title), id(_id), topics(_topics)
+{
std::transform(_sections.begin(), _sections.end(),
std::back_inserter(sections),
create_section());
}
-section::~section() {
+section::~section()
+{
std::for_each(sections.begin(), sections.end(), delete_section());
}
section::section(const section &sec)
- : title(sec.title), id(sec.id), topics(sec.topics) {
+ : title(sec.title), id(sec.id), topics(sec.topics)
+{
std::transform(sec.sections.begin(), sec.sections.end(),
std::back_inserter(sections),
create_section());
}
-section& section::operator=(const section &sec) {
+section& section::operator=(const section &sec)
+{
title = sec.title;
id = sec.id;
std::copy(sec.topics.begin(), sec.topics.end(),
std::back_inserter(topics));
@@ -1433,19 +1477,23 @@
}
-bool section::operator==(const section &sec) const {
+bool section::operator==(const section &sec) const
+{
return sec.id == id;
}
-bool section::operator<(const section &sec) const {
+bool section::operator<(const section &sec) const
+{
return id < sec.id;
}
-void section::add_section(const section &s) {
+void section::add_section(const section &s)
+{
sections.push_back(new section(s));
}
-void section::clear() {
+void section::clear()
+{
topics.clear();
std::for_each(sections.begin(), sections.end(), delete_section());
sections.clear();
@@ -1453,28 +1501,33 @@
help_menu::help_menu(CVideo &video, section const &toplevel, int max_height)
: gui::menu(video, empty_string_vector, false, max_height),
- toplevel_(toplevel), chosen_topic_(NULL), selected_item_(&toplevel,
"") {
+ toplevel_(toplevel), chosen_topic_(NULL), selected_item_(&toplevel,
"")
+{
update_visible_items(toplevel_);
display_visible_items();
if (!visible_items_.empty())
selected_item_ = visible_items_.front();
}
-bool help_menu::expanded(const section &sec) {
+bool help_menu::expanded(const section &sec)
+{
return expanded_.find(&sec) != expanded_.end();
}
-void help_menu::expand(const section &sec) {
+void help_menu::expand(const section &sec)
+{
if (sec.id != "toplevel") {
expanded_.insert(&sec);
}
}
-void help_menu::contract(const section &sec) {
+void help_menu::contract(const section &sec)
+{
expanded_.erase(&sec);
}
-void help_menu::update_visible_items(const section &sec, unsigned level) {
+void help_menu::update_visible_items(const section &sec, unsigned level)
+{
if (level == 0) {
// Clear if this is the top level, otherwise append items.
visible_items_.clear();
@@ -1495,7 +1548,8 @@
}
-std::string help_menu::get_string_to_show(const section &sec, const unsigned
level) {
+std::string help_menu::get_string_to_show(const section &sec, const unsigned
level)
+{
std::stringstream to_show;
std::string pad_string;
// Indentation is represented as three spaces per level.
@@ -1511,7 +1565,8 @@
return to_show.str();
}
-std::string help_menu::get_string_to_show(const topic &topic, const unsigned
level) {
+std::string help_menu::get_string_to_show(const topic &topic, const unsigned
level)
+{
std::string pad_string;
pad_string.resize(level * 3, ' ');
std::stringstream to_show;
@@ -1520,7 +1575,8 @@
return to_show.str();
}
-bool help_menu::select_topic_internal(const topic &t, const section &sec) {
+bool help_menu::select_topic_internal(const topic &t, const section &sec)
+{
topic_list::const_iterator tit =
std::find(sec.topics.begin(), sec.topics.end(), t);
if (tit != sec.topics.end()) {
@@ -1537,7 +1593,8 @@
return false;
}
-void help_menu::select_topic(const topic &t) {
+void help_menu::select_topic(const topic &t)
+{
if (selected_item_ == t) {
// The requested topic is already selected.
return;
@@ -1554,8 +1611,9 @@
display_visible_items();
}
}
-
-int help_menu::process() {
+
+int help_menu::process()
+{
int res = menu::process();
if (double_clicked())
res = selection();
@@ -1574,13 +1632,15 @@
return res;
}
-const topic *help_menu::chosen_topic() {
+const topic *help_menu::chosen_topic()
+{
const topic *ret = chosen_topic_;
chosen_topic_ = NULL;
return ret;
}
-void help_menu::display_visible_items() {
+void help_menu::display_visible_items()
+{
std::vector<std::string> menu_items;
for(std::vector<visible_item>::const_iterator items_it =
visible_items_.begin(),
end = visible_items_.end(); items_it != end; ++items_it) {
@@ -1598,15 +1658,18 @@
help_menu::visible_item::visible_item(const topic *_t, const std::string
&vis_string) :
t(_t), sec(NULL), visible_string(vis_string) {}
-bool help_menu::visible_item::operator==(const section &_sec) const {
+bool help_menu::visible_item::operator==(const section &_sec) const
+{
return sec != NULL && *sec == _sec;
}
-bool help_menu::visible_item::operator==(const topic &_t) const {
+bool help_menu::visible_item::operator==(const topic &_t) const
+{
return t != NULL && *t == _t;
}
-bool help_menu::visible_item::operator==(const visible_item &vis_item) const {
+bool help_menu::visible_item::operator==(const visible_item &vis_item) const
+{
return t == vis_item.t && sec == vis_item.sec;
}
@@ -1619,13 +1682,15 @@
set_scroll_rate(40);
}
-void help_text_area::set_inner_location(SDL_Rect const &rect) {
+void help_text_area::set_inner_location(SDL_Rect const &rect)
+{
bg_register(rect);
if (shown_topic_)
set_items();
}
-void help_text_area::show_topic(const topic &t) {
+void help_text_area::show_topic(const topic &t)
+{
shown_topic_ = &t;
set_items();
set_dirty(true);
@@ -1636,7 +1701,8 @@
const std::string
reference_to, bool _floating,
bool _box, ALIGNMENT
alignment)
: surf(surface), text(_text), ref_to(reference_to),
floating(_floating), box(_box),
- align(alignment) {
+ align(alignment)
+{
rect.x = x;
rect.y = y;
rect.w = box ? surface->w + box_width * 2 : surface->w;
@@ -1645,14 +1711,16 @@
help_text_area::item::item(surface surface, int x, int y, bool _floating,
bool _box, ALIGNMENT
alignment)
- : surf(surface), text(""), ref_to(""), floating(_floating), box(_box),
align(alignment) {
+ : surf(surface), text(""), ref_to(""), floating(_floating), box(_box),
align(alignment)
+{
rect.x = x;
rect.y = y;
rect.w = box ? surface->w + box_width * 2 : surface->w;
rect.h = box ? surface->h + box_width * 2 : surface->h;
}
-void help_text_area::set_items() {
+void help_text_area::set_items()
+{
last_row_.clear();
items_.clear();
curr_loc_.first = 0;
@@ -1725,7 +1793,8 @@
set_shown_size(h);
}
-void help_text_area::handle_ref_cfg(const config &cfg) {
+void help_text_area::handle_ref_cfg(const config &cfg)
+{
const std::string dst = cfg["dst"];
const std::string text = cfg["text"];
const bool force = get_bool(cfg["force"]);
@@ -1756,7 +1825,8 @@
}
}
-void help_text_area::handle_img_cfg(const config &cfg) {
+void help_text_area::handle_img_cfg(const config &cfg)
+{
const std::string src = cfg["src"];
const std::string align = cfg["align"];
const bool floating = get_bool(cfg["float"]);
@@ -1770,7 +1840,8 @@
add_img_item(src, align, floating, box);
}
-void help_text_area::handle_bold_cfg(const config &cfg) {
+void help_text_area::handle_bold_cfg(const config &cfg)
+{
const std::string text = cfg["text"];
if (text == "") {
throw parse_error("Bold markup must have text attribute.");
@@ -1778,7 +1849,8 @@
add_text_item(text, "", -1, true);
}
-void help_text_area::handle_italic_cfg(const config &cfg) {
+void help_text_area::handle_italic_cfg(const config &cfg)
+{
const std::string text = cfg["text"];
if (text == "") {
throw parse_error("Italic markup must have text attribute.");
@@ -1786,7 +1858,8 @@
add_text_item(text, "", -1, false, true);
}
-void help_text_area::handle_header_cfg(const config &cfg) {
+void help_text_area::handle_header_cfg(const config &cfg)
+{
const std::string text = cfg["text"];
if (text == "") {
throw parse_error("Header markup must have text attribute.");
@@ -1794,7 +1867,8 @@
add_text_item(text, "", title2_size, true);
}
-void help_text_area::handle_jump_cfg(const config &cfg) {
+void help_text_area::handle_jump_cfg(const config &cfg)
+{
const std::string amount_str = cfg["amount"];
const std::string to_str = cfg["to"];
if (amount_str == "" && to_str == "") {
@@ -1829,7 +1903,8 @@
}
}
-void help_text_area::handle_format_cfg(const config &cfg) {
+void help_text_area::handle_format_cfg(const config &cfg)
+{
const std::string text = cfg["text"];
if (text == "") {
throw parse_error("Format markup must have text attribute.");
@@ -1850,7 +1925,8 @@
void help_text_area::add_text_item(const std::string text, const std::string
ref_dst,
int
_font_size, bool bold, bool italic,
- SDL_Color
text_color) {
+ SDL_Color
text_color)
+{
const int font_size = _font_size < 0 ? normal_font_size : _font_size;
if (text.empty())
return;
@@ -1920,7 +1996,8 @@
}
void help_text_area::add_img_item(const std::string path, const std::string
alignment,
- const bool
floating, const bool box) {
+ const bool
floating, const bool box)
+{
surface surf(image::get_image(path, image::UNSCALED));
if (surf == NULL) {
std::stringstream msg;
@@ -1968,7 +2045,8 @@
}
}
-int help_text_area::get_y_for_floating_img(const int width, const int x, const
int desired_y) {
+int help_text_area::get_y_for_floating_img(const int width, const int x, const
int desired_y)
+{
int min_y = desired_y;
for (std::list<item>::const_iterator it = items_.begin(); it !=
items_.end(); it++) {
const item& itm = *it;
@@ -1982,7 +2060,8 @@
return min_y;
}
-int help_text_area::get_min_x(const int y, const int height) {
+int help_text_area::get_min_x(const int y, const int height)
+{
int min_x = 0;
for (std::list<item>::const_iterator it = items_.begin(); it !=
items_.end(); it++) {
const item& itm = *it;
@@ -1995,7 +2074,8 @@
return min_x;
}
-int help_text_area::get_max_x(const int y, const int height) {
+int help_text_area::get_max_x(const int y, const int height)
+{
int text_width = inner_location().w;
int max_x = text_width;
for (std::list<item>::const_iterator it = items_.begin(); it !=
items_.end(); it++) {
@@ -2013,7 +2093,8 @@
return max_x;
}
-void help_text_area::add_item(const item &itm) {
+void help_text_area::add_item(const item &itm)
+{
items_.push_back(itm);
if (!itm.floating) {
curr_loc_.first += itm.rect.w;
@@ -2030,7 +2111,8 @@
}
-help_text_area::ALIGNMENT help_text_area::str_to_align(const std::string &s) {
+help_text_area::ALIGNMENT help_text_area::str_to_align(const std::string &s)
+{
const std::string cmp_str = to_lower(s);
if (cmp_str == "left") {
return LEFT;
@@ -2046,7 +2128,8 @@
throw parse_error(msg.str());
}
-void help_text_area::down_one_line() {
+void help_text_area::down_one_line()
+{
adjust_last_row();
last_row_.clear();
curr_loc_.second += curr_row_height_ + (curr_row_height_ ==
min_row_height_ ? 0 : 2);
@@ -2055,7 +2138,8 @@
curr_loc_.first = get_min_x(curr_loc_.second, curr_row_height_);
}
-void help_text_area::adjust_last_row() {
+void help_text_area::adjust_last_row()
+{
for (std::list<item *>::iterator it = last_row_.begin(); it !=
last_row_.end(); it++) {
item &itm = *(*it);
const int gap = curr_row_height_ - itm.rect.h;
@@ -2063,12 +2147,14 @@
}
}
-int help_text_area::get_remaining_width() {
+int help_text_area::get_remaining_width()
+{
const int total_w = (int)get_max_x(curr_loc_.second, curr_row_height_);
return total_w - curr_loc_.first;
}
-void help_text_area::draw_contents() {
+void help_text_area::draw_contents()
+{
SDL_Rect const &loc = inner_location();
bg_restore();
surface const screen = video().getSurface();
@@ -2093,7 +2179,8 @@
update_rect(loc);
}
-void help_text_area::scroll(int) {
+void help_text_area::scroll(int)
+{
// Nothing will be done on the actual scroll event. The scroll
// position is checked when drawing instead and things drawn
// accordingly.
@@ -2104,7 +2191,8 @@
return point_in_rect(x_, y_, item.rect);
}
-std::string help_text_area::ref_at(const int x, const int y) {
+std::string help_text_area::ref_at(const int x, const int y)
+{
const int local_x = x - location().x;
const int local_y = y - location().y;
if (local_y < (int)height() && local_y > 0) {
@@ -2127,7 +2215,8 @@
text_area_(disp.video(), toplevel), toplevel_(toplevel),
ref_cursor_(false),
back_button_(disp.video(), _("< Back"), gui::button::TYPE_PRESS),
forward_button_(disp.video(), _("Forward >"),
gui::button::TYPE_PRESS),
- shown_topic_(NULL) {
+ shown_topic_(NULL)
+{
// Hide the buttons at first since we do not have any forward or
// back topics at this point. They will be unhidden when history
// appears.
@@ -2137,7 +2226,8 @@
set_measurements(font::relative_size(400), font::relative_size(500));
}
-void help_browser::adjust_layout() {
+void help_browser::adjust_layout()
+{
const int menu_buttons_padding = font::relative_size(10);
const int menu_y = location().y;
const int menu_x = location().x;
@@ -2172,11 +2262,13 @@
set_dirty(true);
}
-void help_browser::update_location(SDL_Rect const &) {
+void help_browser::update_location(SDL_Rect const &)
+{
adjust_layout();
}
-void help_browser::process_event() {
+void help_browser::process_event()
+{
CKey key;
int mousex, mousey;
SDL_GetMouseState(&mousex,&mousey);
@@ -2201,7 +2293,8 @@
}
void help_browser::move_in_history(std::deque<const topic *> &from,
-
std::deque<const topic *> &to) {
+ std::deque<const topic *> &to)
+{
if (!from.empty()) {
const topic *to_show = from.back();
from.pop_back();
@@ -2216,7 +2309,8 @@
}
-void help_browser::handle_event(const SDL_Event &event) {
+void help_browser::handle_event(const SDL_Event &event)
+{
SDL_MouseButtonEvent mouse_event = event.button;
if (event.type == SDL_MOUSEBUTTONDOWN) {
if (mouse_event.button == SDL_BUTTON_LEFT) {
@@ -2244,7 +2338,8 @@
}
}
-void help_browser::update_cursor() {
+void help_browser::update_cursor()
+{
int mousex, mousey;
SDL_GetMouseState(&mousex,&mousey);
const std::string ref = text_area_.ref_at(mousex, mousey);
@@ -2259,7 +2354,8 @@
}
-const topic *find_topic(const section &sec, const std::string &id) {
+const topic *find_topic(const section &sec, const std::string &id)
+{
topic_list::const_iterator tit =
std::find_if(sec.topics.begin(), sec.topics.end(), has_id(id));
if (tit != sec.topics.end()) {
@@ -2275,7 +2371,8 @@
return NULL;
}
-const section *find_section(const section &sec, const std::string &id) {
+const section *find_section(const section &sec, const std::string &id)
+{
section_list::const_iterator sit =
std::find_if(sec.sections.begin(), sec.sections.end(),
has_id(id));
if (sit != sec.sections.end()) {
@@ -2290,7 +2387,8 @@
return NULL;
}
-void help_browser::show_topic(const std::string &topic_id) {
+void help_browser::show_topic(const std::string &topic_id)
+{
std::cerr << "showing topic '" << topic_id << "'\n";
const topic *t = find_topic(toplevel_, topic_id);
if (t != NULL) {
@@ -2302,7 +2400,8 @@
}
}
-void help_browser::show_topic(const topic &t, bool save_in_history) {
+void help_browser::show_topic(const topic &t, bool save_in_history)
+{
if (save_in_history) {
forward_topics_.clear();
if (shown_topic_ != NULL) {
@@ -2318,7 +2417,8 @@
update_cursor();
}
-std::vector<std::string> parse_text(const std::string &text) {
+std::vector<std::string> parse_text(const std::string &text)
+{
std::vector<std::string> res;
bool last_char_escape = false;
const char escape_char = '\\';
@@ -2390,7 +2490,8 @@
return res;
}
-std::string convert_to_wml(const std::string &element_name, const std::string
&contents) {
+std::string convert_to_wml(const std::string &element_name, const std::string
&contents)
+{
std::stringstream ss;
bool in_quotes = false;
bool last_char_escape = false;
@@ -2439,7 +2540,8 @@
return ss.str();
}
-bool get_bool(const std::string &s) {
+bool get_bool(const std::string &s)
+{
const std::string cmp_str = to_lower(s);
if (cmp_str == "yes" || cmp_str == "true" || cmp_str == "1" || cmp_str
== "on") {
return true;
@@ -2447,7 +2549,8 @@
return false;
}
-SDL_Color string_to_color(const std::string &s) {
+SDL_Color string_to_color(const std::string &s)
+{
const std::string cmp_str = to_lower(s);
if (cmp_str == "green") {
return font::GOOD_COLOUR;
@@ -2465,27 +2568,31 @@
}
std::vector<std::string> split_in_width(const std::string &s, const int
font_size,
-
const unsigned width) {
+ const unsigned width)
+{
std::string wrapped = font::word_wrap_text(s, font_size, width);
std::vector<std::string> parts = utils::split(wrapped, '\n', 0);
return parts;
}
-std::string remove_first_space(const std::string& text) {
- if (text.length() > 0 && text[0] == ' ') {
- return text.substr(1);
- }
- return text;
+std::string remove_first_space(const std::string& text)
+{
+ if (text.length() > 0 && text[0] == ' ') {
+ return text.substr(1);
+ }
+ return text;
}
-std::string to_lower(const std::string &s) {
+std::string to_lower(const std::string &s)
+{
std::string lower_string;
lower_string.resize(s.size());
std::transform(s.begin(), s.end(), lower_string.begin(), tolower);
return lower_string;
}
-std::string cap(const std::string &s) {
+std::string cap(const std::string &s)
+{
if (s.size() > 0) {
utils::utf8_iterator itor(s);
std::string res = utils::wchar_to_string(towupper(*itor));
@@ -2495,7 +2602,8 @@
return s;
}
-std::string escape(const std::string &s) {
+std::string escape(const std::string &s)
+{
std::string res = s;
if(!res.empty()) {
std::string::size_type pos = 0;
@@ -2510,7 +2618,8 @@
return res;
}
-std::string get_first_word(const std::string &s) {
+std::string get_first_word(const std::string &s)
+{
if (s == "") {
return s;
}
@@ -2529,13 +2638,15 @@
return first_word;
}
-void show_help(display &disp, std::string show_topic, int xloc, int yloc) {
+void show_help(display &disp, std::string show_topic, int xloc, int yloc)
+{
show_help(disp, toplevel, show_topic, xloc, yloc);
}
void show_help(display &disp, const std::vector<std::string> &topics_to_show,
const std::vector<std::string> §ions_to_show,
const std::string show_topic,
- int xloc, int yloc) {
+ int xloc, int yloc)
+{
section to_show;
std::vector<std::string>::const_iterator it;
for (it = topics_to_show.begin(); it != topics_to_show.end(); it++) {
@@ -2564,7 +2675,8 @@
/// Open a help dialog using a toplevel other than the default.
void show_help(display &disp, const section &toplevel_sec, const std::string
show_topic,
- int xloc, int yloc) {
+ int xloc, int yloc)
+{
const events::event_context dialog_events_context;
const gui::dialog_manager manager;
const events::resize_lock prevent_resizing;
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.74 wesnoth/src/intro.cpp:1.75
--- wesnoth/src/intro.cpp:1.74 Thu Mar 24 21:35:52 2005
+++ wesnoth/src/intro.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.74 2005/03/24 21:35:52 ydirson Exp $ */
+/* $Id: intro.cpp,v 1.75 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -59,7 +59,7 @@
showing = show_intro_part(disp, (*item.second),
scenario);
} else if(*item.first == "if") {
const std::string type =
game_events::conditional_passed(
- NULL, *item.second) ? "then":"else";
+ NULL, item.second) ? "then":"else";
const config* const thens = (*item.second).child(type);
if(thens == NULL) {
std::cerr << "no intro story this way...\n";
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.80 wesnoth/src/language.cpp:1.81
--- wesnoth/src/language.cpp:1.80 Fri Mar 25 18:19:20 2005
+++ wesnoth/src/language.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.80 2005/03/25 18:19:20 silene Exp $ */
+/* $Id: language.cpp,v 1.81 2005/03/27 23:06:17 gruikya Exp $ */
/* vim:set encoding=utf-8: */
/*
Copyright (C) 2003 by David White <address@hidden>
@@ -84,13 +84,13 @@
symbol_table string_table;
-const std::string& symbol_table::operator[](const std::string& key) const
+const t_string& symbol_table::operator[](const std::string& key) const
{
const string_map::const_iterator i = strings_.find(key);
if(i != strings_.end()) {
return i->second;
} else {
- static std::string empty_string;
+ static t_string empty_string;
// Let's do it the painful way (untlb means untranslatABLE).
// It will cause problem if somebody stores more than one
reference at once
// but I don't really care since this path is an error path and
it should
@@ -100,7 +100,7 @@
}
}
-const std::string& symbol_table::operator[](const char* key) const
+const t_string& symbol_table::operator[](const char* key) const
{
return (*this)[std::string(key)];
}
Index: wesnoth/src/language.hpp
diff -u wesnoth/src/language.hpp:1.33 wesnoth/src/language.hpp:1.34
--- wesnoth/src/language.hpp:1.33 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/language.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: language.hpp,v 1.33 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: language.hpp,v 1.34 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -20,6 +20,8 @@
//this module controls internationalization.
+class t_string;
+
struct language_def
{
language_def() {}
@@ -35,8 +37,8 @@
struct symbol_table
{
- const std::string& operator[](const std::string& key) const;
- const std::string& operator[](const char* key) const;
+ const t_string& operator[](const std::string& key) const;
+ const t_string& operator[](const char* key) const;
};
//table of strings which are displayed to the user. Maps ids -> text.
Index: wesnoth/src/map.hpp
diff -u wesnoth/src/map.hpp:1.35 wesnoth/src/map.hpp:1.36
--- wesnoth/src/map.hpp:1.35 Sat Mar 19 21:04:46 2005
+++ wesnoth/src/map.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: map.hpp,v 1.35 2005/03/19 21:04:46 gruikya Exp $ */
+/* $Id: map.hpp,v 1.36 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,6 +15,7 @@
#define MAP_H_INCLUDED
class config;
+class vconfig;
#include "terrain.hpp"
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.60 wesnoth/src/mapgen.cpp:1.61
--- wesnoth/src/mapgen.cpp:1.60 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/mapgen.cpp Sun Mar 27 23:06:17 2005
@@ -490,10 +490,11 @@
return best_loc;
}
-std::string generate_name(const unit_race& name_generator, const std::string&
id, std::string* base_name=NULL,
-
std::map<std::string,std::string>* additional_symbols=NULL)
+std::string generate_name(const unit_race& name_generator, const std::string&
id,
+ std::string* base_name=NULL,
+ utils::string_map* additional_symbols=NULL)
{
- const std::vector<std::string>& options =
utils::split(string_table[id]);
+ const std::vector<std::string>& options =
utils::split(string_table[id].str());
if(options.empty() == false) {
const size_t choice = rand()%options.size();
LOG_NG << "calling name generator...\n";
@@ -504,7 +505,7 @@
}
LOG_NG << "assigned base name..\n";
- std::map<std::string,std::string> table;
+ utils::string_map table;
if(additional_symbols == NULL) {
additional_symbols = &table;
}
@@ -1094,7 +1095,7 @@
size_t
field_count = 0, forest_count = 0, mountain_count = 0, hill_count = 0;
-
std::map<std::string,std::string> symbols;
+
utils::string_map symbols;
size_t n;
for(n = 0; n !=
6; ++n) {
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.135
wesnoth/src/multiplayer_connect.cpp:1.136
--- wesnoth/src/multiplayer_connect.cpp:1.135 Sat Mar 26 17:31:33 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.135 2005/03/26 17:31:33 silene Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.136 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -299,13 +299,13 @@
break;
case CNTR_LOCAL:
if(enabled_ && cfg_["save_id"].empty()) {
- res["save_id"] = "local" + res["side"];
+ res["save_id"] = "local" + res["side"].str();
}
res["user_description"] = _("Anonymous local player");
break;
case CNTR_COMPUTER:
if(enabled_ && cfg_["save_id"].empty()) {
- res["save_id"] = "ai" + res["side"];
+ res["save_id"] = "ai" + res["side"].str();
}
res["user_description"] = _("Computer player");
break;
@@ -458,7 +458,7 @@
const int lchoice = rand() % types.size();
leader_ = types[lchoice];
} else {
- string_map i18n_symbols;
+ utils::string_map i18n_symbols;
i18n_symbols["faction"] = fact["name"];
throw config::error(vgettext("Unable to find a leader
type for faction $faction", i18n_symbols));
}
@@ -838,14 +838,14 @@
config::child_iterator sd;
for(sd = sides.first; sd != sides.second; ++sd) {
const int side_num = sd - sides.first + 1;
- std::string& team_name = (**sd)["team_name"];
+ t_string& team_name = (**sd)["team_name"];
if(team_name.empty()) {
team_name = lexical_cast<std::string>(side_num);
}
std::vector<std::string>::const_iterator itor =
std::find(team_names_.begin(), team_names_.end(), team_name);
if(itor == team_names_.end()) {
team_names_.push_back(team_name);
- player_teams_.push_back(team_prefix_ + team_name);
+ player_teams_.push_back(team_prefix_ + team_name.str());
}
}
@@ -938,7 +938,7 @@
// Initialize the list of sides available for the current era.
const config* const era_cfg = game_config().find_child("era","id",era_);
if(era_cfg == NULL) {
- string_map i18n_symbols;
+ utils::string_map i18n_symbols;
i18n_symbols["era"] = era_;
throw config::error(vgettext("Cannot find era $era",
i18n_symbols));
}
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.18
wesnoth/src/multiplayer_create.cpp:1.19
--- wesnoth/src/multiplayer_create.cpp:1.18 Wed Mar 23 22:10:50 2005
+++ wesnoth/src/multiplayer_create.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.18 2005/03/23 22:10:50 ydirson Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.19 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -126,7 +126,7 @@
if (size_t(preferences::era()) < eras.size())
era_combo_.set_selected(preferences::era());
- string_map i18n_symbols;
+ utils::string_map i18n_symbols;
i18n_symbols["login"] = preferences::login();
name_entry_.set_text(vgettext("$login's game", i18n_symbols));
@@ -243,7 +243,7 @@
parameters_.scenario_data = *levels[index];
- std::string& map_data =
parameters_.scenario_data["map_data"];
+ t_string& map_data =
parameters_.scenario_data["map_data"];
if(map_data == "" &&
parameters_.scenario_data["map"] != "") {
map_data =
read_map(parameters_.scenario_data["map"]);
}
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.17 wesnoth/src/multiplayer_ui.cpp:1.18
--- wesnoth/src/multiplayer_ui.cpp:1.17 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/multiplayer_ui.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.17 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.18 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -313,7 +313,7 @@
config::child_iterator user;
for (user = users.begin(); user != users.end(); ++user) {
const std::string prefix = (**user)["available"] == "no" ? "#"
: "";
- user_strings.push_back(prefix + (**user)["name"]);
+ user_strings.push_back(prefix + (**user)["name"].str());
}
set_user_list(user_strings, silent);
}
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.27 wesnoth/src/network_worker.cpp:1.28
--- wesnoth/src/network_worker.cpp:1.27 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/network_worker.cpp Sun Mar 27 23:06:17 2005
@@ -362,3 +362,4 @@
}
}
+
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.196 wesnoth/src/playlevel.cpp:1.197
--- wesnoth/src/playlevel.cpp:1.196 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/playlevel.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.196 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: playlevel.cpp,v 1.197 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -41,7 +41,6 @@
#include "tooltips.hpp"
#include "unit_display.hpp"
#include "util.hpp"
-#include "variable.hpp"
#include "video.hpp"
#include <iostream>
@@ -357,14 +356,14 @@
// system.
for (unit_map::const_iterator help_unit_it = units.begin();
help_unit_it != units.end(); help_unit_it++) {
- const std::string name = help_unit_it->second.type().name();
+ const std::string name = help_unit_it->second.type().id();
preferences::encountered_units().insert(name);
}
// Add all units that are recallable as encountred units.
for(std::map<std::string, player_info>::iterator pi =
state_of_game.players.begin(); pi!=state_of_game.players.end(); ++pi) {
for(std::vector<unit>::iterator help_recall_it =
pi->second.available_units.begin(); help_recall_it !=
pi->second.available_units.end(); help_recall_it++) {
-
preferences::encountered_units().insert(help_recall_it->type().name());
+
preferences::encountered_units().insert(help_recall_it->type().id());
}
}
@@ -510,7 +509,7 @@
events::raise_draw_event();
if(!loading_game) {
game_events::fire("start");
-
game_events::set_variable("turn_number", "1");
+
state_of_game.set_variable("turn_number", "1");
}
gui.draw();
@@ -542,7 +541,7 @@
std::stringstream player_number_str;
player_number_str << player_number;
-
game_events::set_variable("side_number",player_number_str.str());
+
state_of_game.set_variable("side_number",player_number_str.str());
//fire side turn event only if real side change
occurs not counting changes from void to a side
if (team_it != teams.begin()+first_player ||
!first_time) {
@@ -729,7 +728,7 @@
LOG_NG << "turn event..." <<
(recorder.skipping() ? "skipping" : "no skip") << "\n";
update_locker
lock_display(gui.video(),recorder.skipping());
const std::string turn_num = event_stream.str();
-
game_events::set_variable("turn_number",turn_num);
+
state_of_game.set_variable("turn_number",turn_num);
game_events::fire("turn " + turn_num);
game_events::fire("new turn");
}
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.352 wesnoth/src/playturn.cpp:1.353
--- wesnoth/src/playturn.cpp:1.352 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/playturn.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.352 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: playturn.cpp,v 1.353 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1897,7 +1897,7 @@
}
if(message != "") {
- string_map symbols;
+ utils::string_map symbols;
symbols["noun"] = (u.gender() == unit_race::MALE ?
_("him") : _("her"));
message =
utils::interpolate_variables_into_string(message, &symbols);
@@ -1945,7 +1945,7 @@
(You must have veteran survivors from a previous scenario)"));
} else if(current_team.gold() < game_config::recall_cost) {
std::stringstream msg;
- string_map i18n_symbols;
+ utils::string_map i18n_symbols;
i18n_symbols["cost"] =
lexical_cast<std::string>(game_config::recall_cost);
msg << vgettext("You must have at least $cost gold pieces to
recall a unit", i18n_symbols);
gui::show_dialog(gui_,NULL,"",msg.str());
@@ -2380,7 +2380,7 @@
} else {
last_search_hit_ = gamemap::location();
//Not found, inform the player
- string_map symbols;
+ utils::string_map symbols;
symbols["search"] = last_search_;
const std::string msg =
utils::interpolate_variables_into_string(
_("Couldn't find label or unit containing the string
'$search'."),&symbols);
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.147 wesnoth/src/preferences.cpp:1.148
--- wesnoth/src/preferences.cpp:1.147 Sat Mar 26 14:07:16 2005
+++ wesnoth/src/preferences.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.147 2005/03/26 14:07:16 silene Exp $ */
+/* $Id: preferences.cpp,v 1.148 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -356,7 +356,7 @@
const std::string& network_host()
{
- std::string& res = prefs["host"];
+ t_string& res = prefs["host"];
if(res.empty())
res = WESNOTH_DEFAULT_SERVER;
@@ -370,7 +370,7 @@
const std::string& login()
{
- std::string& res = prefs["login"];
+ t_string& res = prefs["login"];
if(res.empty()) {
char* const login = getenv("USER");
if(login != NULL) {
@@ -644,7 +644,7 @@
return null_theme;
}
- std::string& res = prefs["theme"];
+ t_string& res = prefs["theme"];
if(res.empty()) {
res = "Default";
}
Index: wesnoth/src/publish_campaign.cpp
diff -u wesnoth/src/publish_campaign.cpp:1.8
wesnoth/src/publish_campaign.cpp:1.9
--- wesnoth/src/publish_campaign.cpp:1.8 Sat Mar 26 14:07:16 2005
+++ wesnoth/src/publish_campaign.cpp Sun Mar 27 23:06:17 2005
@@ -131,12 +131,12 @@
void unarchive_file(const std::string& path, const config& cfg)
{
- write_file(path + '/' + cfg["name"],unencode_binary(cfg["contents"]));
+ write_file(path + '/' + cfg["name"].str(),
unencode_binary(cfg["contents"]));
}
void unarchive_dir(const std::string& path, const config& cfg)
{
- const std::string dir = path + '/' + cfg["name"];
+ const std::string dir = path + '/' + cfg["name"].str();
make_directory(dir);
const config::child_list& dirs = cfg.get_children("dir");
Index: wesnoth/src/race.cpp
diff -u wesnoth/src/race.cpp:1.19 wesnoth/src/race.cpp:1.20
--- wesnoth/src/race.cpp:1.19 Wed Mar 23 22:10:50 2005
+++ wesnoth/src/race.cpp Sun Mar 27 23:06:17 2005
@@ -114,7 +114,7 @@
next_[FEMALE] = markov_prefixes(names_[FEMALE],chain_size_);
}
-const std::string& unit_race::name() const { return name_; }
+const t_string& unit_race::name() const { return name_; }
std::string unit_race::generate_name(unit_race::GENDER gender) const
{
Index: wesnoth/src/race.hpp
diff -u wesnoth/src/race.hpp:1.8 wesnoth/src/race.hpp:1.9
--- wesnoth/src/race.hpp:1.8 Wed Mar 23 22:10:50 2005
+++ wesnoth/src/race.hpp Sun Mar 27 23:06:17 2005
@@ -18,7 +18,7 @@
unit_race();
unit_race(const config& cfg);
- const std::string& name() const;
+ const t_string& name() const;
std::string generate_name(GENDER gender) const;
@@ -30,7 +30,7 @@
bool not_living() const;
private:
- std::string name_;
+ t_string name_;
int ntraits_;
std::vector<std::string> names_[NUM_GENDERS];
markov_prefix_map next_[NUM_GENDERS];
Index: wesnoth/src/replay.cpp
diff -u wesnoth/src/replay.cpp:1.100 wesnoth/src/replay.cpp:1.101
--- wesnoth/src/replay.cpp:1.100 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/replay.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: replay.cpp,v 1.100 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: replay.cpp,v 1.101 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -664,7 +664,7 @@
}
if(u_type->second.cost() > current_team.gold()) {
- ERR_NW << "unit '" << u_type->second.name() <<
"' is too expensive to recruit: "
+ ERR_NW << "unit '" << u_type->second.id() << "'
is too expensive to recruit: "
<< u_type->second.cost() << "/" <<
current_team.gold() << "\n";
if (!game_config::ignore_replay_errors) throw
replay::error();
}
Index: wesnoth/src/serialization/binary_wml.cpp
diff -u wesnoth/src/serialization/binary_wml.cpp:1.9
wesnoth/src/serialization/binary_wml.cpp:1.10
--- wesnoth/src/serialization/binary_wml.cpp:1.9 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/serialization/binary_wml.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: binary_wml.cpp,v 1.9 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: binary_wml.cpp,v 1.10 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -131,7 +131,7 @@
compress_emit_word(out, i->first, schema);
//output the value, with no compression
- compress_output_literal_word(out, i->second);
+ compress_output_literal_word(out, i->second.value());
}
}
@@ -196,7 +196,8 @@
} else {
//we have a name/value pair, the value is
always a literal string
std::string value =
compress_read_literal_word(in);
- cfg.values.insert(std::make_pair(word, value));
+ t_string t_value =
t_string::from_serialized(value);
+ cfg.values.insert(std::make_pair(word,
t_value));
}
}
Index: wesnoth/src/serialization/parser.cpp
diff -u wesnoth/src/serialization/parser.cpp:1.8
wesnoth/src/serialization/parser.cpp:1.9
--- wesnoth/src/serialization/parser.cpp:1.8 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/serialization/parser.cpp Sun Mar 27 23:06:17 2005
@@ -1,7 +1,8 @@
-/* $Id: parser.cpp,v 1.8 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: parser.cpp,v 1.9 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
+ Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -26,6 +27,7 @@
#include "serialization/parser.hpp"
#include "serialization/preprocessor.hpp"
#include "serialization/string_utils.hpp"
+#include "serialization/tokenizer.hpp"
#include <sstream>
#include <stack>
@@ -34,7 +36,7 @@
#define WRN_CF LOG_STREAM(warn, config)
#define LOG_CF LOG_STREAM(info, config)
-static const int max_recursion_levels = 100;
+static const size_t max_recursion_levels = 100;
line_source get_line_source(std::vector< line_source > const &line_src, int
line)
{
@@ -50,301 +52,282 @@
return res;
}
-void read(config &cfg, std::istream &data_in, std::vector< line_source > const
*line_sources)
-{
- std::string data_str;
- {
- //temporary, only here to accomodate the old parser
- std::stringstream tmp_in;
- tmp_in << data_in.rdbuf();
- data_str = tmp_in.str();
- }
- std::string const &data = data_str;
+namespace {
- cfg.clear();
-
- std::stack< std::string > element_names;
- std::stack< int > element_locs;
- std::stack< config * > elements;
- std::stack< std::map< std::string, config * > > last_element; //allows
[+element] syntax
- std::stack< std::string > textdomains;
- std::string current_textdomain = PACKAGE;
- std::string current_textdomain_location = "";
- elements.push(&cfg);
- element_names.push("");
- element_locs.push(0);
- last_element.push(std::map< std::string, config * >());
-
- enum { ELEMENT_NAME, IN_ELEMENT, VARIABLE_NAME, VALUE }
- state = IN_ELEMENT;
- std::string var;
-
- std::vector< std::pair< std::string, bool > > stored_values;
- std::string value;
-
- bool in_quotes = false, has_quotes = false, in_comment = false,
escape_next = false,
- translatable = false, expecting_value = false;
-
- int line = 0;
-
- for(std::string::const_iterator i = data.begin(), i_end = data.end(); i
!= i_end; ++i) {
- const char c = *i;
- if (c == '\r') //ignore any DOS-style newlines
- continue;
+class parser
+{
+public:
+ parser(config& cfg, std::istream& in, std::vector<line_source> const*
line_sources);
+ void operator() ();
+
+private:
+ void parse_element();
+ void parse_variable();
+ void parse_directive();
+ std::string lineno_string(utils::string_map& map, size_t lineno,
+ const std::string& string1, const std::string& string2);
+ void error(const std::string& message);
+
+ config& cfg_;
+ tokenizer tok_;
+ std::vector<line_source> const* line_sources;
+
+ struct element {
+ element(config* cfg, const std::string& name, size_t
start_line, const std::string& textdomain) :
+ cfg(cfg), name(name), textdomain(textdomain),
start_line(start_line){};
+
+ config* cfg;
+ std::string name;
+
+ std::map<std::string, config*> last_element_map;
+ std::string textdomain;
+ size_t start_line;
+ };
+
+ std::stack<element> elements;
+
+ std::string current_textdomain_location;
+};
+
+parser::parser(config &cfg, std::istream &in, std::vector<line_source> const
*line_sources) :
+ cfg_(cfg),
+ tok_(in),
+ line_sources(line_sources),
+ current_textdomain_location("")
+{
+}
- if (c == '\n') {
- in_comment = false;
- ++line;
- }
+void parser::operator()()
+{
+ cfg_.clear();
+ elements.push(element(&cfg_, "", 0, PACKAGE));
+ tok_.textdomain() = PACKAGE;
- if (*i == '#' && !in_quotes) {
- in_comment = true;
- }
+ do {
+ tok_.next_token();
- if (in_comment) {
+ switch(tok_.current_token().type) {
+ case token::LF:
continue;
+ case '[':
+ parse_element();
+ break;
+ case token::STRING:
+ parse_variable();
+ break;
+ default:
+ error(_("Unexpected characters at line start"));
+ break;
+ case token::END:
+ break;
}
+ } while (tok_.current_token().type != token::END);
- switch(state) {
- case ELEMENT_NAME:
- if(c == ']') {
- if(value == "end" || value.empty() ==
false && value[0] == '/') {
- wassert(!elements.empty());
-
- if(value[0] == '/' &&
- std::string("/" +
element_names.top()) != value) {
- std::stringstream err;
-
- if(line_sources !=
NULL) {
- const
line_source src = get_line_source(*line_sources,line);
-
- err << src.file
<< " " << src.fileline << ": ";
- } else {
- err << "line "
<< line << ": ";
- }
-
- err << "Found illegal
end tag: '" << value
- << "', at end of '"
- <<
element_names.top() << "'";
-
- throw
config::error(err.str());
- }
-
- const std::string name =
element_names.top();
- config* const element =
elements.top();
-
- elements.pop();
- element_names.pop();
- element_locs.pop();
- last_element.pop();
-
- if(elements.empty()) {
- std::stringstream err;
-
- if(line_sources !=
NULL) {
- const
line_source src =
-
get_line_source(*line_sources,line);
-
- err << src.file
<< " " << src.fileline << ": ";
- }
-
- err << "Unexpected
terminating tag\n";
- throw
config::error(err.str());
- return;
- }
+ // The main element should be there. If it is not, this is a parser
error.
+ wassert(!elements.empty());
- last_element.top()[name] =
element;
-
-
if(element->values.count("textdomain") != 0){
- current_textdomain =
textdomains.top();
- textdomains.pop();
- }
- current_textdomain_location =
"";
-
- state = IN_ELEMENT;
+ if(elements.size() != 1) {
+ utils::string_map i18n_symbols;
+ i18n_symbols["tag"] = elements.top().name;
+ error(lineno_string(i18n_symbols, elements.top().start_line,
+ N_("Missing closing tag for tag $tag (file
$file, line $line)"),
+ N_("Missing closing tag for tag $tag (line
$line)")));
+ }
+}
- break;
- }
+void parser::parse_element()
+{
+ tok_.next_token();
+ std::string elname;
+ config* current_element = NULL;
+ std::map<std::string, config*>::const_iterator last_element_itor;
+
+ switch(tok_.current_token().type) {
+ case token::STRING: // [element]
+ elname = tok_.current_token().value;
+ if (tok_.next_token().type != ']')
+ error(_("Unterminated [element] tag"));
+
+ // Add the element
+ current_element = &(elements.top().cfg->add_child(elname));
+ elements.top().last_element_map[elname] = current_element;
+ elements.top().textdomain = tok_.textdomain();
+ elements.push(element(current_element, elname, tok_.get_line(),
elements.top().textdomain));
+ break;
+
+ case '+': // [+element]
+ if (tok_.next_token().type != token::STRING)
+ error(_("Invalid tag name"));
+ elname = tok_.current_token().value;
+ if (tok_.next_token().type != ']')
+ error(_("Unterminated [+element] tag"));
+
+ // Find the last child of the current element whose name is
+ // element
+ last_element_itor =
elements.top().last_element_map.find(elname);
+ if(last_element_itor == elements.top().last_element_map.end()) {
+ current_element =
&elements.top().cfg->add_child(elname);
+ } else {
+ current_element = last_element_itor->second;
+ }
+ elements.top().last_element_map[elname] = current_element;
+ elements.top().textdomain = tok_.textdomain();
+ elements.push(element(current_element, elname, tok_.get_line(),
elements.top().textdomain));
+ break;
+
+ case '/': // [/element]
+ if(tok_.next_token().type != token::STRING)
+ error(_("Invalid closing tag name"));
+ elname = tok_.current_token().value;
+ if(tok_.next_token().type != ']')
+ error(_("Unterminated closing tag"));
+ if(elements.size() <= 1)
+ error(_("Unexpected closing tag"));
+ if(elname != elements.top().name) {
+ utils::string_map i18n_symbols;
+ i18n_symbols["tag"] = elements.top().name;
+ error(lineno_string(i18n_symbols,
elements.top().start_line,
+ N_("Found invalid closing tag for tag
$tag (file $file, line $line)"),
+ N_("Found invalid closing tag for tag
$tag (line $line)")));
+ }
- //any elements with a + sign prefix,
like [+element] mean
- //that they are appending to the
previous element with the same
- //name, if there is one
- if(value.empty() == false && value[0]
== '+') {
-
value.erase(value.begin(),value.begin()+1);
- const
std::map<std::string,config*>::iterator itor = last_element.top().find(value);
- if(itor !=
last_element.top().end()) {
-
elements.push(itor->second);
-
element_names.push(value);
- element_locs.push(line);
-
last_element.push(std::map<std::string,config*>());
- state = IN_ELEMENT;
- value = "";
- break;
- }
- }
+ elements.pop();
+ tok_.textdomain() = elements.top().textdomain;
+ break;
+ default:
+ error(_("Invalid tag name"));
+ }
+}
-
elements.push(&elements.top()->add_child(value));
- element_names.push(value);
- element_locs.push(line);
-
last_element.push(std::map<std::string,config*>());
+void parser::parse_variable()
+{
+ config& cfg = *elements.top().cfg;
+ std::vector<std::string> variables;
+ variables.push_back(tok_.current_token().value);
+ tok_.next_token();
+
+ while (tok_.current_token().type != '=') {
+ if (tok_.current_token().type != ',')
+ error(_("Unexpected characters after variable name
(expected , or =)"));
+ tok_.next_token();
+ if (tok_.current_token().type != token::STRING)
+ error(_("Invalid variable name"));
+ variables.push_back(tok_.current_token().value);
+ tok_.next_token();
+ }
- state = IN_ELEMENT;
- value = "";
- } else {
- value.resize(value.size()+1);
- value[value.size()-1] = c;
- }
+ std::vector<std::string>::const_iterator curvar = variables.begin();
+ bool ignore_next_newlines = false;
+ while(1) {
+ tok_.next_token();
+ wassert(curvar != variables.end());
+
+ switch (tok_.current_token().type) {
+ case ',':
+ if ((curvar+1) != variables.end()) {
+ curvar++;
+ continue;
+ } else {
+ cfg[*curvar] += ",";
+ }
+ break;
+ case '_':
+ tok_.next_token();
+ switch (tok_.current_token().type) {
+ case token::UNTERMINATED_QSTRING:
+ error(_("Unterminated quoted string"));
+ break;
+ case token::QSTRING:
+ cfg[*curvar] +=
t_string(tok_.current_token().value, tok_.textdomain());
break;
+ default:
+ cfg[*curvar] += "_";
+ cfg[*curvar] += tok_.current_token().value;
+ break;
+ case token::END:
+ case token::LF:
+ return;
+ }
+ break;
+ case '+':
+ // Ignore this
+ break;
+ default:
+ cfg[*curvar] += tok_.current_token().leading_spaces +
tok_.current_token().value;
+ break;
+ case token::QSTRING:
+ cfg[*curvar] += tok_.current_token().value;
+ break;
+ case token::UNTERMINATED_QSTRING:
+ error(_("Unterminated quoted string"));
+ break;
+ case token::LF:
+ if(!ignore_next_newlines)
+ return;
+ break;
+ case token::END:
+ return;
+ }
- case IN_ELEMENT:
- if(c == '[') {
- state = ELEMENT_NAME;
- value = "";
- } else if (!utils::portable_isspace(c)) {
- value.resize(1);
- value[0] = c;
- state = VARIABLE_NAME;
- }
+ if (tok_.current_token().type == '+') {
+ ignore_next_newlines = true;
+ } else if (tok_.current_token().type != token::LF) {
+ ignore_next_newlines = false;
+ }
+ }
+}
- break;
+std::string parser::lineno_string(utils::string_map& i18n_symbols, size_t
lineno,
+ const std::string& string1, const std::string& string2)
+{
+ std::string res;
- case VARIABLE_NAME:
- if(c == '=') {
- state = VALUE;
- var = value;
- value = "";
- } else {
- value.resize(value.size()+1);
- value[value.size()-1] = c;
- }
+ if(line_sources != NULL) {
+ const line_source src = get_line_source(*line_sources, lineno);
+ i18n_symbols["file"] = lexical_cast<std::string>(src.file);
+ i18n_symbols["line"] = lexical_cast<std::string>(src.fileline);
+ i18n_symbols["column"] =
lexical_cast<std::string>(tok_.get_column());
+
+ res = vgettext(string1.c_str(), i18n_symbols);
+ } else {
+ i18n_symbols["line"] = lexical_cast<std::string>(lineno);
+ i18n_symbols["column"] =
lexical_cast<std::string>(tok_.get_column());
- break;
+ res = vgettext(string2.c_str(), i18n_symbols);
+ }
+ return res;
+}
- case VALUE:
- if(c == '[' && in_quotes) {
- if(line_sources != NULL) {
- const line_source src =
get_line_source(*line_sources,line);
- WRN_CF << src.file << " " <<
src.fileline << ": ";
- } else {
- WRN_CF << "line " << line << ":
";
- }
+void parser::error(const std::string& error_type)
+{
+ utils::string_map i18n_symbols;
+ i18n_symbols["error"] = error_type;
- WRN_CF << "square bracket found in
string. Is this a run-away string?\n";
- }
-
- if(in_quotes && c == '"' && (i+1) != data.end()
&& *(i+1) == '"') {
- push_back(value, c);
- ++i; // skip the next double-quote
- } else if(c == '"') {
- expecting_value = false;
- in_quotes = !in_quotes;
- has_quotes = true;
-
- //if we have an underscore outside of
quotes in front, then
- //we strip it away, since it simply
indicates that this value is translatable.
- if(value.empty() == false &&
std::count(value.begin(),value.end(),'_') == 1) {
- std::string val = value;
- if (utils::strip(val) == "_") {
- value = "";
- translatable = true;
- }
- }
- } else if(c == '+' && has_quotes && !in_quotes)
{
-
stored_values.push_back(std::make_pair(value,translatable));
- value = "";
- translatable = false;
- expecting_value = true;
- } else if(c == '\n' && !in_quotes &&
expecting_value) {
- //do nothing...just ignore
- } else if(c == '\n' && !in_quotes) {
-
-
stored_values.push_back(std::make_pair(value,translatable));
- value = "";
-
for(std::vector<std::pair<std::string,bool> >::const_iterator i =
stored_values.begin(); i != stored_values.end(); ++i) {
- if(i->second) {
- value +=
dsgettext(current_textdomain.c_str(),i->first.c_str());
- } else {
- value += i->first;
- }
- }
+ throw config::error(lineno_string(i18n_symbols, tok_.get_line(),
+ N_("$error in file $file (line $line, column
$column)"),
+ N_("$error (line $line, column $column)")));
+}
- stored_values.clear();
+} // end anon namespace
- //see if this is a CSV list=CSV list
style assignment (e.g. x,y=5,8)
- std::vector<std::string> vars, values;
-
if(std::count(var.begin(),var.end(),',') > 0) {
- vars = utils::split(var);
- values = utils::split(value);
- } else {
- vars.push_back(var);
- values.push_back(value);
- if (var == "textdomain") {
-
textdomains.push(current_textdomain);
- current_textdomain =
value;
-
bindtextdomain(current_textdomain.c_str(),
-
current_textdomain_location.empty() ?
-
get_intl_dir().c_str() :
-
current_textdomain_location.c_str());
- bind_textdomain_codeset
(current_textdomain.c_str(), "UTF-8");
- } else if (var ==
"translations") {
- const std::string&
location = get_binary_file_location(value, ".");
-
current_textdomain_location = location;
- }
- }
+void read(config &cfg, std::istream &data_in, std::vector< line_source > const
*line_sources)
+{
+ parser(cfg, data_in, line_sources)();
+}
- //iterate over the names and values,
assigning each to its corresponding
- //element. If there are more names than
values, than remaining names get
- //assigned to the last value. If there
are more values than names, then
- //all the last values get concatenated
onto the last name
- if(vars.empty() == false) {
- for(size_t n = 0; n !=
maximum<size_t>(vars.size(),values.size()); ++n) {
- std::string value;
- if(n < values.size()) {
- value =
values[n];
- } else
if(values.empty() == false) {
- value =
values.back();
- }
-
- if(has_quotes == false)
{
-
utils::strip(value);
- }
-
- if(n < vars.size()) {
-
elements.top()->values[vars[n]] = value;
- } else {
-
elements.top()->values[vars.back()] += "," + value;
- }
- }
- }
+static char const *AttributeEquals = "=";
- state = IN_ELEMENT;
- var = "";
- value = "";
- has_quotes = false;
- escape_next = false;
- translatable = false;
- } else if(in_quotes || !has_quotes) {
- expecting_value = false;
- push_back(value, c);
- } else if(expecting_value) {
- // after a +, emulate !has_quotes so we
can see any _ when we encounter a " later
- push_back(value, c);
- }
+static char const *TranslatableAttributePrefix = "_ \"";
+static char const *AttributePrefix = "\"";
+static char const *AttributePostfix = "\"";
- break;
- }
- }
+static char const* AttributeContPostfix = " + \n";
+static char const* AttributeEndPostfix = "\n";
- const std::string top = element_names.top();
- element_names.pop();
- if(!element_names.empty()) {
- throw config::error("Configuration not terminated: no closing
tag to '" + top + "' (line " + str_cast(element_locs.top()) + ")");
- }
-}
+static char const* TextdomainPrefix = "#textdomain ";
+static char const* TextdomainPostfix = "\n";
-static char const *AttributeEquals = "=\"";
-static char const *AttributePostfix = "\"\n";
static char const *ElementPrefix = "[";
static char const *ElementPostfix = "]\n";
static char const *EndElementPrefix = "[/";
@@ -360,16 +343,57 @@
return std::string(res.begin(), res.end());
}
-static void write_internal(config const &cfg, std::ostream &out, size_t tab =
0)
+static void write_internal(config const &cfg, std::ostream &out, std::string
textdomain, size_t tab = 0)
{
if (tab > max_recursion_levels)
return;
for(string_map::const_iterator i = cfg.values.begin(), i_end =
cfg.values.end(); i != i_end; ++i) {
if (!i->second.empty()) {
- out << std::string(tab, '\t')
- << i->first << AttributeEquals <<
escaped_string(i->second)
- << AttributePostfix;
+ bool first = true;
+
+ for(t_string::walker w(i->second); !w.eos(); w.next()) {
+ std::string part(w.begin(), w.end());
+
+ if(w.translatable()) {
+ if(w.textdomain() != textdomain) {
+ out << TextdomainPrefix
+ << w.textdomain()
+ << TextdomainPostfix;
+ textdomain = w.textdomain();
+ }
+
+ if(first) {
+ out << std::string(tab, '\t')
+ << i->first
+ << AttributeEquals;
+ }
+
+ out << TranslatableAttributePrefix
+ << escaped_string(part)
+ << AttributePostfix;
+
+ } else {
+ if(first) {
+ out << std::string(tab, '\t')
+ << i->first
+ << AttributeEquals;
+ }
+
+ out << AttributePrefix
+ << escaped_string(part)
+ << AttributePostfix;
+ }
+
+ if(w.last()) {
+ out << AttributeEndPostfix;
+ } else {
+ out << AttributeContPostfix;
+ out << std::string(tab+1, '\t');
+ }
+
+ first = false;
+ }
}
}
@@ -380,7 +404,7 @@
out << std::string(tab, '\t')
<< ElementPrefix << name << ElementPostfix;
- write_internal(cfg, out, tab + 1);
+ write_internal(cfg, out, textdomain, tab + 1);
out << std::string(tab, '\t')
<< EndElementPrefix << name << EndElementPostfix;
}
@@ -388,5 +412,5 @@
void write(std::ostream &out, config const &cfg)
{
- write_internal(cfg, out);
+ write_internal(cfg, out, PACKAGE);
}
Index: wesnoth/src/serialization/preprocessor.cpp
diff -u wesnoth/src/serialization/preprocessor.cpp:1.7
wesnoth/src/serialization/preprocessor.cpp:1.8
--- wesnoth/src/serialization/preprocessor.cpp:1.7 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/serialization/preprocessor.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: preprocessor.cpp,v 1.7 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: preprocessor.cpp,v 1.8 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -333,6 +333,24 @@
break;
}
+ static const std::string hash_textdomain("#textdomain");
+ //if we find a #textdomain directive, pass it untouched
+ if(size_t(data.end() - i) > hash_textdomain.size() &&
+
std::equal(hash_textdomain.begin(),hash_textdomain.end(),i)) {
+
+ i += hash_textdomain.size();
+ while(i != data.end() &&
utils::portable_isspace(*i))
+ ++i;
+
+ const std::string::const_iterator end =
std::find_if(i, data.end(),
+ utils::portable_isspace);
+ if(end == data.end())
+ break;
+ const std::string symbol(i,end);
+ //put the textdomain to the output stream
+ out << hash_textdomain << " " << symbol;
+ }
+
i = std::find_if(i, data.end(), utils::isnewline);
if(i == data.end())
Index: wesnoth/src/serialization/string_utils.cpp
diff -u wesnoth/src/serialization/string_utils.cpp:1.13
wesnoth/src/serialization/string_utils.cpp:1.14
--- wesnoth/src/serialization/string_utils.cpp:1.13 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/serialization/string_utils.cpp Sun Mar 27 23:06:17 2005
@@ -1,7 +1,8 @@
-/* $Id: string_utils.cpp,v 1.13 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: string_utils.cpp,v 1.14 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
+ Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -20,16 +21,20 @@
#include "serialization/string_utils.hpp"
#include "util.hpp"
#include "log.hpp"
-#include "variable.hpp"
+#include "gamestatus.hpp"
#include "SDL_types.h"
#define ERR_GENERAL LOG_STREAM(err, general)
+variable_set::~variable_set()
+{
+}
+
namespace {
bool two_dots(char a, char b) { return a == '.' && b == '.'; }
-void do_interpolation(std::string &res, const utils::string_map* m)
+void do_interpolation(std::string &res, variable_set& set)
{
//this needs to be able to store negative numbers to check for the
while's condition
//(which is only false when the previous '$' was at index 0)
@@ -106,15 +111,7 @@
//Replace = remove original, and then insert new value, if any.
res.erase(var_begin, var_end);
- if(m != NULL) {
- const utils::string_map::const_iterator itor =
m->find(var_name);
- if (itor != m->end()) {
- res.insert(var_begin_loc,itor->second);
- }
- }
- else {
- res.insert(var_begin_loc,
game_events::get_variable_const(var_name));
- }
+ res.insert(var_begin_loc, set.get_variable(var_name));
}
//Remove any remaining '|', which are used to separate variable names,
@@ -198,10 +195,40 @@
return res;
}
+class string_map_variable_set : public variable_set
+{
+public:
+ string_map_variable_set(const string_map& map) : map_(map) {};
+
+ virtual const t_string& get_variable(const std::string& key)
+ {
+ static const t_string empty_string = "";
+
+ string_map::const_iterator itor = map_.find(key);
+ if(itor == map_.end()) {
+ return empty_string;
+ } else {
+ return itor->second;
+ }
+ };
+private:
+ const string_map& map_;
+
+};
+
std::string interpolate_variables_into_string(const std::string &str, const
string_map *symbols)
{
std::string res = str;
- do_interpolation(res, symbols);
+ string_map_variable_set set(*symbols);
+ do_interpolation(res, set);
+
+ return res;
+}
+
+std::string interpolate_variables_into_string(const std::string &str,
variable_set& variables)
+{
+ std::string res = str;
+ do_interpolation(res, variables);
return res;
}
Index: wesnoth/src/serialization/string_utils.hpp
diff -u wesnoth/src/serialization/string_utils.hpp:1.8
wesnoth/src/serialization/string_utils.hpp:1.9
--- wesnoth/src/serialization/string_utils.hpp:1.8 Sat Mar 26 15:32:26 2005
+++ wesnoth/src/serialization/string_utils.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: string_utils.hpp,v 1.8 2005/03/26 15:32:26 silene Exp $ */
+/* $Id: string_utils.hpp,v 1.9 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -20,6 +20,16 @@
#include <vector>
#include "SDL_types.h"
+class t_string;
+
+class variable_set
+{
+public:
+ virtual ~variable_set();
+
+ virtual const t_string& get_variable(const std::string& id) = 0;
+};
+
//the type we use to represent Unicode strings.
typedef std::vector<wchar_t> wide_string;
//if we append a 0 to that one we can pass it to SDL_ttf
@@ -48,11 +58,12 @@
std::string &strip(std::string &str);
bool has_value(std::string const &values, std::string const &val);
-typedef std::map< std::string, std::string > string_map;
+typedef std::map< std::string, t_string > string_map;
// function which will interpolate variables, starting with '$' in the string
'str' with
// the equivalent symbols in the given symbol table. If 'symbols' is NULL,
then game event
// variables will be used instead
-std::string interpolate_variables_into_string(std::string const &str,
string_map const *symbols = NULL);
+std::string interpolate_variables_into_string(std::string const &str,
string_map const *symbols);
+std::string interpolate_variables_into_string(std::string const &str,
variable_set& variables);
//functions for converting Unicode wide-char strings to UTF-8 encoded
//strings, back and forth
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.75 wesnoth/src/server/server.cpp:1.76
--- wesnoth/src/server/server.cpp:1.75 Mon Mar 21 21:45:44 2005
+++ wesnoth/src/server/server.cpp Sun Mar 27 23:06:17 2005
@@ -56,10 +56,12 @@
return turn;
}
-void truncate_message(std::string& str)
+void truncate_message(t_string& str)
{
const size_t max_message_length = 240;
- str.resize(minimum<size_t>(str.size(),max_message_length));
+ std::string newstr = str.str();
+ newstr.resize(minimum<size_t>(str.size(),max_message_length));
+ str = newstr;
}
}
Index: wesnoth/src/statistics.cpp
diff -u wesnoth/src/statistics.cpp:1.14 wesnoth/src/statistics.cpp:1.15
--- wesnoth/src/statistics.cpp:1.14 Thu Mar 24 21:56:44 2005
+++ wesnoth/src/statistics.cpp Sun Mar 27 23:06:17 2005
@@ -253,7 +253,7 @@
}
attack_context::attack_context(const unit& a, const unit& d, const
battle_stats& stats)
- : attacker_type(a.type().name()), defender_type(d.type().name()),
+ : attacker_type(a.type().id()), defender_type(d.type().id()),
bat_stats(stats), attacker_side(a.side()), defender_side(d.side())
{
}
@@ -327,7 +327,7 @@
return;
stats& s = get_stats(u.side());
- s.recruits[u.type().name()]++;
+ s.recruits[u.type().id()]++;
s.recruit_cost += u.type().cost();
}
@@ -337,7 +337,7 @@
return;
stats& s = get_stats(u.side());
- s.recalls[u.type().name()]++;
+ s.recalls[u.type().id()]++;
s.recall_cost += u.type().cost();
}
@@ -347,7 +347,7 @@
return;
stats& s = get_stats(u.side());
- s.recalls[u.type().name()]--;
+ s.recalls[u.type().id()]--;
s.recall_cost -= u.type().cost();
}
@@ -357,7 +357,7 @@
return;
stats& s = get_stats(u.side());
- s.advanced_to[u.type().name()]++;
+ s.advanced_to[u.type().id()]++;
}
std::vector<std::string> get_categories()
Index: wesnoth/src/team.cpp
diff -u wesnoth/src/team.cpp:1.86 wesnoth/src/team.cpp:1.87
--- wesnoth/src/team.cpp:1.86 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/team.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: team.cpp,v 1.86 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: team.cpp,v 1.87 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -525,7 +525,7 @@
return info_.save_id;
}
-void team::set_objectives(const std::string& new_objectives, bool silently)
+void team::set_objectives(const t_string& new_objectives, bool silently)
{
info_.objectives = new_objectives;
if(!silently)
@@ -537,7 +537,7 @@
info_.objectives_changed = false;
}
-const std::string& team::objectives() const
+const t_string& team::objectives() const
{
return info_.objectives;
}
Index: wesnoth/src/team.hpp
diff -u wesnoth/src/team.hpp:1.56 wesnoth/src/team.hpp:1.57
--- wesnoth/src/team.hpp:1.56 Tue Mar 22 23:42:37 2005
+++ wesnoth/src/team.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: team.hpp,v 1.56 2005/03/22 23:42:37 ydirson Exp $ */
+/* $Id: team.hpp,v 1.57 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -77,7 +77,7 @@
std::string description;
- std::string objectives; /** < Team's objectives for the current
level. */
+ t_string objectives; /** < Team's objectives for the current
level. */
/** Set to true when the objectives for this time changes.
* Reset to false when the objectives for this team have been
@@ -127,10 +127,10 @@
const std::string& name() const;
const std::string& save_id() const;
- void set_objectives(const std::string& new_objectives, bool
silently=false);
+ void set_objectives(const t_string& new_objectives, bool
silently=false);
void reset_objectives_changed();
- const std::string& objectives() const;
+ const t_string& objectives() const;
bool objectives_changed() const;
bool is_enemy(int n) const {
Index: wesnoth/src/terrain.cpp
diff -u wesnoth/src/terrain.cpp:1.27 wesnoth/src/terrain.cpp:1.28
--- wesnoth/src/terrain.cpp:1.27 Wed Mar 23 22:08:52 2005
+++ wesnoth/src/terrain.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: terrain.cpp,v 1.27 2005/03/23 22:08:52 ydirson Exp $ */
+/* $Id: terrain.cpp,v 1.28 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -12,7 +12,7 @@
*/
#include "global.hpp"
-
+#include "tstring.hpp"
#include "config.hpp"
#include "terrain.hpp"
@@ -62,7 +62,7 @@
return symbol_image_;
}
-const std::string& terrain_type::name() const
+const t_string& terrain_type::name() const
{
return name_;
}
Index: wesnoth/src/terrain.hpp
diff -u wesnoth/src/terrain.hpp:1.22 wesnoth/src/terrain.hpp:1.23
--- wesnoth/src/terrain.hpp:1.22 Wed Mar 23 22:08:52 2005
+++ wesnoth/src/terrain.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: terrain.hpp,v 1.22 2005/03/23 22:08:52 ydirson Exp $ */
+/* $Id: terrain.hpp,v 1.23 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,6 +14,7 @@
#define TERRAIN_H_INCLUDED
class config;
+#include "tstring.hpp"
#include <map>
#include <string>
@@ -26,7 +27,7 @@
terrain_type(const config& cfg);
const std::string& symbol_image() const;
- const std::string& name() const;
+ const t_string& name() const;
const std::string& id() const;
//the character representing this terrain
@@ -49,7 +50,7 @@
private:
std::string symbol_image_;
std::string id_;
- std::string name_;
+ t_string name_;
//the 'letter' is the letter that represents this
//terrain type. The 'type' is a list of the 'underlying types'
Index: wesnoth/src/theme.cpp
diff -u wesnoth/src/theme.cpp:1.35 wesnoth/src/theme.cpp:1.36
--- wesnoth/src/theme.cpp:1.35 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/theme.cpp Sun Mar 27 23:06:17 2005
@@ -139,7 +139,7 @@
origcfg = topcfg.find_child("partialresolution", "id",
cfg["inherits"]);
if (origcfg == NULL) {
throw config::error("[partialresolution] refers
to non-existant [resolution] "
- + cfg["inherits"]);
+ + cfg["inherits"].str());
}
// expand parent again - not so big a deal, the only
thing really
// done again is applying he parent's changes, since we
would have
@@ -337,7 +337,7 @@
{}
theme::label::label(const config& cfg)
- : object(cfg), text_(cfg["prefix"] + cfg["text"] + cfg["postfix"]),
+ : object(cfg), text_(cfg["prefix"].str() + cfg["text"].str() +
cfg["postfix"].str()),
icon_(cfg["icon"]), font_(atoi(cfg["font_size"].c_str()))
{
if(font_ == 0)
@@ -366,8 +366,8 @@
theme::status_item::status_item(const config& cfg)
: object(cfg),
- prefix_(cfg["prefix"] + cfg["prefix_literal"]),
- postfix_(cfg["postfix_literal"] + cfg["postfix"]),
+ prefix_(cfg["prefix"].str() + cfg["prefix_literal"].str()),
+ postfix_(cfg["postfix_literal"].str() + cfg["postfix"].str()),
font_(atoi(cfg["font_size"].c_str()))
{
if(font_ == 0)
@@ -411,9 +411,9 @@
{}
theme::menu::menu(const config& cfg) : object(cfg),
context_(cfg["is_context_menu"] == "true"),
- title_(cfg["title"] +
cfg["title_literal"]),
-
image_(cfg["image"]),
-
items_(utils::split(cfg["items"]))
+ title_(cfg["title"].str() +
cfg["title_literal"].str()),
+ image_(cfg["image"]),
+ items_(utils::split(cfg["items"]))
{}
bool theme::menu::is_context() const { return context_; }
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.132 wesnoth/src/unit.cpp:1.133
--- wesnoth/src/unit.cpp:1.132 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/unit.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.132 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: unit.cpp,v 1.133 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -44,8 +44,8 @@
const int lvla = a.type().level();
const int lvlb = b.type().level();
- const std::string& namea = a.type().name();
- const std::string& nameb = b.type().name();
+ const std::string& namea = a.type().id();
+ const std::string& nameb = b.type().id();
const int xpa = a.max_experience() - a.experience();
const int xpb = b.max_experience() - b.experience();
@@ -481,7 +481,7 @@
return false;
}
- const std::string& this_type = this->type().name();
+ const std::string& this_type = this->type().id();
//the type could be a comma-seperated list of types
if(type.empty() == false && type != this_type) {
@@ -642,7 +642,7 @@
custom_unit_description_ = cfg["unit_description"];
traitsDescription_ = cfg["traits_description"];
- const std::map<std::string,std::string>::const_iterator recruit_itor =
cfg.values.find("canrecruit");
+ const string_map::const_iterator recruit_itor =
cfg.values.find("canrecruit");
if(recruit_itor != cfg.values.end() && recruit_itor->second == "1") {
recruit_ = true;
}
@@ -721,7 +721,7 @@
void unit::write(config& cfg) const
{
- cfg["type"] = type_->name();
+ cfg["type"] = type_->id();
std::stringstream hp;
hp << hitpoints_;
@@ -991,7 +991,7 @@
const std::string& type_filter = (**i.first)["unit_type"];
if(type_filter.empty() == false) {
const std::vector<std::string>& types =
utils::split(type_filter);
-
if(std::find(types.begin(),types.end(),this->type().name()) == types.end()) {
+
if(std::find(types.begin(),types.end(),this->type().id()) == types.end()) {
continue;
}
}
@@ -1147,7 +1147,7 @@
description << "\n";
- modificationDescriptions_[type] += description.str();
+ modificationDescriptions_[type] = modificationDescriptions_[type].str()
+ description.str();
}
void unit::reset_modifications()
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.94 wesnoth/src/unit_types.cpp:1.95
--- wesnoth/src/unit_types.cpp:1.94 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/unit_types.cpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.94 2005/03/26 17:10:32 silene Exp $ */
+/* $Id: unit_types.cpp,v 1.95 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -174,7 +174,7 @@
defense_weight_ = 1.0;
}
-const std::string& attack_type::name() const
+const t_string& attack_type::name() const
{
return name_;
}
@@ -244,7 +244,7 @@
bool attack_type::matches_filter(const config& cfg) const
{
const std::string& filter_range = cfg["range"];
- const std::string& filter_name = cfg["name"];
+ const t_string& filter_name = cfg["name"];
const std::string& filter_type = cfg["type"];
const std::string& filter_special = cfg["special"];
@@ -336,9 +336,9 @@
: cfg_(cfg), parent_(parent)
{}
-const std::string& unit_movement_type::name() const
+const t_string& unit_movement_type::name() const
{
- const std::string& res = cfg_["name"];
+ const t_string& res = cfg_["name"];
if(res == "" && parent_ != NULL)
return parent_->name();
else
@@ -374,7 +374,7 @@
return min_value;
}
- const config* movement_costs = cfg_.child("movement costs");
+ const config* movement_costs = cfg_.child("movement_costs");
int res = -1;
@@ -630,7 +630,7 @@
else if(align == "neutral")
alignment_ = NEUTRAL;
else {
- LOG_STREAM(err, config) << "Invalid alignment found for " <<
name() << ": '" << align << "'\n";
+ LOG_STREAM(err, config) << "Invalid alignment found for " <<
id() << ": '" << align << "'\n";
alignment_ = NEUTRAL;
}
@@ -711,21 +711,23 @@
id_ = cfg_["name"];
}
- id_.erase(std::remove(id_.begin(),id_.end(),' '),id_.end());
+ //id_.erase(std::remove(id_.begin(),id_.end(),' '),id_.end());
}
return id_;
}
-std::string unit_type::language_name() const
+const t_string& unit_type::language_name() const
{
return cfg_["name"];
}
+#if 0
const std::string& unit_type::name() const
{
return cfg_["id"];
}
+#endif
const std::string& unit_type::image() const
{
@@ -1160,7 +1162,7 @@
for(config::const_child_itors j = cfg.child_range("unit");
j.first != j.second; ++j.first) {
const unit_type
u_type(**j.first,movement_types,races,unit_traits);
-
unit_types.insert(std::pair<std::string,unit_type>(u_type.name(),u_type));
+
unit_types.insert(std::pair<std::string,unit_type>(u_type.id(),u_type));
}
}
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.65 wesnoth/src/unit_types.hpp:1.66
--- wesnoth/src/unit_types.hpp:1.65 Wed Mar 23 22:10:51 2005
+++ wesnoth/src/unit_types.hpp Sun Mar 27 23:06:17 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.65 2005/03/23 22:10:51 ydirson Exp $ */
+/* $Id: unit_types.hpp,v 1.66 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -79,7 +79,7 @@
enum RANGE { SHORT_RANGE, LONG_RANGE };
attack_type(const config& cfg);
- const std::string& name() const;
+ const t_string& name() const;
const std::string& type() const;
const std::string& special() const;
const std::string& icon() const;
@@ -102,7 +102,7 @@
private:
std::vector<unit_animation> animation_;
std::vector<unit_animation> direction_animation_[6];
- std::string name_;
+ t_string name_;
std::string type_;
std::string special_;
std::string icon_;
@@ -129,7 +129,7 @@
//for at least as long as the class instance
unit_movement_type(const config& cfg, const unit_movement_type*
parent=NULL);
- const std::string& name() const;
+ const t_string& name() const;
int movement_cost(const gamemap& map, gamemap::TERRAIN terrain, int
recurse_count=0) const;
int defense_modifier(const gamemap& map, gamemap::TERRAIN terrain, int
recurse_count=0) const;
int damage_against(const attack_type& attack) const;
@@ -171,11 +171,13 @@
std::string generate_description() const;
//the name of the unit in the current language setting
- std::string language_name() const;
+ const t_string& language_name() const;
- //unique identifier that doesn't have any whitespace
const std::string& id() const;
- const std::string& name() const;
+ //Disabling this one for consistency with other similar structures,
+ //where name() is always the user-visible, translated, name.
+ //language_name should eventually be renamed name()
+ // const std::string& name() const;
const std::string& image() const;
const std::string& image_halo() const;
const std::string& image_moving() const;
Index: wesnoth/src/variable.hpp
diff -u wesnoth/src/variable.hpp:1.3 wesnoth/src/variable.hpp:1.4
--- wesnoth/src/variable.hpp:1.3 Wed Mar 23 08:52:10 2005
+++ wesnoth/src/variable.hpp Sun Mar 27 23:06:17 2005
@@ -1,6 +1,8 @@
-/* $Id: variable.hpp,v 1.3 2005/03/23 08:52:10 silene Exp $ */
+/* $Id: variable.hpp,v 1.4 2005/03/27 23:06:17 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2005 by Philippe Plantier <address@hidden>
+
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
This program is free software; you can redistribute it and/or modify
@@ -14,15 +16,64 @@
#define VARIABLE_H_INCLUDED
#include <string>
+#include <vector>
class config;
+class t_string;
+class game_state;
-namespace game_events {
-std::string& get_variable(const std::string& varname);
-const std::string& get_variable_const(const std::string& varname);
-config& get_variable_cfg(const std::string& varname);
-
-void set_variable(const std::string& varname, const std::string& value);
+/**
+ * A variable-expanding proxy for the config class. This class roughly behaves
+ * as a constant config object, but automatically expands variables.
+ */
+class vconfig
+{
+public:
+ vconfig();
+ vconfig(const config* cfg);
+
+ vconfig& operator=(const vconfig cfg);
+ vconfig& operator=(const config* cfg);
+
+ bool null() const;
+ const config& get_config() const;
+ const config get_parsed_config() const;
+
+ typedef std::vector<vconfig> child_list;
+ child_list get_children(const std::string& key) const;
+ vconfig child(const std::string& key) const;
+
+ const t_string& operator[](const std::string&) const;
+ const t_string& expand(const std::string&) const; /** < Synonym for
operator[] */
+ const t_string& get_attribute(const std::string&) const;
+
+private:
+ const config* cfg_;
+};
+
+namespace variable
+{
+
+/**
+ * Used to for the functions in variable.cpp to locate the current global
+ * variable repository
+ */
+class manager
+{
+public:
+ manager(game_state* repository);
+ ~manager();
+};
+
+// Here should go a class which servers as a variable repository
+#if 0
+class repository
+{
+public:
+private:
+ config variables_;
+}
+#endif
}
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/fonts.cfg data/game.cfg data/scena...,
Philippe Plantier <=