diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index b3b4d3bfa..ae783f09d 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -1080,7 +1080,6 @@ extern const struct race * new_race[]; /* globale settings des Spieles */ typedef struct settings { const char *gamename; - const char *welcomepath; boolean unitsperalliance; unsigned int maxunits; struct attrib *attribs; diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 737bd9312..623e3d800 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -1895,12 +1895,6 @@ parse_main(xmlDocPtr doc) if (nodes->nodeNr>0) { xmlNodePtr node = nodes->nodeTab[0]; - property = xmlGetProp(node, BAD_CAST "welcome"); - if (property!=NULL) { - global.welcomepath = strdup((const char*)property); - xmlFree(property); - } - global.unitsperalliance = xml_bvalue(node, "unitsperalliance", false); global.producexpchance = (float)xml_fvalue(node, "learningbydoing", 1.0/3); global.maxunits = xml_ivalue(node, "units", INT_MAX); diff --git a/src/res/eressea.xml b/src/res/eressea.xml index d8b55f83c..cfca161ae 100644 --- a/src/res/eressea.xml +++ b/src/res/eressea.xml @@ -18,7 +18,7 @@ - + diff --git a/src/res/rts.xml b/src/res/rts.xml index 663d26478..ca1eb072a 100644 --- a/src/res/rts.xml +++ b/src/res/rts.xml @@ -19,7 +19,7 @@ - + @@ -89,23 +89,16 @@ - - - - - - - - eressea-server@eressea.upb.de - eressea-server@eressea.upb.de + rts-server@eressea.de + rts-server@eressea.de Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA BEFEHLE an eressea-server@eressea.upb.de zu senden. + ERESSEA BEFEHLE an rts-server@eressea.de zu senden. Remember to send your orders to - eressea-server@eressea.upb.de with the subject ERESSEA ORDERS. + rts-server@eressea.de with the subject ERESSEA ORDERS. ERESSEA BEFEHLE