| … | |
… | |
| 446 | |
446 | |
| 447 | return 0; |
447 | return 0; |
| 448 | } |
448 | } |
| 449 | |
449 | |
| 450 | // adjust weight per container type ("of holding") |
450 | // adjust weight per container type ("of holding") |
| 451 | static uint32 |
451 | static weight_t |
| 452 | weight_adjust_for (object *op, uint32 weight) |
452 | weight_adjust_for (object *op, weight_t weight) |
| 453 | { |
453 | { |
| 454 | return op->type == CONTAINER |
454 | if (op->type == CONTAINER) |
| 455 | ? weight - weight * op->stats.Str / 100 |
455 | weight -= weight * op->stats.Str / 100; |
| 456 | : weight; |
456 | |
|
|
457 | return weight; |
| 457 | } |
458 | } |
| 458 | |
459 | |
| 459 | /* |
460 | /* |
| 460 | * subtracts, then adds, the specified weight to an object, |
461 | * subtracts, then adds, the specified weight to an object, |
| 461 | * and also updates how much the environment(s) is/are carrying. |
462 | * and also updates how much the environment(s) is/are carrying. |
| 462 | */ |
463 | */ |
| 463 | static void |
464 | static void |
| 464 | adjust_weight (object *op, sint32 sub, sint32 add) |
465 | adjust_weight (object *op, weight_t sub, weight_t add) |
| 465 | { |
466 | { |
| 466 | while (op) |
467 | while (op) |
| 467 | { |
468 | { |
| 468 | sint32 ocarrying = op->carrying; |
469 | weight_t carrying = op->carrying |
|
|
470 | - weight_adjust_for (op, sub); |
|
|
471 | + weight_adjust_for (op, add); |
| 469 | |
472 | |
| 470 | op->carrying -= weight_adjust_for (op, sub); |
473 | sub = op->carrying; |
| 471 | op->carrying += weight_adjust_for (op, add); |
474 | op->carrying = carrying; |
|
|
475 | add = op->carrying; |
| 472 | |
476 | |
| 473 | if (object *pl = op->visible_to ()) |
477 | if (object *pl = op->visible_to ()) |
| 474 | if (pl != op) // player is handled lazily |
478 | if (pl != op) // player is handled lazily |
| 475 | esrv_update_item (UPD_WEIGHT, pl, op); |
479 | esrv_update_item (UPD_WEIGHT, pl, op); |
| 476 | |
480 | |
| 477 | sub = ocarrying; |
|
|
| 478 | add = op->carrying; |
|
|
| 479 | |
|
|
| 480 | op = op->env; |
481 | op = op->env; |
| 481 | } |
482 | } |
| 482 | } |
483 | } |
| 483 | |
484 | |
| 484 | /* |
485 | /* |
| … | |
… | |
| 487 | * containers are carrying, and sums it up. |
488 | * containers are carrying, and sums it up. |
| 488 | */ |
489 | */ |
| 489 | void |
490 | void |
| 490 | object::update_weight () |
491 | object::update_weight () |
| 491 | { |
492 | { |
| 492 | sint32 sum = 0; |
493 | weight_t sum = 0; |
| 493 | |
494 | |
| 494 | for (object *op = inv; op; op = op->below) |
495 | for (object *op = inv; op; op = op->below) |
| 495 | { |
496 | { |
| 496 | op->update_weight (); |
497 | op->update_weight (); |
| 497 | |
498 | |
| … | |
… | |
| 1606 | |
1607 | |
| 1607 | nr = min (nr, nrof); |
1608 | nr = min (nr, nrof); |
| 1608 | |
1609 | |
| 1609 | if (nrof > nr) |
1610 | if (nrof > nr) |
| 1610 | { |
1611 | { |
| 1611 | sint64 oweight = total_weight (); |
1612 | weight_t oweight = total_weight (); |
| 1612 | |
1613 | |
| 1613 | nrof -= nr; |
1614 | nrof -= nr; |
| 1614 | |
1615 | |
| 1615 | if (object *pl = visible_to ()) |
1616 | if (object *pl = visible_to ()) |
| 1616 | esrv_update_item (UPD_NROF, pl, this); |
1617 | esrv_update_item (UPD_NROF, pl, this); |
| … | |
… | |
| 1700 | if (object::can_merge (tmp, op)) |
1701 | if (object::can_merge (tmp, op)) |
| 1701 | { |
1702 | { |
| 1702 | /* return the original object and remove inserted object |
1703 | /* return the original object and remove inserted object |
| 1703 | (client prefers the original object) */ |
1704 | (client prefers the original object) */ |
| 1704 | |
1705 | |
| 1705 | // carring must be 0 for mergable objects |
1706 | // carrying must be 0 for mergable objects |
| 1706 | sint64 oweight = tmp->weight * tmp->nrof; |
1707 | weight_t oweight = weight_t (tmp->weight) * tmp->nrof; |
| 1707 | |
1708 | |
| 1708 | tmp->nrof += op->nrof; |
1709 | tmp->nrof += op->nrof; |
| 1709 | |
1710 | |
| 1710 | if (object *pl = tmp->visible_to ()) |
1711 | if (object *pl = tmp->visible_to ()) |
| 1711 | esrv_update_item (UPD_NROF, pl, tmp); |
1712 | esrv_update_item (UPD_NROF, pl, tmp); |
| 1712 | |
1713 | |
| 1713 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1714 | adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof); |
| 1714 | |
1715 | |
| 1715 | op->destroy (); |
1716 | op->destroy (); |
| 1716 | op = tmp; |
1717 | op = tmp; |
| 1717 | goto inserted; |
1718 | goto inserted; |
| 1718 | } |
1719 | } |
