… | |
… | |
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: |
… | |
… | |
574 | } |
580 | } |
575 | |
581 | |
576 | this->owner = owner; |
582 | this->owner = owner; |
577 | } |
583 | } |
578 | |
584 | |
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 | } |
|
|
595 | |
|
|
596 | /* Zero the key_values on op, decrementing the shared-string |
585 | /* Zero the key_values on op, decrementing the shared-string |
597 | * refcounts and freeing the links. |
586 | * refcounts and freeing the links. |
598 | */ |
587 | */ |
599 | static void |
588 | static void |
600 | free_key_values (object *op) |
589 | free_key_values (object *op) |
… | |
… | |
700 | * be called to update the face variable, _and_ how it looks on the map. |
689 | * be called to update the face variable, _and_ how it looks on the map. |
701 | */ |
690 | */ |
702 | void |
691 | void |
703 | update_turn_face (object *op) |
692 | update_turn_face (object *op) |
704 | { |
693 | { |
705 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
694 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
706 | return; |
695 | return; |
707 | |
696 | |
708 | SET_ANIMATION (op, op->direction); |
697 | SET_ANIMATION (op, op->direction); |
709 | update_object (op, UP_OBJ_FACE); |
698 | update_object (op, UP_OBJ_FACE); |
710 | } |
699 | } |
… | |
… | |
776 | /* nop */; |
765 | /* nop */; |
777 | else if (action == UP_OBJ_INSERT) |
766 | else if (action == UP_OBJ_INSERT) |
778 | { |
767 | { |
779 | #if 0 |
768 | #if 0 |
780 | // this is likely overkill, TODO: revisit (schmorp) |
769 | // this is likely overkill, TODO: revisit (schmorp) |
781 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
770 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
782 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
771 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
783 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
772 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
784 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
773 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
785 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
774 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
786 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
775 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
787 | || (m.move_on | op->move_on ) != m.move_on |
776 | || (m.move_on | op->move_on ) != m.move_on |
788 | || (m.move_off | op->move_off ) != m.move_off |
777 | || (m.move_off | op->move_off ) != m.move_off |
789 | || (m.move_slow | op->move_slow) != m.move_slow |
778 | || (m.move_slow | op->move_slow) != m.move_slow |
790 | /* This isn't perfect, but I don't expect a lot of objects to |
779 | /* This isn't perfect, but I don't expect a lot of objects to |
791 | * have move_allow right now. |
780 | * have move_allow right now. |
… | |
… | |
812 | update_object (op->more, action); |
801 | update_object (op->more, action); |
813 | } |
802 | } |
814 | |
803 | |
815 | object::object () |
804 | object::object () |
816 | { |
805 | { |
817 | SET_FLAG (this, FLAG_REMOVED); |
806 | this->set_flag (FLAG_REMOVED); |
818 | |
807 | |
819 | //expmul = 1.0; declared const for the time being |
808 | //expmul = 1.0; declared const for the time being |
820 | face = blank_face; |
809 | face = blank_face; |
821 | material = MATERIAL_NULL; |
810 | material = MATERIAL_NULL; |
822 | } |
811 | } |
… | |
… | |
826 | unlink (); |
815 | unlink (); |
827 | |
816 | |
828 | free_key_values (this); |
817 | free_key_values (this); |
829 | } |
818 | } |
830 | |
819 | |
831 | static int object_count; |
|
|
832 | |
|
|
833 | void object::link () |
820 | void object::link () |
834 | { |
821 | { |
835 | assert (!index);//D |
822 | assert (!index);//D |
836 | uuid = UUID::gen (); |
823 | uuid = UUID::gen (); |
837 | count = ++object_count; |
|
|
838 | |
824 | |
839 | refcnt_inc (); |
825 | refcnt_inc (); |
840 | objects.insert (this); |
826 | objects.insert (this); |
|
|
827 | |
|
|
828 | ++create_count; |
|
|
829 | |
841 | } |
830 | } |
842 | |
831 | |
843 | void object::unlink () |
832 | void object::unlink () |
844 | { |
833 | { |
845 | if (!index) |
834 | if (!index) |
846 | return; |
835 | return; |
|
|
836 | |
|
|
837 | ++destroy_count; |
847 | |
838 | |
848 | objects.erase (this); |
839 | objects.erase (this); |
849 | refcnt_dec (); |
840 | refcnt_dec (); |
850 | } |
841 | } |
851 | |
842 | |
… | |
… | |
956 | map->insert (op, x, y); |
947 | map->insert (op, x, y); |
957 | } |
948 | } |
958 | } |
949 | } |
959 | } |
950 | } |
960 | |
951 | |
|
|
952 | /* |
|
|
953 | * Remove and free all objects in the inventory of the given object. |
|
|
954 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
955 | * well, so we can (and have to!) take shortcuts. |
|
|
956 | */ |
|
|
957 | void |
|
|
958 | object::destroy_inv_fast () |
|
|
959 | { |
|
|
960 | while (object *op = inv) |
|
|
961 | { |
|
|
962 | // remove from object the fast way |
|
|
963 | op->flag [FLAG_REMOVED] = true; |
|
|
964 | op->env = 0; |
|
|
965 | if ((inv = inv->below)) |
|
|
966 | inv->above = 0; |
|
|
967 | |
|
|
968 | // then destroy |
|
|
969 | op->destroy (); |
|
|
970 | } |
|
|
971 | } |
|
|
972 | |
|
|
973 | void |
|
|
974 | object::freelist_free (int count) |
|
|
975 | { |
|
|
976 | while (count-- && freelist) |
|
|
977 | { |
|
|
978 | freelist_item *next = freelist->next; |
|
|
979 | // count is being "destroyed" |
|
|
980 | |
|
|
981 | sfree ((char *)freelist, sizeof (object)); |
|
|
982 | |
|
|
983 | freelist = next; |
|
|
984 | --free_count; |
|
|
985 | } |
|
|
986 | } |
|
|
987 | |
|
|
988 | object * |
961 | object *object::create () |
989 | object::create () |
962 | { |
990 | { |
963 | object *op = new object; |
991 | object *op; |
|
|
992 | |
|
|
993 | if (freelist) |
|
|
994 | { |
|
|
995 | freelist_item li = *freelist; |
|
|
996 | memset (freelist, 0, sizeof (object)); |
|
|
997 | |
|
|
998 | op = new (freelist) object; |
|
|
999 | op->count = li.count; |
|
|
1000 | |
|
|
1001 | freelist = li.next; |
|
|
1002 | --free_count; |
|
|
1003 | } |
|
|
1004 | else |
|
|
1005 | { |
|
|
1006 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1007 | |
|
|
1008 | op = new(ni) object; |
|
|
1009 | |
|
|
1010 | op->count = ++object_count; |
|
|
1011 | } |
|
|
1012 | |
964 | op->link (); |
1013 | op->link (); |
|
|
1014 | |
965 | return op; |
1015 | return op; |
|
|
1016 | } |
|
|
1017 | |
|
|
1018 | void |
|
|
1019 | object::do_delete () |
|
|
1020 | { |
|
|
1021 | uint32_t count = this->count; |
|
|
1022 | |
|
|
1023 | this->~object (); |
|
|
1024 | |
|
|
1025 | freelist_item *li = (freelist_item *)this; |
|
|
1026 | li->next = freelist; |
|
|
1027 | li->count = count; |
|
|
1028 | |
|
|
1029 | freelist = li; |
|
|
1030 | ++free_count; |
966 | } |
1031 | } |
967 | |
1032 | |
968 | static struct freed_map : maptile |
1033 | static struct freed_map : maptile |
969 | { |
1034 | { |
970 | freed_map () |
1035 | freed_map () |
… | |
… | |
1035 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1100 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1036 | head->destroy (); |
1101 | head->destroy (); |
1037 | return; |
1102 | return; |
1038 | } |
1103 | } |
1039 | |
1104 | |
1040 | destroy_inv (false); |
1105 | destroy_inv_fast (); |
1041 | |
1106 | |
1042 | if (is_head ()) |
1107 | if (is_head ()) |
1043 | if (sound_destroy) |
1108 | if (sound_destroy) |
1044 | play_sound (sound_destroy); |
1109 | play_sound (sound_destroy); |
1045 | else if (flag [FLAG_MONSTER]) |
1110 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1145 | else if (pl->container_ () == this) |
1210 | else if (pl->container_ () == this) |
1146 | { |
1211 | { |
1147 | // removing a container should close it |
1212 | // removing a container should close it |
1148 | close_container (); |
1213 | close_container (); |
1149 | } |
1214 | } |
1150 | |
1215 | else |
1151 | esrv_del_item (pl->contr, count); |
1216 | esrv_del_item (pl->contr, count); |
1152 | } |
1217 | } |
1153 | |
1218 | |
1154 | /* link the object above us */ |
1219 | /* link the object above us */ |
1155 | // re-link, make sure compiler can easily use cmove |
1220 | // re-link, make sure compiler can easily use cmove |
1156 | *(above ? &above->below : &ms.top) = below; |
1221 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1342 | // from here :/ |
1407 | // from here :/ |
1343 | op->nrof += tmp->nrof; |
1408 | op->nrof += tmp->nrof; |
1344 | tmp->destroy (); |
1409 | tmp->destroy (); |
1345 | } |
1410 | } |
1346 | |
1411 | |
1347 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1412 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1348 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1413 | op->clr_flag (FLAG_INV_LOCKED); |
1349 | |
1414 | |
1350 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1415 | if (!op->flag [FLAG_ALIVE]) |
1351 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1416 | op->clr_flag (FLAG_NO_STEAL); |
1352 | |
1417 | |
1353 | if (flag & INS_BELOW_ORIGINATOR) |
1418 | if (flag & INS_BELOW_ORIGINATOR) |
1354 | { |
1419 | { |
1355 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1420 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1356 | { |
1421 | { |
… | |
… | |
1391 | * when lots of spells are cast in one area. Currently, it is presumed |
1456 | * when lots of spells are cast in one area. Currently, it is presumed |
1392 | * that flying non pickable objects are spell objects. |
1457 | * that flying non pickable objects are spell objects. |
1393 | */ |
1458 | */ |
1394 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1459 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1395 | { |
1460 | { |
1396 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1461 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1397 | floor = tmp; |
1462 | floor = tmp; |
1398 | |
1463 | |
1399 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1464 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1400 | { |
1465 | { |
1401 | /* We insert above top, so we want this object below this */ |
1466 | /* We insert above top, so we want this object below this */ |
1402 | top = tmp->below; |
1467 | top = tmp->below; |
1403 | break; |
1468 | break; |
1404 | } |
1469 | } |
… | |
… | |
1422 | && (op->face && !faces [op->face].visibility)) |
1487 | && (op->face && !faces [op->face].visibility)) |
1423 | { |
1488 | { |
1424 | object *last; |
1489 | object *last; |
1425 | |
1490 | |
1426 | for (last = top; last != floor; last = last->below) |
1491 | for (last = top; last != floor; last = last->below) |
1427 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1492 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1428 | break; |
1493 | break; |
1429 | |
1494 | |
1430 | /* Check to see if we found the object that blocks view, |
1495 | /* Check to see if we found the object that blocks view, |
1431 | * and make sure we have a below pointer for it so that |
1496 | * and make sure we have a below pointer for it so that |
1432 | * we can get inserted below this one, which requires we |
1497 | * we can get inserted below this one, which requires we |
… | |
… | |
1563 | || (items < m->max_items |
1628 | || (items < m->max_items |
1564 | && ms.volume () < m->max_volume)) |
1629 | && ms.volume () < m->max_volume)) |
1565 | return true; |
1630 | return true; |
1566 | |
1631 | |
1567 | if (originator && originator->is_player ()) |
1632 | if (originator && originator->is_player ()) |
1568 | originator->contr->failmsg (format ( |
1633 | 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.>", |
1634 | "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 () |
1635 | query_name () |
1571 | )); |
1636 | ); |
1572 | |
1637 | |
1573 | return false; |
1638 | return false; |
1574 | } |
1639 | } |
1575 | |
1640 | |
1576 | /* |
1641 | /* |
… | |
… | |
1750 | * on top. |
1815 | * on top. |
1751 | */ |
1816 | */ |
1752 | int |
1817 | int |
1753 | check_move_on (object *op, object *originator) |
1818 | check_move_on (object *op, object *originator) |
1754 | { |
1819 | { |
1755 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1820 | if (op->flag [FLAG_NO_APPLY]) |
1756 | return 0; |
1821 | return 0; |
1757 | |
1822 | |
1758 | object *tmp; |
1823 | object *tmp; |
1759 | maptile *m = op->map; |
1824 | maptile *m = op->map; |
1760 | int x = op->x, y = op->y; |
1825 | int x = op->x, y = op->y; |
… | |
… | |
1797 | * Second check makes sure that the movement types not being slowed |
1862 | * Second check makes sure that the movement types not being slowed |
1798 | * (~slow_move) is not blocked on this space - just because the |
1863 | * (~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 |
1864 | * 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. |
1865 | * swim on that space, can't use it to avoid the penalty. |
1801 | */ |
1866 | */ |
1802 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1867 | if (!op->flag [FLAG_WIZPASS]) |
1803 | { |
1868 | { |
1804 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1869 | 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)) |
1870 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1806 | { |
1871 | { |
1807 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1872 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1938 | void |
2003 | void |
1939 | flag_inv (object *op, int flag) |
2004 | flag_inv (object *op, int flag) |
1940 | { |
2005 | { |
1941 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2006 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1942 | { |
2007 | { |
1943 | SET_FLAG (tmp, flag); |
2008 | tmp->set_flag (flag); |
1944 | flag_inv (tmp, flag); |
2009 | flag_inv (tmp, flag); |
1945 | } |
2010 | } |
1946 | } |
2011 | } |
1947 | |
2012 | |
1948 | /* |
2013 | /* |
… | |
… | |
1951 | void |
2016 | void |
1952 | unflag_inv (object *op, int flag) |
2017 | unflag_inv (object *op, int flag) |
1953 | { |
2018 | { |
1954 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2019 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1955 | { |
2020 | { |
1956 | CLEAR_FLAG (tmp, flag); |
2021 | tmp->clr_flag (flag); |
1957 | unflag_inv (tmp, flag); |
2022 | unflag_inv (tmp, flag); |
1958 | } |
2023 | } |
1959 | } |
2024 | } |
1960 | |
2025 | |
1961 | /* |
2026 | /* |
… | |
… | |
2321 | * Add a check so we can't pick up invisible objects (0.93.8) |
2386 | * Add a check so we can't pick up invisible objects (0.93.8) |
2322 | */ |
2387 | */ |
2323 | int |
2388 | int |
2324 | can_pick (const object *who, const object *item) |
2389 | can_pick (const object *who, const object *item) |
2325 | { |
2390 | { |
2326 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2391 | return /*who->flag [FLAG_WIZ]|| */ |
2327 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2392 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2328 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2393 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2329 | } |
2394 | } |
2330 | |
2395 | |
2331 | /* |
2396 | /* |
2332 | * create clone from object to another |
2397 | * create clone from object to another |
2333 | */ |
2398 | */ |
… | |
… | |
2673 | } |
2738 | } |
2674 | else |
2739 | else |
2675 | move_type = mt; |
2740 | move_type = mt; |
2676 | } |
2741 | } |
2677 | |
2742 | |
|
|
2743 | /* object should be a player. |
|
|
2744 | * we return the object the player has marked with the 'mark' command |
|
|
2745 | * below. If no match is found (or object has changed), we return |
|
|
2746 | * NULL. We leave it up to the calling function to print messages if |
|
|
2747 | * nothing is found. |
|
|
2748 | */ |
|
|
2749 | object * |
|
|
2750 | object::mark () const |
|
|
2751 | { |
|
|
2752 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2753 | return contr->mark; |
|
|
2754 | else |
|
|
2755 | return 0; |
|
|
2756 | } |
|
|
2757 | |