Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

npc parteien stehen auserhalb des allianz schemas und könne alle 

HELFE setzten
This commit is contained in:
Katja Zedel 2005-06-05 11:28:45 +00:00
parent 1ebff5601a
commit b5d86690f0
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/kernel/eressea.c
View File

@ -496,6 +496,23 @@ static attrib_type at_maxmagicians = {
ATF_UNIQUE 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 int
max_skill(faction * f, skill_t sk) max_skill(faction * f, skill_t sk)
{ {
@ -967,11 +984,15 @@ int
alliedgroup(const struct plane * pl, const struct faction * f, alliedgroup(const struct plane * pl, const struct faction * f,
const struct faction * f2, const struct ally * sf, int mode) const struct faction * f2, const struct ally * sf, int mode)
{ {
attrib *a;
while (sf && sf->faction!=f2) sf=sf->next; while (sf && sf->faction!=f2) sf=sf->next;
if (sf==NULL) { if (sf==NULL) {
mode = mode & autoalliance(pl, f, f2); mode = mode & autoalliance(pl, f, f2);
} }
mode = ally_mode(sf, 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) { if (AllianceRestricted() && f->alliance!=f2->alliance) {
mode &= ~AllianceRestricted(); mode &= ~AllianceRestricted();
} }
@ -3182,6 +3203,7 @@ attrib_init(void)
at_register(&at_wyrm); at_register(&at_wyrm);
at_register(&at_building_generic_type); at_register(&at_building_generic_type);
at_register(&at_maxmagicians); at_register(&at_maxmagicians);
at_register(&at_npcfaction);
/* border-typen */ /* border-typen */
register_bordertype(&bt_noway); register_bordertype(&bt_noway);