forked from github/server
Das sollte eigentlich eine deutliche Beschleunigung von count_side geben.
This commit is contained in:
parent
81a8fde774
commit
76f49bd4c0
|
@ -513,11 +513,6 @@ get_unitrow(const fighter * af)
|
|||
int front = 0;
|
||||
size_t bsize;
|
||||
|
||||
#ifdef FAST_GETUNITROW
|
||||
if (!b->nonblockers && b->alive==af->row.alive) {
|
||||
return af->row.cached;
|
||||
}
|
||||
#endif
|
||||
bsize = cv_size(&b->sides);
|
||||
|
||||
if (csize<bsize) {
|
||||
|
@ -560,10 +555,6 @@ get_unitrow(const fighter * af)
|
|||
*/
|
||||
result = max(FIRST_ROW, row - retreat);
|
||||
|
||||
#ifdef FAST_GETUNITROW
|
||||
af->row.alive = b->alive;
|
||||
af->row.cached = result;
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -1305,13 +1296,21 @@ count_side(const side * s, int minrow, int maxrow)
|
|||
{
|
||||
void **fi;
|
||||
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) {
|
||||
const fighter *fig = *fi;
|
||||
int row;
|
||||
|
||||
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) {
|
||||
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;
|
||||
if (u->race->battle_flags & BF_NOBLOCK) {
|
||||
s1->nonblockers[statusrow(fig->status)] += u->number;
|
||||
#ifdef FAST_GETUNITROW
|
||||
b->nonblockers = true;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (fig->unit->race->flags & RCF_HORSE) {
|
||||
|
|
|
@ -17,9 +17,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
/** new code defines **/
|
||||
#undef FAST_GETUNITROW
|
||||
|
||||
/** more defines **/
|
||||
#define FS_ENEMY 1
|
||||
#define FS_HELP 2
|
||||
|
@ -64,9 +61,6 @@ extern "C" {
|
|||
int alive;
|
||||
#ifdef SMALL_BATTLE_MESSAGES
|
||||
boolean small;
|
||||
#endif
|
||||
#ifdef FAST_GETUNITROW
|
||||
boolean nonblockers;
|
||||
#endif
|
||||
} battle;
|
||||
|
||||
|
@ -180,12 +174,6 @@ extern "C" {
|
|||
#ifdef SHOW_KILLS
|
||||
int kills;
|
||||
int hits;
|
||||
#endif
|
||||
#ifdef FAST_GETUNITROW
|
||||
struct {
|
||||
int alive;
|
||||
int cached;
|
||||
} row;
|
||||
#endif
|
||||
} fighter;
|
||||
|
||||
|
|
Loading…
Reference in New Issue