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

due to lua not being available, there are no familiars

Browse source
This commit is contained in:
Enno Rehling 2006-02-09 20:01:06 +00:00
parent a1de5d5701
commit b654c89773
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/spells/spells.c
View file

@ -535,7 +535,7 @@ select_familiar(const race * magerace, magic_t magiegebiet)
retval = magerace->familiars[magiegebiet];
}
assert (retval!=NULL && retval->init_familiar!=NULL);
assert (retval==NULL || retval->init_familiar!=NULL);
return retval;
}
@ -580,6 +580,11 @@ sp_summon_familiar(castorder *co)
return 0;
}
rc = select_familiar(mage->faction->race, mage->faction->magiegebiet);
if (rc==NULL) {
log_error(("could not find suitable familiar for %s.\n",
mage->faction->race->_name[0]));
return 0;
}
if (fval(rc, RCF_SWIM) && !fval(rc, RCF_WALK)) {
int coasts = is_coastregion(r);