diff --git a/conf/e2/config.xml b/conf/e2/config.xml index 98c118088..2c9ac7022 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -54,10 +54,6 @@ - - - - diff --git a/conf/e3/config.json b/conf/e3/config.json index d831a0b3e..58804f1f0 100644 --- a/conf/e3/config.json +++ b/conf/e3/config.json @@ -4,6 +4,17 @@ "prefixes.json", "e3/terrains.json" ], + "disable": [ + "besiege", + "steal", + "buy", + "teach", + "sabotage", + "spy", + "tax", + "entertain", + "sell" + ], "settings": { "game.id": 3, "game.name": "E3", diff --git a/conf/e3/config.xml b/conf/e3/config.xml index 6a32c95da..68e61b7d1 100644 --- a/conf/e3/config.xml +++ b/conf/e3/config.xml @@ -43,17 +43,6 @@ - - - - - - - - - - - diff --git a/conf/e4/config.json b/conf/e4/config.json index 831b973a8..5a58e7021 100644 --- a/conf/e4/config.json +++ b/conf/e4/config.json @@ -4,6 +4,17 @@ "prefixes.json", "e3/terrains.json" ], + "disable": [ + "besiege", + "steal", + "buy", + "teach", + "sabotage", + "spy", + "tax", + "entertain", + "sell" + ], "settings": { "game.id": 4, "game.name": "Deveron", diff --git a/conf/e4/config.xml b/conf/e4/config.xml index bbf712c09..0d6ea5704 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -43,16 +43,6 @@ - - - - - - - - - - diff --git a/src/kernel/jsonconf.c b/src/kernel/jsonconf.c index 0f1a81dc0..be6a931d9 100644 --- a/src/kernel/jsonconf.c +++ b/src/kernel/jsonconf.c @@ -504,7 +504,7 @@ static void json_prefixes(cJSON *json) { static void json_disable_keywords(cJSON *json) { cJSON *child; if (json->type != cJSON_Array) { - log_error("disabled is not a json array: %d", json->type); + log_error("disable is not a json array: %d", json->type); return; } for (child = json->child; child; child = child->next) { diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c index 5aa40e6e1..1e87401a7 100644 --- a/src/kernel/xmlreader.c +++ b/src/kernel/xmlreader.c @@ -2066,21 +2066,6 @@ static int parse_main(xmlDocPtr doc) xmlXPathFreeObject(result); xpath->node = node; - /* 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 *propName = xmlGetProp(node, BAD_CAST "name"); - - if (xml_bvalue(node, "disable", false)) { - disable_keyword_str((const char *)propName); - } - xmlFree(propName); - } - - xmlXPathFreeObject(result); - /* reading eressea/game/skill */ result = xmlXPathEvalExpression(BAD_CAST "skill", xpath); nodes = result->nodesetval;