Author: mog
Date: Tue May 20 20:42:22 2008
New Revision: 26739
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26739&view=rev
Log:
Really fix macro collision.
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.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=26739&r1=26738&r2=26739&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
Tue May 20 20:42:22 2008
@@ -1,5 +1,5 @@
#textdomain wesnoth-sotbe
-#define VILLAGE X Y
+#define SIDE_VILLAGE X Y
[village]
x={X}
y={Y}
@@ -86,19 +86,19 @@
team_name=villains
user_team_name=_"Villains"
{GOLD 300 350 400}
- {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}
+ {SIDE_VILLAGE 11 24}
+ {SIDE_VILLAGE 8 24}
+ {SIDE_VILLAGE 9 28}
+ {SIDE_VILLAGE 12 22}
+ {SIDE_VILLAGE 10 25}
+ {SIDE_VILLAGE 11 27}
+ {SIDE_VILLAGE 18 23}
+ {SIDE_VILLAGE 18 25}
+ {SIDE_VILLAGE 18 27}
+ {SIDE_VILLAGE 22 24}
+ {SIDE_VILLAGE 21 26}
+ {SIDE_VILLAGE 20 27}
+ {SIDE_VILLAGE 19 29}
[ai]
[leader_goal]
@@ -119,12 +119,12 @@
team_name=villains
user_team_name=_"Villains"
{GOLD 200 250 300}
- {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_VILLAGE 17 20}
+ {SIDE_VILLAGE 18 20}
+ {SIDE_VILLAGE 12 20}
+ {SIDE_VILLAGE 13 20}
+ {SIDE_VILLAGE 19 27}
+ {SIDE_VILLAGE 17 12}
[/side]
[story]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
