| … | |
… | |
| 345 | else |
345 | else |
| 346 | { |
346 | { |
| 347 | // maybe there is a player standing on the same mapspace |
347 | // maybe there is a player standing on the same mapspace |
| 348 | // this will catch the case where "this" is a player |
348 | // this will catch the case where "this" is a player |
| 349 | if (object *pl = ms ().player ()) |
349 | if (object *pl = ms ().player ()) |
|
|
350 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
| 350 | if (!pl->container || this == pl->container) |
351 | || this == pl->container) |
| 351 | return pl; |
352 | return pl; |
| 352 | } |
353 | } |
| 353 | } |
354 | } |
| 354 | |
355 | |
| 355 | return 0; |
356 | return 0; |
| … | |
… | |
| 1541 | |
1542 | |
| 1542 | nrof -= nr; |
1543 | nrof -= nr; |
| 1543 | |
1544 | |
| 1544 | if (nrof) |
1545 | if (nrof) |
| 1545 | { |
1546 | { |
| 1546 | adjust_weight (env, -weight * nr); // carrying == 0 |
1547 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
| 1547 | |
1548 | |
| 1548 | if (object *pl = visible_to ()) |
1549 | if (object *pl = visible_to ()) |
| 1549 | esrv_update_item (UPD_NROF, pl, this); |
1550 | esrv_update_item (UPD_NROF, pl, this); |
| 1550 | |
1551 | |
| 1551 | return true; |
1552 | return true; |
| 1552 | } |
1553 | } |
| 1553 | else |
1554 | else |
| 1554 | { |
1555 | { |
| 1555 | destroy (1); |
1556 | destroy (); |
| 1556 | return false; |
1557 | return false; |
| 1557 | } |
1558 | } |
| 1558 | } |
1559 | } |
| 1559 | |
1560 | |
| 1560 | /* |
1561 | /* |
