forked from github/server
Compile-fixes.
This commit is contained in:
parent
988a0078c4
commit
d0d03c08af
|
@ -39,7 +39,6 @@ extern "C" {
|
|||
#define SWIM_INTO (1<<8) /* man darf hierhin schwimmen */
|
||||
#define WALK_INTO (1<<9) /* man darf hierhin laufen */
|
||||
#define LARGE_SHIPS (1<<10) /* grosse Schiffe dürfen hinfahren */
|
||||
#define AUTO_TERRAIN (1<<11) /* used by autoseed */
|
||||
|
||||
typedef struct production_rule {
|
||||
char * name;
|
||||
|
|
|
@ -1545,7 +1545,7 @@ parse_terrains(xmlDocPtr doc)
|
|||
if (xml_bvalue(node, "land", true)) terrain->flags |= LAND_REGION;
|
||||
if (xml_bvalue(node, "forest", false)) terrain->flags |= FOREST_REGION;
|
||||
|
||||
terrain->distribution = (short)xml_ivalue(node, "seed", 0) terrain->flags |= AUTO_TERRAIN;
|
||||
terrain->distribution = (short)xml_ivalue(node, "seed", 0);
|
||||
|
||||
xpath->node = node;
|
||||
xpathChildren = xmlXPathEvalExpression(BAD_CAST "herb", xpath);
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
Version="7.10"
|
||||
Name="eressea-lua"
|
||||
ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}"
|
||||
RootNamespace="eressea-lua"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
|
|
|
@ -1,102 +1,88 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<terrains>
|
||||
<!-- defaults: walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" -->
|
||||
<terrain name="ocean" size="100" shallow="no" walk="no" swim="yes" land="no" sea="yes"/>
|
||||
|
||||
<terrain name="plain" size="10000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3">
|
||||
<herb name="h0"/>
|
||||
<herb name="h1"/>
|
||||
<herb name="h2"/>
|
||||
<herb name="h3"/>
|
||||
<herb name="h4"/>
|
||||
<herb name="h5"/>
|
||||
<resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10"/>
|
||||
<resource name="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20"/>
|
||||
<resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="swamp" size="2000" road="75" seed="2">
|
||||
<herb name="h6"/>
|
||||
<herb name="h7"/>
|
||||
<herb name="h8"/>
|
||||
<resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10"/>
|
||||
<resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20"/>
|
||||
<resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="desert" size="1000" road="100" cavalry="yes" seed="2">
|
||||
<herb name="h9"/>
|
||||
<herb name="h10"/>
|
||||
<herb name="h11"/>
|
||||
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10"/>
|
||||
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20"/>
|
||||
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="highland" size="4000" road="100" cavalry="yes" seed="2">
|
||||
<herb name="h12"/>
|
||||
<herb name="h13"/>
|
||||
<herb name="h14"/>
|
||||
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10"/>
|
||||
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20"/>
|
||||
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="mountain" size="1000" road="250" seed="2">
|
||||
<herb name="h15"/>
|
||||
<herb name="h16"/>
|
||||
<herb name="h17"/>
|
||||
<resource name="iron" chance="1.0" level="1" base="50" div="50"/>
|
||||
<resource name="stone" chance="1.0" level="1" base="100" div="100"/>
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="glacier" size="100" road="250" arctic="yes" seed="2">
|
||||
<herb name="h15"/>
|
||||
<herb name="h16"/>
|
||||
<herb name="h17"/>
|
||||
<resource name="iron" chance="1.0" level="1" base="3" div="50"/>
|
||||
<resource name="stone" chance="1.0" level="1" base="2" div="100"/>
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="iceberg_sleep" size="100" road="250" arctic="yes">
|
||||
<herb name="h15"/>
|
||||
<herb name="h16"/>
|
||||
<herb name="h17"/>
|
||||
<resource name="iron" chance="0.9" level="1" base="3" div="50"/>
|
||||
<resource name="stone" chance="0.9" level="1" base="2" div="100"/>
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="iceberg" size="100" arctic="yes">
|
||||
<herb name="h15"/>
|
||||
<herb name="h16"/>
|
||||
<herb name="h17"/>
|
||||
<resource name="iron" chance="0.9" level="1" base="3" div="50"/>
|
||||
<resource name="stone" chance="0.9" level="1" base="2" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="firewall" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes"/>
|
||||
|
||||
<terrain name="fog" sail="no" land="no" size="0"/>
|
||||
<terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0"/>
|
||||
|
||||
<terrain name="volcano" size="500" road="250" seed="1">
|
||||
<resource name="iron" chance="0.5" level="1" base="50" div="50"/>
|
||||
<resource name="stone" chance="0.5" level="1" base="100" div="100"/>
|
||||
<resource name="laen" chance="0.075" level="1" base="4" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<terrain name="activevolcano" size="500" road="250">
|
||||
<resource name="iron" chance="0.5" level="1" base="50" div="50"/>
|
||||
<resource name="stone" chance="0.5" level="1" base="100" div="100"/>
|
||||
<resource name="laen" chance="0.075" level="1" base="4" div="100"/>
|
||||
</terrain>
|
||||
|
||||
<!-- used for the museum only -->
|
||||
<terrain name="hall1" sail="no" fly="no" size="0"/>
|
||||
<terrain name="corridor1" sail="no" fly="no" size="0"/>
|
||||
<terrain name="wall1" forbidden="yes" size="0"/>
|
||||
|
||||
<terrains xmlns="http://tempuri.org/terrains.xsd">
|
||||
<!-- defaults: walk="yes" sail="yes" fly="yes" shallow="yes" swim="no" forest="no" sea="no" land="yes" forbidden="no" arctic="no" cavalry="no" -->
|
||||
<terrain name="ocean" size="100" shallow="no" walk="no" swim="yes" land="no" sea="yes" />
|
||||
<terrain name="plain" size="10000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3">
|
||||
<herb name="h0" />
|
||||
<herb name="h1" />
|
||||
<herb name="h2" />
|
||||
<herb name="h3" />
|
||||
<herb name="h4" />
|
||||
<herb name="h5" />
|
||||
<resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10" />
|
||||
<resource name="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20" />
|
||||
<resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50" />
|
||||
</terrain>
|
||||
<terrain name="swamp" size="2000" road="75" seed="2">
|
||||
<herb name="h6" />
|
||||
<herb name="h7" />
|
||||
<herb name="h8" />
|
||||
<resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10" />
|
||||
<resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20" />
|
||||
<resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50" />
|
||||
</terrain>
|
||||
<terrain name="desert" size="1000" road="100" cavalry="yes" seed="2">
|
||||
<herb name="h9" />
|
||||
<herb name="h10" />
|
||||
<herb name="h11" />
|
||||
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
|
||||
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
|
||||
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
|
||||
</terrain>
|
||||
<terrain name="highland" size="4000" road="100" cavalry="yes" seed="2">
|
||||
<herb name="h12" />
|
||||
<herb name="h13" />
|
||||
<herb name="h14" />
|
||||
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
|
||||
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
|
||||
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
|
||||
</terrain>
|
||||
<terrain name="mountain" size="1000" road="250" seed="2">
|
||||
<herb name="h15" />
|
||||
<herb name="h16" />
|
||||
<herb name="h17" />
|
||||
<resource name="iron" chance="1.0" level="1" base="50" div="50" />
|
||||
<resource name="stone" chance="1.0" level="1" base="100" div="100" />
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100" />
|
||||
</terrain>
|
||||
<terrain name="glacier" size="100" road="250" arctic="yes" seed="2">
|
||||
<herb name="h15" />
|
||||
<herb name="h16" />
|
||||
<herb name="h17" />
|
||||
<resource name="iron" chance="1.0" level="1" base="3" div="50" />
|
||||
<resource name="stone" chance="1.0" level="1" base="2" div="100" />
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100" />
|
||||
</terrain>
|
||||
<terrain name="iceberg_sleep" size="100" road="250" arctic="yes">
|
||||
<herb name="h15" />
|
||||
<herb name="h16" />
|
||||
<herb name="h17" />
|
||||
<resource name="iron" chance="0.9" level="1" base="3" div="50" />
|
||||
<resource name="stone" chance="0.9" level="1" base="2" div="100" />
|
||||
<resource name="laen" chance="0.05" level="1" base="4" div="100" />
|
||||
</terrain>
|
||||
<terrain name="iceberg" size="100" arctic="yes">
|
||||
<herb name="h15" />
|
||||
<herb name="h16" />
|
||||
<herb name="h17" />
|
||||
<resource name="iron" chance="0.9" level="1" base="3" div="50" />
|
||||
<resource name="stone" chance="0.9" level="1" base="2" div="100" />
|
||||
</terrain>
|
||||
<terrain name="firewall" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
|
||||
<terrain name="fog" sail="no" land="no" size="0" />
|
||||
<terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0" />
|
||||
<terrain name="volcano" size="500" road="250" seed="1">
|
||||
<resource name="iron" chance="0.5" level="1" base="50" div="50" />
|
||||
<resource name="stone" chance="0.5" level="1" base="100" div="100" />
|
||||
<resource name="laen" chance="0.075" level="1" base="4" div="100" />
|
||||
</terrain>
|
||||
<terrain name="activevolcano" size="500" road="250">
|
||||
<resource name="iron" chance="0.5" level="1" base="50" div="50" />
|
||||
<resource name="stone" chance="0.5" level="1" base="100" div="100" />
|
||||
<resource name="laen" chance="0.075" level="1" base="4" div="100" />
|
||||
</terrain>
|
||||
<!-- used for the museum only -->
|
||||
<terrain name="hall1" sail="no" fly="no" size="0" />
|
||||
<terrain name="corridor1" sail="no" fly="no" size="0" />
|
||||
<terrain name="wall1" forbidden="yes" size="0" />
|
||||
</terrains>
|
Loading…
Reference in New Issue