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

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-04-19 12:35:25 -04:00
commit 992ebe1358
87 changed files with 473 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
changelog
View file

@ -13,11 +13,19 @@ Version 1.13.0-dev:
mechanism and applied to other CAs as well, but it was most visible in the
Micro AIs.
* Some internal reorganization of Micro AI code to facilitate customizing
MAIs for UMC and adding functionality from other versions of Wesnoth
them for UMC and adding functionality from other versions of Wesnoth. Some
code cleanup for consistency, readability and speed, as well as fixing of
some minor and subtle bugs.
* Campaigns:
* Changed all occurrences of {FLAG_VARIANT ragged} to {FLAG_VARIANT6 ragged}
* Eastern Invasion:
* In 'Captured', stolen gold won't be mentioned if the player had no
carryover gold.
* Son of the Black Eye: some minor changes
* S2: adjusted starting villages; scenario now ends if Kapou'e is already
on the signpost when the messenger comes back
* S3: make objectives consistent between before and after trolls appear
* S6: remove AI controller. It doesn't work with sides without a leader
* The Hammer of Thursagan:
* Fixed missing objective in 'The Court of Karrag'.
* Rebalanced scenarios 'Invaders', Mages and Drakes' and 'Fear'.
@ -90,12 +98,12 @@ Version 1.13.0-dev:
* Changed: Don't use the random generator for units with no names.
* Fix bug #21910: code for game is ready bell is corrected, simplified, and
moved to mp_connect::process_network_data.
* Deliver desktop notifications in tandem with "game is ready" bell and
* Deliver desktop notifications in tandem with "game is ready" bell and
also the "game has begun" bell.
* Disable notifications preference now works in all platforms, not just DBUS.
* Fix bug in which blindfold could cause OOS.
* Fix bug #21914: allow drake walking corpse variation to move on unwalkable
* Fix unnecessary "Mandatory WML Child not found" error when replay file
* Fix unnecessary "Mandatory WML Child not found" error when replay file
doesn't have a [carryover_sides_start] tag
* Server now generates PR 121 compliant replay files.
* Fix bug #21025: replay controller doesn't execute play_next_side properly

6
data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
View file

@ -98,7 +98,7 @@
{EBESIEGED_RECRUITMENT}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -116,7 +116,7 @@
[ai]
{AVOID_CHANTAL}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -134,7 +134,7 @@
[ai]
{AVOID_CHANTAL}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#allies of Konrad

2
data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
View file

@ -56,7 +56,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[story]

2
data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
View file

@ -67,7 +67,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Gharlsa starts with all villages north of the northernmost river

2
data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
View file

@ -51,7 +51,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[story]

2
data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
View file

@ -77,7 +77,7 @@
leader_value=3
village_value=1
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 9}

2
data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
View file

@ -91,7 +91,7 @@
grouping="offensive"
attack_depth="5"
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 4}

2
data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
View file

@ -133,7 +133,7 @@
{GOLD4 200 250 300 350}
{INCOME4 2 6 10 14}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
View file

@ -101,7 +101,7 @@
grouping=defensive
caution=0.9
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
View file

@ -125,7 +125,7 @@
gold=0
income=-10
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 99}

2
data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
View file

@ -46,7 +46,7 @@
recruitment_pattern=scout,scout,fighter
village_value=2 # they want to pillage!
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[story]

2
data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
View file

@ -57,7 +57,7 @@
aggression=0.0
caution=0.50
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{MEMOIRS_DEATHS}

2
data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
View file

@ -67,7 +67,7 @@
[/ai]
{GOLD 200 200 300}
team_name=baddies
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

4
data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
View file

@ -53,7 +53,7 @@
[ai]
villages_per_scout=15
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 4}
@ -70,7 +70,7 @@
[ai]
villages_per_scout=10
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 4}

2
data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
View file

@ -45,7 +45,7 @@
team_name=baddies
user_team_name= _ "Enemies"
{GOLD 150 200 250}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 1 4}

