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

Das sollte eigentlich eine deutliche Beschleunigung von count_side geben.

This commit is contained in:
Enno Rehling 2004-05-28 21:31:11 +00:00
parent 81a8fde774
commit 76f49bd4c0
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,11 +513,6 @@ get_unitrow(const fighter * af)
int front = 0; int front = 0;
size_t bsize; size_t bsize;
#ifdef FAST_GETUNITROW
if (!b->nonblockers && b->alive==af->row.alive) {
return af->row.cached;
}
#endif
bsize = cv_size(&b->sides); bsize = cv_size(&b->sides);
if (csize<bsize) { if (csize<bsize) {
@ -528,7 +523,7 @@ get_unitrow(const fighter * af)
else memset(counted, 0, bsize*sizeof(boolean)); else memset(counted, 0, bsize*sizeof(boolean));
memset(size, 0, sizeof(size)); memset(size, 0, sizeof(size));
for (line=FIRST_ROW;line!=NUMROWS;++line) { for (line=FIRST_ROW;line!=NUMROWS;++line) {
int si; int si;
/* how many enemies are there in the first row? */ /* how many enemies are there in the first row? */
for (si=0;af->side->enemies[si];++si) { for (si=0;af->side->enemies[si];++si) {
side *s = af->side->enemies[si]; side *s = af->side->enemies[si];
@ -560,10 +555,6 @@ get_unitrow(const fighter * af)
*/ */
result = max(FIRST_ROW, row - retreat); result = max(FIRST_ROW, row - retreat);
#ifdef FAST_GETUNITROW
af->row.alive = b->alive;
af->row.cached = result;
#endif
return result; return result;
} }
@ -1305,13 +1296,21 @@ count_side(const side * s, int minrow, int maxrow)
{ {
void **fi; void **fi;
int people = 0; int people = 0;
int unitrow[NUMROWS];
int i;
for (i=0;i!=NUMROWS;++i) unitrow[i] = -1;
for (fi = s->fighters.begin; fi != s->fighters.end; ++fi) { for (fi = s->fighters.begin; fi != s->fighters.end; ++fi) {
const fighter *fig = *fi; const fighter *fig = *fi;
int row; int row;
if (fig->alive - fig->removed <= 0) continue; if (fig->alive - fig->removed <= 0) continue;
row = get_unitrow(fig); row = statusrow(fig->status);
if (unitrow[row] == -1) {
unitrow[row] = get_unitrow(fig);
}
row = unitrow[row];
if (row >= minrow && row <= maxrow) { if (row >= minrow && row <= maxrow) {
people += fig->alive - fig->removed; people += fig->alive - fig->removed;
@ -2975,9 +2974,6 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
s1->size[SUM_ROW] += u->number; s1->size[SUM_ROW] += u->number;
if (u->race->battle_flags & BF_NOBLOCK) { if (u->race->battle_flags & BF_NOBLOCK) {
s1->nonblockers[statusrow(fig->status)] += u->number; s1->nonblockers[statusrow(fig->status)] += u->number;
#ifdef FAST_GETUNITROW
b->nonblockers = true;
#endif
} }
if (fig->unit->race->flags & RCF_HORSE) { if (fig->unit->race->flags & RCF_HORSE) {

12
src/common/kernel/battle.h
View File

@ -17,9 +17,6 @@
extern "C" { extern "C" {
#endif #endif
/** new code defines **/
#undef FAST_GETUNITROW
/** more defines **/ /** more defines **/
#define FS_ENEMY 1 #define FS_ENEMY 1
#define FS_HELP 2 #define FS_HELP 2
@ -64,9 +61,6 @@ extern "C" {
int alive; int alive;
#ifdef SMALL_BATTLE_MESSAGES #ifdef SMALL_BATTLE_MESSAGES
boolean small; boolean small;
#endif
#ifdef FAST_GETUNITROW
boolean nonblockers;
#endif #endif
} battle; } battle;
@ -180,12 +174,6 @@ extern "C" {
#ifdef SHOW_KILLS #ifdef SHOW_KILLS
int kills; int kills;
int hits; int hits;
#endif
#ifdef FAST_GETUNITROW
struct {
int alive;
int cached;
} row;
#endif #endif
} fighter; } fighter;