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

http://eressea.upb.de/mantis/view.php?id=1004 

"Giftelementar 3 Wochen lang gezaubert - obwohl sich der Magier bewegt hat"

Message wurde an der falschen stelle generiert
This commit is contained in:
Enno Rehling 2007-02-14 20:17:24 +00:00
parent 4b1b578021
commit 7f455d373c
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/spells/spells.c
View File

@ -3205,7 +3205,7 @@ dc_age(struct curse * c)
/* age returns 0 if the attribute needs to be removed, !=0 otherwise */ /* age returns 0 if the attribute needs to be removed, !=0 otherwise */
{ {
region * r = (region*)c->data.v; region * r = (region*)c->data.v;
unit *u, **up; unit **up;
unit * mage = c->magician; unit * mage = c->magician;
if (r==NULL || mage==NULL || mage->number==0) { if (r==NULL || mage==NULL || mage->number==0) {
@ -3231,20 +3231,6 @@ dc_age(struct curse * c)
if (*up==u) up=&u->next; if (*up==u) up=&u->next;
} }
/* melden, 1x pro Partei */
for (u = r->units; u; u = u->next ) {
if (!fval(u->faction, FL_DH) ) {
fset(u->faction, FL_DH);
ADDMSG(&u->faction->msgs, msg_message("deathcloud_effect",
"mage region", cansee(u->faction, r, mage, 0) ? mage : NULL, r));
}
}
if (!fval(mage->faction, FL_DH)) {
ADDMSG(&mage->faction->msgs, msg_message("deathcloud_effect",
"mage region", mage, r));
}
return 0; return 0;
} }
@ -3308,6 +3294,7 @@ sp_deathcloud(castorder *co)
region *r = co->rt; region *r = co->rt;
unit *mage = co->magician.u; unit *mage = co->magician.u;
attrib *a = r->attribs; attrib *a = r->attribs;
unit * u;
while (a) { while (a) {
if ((a->type->flags & ATF_CURSE)) { if ((a->type->flags & ATF_CURSE)) {
@ -3323,6 +3310,20 @@ sp_deathcloud(castorder *co)
mk_deathcloud(mage, r, co->force, co->level); mk_deathcloud(mage, r, co->force, co->level);
/* melden, 1x pro Partei */
for (u = r->units; u; u = u->next ) {
if (!fval(u->faction, FL_DH) ) {
fset(u->faction, FL_DH);
ADDMSG(&u->faction->msgs, msg_message("deathcloud_effect",
"mage region", cansee(u->faction, r, mage, 0) ? mage : NULL, r));
}
}
if (!fval(mage->faction, FL_DH)) {
ADDMSG(&mage->faction->msgs, msg_message("deathcloud_effect",
"mage region", mage, r));
}
return co->level; return co->level;
} }