Author: esr
Date: Sun Mar 23 15:27:28 2008
New Revision: 25018
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25018&view=rev
Log:
Clean up macro so typechecking doesn't barf.
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/scen1/scenario_start.cfg
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/scen1/scenario_start.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/scen1/scenario_start.cfg?rev=25018&r1=25017&r2=25018&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/scen1/scenario_start.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/scen1/scenario_start.cfg
Sun Mar 23 15:27:28 2008
@@ -4,10 +4,10 @@
# macro for setting up the village occupants
-#define VILLAGE_EVENT TYPE NAME GENDER
+#define VILLAGE_EVENT TYPE NAME_STRING GENDER_NAME
{VARIABLE elf_pool[$elf_pool_counter].type {TYPE}}
- {VARIABLE elf_pool[$elf_pool_counter].name {NAME}}
- {VARIABLE elf_pool[$elf_pool_counter].gender {GENDER}}
+ {VARIABLE elf_pool[$elf_pool_counter].name {NAME_STRING}}
+ {VARIABLE elf_pool[$elf_pool_counter].gender {GENDER_NAME}}
{VARIABLE_OP elf_pool_counter add 1}
#enddef
@@ -44,14 +44,14 @@
{VARIABLE elf_pool_counter 0}
# Elves in the pool - 2 fighters, 2 archers, 2 hunters, 2 scouts
- {VILLAGE_EVENT "Desert Fighter" _"Lrea" "female"}
- {VILLAGE_EVENT "Desert Fighter" _"Piyru" "male"}
- {VILLAGE_EVENT "Desert Archer" _"Frea" "female"}
- {VILLAGE_EVENT "Desert Archer" _"Danu" "male"}
- {VILLAGE_EVENT "Desert Hunter" _"Hamuil" "male"}
- {VILLAGE_EVENT "Desert Hunter" _"Anioh" "male"}
- {VILLAGE_EVENT "Desert Scout" _"Vemuil" "male"}
- {VILLAGE_EVENT "Desert Scout" _"Taliu" "male"}
+ {VILLAGE_EVENT "Desert Fighter" _"Lrea" female}
+ {VILLAGE_EVENT "Desert Fighter" _"Piyru" male}
+ {VILLAGE_EVENT "Desert Archer" _"Frea" female}
+ {VILLAGE_EVENT "Desert Archer" _"Danu" male}
+ {VILLAGE_EVENT "Desert Hunter" _"Hamuil" male}
+ {VILLAGE_EVENT "Desert Hunter" _"Anioh" male}
+ {VILLAGE_EVENT "Desert Scout" _"Vemuil" male}
+ {VILLAGE_EVENT "Desert Scout" _"Taliu" male}
[/event]
#undef VILLAGE_EVENT
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