2
data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
View file

@ -124,7 +124,7 @@
{GOLD 250 290 370}
{INCOME 1 2 4}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

6
data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
View file

@ -94,7 +94,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -129,7 +129,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -164,7 +164,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

6
data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
View file

@ -95,7 +95,7 @@
#endif
{GOLD 150 260 330}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
type=Orcish Warrior
@ -117,7 +117,7 @@
#endif
{GOLD 150 250 300}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
type=Orcish Warrior
@ -165,7 +165,7 @@
{GOLD 150 250 300}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]
name=prestart

2
data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file

@ -88,7 +88,7 @@
caution=0.1
recruitment_pattern=fighter,archer,scout
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file

@ -59,7 +59,7 @@
caution=0.5
recruitment_pattern=scout,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES_ALL 2}

4
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file

@ -63,7 +63,7 @@
grouping=offensive
recruitment_pattern=mixed fighter,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -82,7 +82,7 @@
[ai]
aggression=0.7
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

4
data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
View file

@ -66,7 +66,7 @@
village_value=0.5
recruitment_pattern=scout,archer,archer,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 8}
@ -90,7 +90,7 @@
villages_per_scout=6
recruitment_pattern=archer,scout,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 8}

6
data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file

@ -85,7 +85,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 10}
@ -122,7 +122,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 7}
@ -159,7 +159,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 4 8}

2
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -64,7 +64,7 @@
villages_per_scout=8
village_value=0.5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
View file

@ -65,7 +65,7 @@
{GOLD 125 150 175}
team_name=monster
user_team_name=_"Monsters"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

2
data/campaigns/Eastern_Invasion/scenarios/06_Two_Paths.cfg
View file

@ -42,7 +42,7 @@
{INCOME 5 8 10}
team_name=evil
user_team_name=_"Evil"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 5}

2
data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
View file

@ -60,7 +60,7 @@
team_name=evil
user_team_name=_"Evil"
{GOLD 150 200 250}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
View file

@ -66,7 +66,7 @@
[ai]
grouping=no
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 9}

2
data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
View file

@ -72,7 +72,7 @@
[/ai]
team_name=bad
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

4
data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
View file

@ -53,7 +53,7 @@
recruitment_pattern=fighter,scout,fighter,scout
recruitment_ignore_bad_combat=yes
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Direwolf Rider" 3}
@ -99,7 +99,7 @@
recruitment_pattern=fighter,archer,fighter,mixed fighter
recruitment_ignore_bad_combat=yes
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 4 8}

6
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View file

@ -191,7 +191,7 @@
{EBESIEGED_RECRUITMENT}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -212,7 +212,7 @@
{HIGH_PRIORITY_TARGETS}
#endif
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -233,7 +233,7 @@
{HIGH_PRIORITY_TARGETS}
#endif
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#allies of Konrad

2
data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
View file

@ -108,7 +108,7 @@
[ai]
{ATTACK_DEPTH 1 3 5}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES_AREA 3 3 19 5}

2
data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
View file

@ -78,7 +78,7 @@
caution=0
grouping=no
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#make the orcs start with all the villages

4
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -72,7 +72,7 @@
team_name=orcs
user_team_name=_"Orcs"
{GOLD 30 60 110}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -88,7 +88,7 @@
[/ai]
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 14}

2
data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
View file

@ -89,7 +89,7 @@
caution=0.25
grouping=offensive
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#ifndef HARD

4
data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
View file

@ -200,7 +200,7 @@
team_name=orcs
user_team_name=_"Orcs"
{CROSSROADS_AI_PARAMS}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 18}
@ -222,7 +222,7 @@
[village]
x,y=39,27
[/village]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 17}

2
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View file

@ -122,7 +122,7 @@
value=100
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 5}

4
data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
View file

@ -101,7 +101,7 @@
{INCOME 2 4 8}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 5}
@ -127,7 +127,7 @@
{INCOME 2 4 8}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 5}

