From 1f69fb706082d90e73a8ed63f268b9a5ea020351 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 5 Mar 2008 20:58:44 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1280 do not count healed people among kills. --- src/common/kernel/battle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 4750095d3..00b460073 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -1109,7 +1109,7 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile) if (df->person[dt.index].hp > 0) { /* Hat überlebt */ if (bdebug) { fprintf(bdebug, "Damage %d, armor %d: %d -> %d HP\n", - da, ar, df->person[dt.index].hp, df->person[dt.index].hp - rda); + da, ar, df->person[dt.index].hp + rda, df->person[dt.index].hp); } if (au->race == new_race[RC_DAEMON]) { #ifdef TODO_RUNESWORD @@ -1123,9 +1123,6 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile) df->person[dt.index].flags = (df->person[dt.index].flags & ~FL_SLEEPING); return false; } -#ifdef SHOW_KILLS - ++at.fighter->kills; -#endif /* Sieben Leben */ if (du->race == new_race[RC_CAT] && (chance(1.0 / 7))) { @@ -1154,6 +1151,10 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile) return false; } +#ifdef SHOW_KILLS + ++at.fighter->kills; +#endif + if (bdebug) { fprintf(bdebug, "Damage %d, armor %d: %d -> %d HP, tot.\n", da, ar, df->person[dt.index].hp, df->person[dt.index].hp - rda);