From 3daf4a78ecc5d83748f25e6aafa749a08d6c0d50 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 23 Jul 2005 19:24:16 +0000 Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D60?= =?UTF-8?q?7=20Gabe=20des=20Chaos=20h=C3=B6rt=20einfach=20auf.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem war, dass der Name des curse falsch war und deshalb NULL... man soll sowas immer testen. --- src/common/kernel/spell.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index 37eed4c61..9948a88e7 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -3682,7 +3682,15 @@ sp_magicboost(castorder *co) double power = co->force; variant effect; trigger * tsummon; + static const curse_type * ct_auraboost; + static const curse_type * ct_magicboost; + if (!ct_auraboost) { + ct_auraboost = ct_find("auraboost"); + ct_magicboost = ct_find("magicboost"); + assert(ct_auraboost!=NULL); + assert(ct_magicboost!=NULL); + } /* fehler, wenn schon ein boost */ if(is_cursed(mage->attribs, C_MBOOST, 0) == true){ report_failure(mage, co->order); @@ -3690,14 +3698,16 @@ sp_magicboost(castorder *co) } effect.i = 6; - c = create_curse(mage, &mage->attribs, ct_find("magicboost"), power, 10, effect, 1); + c = create_curse(mage, &mage->attribs, ct_magicboost, power, 10, effect, 1); /* kann nicht durch Antimagie beeinflusst werden */ curse_setflag(c, CURSE_IMMUNE); + /* one aura boost with 200% aura now: */ effect.i = 200; - c = create_curse(mage, &mage->attribs, ct_find("aura"), power, 4, effect, 1); + c = create_curse(mage, &mage->attribs, ct_auraboost, power, 4, effect, 1); - tsummon = trigger_createcurse(mage, mage, c->type, power, 6, 50, 1); + /* and one aura boost with 50% aura in 5 weeks: */ + tsummon = trigger_createcurse(mage, mage, ct_auraboost, power, 6, 50, 1); add_trigger(&mage->attribs, "timer", trigger_timeout(5, tsummon)); ADDMSG(&mage->faction->msgs, msg_message("magicboost_effect",