From b5d86690f0ae20c501efd253d749a3e0c964a586 Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sun, 5 Jun 2005 11:28:45 +0000
Subject: [PATCH] =?UTF-8?q?npc=20parteien=20stehen=20auserhalb=20des=20all?=
 =?UTF-8?q?ianz=20schemas=20und=20k=C3=B6nne=20alle=20HELFE=20setzten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/eressea.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 7d8947ecb..85b8e534d 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -496,6 +496,23 @@ static attrib_type at_maxmagicians = {
 	ATF_UNIQUE
 };
 
+static void
+init_npcfaction(struct attrib *a)
+{
+	a->data.i = 1;
+}
+
+
+static attrib_type at_npcfaction = {
+	"npcfaction",
+	init_npcfaction,
+	NULL,
+	NULL,
+	a_writedefault,
+	a_readdefault,
+	ATF_UNIQUE
+};
+
 int
 max_skill(faction * f, skill_t sk)
 {
@@ -967,11 +984,15 @@ int
 alliedgroup(const struct plane * pl, const struct faction * f, 
             const struct faction * f2, const struct ally * sf, int mode)
 {
+	attrib *a;
   while (sf && sf->faction!=f2) sf=sf->next;
   if (sf==NULL) {
     mode = mode & autoalliance(pl, f, f2);
   }
   mode = ally_mode(sf, mode) | (mode & autoalliance(pl, f, f2));
+	if((a = a_find(f->attribs, &at_npcfaction)) != NULL) {
+		return mode;
+	}
   if (AllianceRestricted() && f->alliance!=f2->alliance) {
     mode &= ~AllianceRestricted();
   }
@@ -3182,6 +3203,7 @@ attrib_init(void)
 	at_register(&at_wyrm);
 	at_register(&at_building_generic_type);
 	at_register(&at_maxmagicians);
+	at_register(&at_npcfaction);
 
 	/* border-typen */
 	register_bordertype(&bt_noway);