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

http://eressea.upb.de/mantis/view.php?id=950 

"missing info texts (newbie_info_1, etc)"
xi:include should not use file= but href=. fixed in all games.
This commit is contained in:
Enno Rehling 2006-07-24 23:07:28 +00:00
parent 02b012ed47
commit 25dcc85f66
9 changed files with 108 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1886,74 +1886,78 @@ parse_main(xmlDocPtr doc)
int i;
xmlChar * property;
xmlNodePtr node = nodes->nodeTab[0];
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);
}
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.maxunits = xml_ivalue(node, "units", INT_MAX);
global.unitsperalliance = xml_bvalue(node, "unitsperalliance", false);
global.maxunits = xml_ivalue(node, "units", INT_MAX);
property = xmlGetProp(node, BAD_CAST "name");
if (property!=NULL) {
global.gamename = strdup((const char*)property);
xmlFree(property);
}
property = xmlGetProp(node, BAD_CAST "name");
if (property!=NULL) {
global.gamename = strdup((const char*)property);
xmlFree(property);
}
xmlXPathFreeObject(result);
xmlXPathFreeObject(result);
/* reading eressea/game/param */
xpath->node = node;
result = xmlXPathEvalExpression(BAD_CAST "param", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
xmlChar * value = xmlGetProp(node, BAD_CAST "value");
/* reading eressea/game/param */
xpath->node = node;
result = xmlXPathEvalExpression(BAD_CAST "param", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
xmlChar * value = xmlGetProp(node, BAD_CAST "value");
set_param(&global.parameters, (const char*)name, (const char*)value);
set_param(&global.parameters, (const char*)name, (const char*)value);
xmlFree(name);
xmlFree(value);
}
xmlXPathFreeObject(result);
xmlFree(name);
xmlFree(value);
}
/* reading eressea/game/order */
result = xmlXPathEvalExpression(BAD_CAST "order", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
boolean disable = xml_bvalue(node, "disable", false);
xmlXPathFreeObject(result);
if (disable) {
int k;
for (k=0;k!=MAXKEYWORDS;++k) {
if (strcmp(keywords[k], (const char*)name)==0) {
global.disabled[k]=1;
break;
/* reading eressea/game/order */
result = xmlXPathEvalExpression(BAD_CAST "order", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
boolean disable = xml_bvalue(node, "disable", false);
if (disable) {
int k;
for (k=0;k!=MAXKEYWORDS;++k) {
if (strcmp(keywords[k], (const char*)name)==0) {
global.disabled[k]=1;
break;
}
}
if (k==MAXKEYWORDS) {
log_error(("trying to disable unknown comand %s\n", (const char*)name));
}
}
if (k==MAXKEYWORDS) {
log_error(("trying to disable unknown comand %s\n", (const char*)name));
}
xmlFree(name);
}
xmlFree(name);
}
xmlXPathFreeObject(result);
/* reading eressea/game/skill */
result = xmlXPathEvalExpression(BAD_CAST "skill", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
boolean enable = xml_bvalue(node, "enable", true);
enable_skill((const char*)name, enable);
xmlFree(name);
xmlXPathFreeObject(result);
/* reading eressea/game/skill */
result = xmlXPathEvalExpression(BAD_CAST "skill", xpath);
nodes = result->nodesetval;
for (i=0;i!=nodes->nodeNr;++i) {
xmlNodePtr node = nodes->nodeTab[i];
xmlChar * name = xmlGetProp(node, BAD_CAST "name");
boolean enable = xml_bvalue(node, "enable", true);
enable_skill((const char*)name, enable);
xmlFree(name);
}
}
xmlXPathFreeObject(result);

18
src/res/conquest.xml
View File

@ -1,14 +1,14 @@
<eressea>
<include file="messages.xml"></include>
<include href="messages.xml"></include>
<comment>Localization</comment>
<include file="de/strings.xml"></include>
<include file="en/strings.xml"></include>
<include href="de/strings.xml"></include>
<include href="en/strings.xml"></include>
<include file="races.xml"></include>
<include file="resources.xml"></include>
<include file="ships.xml"></include>
<include file="buildings.xml"></include>
<include href="races.xml"></include>
<include href="resources.xml"></include>
<include href="ships.xml"></include>
<include href="buildings.xml"></include>
<game name="Kreis der Macht" units="250" welcome="vinyambar">
<comment>Game specific</comment>
@ -16,6 +16,6 @@
<order name="MEINUNG" disable></order>
<order name="MAGIEGEBIET" disable></order>
</game>
<include file="vinyambar/de/strings.xml"></include>
<include file="vinyambar/conquest.xml"></include>
<include href="vinyambar/de/strings.xml"></include>
<include href="vinyambar/conquest.xml"></include>
</eressea>

8
src/res/hse-05-01.xml
View File

@ -12,10 +12,10 @@
<xi:include href="prefixes.xml"/>
<xi:include href="ships.xml"/>
<xi:include href="buildings.xml"/>
<xi:include file="terrains.xml"/>
<xi:include file="alchemy.xml"/>
<xi:include file="technologies.xml"/>
<xi:include file="skills.xml"/>
<xi:include href="terrains.xml"/>
<xi:include href="alchemy.xml"/>
<xi:include href="technologies.xml"/>
<xi:include href="skills.xml"/>
<equipment>
<item name="wood" amount="5"/>
<item name="stone" amount="10"/>

23
src/res/tutorial.xml
View File

@ -5,7 +5,7 @@
<!-- Localization -->
<xi:include href="de/strings.xml"/>
<xi:include href="en/strings.xml"/>
<xi:include file="fr/strings.xml"/>
<xi:include href="fr/strings.xml"/>
<xi:include href="resources.xml"/>
<xi:include href="spoils.xml"/>
@ -62,27 +62,24 @@
<param name="hunger.long" value="1"></param>
<param name="MaxAge" value="8"></param>
</game>
<xi:include file="tutorial/de/strings.xml"/>
<xi:include file="tutorial/en/strings.xml"/>
<xi:include file="eressea/races.xml"/>
<xi:include file="eressea/items.xml"/>
<xi:include file="eressea/dungeons.xml"/>
<xi:include href="tutorial/de/strings.xml"/>
<xi:include href="tutorial/en/strings.xml"/>
<xi:include href="eressea/races.xml"/>
<xi:include href="eressea/items.xml"/>
<xi:include href="eressea/dungeons.xml"/>
<strings>
<string name="mailto">
<text locale="en">tutorial@eressea.upb.de</text>
<text locale="de">tutorial@eressea.upb.de</text>
</string>
<string name="newbie_info_1">
<text locale="en">Remember to send your orders to tutorial@eressea.upb.de with the subject ERESSEA ORDERS.</text>
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an tutorial@eressea.upb.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
</string>
<string name="mailcmd">
<text locale="de">ERESSEA BEFEHLE</text>
<text locale="en">ERESSEA ORDERS</text>
</string>
</strings>
<string name="defaultorder">
<text locale="de">ARBEITE</text>
</string>
<string name="defaultorder">
<text locale="en">WORK</text>
</string>
</eressea>

3
src/res/tutorial/de/strings.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<strings>
<string name="newbie_info_1">
<text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an tutorial@eressea.upb.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
</string>
<string name="newbie_info_2">
<text locale="de">Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden.</text>
</string>

3
src/res/tutorial/en/strings.xml
View File

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<strings>
<comment> report newbie info</comment>
<string name="newbie_info_1">
<text locale="en">Remember to send your orders to tutorial@eressea.upb.de with the subject ERESSEA ORDERS.</text>
</string>
<string name="newbie_info_2">
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea.</text>
</string>

18
src/res/vinyambar-3.xml
View File

@ -1,14 +1,14 @@
<eressea>
<include file="messages.xml"></include>
<include href="messages.xml"></include>
<comment>Localization</comment>
<include file="de/strings.xml"></include>
<include file="en/strings.xml"></include>
<include href="de/strings.xml"></include>
<include href="en/strings.xml"></include>
<include file="races.xml"></include>
<include file="resources.xml"></include>
<include file="ships.xml"></include>
<include file="buildings.xml"></include>
<include href="races.xml"></include>
<include href="resources.xml"></include>
<include href="ships.xml"></include>
<include href="buildings.xml"></include>
<game name="Kreis der Macht" units="250" welcome="vinyambar">
<comment>Game specific</comment>
@ -27,8 +27,8 @@
<param name="alliance.auto" value="fight"/>
<param name="alliance.transferquit" value="true"/>
</game>
<include file="vinyambar/de/strings.xml"></include>
<include file="vinyambar/stronghold.xml"></include>
<include href="vinyambar/de/strings.xml"></include>
<include href="vinyambar/stronghold.xml"></include>
<strings>
<string name="mailto">
<text>vinyambar@eressea.amber.kn-bremen.de</text>

16
src/res/vinyambar-classic.xml
View File

@ -1,13 +1,13 @@
<eressea>
<include file="messages.xml"></include>
<include href="messages.xml"></include>
<comment>Localization</comment>
<include file="de/strings.xml"></include>
<include file="en/strings.xml"></include>
<include href="de/strings.xml"></include>
<include href="en/strings.xml"></include>
<include file="races.xml"></include>
<include file="resources.xml"></include>
<include file="ships.xml"></include>
<include href="races.xml"></include>
<include href="resources.xml"></include>
<include href="ships.xml"></include>
<game name="Vinyambar I" units="250" welcome="vinyambar">
<comment>Game specific</comment>
@ -21,8 +21,8 @@
<param name="database.gameid" value="1"></param>
<param name="hunger.long" value="1"></param>
</game>
<include file="vinyambar/races.xml"></include>
<include file="vinyambar/de/strings-classic.xml"></include>
<include href="vinyambar/races.xml"></include>
<include href="vinyambar/de/strings-classic.xml"></include>
<strings>
<string name="mailto">
<text>vinyambar@eressea.amber.kn-bremen.de</text>

16
src/res/vinyambar.xml
View File

@ -1,13 +1,13 @@
<eressea>
<include file="messages.xml"></include>
<include href="messages.xml"></include>
<comment>Localization</comment>
<include file="de/strings.xml"></include>
<include file="en/strings.xml"></include>
<include href="de/strings.xml"></include>
<include href="en/strings.xml"></include>
<include file="races.xml"></include>
<include file="resources.xml"></include>
<include file="ships.xml"></include>
<include href="races.xml"></include>
<include href="resources.xml"></include>
<include href="ships.xml"></include>
<game name="Vinyambar II" units="250" welcome="vinyambar">
<comment>Game specific</comment>
@ -22,8 +22,8 @@
<param name="database.gameid" value="2"></param>
<param name="hunger.long" value="0"></param>
</game>
<include file="vinyambar/races.xml"></include>
<include file="vinyambar/de/strings.xml"></include>
<include href="vinyambar/races.xml"></include>
<include href="vinyambar/de/strings.xml"></include>
<strings>
<string name="mailto">
<text>vinyambar@eressea.amber.kn-bremen.de</text>