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

weight, cargo & capacity in the CR.

Browse source
This commit is contained in:
Enno Rehling 2006-01-18 23:12:59 +00:00
parent 2f3181af53
commit 6df45d2a93
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/gamecode/creport.c
View file

@ -579,12 +579,15 @@ cr_output_ship(FILE * F, const ship * sh, const unit * u, int fcaptain, const fa
/* calculate cargo */ /* calculate cargo */
if (u && (u->faction == f || omniscient(f))) { if (u && (u->faction == f || omniscient(f))) {
int n = 0, p = 0; int n = 0, p = 0, c = shipcapacity(sh);
getshipweight(sh, &n, &p); getshipweight(sh, &n, &p);
n = (n+99) / 100; /* 1 Silber = 1 GE */
fprintf(F, "%d;cargo\n", n);
fprintf(F, "%d;capacity\n", c);
n = (n+99) / 100; /* 1 Silber = 1 GE */
fprintf(F, "%d;Ladung\n", n); fprintf(F, "%d;Ladung\n", n);
fprintf(F, "%d;MaxLadung\n", shipcapacity(sh) / 100); fprintf(F, "%d;MaxLadung\n", c / 100);
} }
/* shore */ /* shore */
w = NODIRECTION; w = NODIRECTION;
@ -730,6 +733,7 @@ cr_output_unit(FILE * F, const region * r,
fprintf(F, "%d;alias\n", -i); fprintf(F, "%d;alias\n", -i);
i = get_money(u); i = get_money(u);
fprintf(F, "%d;Kampfstatus\n", u->status); fprintf(F, "%d;Kampfstatus\n", u->status);
fprintf(F, "%d;weight\n", weight(u));
if (fval(u, UFL_NOAID)) { if (fval(u, UFL_NOAID)) {
fputs("1;unaided\n", F); fputs("1;unaided\n", F);
} }