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

http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000004 

- Kosmetik beim Kampfreport, Anzahl hat nicht gestimmt.
This commit is contained in:
Enno Rehling 2004-03-05 23:34:18 +00:00
parent ec400f9680
commit 0ab584abd4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2364,6 +2364,7 @@ aftermath(battle * b)
do_combatmagic(b, DO_POSTCOMBATSPELL); do_combatmagic(b, DO_POSTCOMBATSPELL);
cv_foreach(s, b->sides) { cv_foreach(s, b->sides) {
int snumber = 0;
fighter *df; fighter *df;
boolean relevant = false; /* Kampf relevant für dieses Heer? */ boolean relevant = false; /* Kampf relevant für dieses Heer? */
if (s->bf->lastturn+(b->has_tactics_turn?1:0)>1) { if (s->bf->lastturn+(b->has_tactics_turn?1:0)>1) {
@ -2377,6 +2378,7 @@ aftermath(battle * b)
int dead = du->number - df->alive - df->run.number; int dead = du->number - df->alive - df->run.number;
int sum_hp = 0; int sum_hp = 0;
int n; int n;
snumber +=du->number;
if (relevant && df->action_counter >= du->number) { if (relevant && df->action_counter >= du->number) {
ship * sh = du->ship?du->ship:leftship(du); ship * sh = du->ship?du->ship:leftship(du);
@ -2428,6 +2430,7 @@ aftermath(battle * b)
{ {
/* nur teilweise geflohene Einheiten mergen sich wieder */ /* nur teilweise geflohene Einheiten mergen sich wieder */
df->alive += df->run.number; df->alive += df->run.number;
s->alive += df->run.number;
sum_hp += df->run.hp; sum_hp += df->run.hp;
#ifndef NO_RUNNING #ifndef NO_RUNNING
merge_fleeloot(df, du); merge_fleeloot(df, du);
@ -2480,6 +2483,8 @@ aftermath(battle * b)
du->hp=du->no; du->hp=du->no;
} }
} cv_next(df); } cv_next(df);
s->alive+=s->healed;
assert(snumber==s->flee+s->alive+s->dead);
} cv_next(s); } cv_next(s);
dead_peasants = min(rpeasants(r), (is*BATTLE_KILLS_PEASANTS)/100); dead_peasants = min(rpeasants(r), (is*BATTLE_KILLS_PEASANTS)/100);
deathcounts(r, dead_peasants + is); deathcounts(r, dead_peasants + is);