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

fix crash when items disappear

Browse source
This commit is contained in:
Enno Rehling 2010-02-06 18:11:23 +00:00
parent c481a5e80a
commit 7c0cb78bbf
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/kernel/battle.c
View file

@ -1364,11 +1364,17 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile)
fprintf(bdebug, "Damage %d, armor %d, type %d: %d -> %d HP, tot.\n",
da, ar, type, df->person[dt.index].hp + rda, df->person[dt.index].hp);
}
for (pitm=&du->items; *pitm; pitm=&(*pitm)->next) {
const item_type * itype = (*pitm)->type;
if (!(itype->flags & ITF_CURSED) && dt.index < (*pitm)->number) {
for (pitm=&du->items; *pitm; ) {
item * itm = *pitm;
const item_type * itype = itm->type;
if (!(itype->flags & ITF_CURSED) && dt.index < itm->number) {
/* 25% Grundchance, das ein Item kaputtgeht. */
if (rng_int() % 4 < 1) i_change(pitm, itype, -1);
if (rng_int() % 4 < 1) {
i_change(pitm, itype, -1);
}
}
if (*pitm==itm) {
pitm = &itm->next;
}
}
kill_troop(dt);