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

fix crash in a spell when no astral space is available.

This commit is contained in:
Enno Rehling 2013-12-29 00:15:50 +01:00
parent 31b083a19f
commit 9b49bbd387
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/gamecode/laws.c
View File

@ -3297,8 +3297,6 @@ static building *age_building(building * b)
region *rt = r_standard_to_astral(r); region *rt = r_standard_to_astral(r);
unit *u, *mage = NULL; unit *u, *mage = NULL;
if (fval(rt->terrain, FORBIDDEN_REGION))
rt = NULL;
/* step 1: give unicorns to people in the building, /* step 1: give unicorns to people in the building,
* find out if there's a magician in there. */ * find out if there's a magician in there. */
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {
@ -3325,7 +3323,7 @@ static building *age_building(building * b)
/* if there's a magician, and a connection to astral space, create the /* if there's a magician, and a connection to astral space, create the
* curse. */ * curse. */
if (rt != NULL && mage != NULL) { if (rt && !fval(rt->terrain, FORBIDDEN_REGION) && mage != NULL) {
curse *c = get_curse(rt->attribs, ct_astralblock); curse *c = get_curse(rt->attribs, ct_astralblock);
if (c == NULL) { if (c == NULL) {
if (mage != NULL) { if (mage != NULL) {