| … | |
… | |
| 186 | || ob1->speed != ob2->speed |
186 | || ob1->speed != ob2->speed |
| 187 | || ob1->value != ob2->value |
187 | || ob1->value != ob2->value |
| 188 | || ob1->name != ob2->name) |
188 | || ob1->name != ob2->name) |
| 189 | return 0; |
189 | return 0; |
| 190 | |
190 | |
| 191 | /* Do not merge objects if nrof would overflow. First part checks |
191 | /* Do not merge objects if nrof would overflow, assume nrof |
| 192 | * for unsigned overflow (2c), second part checks whether the result |
192 | * is always 0 .. 2**31-1 */ |
| 193 | * would fit into a 32 bit signed int, which is often used to hold |
193 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
| 194 | * nrof values. |
|
|
| 195 | */ |
|
|
| 196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
| 197 | return 0; |
194 | return 0; |
| 198 | |
195 | |
| 199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
196 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
| 200 | * This is to the comparison of the flags below will be OK. We |
197 | * This is to the comparison of the flags below will be OK. We |
| 201 | * just can't ignore the been applied or identified flags, as they |
198 | * just can't ignore the been applied or identified flags, as they |
| … | |
… | |
| 345 | else |
342 | else |
| 346 | { |
343 | { |
| 347 | // maybe there is a player standing on the same mapspace |
344 | // maybe there is a player standing on the same mapspace |
| 348 | // this will catch the case where "this" is a player |
345 | // this will catch the case where "this" is a player |
| 349 | if (object *pl = ms ().player ()) |
346 | if (object *pl = ms ().player ()) |
|
|
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
| 350 | if (!pl->container || this == pl->container) |
348 | || this == pl->container) |
| 351 | return pl; |
349 | return pl; |
| 352 | } |
350 | } |
| 353 | } |
351 | } |
| 354 | |
352 | |
| 355 | return 0; |
353 | return 0; |
| … | |
… | |
| 769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
| 770 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_on | op->move_on ) != m.move_on |
| 771 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_off | op->move_off ) != m.move_off |
| 772 | || (m.move_slow | op->move_slow) != m.move_slow |
770 | || (m.move_slow | op->move_slow) != m.move_slow |
| 773 | /* This isn't perfect, but I don't expect a lot of objects to |
771 | /* This isn't perfect, but I don't expect a lot of objects to |
| 774 | * to have move_allow right now. |
772 | * have move_allow right now. |
| 775 | */ |
773 | */ |
| 776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
774 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
| 777 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
775 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
| 778 | m.flags_ = 0; |
776 | m.flags_ = 0; |
| 779 | } |
777 | } |
| … | |
… | |
| 909 | || map->in_memory != MAP_ACTIVE |
907 | || map->in_memory != MAP_ACTIVE |
| 910 | || map->no_drop |
908 | || map->no_drop |
| 911 | || ms ().move_block == MOVE_ALL) |
909 | || ms ().move_block == MOVE_ALL) |
| 912 | { |
910 | { |
| 913 | while (inv) |
911 | while (inv) |
| 914 | { |
|
|
| 915 | inv->destroy_inv (false); |
|
|
| 916 | inv->destroy (); |
912 | inv->destroy (true); |
| 917 | } |
|
|
| 918 | } |
913 | } |
| 919 | else |
914 | else |
| 920 | { /* Put objects in inventory onto this space */ |
915 | { /* Put objects in inventory onto this space */ |
| 921 | while (inv) |
916 | while (inv) |
| 922 | { |
917 | { |
| … | |
… | |
| 1117 | *(below ? &below->above : &ms.bot) = above; |
1112 | *(below ? &below->above : &ms.bot) = above; |
| 1118 | |
1113 | |
| 1119 | above = 0; |
1114 | above = 0; |
| 1120 | below = 0; |
1115 | below = 0; |
| 1121 | |
1116 | |
|
|
1117 | ms.flags_ = 0; |
|
|
1118 | |
| 1122 | if (map->in_memory == MAP_SAVING) |
1119 | if (map->in_memory == MAP_SAVING) |
| 1123 | return; |
1120 | return; |
| 1124 | |
1121 | |
| 1125 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1122 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
| 1126 | |
1123 | |
| … | |
… | |
| 1157 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1154 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
| 1158 | } |
1155 | } |
| 1159 | |
1156 | |
| 1160 | last = tmp; |
1157 | last = tmp; |
| 1161 | } |
1158 | } |
| 1162 | |
|
|
| 1163 | /* last == NULL if there are no objects on this space */ |
|
|
| 1164 | //TODO: this makes little sense, why only update the topmost object? |
|
|
| 1165 | if (!last) |
|
|
| 1166 | map->at (x, y).flags_ = 0; |
|
|
| 1167 | else |
|
|
| 1168 | update_object (last, UP_OBJ_REMOVE); |
|
|
| 1169 | |
1159 | |
| 1170 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1160 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
| 1171 | update_all_los (map, x, y); |
1161 | update_all_los (map, x, y); |
| 1172 | } |
1162 | } |
| 1173 | } |
1163 | } |
| … | |
… | |
| 1537 | if (!nr) |
1527 | if (!nr) |
| 1538 | return true; |
1528 | return true; |
| 1539 | |
1529 | |
| 1540 | nr = min (nr, nrof); |
1530 | nr = min (nr, nrof); |
| 1541 | |
1531 | |
|
|
1532 | if (nrof > nr) |
|
|
1533 | { |
| 1542 | nrof -= nr; |
1534 | nrof -= nr; |
| 1543 | |
|
|
| 1544 | if (nrof) |
|
|
| 1545 | { |
|
|
| 1546 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1535 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
| 1547 | |
1536 | |
| 1548 | if (object *pl = visible_to ()) |
1537 | if (object *pl = visible_to ()) |
| 1549 | esrv_update_item (UPD_NROF, pl, this); |
1538 | esrv_update_item (UPD_NROF, pl, this); |
| 1550 | |
1539 | |
| 1551 | return true; |
1540 | return true; |
| 1552 | } |
1541 | } |
| 1553 | else |
1542 | else |
| 1554 | { |
1543 | { |
| 1555 | destroy (1); |
1544 | destroy (); |
| 1556 | return false; |
1545 | return false; |
| 1557 | } |
1546 | } |
| 1558 | } |
1547 | } |
| 1559 | |
1548 | |
| 1560 | /* |
1549 | /* |
