From 0b88d46667b97cc14c25de0de8ec608977a1583f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 9 Apr 2006 14:26:02 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=879 - kopflose, blutleere Wyrme repariert. --- src/common/kernel/battle.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 8ebad9764..9c9380c11 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -827,20 +827,22 @@ remove_troop(troop dt) unit * du = df->unit; rmtroop(dt); - if (!df->alive && du->race->itemdrop) { + if (!df->alive) { char eqname[64]; const struct equipment * eq; - item * drops = du->race->itemdrop(du->race, du->number-df->run.number); + if (du->race->itemdrop) { + item * drops = du->race->itemdrop(du->race, du->number-df->run.number); - if (drops != NULL){ - i_merge(&du->items, &drops); - } + if (drops != NULL){ + i_merge(&du->items, &drops); + } + } sprintf(eqname, "%s_spoils", du->race->_name[0]); eq = get_equipment(eqname); if (eq!=NULL) { equip_items(&du->items, eq); } - } + } } /** reduces the target's exp by an equivalent of n points learning