From d1d1bee8f6e58c189d1bdd11a769a17fdc1a1554 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 17 Nov 2016 11:27:20 +0100
Subject: [PATCH] missing struct declarations in curse.h remove config.h from
 spells and curses.

---
 src/kernel/curse.h                | 2 ++
 src/spells/buildingcurse.c        | 1 -
 src/spells/magicresistance.c      | 1 -
 src/spells/magicresistance.test.c | 1 -
 src/spells/regioncurse.c          | 3 +--
 src/spells/shipcurse.c            | 1 -
 src/spells/unitcurse.c            | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/kernel/curse.h b/src/kernel/curse.h
index 0de1211c7..29498f4d2 100644
--- a/src/kernel/curse.h
+++ b/src/kernel/curse.h
@@ -30,6 +30,8 @@ extern "C" {
     struct curse_type;
     struct gamedata;
     struct storage;
+    struct attrib;
+    struct faction;
 
     /* Sprueche in der struct region und auf Einheiten, Schiffen oder Burgen
      * (struct attribute)
diff --git a/src/spells/buildingcurse.c b/src/spells/buildingcurse.c
index d3b5ddf36..01b0435ab 100644
--- a/src/spells/buildingcurse.c
+++ b/src/spells/buildingcurse.c
@@ -12,7 +12,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "buildingcurse.h"
 
 /* kernel includes */
diff --git a/src/spells/magicresistance.c b/src/spells/magicresistance.c
index 3587a1be6..a897ea348 100644
--- a/src/spells/magicresistance.c
+++ b/src/spells/magicresistance.c
@@ -1,5 +1,4 @@
 #include <platform.h>
-#include <kernel/config.h>
 #include <kernel/curse.h>
 #include <kernel/messages.h>
 #include <util/language.h>
diff --git a/src/spells/magicresistance.test.c b/src/spells/magicresistance.test.c
index 4b0d69388..e9cc98e34 100644
--- a/src/spells/magicresistance.test.c
+++ b/src/spells/magicresistance.test.c
@@ -1,5 +1,4 @@
 #include <platform.h>
-#include <kernel/config.h>
 #include <kernel/curse.h>
 #include <kernel/building.h>
 #include <kernel/faction.h>
diff --git a/src/spells/regioncurse.c b/src/spells/regioncurse.c
index 382b13b86..3d7593484 100644
--- a/src/spells/regioncurse.c
+++ b/src/spells/regioncurse.c
@@ -12,7 +12,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "regioncurse.h"
 #include "magic.h"
 
@@ -50,7 +49,7 @@ static message *cinfo_cursed_by_the_gods(const void *obj, objtype_t typ,
     unused_arg(self);
     assert(typ == TYP_REGION);
 
-    if (fval(r->terrain, SEA_REGION)) {
+    if (r->terrain->flags & SEA_REGION) {
         return msg_message("curseinfo::godcurseocean", "id", c->no);
     }
     return msg_message("curseinfo::godcurse", "id", c->no);
diff --git a/src/spells/shipcurse.c b/src/spells/shipcurse.c
index 8da3c7c89..59cc534d4 100644
--- a/src/spells/shipcurse.c
+++ b/src/spells/shipcurse.c
@@ -12,7 +12,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "shipcurse.h"
 
 /* kernel includes */
diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c
index 944db2032..6e769145e 100644
--- a/src/spells/unitcurse.c
+++ b/src/spells/unitcurse.c
@@ -12,7 +12,6 @@
  */
 
 #include <platform.h>
-#include <kernel/config.h>
 #include "unitcurse.h"
 
 /* kernel includes */