From 0675c50c7f4040171b67580aaeff393576d947cb Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 16 Jun 2014 23:05:39 -0700
Subject: [PATCH] keyword lookup macro

---
 game-e2/config.xml  | 2 --
 src/kernel/config.c | 3 +--
 src/kernel/move.c   | 2 +-
 src/kernel/order.c  | 2 +-
 src/kernel/types.h  | 1 -
 src/keyword.h       | 2 ++
 src/monsters.c      | 2 +-
 src/report.c        | 4 ++--
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/game-e2/config.xml b/game-e2/config.xml
index 352e59d95..871f893d8 100644
--- a/game-e2/config.xml
+++ b/game-e2/config.xml
@@ -53,8 +53,6 @@
   <game name="Eressea">
     <!-- Game specific settings -->
 
-    <order name="BEZAHLEN" disable="yes"/>
-
     <skill name="alchemy" enable="true"/>
     <skill name="crossbow" enable="true"/>
     <skill name="mining" enable="true"/>
diff --git a/src/kernel/config.c b/src/kernel/config.c
index 40a0c0daf..45301077e 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -413,8 +413,7 @@ const char *options[MAXOPTIONS] = {
   "ADRESSEN",
   "BZIP2",
   "PUNKTE",
-  "SHOWSKCHANGE",
-  "XML"
+  "SHOWSKCHANGE"
 };
 
 static int allied_skillcount(const faction * f, skill_t sk)
diff --git a/src/kernel/move.c b/src/kernel/move.c
index d63208041..bd32f9880 100644
--- a/src/kernel/move.c
+++ b/src/kernel/move.c
@@ -2399,7 +2399,7 @@ static int hunt(unit * u, order * ord)
   }
 
   bufp = command;
-  bytes = slprintf(bufp, size, "%s %s", LOC(u->faction->locale, keywords[K_MOVE]), LOC(u->faction->locale, directions[dir]));
+  bytes = slprintf(bufp, size, "%s %s", LOC(u->faction->locale, keyword(K_MOVE)), LOC(u->faction->locale, directions[dir]));
   if (wrptr(&bufp, &size, bytes) != 0)
     WARN_STATIC_BUFFER();
 
diff --git a/src/kernel/order.c b/src/kernel/order.c
index 6a0d9c954..a2ea25ff6 100644
--- a/src/kernel/order.c
+++ b/src/kernel/order.c
@@ -105,7 +105,7 @@ static char* get_command(const order *ord, char *sbuffer, size_t size) {
     if (kwd != NOKEYWORD) {
         const struct locale *lang = ORD_LOCALE(ord);
         if (size > 0) {
-            const char *str = (const char *)LOC(lang, mkname("keyword", keywords[kwd]));
+            const char *str = (const char *)LOC(lang, keyword(kwd));
             assert(str);
             if (text) --size;
             bytes = (int)strlcpy(bufp, str, size);
diff --git a/src/kernel/types.h b/src/kernel/types.h
index bb48c9fc5..a2d438b02 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -183,7 +183,6 @@ enum {
   O_BZIP2,                      /* 1024 - compress as bzip2 */
   O_SCORE,                      /* 2048 - punkte anzeigen? */
   O_SHOWSKCHANGE,               /* 4096 - Skillveränderungen anzeigen? */
-  O_XML,                        /* 8192 - XML report versenden */
   MAXOPTIONS
 };
 
diff --git a/src/keyword.h b/src/keyword.h
index cd48f9da6..701e22a97 100644
--- a/src/keyword.h
+++ b/src/keyword.h
@@ -80,6 +80,8 @@ void init_keywords(const struct locale *lang);
 void init_keyword(const struct locale *lang, keyword_t kwd, const char *str);
 bool keyword_disabled(keyword_t kwd);
 void enable_keyword(keyword_t kwd, bool enabled);
+#define keyword(kwd) mkname("keyword", keywords[kwd])
+  
 #ifdef __cplusplus
 #endif
 #endif
diff --git a/src/monsters.c b/src/monsters.c
index e94a04991..f876bdf88 100644
--- a/src/monsters.c
+++ b/src/monsters.c
@@ -445,7 +445,7 @@ static order *make_movement_order(unit * u, const region * target, int moves,
 
   bytes =
     (int)strlcpy(bufp,
-    (const char *)LOC(u->faction->locale, keywords[K_MOVE]), size);
+    (const char *)LOC(u->faction->locale, keyword(K_MOVE)), size);
   if (wrptr(&bufp, &size, bytes) != 0)
     WARN_STATIC_BUFFER();
 
diff --git a/src/report.c b/src/report.c
index b71bb1109..f0cf5eb10 100644
--- a/src/report.c
+++ b/src/report.c
@@ -336,9 +336,9 @@ static void nr_spell(FILE * F, spellbook_entry * sbe, const struct locale *lang)
   size = sizeof(buf) - 1;
 
   if (sp->sptyp & ISCOMBATSPELL) {
-    bytes = (int)strlcpy(bufp, LOC(lang, keywords[K_COMBATSPELL]), size);
+    bytes = (int)strlcpy(bufp, LOC(lang, keyword(K_COMBATSPELL)), size);
   } else {
-    bytes = (int)strlcpy(bufp, LOC(lang, keywords[K_CAST]), size);
+    bytes = (int)strlcpy(bufp, LOC(lang, keyword(K_CAST)), size);
   }
   if (wrptr(&bufp, &size, bytes) != 0)
     WARN_STATIC_BUFFER();