… | |
… | |
983 | x = 1; |
983 | x = 1; |
984 | y = 1; |
984 | y = 1; |
985 | |
985 | |
986 | if (more) |
986 | if (more) |
987 | { |
987 | { |
988 | more->destroy (); |
988 | more->destroy (true); |
989 | more = 0; |
989 | more = 0; |
990 | } |
990 | } |
991 | |
991 | |
992 | head = 0; |
992 | head = 0; |
993 | |
993 | |
… | |
… | |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1192 | |
1192 | |
1193 | op->weight = 0; // cancel the addition above |
1193 | op->weight = 0; // cancel the addition above |
1194 | op->carrying = 0; // must be 0 already |
1194 | op->carrying = 0; // must be 0 already |
1195 | |
1195 | |
1196 | op->destroy (1); |
1196 | op->destroy (true); |
1197 | |
1197 | |
1198 | return top; |
1198 | return top; |
1199 | } |
1199 | } |
1200 | |
1200 | |
1201 | return 0; |
1201 | return 0; |
… | |
… | |
1275 | { |
1275 | { |
1276 | 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)"); |
1277 | op->remove (); |
1277 | op->remove (); |
1278 | } |
1278 | } |
1279 | |
1279 | |
1280 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1280 | if (m == &freed_map)//D TODO: remove soon |
1281 | {//D |
1281 | {//D |
1282 | 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 |
1283 | op->face = 1;//D |
|
|
1284 | }//D |
1283 | }//D |
1285 | |
1284 | |
1286 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1287 | * 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 |
1288 | * need extra work |
1287 | * need extra work |
1289 | */ |
1288 | */ |
1290 | if (!xy_normalise (m, op->x, op->y)) |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1291 | { |
1290 | { |
1292 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found |
1293 | return 0; |
1292 | return 0; |
1294 | } |
1293 | } |
1295 | |
1294 | |
1296 | if (object *more = op->more) |
1295 | if (object *more = op->more) |
1297 | if (!insert_ob_in_map (more, m, originator, flag)) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1310 | { |
1309 | { |
1311 | // TODO: we actually want to update tmp, not op, |
1310 | // TODO: we actually want to update tmp, not op, |
1312 | // but some caller surely breaks when we return tmp |
1311 | // but some caller surely breaks when we return tmp |
1313 | // from here :/ |
1312 | // from here :/ |
1314 | op->nrof += tmp->nrof; |
1313 | op->nrof += tmp->nrof; |
1315 | tmp->destroy (1); |
1314 | tmp->destroy (true); |
1316 | } |
1315 | } |
1317 | |
1316 | |
1318 | 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 */ |
1319 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1320 | |
1319 | |
… | |
… | |
1495 | { |
1494 | { |
1496 | /* first search for itself and remove any old instances */ |
1495 | /* first search for itself and remove any old instances */ |
1497 | |
1496 | |
1498 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1497 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1499 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1498 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1500 | tmp->destroy (1); |
1499 | tmp->destroy (true); |
1501 | |
1500 | |
1502 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1501 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1503 | |
1502 | |
1504 | tmp->x = op->x; |
1503 | tmp->x = op->x; |
1505 | tmp->y = op->y; |
1504 | tmp->y = op->y; |
… | |
… | |
1628 | if (object *pl = tmp->visible_to ()) |
1627 | if (object *pl = tmp->visible_to ()) |
1629 | esrv_update_item (UPD_NROF, pl, tmp); |
1628 | esrv_update_item (UPD_NROF, pl, tmp); |
1630 | |
1629 | |
1631 | adjust_weight (this, op->total_weight ()); |
1630 | adjust_weight (this, op->total_weight ()); |
1632 | |
1631 | |
1633 | op->destroy (1); |
1632 | op->destroy (true); |
1634 | op = tmp; |
1633 | op = tmp; |
1635 | goto inserted; |
1634 | goto inserted; |
1636 | } |
1635 | } |
1637 | |
1636 | |
1638 | op->owner = 0; // it's his/hers now. period. |
1637 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
2487 | |
2486 | |
2488 | #if 0 |
2487 | #if 0 |
2489 | // remove the "Close old_container" object. |
2488 | // remove the "Close old_container" object. |
2490 | if (object *closer = old_container->inv) |
2489 | if (object *closer = old_container->inv) |
2491 | if (closer->type == CLOSE_CON) |
2490 | if (closer->type == CLOSE_CON) |
2492 | closer->destroy (); |
2491 | closer->destroy (true); |
2493 | #endif |
2492 | #endif |
2494 | |
2493 | |
2495 | // make sure the container is available |
2494 | // make sure the container is available |
2496 | esrv_send_item (this, old_container); |
2495 | esrv_send_item (this, old_container); |
2497 | |
2496 | |
… | |
… | |
2553 | |
2552 | |
2554 | void |
2553 | void |
2555 | object::force_add (const shstr name, int duration) |
2554 | object::force_add (const shstr name, int duration) |
2556 | { |
2555 | { |
2557 | if (object *force = force_find (name)) |
2556 | if (object *force = force_find (name)) |
2558 | force->destroy (); |
2557 | force->destroy (true); |
2559 | |
2558 | |
2560 | object *force = get_archetype (FORCE_NAME); |
2559 | object *force = get_archetype (FORCE_NAME); |
2561 | |
2560 | |
2562 | force->slaying = name; |
2561 | force->slaying = name; |
2563 | force->stats.food = 1; |
2562 | force->stats.food = 1; |