From 0c2a0080cb76863a320fab215277d9e60eea1de5 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 17 Apr 2005 18:25:11 +0000
Subject: [PATCH] =?UTF-8?q?Noch=20mehr=20=C3=84nderungen=20wg.=20Gewichten?=
 =?UTF-8?q?.=201=20GE=20=3D=20[1..100]=20Silber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/creport.c | 34 +++++++++++++++++-----------------
 src/common/gamecode/report.c  |  3 ++-
 src/mapper/map_units.c        | 10 +++++-----
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index b3fa943da..1a93056d2 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -562,19 +562,19 @@ cr_output_buildings(FILE * F, building * b, unit * u, int fno, faction *f)
 
 /* prints a ship */
 static void
-cr_output_ship(FILE * F, const ship * s, const unit * u, int fcaptain, const faction * f, const region * r)
+cr_output_ship(FILE * F, const ship * sh, const unit * u, int fcaptain, const faction * f, const region * r)
 {
 	unit *u2;
 	int w = 0;
-	assert(s);
-	fprintf(F, "SCHIFF %d\n", s->no);
-	fprintf(F, "\"%s\";Name\n", s->name);
-	if (strlen(s->display))
-		fprintf(F, "\"%s\";Beschr\n", s->display);
-	fprintf(F, "\"%s\";Typ\n", add_translation(s->type->name[0], locale_string(f->locale, s->type->name[0])));
-	fprintf(F, "%d;Groesse\n", s->size);
-	if (s->damage) {
-		int percent = s->damage*100/(s->size*DAMAGE_SCALE);
+	assert(sh);
+	fprintf(F, "SCHIFF %d\n", sh->no);
+	fprintf(F, "\"%s\";Name\n", sh->name);
+	if (strlen(sh->display))
+		fprintf(F, "\"%s\";Beschr\n", sh->display);
+	fprintf(F, "\"%s\";Typ\n", add_translation(sh->type->name[0], locale_string(f->locale, sh->type->name[0])));
+	fprintf(F, "%d;Groesse\n", sh->size);
+	if (sh->damage) {
+		int percent = sh->damage*100/(sh->size*DAMAGE_SCALE);
 		fprintf(F, "%d;Schaden\n", percent);
 	}
 	if (u)
@@ -584,20 +584,20 @@ cr_output_ship(FILE * F, const ship * s, const unit * u, int fcaptain, const fac
 
 	/* calculate cargo */
 	if (u && (u->faction == f || omniscient(f))) {
-		for (u2 = r->units; u2; u2 = u2->next)
-			if (u2->ship == s)
-				w += weight(u2);
+    int n = 0, p = 0;
+    getshipweight(sh, &n, &p);
+    n = (n+99) / 100; /* 1 Silber = 1 GE */
 
-		fprintf(F, "%d;Ladung\n", (w + 99) / 100);
-		fprintf(F, "%d;MaxLadung\n", shipcapacity(s) / 100);
+		fprintf(F, "%d;Ladung\n", n);
+		fprintf(F, "%d;MaxLadung\n", shipcapacity(sh) / 100);
 	}
 	/* shore */
 	w = NODIRECTION;
-	if (rterrain(r) != T_OCEAN) w = s->coast;
+	if (rterrain(r) != T_OCEAN) w = sh->coast;
 	if (w != NODIRECTION)
 		fprintf(F, "%d;Kueste\n", w);
 
-	print_curses(F, f, s, TYP_SHIP);
+	print_curses(F, f, sh, TYP_SHIP);
 }
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =  */
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 17d467b7e..713c643fe 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2345,9 +2345,10 @@ report(FILE *F, faction * f, const faction_list * addresses,
       if (of == f) {
         int n = 0, p = 0;
         getshipweight(sh, &n, &p);
+        n = (n+99) / 100; /* 1 Silber = 1 GE */
 
         sprintf(buf, "%s, %s, (%d/%d)", shipname(sh), 
-          LOC(f->locale, sh->type->name[0]), n / 100, shipcapacity(sh) / 100);
+          LOC(f->locale, sh->type->name[0]), n, shipcapacity(sh) / 100);
       } else {
         sprintf(buf, "%s, %s", shipname(sh), LOC(f->locale, sh->type->name[0]));
       }
diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index 3552dcb28..8ca3cdf44 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -974,11 +974,11 @@ showunits(region * r)
 		}
 	}
 	for (sh = r->ships; sh; sh = sh->next) {
-		f=0;
-		for (u = r->units; u; u = u->next)
-			if (u->ship == sh) f += weight(u);
-			sprintf(lbuf, "\023%s, %s, (%d/%d)", shipname(sh), sh->type->name[0],
-					(f+99)/100, shipcapacity(sh)/100);
+    int n = 0, p = 0;
+    getshipweight(sh, &n, &p);
+    n = (n+99) / 100; /* 1 Silber = 1 GE */
+    sprintf(lbuf, "\023%s, %s, (%d/%d)", shipname(sh), sh->type->name[0],
+      n, shipcapacity(sh)/100);
 		if (sh->type->construction && sh->size!=sh->type->construction->maxsize) {
 			f = 100 * (sh->size) / sh->type->construction->maxsize;
 			sncat(lbuf, ", im Bau (", BUFSIZE);