From a5e63a2472c37bce3bfa96ad2fca3184589302dd Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 30 Oct 2016 05:37:12 +0100
Subject: [PATCH] move GUARD_* flags to guard.h

---
 s/cmake-init           |  6 +++---
 src/guard.h            | 19 +++++++++++++++++++
 src/kernel/config.h    | 19 -------------------
 src/kernel/xmlreader.c |  1 +
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/s/cmake-init b/s/cmake-init
index 2cd5b4834..b1ea6759a 100755
--- a/s/cmake-init
+++ b/s/cmake-init
@@ -46,9 +46,9 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then
  echo "tolua is not installed, building from source"
  cd $ROOT
  if [ ! -d tolua ]; then
-  LUA_VERSION="5.1"
-  if [ -d /usr/include/lua5.2 ] || [ -d /usr/local/include/lua5.2 ]; then
-   LUA_VERSION="5.2"
+  LUA_VERSION="5.2"
+  if [ -d /usr/include/lua5.1 ] || [ -d /usr/local/include/lua5.1 ]; then
+   LUA_VERSION="5.1"
   fi
   echo "fetching tolua ${LUA_VERSION} from github..."
   git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua
diff --git a/src/guard.h b/src/guard.h
index 39533dee3..5fe476e11 100644
--- a/src/guard.h
+++ b/src/guard.h
@@ -11,6 +11,25 @@ extern "C" {
     
     typedef enum { E_GUARD_OK, E_GUARD_UNARMED, E_GUARD_NEWBIE, E_GUARD_FLEEING } guard_t;
 
+#define GUARD_NONE 0
+#define GUARD_TAX 1
+    /* Verhindert Steuereintreiben */
+#define GUARD_MINING 2
+    /* Verhindert Bergbau */
+#define GUARD_TREES 4
+    /* Verhindert Waldarbeiten */
+#define GUARD_TRAVELTHRU 8
+    /* Blockiert Durchreisende */
+#define GUARD_LANDING 16
+    /* Verhindert Ausstieg + Weiterreise */
+#define GUARD_CREWS 32
+    /* Verhindert Unterhaltung auf Schiffen */
+#define GUARD_RECRUIT 64
+    /* Verhindert Rekrutieren */
+#define GUARD_PRODUCE 128
+    /* Verhindert Abbau von Resourcen mit RTF_LIMITED */
+#define GUARD_ALL 0xFFFF
+
     extern struct attrib_type at_guard;
 
     guard_t can_start_guarding(const struct unit * u);
diff --git a/src/kernel/config.h b/src/kernel/config.h
index 74565e25e..8c46e4185 100644
--- a/src/kernel/config.h
+++ b/src/kernel/config.h
@@ -114,25 +114,6 @@ struct param;
 #define GF_PURE 64
     /* untranslated */
 
-#define GUARD_NONE 0
-#define GUARD_TAX 1
-    /* Verhindert Steuereintreiben */
-#define GUARD_MINING 2
-    /* Verhindert Bergbau */
-#define GUARD_TREES 4
-    /* Verhindert Waldarbeiten */
-#define GUARD_TRAVELTHRU 8
-    /* Blockiert Durchreisende */
-#define GUARD_LANDING 16
-    /* Verhindert Ausstieg + Weiterreise */
-#define GUARD_CREWS 32
-    /* Verhindert Unterhaltung auf Schiffen */
-#define GUARD_RECRUIT 64
-    /* Verhindert Rekrutieren */
-#define GUARD_PRODUCE 128
-    /* Verhindert Abbau von Resourcen mit RTF_LIMITED */
-#define GUARD_ALL 0xFFFF
-
     int maxworkingpeasants(const struct region *r);
     bool markets_module(void);
     int wage(const struct region *r, const struct faction *f,
diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index e022effaf..38ead12ab 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -15,6 +15,7 @@ without prior permission by the authors of Eressea.
 #include "xmlreader.h"
 
 #include "building.h"
+#include "guard.h"
 #include "equipment.h"
 #include "item.h"
 #include "keyword.h"