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

Noch mehr Einsparungen von Aufrufen nach get_unitrow()

This commit is contained in:
Enno Rehling 2004-05-28 23:46:49 +00:00
parent 76f49bd4c0
commit 6820841790
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1340,12 +1340,12 @@ count_enemies(battle * b, side * as, int minrow, int maxrow)
troop troop
select_enemy(battle * b, fighter * af, int minrow, int maxrow) select_enemy(battle * b, fighter * af, int minrow, int maxrow)
{ {
side *as = af?af->side:NULL; side *as = af->side;
troop dt = no_troop; troop dt = no_troop;
void ** si; int si;
int enemies; int enemies;
if (af && af->unit->race->flags & RCF_FLY) { if (af->unit->race->flags & RCF_FLY) {
/* flying races ignore min- and maxrow and can attack anyone fighting /* flying races ignore min- and maxrow and can attack anyone fighting
* them */ * them */
minrow = FIGHT_ROW; minrow = FIGHT_ROW;
@ -1355,16 +1355,27 @@ select_enemy(battle * b, fighter * af, int minrow, int maxrow)
enemies = count_enemies(b, as, minrow, maxrow); enemies = count_enemies(b, as, minrow, maxrow);
if (!enemies) /* Niemand ist in der angegebenen Entfernung? */
return dt; /* Niemand ist in der angegebenen Entfernung */ if (enemies<=0) return dt;
enemies = rand() % enemies; enemies = rand() % enemies;
for (si=b->sides.begin;!dt.fighter && si!=b->sides.end;++si) { for (si=0;!dt.fighter && as->enemies[si];++si) {
side *ds = *si; side *ds = as->enemies[si];
void ** fi; void ** fi;
if (as!=NULL && !enemy(as, ds)) continue; int ui, unitrow[NUMROWS];
for (ui=0;ui!=NUMROWS;++ui) unitrow[ui] = -1;
for (fi=ds->fighters.begin;fi!=ds->fighters.end;++fi) { for (fi=ds->fighters.begin;fi!=ds->fighters.end;++fi) {
fighter * df = *fi; fighter * df = *fi;
int dr = get_unitrow(df); int dr;
ui = statusrow(df);
if (unitrow[ui]<0) {
unitrow[ui] = get_unitrow(df);
}
dr = unitrow[ui];
if (dr < minrow || dr > maxrow) continue; if (dr < minrow || dr > maxrow) continue;
if (df->alive - df->removed > enemies) { if (df->alive - df->removed > enemies) {
dt.index = enemies; dt.index = enemies;