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

Bugfix Auswahl der REgion bei Ruf der Realität

Browse source
This commit is contained in:
Enno Rehling 2004-06-26 19:05:00 +00:00
parent 4b3f794d4c
commit e88fb30f0e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/kernel/spell.c
View file

@ -6178,19 +6178,20 @@ sp_fetchastral(castorder *co)
if (rtl!=NULL) free_regionlist(rtl); if (rtl!=NULL) free_regionlist(rtl);
rtl = astralregions(rt, NULL); rtl = astralregions(rt, NULL);
for (rfind=rtl;rfind!=NULL;rfind=rfind->next) { for (rfind=rtl;rfind!=NULL;rfind=rfind->next) {
if (rfind->data==ro) break; if (rfind->data==mage->region) break;
} }
if (rfind==NULL) { if (rfind==NULL) {
/* the region r is not in the schemes of rt */ /* the region r is not in the schemes of rt */
ADDMSG(&mage->faction->msgs, msg_message("spellfail_distance", ADDMSG(&mage->faction->msgs, msg_message("spellfail_distance",
"command region unit target", co->order, ro, mage, u)); "command region unit target", co->order, mage->region, mage, u));
continue; continue;
} }
ro = u->region;
} }
if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) { if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
ADDMSG(&mage->faction->msgs, msg_message("spellfail_distance", ADDMSG(&mage->faction->msgs, msg_message("spellfail_distance",
"command region unit", co->order, ro, mage)); "command region unit", co->order, mage->region, mage));
continue; continue;
} }
@ -6202,7 +6203,7 @@ sp_fetchastral(castorder *co)
w = weight(u); w = weight(u);
if (remaining_cap - w < 0) { if (remaining_cap - w < 0) {
ADDMSG(&mage->faction->msgs, msg_message("fail_tooheavy", ADDMSG(&mage->faction->msgs, msg_message("fail_tooheavy",
"command region unit target", co->order, ro, mage, u)); "command region unit target", co->order, mage->region, mage, u));
continue; continue;
} }
@ -6213,7 +6214,7 @@ sp_fetchastral(castorder *co)
addmessage(rt, mage->faction, buf, MSG_MAGIC, ML_INFO); addmessage(rt, mage->faction, buf, MSG_MAGIC, ML_INFO);
sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.", sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.",
unitname(u), unitname(mage)); unitname(u), unitname(mage));
addmessage(rt, u->faction, buf, MSG_EVENT, ML_WARN); addmessage(ro, u->faction, buf, MSG_EVENT, ML_WARN);
} else { } else {
sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem " sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem "
"Zauber.", unitname(u)); "Zauber.", unitname(u));