diff --git a/src/common/kernel/terrain.h b/src/common/kernel/terrain.h index 31b8b6b15..b00bc247d 100644 --- a/src/common/kernel/terrain.h +++ b/src/common/kernel/terrain.h @@ -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; diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 308e6aa97..d7e1914c6 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -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); diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj index 959dfd909..0a952a739 100644 --- a/src/eressea/eressea-lua.vcproj +++ b/src/eressea/eressea-lua.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="eressea-lua" ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}" + RootNamespace="eressea-lua" SccProjectName="" SccLocalPath=""> diff --git a/src/res/terrains.xml b/src/res/terrains.xml index f820e9a1f..bc277ec78 100644 --- a/src/res/terrains.xml +++ b/src/res/terrains.xml @@ -1,102 +1,88 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file