… | |
… | |
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: |
… | |
… | |
439 | { |
445 | { |
440 | while (op) |
446 | while (op) |
441 | { |
447 | { |
442 | // adjust by actual difference to account for rounding errors |
448 | // adjust by actual difference to account for rounding errors |
443 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
449 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
444 | weight = weight_adjust_for (op, op->carrying) |
450 | weight = weight_adjust_for (op, op->carrying + weight) |
445 | - weight_adjust_for (op, op->carrying - weight); |
451 | - weight_adjust_for (op, op->carrying); |
446 | |
452 | |
447 | if (!weight) |
453 | if (!weight) |
448 | return; |
454 | return; |
449 | |
455 | |
450 | op->carrying += weight; |
456 | op->carrying += weight; |
… | |
… | |
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 carrying 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); |
… | |
… | |
683 | * 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. |
684 | */ |
694 | */ |
685 | void |
695 | void |
686 | update_turn_face (object *op) |
696 | update_turn_face (object *op) |
687 | { |
697 | { |
688 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
698 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
689 | return; |
699 | return; |
690 | |
700 | |
691 | SET_ANIMATION (op, op->direction); |
701 | SET_ANIMATION (op, op->direction); |
692 | update_object (op, UP_OBJ_FACE); |
702 | update_object (op, UP_OBJ_FACE); |
693 | } |
703 | } |
… | |
… | |
759 | /* nop */; |
769 | /* nop */; |
760 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
761 | { |
771 | { |
762 | #if 0 |
772 | #if 0 |
763 | // this is likely overkill, TODO: revisit (schmorp) |
773 | // this is likely overkill, TODO: revisit (schmorp) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
774 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
775 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
766 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
776 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
777 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
778 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
779 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
780 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
781 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
782 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* 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 |
774 | * have move_allow right now. |
784 | * have move_allow right now. |
… | |
… | |
795 | update_object (op->more, action); |
805 | update_object (op->more, action); |
796 | } |
806 | } |
797 | |
807 | |
798 | object::object () |
808 | object::object () |
799 | { |
809 | { |
800 | SET_FLAG (this, FLAG_REMOVED); |
810 | this->set_flag (FLAG_REMOVED); |
801 | |
811 | |
802 | //expmul = 1.0; declared const for the time being |
812 | //expmul = 1.0; declared const for the time being |
803 | face = blank_face; |
813 | face = blank_face; |
804 | material = MATERIAL_NULL; |
814 | material = MATERIAL_NULL; |
805 | } |
815 | } |
… | |
… | |
809 | unlink (); |
819 | unlink (); |
810 | |
820 | |
811 | free_key_values (this); |
821 | free_key_values (this); |
812 | } |
822 | } |
813 | |
823 | |
814 | static int object_count; |
|
|
815 | |
|
|
816 | void object::link () |
824 | void object::link () |
817 | { |
825 | { |
818 | assert (!index);//D |
826 | assert (!index);//D |
819 | uuid = UUID::gen (); |
827 | uuid = UUID::gen (); |
820 | count = ++object_count; |
|
|
821 | |
828 | |
822 | refcnt_inc (); |
829 | refcnt_inc (); |
823 | objects.insert (this); |
830 | objects.insert (this); |
|
|
831 | |
|
|
832 | ++create_count; |
|
|
833 | |
824 | } |
834 | } |
825 | |
835 | |
826 | void object::unlink () |
836 | void object::unlink () |
827 | { |
837 | { |
828 | if (!index) |
838 | if (!index) |
829 | return; |
839 | return; |
|
|
840 | |
|
|
841 | ++destroy_count; |
830 | |
842 | |
831 | objects.erase (this); |
843 | objects.erase (this); |
832 | refcnt_dec (); |
844 | refcnt_dec (); |
833 | } |
845 | } |
834 | |
846 | |
… | |
… | |
939 | map->insert (op, x, y); |
951 | map->insert (op, x, y); |
940 | } |
952 | } |
941 | } |
953 | } |
942 | } |
954 | } |
943 | |
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 * |
944 | object *object::create () |
993 | object::create () |
945 | { |
994 | { |
946 | 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 | |
947 | op->link (); |
1017 | op->link (); |
|
|
1018 | |
948 | return op; |
1019 | return op; |
949 | } |
1020 | } |
950 | |
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 | |
951 | static struct freed_map : maptile |
1037 | static struct freed_map : maptile |
952 | { |
1038 | { |
953 | freed_map () |
1039 | freed_map () |
|
|
1040 | : maptile (3, 3) |
954 | { |
1041 | { |
955 | path = "<freed objects map>"; |
1042 | path = "<freed objects map>"; |
956 | name = "/internal/freed_objects_map"; |
1043 | name = "/internal/freed_objects_map"; |
957 | width = 3; |
|
|
958 | height = 3; |
|
|
959 | no_drop = 1; |
1044 | no_drop = 1; |
960 | no_reset = 1; |
1045 | no_reset = 1; |
961 | |
1046 | |
962 | alloc (); |
|
|
963 | in_memory = MAP_ACTIVE; |
1047 | in_memory = MAP_ACTIVE; |
964 | } |
1048 | } |
965 | |
1049 | |
966 | ~freed_map () |
1050 | ~freed_map () |
967 | { |
1051 | { |
… | |
… | |
1018 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1102 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1019 | head->destroy (); |
1103 | head->destroy (); |
1020 | return; |
1104 | return; |
1021 | } |
1105 | } |
1022 | |
1106 | |
1023 | destroy_inv (false); |
1107 | destroy_inv_fast (); |
1024 | |
1108 | |
1025 | if (is_head ()) |
1109 | if (is_head ()) |
1026 | if (sound_destroy) |
1110 | if (sound_destroy) |
1027 | play_sound (sound_destroy); |
1111 | play_sound (sound_destroy); |
1028 | else if (flag [FLAG_MONSTER]) |
1112 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1128 | else if (pl->container_ () == this) |
1212 | else if (pl->container_ () == this) |
1129 | { |
1213 | { |
1130 | // removing a container should close it |
1214 | // removing a container should close it |
1131 | close_container (); |
1215 | close_container (); |
1132 | } |
1216 | } |
1133 | |
1217 | else |
1134 | esrv_del_item (pl->contr, count); |
1218 | esrv_del_item (pl->contr, count); |
1135 | } |
1219 | } |
1136 | |
1220 | |
1137 | /* link the object above us */ |
1221 | /* link the object above us */ |
1138 | // re-link, make sure compiler can easily use cmove |
1222 | // re-link, make sure compiler can easily use cmove |
1139 | *(above ? &above->below : &ms.top) = below; |
1223 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1325 | // from here :/ |
1409 | // from here :/ |
1326 | op->nrof += tmp->nrof; |
1410 | op->nrof += tmp->nrof; |
1327 | tmp->destroy (); |
1411 | tmp->destroy (); |
1328 | } |
1412 | } |
1329 | |
1413 | |
1330 | 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 */ |
1331 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1415 | op->clr_flag (FLAG_INV_LOCKED); |
1332 | |
1416 | |
1333 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1417 | if (!op->flag [FLAG_ALIVE]) |
1334 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1418 | op->clr_flag (FLAG_NO_STEAL); |
1335 | |
1419 | |
1336 | if (flag & INS_BELOW_ORIGINATOR) |
1420 | if (flag & INS_BELOW_ORIGINATOR) |
1337 | { |
1421 | { |
1338 | 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) |
1339 | { |
1423 | { |
… | |
… | |
1374 | * 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 |
1375 | * that flying non pickable objects are spell objects. |
1459 | * that flying non pickable objects are spell objects. |
1376 | */ |
1460 | */ |
1377 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1461 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1378 | { |
1462 | { |
1379 | 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]) |
1380 | floor = tmp; |
1464 | floor = tmp; |
1381 | |
1465 | |
1382 | 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]) |
1383 | { |
1467 | { |
1384 | /* We insert above top, so we want this object below this */ |
1468 | /* We insert above top, so we want this object below this */ |
1385 | top = tmp->below; |
1469 | top = tmp->below; |
1386 | break; |
1470 | break; |
1387 | } |
1471 | } |
… | |
… | |
1405 | && (op->face && !faces [op->face].visibility)) |
1489 | && (op->face && !faces [op->face].visibility)) |
1406 | { |
1490 | { |
1407 | object *last; |
1491 | object *last; |
1408 | |
1492 | |
1409 | for (last = top; last != floor; last = last->below) |
1493 | for (last = top; last != floor; last = last->below) |
1410 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1494 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1411 | break; |
1495 | break; |
1412 | |
1496 | |
1413 | /* Check to see if we found the object that blocks view, |
1497 | /* Check to see if we found the object that blocks view, |
1414 | * 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 |
1415 | * we can get inserted below this one, which requires we |
1499 | * we can get inserted below this one, which requires we |
… | |
… | |
1546 | || (items < m->max_items |
1630 | || (items < m->max_items |
1547 | && ms.volume () < m->max_volume)) |
1631 | && ms.volume () < m->max_volume)) |
1548 | return true; |
1632 | return true; |
1549 | |
1633 | |
1550 | if (originator && originator->is_player ()) |
1634 | if (originator && originator->is_player ()) |
1551 | originator->contr->failmsg (format ( |
1635 | originator->contr->failmsgf ( |
1552 | "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.>", |
1553 | query_name () |
1637 | query_name () |
1554 | )); |
1638 | ); |
1555 | |
1639 | |
1556 | return false; |
1640 | return false; |
1557 | } |
1641 | } |
1558 | |
1642 | |
1559 | /* |
1643 | /* |
… | |
… | |
1733 | * on top. |
1817 | * on top. |
1734 | */ |
1818 | */ |
1735 | int |
1819 | int |
1736 | check_move_on (object *op, object *originator) |
1820 | check_move_on (object *op, object *originator) |
1737 | { |
1821 | { |
1738 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1822 | if (op->flag [FLAG_NO_APPLY]) |
1739 | return 0; |
1823 | return 0; |
1740 | |
1824 | |
1741 | object *tmp; |
1825 | object *tmp; |
1742 | maptile *m = op->map; |
1826 | maptile *m = op->map; |
1743 | int x = op->x, y = op->y; |
1827 | int x = op->x, y = op->y; |
… | |
… | |
1780 | * Second check makes sure that the movement types not being slowed |
1864 | * Second check makes sure that the movement types not being slowed |
1781 | * (~slow_move) is not blocked on this space - just because the |
1865 | * (~slow_move) is not blocked on this space - just because the |
1782 | * 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 |
1783 | * 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. |
1784 | */ |
1868 | */ |
1785 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1869 | if (!op->flag [FLAG_WIZPASS]) |
1786 | { |
1870 | { |
1787 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1871 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1788 | ((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)) |
1789 | { |
1873 | { |
1790 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1874 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1921 | void |
2005 | void |
1922 | flag_inv (object *op, int flag) |
2006 | flag_inv (object *op, int flag) |
1923 | { |
2007 | { |
1924 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2008 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1925 | { |
2009 | { |
1926 | SET_FLAG (tmp, flag); |
2010 | tmp->set_flag (flag); |
1927 | flag_inv (tmp, flag); |
2011 | flag_inv (tmp, flag); |
1928 | } |
2012 | } |
1929 | } |
2013 | } |
1930 | |
2014 | |
1931 | /* |
2015 | /* |
… | |
… | |
1934 | void |
2018 | void |
1935 | unflag_inv (object *op, int flag) |
2019 | unflag_inv (object *op, int flag) |
1936 | { |
2020 | { |
1937 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2021 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1938 | { |
2022 | { |
1939 | CLEAR_FLAG (tmp, flag); |
2023 | tmp->clr_flag (flag); |
1940 | unflag_inv (tmp, flag); |
2024 | unflag_inv (tmp, flag); |
1941 | } |
2025 | } |
1942 | } |
2026 | } |
1943 | |
2027 | |
1944 | /* |
2028 | /* |
… | |
… | |
2134 | { |
2218 | { |
2135 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2219 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2136 | } |
2220 | } |
2137 | |
2221 | |
2138 | /* |
2222 | /* |
2139 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2223 | * find_dir_2(delta-x,delta-y) will return a direction value |
2140 | * an object which has subtracted the x and y coordinates of another |
2224 | * for running into direct [dx, dy]. |
2141 | * object, needs to travel toward it. |
2225 | * (the opposite of crossfire's find_dir_2!) |
2142 | */ |
2226 | */ |
2143 | int |
2227 | int |
2144 | find_dir_2 (int x, int y) |
2228 | find_dir_2 (int x, int y) |
2145 | { |
2229 | { |
|
|
2230 | #if 1 // new algorithm |
|
|
2231 | // this works by putting x, y into 16 sectors, which |
|
|
2232 | // are not equal sized, but are a better approximation |
|
|
2233 | // then the old algorithm, and then using a mapping |
|
|
2234 | // table to map it into a direction value. |
|
|
2235 | // basically, it maps these comparisons to each bit |
|
|
2236 | // bit #3: x < 0 |
|
|
2237 | // bit #2: y < 0 |
|
|
2238 | // bit #1: x > y |
|
|
2239 | // bit #0: x > 2y |
|
|
2240 | |
|
|
2241 | static const uint8 dir[16] = { |
|
|
2242 | 4, 5, 4, 3, |
|
|
2243 | 2, 1, 2, 3, |
|
|
2244 | 6, 5, 6, 7, |
|
|
2245 | 8, 1, 8, 7, |
|
|
2246 | }; |
|
|
2247 | int sector = 0; |
|
|
2248 | |
|
|
2249 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2250 | sector |= x < 0 ? 8 : 0; |
|
|
2251 | x = x < 0 ? -x : x; // abs |
|
|
2252 | |
|
|
2253 | sector |= y < 0 ? 4 : 0; |
|
|
2254 | y = y < 0 ? -y : y; // abs |
|
|
2255 | |
|
|
2256 | if (x > y) |
|
|
2257 | { |
|
|
2258 | sector |= 2; |
|
|
2259 | |
|
|
2260 | if (x > y * 2) |
|
|
2261 | sector |= 1; |
|
|
2262 | } |
|
|
2263 | else |
|
|
2264 | { |
|
|
2265 | if (y > x * 2) |
|
|
2266 | sector |= 1; |
|
|
2267 | else if (!y) |
|
|
2268 | return 0; // x == 0 here |
|
|
2269 | } |
|
|
2270 | |
|
|
2271 | return dir [sector]; |
|
|
2272 | #else // old algorithm |
2146 | int q; |
2273 | int q; |
2147 | |
2274 | |
2148 | if (y) |
2275 | if (y) |
2149 | q = x * 100 / y; |
2276 | q = 128 * x / y; |
2150 | else if (x) |
2277 | else if (x) |
2151 | q = -300 * x; |
2278 | q = -512 * x; // to make it > 309 |
2152 | else |
2279 | else |
2153 | return 0; |
2280 | return 0; |
2154 | |
2281 | |
2155 | if (y > 0) |
2282 | if (y > 0) |
2156 | { |
2283 | { |
2157 | if (q < -242) |
2284 | if (q < -309) return 7; |
|
|
2285 | if (q < -52) return 6; |
|
|
2286 | if (q < 52) return 5; |
|
|
2287 | if (q < 309) return 4; |
|
|
2288 | |
2158 | return 3; |
2289 | return 3; |
2159 | if (q < -41) |
2290 | } |
2160 | return 2; |
2291 | else |
2161 | if (q < 41) |
2292 | { |
2162 | return 1; |
2293 | if (q < -309) return 3; |
2163 | if (q < 242) |
2294 | if (q < -52) return 2; |
2164 | return 8; |
2295 | if (q < 52) return 1; |
|
|
2296 | if (q < 309) return 8; |
|
|
2297 | |
2165 | return 7; |
2298 | return 7; |
2166 | } |
2299 | } |
2167 | |
2300 | #endif |
2168 | if (q < -242) |
|
|
2169 | return 7; |
|
|
2170 | if (q < -41) |
|
|
2171 | return 6; |
|
|
2172 | if (q < 41) |
|
|
2173 | return 5; |
|
|
2174 | if (q < 242) |
|
|
2175 | return 4; |
|
|
2176 | |
|
|
2177 | return 3; |
|
|
2178 | } |
2301 | } |
2179 | |
2302 | |
2180 | /* |
2303 | /* |
2181 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2304 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2182 | * between two directions (which are expected to be absolute (see absdir()) |
2305 | * between two directions (which are expected to be absolute (see absdir()) |
2183 | */ |
2306 | */ |
2184 | int |
2307 | int |
2185 | dirdiff (int dir1, int dir2) |
2308 | dirdiff (int dir1, int dir2) |
2186 | { |
2309 | { |
2187 | int d; |
|
|
2188 | |
|
|
2189 | d = abs (dir1 - dir2); |
2310 | int d = abs (dir1 - dir2); |
2190 | if (d > 4) |
|
|
2191 | d = 8 - d; |
|
|
2192 | |
2311 | |
2193 | return d; |
2312 | return d > 4 ? 8 - d : d; |
2194 | } |
2313 | } |
2195 | |
2314 | |
2196 | /* peterm: |
2315 | /* peterm: |
2197 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2316 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2198 | * Basically, this is a table of directions, and what directions |
2317 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2304 | * Add a check so we can't pick up invisible objects (0.93.8) |
2423 | * Add a check so we can't pick up invisible objects (0.93.8) |
2305 | */ |
2424 | */ |
2306 | int |
2425 | int |
2307 | can_pick (const object *who, const object *item) |
2426 | can_pick (const object *who, const object *item) |
2308 | { |
2427 | { |
2309 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2428 | return /*who->flag [FLAG_WIZ]|| */ |
2310 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2429 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2311 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2430 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2312 | } |
2431 | } |
2313 | |
2432 | |
2314 | /* |
2433 | /* |
2315 | * create clone from object to another |
2434 | * create clone from object to another |
2316 | */ |
2435 | */ |
… | |
… | |
2656 | } |
2775 | } |
2657 | else |
2776 | else |
2658 | move_type = mt; |
2777 | move_type = mt; |
2659 | } |
2778 | } |
2660 | |
2779 | |
|
|
2780 | /* object should be a player. |
|
|
2781 | * we return the object the player has marked with the 'mark' command |
|
|
2782 | * below. If no match is found (or object has changed), we return |
|
|
2783 | * NULL. We leave it up to the calling function to print messages if |
|
|
2784 | * nothing is found. |
|
|
2785 | */ |
|
|
2786 | object * |
|
|
2787 | object::mark () const |
|
|
2788 | { |
|
|
2789 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2790 | return contr->mark; |
|
|
2791 | else |
|
|
2792 | return 0; |
|
|
2793 | } |
|
|
2794 | |