ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.80 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.84 by root, Mon Dec 25 14:54:44 2006 UTC

… …
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
485 485
486 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
487 487
488 if (self || cb)
489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
490
491 if (is_freed) 488 if (is_freed)
492 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
493 490
494 if (is_removed) 491 if (is_removed)
495 SET_FLAG (dst, FLAG_REMOVED); 492 SET_FLAG (dst, FLAG_REMOVED);
… …
694 */ 691 */
695 if (!op->map || op->map->in_memory == MAP_SAVING) 692 if (!op->map || op->map->in_memory == MAP_SAVING)
696 return; 693 return;
697 694
698 /* make sure the object is within map boundaries */ 695 /* make sure the object is within map boundaries */
699 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 696 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700 { 697 {
701 LOG (llevError, "update_object() called for object out of map!\n"); 698 LOG (llevError, "update_object() called for object out of map!\n");
702#ifdef MANY_CORES 699#ifdef MANY_CORES
703 abort (); 700 abort ();
704#endif 701#endif
… …
741 738
742 if (op->more) 739 if (op->more)
743 update_object (op->more, action); 740 update_object (op->more, action);
744} 741}
745 742
746object::vector object::mortals;
747object::vector object::objects; // not yet used 743object::vector object::objects; // not yet used
748object *object::first; 744object *object::first;
749
750void object::free_mortals ()
751{
752 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753 if ((*i)->refcnt)
754 ++i; // further delay freeing
755 else
756 {
757 delete *i;
758 mortals.erase (i);
759 }
760}
761 745
762object::object () 746object::object ()
763{ 747{
764 SET_FLAG (this, FLAG_REMOVED); 748 SET_FLAG (this, FLAG_REMOVED);
765 749
… …
814 * this function to succeed. 798 * this function to succeed.
815 * 799 *
816 * If destroy_inventory is set, free inventory as well. Else drop items in 800 * If destroy_inventory is set, free inventory as well. Else drop items in
817 * inventory to the ground. 801 * inventory to the ground.
818 */ 802 */
819void object::destroy (bool destroy_inventory) 803void
804object::do_destroy ()
820{ 805{
821 if (QUERY_FLAG (this, FLAG_FREED)) 806 attachable::do_destroy ();
807
808 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this);
810
811 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this);
813
814 if (!flag [FLAG_REMOVED])
815 remove ();
816
817 if (flag [FLAG_FREED])
822 return; 818 return;
823 819
824 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 820 flag [FLAG_FREED] = 1;
825 remove_friendly_object (this);
826
827 if (!QUERY_FLAG (this, FLAG_REMOVED))
828 remove ();
829
830 SET_FLAG (this, FLAG_FREED);
831
832 if (more)
833 {
834 more->destroy (destroy_inventory);
835 more = 0;
836 }
837
838 if (inv)
839 {
840 /* Only if the space blocks everything do we not process -
841 * if some form of movement is allowed, let objects
842 * drop on that space.
843 */
844 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845 {
846 object *op = inv;
847
848 while (op)
849 {
850 object *tmp = op->below;
851 op->destroy (destroy_inventory);
852 op = tmp;
853 }
854 }
855 else
856 { /* Put objects in inventory onto this space */
857 object *op = inv;
858
859 while (op)
860 {
861 object *tmp = op->below;
862
863 op->remove ();
864
865 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867 op->destroy ();
868 else
869 {
870 op->x = x;
871 op->y = y;
872 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873 }
874
875 op = tmp;
876 }
877 }
878 }
879 821
880 // hack to ensure that freed objects still have a valid map 822 // hack to ensure that freed objects still have a valid map
881 { 823 {
882 static maptile *freed_map; // freed objects are moved here to avoid crashes 824 static maptile *freed_map; // freed objects are moved here to avoid crashes
883 825
… …
895 map = freed_map; 837 map = freed_map;
896 x = 1; 838 x = 1;
897 y = 1; 839 y = 1;
898 } 840 }
899 841
842 more = 0;
843 head = 0;
844 inv = 0;
845
900 // clear those pointers that likely might have circular references to us 846 // clear those pointers that likely might have circular references to us
901 owner = 0; 847 owner = 0;
902 enemy = 0; 848 enemy = 0;
903 attacked_by = 0; 849 attacked_by = 0;
904 850
… …
908 /* Remove object from the active list */ 854 /* Remove object from the active list */
909 speed = 0; 855 speed = 0;
910 update_ob_speed (this); 856 update_ob_speed (this);
911 857
912 unlink (); 858 unlink ();
859}
913 860
914 mortals.push_back (this); 861/*
862 * Remove and free all objects in the inventory of the given object.
863 * object.c ?
864 */
865void
866object::destroy_inv (bool drop_to_ground)
867{
868 if (!inv)
869 return;
870
871 /* Only if the space blocks everything do we not process -
872 * if some form of movement is allowed, let objects
873 * drop on that space.
874 */
875 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
876 {
877 while (inv)
878 {
879 inv->destroy_inv (drop_to_ground);
880 inv->destroy ();
881 }
882 }
883 else
884 { /* Put objects in inventory onto this space */
885 while (inv)
886 {
887 object *op = inv;
888
889 if (op->flag [FLAG_STARTEQUIP]
890 || op->flag [FLAG_NO_DROP]
891 || op->type == RUNE
892 || op->type == TRAP
893 || op->flag [FLAG_IS_A_TEMPLATE])
894 op->destroy ();
895 else
896 {
897 op->remove ();
898 op->x = x;
899 op->y = y;
900 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901 }
902 }
903 }
904}
905
906void
907object::destroy (bool destroy_inventory)
908{
909 if (destroyed ())
910 return;
911
912 if (more)
913 {
914 //TODO: non-head objects must not have inventory
915 more->destroy (destroy_inventory);
916 more = 0;
917 }
918
919 if (destroy_inventory)
920 destroy_inv (true);
921
922 attachable::destroy ();
915} 923}
916 924
917/* 925/*
918 * sub_weight() recursively (outwards) subtracts a number from the 926 * sub_weight() recursively (outwards) subtracts a number from the
919 * weight of an object (and what is carried by it's environment(s)). 927 * weight of an object (and what is carried by it's environment(s)).
… …
943object::remove () 951object::remove ()
944{ 952{
945 object *tmp, *last = 0; 953 object *tmp, *last = 0;
946 object *otmp; 954 object *otmp;
947 955
948 int check_walk_off;
949
950 if (QUERY_FLAG (this, FLAG_REMOVED)) 956 if (QUERY_FLAG (this, FLAG_REMOVED))
951 return; 957 return;
952 958
953 SET_FLAG (this, FLAG_REMOVED); 959 SET_FLAG (this, FLAG_REMOVED);
960 INVOKE_OBJECT (REMOVE, this);
954 961
955 if (more) 962 if (more)
956 more->remove (); 963 more->remove ();
957 964
958 /* 965 /*
… …
1020 dump = dump_object (GET_MAP_OB (map, x, y)); 1027 dump = dump_object (GET_MAP_OB (map, x, y));
1021 LOG (llevError, "%s\n", dump); 1028 LOG (llevError, "%s\n", dump);
1022 free (dump); 1029 free (dump);
1023 } 1030 }
1024 1031
1025 map->at (x, y).bottom = above; /* goes on above it. */ 1032 map->at (x, y).bot = above; /* goes on above it. */
1026 } 1033 }
1027 1034
1028 above = 0; 1035 above = 0;
1029 below = 0; 1036 below = 0;
1030 1037
1031 if (map->in_memory == MAP_SAVING) 1038 if (map->in_memory == MAP_SAVING)
1032 return; 1039 return;
1033 1040
1034 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1041 int check_walk_off = !flag [FLAG_NO_APPLY];
1035 1042
1036 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1043 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1037 { 1044 {
1038 /* No point updating the players look faces if he is the object 1045 /* No point updating the players look faces if he is the object
1039 * being removed. 1046 * being removed.
… …
1045 * removed (most likely destroyed), update the player view 1052 * removed (most likely destroyed), update the player view
1046 * appropriately. 1053 * appropriately.
1047 */ 1054 */
1048 if (tmp->container == this) 1055 if (tmp->container == this)
1049 { 1056 {
1050 CLEAR_FLAG (this, FLAG_APPLIED); 1057 flag [FLAG_APPLIED] = 0;
1051 tmp->container = 0; 1058 tmp->container = 0;
1052 } 1059 }
1053 1060
1061 if (tmp->contr->ns)
1054 tmp->contr->ns->floorbox_update (); 1062 tmp->contr->ns->floorbox_update ();
1055 } 1063 }
1056 1064
1057 /* See if player moving off should effect something */ 1065 /* See if player moving off should effect something */
1058 if (check_walk_off 1066 if (check_walk_off
1059 && ((move_type & tmp->move_off) 1067 && ((move_type & tmp->move_off)
… …
1077 if (!last) 1085 if (!last)
1078 map->at (x, y).flags_ = P_NEED_UPDATE; 1086 map->at (x, y).flags_ = P_NEED_UPDATE;
1079 else 1087 else
1080 update_object (last, UP_OBJ_REMOVE); 1088 update_object (last, UP_OBJ_REMOVE);
1081 1089
1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1090 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083 update_all_los (map, x, y); 1091 update_all_los (map, x, y);
1084 } 1092 }
1085} 1093}
1086 1094
1087/* 1095/*
… …
1096merge_ob (object *op, object *top) 1104merge_ob (object *op, object *top)
1097{ 1105{
1098 if (!op->nrof) 1106 if (!op->nrof)
1099 return 0; 1107 return 0;
1100 1108
1101 if (top == NULL) 1109 if (top)
1102 for (top = op; top != NULL && top->above != NULL; top = top->above); 1110 for (top = op; top && top->above; top = top->above)
1111 ;
1103 1112
1104 for (; top != NULL; top = top->below) 1113 for (; top; top = top->below)
1105 { 1114 {
1106 if (top == op) 1115 if (top == op)
1107 continue; 1116 continue;
1108 1117
1109 if (object::can_merge (op, top)) 1118 if (object::can_merge (op, top))
… …
1159 * Return value: 1168 * Return value:
1160 * new object if 'op' was merged with other object 1169 * new object if 'op' was merged with other object
1161 * NULL if 'op' was destroyed 1170 * NULL if 'op' was destroyed
1162 * just 'op' otherwise 1171 * just 'op' otherwise
1163 */ 1172 */
1164
1165object * 1173object *
1166insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1174insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167{ 1175{
1168 object *tmp, *top, *floor = NULL; 1176 object *tmp, *top, *floor = NULL;
1169 sint16 x, y; 1177 sint16 x, y;
… …
1203 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1211 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204 free (dump); 1212 free (dump);
1205 return op; 1213 return op;
1206 } 1214 }
1207 1215
1208 if (op->more != NULL) 1216 if (op->more)
1209 { 1217 {
1210 /* The part may be on a different map. */ 1218 /* The part may be on a different map. */
1211 1219
1212 object *more = op->more; 1220 object *more = op->more;
1213 1221
… …
1229 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1237 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230 { 1238 {
1231 if (!op->head) 1239 if (!op->head)
1232 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1240 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233 1241
1234 return NULL; 1242 return 0;
1235 } 1243 }
1236 } 1244 }
1237 1245
1238 CLEAR_FLAG (op, FLAG_REMOVED); 1246 CLEAR_FLAG (op, FLAG_REMOVED);
1239 1247
… …
1273 op->below = originator->below; 1281 op->below = originator->below;
1274 1282
1275 if (op->below) 1283 if (op->below)
1276 op->below->above = op; 1284 op->below->above = op;
1277 else 1285 else
1278 op->ms ().bottom = op; 1286 op->ms ().bot = op;
1279 1287
1280 /* since *below* originator, no need to update top */ 1288 /* since *below* originator, no need to update top */
1281 originator->below = op; 1289 originator->below = op;
1282 } 1290 }
1283 else 1291 else
… …
1362 1370
1363 if (op->above) 1371 if (op->above)
1364 op->above->below = op; 1372 op->above->below = op;
1365 1373
1366 op->below = NULL; 1374 op->below = NULL;
1367 op->ms ().bottom = op; 1375 op->ms ().bot = op;
1368 } 1376 }
1369 else 1377 else
1370 { /* get inserted into the stack above top */ 1378 { /* get inserted into the stack above top */
1371 op->above = top->above; 1379 op->above = top->above;
1372 1380
… …
1387 /* If we have a floor, we know the player, if any, will be above 1395 /* If we have a floor, we know the player, if any, will be above
1388 * it, so save a few ticks and start from there. 1396 * it, so save a few ticks and start from there.
1389 */ 1397 */
1390 if (!(flag & INS_MAP_LOAD)) 1398 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1399 if (object *pl = op->ms ().player ())
1400 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1401 pl->contr->ns->floorbox_update ();
1393 1402
1394 /* If this object glows, it may affect lighting conditions that are 1403 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1404 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1405 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1406 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1407 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1408 * this should get redone to only look for players within range,
1400 * or just updating the P_NEED_UPDATE for spaces within this area 1409 * or just updating the P_NEED_UPDATE for spaces within this area
1401 * of effect may be sufficient. 1410 * of effect may be sufficient.
1402 */ 1411 */
1403 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1412 if (op->map->darkness && (op->glow_radius != 0))
1404 update_all_los (op->map, op->x, op->y); 1413 update_all_los (op->map, op->x, op->y);
1405 1414
1406 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1415 /* updates flags (blocked, alive, no magic, etc) for this map space */
1407 update_object (op, UP_OBJ_INSERT); 1416 update_object (op, UP_OBJ_INSERT);
1417
1418 INVOKE_OBJECT (INSERT, op);
1408 1419
1409 /* Don't know if moving this to the end will break anything. However, 1420 /* Don't know if moving this to the end will break anything. However,
1410 * we want to have floorbox_update called before calling this. 1421 * we want to have floorbox_update called before calling this.
1411 * 1422 *
1412 * check_move_on() must be after this because code called from 1423 * check_move_on() must be after this because code called from
… …
1417 1428
1418 /* if this is not the head or flag has been passed, don't check walk on status */ 1429 /* if this is not the head or flag has been passed, don't check walk on status */
1419 if (!(flag & INS_NO_WALK_ON) && !op->head) 1430 if (!(flag & INS_NO_WALK_ON) && !op->head)
1420 { 1431 {
1421 if (check_move_on (op, originator)) 1432 if (check_move_on (op, originator))
1422 return NULL; 1433 return 0;
1423 1434
1424 /* If we are a multi part object, lets work our way through the check 1435 /* If we are a multi part object, lets work our way through the check
1425 * walk on's. 1436 * walk on's.
1426 */ 1437 */
1427 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1438 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1428 if (check_move_on (tmp, originator)) 1439 if (check_move_on (tmp, originator))
1429 return NULL; 1440 return 0;
1430 } 1441 }
1431 1442
1432 return op; 1443 return op;
1433} 1444}
1434 1445
… …
1505 1516
1506object * 1517object *
1507decrease_ob_nr (object *op, uint32 i) 1518decrease_ob_nr (object *op, uint32 i)
1508{ 1519{
1509 object *tmp; 1520 object *tmp;
1510 player *pl;
1511 1521
1512 if (i == 0) /* objects with op->nrof require this check */ 1522 if (i == 0) /* objects with op->nrof require this check */
1513 return op; 1523 return op;
1514 1524
1515 if (i > op->nrof) 1525 if (i > op->nrof)
… …
1528 * IMO, searching through all the players will mostly 1538 * IMO, searching through all the players will mostly
1529 * likely be quicker than following op->env to the map, 1539 * likely be quicker than following op->env to the map,
1530 * and then searching the map for a player. 1540 * and then searching the map for a player.
1531 */ 1541 */
1532 if (!tmp) 1542 if (!tmp)
1533 { 1543 for_all_players (pl)
1534 for (pl = first_player; pl; pl = pl->next)
1535 if (pl->ob->container == op->env) 1544 if (pl->ob->container == op->env)
1536 { 1545 {
1537 tmp = pl->ob; 1546 tmp = pl->ob;
1538 break; 1547 break;
1539 } 1548 }
1540 }
1541 1549
1542 if (i < op->nrof) 1550 if (i < op->nrof)
1543 { 1551 {
1544 sub_weight (op->env, op->weight * i); 1552 sub_weight (op->env, op->weight * i);
1545 op->nrof -= i; 1553 op->nrof -= i;
… …
1695 if ((op->glow_radius != 0) && map) 1703 if ((op->glow_radius != 0) && map)
1696 { 1704 {
1697#ifdef DEBUG_LIGHTS 1705#ifdef DEBUG_LIGHTS
1698 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699#endif /* DEBUG_LIGHTS */ 1707#endif /* DEBUG_LIGHTS */
1700 if (MAP_DARKNESS (map)) 1708 if (map->darkness)
1701 update_all_los (map, x, y); 1709 update_all_los (map, x, y);
1702 } 1710 }
1703 1711
1704 /* Client has no idea of ordering so lets not bother ordering it here. 1712 /* Client has no idea of ordering so lets not bother ordering it here.
1705 * It sure simplifies this function... 1713 * It sure simplifies this function...
… …
1710 { 1718 {
1711 op->below = inv; 1719 op->below = inv;
1712 op->below->above = op; 1720 op->below->above = op;
1713 inv = op; 1721 inv = op;
1714 } 1722 }
1723
1724 INVOKE_OBJECT (INSERT, this);
1715 1725
1716 return op; 1726 return op;
1717} 1727}
1718 1728
1719/* 1729/*
… …
1771 1781
1772 /* The objects have to be checked from top to bottom. 1782 /* The objects have to be checked from top to bottom.
1773 * Hence, we first go to the top: 1783 * Hence, we first go to the top:
1774 */ 1784 */
1775 1785
1776 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1786 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1777 { 1787 {
1778 /* Trim the search when we find the first other spell effect 1788 /* Trim the search when we find the first other spell effect
1779 * this helps performance so that if a space has 50 spell objects, 1789 * this helps performance so that if a space has 50 spell objects,
1780 * we don't need to check all of them. 1790 * we don't need to check all of them.
1781 */ 1791 */
… …
1836/* 1846/*
1837 * present_arch(arch, map, x, y) searches for any objects with 1847 * present_arch(arch, map, x, y) searches for any objects with
1838 * a matching archetype at the given map and coordinates. 1848 * a matching archetype at the given map and coordinates.
1839 * The first matching object is returned, or NULL if none. 1849 * The first matching object is returned, or NULL if none.
1840 */ 1850 */
1841
1842object * 1851object *
1843present_arch (const archetype *at, maptile *m, int x, int y) 1852present_arch (const archetype *at, maptile *m, int x, int y)
1844{ 1853{
1845 object *
1846 tmp;
1847
1848 if (m == NULL || out_of_map (m, x, y)) 1854 if (m == NULL || out_of_map (m, x, y))
1849 { 1855 {
1850 LOG (llevError, "Present_arch called outside map.\n"); 1856 LOG (llevError, "Present_arch called outside map.\n");
1851 return NULL; 1857 return NULL;
1852 } 1858 }
1859
1853 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1860 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1854 if (tmp->arch == at) 1861 if (tmp->arch == at)
1855 return tmp; 1862 return tmp;
1863
1856 return NULL; 1864 return NULL;
1857} 1865}
1858 1866
1859/* 1867/*
1860 * present(type, map, x, y) searches for any objects with 1868 * present(type, map, x, y) searches for any objects with
1861 * a matching type variable at the given map and coordinates. 1869 * a matching type variable at the given map and coordinates.
1862 * The first matching object is returned, or NULL if none. 1870 * The first matching object is returned, or NULL if none.
1863 */ 1871 */
1864
1865object * 1872object *
1866present (unsigned char type, maptile *m, int x, int y) 1873present (unsigned char type, maptile *m, int x, int y)
1867{ 1874{
1868 object *
1869 tmp;
1870
1871 if (out_of_map (m, x, y)) 1875 if (out_of_map (m, x, y))
1872 { 1876 {
1873 LOG (llevError, "Present called outside map.\n"); 1877 LOG (llevError, "Present called outside map.\n");
1874 return NULL; 1878 return NULL;
1875 } 1879 }
1880
1876 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1881 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1877 if (tmp->type == type) 1882 if (tmp->type == type)
1878 return tmp; 1883 return tmp;
1884
1879 return NULL; 1885 return NULL;
1880} 1886}
1881 1887
1882/* 1888/*
1883 * present_in_ob(type, object) searches for any objects with 1889 * present_in_ob(type, object) searches for any objects with
1884 * a matching type variable in the inventory of the given object. 1890 * a matching type variable in the inventory of the given object.
1885 * The first matching object is returned, or NULL if none. 1891 * The first matching object is returned, or NULL if none.
1886 */ 1892 */
1887
1888object * 1893object *
1889present_in_ob (unsigned char type, const object *op) 1894present_in_ob (unsigned char type, const object *op)
1890{ 1895{
1891 object *
1892 tmp;
1893
1894 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1896 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895 if (tmp->type == type) 1897 if (tmp->type == type)
1896 return tmp; 1898 return tmp;
1899
1897 return NULL; 1900 return NULL;
1898} 1901}
1899 1902
1900/* 1903/*
1901 * present_in_ob (type, str, object) searches for any objects with 1904 * present_in_ob (type, str, object) searches for any objects with
… …
1909 * str is the string to match against. Note that we match against 1912 * str is the string to match against. Note that we match against
1910 * the object name, not the archetype name. this is so that the 1913 * the object name, not the archetype name. this is so that the
1911 * spell code can use one object type (force), but change it's name 1914 * spell code can use one object type (force), but change it's name
1912 * to be unique. 1915 * to be unique.
1913 */ 1916 */
1914
1915object * 1917object *
1916present_in_ob_by_name (int type, const char *str, const object *op) 1918present_in_ob_by_name (int type, const char *str, const object *op)
1917{ 1919{
1918 object *
1919 tmp;
1920
1921 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922 {
1923 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1921 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924 return tmp; 1922 return tmp;
1925 } 1923
1926 return NULL; 1924 return 0;
1927} 1925}
1928 1926
1929/* 1927/*
1930 * present_arch_in_ob(archetype, object) searches for any objects with 1928 * present_arch_in_ob(archetype, object) searches for any objects with
1931 * a matching archetype in the inventory of the given object. 1929 * a matching archetype in the inventory of the given object.
1932 * The first matching object is returned, or NULL if none. 1930 * The first matching object is returned, or NULL if none.
1933 */ 1931 */
1934
1935object * 1932object *
1936present_arch_in_ob (const archetype *at, const object *op) 1933present_arch_in_ob (const archetype *at, const object *op)
1937{ 1934{
1938 object *
1939 tmp;
1940
1941 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942 if (tmp->arch == at) 1936 if (tmp->arch == at)
1943 return tmp; 1937 return tmp;
1938
1944 return NULL; 1939 return NULL;
1945} 1940}
1946 1941
1947/* 1942/*
1948 * activate recursively a flag on an object inventory 1943 * activate recursively a flag on an object inventory
1949 */ 1944 */
1950void 1945void
1951flag_inv (object *op, int flag) 1946flag_inv (object *op, int flag)
1952{ 1947{
1953 object *
1954 tmp;
1955
1956 if (op->inv) 1948 if (op->inv)
1957 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1949 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958 { 1950 {
1959 SET_FLAG (tmp, flag); 1951 SET_FLAG (tmp, flag);
1960 flag_inv (tmp, flag); 1952 flag_inv (tmp, flag);
1961 } 1953 }
1962} /* 1954}
1955
1956/*
1963 * desactivate recursively a flag on an object inventory 1957 * deactivate recursively a flag on an object inventory
1964 */ 1958 */
1965void 1959void
1966unflag_inv (object *op, int flag) 1960unflag_inv (object *op, int flag)
1967{ 1961{
1968 object *
1969 tmp;
1970
1971 if (op->inv) 1962 if (op->inv)
1972 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973 { 1964 {
1974 CLEAR_FLAG (tmp, flag); 1965 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 1966 unflag_inv (tmp, flag);
1976 } 1967 }
1977} 1968}
… …
1980 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1971 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981 * all it's inventory (recursively). 1972 * all it's inventory (recursively).
1982 * If checksums are used, a player will get set_cheat called for 1973 * If checksums are used, a player will get set_cheat called for
1983 * him/her-self and all object carried by a call to this function. 1974 * him/her-self and all object carried by a call to this function.
1984 */ 1975 */
1985
1986void 1976void
1987set_cheat (object *op) 1977set_cheat (object *op)
1988{ 1978{
1989 SET_FLAG (op, FLAG_WAS_WIZ); 1979 SET_FLAG (op, FLAG_WAS_WIZ);
1990 flag_inv (op, FLAG_WAS_WIZ); 1980 flag_inv (op, FLAG_WAS_WIZ);
… …
2009 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
2010 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
2011 * the archetype because that isn't correct if the monster has been 2001 * the archetype because that isn't correct if the monster has been
2012 * customized, changed states, etc. 2002 * customized, changed states, etc.
2013 */ 2003 */
2014
2015int 2004int
2016find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017{ 2006{
2018 int
2019 i,
2020 index = 0, flag; 2007 int index = 0, flag;
2021 static int
2022 altern[SIZEOFFREE]; 2008 int altern[SIZEOFFREE];
2023 2009
2024 for (i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
2025 { 2011 {
2026 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2012 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027 if (!flag) 2013 if (!flag)
2028 altern[index++] = i; 2014 altern [index++] = i;
2029 2015
2030 /* Basically, if we find a wall on a space, we cut down the search size. 2016 /* Basically, if we find a wall on a space, we cut down the search size.
2031 * In this way, we won't return spaces that are on another side of a wall. 2017 * In this way, we won't return spaces that are on another side of a wall.
2032 * This mostly work, but it cuts down the search size in all directions - 2018 * This mostly work, but it cuts down the search size in all directions -
2033 * if the space being examined only has a wall to the north and empty 2019 * if the space being examined only has a wall to the north and empty
… …
2049 * find_first_free_spot(archetype, maptile, x, y) works like 2035 * find_first_free_spot(archetype, maptile, x, y) works like
2050 * find_free_spot(), but it will search max number of squares. 2036 * find_free_spot(), but it will search max number of squares.
2051 * But it will return the first available spot, not a random choice. 2037 * But it will return the first available spot, not a random choice.
2052 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2038 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2053 */ 2039 */
2054
2055int 2040int
2056find_first_free_spot (const object *ob, maptile *m, int x, int y) 2041find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057{ 2042{
2058 int
2059 i;
2060
2061 for (i = 0; i < SIZEOFFREE; i++) 2043 for (int i = 0; i < SIZEOFFREE; i++)
2062 {
2063 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2044 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064 return i; 2045 return i;
2065 } 2046
2066 return -1; 2047 return -1;
2067} 2048}
2068 2049
2069/* 2050/*
2070 * The function permute(arr, begin, end) randomly reorders the array 2051 * The function permute(arr, begin, end) randomly reorders the array
2071 * arr[begin..end-1]. 2052 * arr[begin..end-1].
2053 * now uses a fisher-yates shuffle, old permute was broken
2072 */ 2054 */
2073static void 2055static void
2074permute (int *arr, int begin, int end) 2056permute (int *arr, int begin, int end)
2075{ 2057{
2076 int 2058 arr += begin;
2077 i,
2078 j,
2079 tmp,
2080 len;
2081
2082 len = end - begin; 2059 end -= begin;
2083 for (i = begin; i < end; i++)
2084 {
2085 j = begin + RANDOM () % len;
2086 2060
2087 tmp = arr[i]; 2061 while (--end)
2088 arr[i] = arr[j]; 2062 swap (arr [end], arr [RANDOM () % (end + 1)]);
2089 arr[j] = tmp;
2090 }
2091} 2063}
2092 2064
2093/* new function to make monster searching more efficient, and effective! 2065/* new function to make monster searching more efficient, and effective!
2094 * This basically returns a randomized array (in the passed pointer) of 2066 * This basically returns a randomized array (in the passed pointer) of
2095 * the spaces to find monsters. In this way, it won't always look for 2067 * the spaces to find monsters. In this way, it won't always look for
… …
2098 * the 3x3 area will be searched, just not in a predictable order. 2070 * the 3x3 area will be searched, just not in a predictable order.
2099 */ 2071 */
2100void 2072void
2101get_search_arr (int *search_arr) 2073get_search_arr (int *search_arr)
2102{ 2074{
2103 int 2075 int i;
2104 i;
2105 2076
2106 for (i = 0; i < SIZEOFFREE; i++) 2077 for (i = 0; i < SIZEOFFREE; i++)
2107 {
2108 search_arr[i] = i; 2078 search_arr[i] = i;
2109 }
2110 2079
2111 permute (search_arr, 1, SIZEOFFREE1 + 1); 2080 permute (search_arr, 1, SIZEOFFREE1 + 1);
2112 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2081 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2082 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114} 2083}
… …
2123 * Perhaps incorrectly, but I'm making the assumption that exclude 2092 * Perhaps incorrectly, but I'm making the assumption that exclude
2124 * is actually want is going to try and move there. We need this info 2093 * is actually want is going to try and move there. We need this info
2125 * because we have to know what movement the thing looking to move 2094 * because we have to know what movement the thing looking to move
2126 * there is capable of. 2095 * there is capable of.
2127 */ 2096 */
2128
2129int 2097int
2130find_dir (maptile *m, int x, int y, object *exclude) 2098find_dir (maptile *m, int x, int y, object *exclude)
2131{ 2099{
2132 int
2133 i,
2134 max = SIZEOFFREE, mflags; 2100 int i, max = SIZEOFFREE, mflags;
2135 2101
2136 sint16 nx, ny; 2102 sint16 nx, ny;
2137 object * 2103 object *tmp;
2138 tmp;
2139 maptile * 2104 maptile *mp;
2140 mp;
2141 2105
2142 MoveType blocked, move_type; 2106 MoveType blocked, move_type;
2143 2107
2144 if (exclude && exclude->head) 2108 if (exclude && exclude->head)
2145 { 2109 {
… …
2162 2126
2163 if (mflags & P_OUT_OF_MAP) 2127 if (mflags & P_OUT_OF_MAP)
2164 max = maxfree[i]; 2128 max = maxfree[i];
2165 else 2129 else
2166 { 2130 {
2167 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2131 mapspace &ms = mp->at (nx, ny);
2132
2133 blocked = ms.move_block;
2168 2134
2169 if ((move_type & blocked) == move_type) 2135 if ((move_type & blocked) == move_type)
2170 max = maxfree[i]; 2136 max = maxfree[i];
2171 else if (mflags & P_IS_ALIVE) 2137 else if (mflags & P_IS_ALIVE)
2172 { 2138 {
2173 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2139 for (tmp = ms.bot; tmp; tmp = tmp->above)
2174 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2140 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2141 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2175 break; 2142 break;
2176 2143
2177 if (tmp) 2144 if (tmp)
2178 return freedir[i]; 2145 return freedir[i];
2179 } 2146 }
… …
2185 2152
2186/* 2153/*
2187 * distance(object 1, object 2) will return the square of the 2154 * distance(object 1, object 2) will return the square of the
2188 * distance between the two given objects. 2155 * distance between the two given objects.
2189 */ 2156 */
2190
2191int 2157int
2192distance (const object *ob1, const object *ob2) 2158distance (const object *ob1, const object *ob2)
2193{ 2159{
2194 int i;
2195
2196 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2160 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197 return i;
2198} 2161}
2199 2162
2200/* 2163/*
2201 * find_dir_2(delta-x,delta-y) will return a direction in which 2164 * find_dir_2(delta-x,delta-y) will return a direction in which
2202 * an object which has subtracted the x and y coordinates of another 2165 * an object which has subtracted the x and y coordinates of another
2203 * object, needs to travel toward it. 2166 * object, needs to travel toward it.
2204 */ 2167 */
2205
2206int 2168int
2207find_dir_2 (int x, int y) 2169find_dir_2 (int x, int y)
2208{ 2170{
2209 int q; 2171 int q;
2210 2172
… …
2249int 2211int
2250absdir (int d) 2212absdir (int d)
2251{ 2213{
2252 while (d < 1) 2214 while (d < 1)
2253 d += 8; 2215 d += 8;
2216
2254 while (d > 8) 2217 while (d > 8)
2255 d -= 8; 2218 d -= 8;
2219
2256 return d; 2220 return d;
2257} 2221}
2258 2222
2259/* 2223/*
2260 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2262 */ 2226 */
2263 2227
2264int 2228int
2265dirdiff (int dir1, int dir2) 2229dirdiff (int dir1, int dir2)
2266{ 2230{
2267 int 2231 int d;
2268 d;
2269 2232
2270 d = abs (dir1 - dir2); 2233 d = abs (dir1 - dir2);
2271 if (d > 4) 2234 if (d > 4)
2272 d = 8 - d; 2235 d = 8 - d;
2236
2273 return d; 2237 return d;
2274} 2238}
2275 2239
2276/* peterm: 2240/* peterm:
2277 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2241 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2280 * This basically means that if direction is 15, then it could either go 2244 * This basically means that if direction is 15, then it could either go
2281 * direction 4, 14, or 16 to get back to where we are. 2245 * direction 4, 14, or 16 to get back to where we are.
2282 * Moved from spell_util.c to object.c with the other related direction 2246 * Moved from spell_util.c to object.c with the other related direction
2283 * functions. 2247 * functions.
2284 */ 2248 */
2285
2286int
2287 reduction_dir[SIZEOFFREE][3] = { 2249int reduction_dir[SIZEOFFREE][3] = {
2288 {0, 0, 0}, /* 0 */ 2250 {0, 0, 0}, /* 0 */
2289 {0, 0, 0}, /* 1 */ 2251 {0, 0, 0}, /* 1 */
2290 {0, 0, 0}, /* 2 */ 2252 {0, 0, 0}, /* 2 */
2291 {0, 0, 0}, /* 3 */ 2253 {0, 0, 0}, /* 3 */
2292 {0, 0, 0}, /* 4 */ 2254 {0, 0, 0}, /* 4 */
… …
2442/* Basically, we save the content of the string to a temp file, then call */ 2404/* Basically, we save the content of the string to a temp file, then call */
2443/* load_object on it. I admit it is a highly inefficient way to make things, */ 2405/* load_object on it. I admit it is a highly inefficient way to make things, */
2444/* but it was simple to make and allows reusing the load_object function. */ 2406/* but it was simple to make and allows reusing the load_object function. */
2445/* Remember not to use load_object_str in a time-critical situation. */ 2407/* Remember not to use load_object_str in a time-critical situation. */
2446/* Also remember that multiparts objects are not supported for now. */ 2408/* Also remember that multiparts objects are not supported for now. */
2447
2448object * 2409object *
2449load_object_str (const char *obstr) 2410load_object_str (const char *obstr)
2450{ 2411{
2451 object *op; 2412 object *op;
2452 char filename[MAX_BUF]; 2413 char filename[MAX_BUF];
… …
2482 * returns NULL if no match. 2443 * returns NULL if no match.
2483 */ 2444 */
2484object * 2445object *
2485find_obj_by_type_subtype (const object *who, int type, int subtype) 2446find_obj_by_type_subtype (const object *who, int type, int subtype)
2486{ 2447{
2487 object *tmp;
2488
2489 for (tmp = who->inv; tmp; tmp = tmp->below) 2448 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490 if (tmp->type == type && tmp->subtype == subtype) 2449 if (tmp->type == type && tmp->subtype == subtype)
2491 return tmp; 2450 return tmp;
2492 2451
2493 return NULL; 2452 return 0;
2494} 2453}
2495 2454
2496/* If ob has a field named key, return the link from the list, 2455/* If ob has a field named key, return the link from the list,
2497 * otherwise return NULL. 2456 * otherwise return NULL.
2498 * 2457 *
… …
2500 * do the desired thing. 2459 * do the desired thing.
2501 */ 2460 */
2502key_value * 2461key_value *
2503get_ob_key_link (const object *ob, const char *key) 2462get_ob_key_link (const object *ob, const char *key)
2504{ 2463{
2505 key_value *link;
2506
2507 for (link = ob->key_values; link != NULL; link = link->next) 2464 for (key_value *link = ob->key_values; link; link = link->next)
2508 if (link->key == key) 2465 if (link->key == key)
2509 return link; 2466 return link;
2510 2467
2511 return NULL; 2468 return 0;
2512} 2469}
2513 2470
2514/* 2471/*
2515 * Returns the value of op has an extra_field for key, or NULL. 2472 * Returns the value of op has an extra_field for key, or NULL.
2516 * 2473 *
… …
2556 * Returns TRUE on success. 2513 * Returns TRUE on success.
2557 */ 2514 */
2558int 2515int
2559set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2516set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560{ 2517{
2561 key_value *
2562 field = NULL, *last = NULL; 2518 key_value *field = NULL, *last = NULL;
2563 2519
2564 for (field = op->key_values; field != NULL; field = field->next) 2520 for (field = op->key_values; field != NULL; field = field->next)
2565 { 2521 {
2566 if (field->key != canonical_key) 2522 if (field->key != canonical_key)
2567 { 2523 {
… …
2595 /* IF we get here, key doesn't exist */ 2551 /* IF we get here, key doesn't exist */
2596 2552
2597 /* No field, we'll have to add it. */ 2553 /* No field, we'll have to add it. */
2598 2554
2599 if (!add_key) 2555 if (!add_key)
2600 {
2601 return FALSE; 2556 return FALSE;
2602 } 2557
2603 /* There isn't any good reason to store a null 2558 /* There isn't any good reason to store a null
2604 * value in the key/value list. If the archetype has 2559 * value in the key/value list. If the archetype has
2605 * this key, then we should also have it, so shouldn't 2560 * this key, then we should also have it, so shouldn't
2606 * be here. If user wants to store empty strings, 2561 * be here. If user wants to store empty strings,
2607 * should pass in "" 2562 * should pass in ""

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines