Author: mog
Date: Sat May 17 17:49:59 2008
New Revision: 26675
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26675&view=rev
Log:
Fix collision of macro names.
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
trunk/data/core/terrain-graphics/base.cfg
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg?rev=26675&r1=26674&r2=26675&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
Sat May 17 17:49:59 2008
@@ -86,19 +86,19 @@
team_name=villains
user_team_name=_"Villains"
{GOLD 300 350 400}
- {VILLAGE 11 24}
- {VILLAGE 8 24}
- {VILLAGE 9 28}
- {VILLAGE 12 22}
- {VILLAGE 10 25}
- {VILLAGE 11 27}
- {VILLAGE 18 23}
- {VILLAGE 18 25}
- {VILLAGE 18 27}
- {VILLAGE 22 24}
- {VILLAGE 21 26}
- {VILLAGE 20 27}
- {VILLAGE 19 29}
+ {OWN_VILLAGE 11 24}
+ {OWN_VILLAGE 8 24}
+ {OWN_VILLAGE 9 28}
+ {OWN_VILLAGE 12 22}
+ {OWN_VILLAGE 10 25}
+ {OWN_VILLAGE 11 27}
+ {OWN_VILLAGE 18 23}
+ {OWN_VILLAGE 18 25}
+ {OWN_VILLAGE 18 27}
+ {OWN_VILLAGE 22 24}
+ {OWN_VILLAGE 21 26}
+ {OWN_VILLAGE 20 27}
+ {OWN_VILLAGE 19 29}
[ai]
[leader_goal]
@@ -119,12 +119,12 @@
team_name=villains
user_team_name=_"Villains"
{GOLD 200 250 300}
- {VILLAGE 17 20}
- {VILLAGE 18 20}
- {VILLAGE 12 20}
- {VILLAGE 13 20}
- {VILLAGE 19 27}
- {VILLAGE 17 12}
+ {OWN_VILLAGE 17 20}
+ {OWN_VILLAGE 18 20}
+ {OWN_VILLAGE 12 20}
+ {OWN_VILLAGE 13 20}
+ {OWN_VILLAGE 19 27}
+ {OWN_VILLAGE 17 12}
[/side]
[story]
Modified: trunk/data/core/terrain-graphics/base.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/base.cfg?rev=26675&r1=26674&r2=26675&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/base.cfg (original)
+++ trunk/data/core/terrain-graphics/base.cfg Sat May 17 17:49:59 2008
@@ -32,9 +32,6 @@
#define TERRAIN_BASE_PROB TERRAIN_PATTERN IMAGESTEM PROB
{TERRAIN_BASE_PROB_FL ({TERRAIN_PATTERN}) {IMAGESTEM} {PROB} base -1000}
-#enddef
-#define TERRAIN_BASE TERRAIN_PATTERN IMAGESTEM
- {TERRAIN_BASE_FL ({TERRAIN_PATTERN}) {IMAGESTEM} base -1000}
#enddef
#define TERRAIN_BASE_PROB_OV TERRAIN_PATTERN IMAGESTEM PROB
{TERRAIN_BASE_PROB_FL ({TERRAIN_PATTERN}) {IMAGESTEM} {PROB} overlay -80}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