6
data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
View file

@ -80,7 +80,7 @@
[/ai]
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -100,7 +100,7 @@
[/ai]
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -120,7 +120,7 @@
grouping=no
caution=-5.0
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

6
data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
View file

@ -502,7 +502,7 @@
leader_value=50.0
villages_per_scout=0.0
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[/items]
[/chamber]
@ -622,7 +622,7 @@
{GOLD 30 40 50}
{INCOME 2 4 6}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[/items]
[/chamber]
@ -722,7 +722,7 @@
user_team_name=_"Orcs"
{GOLD 20 30 40}
{INCOME 2 4 6}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[/items]
[/chamber]

2
data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
View file

@ -96,7 +96,7 @@
#endif
team_name=evil
user_team_name=_"Evil"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 8}

2
data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
View file

@ -87,7 +87,7 @@
#ifdef HARD
recruit=Troll Warrior,Wolf Rider,Orcish Crossbowman
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 7}

2
data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
View file

@ -138,7 +138,7 @@
{INCOME 8 12 16}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
View file

@ -135,7 +135,7 @@
[/ai]
team_name=evil
user_team_name=_"Asheviere"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 13}

2
data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
View file

@ -116,7 +116,7 @@
[/ai]
team_name=evil
user_team_name=_"Asheviere"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
View file

@ -239,7 +239,7 @@ Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Guardsman#enddef
#enddef
#define ORC_SETUP
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
#enddef
#define DWARF_SETUP

2
data/campaigns/Liberty/scenarios/01_The_Raid.cfg
View file

@ -77,7 +77,7 @@
team_name=orcs
user_team_name=_"Orcs"
gold=25
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

2
data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
View file

@ -87,7 +87,7 @@
{GOLD 100 180 260}
team_name=bad_guys
user_team_name=_"Evil"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
View file

@ -94,7 +94,7 @@
fog=yes
share_maps=no
share_view=no
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#

2
data/campaigns/Liberty/scenarios/08_Glory.cfg
View file

@ -202,7 +202,7 @@
[/ai]
team_name=orcs_dammit
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 4 5}

2
data/campaigns/Liberty/scenarios/09_Epilogue.cfg
View file

@ -68,6 +68,6 @@
side=2
canrecruit=yes
recruit="Orcish Warrior"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
View file

@ -87,7 +87,7 @@
controller=human
{GOLD4 130 100 75 60}
recruit=Peasant,Woodsman
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[unit]
type=Peasant
id=Zlex

2
data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
View file

@ -53,7 +53,7 @@
team_name=rebels
user_team_name=_"Rebels"
shroud=yes
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Three sides for trolls, one lead by troll warrior

2
data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
View file

@ -127,7 +127,7 @@
side=2
{GOLD4 300 350 400 500}
recruit=Wolf Rider,Goblin Knight,Goblin Pillager
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

6
data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
View file

@ -162,7 +162,7 @@
leader_value=50
passive_leader=yes
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Sidekicks
@ -182,7 +182,7 @@
caution=-1.0
leader_value=50
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -201,7 +201,7 @@
caution=-1.0
leader_value=50
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Prestart event, we change Tallin to be of Sergeant line

2
data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file

@ -177,7 +177,7 @@
recruit=Orcish Grunt,Orcish Archer,Wolf Rider,Orcish Assassin,Troll Whelp
team_name=Orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Empty side for guarding units

2
data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
View file

@ -44,7 +44,7 @@
canrecruit=yes
side=2
no_leader=yes
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

8
data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
View file

@ -67,7 +67,7 @@
{INCOME4 25 35 45 55}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -81,7 +81,7 @@
{INCOME4 25 35 45 55}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -95,7 +95,7 @@
{INCOME4 25 35 45 55}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -109,7 +109,7 @@
{INCOME4 25 35 45 55}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Krash may not actually still be alive at this point, but setting up

2
data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
View file

