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

NEW RULE: aftermath marks either all or none of the fighters in an army (side) as having had a long battle.

This commit is contained in:
Enno Rehling 2005-07-26 10:16:38 +00:00
parent d674bf8f13
commit f054d324aa
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@
#include "reports.h" #include "reports.h"
#include "ship.h" #include "ship.h"
#include "skill.h" #include "skill.h"
#include "spell.h"
#include "unit.h" #include "unit.h"
/* attributes includes */ /* attributes includes */
@ -2436,6 +2435,7 @@ aftermath(battle * b)
int snumber = 0; 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? */
boolean active_army = false; /* anyone in this army done much? */
if (s->bf->lastturn+(b->has_tactics_turn?1:0)>1) { if (s->bf->lastturn+(b->has_tactics_turn?1:0)>1) {
relevant = true; relevant = true;
} }
@ -2446,15 +2446,24 @@ 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;
boolean involved = relevant && df->action_counter >= du->number;
snumber += du->number; snumber += du->number;
if (relevant && df->action_counter >= du->number) {
ship * sh = du->ship?du->ship:leftship(du);
if (involved) {
ship * sh = du->ship?du->ship:leftship(du);
if (sh) fset(sh, SF_DAMAGED); if (sh) fset(sh, SF_DAMAGED);
}
if (active_army || involved) {
if (!active_army) {
/* make sur to stop everyone else in this army */
fighter * fig;
cv_foreach(fig, s->fighters) {
if (fig==df) break;
fset(fig->unit, UFL_LONGACTION);
} cv_next(fig);
active_army = true;
}
fset(du, UFL_LONGACTION); fset(du, UFL_LONGACTION);
/* TODO: das sollte hier weg sobald anderswo üb
* erall UFL_LONGACTION getestet wird. */
set_order(&du->thisorder, NULL);
} }
for (n = 0; n != df->alive; ++n) { for (n = 0; n != df->alive; ++n) {
if (df->person[n].hp > 0) if (df->person[n].hp > 0)