From 0f2744fcf37fa2593ecea327cd6a95ea46051d1d Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 11 Mar 2017 18:10:23 +0100
Subject: [PATCH] BUG 2285: remove factions' wealthfrom statistics.

---
 src/kernel/faction.h |  1 -
 src/laws.c           |  4 ++--
 src/summary.c        | 10 ++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/kernel/faction.h b/src/kernel/faction.h
index 0a0ac39d6..80248210a 100644
--- a/src/kernel/faction.h
+++ b/src/kernel/faction.h
@@ -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 group *groups; /* alliedgroup and others should check sf.faction.alive before using a faction from f.groups */
         int nregions;
-        int money;
         score_t score;
         struct alliance *alliance;
         int alliance_joindate;      /* the turn on which the faction joined its current alliance (or left the last one) */
diff --git a/src/laws.c b/src/laws.c
index 2554d0e23..d66cf496b 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -1279,8 +1279,8 @@ static void remove_idle_players(void)
             }
             else if (turn != f->lastorders) {
                 char info[256];
-                sprintf(info, "%d Einheiten, %d Personen, %d Silber",
-                    f->no_units, f->num_total, f->money);
+                sprintf(info, "%d Einheiten, %d Personen",
+                    f->no_units, f->num_total);
             }
             fp = &f->next;
         }
diff --git a/src/summary.c b/src/summary.c
index 32416a263..86273e67d 100644
--- a/src/summary.c
+++ b/src/summary.c
@@ -129,15 +129,15 @@ static char *rcomp(int i, int j)
 static void out_faction(FILE * file, const struct faction *f)
 {
     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,
             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 {
-        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)),
-            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);
     }
 }
@@ -395,7 +395,6 @@ summary *make_summary(void)
         ++plang->number;
         f->nregions = 0;
         f->num_total = 0;
-        f->money = 0;
         if (f->units) {
             s->factions++;
             /* Problem mit Monsterpartei ... */
@@ -478,7 +477,6 @@ summary *make_summary(void)
                 }
 
                 f->num_total += u->number;
-                f->money += get_money(u);
                 orace = (int)old_race(u_race(u));
                 if (orace >= 0) {
                     s->poprace[orace] += u->number;