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

sp_showastral (Astraler Blick) aus der Liste der Zauber entfernt, der Zauber hat seit 2 Jahren schon keine Wirkung mehr.

This commit is contained in:
Enno Rehling 2004-05-21 18:04:18 +00:00
parent ea83b1f2fa
commit da813f74d0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/kernel/magic.c
View File

@ -227,8 +227,11 @@ read_mage(attrib * a, FILE * F)
} }
for (;;) { for (;;) {
int spid; int spid;
fscanf (F, "%d", &spid); fscanf (F, "%d", &spid);
if (spid < 0) break; if (spid < 0) break;
if (find_spellbyid((spellid_t)spid)==NULL) continue;
*sp = calloc (sizeof(spell_ptr), 1); *sp = calloc (sizeof(spell_ptr), 1);
(*sp)->spellid = (spellid_t)spid; (*sp)->spellid = (spellid_t)spid;
sp = &(*sp)->next; sp = &(*sp)->next;

12
src/common/kernel/spell.c
View File

@ -6277,11 +6277,10 @@ sp_fetchastral(castorder *co)
return cast_level; return cast_level;
} }
/* ------------------------------------------------------------- */ #ifdef SHOWASTRAL_NOT_BORKED
int int
sp_showastral(castorder *co) sp_showastral(castorder *co)
{ {
#if 0
unit *u; unit *u;
region *rt; region *rt;
int n = 0; int n = 0;
@ -6365,11 +6364,10 @@ sp_showastral(castorder *co)
free_regionlist(rl); free_regionlist(rl);
return cast_level; return cast_level;
#else
unused(co); unused(co);
return 0; return 0;
#endif
} }
#endif
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
int int
@ -7750,6 +7748,10 @@ find_spellbyid(spellid_t id)
spell_list * slist; spell_list * slist;
assert(id>=0); assert(id>=0);
#ifndef SHOWASTRAL_NOT_BORKED
/* disabled spells */
if (id==SPL_SHOWASTRAL) return NULL;
#endif
if (id==SPL_NOSPELL) return NULL; if (id==SPL_NOSPELL) return NULL;
for (slist=spells;slist!=NULL;slist=slist->next) { for (slist=spells;slist!=NULL;slist=slist->next) {
spell* sp = slist->data; spell* sp = slist->data;
@ -9725,6 +9727,7 @@ static spell spelldaten[] =
}, },
(spell_f)sp_fumbleshield, patzer (spell_f)sp_fumbleshield, patzer
}, },
#ifdef SHOWASTRAL_NOT_BORKED
{ {
SPL_SHOWASTRAL, "Astraler Blick", SPL_SHOWASTRAL, "Astraler Blick",
"Der Magier kann kurzzeitig in die Astralebene blicken und erfährt " "Der Magier kann kurzzeitig in die Astralebene blicken und erfährt "
@ -9739,6 +9742,7 @@ static spell spelldaten[] =
}, },
(spell_f)sp_showastral, patzer (spell_f)sp_showastral, patzer
}, },
#endif
{ {
SPL_RESISTMAGICBONUS, "Schutzzauber", SPL_RESISTMAGICBONUS, "Schutzzauber",
"Dieser Zauber verstärkt die natürliche Widerstandskraft gegen Magie. " "Dieser Zauber verstärkt die natürliche Widerstandskraft gegen Magie. "