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

http://eressea.upb.de/mantis/view.php?id=1120

Browse source 
"Damaged ship didn't sail although load was exactly at capacity"

Die Silberaufrundng wird nur noch im Report gemacht. Alles andere verwirrt.
This commit is contained in:
Enno Rehling 2007-02-04 18:41:43 +00:00
parent 0b4bc1743e
commit 7c258dde41
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/kernel/build.c
View file

@ -1164,7 +1164,6 @@ enter_ship(unit * u, struct order * ord, int id, boolean report)
getshipweight(sh, &sweight, &scabins); getshipweight(sh, &sweight, &scabins);
sweight += weight(u); sweight += weight(u);
scabins += u->number; scabins += u->number;
sweight = ((sweight+99) / 100) * 100; /* Silberreste aufrunden */
if (sweight > mweight || scabins > mcabins) { if (sweight > mweight || scabins > mcabins) {
if (report) cmistake(u, ord, 34, MSG_MOVE); if (report) cmistake(u, ord, 34, MSG_MOVE);

1
src/common/kernel/movement.c
View file

@ -449,7 +449,6 @@ cansail(const region * r, ship * sh)
if (sh->type->construction && sh->size!=sh->type->construction->maxsize) if (sh->type->construction && sh->size!=sh->type->construction->maxsize)
return false; return false;
getshipweight(sh, &n, &p); getshipweight(sh, &n, &p);
n = ((n+99)/100) * 100; /* Silberreste aufrunden */
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) { if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
if (sh->type->cargo>500*100) if (sh->type->cargo>500*100)