@ -172,7 +172,7 @@
{GOLD4 1000 1500 2000 2500}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Empty sides - to ensure proper recall lists carryover

10
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -100,7 +100,7 @@
value=250
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 3}
# Sidekicks
@ -145,7 +145,7 @@
value=350
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 4}
@ -190,7 +190,7 @@
value=350
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 4 4}
@ -235,7 +235,7 @@
value=350
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 5 4}
@ -280,7 +280,7 @@
value=350
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 6 4}

4
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
View file

@ -73,7 +73,7 @@
[/ai]
team_name=orcs
user_team_name= _ "Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -95,7 +95,7 @@
[/ai]
team_name=orcs
user_team_name= _ "Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

4
data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
View file

@ -25,8 +25,6 @@
{BLACK_FLAG}
[/side]
{AI_CONTROLLER () 1 5 ()}
[side]
type=General
id=Slowhand
@ -138,8 +136,6 @@
bonus=yes
carryover_percentage=40
[/gold_carryover]
{AI_CONTROLLER_NOTE}
[/objectives]
[/event]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/07_The_Desert_of_Death.cfg
View file

@ -92,7 +92,7 @@
user_team_name=_"Villains"
canrecruit=yes
{GOLD 20 60 100} # There's quite a bit of income by the time they mobilize
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/13_The_Dwarvish_Stand.cfg
View file

@ -95,7 +95,7 @@
team_name=villains
user_team_name=_"Villains"
{GOLD 350 400 450}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[story]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
View file

@ -71,7 +71,7 @@
grouping="offensive"
attack_depth="5"
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
View file

@ -122,7 +122,7 @@
#ifdef HARD
recruit=Footpad, Thug, Outlaw, Bandit, Poacher, Trapper
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[story]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View file

@ -154,7 +154,7 @@
grouping=offensive
village_value=4
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# Here is the code for popping up random bandits on village

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
View file

@ -120,7 +120,7 @@
grouping=no
[/ai]
{GOLD 160 200 240} # BALANCE
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -157,7 +157,7 @@
grouping=no
[/ai]
{GOLD 160 200 240} # BALANCE
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
@ -193,7 +193,7 @@
grouping=no
[/ai]
{GOLD 160 200 240} # BALANCE
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
View file

@ -106,7 +106,7 @@
recruitment_pattern=fighter,fighter,archer,scout
{ATTACK_DEPTH 2 3 4}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 6}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -58,7 +58,7 @@
{GOLD 90 130 170}
team_name=wesfolk
user_team_name=_"Wesfolk"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 7}

2
data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
View file

@ -84,7 +84,7 @@
recruitment_pattern=scout,fighter,archer,archer
#endif
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 14}

4
data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
View file

@ -89,7 +89,7 @@
(fighter,archer,fighter,fighter)
(scout,fighter,archer,fighter,fighter)}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 21}
@ -119,7 +119,7 @@
#ifdef HARD
{NAMED_GENERIC_UNIT 2 Thief 18 22 () (_"Criminal")} {GUARDIAN}
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]

2
data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
View file

@ -104,7 +104,7 @@
#ifdef HARD
recruit=Footpad,Thief,Poacher,Vampire Bat,Skeleton,Skeleton Archer
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES_AREA 2 28 21 5}

2
data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
View file

@ -151,7 +151,7 @@
#ifdef HARD
recruit=Footpad,Thug,Poacher,Thief
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 9}

2
data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
View file

@ -77,7 +77,7 @@
{ATTACK_DEPTH 3 4 5}
[/ai]
recruit=Footpad, Thug
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# The Undead Hordes

2
data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
View file

@ -132,7 +132,7 @@
#ifdef HARD
recruit=Footpad, Thug, Outlaw, Bandit
#endif
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
View file

@ -137,7 +137,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
[/side]
[side]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
no_leader=yes
side=3
team_name=evil

2
data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
View file

@ -120,7 +120,7 @@ But I am still troubled. I wonder... is this sense of foreboding I feel merely a
#endif
team_name=evil
user_team_name=_"Enemies"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]

