From 356697e44ec840d701833cfb413e4df23c303cbf Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 19 Oct 2014 20:02:06 +0200
Subject: [PATCH 1/2] improve test for attrib::nexttype correctness.

---
 src/util/attrib.test.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/util/attrib.test.c b/src/util/attrib.test.c
index 2e15c8321..479809d1d 100644
--- a/src/util/attrib.test.c
+++ b/src/util/attrib.test.c
@@ -69,6 +69,13 @@ static void test_attrib_nexttype(CuTest * tc)
     CuAssertPtrEquals(tc, a, alist->nexttype);
     CuAssertPtrEquals(tc, 0, a->nexttype);
 
+    a_remove(&alist, alist);
+    CuAssertPtrEquals(tc, a, alist->nexttype);
+
+    CuAssertPtrNotNull(tc, (a = a_add(&alist, a_new(&at_bar))));
+    a_remove(&alist, alist->nexttype);
+    CuAssertPtrEquals(tc, a, alist->nexttype);
+
     a_removeall(&alist, &at_foo);
     a_removeall(&alist, &at_bar);
 }

From 96d5544b1ff8b8b6380dce34f20b956823b694f7 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 20 Oct 2014 17:13:32 +0200
Subject: [PATCH 2/2] Bug 2032: rename FIGHT back to COMBAT

---
 res/core/de/strings.xml | 2 +-
 res/core/en/strings.xml | 3 ---
 src/kernel/config.c     | 2 +-
 src/keyword.c           | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index cd408f9ea..863b26e35 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -2173,7 +2173,7 @@
   <string name="help">
     <text locale="de">HELFEN</text>
   </string>
-  <string name="fight">
+  <string name="combat">
     <text locale="de">KÄMPFEN</text>
   </string>
   <string name="ready">
diff --git a/res/core/en/strings.xml b/res/core/en/strings.xml
index a85bb5a4f..98bfaf310 100644
--- a/res/core/en/strings.xml
+++ b/res/core/en/strings.xml
@@ -1451,9 +1451,6 @@
   <string name="help">
     <text locale="en">HELP</text>
   </string>
-  <string name="fight">
-    <text locale="en">FIGHT</text>
-  </string>
   <string name="ready">
     <text locale="en">COMBATSPELL</text>
   </string>
diff --git a/src/kernel/config.c b/src/kernel/config.c
index 67e145258..17484449d 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -673,7 +673,7 @@ static void init_gms(void)
     faction *f;
 
     for (f = factions; f; f = f->next) {
-        const attrib *a = a_findc(f->attribs, &at_gm);
+        attrib *a = a_find(f->attribs, &at_gm);
 
         if (a != NULL)
             fset(f, FFL_GM);
diff --git a/src/keyword.c b/src/keyword.c
index 23f55a609..25ace155b 100644
--- a/src/keyword.c
+++ b/src/keyword.c
@@ -103,7 +103,7 @@ const char *keywords[MAXKEYWORDS] = {
     "research",
     "give",
     "help",
-    "fight",
+    "combat",
     "ready",
     "buy",
     "contact",