From b16bbb914638362b230564675182539354f29462 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 13 Jun 2005 21:40:32 +0000
Subject: [PATCH] reading messages accidentally disabled

---
 src/common/kernel/eressea.h   |  2 +-
 src/common/kernel/xmlreader.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 30edd5371..9e3c2ed29 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -163,7 +163,7 @@ struct building_type;
 #define BACTION_VERSION 319 /* building action gets a param string */
 #define NOLASTORDER_VERSION 320 /* do not use lastorder */
 
-#define MIN_VERSION ALLIANCES_VERSION
+#define MIN_VERSION CURSETYPE_VERSION
 #define REGIONOWNERS_VERSION 400
 #define UGROUPS_VERSION 500 /* nicht aktivieren, nicht fertig */
 
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 0b48c2124..07d3832d4 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -1098,11 +1098,15 @@ parse_races(xmlDocPtr doc)
 static int
 parse_messages(xmlDocPtr doc)
 {
-  xmlXPathContextPtr xpath = xmlXPathNewContext(doc);
+  xmlXPathContextPtr xpath;
   xmlXPathObjectPtr messages;
   xmlNodeSetPtr nodes;
   int i;
 
+  if (!gamecode_enabled) return 0;
+
+  xpath = xmlXPathNewContext(doc);
+
   /* reading eressea/strings/string */
   messages = xmlXPathEvalExpression(BAD_CAST "/eressea/messages/message", xpath);
   nodes = messages->nodesetval;
@@ -1356,9 +1360,7 @@ register_xmlreader(void)
 
   xml_register_callback(parse_strings);
   xml_register_callback(parse_prefixes);
-  if (gamecode_enabled) {
-    xml_register_callback(parse_messages);
-  }
+  xml_register_callback(parse_messages);
 
   xml_register_callback(parse_races);
   xml_register_callback(parse_resources);