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

http://eressea.upb.de/mantis/view.php?id=1280 

do not count healed people among kills.
This commit is contained in:
Enno Rehling 2008-03-05 20:58:44 +00:00
parent 91ece491e5
commit 1f69fb7060
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/kernel/battle.c
View File

@ -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);