From 13c29c136c9a3104e4ff3404a651066b1b82ebd6 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 23 Nov 2016 17:52:57 +0100
Subject: [PATCH] eliminate config.h from triggers. was only used once, for a
 single fset macro

---
 src/triggers/createcurse.c | 1 -
 src/triggers/createunit.c  | 1 -
 src/triggers/createunit.h  | 1 +
 src/triggers/gate.c        | 1 -
 src/triggers/giveitem.c    | 1 -
 src/triggers/killunit.c    | 1 -
 src/triggers/shock.c       | 3 +--
 src/triggers/timeout.c     | 1 -
 src/triggers/triggers.c    | 1 -
 src/triggers/unguard.c     | 3 +--
 src/triggers/unitmessage.c | 1 -
 11 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/triggers/createcurse.c b/src/triggers/createcurse.c
index fe39e8b7f..040a4e7b7 100644
--- a/src/triggers/createcurse.c
+++ b/src/triggers/createcurse.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "createcurse.h"
 
 /* kernel includes */
diff --git a/src/triggers/createunit.c b/src/triggers/createunit.c
index 2fec00ade..5952c88bc 100644
--- a/src/triggers/createunit.c
+++ b/src/triggers/createunit.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "createunit.h"
 
 /* kernel includes */
diff --git a/src/triggers/createunit.h b/src/triggers/createunit.h
index 31649b868..d2337d306 100644
--- a/src/triggers/createunit.h
+++ b/src/triggers/createunit.h
@@ -28,6 +28,7 @@ extern "C" {
     struct region;
     struct faction;
     struct unit;
+    struct race;
 
     extern struct trigger_type tt_createunit;
 
diff --git a/src/triggers/gate.c b/src/triggers/gate.c
index acf2bb5d4..e681efc04 100644
--- a/src/triggers/gate.c
+++ b/src/triggers/gate.c
@@ -10,7 +10,6 @@
  without prior permission by the authors of Eressea.
  */
 #include <platform.h>
-#include <kernel/config.h>
 #include "gate.h"
 
  /* kernel includes */
diff --git a/src/triggers/giveitem.c b/src/triggers/giveitem.c
index d4a56162b..6b0e8f8c7 100644
--- a/src/triggers/giveitem.c
+++ b/src/triggers/giveitem.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "giveitem.h"
 
 /* kernel includes */
diff --git a/src/triggers/killunit.c b/src/triggers/killunit.c
index 23275a6af..22ad27896 100644
--- a/src/triggers/killunit.c
+++ b/src/triggers/killunit.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "killunit.h"
 
 #include <kernel/region.h>
diff --git a/src/triggers/shock.c b/src/triggers/shock.c
index f44219b5f..7c54676e0 100644
--- a/src/triggers/shock.c
+++ b/src/triggers/shock.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "shock.h"
 
 #include "magic.h"
@@ -84,7 +83,7 @@ static void do_shock(unit * u, const char *reason)
         }
 
     /* Dies ist ein Hack, um das skillmod und familiar-Attribut beim Mage
-     * zu löschen wenn der Familiar getötet wird. Da sollten wir über eine
+     * zu l�schen wenn der Familiar get�tet wird. Da sollten wir �ber eine
      * saubere Implementation nachdenken. */
 
     if (strcmp(reason, "trigger") == 0) {
diff --git a/src/triggers/timeout.c b/src/triggers/timeout.c
index 06fa18363..10e4d08be 100644
--- a/src/triggers/timeout.c
+++ b/src/triggers/timeout.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "timeout.h"
 
 /* util includes */
diff --git a/src/triggers/triggers.c b/src/triggers/triggers.c
index 152fdcb58..d5ea7d3d4 100644
--- a/src/triggers/triggers.c
+++ b/src/triggers/triggers.c
@@ -17,7 +17,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **/
 
 #include <platform.h>
-#include <kernel/config.h>
 
 /* triggers includes */
 #include <triggers/changefaction.h>
diff --git a/src/triggers/unguard.c b/src/triggers/unguard.c
index e6471f977..72e611dcc 100644
--- a/src/triggers/unguard.c
+++ b/src/triggers/unguard.c
@@ -10,7 +10,6 @@
  without prior permission by the authors of Eressea.
  */
 #include <platform.h>
-#include <kernel/config.h>
 #include "unguard.h"
 
 /* kernel includes */
@@ -34,7 +33,7 @@ static int unguard_handle(trigger * t, void *data)
     building *b = (building *)t->data.v;
 
     if (b) {
-        fset(b, BLD_UNGUARDED);
+        b-> flags |= BLD_UNGUARDED;
     }
     else {
         log_error("could not perform unguard::handle()\n");
diff --git a/src/triggers/unitmessage.c b/src/triggers/unitmessage.c
index 2d869fc49..0c1e80124 100644
--- a/src/triggers/unitmessage.c
+++ b/src/triggers/unitmessage.c
@@ -8,7 +8,6 @@ without prior permission by the authors of Eressea.
 */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "unitmessage.h"
 
 /* kernel includes */