2
data/campaigns/Two_Brothers/scenarios/05_Epilogue.cfg
View file

@ -65,6 +65,6 @@ In the meantime, though, it’s good to relax and enjoy the peace."
side=2
canrecruit=yes
recruit="Orcish Warrior"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[/scenario]

2
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -78,7 +78,7 @@
[/criteria]
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
#Random monster side: ogres, scorpions

2
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -185,7 +185,7 @@
{AI_SIMPLE_ALWAYS_ASPECT scout_village_targeting 0}
{AI_SIMPLE_ALWAYS_ASPECT village_value 0}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 1 30}

6
data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
View file

@ -78,7 +78,7 @@
recruitment_pattern=scout,scout,fighter,fighter,archer,fighter
#endif
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# this orc tribe specialized in ranged combat
@ -118,7 +118,7 @@
recruitment_pattern=scout,fighter,archer,fighter,fighter,mixed fighter
#endif
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# this orc tribe specialized in melee combat
@ -153,7 +153,7 @@
aggression=0.5
recruitment_pattern=scout,fighter,archer,fighter,archer,mixed fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
# assassin's side

11
data/core/macros/image-utils.cfg
View file

@ -264,12 +264,23 @@
# Enable the specified flag variant: knalgan, loyalist, ragged,
# long, undead, or wood-elvish. Use within a [side] block; only
# affects that side.
# Since the ragged variant has six frames instead of the usual four,
# for that flag it's better to use FLAG_VARIANT6 below instead.
# wmlscope: start ignoring
flag=flags/{NAME}-flag-[1~4].png:150
flag_icon=flags/{NAME}-flag-icon.png
# wmlscope: stop ignoring
#enddef
#define FLAG_VARIANT6 NAME
# Like FLAG_VARIANT, but this supports flags with six frames.
# Currently only the ragged flag has six frames.
# wmlscope: start ignoring
flag=flags/{NAME}-flag-[1~6].png:150
flag_icon=flags/{NAME}-flag-icon.png
# wmlscope: stop ignoring
#enddef
#define ANIMATED_MAUSOLEUM X Y
# Embed this at scenario toplevel, not within an event.
# Note that it will freeze while dialogue popups are onscreen.

7
data/tools/wmllint
View file

@ -599,8 +599,11 @@ linechanges = (
("misc/schedule-underground.png","misc/time-schedules/schedule-underground.png"),
("misc/schedule-underground-illum.png","misc/time-schedules/schedule-underground-illum.png"),
("misc/tod-schedule-24hrs.png","misc/time-schedules/tod-schedule-24hrs.png")
("misc/tod-schedule-24hrs.png","misc/time-schedules/tod-schedule-24hrs.png"),
# Changed before 1.13.0 to fix frames for ragged flags
('FLAG_VARIANT ragged','FLAG_VARIANT6 ragged'),
('FLAG_VARIANT "ragged"','FLAG_VARIANT6 ragged')
)
def validate_on_pop(tagstack, closer, filename, lineno):

4
projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file

@ -7,7 +7,7 @@
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Release">
<Target title="release">
<Option output="../../wesnoth" prefix_auto="1" extension_auto="1" />
<Option working_dir="../../" />
<Option object_output=".objs-release" />
@ -22,7 +22,7 @@
<SilentBuild command="scons -C ../.. build=$target wesnoth" />
</MakeCommands>
</Target>
<Target title="Debug">
<Target title="debug">
<Option output="../../wesnoth-debug" prefix_auto="1" extension_auto="1" />
<Option working_dir="../../" />
<Option object_output=".objs-debug" />

216
projectfiles/VC9/README.txt
View file

