back out part1 patch (trunk only)

I got an unexpected access violation since
checking in that patch, so I'm backing out the
change while investigating.
This commit is contained in:
nethack.allison
2006-07-08 20:16:13 +00:00
parent 699330928d
commit 90f640a935
8 changed files with 47 additions and 102 deletions

View File

@@ -1311,7 +1311,7 @@ register struct monst *mtmp, *mtmp2;
/* since this is so rare, we don't have any `mon_move_light_source' */
new_light_source(mtmp2->mx, mtmp2->my,
emits_light(mtmp2->data),
LS_MONSTER, monst_to_any(mtmp2));
LS_MONSTER, (genericptr_t)mtmp2);
/* here we rely on the fact that `mtmp' hasn't actually been deleted */
del_light_source(LS_MONSTER, (genericptr_t)mtmp);
}
@@ -2623,7 +2623,7 @@ boolean msg; /* "The oldmon turns into a newmon!" */
del_light_source(LS_MONSTER, (genericptr_t)mtmp);
if (emits_light(mtmp->data))
new_light_source(mtmp->mx, mtmp->my, emits_light(mtmp->data),
LS_MONSTER, monst_to_any(mtmp));
LS_MONSTER, (genericptr_t)mtmp);
}
if (!mtmp->perminvis || pm_invisible(olddata))
mtmp->perminvis = pm_invisible(mdat);