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.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC

… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
522 tail = new_link; 522 tail = new_link;
523 } 523 }
524 } 524 }
525 } 525 }
526 526
527 update_ob_speed (dst); 527 dst->set_speed (dst->speed);
528} 528}
529 529
530object * 530object *
531object::clone () 531object::clone ()
532{ 532{
… …
554 * Updates the speed of an object. If the speed changes from 0 to another 554 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 555 * value, or vice versa, then add/remove the object from the active list.
556 * This function needs to be called whenever the speed of an object changes. 556 * This function needs to be called whenever the speed of an object changes.
557 */ 557 */
558void 558void
559update_ob_speed (object *op) 559object::set_speed (float speed)
560{ 560{
561 extern int arch_init; 561 extern int arch_init;
562 562
563 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated. 564 * since they never really need to be updated.
565 */ 565 */
566 566 if (flag [FLAG_FREED] && speed)
567 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568 { 567 {
569 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
570#ifdef MANY_CORES
571 abort ();
572#else
573 op->speed = 0; 569 speed = 0;
574#endif
575 } 570 }
571
572 this->speed = speed;
576 573
577 if (arch_init) 574 if (arch_init)
578 return; 575 return;
579 576
580 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
581 { 578 {
582 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
583 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
584 return; 581 return;
585 582
586 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
587 * of the list. */ 584 * of the list. */
588 op->active_next = active_objects; 585 active_next = active_objects;
589 586
590 if (op->active_next != NULL) 587 if (active_next)
591 op->active_next->active_prev = op; 588 active_next->active_prev = this;
592 589
593 active_objects = op; 590 active_objects = this;
594 } 591 }
595 else 592 else
596 { 593 {
597 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
598 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
599 return; 596 return;
600 597
601 if (op->active_prev == NULL) 598 if (!active_prev)
602 { 599 {
603 active_objects = op->active_next; 600 active_objects = active_next;
604 601
605 if (op->active_next != NULL) 602 if (active_next)
606 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
607 } 604 }
608 else 605 else
609 { 606 {
610 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
611 608
612 if (op->active_next) 609 if (active_next)
613 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
614 } 611 }
615 612
616 op->active_next = NULL; 613 active_next = 0;
617 op->active_prev = NULL; 614 active_prev = 0;
618 } 615 }
619} 616}
620 617
621/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
622 * objects. 619 * objects.
… …
691 */ 688 */
692 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
693 return; 690 return;
694 691
695 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
696 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
697 { 694 {
698 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
699#ifdef MANY_CORES 696#ifdef MANY_CORES
700 abort (); 697 abort ();
701#endif 698#endif
… …
788 object *op = new object; 785 object *op = new object;
789 op->link (); 786 op->link ();
790 return op; 787 return op;
791} 788}
792 789
793/*
794 * free_object() frees everything allocated by an object, removes
795 * it from the list of used objects, and puts it on the list of
796 * free objects. The IS_FREED() flag is set in the object.
797 * The object must have been removed by remove_ob() first for
798 * this function to succeed.
799 *
800 * If destroy_inventory is set, free inventory as well. Else drop items in
801 * inventory to the ground.
802 */
803void 790void
804object::do_destroy () 791object::do_destroy ()
805{ 792{
806 attachable::do_destroy (); 793 attachable::do_destroy ();
807 794
… …
816 803
817 if (flag [FLAG_FREED]) 804 if (flag [FLAG_FREED])
818 return; 805 return;
819 806
820 flag [FLAG_FREED] = 1; 807 flag [FLAG_FREED] = 1;
808
809 while (inv)
810 inv->destroy ();
811
812 set_speed (0);
813 unlink ();
821 814
822 // hack to ensure that freed objects still have a valid map 815 // hack to ensure that freed objects still have a valid map
823 { 816 {
824 static maptile *freed_map; // freed objects are moved here to avoid crashes 817 static maptile *freed_map; // freed objects are moved here to avoid crashes
825 818
… …
837 map = freed_map; 830 map = freed_map;
838 x = 1; 831 x = 1;
839 y = 1; 832 y = 1;
840 } 833 }
841 834
842 more = 0;
843 head = 0; 835 head = 0;
844 inv = 0; 836
837 if (more)
838 {
839 more->destroy ();
840 more = 0;
841 }
845 842
846 // clear those pointers that likely might have circular references to us 843 // clear those pointers that likely might have circular references to us
847 owner = 0; 844 owner = 0;
848 enemy = 0; 845 enemy = 0;
849 attacked_by = 0; 846 attacked_by = 0;
850 847
851 // only relevant for players(?), but make sure of it anyways 848 // only relevant for players(?), but make sure of it anyways
852 contr = 0; 849 contr = 0;
853
854 /* Remove object from the active list */
855 speed = 0;
856 update_ob_speed (this);
857
858 unlink ();
859} 850}
860 851
861/* 852/*
862 * Remove and free all objects in the inventory of the given object. 853 * Remove and free all objects in the inventory of the given object.
863 * object.c ? 854 * object.c ?
864 */ 855 */
865void 856void
866object::destroy_inv (bool drop_to_ground) 857object::destroy_inv (bool drop_to_ground)
867{ 858{
868 if (!inv)
869 return;
870
871 /* Only if the space blocks everything do we not process - 859 /* Only if the space blocks everything do we not process -
872 * if some form of movement is allowed, let objects 860 * if some form of movement is allowed, let objects
873 * drop on that space. 861 * drop on that space.
874 */ 862 */
875 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 863 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
876 { 864 {
877 while (inv) 865 while (inv)
878 {
879 inv->destroy_inv (drop_to_ground);
880 inv->destroy (); 866 inv->destroy ();
881 }
882 } 867 }
883 else 868 else
884 { /* Put objects in inventory onto this space */ 869 { /* Put objects in inventory onto this space */
885 while (inv) 870 while (inv)
886 { 871 {
… …
906void 891void
907object::destroy (bool destroy_inventory) 892object::destroy (bool destroy_inventory)
908{ 893{
909 if (destroyed ()) 894 if (destroyed ())
910 return; 895 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 896
919 if (destroy_inventory) 897 if (destroy_inventory)
920 destroy_inv (true); 898 destroy_inv (true);
921 899
922 attachable::destroy (); 900 attachable::destroy ();
… …
1027 dump = dump_object (GET_MAP_OB (map, x, y)); 1005 dump = dump_object (GET_MAP_OB (map, x, y));
1028 LOG (llevError, "%s\n", dump); 1006 LOG (llevError, "%s\n", dump);
1029 free (dump); 1007 free (dump);
1030 } 1008 }
1031 1009
1032 map->at (x, y).bottom = above; /* goes on above it. */ 1010 map->at (x, y).bot = above; /* goes on above it. */
1033 } 1011 }
1034 1012
1035 above = 0; 1013 above = 0;
1036 below = 0; 1014 below = 0;
1037 1015
… …
1281 op->below = originator->below; 1259 op->below = originator->below;
1282 1260
1283 if (op->below) 1261 if (op->below)
1284 op->below->above = op; 1262 op->below->above = op;
1285 else 1263 else
1286 op->ms ().bottom = op; 1264 op->ms ().bot = op;
1287 1265
1288 /* since *below* originator, no need to update top */ 1266 /* since *below* originator, no need to update top */
1289 originator->below = op; 1267 originator->below = op;
1290 } 1268 }
1291 else 1269 else
… …
1370 1348
1371 if (op->above) 1349 if (op->above)
1372 op->above->below = op; 1350 op->above->below = op;
1373 1351
1374 op->below = NULL; 1352 op->below = NULL;
1375 op->ms ().bottom = op; 1353 op->ms ().bot = op;
1376 } 1354 }
1377 else 1355 else
1378 { /* get inserted into the stack above top */ 1356 { /* get inserted into the stack above top */
1379 op->above = top->above; 1357 op->above = top->above;
1380 1358
… …
1407 * be far away from this change and not affected in any way - 1385 * be far away from this change and not affected in any way -
1408 * this should get redone to only look for players within range, 1386 * this should get redone to only look for players within range,
1409 * or just updating the P_NEED_UPDATE for spaces within this area 1387 * or just updating the P_NEED_UPDATE for spaces within this area
1410 * of effect may be sufficient. 1388 * of effect may be sufficient.
1411 */ 1389 */
1412 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1390 if (op->map->darkness && (op->glow_radius != 0))
1413 update_all_los (op->map, op->x, op->y); 1391 update_all_los (op->map, op->x, op->y);
1414 1392
1415 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1393 /* updates flags (blocked, alive, no magic, etc) for this map space */
1416 update_object (op, UP_OBJ_INSERT); 1394 update_object (op, UP_OBJ_INSERT);
1417 1395
… …
1703 if ((op->glow_radius != 0) && map) 1681 if ((op->glow_radius != 0) && map)
1704 { 1682 {
1705#ifdef DEBUG_LIGHTS 1683#ifdef DEBUG_LIGHTS
1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1684 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707#endif /* DEBUG_LIGHTS */ 1685#endif /* DEBUG_LIGHTS */
1708 if (MAP_DARKNESS (map)) 1686 if (map->darkness)
1709 update_all_los (map, x, y); 1687 update_all_los (map, x, y);
1710 } 1688 }
1711 1689
1712 /* Client has no idea of ordering so lets not bother ordering it here. 1690 /* Client has no idea of ordering so lets not bother ordering it here.
1713 * It sure simplifies this function... 1691 * It sure simplifies this function...
… …
1781 1759
1782 /* The objects have to be checked from top to bottom. 1760 /* The objects have to be checked from top to bottom.
1783 * Hence, we first go to the top: 1761 * Hence, we first go to the top:
1784 */ 1762 */
1785 1763
1786 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1764 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1787 { 1765 {
1788 /* Trim the search when we find the first other spell effect 1766 /* Trim the search when we find the first other spell effect
1789 * this helps performance so that if a space has 50 spell objects, 1767 * this helps performance so that if a space has 50 spell objects,
1790 * we don't need to check all of them. 1768 * we don't need to check all of them.
1791 */ 1769 */
… …
1846/* 1824/*
1847 * present_arch(arch, map, x, y) searches for any objects with 1825 * present_arch(arch, map, x, y) searches for any objects with
1848 * a matching archetype at the given map and coordinates. 1826 * a matching archetype at the given map and coordinates.
1849 * The first matching object is returned, or NULL if none. 1827 * The first matching object is returned, or NULL if none.
1850 */ 1828 */
1851
1852object * 1829object *
1853present_arch (const archetype *at, maptile *m, int x, int y) 1830present_arch (const archetype *at, maptile *m, int x, int y)
1854{ 1831{
1855 object *
1856 tmp;
1857
1858 if (m == NULL || out_of_map (m, x, y)) 1832 if (m == NULL || out_of_map (m, x, y))
1859 { 1833 {
1860 LOG (llevError, "Present_arch called outside map.\n"); 1834 LOG (llevError, "Present_arch called outside map.\n");
1861 return NULL; 1835 return NULL;
1862 } 1836 }
1837
1863 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1838 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1864 if (tmp->arch == at) 1839 if (tmp->arch == at)
1865 return tmp; 1840 return tmp;
1841
1866 return NULL; 1842 return NULL;
1867} 1843}
1868 1844
1869/* 1845/*
1870 * present(type, map, x, y) searches for any objects with 1846 * present(type, map, x, y) searches for any objects with
1871 * a matching type variable at the given map and coordinates. 1847 * a matching type variable at the given map and coordinates.
1872 * The first matching object is returned, or NULL if none. 1848 * The first matching object is returned, or NULL if none.
1873 */ 1849 */
1874
1875object * 1850object *
1876present (unsigned char type, maptile *m, int x, int y) 1851present (unsigned char type, maptile *m, int x, int y)
1877{ 1852{
1878 object *
1879 tmp;
1880
1881 if (out_of_map (m, x, y)) 1853 if (out_of_map (m, x, y))
1882 { 1854 {
1883 LOG (llevError, "Present called outside map.\n"); 1855 LOG (llevError, "Present called outside map.\n");
1884 return NULL; 1856 return NULL;
1885 } 1857 }
1858
1886 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1859 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1887 if (tmp->type == type) 1860 if (tmp->type == type)
1888 return tmp; 1861 return tmp;
1862
1889 return NULL; 1863 return NULL;
1890} 1864}
1891 1865
1892/* 1866/*
1893 * present_in_ob(type, object) searches for any objects with 1867 * present_in_ob(type, object) searches for any objects with
1894 * a matching type variable in the inventory of the given object. 1868 * a matching type variable in the inventory of the given object.
1895 * The first matching object is returned, or NULL if none. 1869 * The first matching object is returned, or NULL if none.
1896 */ 1870 */
1897
1898object * 1871object *
1899present_in_ob (unsigned char type, const object *op) 1872present_in_ob (unsigned char type, const object *op)
1900{ 1873{
1901 object *
1902 tmp;
1903
1904 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1874 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905 if (tmp->type == type) 1875 if (tmp->type == type)
1906 return tmp; 1876 return tmp;
1877
1907 return NULL; 1878 return NULL;
1908} 1879}
1909 1880
1910/* 1881/*
1911 * present_in_ob (type, str, object) searches for any objects with 1882 * present_in_ob (type, str, object) searches for any objects with
… …
1922 * to be unique. 1893 * to be unique.
1923 */ 1894 */
1924object * 1895object *
1925present_in_ob_by_name (int type, const char *str, const object *op) 1896present_in_ob_by_name (int type, const char *str, const object *op)
1926{ 1897{
1927 object *tmp;
1928
1929 for (tmp = op->inv; tmp; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1899 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931 return tmp; 1900 return tmp;
1932 1901
1933 return 0; 1902 return 0;
1934} 1903}
… …
2143 2112
2144 if ((move_type & blocked) == move_type) 2113 if ((move_type & blocked) == move_type)
2145 max = maxfree[i]; 2114 max = maxfree[i];
2146 else if (mflags & P_IS_ALIVE) 2115 else if (mflags & P_IS_ALIVE)
2147 { 2116 {
2148 for (tmp = ms.bottom; tmp; tmp = tmp->above) 2117 for (tmp = ms.bot; tmp; tmp = tmp->above)
2149 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2118 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2119 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2151 break; 2120 break;
2152 2121
2153 if (tmp) 2122 if (tmp)

Diff Legend

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