@ -28,3 +28,219 @@ can be compiled using cmake+msvc9
7. open generated project file in msvc9 and compile. the project should
pick up changes in cmake files automatically. Also, you can re-run the
.bat file to regenerate it.
==========
Building the prerequisites
We'll assume to have two 'General Folders' for libraries and includes to store
most of the prerequisites. (Otherwise each configuration setting for each
project would need to have each and every 'lib' and 'include' folder added.)
C:\projects\_include
C:\projects\_lib
We'll now start downloading and compiling/copying the prerequisites into the necessary folders:
1. >=zlib-1.2.3 ( http://www.zlib.net/ )
Download the zlib source code
zlib123.zip
and unpack it into the projects folder to get:
C:\projects\zlib123\
Open the file zlib.dsw in the folder
C:\projects\zlib123\projects\visualc6\
with MSVC and select 'Yes To All' to convert it into a VC9 project.
Open the properties of the 'zlib' solution and in the
'Configuration Properties' select the 'DLL Release'
'Configuration'. Select 'OK' and then right-click the 'zlib'
project and select 'Build'. After a successful Build, close that
instance of MSVC.
2. >=libsdl-1.2.7 ( http://www.libsdl.org )
Download the development library file for Win32 as well as the
source code
SDL-1.2.13.zip
SDL-devel-1.2.13-VC8.zip
and unpack them into the projects folder to get:
C:\projects\SDL-1.2.13\
Copy the 'SDL.dll' and the 'SDL.lib' from the 'lib' folder
and the contents of 'include' folder into the corresponding
'General Folder' ( ...\_include\ resp. ...\_lib\ ).
Unpack the 'VisualC.zip' and open the 'SDL.sln' file with MSVC.
Follow the instructions to convert the project to VC9.
Right-click the 'SDLmain' project and select 'Build'. After a
successful Build, close that instance of MSVC.
Copy 'SDLmain.lib' from
C:\projects\SDL-1.2.13\VisualC\SDLmain\Debug
into the 'lib' 'General Folder'.
3. >=libboost-1.33.0 ( http://www.boost.org/ )
Download Boost and unpack it into the folder
C:\projects\
This should give you a folder structure like
C:\projects\boost_1_38_0\
Download the pre-built bjam executable
boost-jam-3.1.17-1-ntx86.zip
from the bjam download page on sourceforge
http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941
and unpack and move the bjam executable it into the base folder
of boost
C:\projects\boost_1_38_0\
Now start the command prompt (CMD.exe) and invoke the following
commands:
C:\> set ZLIB_SOURCE=C:\projects\zlib123\
C:\> set ZLIB_LIBPATH=C:\projects\zlib123\projects\visualc6\Win32_DLL_Release
C:\> set ZLIB_BINARY=zlib1.dll
C:\> cd C:\projects\boost_1_38_0
C:\projects\boost_1_38_0> bjam ^
More? --toolset=msvc ^
More? --build-type=complete ^
More? --prefix="C:\projects\Boost\" install
If the upper last command doesn't work, replace the last line with:
--prefix="C:\projects\Boost" install
Now bjam will compile all variants of the boost library binaries
for MSVC 2008 and copies them into the folder
C:\projects\Boost\lib\
while all required headers are copied into
C:\projects\Boost\include\boost-1_38\boost
Use the time bjam is busy compiling (possibly several hours) as
you wish. (It is possible to continue downloading and copying
the include and lib files since all required compiling is done.)
Once bjam has finished building/copying, you then can delete
the folder
C:\projects\boost_1_38_0\
to free up space.
4. >=sdl-image-1.2 (with PNG support)
( http://www.libsdl.org/projects/SDL_image )
Download the binary file for Win32
SDL_image-devel-1.2.7-VC9.zip
and unpack it into the projects folder to get:
C:\projects\SDL_image-1.2.7\
Copy the contents of each the 'lib' and the 'include' folder
into the corresponding 'General Folder'.
5. >=sdl-mixer-1.2 (with Vorbis support)
( http://www.libsdl.org/projects/SDL_mixer )
Download the binary file for Win32
SDL_mixer-devel-1.2.8-VC8.zip
and unpack it into the projects folder to get:
C:\projects\SDL_mixer-1.2.8\
Copy the contents of each the 'lib' and the 'include' folder
into the corresponding 'General Folder'.
6. >=sdl-net-1.2 ( http://www.libsdl.org/projects/SDL_net )
Download the binary file for Win32
SDL_net-devel-1.2.7-VC8.zip
and unpack it into the projects folder to get:
C:\projects\SDL_net-1.2.7\
Copy the contents of each the 'lib' and the 'include' folder
into the corresponding 'General Folder'.
7. >=sdl-ttf-2.0.8 ( http://www.libsdl.org/projects/SDL_ttf )
Download the binary file for Win32
SDL_ttf-devel-2.0.9-VC8.zip
and unpack it into the projects folder to get:
C:\projects\SDL_ttf-2.0.9\
Copy the contents of each the 'lib' and the 'include' folder
into the corresponding 'General Folder'.
8. >=libintl-0.14.4
( http://gnuwin32.sourceforge.net/packages/gettext.htm )
Download the 'Binaries', 'Dependencies' and the
'Developer files'
gettext-0.14.4-bin.zip
gettext-0.14.4-dep.zip
gettext-0.14.4-lib.zip
and unpack them all into the projects folder to get:
C:\projects\gettext-0.14.4\
Copy the contents of each the 'lib' and the 'include' folder
into the corresponding 'General Folder'.
Copy all dll's from the 'bin' folder into the '_lib'
'General Folder'.
9. >=libfontconfig-2.4.1
( http://www.gtk.org/download-windows.html )
Download the 'Fontconfig' package 'Binaries' from the
'Third Party Dependencies'
fontconfig-2.4.2-tml-20071015.zip
and unpack it into the projects folder to get:
C:\projects\fontconfig-2.4.2\
Copy the 'libfontconfig-1.dll' from the 'bin' folder into the
'lib' 'General Folder'.
10. >=lua-5.1.4 ( http://luabinaries.luaforge.net/download.html )
Download the 'Windows x86 DLL and Includes (Visual C++ 2005
Compatible)'
lua5_1_4_Win32_dll8_lib.zip
and unpack it into the projects folder to get:
C:\projects\lua-5.1.4\
Copy the dll's and the lib's into the 'lib' 'General Folder' and
the content of the 'include' folder into the corresponding '
General Folder'.
11. >=pangocairo-1.24.4 ( http://www.gtk.org/download-windows.html )
Download the following 'Binaryies' and 'Dev' packages from the
'GTK+ individual packages'
cairo_1.8.6-1_win32.zip
cairo-dev_1.8.6-1_win32.zip
glib_2.20.0-1_win32.zip
glib-dev_2.20.0-1_win32.zip
pango_1.24.0-1_win32.zip
pango-dev_1.24.0-1_win32.zip
and unpack them into the projects folder to get:
C:\projects\pangocairo\
Copy all dll's from the 'bin' folder into the '_lib'
'General Folder'.
Copy the contents (but not the subfolders) of the 'lib' folder
into the corresponding 'General Folder'.
Copy the 'glibconfig.h' file from
C:\projects\pangocairo\lib\glib-2.0\include into the '_include'
'General Folder'.
Copy the contens (including subfolders) of the following folders
into the '_include' 'General Folder':
C:\projects\pangocairo\include\cairo
C:\projects\pangocairo\include\glib-2.0
C:\projects\pangocairo\include\pango-1.0

112
projectfiles/VC9/wesnoth.vcproj
View file

@ -19325,6 +19325,118 @@
RelativePath="..\..\src\sdl\compat.hpp"
>
</File>
<File
RelativePath="..\..\src\sdl\exception.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\sdl\exception.hpp"
>
</File>
<File
RelativePath="..\..\src\sdl\texture.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\SDL\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\sdl\texture.hpp"
>
</File>
<File
RelativePath="..\..\src\sdl\window.cpp"
>