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=1364 

"Wechsel von Astralraum in den Realraum möglich, obwohl Der Kontakt zur Realistät verhindert ist."
- was checking the wrong region.
This commit is contained in:
Enno Rehling 2008-03-05 21:27:55 +00:00
parent 1f69fb7060
commit bb1059eaa1
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5761,11 +5761,6 @@ sp_fetchastral(castorder *co)
return 0; return 0;
} }
if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_distance", ""));
return 0;
}
/* für jede Einheit in der Kommandozeile */ /* für jede Einheit in der Kommandozeile */
for (n=0; n!=pa->length; ++n) { for (n=0; n!=pa->length; ++n) {
unit * u2, * u = pa->param[n]->data.u; unit * u2, * u = pa->param[n]->data.u;
@ -5796,8 +5791,8 @@ sp_fetchastral(castorder *co)
ro = u->region; ro = u->region;
} }
if (is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) { if (is_cursed(ro->attribs, C_ASTRALBLOCK, 0)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_distance", "")); ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_astralblock", ""));
continue; continue;
} }
@ -5969,19 +5964,17 @@ sp_viewreality(castorder *co)
return 0; return 0;
} }
if (is_cursed(r->attribs, C_ASTRALBLOCK, 0)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "spellfail_astralblock", ""));
return 0;
}
rl = astralregions(r, NULL); rl = astralregions(r, NULL);
/* Irgendwann mal auf Curses u/o Attribut umstellen. */ /* Irgendwann mal auf Curses u/o Attribut umstellen. */
for (rl2=rl; rl2; rl2=rl2->next) { for (rl2=rl; rl2; rl2=rl2->next) {
u = create_unit(rl2->data, mage->faction, RS_FARVISION, new_race[RC_SPELL], 0, "spell/viewreality", NULL); region * rt = rl2->data;
if (!is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
u = create_unit(rt, mage->faction, RS_FARVISION, new_race[RC_SPELL], 0, "spell/viewreality", NULL);
set_level(u, SK_OBSERVATION, co->level/2); set_level(u, SK_OBSERVATION, co->level/2);
u->age = 2; u->age = 2;
} }
}
free_regionlist(rl); free_regionlist(rl);