| version 1.108 | | version 1.109 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.108 2005/10/18 16:54:30 gros Exp $"; | | * "$Id: object.c,v 1.109 2005/10/28 19:08:53 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { | | for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { |
| if (inv->inv) | | if (inv->inv) |
| sum_weight(inv); | | sum_weight(inv); |
| sum += inv->carrying + (inv->nrof ? inv->weight * inv->nrof : inv->weight); | | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
| } | | } |
| if (op->type == CONTAINER && op->stats.Str) | | if (op->type == CONTAINER && op->stats.Str) |
| sum = (sum * (100 - op->stats.Str))/100; | | sum = (sum * (100 - op->stats.Str))/100; |