Author: fendrin
Date: Mon May 30 18:32:01 2011
New Revision: 49706
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49706&view=rev
Log:
Removed a backwards compatability hack that spammed stdout with warnings.
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_Mountains.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_The_Elvish_Treasury.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_The_Saurian_Treasury.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_Last_Stand.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_Hunters.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_Book.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_Front.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_Must_Die.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_Siege.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/20_Council_Ruling.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
trunk/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg Mon
May 30 18:32:01 2011
@@ -50,7 +50,7 @@
{DEFAULT_SCHEDULE}
{STARTING_VILLAGES 2 50}
- {LOW_PRESTART}
+# {LOW_PRESTART}
victory_when_enemies_defeated=no
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_Mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_Mountains.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_Mountains.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_Mountains.cfg
Mon May 30 18:32:01 2011
@@ -39,7 +39,7 @@
{STARTING_VILLAGES_ALL 3}
{STARTING_VILLAGES_DWARF 2}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
@@ -446,11 +446,12 @@
{ai/aliases/stable_singleplayer.cfg}
[ai]
-#ifdef EASY
+#TODO enable after the bug with the
AI_SIMPLE_FORMULA_AI_EXPERIMENTAL_RECRUITMENT macro is fixed.
+##ifdef EASY
{AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter"}
-#else
- {AI_SIMPLE_FORMULA_AI_EXPERIMENTAL_RECRUITMENT}
-#endif
+##else
+ # {AI_SIMPLE_FORMULA_AI_EXPERIMENTAL_RECRUITMENT}
+##endif
[goal]
[criteria]
race=elf
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
Mon May 30 18:32:01 2011
@@ -37,7 +37,7 @@
experience_modifier=100
name= _ "Kaâlian under Attack"
- {LOW_PRESTART}
+# {LOW_PRESTART}
#### Map setup ####
{LOW_MAP Kalian.map}
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_The_Elvish_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_The_Elvish_Treasury.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_The_Elvish_Treasury.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_The_Elvish_Treasury.cfg
Mon May 30 18:32:01 2011
@@ -42,7 +42,7 @@
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC silvan_sanctuary.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_The_Saurian_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_The_Saurian_Treasury.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
---
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_The_Saurian_Treasury.cfg
(original)
+++
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_The_Saurian_Treasury.cfg
Mon May 30 18:32:01 2011
@@ -50,7 +50,7 @@
{STARTING_VILLAGES_ALL 2}
{STARTING_VILLAGES 3 20}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
---
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
(original)
+++
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
Mon May 30 18:32:01 2011
@@ -37,7 +37,7 @@
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
{EXTRA_SCENARIO_MUSIC northerners.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_Last_Stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_Last_Stand.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_Last_Stand.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_Last_Stand.cfg
Mon May 30 18:32:01 2011
@@ -67,7 +67,7 @@
{LOW_MASK 07_Elves_Last_Stand.mask 1 1}
{campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
### /Map Setup ###
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_Hunters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_Hunters.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_Hunters.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_Hunters.cfg Mon
May 30 18:32:01 2011
@@ -39,7 +39,7 @@
{EXTRA_SCENARIO_MUSIC battle.ogg}
#TODO redo music playlist
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
#ifdef MULTIPLAYER
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
Mon May 30 18:32:01 2011
@@ -40,7 +40,7 @@
{EXTRA_SCENARIO_MUSIC northern_mountains.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_Book.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_Book.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_Book.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_Book.cfg
Mon May 30 18:32:01 2011
@@ -34,7 +34,7 @@
{EXTRA_SCENARIO_MUSIC suspense.ogg}
{EXTRA_SCENARIO_MUSIC into_the_shadows.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_Front.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_Front.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_Front.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_Front.cfg
Mon May 30 18:32:01 2011
@@ -27,7 +27,7 @@
{DEFAULT_SCHEDULE}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg Mon
May 30 18:32:01 2011
@@ -31,7 +31,7 @@
{LOW_MAP 14_Human_Alliance.map}
#shortens the map on the left border for the later reenforcements
- {LOW_PRESTART}
+# {LOW_PRESTART}
#define LOAD_SUBMAP X_SPAN Y_SPAN OFFSET_X OFFSET_Y
[store_unit]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_Must_Die.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_Must_Die.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_Must_Die.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_Must_Die.cfg
Mon May 30 18:32:01 2011
@@ -33,7 +33,7 @@
{DAWN}
next_scenario=17_Breaking_the_Siege
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_Siege.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_Siege.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_Siege.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_Siege.cfg
Mon May 30 18:32:01 2011
@@ -27,7 +27,7 @@
{EXTRA_SCENARIO_MUSIC northerners.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
{./North_elves_utils.cfg}
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg Mon
May 30 18:32:01 2011
@@ -39,7 +39,7 @@
{DEFAULT_SCHEDULE}
- {LOW_PRESTART}
+# {LOW_PRESTART}
next_scenario=20_Council_Ruling
[story]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/20_Council_Ruling.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/20_Council_Ruling.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/20_Council_Ruling.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/20_Council_Ruling.cfg Mon
May 30 18:32:01 2011
@@ -8,7 +8,7 @@
{SCENARIO_MUSIC "transience.ogg"}
- {LOW_PRESTART}
+# {LOW_PRESTART}
# wmllint: directory spelling Uradredia
[story]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
Mon May 30 18:32:01 2011
@@ -30,7 +30,7 @@
{DEFAULT_SCHEDULE}
- {LOW_PRESTART}
+# {LOW_PRESTART}
next_scenario=22_Northern_Battle
[story]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg Mon
May 30 18:32:01 2011
@@ -30,7 +30,7 @@
{EXTRA_SCENARIO_MUSIC weight_of_revenge.ogg}
{EXTRA_SCENARIO_MUSIC casualties_of_war.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
[story]
[part]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg Mon May
30 18:32:01 2011
@@ -25,7 +25,7 @@
{EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC casualties_of_war.ogg}
- {LOW_PRESTART}
+# {LOW_PRESTART}
next_scenario=24_Epilogue
[story]
Modified: trunk/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg?rev=49706&r1=49705&r2=49706&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg (original)
+++ trunk/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg Mon May 30
18:32:01 2011
@@ -174,14 +174,14 @@
#enddef
#TODO remove the hack before the release of 1.10
-#define LOW_PRESTART
- #this is needed to allow old saves (where the leaders can't recruit) to
pick canrecrut="yes"
- [event]
- name=prestart
- {LOW_ENSURE_CANRECRUIT}
- {LOW_ENSURE_NOT_HERO}
- [/event]
-#enddef
+##define LOW_PRESTART
+# #this is needed to allow old saves (where the leaders can't recruit) to
pick canrecrut="yes"
+# [event]
+# name=prestart
+# {LOW_ENSURE_CANRECRUIT}
+# {LOW_ENSURE_NOT_HERO}
+# [/event]
+##enddef
#define STORE_SIDE SIDE
[store_unit]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits