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.83 by root, Mon Dec 25 14:43:22 2006 UTC vs.
Revision 1.87 by root, Tue Dec 26 08:54:59 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.
… …
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
… …
850 837
851 // only relevant for players(?), but make sure of it anyways 838 // only relevant for players(?), but make sure of it anyways
852 contr = 0; 839 contr = 0;
853 840
854 /* Remove object from the active list */ 841 /* Remove object from the active list */
855 speed = 0; 842 set_speed (0);
856 update_ob_speed (this);
857 843
858 unlink (); 844 unlink ();
859} 845}
860 846
861/* 847/*
… …
1027 dump = dump_object (GET_MAP_OB (map, x, y)); 1013 dump = dump_object (GET_MAP_OB (map, x, y));
1028 LOG (llevError, "%s\n", dump); 1014 LOG (llevError, "%s\n", dump);
1029 free (dump); 1015 free (dump);
1030 } 1016 }
1031 1017
1032 map->at (x, y).bottom = above; /* goes on above it. */ 1018 map->at (x, y).bot = above; /* goes on above it. */
1033 } 1019 }
1034 1020
1035 above = 0; 1021 above = 0;
1036 below = 0; 1022 below = 0;
1037 1023
… …
1281 op->below = originator->below; 1267 op->below = originator->below;
1282 1268
1283 if (op->below) 1269 if (op->below)
1284 op->below->above = op; 1270 op->below->above = op;
1285 else 1271 else
1286 op->ms ().bottom = op; 1272 op->ms ().bot = op;
1287 1273
1288 /* since *below* originator, no need to update top */ 1274 /* since *below* originator, no need to update top */
1289 originator->below = op; 1275 originator->below = op;
1290 } 1276 }
1291 else 1277 else
… …
1370 1356
1371 if (op->above) 1357 if (op->above)
1372 op->above->below = op; 1358 op->above->below = op;
1373 1359
1374 op->below = NULL; 1360 op->below = NULL;
1375 op->ms ().bottom = op; 1361 op->ms ().bot = op;
1376 } 1362 }
1377 else 1363 else
1378 { /* get inserted into the stack above top */ 1364 { /* get inserted into the stack above top */
1379 op->above = top->above; 1365 op->above = top->above;
1380 1366
… …
1407 * be far away from this change and not affected in any way - 1393 * be far away from this change and not affected in any way -
1408 * this should get redone to only look for players within range, 1394 * this should get redone to only look for players within range,
1409 * or just updating the P_NEED_UPDATE for spaces within this area 1395 * or just updating the P_NEED_UPDATE for spaces within this area
1410 * of effect may be sufficient. 1396 * of effect may be sufficient.
1411 */ 1397 */
1412 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1398 if (op->map->darkness && (op->glow_radius != 0))
1413 update_all_los (op->map, op->x, op->y); 1399 update_all_los (op->map, op->x, op->y);
1414 1400
1415 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1401 /* updates flags (blocked, alive, no magic, etc) for this map space */
1416 update_object (op, UP_OBJ_INSERT); 1402 update_object (op, UP_OBJ_INSERT);
1417 1403
… …
1703 if ((op->glow_radius != 0) && map) 1689 if ((op->glow_radius != 0) && map)
1704 { 1690 {
1705#ifdef DEBUG_LIGHTS 1691#ifdef DEBUG_LIGHTS
1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1692 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707#endif /* DEBUG_LIGHTS */ 1693#endif /* DEBUG_LIGHTS */
1708 if (MAP_DARKNESS (map)) 1694 if (map->darkness)
1709 update_all_los (map, x, y); 1695 update_all_los (map, x, y);
1710 } 1696 }
1711 1697
1712 /* Client has no idea of ordering so lets not bother ordering it here. 1698 /* Client has no idea of ordering so lets not bother ordering it here.
1713 * It sure simplifies this function... 1699 * It sure simplifies this function...
… …
1781 1767
1782 /* The objects have to be checked from top to bottom. 1768 /* The objects have to be checked from top to bottom.
1783 * Hence, we first go to the top: 1769 * Hence, we first go to the top:
1784 */ 1770 */
1785 1771
1786 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1787 { 1773 {
1788 /* Trim the search when we find the first other spell effect 1774 /* Trim the search when we find the first other spell effect
1789 * this helps performance so that if a space has 50 spell objects, 1775 * this helps performance so that if a space has 50 spell objects,
1790 * we don't need to check all of them. 1776 * we don't need to check all of them.
1791 */ 1777 */
… …
1846/* 1832/*
1847 * present_arch(arch, map, x, y) searches for any objects with 1833 * present_arch(arch, map, x, y) searches for any objects with
1848 * a matching archetype at the given map and coordinates. 1834 * a matching archetype at the given map and coordinates.
1849 * The first matching object is returned, or NULL if none. 1835 * The first matching object is returned, or NULL if none.
1850 */ 1836 */
1851
1852object * 1837object *
1853present_arch (const archetype *at, maptile *m, int x, int y) 1838present_arch (const archetype *at, maptile *m, int x, int y)
1854{ 1839{
1855 object *
1856 tmp;
1857
1858 if (m == NULL || out_of_map (m, x, y)) 1840 if (m == NULL || out_of_map (m, x, y))
1859 { 1841 {
1860 LOG (llevError, "Present_arch called outside map.\n"); 1842 LOG (llevError, "Present_arch called outside map.\n");
1861 return NULL; 1843 return NULL;
1862 } 1844 }
1845
1863 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1846 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1864 if (tmp->arch == at) 1847 if (tmp->arch == at)
1865 return tmp; 1848 return tmp;
1849
1866 return NULL; 1850 return NULL;
1867} 1851}
1868 1852
1869/* 1853/*
1870 * present(type, map, x, y) searches for any objects with 1854 * present(type, map, x, y) searches for any objects with
1871 * a matching type variable at the given map and coordinates. 1855 * a matching type variable at the given map and coordinates.
1872 * The first matching object is returned, or NULL if none. 1856 * The first matching object is returned, or NULL if none.
1873 */ 1857 */
1874
1875object * 1858object *
1876present (unsigned char type, maptile *m, int x, int y) 1859present (unsigned char type, maptile *m, int x, int y)
1877{ 1860{
1878 object *
1879 tmp;
1880
1881 if (out_of_map (m, x, y)) 1861 if (out_of_map (m, x, y))
1882 { 1862 {
1883 LOG (llevError, "Present called outside map.\n"); 1863 LOG (llevError, "Present called outside map.\n");
1884 return NULL; 1864 return NULL;
1885 } 1865 }
1866
1886 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1867 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1887 if (tmp->type == type) 1868 if (tmp->type == type)
1888 return tmp; 1869 return tmp;
1870
1889 return NULL; 1871 return NULL;
1890} 1872}
1891 1873
1892/* 1874/*
1893 * present_in_ob(type, object) searches for any objects with 1875 * present_in_ob(type, object) searches for any objects with
1894 * a matching type variable in the inventory of the given object. 1876 * a matching type variable in the inventory of the given object.
1895 * The first matching object is returned, or NULL if none. 1877 * The first matching object is returned, or NULL if none.
1896 */ 1878 */
1897
1898object * 1879object *
1899present_in_ob (unsigned char type, const object *op) 1880present_in_ob (unsigned char type, const object *op)
1900{ 1881{
1901 object *
1902 tmp;
1903
1904 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1882 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905 if (tmp->type == type) 1883 if (tmp->type == type)
1906 return tmp; 1884 return tmp;
1885
1907 return NULL; 1886 return NULL;
1908} 1887}
1909 1888
1910/* 1889/*
1911 * present_in_ob (type, str, object) searches for any objects with 1890 * present_in_ob (type, str, object) searches for any objects with
… …
1922 * to be unique. 1901 * to be unique.
1923 */ 1902 */
1924object * 1903object *
1925present_in_ob_by_name (int type, const char *str, const object *op) 1904present_in_ob_by_name (int type, const char *str, const object *op)
1926{ 1905{
1927 object *tmp;
1928
1929 for (tmp = op->inv; tmp; tmp = tmp->below) 1906 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1907 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931 return tmp; 1908 return tmp;
1932 1909
1933 return 0; 1910 return 0;
1934} 1911}
… …
2143 2120
2144 if ((move_type & blocked) == move_type) 2121 if ((move_type & blocked) == move_type)
2145 max = maxfree[i]; 2122 max = maxfree[i];
2146 else if (mflags & P_IS_ALIVE) 2123 else if (mflags & P_IS_ALIVE)
2147 { 2124 {
2148 for (tmp = ms.bottom; tmp; tmp = tmp->above) 2125 for (tmp = ms.bot; tmp; tmp = tmp->above)
2149 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2127 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2151 break; 2128 break;
2152 2129
2153 if (tmp) 2130 if (tmp)

Diff Legend

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