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

kill faction.nregions, it is calculated but never read.

Browse source
This commit is contained in:
Enno Rehling 2017-03-12 14:20:34 +01:00
parent 627f5ba2d1
commit 7b4550b9d6
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/kernel/faction.h
View file

@ -81,7 +81,6 @@ extern "C" {
int options; int options;
struct ally *allies; /* alliedgroup and others should check sf.faction.alive before using a faction from f.allies */ struct ally *allies; /* alliedgroup and others should check sf.faction.alive before using a faction from f.allies */
struct group *groups; /* alliedgroup and others should check sf.faction.alive before using a faction from f.groups */ struct group *groups; /* alliedgroup and others should check sf.faction.alive before using a faction from f.groups */
int nregions;
score_t score; score_t score;
struct alliance *alliance; struct alliance *alliance;
int alliance_joindate; /* the turn on which the faction joined its current alliance (or left the last one) */ int alliance_joindate; /* the turn on which the faction joined its current alliance (or left the last one) */

10
src/summary.c
View file

@ -393,7 +393,6 @@ summary *make_summary(void)
plang->locale = lang; plang->locale = lang;
} }
++plang->number; ++plang->number;
f->nregions = 0;
if (f->units) { if (f->units) {
s->factions++; s->factions++;
/* Problem mit Monsterpartei ... */ /* Problem mit Monsterpartei ... */
@ -432,11 +431,6 @@ summary *make_summary(void)
s->peasants += rpeasants(r); s->peasants += rpeasants(r);
s->peasantmoney += rmoney(r); s->peasantmoney += rmoney(r);
/* Einheiten Info. nregions darf nur einmal pro Partei
* incrementiert werden. */
for (u = r->units; u; u = u->next)
freset(u->faction, FFL_SELECT);
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {
int orace; int orace;
f = u->faction; f = u->faction;
@ -469,10 +463,6 @@ summary *make_summary(void)
if (aktskill > s->maxskill) if (aktskill > s->maxskill)
s->maxskill = aktskill; s->maxskill = aktskill;
} }
if (!fval(f, FFL_SELECT)) {
f->nregions++;
fset(f, FFL_SELECT);
}
} }
orace = (int)old_race(u_race(u)); orace = (int)old_race(u_race(u));