diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index dc1a39c98..652c931b5 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -999,10 +999,12 @@ spellpower(region * r, unit * u, spell * sp, int cast_level, struct order * ord) force -= curse_geteffect(c); curse_changevigour(&r->attribs, c, -cast_level); cmistake(u, ord, 185, MSG_MAGIC); - if (force>0) { - ADDMSG(&mage->faction->msgs, msg_message("reduce_spell", "self mage region", mage, u, r)); - } else { - ADDMSG(&mage->faction->msgs, msg_message("block_spell", "self mage region", mage, u, r)); + if (mage!=NULL) { + if (force>0) { + ADDMSG(&mage->faction->msgs, msg_message("reduce_spell", "self mage region", mage, u, r)); + } else { + ADDMSG(&mage->faction->msgs, msg_message("block_spell", "self mage region", mage, u, r)); + } } } @@ -1013,10 +1015,12 @@ spellpower(region * r, unit * u, spell * sp, int cast_level, struct order * ord) force -= curse_geteffect(c); curse_changevigour(&u->attribs, c, -1); cmistake(u, ord, 185, MSG_MAGIC); - if (force>0) { - ADDMSG(&mage->faction->msgs, msg_message("reduce_spell", "self mage region", mage, u, r)); - } else { - ADDMSG(&mage->faction->msgs, msg_message("block_spell", "self mage region", mage, u, r)); + if (mage!=NULL) { + if (force>0) { + ADDMSG(&mage->faction->msgs, msg_message("reduce_spell", "self mage region", mage, u, r)); + } else { + ADDMSG(&mage->faction->msgs, msg_message("block_spell", "self mage region", mage, u, r)); + } } } diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index 9da9034ee..ea295b639 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -4401,7 +4401,7 @@ sp_migranten(castorder *co) if (kontaktiert == 0) { ADDMSG(&mage->faction->msgs, msg_message("spellfail::contact", - "mage region order target", mage, mage->region, co->order, + "mage region command target", mage, mage->region, co->order, target)); return 0; }