… | |
… | |
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 |
… | |
… | |
235 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | return 0; |
233 | return 0; |
237 | |
234 | |
238 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
239 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_CLIENT_SENT) |
|
|
241 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
242 | .any ()) |
238 | .any ()) |
243 | return 0; |
239 | return 0; |
244 | |
240 | |
245 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
… | |
… | |
345 | else |
341 | else |
346 | { |
342 | { |
347 | // maybe there is a player standing on the same mapspace |
343 | // maybe there is a player standing on the same mapspace |
348 | // this will catch the case where "this" is a player |
344 | // this will catch the case where "this" is a player |
349 | if (object *pl = ms ().player ()) |
345 | if (object *pl = ms ().player ()) |
|
|
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
350 | if (!pl->container || this == pl->container) |
347 | || this == pl->container) |
351 | return pl; |
348 | return pl; |
352 | } |
349 | } |
353 | } |
350 | } |
354 | |
351 | |
355 | return 0; |
352 | return 0; |
… | |
… | |
639 | } |
636 | } |
640 | |
637 | |
641 | if (speed < 0) |
638 | if (speed < 0) |
642 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
643 | |
640 | |
644 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
645 | } |
642 | } |
646 | |
643 | |
647 | void |
644 | void |
648 | object::instantiate () |
645 | object::instantiate () |
649 | { |
646 | { |
… | |
… | |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * to have move_allow right now. |
771 | * have move_allow right now. |
775 | */ |
772 | */ |
776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
773 | || ((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) |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
778 | m.flags_ = 0; |
775 | m.flags_ = 0; |
779 | } |
776 | } |
… | |
… | |
833 | { |
830 | { |
834 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
835 | if (active) |
832 | if (active) |
836 | return; |
833 | return; |
837 | |
834 | |
|
|
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
837 | |
838 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
839 | actives.insert (this); |
839 | actives.insert (this); |
840 | } |
840 | } |
841 | |
841 | |
842 | void |
842 | void |
… | |
… | |
909 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
910 | || map->no_drop |
910 | || map->no_drop |
911 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
912 | { |
912 | { |
913 | while (inv) |
913 | while (inv) |
914 | { |
|
|
915 | inv->destroy_inv (false); |
|
|
916 | inv->destroy (); |
914 | inv->destroy (); |
917 | } |
|
|
918 | } |
915 | } |
919 | else |
916 | else |
920 | { /* Put objects in inventory onto this space */ |
917 | { /* Put objects in inventory onto this space */ |
921 | while (inv) |
918 | while (inv) |
922 | { |
919 | { |
… | |
… | |
926 | || op->flag [FLAG_NO_DROP] |
923 | || op->flag [FLAG_NO_DROP] |
927 | || op->type == RUNE |
924 | || op->type == RUNE |
928 | || op->type == TRAP |
925 | || op->type == TRAP |
929 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
930 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
931 | op->destroy (true); |
928 | op->destroy (); |
932 | else |
929 | else |
933 | map->insert (op, x, y); |
930 | map->insert (op, x, y); |
934 | } |
931 | } |
935 | } |
932 | } |
936 | } |
933 | } |
… | |
… | |
1000 | attacked_by = 0; |
997 | attacked_by = 0; |
1001 | current_weapon = 0; |
998 | current_weapon = 0; |
1002 | } |
999 | } |
1003 | |
1000 | |
1004 | void |
1001 | void |
1005 | object::destroy (bool destroy_inventory) |
1002 | object::destroy () |
1006 | { |
1003 | { |
1007 | if (destroyed ()) |
1004 | if (destroyed ()) |
1008 | return; |
1005 | return; |
1009 | |
1006 | |
1010 | if (!is_head () && !head->destroyed ()) |
1007 | if (!is_head () && !head->destroyed ()) |
1011 | { |
1008 | { |
1012 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1009 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1013 | head->destroy (destroy_inventory); |
1010 | head->destroy (); |
1014 | return; |
1011 | return; |
1015 | } |
1012 | } |
1016 | |
1013 | |
1017 | destroy_inv (!destroy_inventory); |
1014 | destroy_inv (false); |
1018 | |
1015 | |
1019 | if (is_head ()) |
1016 | if (is_head ()) |
1020 | if (sound_destroy) |
1017 | if (sound_destroy) |
1021 | play_sound (sound_destroy); |
1018 | play_sound (sound_destroy); |
1022 | else if (flag [FLAG_MONSTER]) |
1019 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1117 | *(below ? &below->above : &ms.bot) = above; |
1114 | *(below ? &below->above : &ms.bot) = above; |
1118 | |
1115 | |
1119 | above = 0; |
1116 | above = 0; |
1120 | below = 0; |
1117 | below = 0; |
1121 | |
1118 | |
|
|
1119 | ms.flags_ = 0; |
|
|
1120 | |
1122 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
1123 | return; |
1122 | return; |
1124 | |
1123 | |
1125 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1126 | |
1125 | |
… | |
… | |
1158 | } |
1157 | } |
1159 | |
1158 | |
1160 | last = tmp; |
1159 | last = tmp; |
1161 | } |
1160 | } |
1162 | |
1161 | |
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 | |
|
|
1170 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1162 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1171 | update_all_los (map, x, y); |
1163 | update_all_los (map, x, y); |
1172 | } |
1164 | } |
1173 | } |
1165 | } |
1174 | |
1166 | |
… | |
… | |
1199 | esrv_update_item (UPD_NROF, pl, top); |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1200 | |
1192 | |
1201 | op->weight = 0; // cancel the addition above |
1193 | op->weight = 0; // cancel the addition above |
1202 | op->carrying = 0; // must be 0 already |
1194 | op->carrying = 0; // must be 0 already |
1203 | |
1195 | |
1204 | op->destroy (1); |
1196 | op->destroy (); |
1205 | |
1197 | |
1206 | return top; |
1198 | return top; |
1207 | } |
1199 | } |
1208 | |
1200 | |
1209 | return 0; |
1201 | return 0; |
… | |
… | |
1283 | { |
1275 | { |
1284 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1276 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1285 | op->remove (); |
1277 | op->remove (); |
1286 | } |
1278 | } |
1287 | |
1279 | |
1288 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1280 | if (m == &freed_map)//D TODO: remove soon |
1289 | {//D |
1281 | {//D |
1290 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1282 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1291 | op->face = 1;//D |
|
|
1292 | }//D |
1283 | }//D |
1293 | |
1284 | |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1286 | * of areas of callers (eg, anything that uses find_free_spot would now |
1296 | * need extra work |
1287 | * need extra work |
1297 | */ |
1288 | */ |
1298 | if (!xy_normalise (m, op->x, op->y)) |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1299 | { |
1290 | { |
1300 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1301 | return 0; |
1292 | return 0; |
1302 | } |
1293 | } |
1303 | |
1294 | |
1304 | if (object *more = op->more) |
1295 | if (object *more = op->more) |
1305 | if (!insert_ob_in_map (more, m, originator, flag)) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1318 | { |
1309 | { |
1319 | // TODO: we actually want to update tmp, not op, |
1310 | // TODO: we actually want to update tmp, not op, |
1320 | // but some caller surely breaks when we return tmp |
1311 | // but some caller surely breaks when we return tmp |
1321 | // from here :/ |
1312 | // from here :/ |
1322 | op->nrof += tmp->nrof; |
1313 | op->nrof += tmp->nrof; |
1323 | tmp->destroy (1); |
1314 | tmp->destroy (); |
1324 | } |
1315 | } |
1325 | |
1316 | |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1317 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1327 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1328 | |
1319 | |
… | |
… | |
1503 | { |
1494 | { |
1504 | /* first search for itself and remove any old instances */ |
1495 | /* first search for itself and remove any old instances */ |
1505 | |
1496 | |
1506 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1497 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1507 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1498 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1508 | tmp->destroy (1); |
1499 | tmp->destroy (); |
1509 | |
1500 | |
1510 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1501 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1511 | |
1502 | |
1512 | tmp->x = op->x; |
1503 | tmp->x = op->x; |
1513 | tmp->y = op->y; |
1504 | tmp->y = op->y; |
… | |
… | |
1537 | if (!nr) |
1528 | if (!nr) |
1538 | return true; |
1529 | return true; |
1539 | |
1530 | |
1540 | nr = min (nr, nrof); |
1531 | nr = min (nr, nrof); |
1541 | |
1532 | |
|
|
1533 | if (nrof > nr) |
|
|
1534 | { |
1542 | nrof -= nr; |
1535 | nrof -= nr; |
1543 | |
|
|
1544 | if (nrof) |
|
|
1545 | { |
|
|
1546 | adjust_weight (env, -weight * nr); // carrying == 0 |
1536 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1547 | |
1537 | |
1548 | if (object *pl = visible_to ()) |
1538 | if (object *pl = visible_to ()) |
1549 | esrv_update_item (UPD_NROF, pl, this); |
1539 | esrv_update_item (UPD_NROF, pl, this); |
1550 | |
1540 | |
1551 | return true; |
1541 | return true; |
1552 | } |
1542 | } |
1553 | else |
1543 | else |
1554 | { |
1544 | { |
1555 | destroy (1); |
1545 | destroy (); |
1556 | return false; |
1546 | return false; |
1557 | } |
1547 | } |
1558 | } |
1548 | } |
1559 | |
1549 | |
1560 | /* |
1550 | /* |
… | |
… | |
1637 | if (object *pl = tmp->visible_to ()) |
1627 | if (object *pl = tmp->visible_to ()) |
1638 | esrv_update_item (UPD_NROF, pl, tmp); |
1628 | esrv_update_item (UPD_NROF, pl, tmp); |
1639 | |
1629 | |
1640 | adjust_weight (this, op->total_weight ()); |
1630 | adjust_weight (this, op->total_weight ()); |
1641 | |
1631 | |
1642 | op->destroy (1); |
1632 | op->destroy (); |
1643 | op = tmp; |
1633 | op = tmp; |
1644 | goto inserted; |
1634 | goto inserted; |
1645 | } |
1635 | } |
1646 | |
1636 | |
1647 | op->owner = 0; // it's his/hers now. period. |
1637 | op->owner = 0; // it's his/hers now. period. |