… | |
… | |
37 | uint32_t mapspace::smellcount = 10000; |
37 | uint32_t mapspace::smellcount = 10000; |
38 | |
38 | |
39 | objectvec objects; |
39 | objectvec objects; |
40 | activevec actives; |
40 | activevec actives; |
41 | |
41 | |
|
|
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
|
|
47 | |
42 | //+GPL |
48 | //+GPL |
43 | |
49 | |
44 | short freearr_x[SIZEOFFREE] = { |
50 | short freearr_x[SIZEOFFREE] = { |
45 | 0, |
51 | 0, |
46 | 0, 1, 1, 1, 0, -1, -1, -1, |
52 | 0, 1, 1, 1, 0, -1, -1, -1, |
… | |
… | |
266 | * This is to the comparison of the flags below will be OK. We |
272 | * This is to the comparison of the flags below will be OK. We |
267 | * just can't ignore the been applied or identified flags, as they |
273 | * just can't ignore the been applied or identified flags, as they |
268 | * are not equal - just if it has been identified, the been_applied |
274 | * are not equal - just if it has been identified, the been_applied |
269 | * flags lose any meaning. |
275 | * flags lose any meaning. |
270 | */ |
276 | */ |
271 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
277 | if (ob1->flag [FLAG_IDENTIFIED]) |
272 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
278 | ob1->set_flag (FLAG_BEEN_APPLIED); |
273 | |
279 | |
274 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
280 | if (ob2->flag [FLAG_IDENTIFIED]) |
275 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
281 | ob2->set_flag (FLAG_BEEN_APPLIED); |
276 | |
282 | |
277 | if (ob1->arch->archname != ob2->arch->archname |
283 | if (ob1->arch->archname != ob2->arch->archname |
278 | || ob1->name != ob2->name |
284 | || ob1->name != ob2->name |
279 | || ob1->title != ob2->title |
285 | || ob1->title != ob2->title |
280 | || ob1->msg != ob2->msg |
286 | || ob1->msg != ob2->msg |
… | |
… | |
329 | |
335 | |
330 | /* Don't merge objects that are applied. With the new 'body' code, |
336 | /* Don't merge objects that are applied. With the new 'body' code, |
331 | * it is possible for most any character to have more than one of |
337 | * it is possible for most any character to have more than one of |
332 | * some items equipped, and we don't want those to merge. |
338 | * some items equipped, and we don't want those to merge. |
333 | */ |
339 | */ |
334 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
340 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
335 | return 0; |
341 | return 0; |
336 | |
342 | |
337 | /* Note sure why the following is the case - either the object has to |
343 | /* Note sure why the following is the case - either the object has to |
338 | * be animated or have a very low speed. Is this an attempted monster |
344 | * be animated or have a very low speed. Is this an attempted monster |
339 | * check? |
345 | * check? |
340 | */ |
346 | */ |
341 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
347 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
342 | return 0; |
348 | return 0; |
343 | |
349 | |
344 | switch (ob1->type) |
350 | switch (ob1->type) |
345 | { |
351 | { |
346 | case SCROLL: |
352 | case SCROLL: |
… | |
… | |
477 | |
483 | |
478 | sum = weight_adjust_for (this, sum); |
484 | sum = weight_adjust_for (this, sum); |
479 | |
485 | |
480 | if (sum != carrying) |
486 | if (sum != carrying) |
481 | { |
487 | { |
|
|
488 | if (carrying != sum)//D |
|
|
489 | LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", |
|
|
490 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
491 | |
482 | carrying = sum; |
492 | carrying = sum; |
483 | |
493 | |
484 | if (object *pl = visible_to ()) |
494 | if (object *pl = visible_to ()) |
485 | if (pl != this) // player is handled lazily |
495 | if (pl != this) // player is handled lazily |
486 | esrv_update_item (UPD_WEIGHT, pl, this); |
496 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
572 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
582 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
573 | return; |
583 | return; |
574 | } |
584 | } |
575 | |
585 | |
576 | this->owner = owner; |
586 | this->owner = owner; |
577 | } |
|
|
578 | |
|
|
579 | int |
|
|
580 | object::slottype () const |
|
|
581 | { |
|
|
582 | if (type == SKILL) |
|
|
583 | { |
|
|
584 | if (IS_COMBAT_SKILL (subtype)) return slot_combat; |
|
|
585 | if (IS_RANGED_SKILL (subtype)) return slot_ranged; |
|
|
586 | } |
|
|
587 | else |
|
|
588 | { |
|
|
589 | if (slot [body_combat].info) return slot_combat; |
|
|
590 | if (slot [body_range ].info) return slot_ranged; |
|
|
591 | } |
|
|
592 | |
|
|
593 | return slot_none; |
|
|
594 | } |
587 | } |
595 | |
588 | |
596 | /* Zero the key_values on op, decrementing the shared-string |
589 | /* Zero the key_values on op, decrementing the shared-string |
597 | * refcounts and freeing the links. |
590 | * refcounts and freeing the links. |
598 | */ |
591 | */ |
… | |
… | |
700 | * be called to update the face variable, _and_ how it looks on the map. |
693 | * be called to update the face variable, _and_ how it looks on the map. |
701 | */ |
694 | */ |
702 | void |
695 | void |
703 | update_turn_face (object *op) |
696 | update_turn_face (object *op) |
704 | { |
697 | { |
705 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
698 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
706 | return; |
699 | return; |
707 | |
700 | |
708 | SET_ANIMATION (op, op->direction); |
701 | SET_ANIMATION (op, op->direction); |
709 | update_object (op, UP_OBJ_FACE); |
702 | update_object (op, UP_OBJ_FACE); |
710 | } |
703 | } |
… | |
… | |
776 | /* nop */; |
769 | /* nop */; |
777 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
778 | { |
771 | { |
779 | #if 0 |
772 | #if 0 |
780 | // this is likely overkill, TODO: revisit (schmorp) |
773 | // this is likely overkill, TODO: revisit (schmorp) |
781 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
774 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
782 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
775 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
783 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
776 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
784 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
777 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
785 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
778 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
786 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
779 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
787 | || (m.move_on | op->move_on ) != m.move_on |
780 | || (m.move_on | op->move_on ) != m.move_on |
788 | || (m.move_off | op->move_off ) != m.move_off |
781 | || (m.move_off | op->move_off ) != m.move_off |
789 | || (m.move_slow | op->move_slow) != m.move_slow |
782 | || (m.move_slow | op->move_slow) != m.move_slow |
790 | /* This isn't perfect, but I don't expect a lot of objects to |
783 | /* This isn't perfect, but I don't expect a lot of objects to |
791 | * have move_allow right now. |
784 | * have move_allow right now. |
… | |
… | |
812 | update_object (op->more, action); |
805 | update_object (op->more, action); |
813 | } |
806 | } |
814 | |
807 | |
815 | object::object () |
808 | object::object () |
816 | { |
809 | { |
817 | SET_FLAG (this, FLAG_REMOVED); |
810 | this->set_flag (FLAG_REMOVED); |
818 | |
811 | |
819 | //expmul = 1.0; declared const for the time being |
812 | //expmul = 1.0; declared const for the time being |
820 | face = blank_face; |
813 | face = blank_face; |
821 | material = MATERIAL_NULL; |
814 | material = MATERIAL_NULL; |
822 | } |
815 | } |
… | |
… | |
826 | unlink (); |
819 | unlink (); |
827 | |
820 | |
828 | free_key_values (this); |
821 | free_key_values (this); |
829 | } |
822 | } |
830 | |
823 | |
831 | static int object_count; |
|
|
832 | |
|
|
833 | void object::link () |
824 | void object::link () |
834 | { |
825 | { |
835 | assert (!index);//D |
826 | assert (!index);//D |
836 | uuid = UUID::gen (); |
827 | uuid = UUID::gen (); |
837 | count = ++object_count; |
|
|
838 | |
828 | |
839 | refcnt_inc (); |
829 | refcnt_inc (); |
840 | objects.insert (this); |
830 | objects.insert (this); |
|
|
831 | |
|
|
832 | ++create_count; |
|
|
833 | |
841 | } |
834 | } |
842 | |
835 | |
843 | void object::unlink () |
836 | void object::unlink () |
844 | { |
837 | { |
845 | if (!index) |
838 | if (!index) |
846 | return; |
839 | return; |
|
|
840 | |
|
|
841 | ++destroy_count; |
847 | |
842 | |
848 | objects.erase (this); |
843 | objects.erase (this); |
849 | refcnt_dec (); |
844 | refcnt_dec (); |
850 | } |
845 | } |
851 | |
846 | |
… | |
… | |
956 | map->insert (op, x, y); |
951 | map->insert (op, x, y); |
957 | } |
952 | } |
958 | } |
953 | } |
959 | } |
954 | } |
960 | |
955 | |
|
|
956 | /* |
|
|
957 | * Remove and free all objects in the inventory of the given object. |
|
|
958 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
959 | * well, so we can (and have to!) take shortcuts. |
|
|
960 | */ |
|
|
961 | void |
|
|
962 | object::destroy_inv_fast () |
|
|
963 | { |
|
|
964 | while (object *op = inv) |
|
|
965 | { |
|
|
966 | // remove from object the fast way |
|
|
967 | op->flag [FLAG_REMOVED] = true; |
|
|
968 | op->env = 0; |
|
|
969 | if ((inv = inv->below)) |
|
|
970 | inv->above = 0; |
|
|
971 | |
|
|
972 | // then destroy |
|
|
973 | op->destroy (); |
|
|
974 | } |
|
|
975 | } |
|
|
976 | |
|
|
977 | void |
|
|
978 | object::freelist_free (int count) |
|
|
979 | { |
|
|
980 | while (count-- && freelist) |
|
|
981 | { |
|
|
982 | freelist_item *next = freelist->next; |
|
|
983 | // count is being "destroyed" |
|
|
984 | |
|
|
985 | sfree ((char *)freelist, sizeof (object)); |
|
|
986 | |
|
|
987 | freelist = next; |
|
|
988 | --free_count; |
|
|
989 | } |
|
|
990 | } |
|
|
991 | |
|
|
992 | object * |
961 | object *object::create () |
993 | object::create () |
962 | { |
994 | { |
963 | object *op = new object; |
995 | object *op; |
|
|
996 | |
|
|
997 | if (freelist) |
|
|
998 | { |
|
|
999 | freelist_item li = *freelist; |
|
|
1000 | memset (freelist, 0, sizeof (object)); |
|
|
1001 | |
|
|
1002 | op = new (freelist) object; |
|
|
1003 | op->count = li.count; |
|
|
1004 | |
|
|
1005 | freelist = li.next; |
|
|
1006 | --free_count; |
|
|
1007 | } |
|
|
1008 | else |
|
|
1009 | { |
|
|
1010 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1011 | |
|
|
1012 | op = new(ni) object; |
|
|
1013 | |
|
|
1014 | op->count = ++object_count; |
|
|
1015 | } |
|
|
1016 | |
964 | op->link (); |
1017 | op->link (); |
|
|
1018 | |
965 | return op; |
1019 | return op; |
966 | } |
1020 | } |
967 | |
1021 | |
|
|
1022 | void |
|
|
1023 | object::do_delete () |
|
|
1024 | { |
|
|
1025 | uint32_t count = this->count; |
|
|
1026 | |
|
|
1027 | this->~object (); |
|
|
1028 | |
|
|
1029 | freelist_item *li = (freelist_item *)this; |
|
|
1030 | li->next = freelist; |
|
|
1031 | li->count = count; |
|
|
1032 | |
|
|
1033 | freelist = li; |
|
|
1034 | ++free_count; |
|
|
1035 | } |
|
|
1036 | |
968 | static struct freed_map : maptile |
1037 | static struct freed_map : maptile |
969 | { |
1038 | { |
970 | freed_map () |
1039 | freed_map () |
|
|
1040 | : maptile (3, 3) |
971 | { |
1041 | { |
972 | path = "<freed objects map>"; |
1042 | path = "<freed objects map>"; |
973 | name = "/internal/freed_objects_map"; |
1043 | name = "/internal/freed_objects_map"; |
974 | width = 3; |
|
|
975 | height = 3; |
|
|
976 | no_drop = 1; |
1044 | no_drop = 1; |
977 | no_reset = 1; |
1045 | no_reset = 1; |
978 | |
1046 | |
979 | alloc (); |
|
|
980 | in_memory = MAP_ACTIVE; |
1047 | in_memory = MAP_ACTIVE; |
981 | } |
1048 | } |
982 | |
1049 | |
983 | ~freed_map () |
1050 | ~freed_map () |
984 | { |
1051 | { |
… | |
… | |
1035 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1102 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1036 | head->destroy (); |
1103 | head->destroy (); |
1037 | return; |
1104 | return; |
1038 | } |
1105 | } |
1039 | |
1106 | |
1040 | destroy_inv (false); |
1107 | destroy_inv_fast (); |
1041 | |
1108 | |
1042 | if (is_head ()) |
1109 | if (is_head ()) |
1043 | if (sound_destroy) |
1110 | if (sound_destroy) |
1044 | play_sound (sound_destroy); |
1111 | play_sound (sound_destroy); |
1045 | else if (flag [FLAG_MONSTER]) |
1112 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1145 | else if (pl->container_ () == this) |
1212 | else if (pl->container_ () == this) |
1146 | { |
1213 | { |
1147 | // removing a container should close it |
1214 | // removing a container should close it |
1148 | close_container (); |
1215 | close_container (); |
1149 | } |
1216 | } |
1150 | |
1217 | else |
1151 | esrv_del_item (pl->contr, count); |
1218 | esrv_del_item (pl->contr, count); |
1152 | } |
1219 | } |
1153 | |
1220 | |
1154 | /* link the object above us */ |
1221 | /* link the object above us */ |
1155 | // re-link, make sure compiler can easily use cmove |
1222 | // re-link, make sure compiler can easily use cmove |
1156 | *(above ? &above->below : &ms.top) = below; |
1223 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1342 | // from here :/ |
1409 | // from here :/ |
1343 | op->nrof += tmp->nrof; |
1410 | op->nrof += tmp->nrof; |
1344 | tmp->destroy (); |
1411 | tmp->destroy (); |
1345 | } |
1412 | } |
1346 | |
1413 | |
1347 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1414 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1348 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1415 | op->clr_flag (FLAG_INV_LOCKED); |
1349 | |
1416 | |
1350 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1417 | if (!op->flag [FLAG_ALIVE]) |
1351 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1418 | op->clr_flag (FLAG_NO_STEAL); |
1352 | |
1419 | |
1353 | if (flag & INS_BELOW_ORIGINATOR) |
1420 | if (flag & INS_BELOW_ORIGINATOR) |
1354 | { |
1421 | { |
1355 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1422 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1356 | { |
1423 | { |
… | |
… | |
1391 | * when lots of spells are cast in one area. Currently, it is presumed |
1458 | * when lots of spells are cast in one area. Currently, it is presumed |
1392 | * that flying non pickable objects are spell objects. |
1459 | * that flying non pickable objects are spell objects. |
1393 | */ |
1460 | */ |
1394 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1461 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1395 | { |
1462 | { |
1396 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1463 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1397 | floor = tmp; |
1464 | floor = tmp; |
1398 | |
1465 | |
1399 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1466 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1400 | { |
1467 | { |
1401 | /* We insert above top, so we want this object below this */ |
1468 | /* We insert above top, so we want this object below this */ |
1402 | top = tmp->below; |
1469 | top = tmp->below; |
1403 | break; |
1470 | break; |
1404 | } |
1471 | } |
… | |
… | |
1422 | && (op->face && !faces [op->face].visibility)) |
1489 | && (op->face && !faces [op->face].visibility)) |
1423 | { |
1490 | { |
1424 | object *last; |
1491 | object *last; |
1425 | |
1492 | |
1426 | for (last = top; last != floor; last = last->below) |
1493 | for (last = top; last != floor; last = last->below) |
1427 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1494 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1428 | break; |
1495 | break; |
1429 | |
1496 | |
1430 | /* Check to see if we found the object that blocks view, |
1497 | /* Check to see if we found the object that blocks view, |
1431 | * and make sure we have a below pointer for it so that |
1498 | * and make sure we have a below pointer for it so that |
1432 | * we can get inserted below this one, which requires we |
1499 | * we can get inserted below this one, which requires we |
… | |
… | |
1563 | || (items < m->max_items |
1630 | || (items < m->max_items |
1564 | && ms.volume () < m->max_volume)) |
1631 | && ms.volume () < m->max_volume)) |
1565 | return true; |
1632 | return true; |
1566 | |
1633 | |
1567 | if (originator && originator->is_player ()) |
1634 | if (originator && originator->is_player ()) |
1568 | originator->contr->failmsg (format ( |
1635 | originator->contr->failmsgf ( |
1569 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1636 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1570 | query_name () |
1637 | query_name () |
1571 | )); |
1638 | ); |
1572 | |
1639 | |
1573 | return false; |
1640 | return false; |
1574 | } |
1641 | } |
1575 | |
1642 | |
1576 | /* |
1643 | /* |
… | |
… | |
1750 | * on top. |
1817 | * on top. |
1751 | */ |
1818 | */ |
1752 | int |
1819 | int |
1753 | check_move_on (object *op, object *originator) |
1820 | check_move_on (object *op, object *originator) |
1754 | { |
1821 | { |
1755 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1822 | if (op->flag [FLAG_NO_APPLY]) |
1756 | return 0; |
1823 | return 0; |
1757 | |
1824 | |
1758 | object *tmp; |
1825 | object *tmp; |
1759 | maptile *m = op->map; |
1826 | maptile *m = op->map; |
1760 | int x = op->x, y = op->y; |
1827 | int x = op->x, y = op->y; |
… | |
… | |
1797 | * Second check makes sure that the movement types not being slowed |
1864 | * Second check makes sure that the movement types not being slowed |
1798 | * (~slow_move) is not blocked on this space - just because the |
1865 | * (~slow_move) is not blocked on this space - just because the |
1799 | * space doesn't slow down swimming (for example), if you can't actually |
1866 | * space doesn't slow down swimming (for example), if you can't actually |
1800 | * swim on that space, can't use it to avoid the penalty. |
1867 | * swim on that space, can't use it to avoid the penalty. |
1801 | */ |
1868 | */ |
1802 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1869 | if (!op->flag [FLAG_WIZPASS]) |
1803 | { |
1870 | { |
1804 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1871 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1805 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1872 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1806 | { |
1873 | { |
1807 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1874 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1938 | void |
2005 | void |
1939 | flag_inv (object *op, int flag) |
2006 | flag_inv (object *op, int flag) |
1940 | { |
2007 | { |
1941 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2008 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1942 | { |
2009 | { |
1943 | SET_FLAG (tmp, flag); |
2010 | tmp->set_flag (flag); |
1944 | flag_inv (tmp, flag); |
2011 | flag_inv (tmp, flag); |
1945 | } |
2012 | } |
1946 | } |
2013 | } |
1947 | |
2014 | |
1948 | /* |
2015 | /* |
… | |
… | |
1951 | void |
2018 | void |
1952 | unflag_inv (object *op, int flag) |
2019 | unflag_inv (object *op, int flag) |
1953 | { |
2020 | { |
1954 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2021 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1955 | { |
2022 | { |
1956 | CLEAR_FLAG (tmp, flag); |
2023 | tmp->clr_flag (flag); |
1957 | unflag_inv (tmp, flag); |
2024 | unflag_inv (tmp, flag); |
1958 | } |
2025 | } |
1959 | } |
2026 | } |
1960 | |
2027 | |
1961 | /* |
2028 | /* |
… | |
… | |
2321 | * Add a check so we can't pick up invisible objects (0.93.8) |
2388 | * Add a check so we can't pick up invisible objects (0.93.8) |
2322 | */ |
2389 | */ |
2323 | int |
2390 | int |
2324 | can_pick (const object *who, const object *item) |
2391 | can_pick (const object *who, const object *item) |
2325 | { |
2392 | { |
2326 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2393 | return /*who->flag [FLAG_WIZ]|| */ |
2327 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2394 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2328 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2395 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2329 | } |
2396 | } |
2330 | |
2397 | |
2331 | /* |
2398 | /* |
2332 | * create clone from object to another |
2399 | * create clone from object to another |
2333 | */ |
2400 | */ |
… | |
… | |
2673 | } |
2740 | } |
2674 | else |
2741 | else |
2675 | move_type = mt; |
2742 | move_type = mt; |
2676 | } |
2743 | } |
2677 | |
2744 | |
|
|
2745 | /* object should be a player. |
|
|
2746 | * we return the object the player has marked with the 'mark' command |
|
|
2747 | * below. If no match is found (or object has changed), we return |
|
|
2748 | * NULL. We leave it up to the calling function to print messages if |
|
|
2749 | * nothing is found. |
|
|
2750 | */ |
|
|
2751 | object * |
|
|
2752 | object::mark () const |
|
|
2753 | { |
|
|
2754 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2755 | return contr->mark; |
|
|
2756 | else |
|
|
2757 | return 0; |
|
|
2758 | } |
|
|
2759 | |