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

BUG 2285: remove factions' wealthfrom statistics.

This commit is contained in:
Enno Rehling 2017-03-11 18:10:23 +01:00
parent f7ca4627d1
commit 0f2744fcf3
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/faction.h
View File

@ -83,7 +83,6 @@ extern "C" {
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; int nregions;
int money;
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) */

4
src/laws.c
View File

@ -1279,8 +1279,8 @@ static void remove_idle_players(void)
} }
else if (turn != f->lastorders) { else if (turn != f->lastorders) {
char info[256]; char info[256];
sprintf(info, "%d Einheiten, %d Personen, %d Silber", sprintf(info, "%d Einheiten, %d Personen",
f->no_units, f->num_total, f->money); f->no_units, f->num_total);
} }
fp = &f->next; fp = &f->next;
} }

10
src/summary.c
View File

@ -129,15 +129,15 @@ static char *rcomp(int i, int j)
static void out_faction(FILE * file, const struct faction *f) static void out_faction(FILE * file, const struct faction *f)
{ {
if (alliances != NULL) { if (alliances != NULL) {
fprintf(file, "%s (%s/%d) (%.3s/%.3s), %d Einh., %d Pers., $%d, %d NMR\n", fprintf(file, "%s (%s/%d) (%.3s/%.3s), %d Einh., %d Pers., %d NMR\n",
f->name, itoa36(f->no), f_get_alliance(f) ? f->alliance->id : 0, f->name, itoa36(f->no), f_get_alliance(f) ? f->alliance->id : 0,
LOC(default_locale, rc_name_s(f->race, NAME_SINGULAR)), magic_school[f->magiegebiet], LOC(default_locale, rc_name_s(f->race, NAME_SINGULAR)), magic_school[f->magiegebiet],
count_units(f), f->num_total, f->money, turn - f->lastorders); count_units(f), f->num_total, turn - f->lastorders);
} }
else { else {
fprintf(file, "%s (%.3s/%.3s), %d Einh., %d Pers., $%d, %d NMR\n", fprintf(file, "%s (%.3s/%.3s), %d Einh., %d Pers., %d NMR\n",
factionname(f), LOC(default_locale, rc_name_s(f->race, NAME_SINGULAR)), factionname(f), LOC(default_locale, rc_name_s(f->race, NAME_SINGULAR)),
magic_school[f->magiegebiet], count_units(f), f->num_total, f->money, magic_school[f->magiegebiet], count_units(f), f->num_total,
turn - f->lastorders); turn - f->lastorders);
} }
} }
@ -395,7 +395,6 @@ summary *make_summary(void)
++plang->number; ++plang->number;
f->nregions = 0; f->nregions = 0;
f->num_total = 0; f->num_total = 0;
f->money = 0;
if (f->units) { if (f->units) {
s->factions++; s->factions++;
/* Problem mit Monsterpartei ... */ /* Problem mit Monsterpartei ... */
@ -478,7 +477,6 @@ summary *make_summary(void)
} }
f->num_total += u->number; f->num_total += u->number;
f->money += get_money(u);
orace = (int)old_race(u_race(u)); orace = (int)old_race(u_race(u));
if (orace >= 0) { if (orace >= 0) {
s->poprace[orace] += u->number; s->poprace[orace] += u->number;