… | |
… | |
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 |
… | |
… | |
640 | } |
636 | } |
641 | |
637 | |
642 | if (speed < 0) |
638 | if (speed < 0) |
643 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
644 | |
640 | |
645 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
646 | } |
642 | } |
647 | |
643 | |
648 | void |
644 | void |
649 | object::instantiate () |
645 | object::instantiate () |
650 | { |
646 | { |
… | |
… | |
770 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
771 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
772 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
773 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
774 | /* 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 |
775 | * to have move_allow right now. |
771 | * have move_allow right now. |
776 | */ |
772 | */ |
777 | || ((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 |
778 | || 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) |
779 | m.flags_ = 0; |
775 | m.flags_ = 0; |
780 | } |
776 | } |
… | |
… | |
834 | { |
830 | { |
835 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
836 | if (active) |
832 | if (active) |
837 | return; |
833 | return; |
838 | |
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 | |
839 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
840 | actives.insert (this); |
839 | actives.insert (this); |
841 | } |
840 | } |
842 | |
841 | |
843 | void |
842 | void |
… | |
… | |
910 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
911 | || map->no_drop |
910 | || map->no_drop |
912 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
913 | { |
912 | { |
914 | while (inv) |
913 | while (inv) |
915 | inv->destroy (true); |
914 | inv->destroy (); |
916 | } |
915 | } |
917 | else |
916 | else |
918 | { /* Put objects in inventory onto this space */ |
917 | { /* Put objects in inventory onto this space */ |
919 | while (inv) |
918 | while (inv) |
920 | { |
919 | { |
… | |
… | |
924 | || op->flag [FLAG_NO_DROP] |
923 | || op->flag [FLAG_NO_DROP] |
925 | || op->type == RUNE |
924 | || op->type == RUNE |
926 | || op->type == TRAP |
925 | || op->type == TRAP |
927 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
928 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
929 | op->destroy (true); |
928 | op->destroy (); |
930 | else |
929 | else |
931 | map->insert (op, x, y); |
930 | map->insert (op, x, y); |
932 | } |
931 | } |
933 | } |
932 | } |
934 | } |
933 | } |
… | |
… | |
1115 | *(below ? &below->above : &ms.bot) = above; |
1114 | *(below ? &below->above : &ms.bot) = above; |
1116 | |
1115 | |
1117 | above = 0; |
1116 | above = 0; |
1118 | below = 0; |
1117 | below = 0; |
1119 | |
1118 | |
|
|
1119 | ms.flags_ = 0; |
|
|
1120 | |
1120 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
1121 | return; |
1122 | return; |
1122 | |
1123 | |
1123 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | |
1125 | |
… | |
… | |
1156 | } |
1157 | } |
1157 | |
1158 | |
1158 | last = tmp; |
1159 | last = tmp; |
1159 | } |
1160 | } |
1160 | |
1161 | |
1161 | /* last == NULL if there are no objects on this space */ |
|
|
1162 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1163 | if (!last) |
|
|
1164 | map->at (x, y).flags_ = 0; |
|
|
1165 | else |
|
|
1166 | update_object (last, UP_OBJ_REMOVE); |
|
|
1167 | |
|
|
1168 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1162 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1169 | update_all_los (map, x, y); |
1163 | update_all_los (map, x, y); |
1170 | } |
1164 | } |
1171 | } |
1165 | } |
1172 | |
1166 | |
… | |
… | |
1197 | esrv_update_item (UPD_NROF, pl, top); |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1198 | |
1192 | |
1199 | op->weight = 0; // cancel the addition above |
1193 | op->weight = 0; // cancel the addition above |
1200 | op->carrying = 0; // must be 0 already |
1194 | op->carrying = 0; // must be 0 already |
1201 | |
1195 | |
1202 | op->destroy (1); |
1196 | op->destroy (); |
1203 | |
1197 | |
1204 | return top; |
1198 | return top; |
1205 | } |
1199 | } |
1206 | |
1200 | |
1207 | return 0; |
1201 | return 0; |
… | |
… | |
1281 | { |
1275 | { |
1282 | 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)"); |
1283 | op->remove (); |
1277 | op->remove (); |
1284 | } |
1278 | } |
1285 | |
1279 | |
1286 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1280 | if (m == &freed_map)//D TODO: remove soon |
1287 | {//D |
1281 | {//D |
1288 | 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 |
1289 | op->face = 1;//D |
|
|
1290 | }//D |
1283 | }//D |
1291 | |
1284 | |
1292 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1293 | * 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 |
1294 | * need extra work |
1287 | * need extra work |
1295 | */ |
1288 | */ |
1296 | if (!xy_normalise (m, op->x, op->y)) |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1297 | { |
1290 | { |
1298 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1299 | return 0; |
1292 | return 0; |
1300 | } |
1293 | } |
1301 | |
1294 | |
1302 | if (object *more = op->more) |
1295 | if (object *more = op->more) |
1303 | if (!insert_ob_in_map (more, m, originator, flag)) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1316 | { |
1309 | { |
1317 | // TODO: we actually want to update tmp, not op, |
1310 | // TODO: we actually want to update tmp, not op, |
1318 | // but some caller surely breaks when we return tmp |
1311 | // but some caller surely breaks when we return tmp |
1319 | // from here :/ |
1312 | // from here :/ |
1320 | op->nrof += tmp->nrof; |
1313 | op->nrof += tmp->nrof; |
1321 | tmp->destroy (1); |
1314 | tmp->destroy (); |
1322 | } |
1315 | } |
1323 | |
1316 | |
1324 | 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 */ |
1325 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1326 | |
1319 | |
… | |
… | |
1501 | { |
1494 | { |
1502 | /* first search for itself and remove any old instances */ |
1495 | /* first search for itself and remove any old instances */ |
1503 | |
1496 | |
1504 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1497 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1505 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1498 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1506 | tmp->destroy (1); |
1499 | tmp->destroy (); |
1507 | |
1500 | |
1508 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1501 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1509 | |
1502 | |
1510 | tmp->x = op->x; |
1503 | tmp->x = op->x; |
1511 | tmp->y = op->y; |
1504 | tmp->y = op->y; |
… | |
… | |
1535 | if (!nr) |
1528 | if (!nr) |
1536 | return true; |
1529 | return true; |
1537 | |
1530 | |
1538 | nr = min (nr, nrof); |
1531 | nr = min (nr, nrof); |
1539 | |
1532 | |
|
|
1533 | if (nrof > nr) |
|
|
1534 | { |
1540 | nrof -= nr; |
1535 | nrof -= nr; |
1541 | |
|
|
1542 | if (nrof) |
|
|
1543 | { |
|
|
1544 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1536 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1545 | |
1537 | |
1546 | if (object *pl = visible_to ()) |
1538 | if (object *pl = visible_to ()) |
1547 | esrv_update_item (UPD_NROF, pl, this); |
1539 | esrv_update_item (UPD_NROF, pl, this); |
1548 | |
1540 | |
… | |
… | |
1635 | if (object *pl = tmp->visible_to ()) |
1627 | if (object *pl = tmp->visible_to ()) |
1636 | esrv_update_item (UPD_NROF, pl, tmp); |
1628 | esrv_update_item (UPD_NROF, pl, tmp); |
1637 | |
1629 | |
1638 | adjust_weight (this, op->total_weight ()); |
1630 | adjust_weight (this, op->total_weight ()); |
1639 | |
1631 | |
1640 | op->destroy (1); |
1632 | op->destroy (); |
1641 | op = tmp; |
1633 | op = tmp; |
1642 | goto inserted; |
1634 | goto inserted; |
1643 | } |
1635 | } |
1644 | |
1636 | |
1645 | op->owner = 0; // it's his/hers now. period. |
1637 | op->owner = 0; // it's his/hers now. period. |