Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compile-fixes.

This commit is contained in:
Enno Rehling 2005-12-31 13:18:35 +00:00
parent 988a0078c4
commit d0d03c08af
4 changed files with 89 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/kernel/terrain.h
View File

@ -39,7 +39,6 @@ extern "C" {
#define SWIM_INTO (1<<8) /* man darf hierhin schwimmen */ #define SWIM_INTO (1<<8) /* man darf hierhin schwimmen */
#define WALK_INTO (1<<9) /* man darf hierhin laufen */ #define WALK_INTO (1<<9) /* man darf hierhin laufen */
#define LARGE_SHIPS (1<<10) /* grosse Schiffe dürfen hinfahren */ #define LARGE_SHIPS (1<<10) /* grosse Schiffe dürfen hinfahren */
#define AUTO_TERRAIN (1<<11) /* used by autoseed */
typedef struct production_rule { typedef struct production_rule {
char * name; char * name;

2
src/common/kernel/xmlreader.c
View File

@ -1545,7 +1545,7 @@ parse_terrains(xmlDocPtr doc)
if (xml_bvalue(node, "land", true)) terrain->flags |= LAND_REGION; if (xml_bvalue(node, "land", true)) terrain->flags |= LAND_REGION;
if (xml_bvalue(node, "forest", false)) terrain->flags |= FOREST_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; xpath->node = node;
xpathChildren = xmlXPathEvalExpression(BAD_CAST "herb", xpath); xpathChildren = xmlXPathEvalExpression(BAD_CAST "herb", xpath);

1
src/eressea/eressea-lua.vcproj
View File

@ -4,6 +4,7 @@
Version="7.10" Version="7.10"
Name="eressea-lua" Name="eressea-lua"
ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}" ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}"
RootNamespace="eressea-lua"
SccProjectName="" SccProjectName=""
SccLocalPath=""> SccLocalPath="">
<Platforms> <Platforms>

188
src/res/terrains.xml
View File

@ -1,102 +1,88 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<terrains> <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" --> <!-- 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="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">
<terrain name="plain" size="10000" road="50" shallow="no" forest="yes" cavalry="yes" seed="3"> <herb name="h0" />
<herb name="h0"/> <herb name="h1" />
<herb name="h1"/> <herb name="h2" />
<herb name="h2"/> <herb name="h3" />
<herb name="h3"/> <herb name="h4" />
<herb name="h4"/> <herb name="h5" />
<herb name="h5"/> <resource name="iron" chance="0.1" level="2d4-1" base="5d8" div="2d20+10" />
<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="stone" chance="0.15" level="1d4" base="5d8" div="2d30+20"/> <resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50" />
<resource name="laen" chance="0.01" level="1d4" base="1d4" div="2d20+50"/> </terrain>
</terrain> <terrain name="swamp" size="2000" road="75" seed="2">
<herb name="h6" />
<terrain name="swamp" size="2000" road="75" seed="2"> <herb name="h7" />
<herb name="h6"/> <herb name="h8" />
<herb name="h7"/> <resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10" />
<herb name="h8"/> <resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20" />
<resource name="iron" chance="0.02" level="2d4-1" base="5d8" div="2d20+10"/> <resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50" />
<resource name="stone" chance="0.02" level="1d4" base="5d8" div="2d30+20"/> </terrain>
<resource name="laen" chance="0.02" level="1d4" base="1d4" div="2d20+50"/> <terrain name="desert" size="1000" road="100" cavalry="yes" seed="2">
</terrain> <herb name="h9" />
<herb name="h10" />
<terrain name="desert" size="1000" road="100" cavalry="yes" seed="2"> <herb name="h11" />
<herb name="h9"/> <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
<herb name="h10"/> <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
<herb name="h11"/> <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10"/> </terrain>
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20"/> <terrain name="highland" size="4000" road="100" cavalry="yes" seed="2">
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50"/> <herb name="h12" />
</terrain> <herb name="h13" />
<herb name="h14" />
<terrain name="highland" size="4000" road="100" cavalry="yes" seed="2"> <resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10" />
<herb name="h12"/> <resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20" />
<herb name="h13"/> <resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50" />
<herb name="h14"/> </terrain>
<resource name="iron" chance="0.15" level="2d4-1" base="5d8" div="2d20+10"/> <terrain name="mountain" size="1000" road="250" seed="2">
<resource name="stone" chance="0.25" level="1d4" base="5d8" div="2d30+20"/> <herb name="h15" />
<resource name="laen" chance="0.025" level="1d4" base="1d4" div="2d20+50"/> <herb name="h16" />
</terrain> <herb name="h17" />
<resource name="iron" chance="1.0" level="1" base="50" div="50" />
<terrain name="mountain" size="1000" road="250" seed="2"> <resource name="stone" chance="1.0" level="1" base="100" div="100" />
<herb name="h15"/> <resource name="laen" chance="0.05" level="1" base="4" div="100" />
<herb name="h16"/> </terrain>
<herb name="h17"/> <terrain name="glacier" size="100" road="250" arctic="yes" seed="2">
<resource name="iron" chance="1.0" level="1" base="50" div="50"/> <herb name="h15" />
<resource name="stone" chance="1.0" level="1" base="100" div="100"/> <herb name="h16" />
<resource name="laen" chance="0.05" level="1" base="4" div="100"/> <herb name="h17" />
</terrain> <resource name="iron" chance="1.0" level="1" base="3" div="50" />
<resource name="stone" chance="1.0" level="1" base="2" div="100" />
<terrain name="glacier" size="100" road="250" arctic="yes" seed="2"> <resource name="laen" chance="0.05" level="1" base="4" div="100" />
<herb name="h15"/> </terrain>
<herb name="h16"/> <terrain name="iceberg_sleep" size="100" road="250" arctic="yes">
<herb name="h17"/> <herb name="h15" />
<resource name="iron" chance="1.0" level="1" base="3" div="50"/> <herb name="h16" />
<resource name="stone" chance="1.0" level="1" base="2" div="100"/> <herb name="h17" />
<resource name="laen" chance="0.05" level="1" base="4" div="100"/> <resource name="iron" chance="0.9" level="1" base="3" div="50" />
</terrain> <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 name="iceberg_sleep" size="100" road="250" arctic="yes"> </terrain>
<herb name="h15"/> <terrain name="iceberg" size="100" arctic="yes">
<herb name="h16"/> <herb name="h15" />
<herb name="h17"/> <herb name="h16" />
<resource name="iron" chance="0.9" level="1" base="3" div="50"/> <herb name="h17" />
<resource name="stone" chance="0.9" level="1" base="2" div="100"/> <resource name="iron" chance="0.9" level="1" base="3" div="50" />
<resource name="laen" chance="0.05" level="1" base="4" div="100"/> <resource name="stone" chance="0.9" level="1" base="2" div="100" />
</terrain> </terrain>
<terrain name="firewall" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes" />
<terrain name="iceberg" size="100" arctic="yes"> <terrain name="fog" sail="no" land="no" size="0" />
<herb name="h15"/> <terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0" />
<herb name="h16"/> <terrain name="volcano" size="500" road="250" seed="1">
<herb name="h17"/> <resource name="iron" chance="0.5" level="1" base="50" div="50" />
<resource name="iron" chance="0.9" level="1" base="3" div="50"/> <resource name="stone" chance="0.5" level="1" base="100" div="100" />
<resource name="stone" chance="0.9" level="1" base="2" div="100"/> <resource name="laen" chance="0.075" level="1" base="4" div="100" />
</terrain> </terrain>
<terrain name="activevolcano" size="500" road="250">
<terrain name="firewall" size="100" road="250" land="no" walk="no" sail="no" fly="no" forbidden="yes"/> <resource name="iron" chance="0.5" level="1" base="50" div="50" />
<resource name="stone" chance="0.5" level="1" base="100" div="100" />
<terrain name="fog" sail="no" land="no" size="0"/> <resource name="laen" chance="0.075" level="1" base="4" div="100" />
<terrain name="thickfog" forbidden="yes" sail="no" walk="no" fly="no" land="no" size="0"/> </terrain>
<!-- used for the museum only -->
<terrain name="volcano" size="500" road="250" seed="1"> <terrain name="hall1" sail="no" fly="no" size="0" />
<resource name="iron" chance="0.5" level="1" base="50" div="50"/> <terrain name="corridor1" sail="no" fly="no" size="0" />
<resource name="stone" chance="0.5" level="1" base="100" div="100"/> <terrain name="wall1" forbidden="yes" size="0" />
<resource name="laen" chance="0.075" level="1" base="4" div="100"/> </terrains>
</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>