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

crashbug leere magier 

error fuer fehlende curseinfo
This commit is contained in:
Enno Rehling 2007-02-11 21:48:35 +00:00
parent 30a43b925d
commit a9a8a9a6d3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/creport.c
View File

@ -249,6 +249,8 @@ print_curses(FILE * F, const faction * viewer, const void * obj, typ_t typ)
self = c->type->cansee(viewer, obj, typ, c, self); self = c->type->cansee(viewer, obj, typ, c, self);
} }
dh = c->type->curseinfo(viewer->locale, obj, typ, c, self); dh = c->type->curseinfo(viewer->locale, obj, typ, c, self);
} else {
log_error(("no curseinfo for %s\n", c->type->cname));
} }
if (dh==0) { if (dh==0) {
if (c->type->info_str!=NULL) { if (c->type->info_str!=NULL) {

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

@ -2476,14 +2476,14 @@ magic(void)
boolean casted = false; boolean casted = false;
order * ord; order * ord;
if (u->race == new_race[RC_SPELL] || fval(u, UFL_LONGACTION)) if (u->number<=0 || u->race == new_race[RC_SPELL])
continue; continue;
if (u->race == new_race[RC_INSECT] && r_insectstalled(r) && if (u->race == new_race[RC_INSECT] && r_insectstalled(r) &&
!is_cursed(u->attribs, C_KAELTESCHUTZ,0)) !is_cursed(u->attribs, C_KAELTESCHUTZ,0))
continue; continue;
if(fval(u, UFL_WERE|UFL_LONGACTION)) { if (fval(u, UFL_WERE|UFL_LONGACTION)) {
continue; continue;
} }