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.101 by root, Mon Jan 1 17:30:33 2007 UTC vs.
Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
… …
390} 392}
391 393
392/* 394/*
393 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
394 */ 396 */
395
396object * 397object *
397find_object (tag_t i) 398find_object (tag_t i)
398{ 399{
399 for (object *op = object::first; op; op = op->next) 400 return ((unsigned int)i) < objects.size ()
400 if (op->count == i) 401 ? objects [i]
401 return op; 402 : 0;
402
403 return 0;
404} 403}
405 404
406/* 405/*
407 * Returns the first object which has a name equal to the argument. 406 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 407 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 408 * Enables features like "patch <name-of-other-player> food 999"
410 */ 409 */
411
412object * 410object *
413find_object_name (const char *str) 411find_object_name (const char *str)
414{ 412{
415 shstr_cmp str_ (str); 413 shstr_cmp str_ (str);
416 object *op; 414 object *op;
417 415
418 for (op = object::first; op != NULL; op = op->next) 416 for_all_objects (op)
419 if (op->name == str_) 417 if (op->name == str_)
420 break; 418 break;
421 419
422 return op; 420 return op;
423} 421}
… …
677 free_key_values (this); 675 free_key_values (this);
678} 676}
679 677
680void object::link () 678void object::link ()
681{ 679{
682 count = ++ob_count; 680 assert (!count);//D
683 uuid = gen_uuid (); 681 uuid = gen_uuid ();
684 682
685 prev = 0; 683 refcnt_inc ();
686 next = object::first; 684 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 685}
693 686
694void object::unlink () 687void object::unlink ()
695{ 688{
696 if (this == object::first) 689 assert (count);//D
697 object::first = next; 690 objects.erase (this);
698 691 refcnt_dec ();
699 /* Remove this object from the list of used objects */
700 if (prev) prev->next = next;
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 692}
712 693
713void 694void
714object::activate () 695object::activate ()
715{ 696{
716 /* If already on active list, don't do anything */ 697 /* If already on active list, don't do anything */
717 if (active ()) 698 if (active)
718 return; 699 return;
719 700
720 if (has_active_speed ()) 701 if (has_active_speed ())
721 { 702 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 703}
732 704
733void 705void
734object::activate_recursive () 706object::activate_recursive ()
735{ 707{
736 activate (); 708 activate ();
737 709
738 for (object *op = inv; op; op = op->above) 710 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 711 op->activate_recursive ();
740} 712}
741 713
742/* This function removes object 'op' from the list of active 714/* This function removes object 'op' from the list of active
743 * objects. 715 * objects.
… …
749 */ 721 */
750void 722void
751object::deactivate () 723object::deactivate ()
752{ 724{
753 /* If not on the active list, nothing needs to be done */ 725 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 726 if (!active)
755 return; 727 return;
756 728
757 if (active_prev == 0) 729 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 730}
773 731
774void 732void
775object::deactivate_recursive () 733object::deactivate_recursive ()
776{ 734{
777 for (object *op = inv; op; op = op->above) 735 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 736 op->deactivate_recursive ();
779 737
780 deactivate (); 738 deactivate ();
739}
740
741void
742object::set_flag_inv (int flag, int value)
743{
744 for (object *op = inv; op; op = op->below)
745 {
746 op->flag [flag] = value;
747 op->set_flag_inv (flag, value);
748 }
781} 749}
782 750
783/* 751/*
784 * Remove and free all objects in the inventory of the given object. 752 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 753 * object.c ?
… …
818 786
819 if (op->flag [FLAG_STARTEQUIP] 787 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 788 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 789 || op->type == RUNE
822 || op->type == TRAP 790 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 791 || op->flag [FLAG_IS_A_TEMPLATE]
792 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 793 op->destroy ();
825 else 794 else
826 map->insert (op, x, y); 795 map->insert (op, x, y);
827 } 796 }
828 } 797 }
… …
870 freed_map->name = "/internal/freed_objects_map"; 839 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 840 freed_map->width = 3;
872 freed_map->height = 3; 841 freed_map->height = 3;
873 842
874 freed_map->alloc (); 843 freed_map->alloc ();
844 freed_map->in_memory = MAP_IN_MEMORY;
875 } 845 }
876 846
877 map = freed_map; 847 map = freed_map;
878 x = 1; 848 x = 1;
879 y = 1; 849 y = 1;
… …
889 859
890 // clear those pointers that likely might have circular references to us 860 // clear those pointers that likely might have circular references to us
891 owner = 0; 861 owner = 0;
892 enemy = 0; 862 enemy = 0;
893 attacked_by = 0; 863 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 864}
898 865
899void 866void
900object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
901{ 868{
… …
1203 { 1170 {
1204 /* The part may be on a different map. */ 1171 /* The part may be on a different map. */
1205 1172
1206 object *more = op->more; 1173 object *more = op->more;
1207 1174
1208 /* We really need the caller to normalize coordinates - if 1175 /* We really need the caller to normalise coordinates - if
1209 * we set the map, that doesn't work if the location is within 1176 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate 1177 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it. 1178 * is clear wrong do we normalise it.
1212 */ 1179 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y); 1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map) 1182 else if (!more->map)
1216 { 1183 {
… …
1443{ 1410{
1444 object *tmp, *tmp1; 1411 object *tmp, *tmp1;
1445 1412
1446 /* first search for itself and remove any old instances */ 1413 /* first search for itself and remove any old instances */
1447 1414
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1415 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1416 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1450 tmp->destroy (); 1417 tmp->destroy ();
1451 1418
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1419 tmp1 = arch_to_object (archetype::find (arch_string));
1453 1420
… …
1776 1743
1777 /* The objects have to be checked from top to bottom. 1744 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1745 * Hence, we first go to the top:
1779 */ 1746 */
1780 1747
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1748 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1749 {
1783 /* Trim the search when we find the first other spell effect 1750 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1751 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1752 * we don't need to check all of them.
1786 */ 1753 */
… …
1844 * The first matching object is returned, or NULL if none. 1811 * The first matching object is returned, or NULL if none.
1845 */ 1812 */
1846object * 1813object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1814present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1815{
1849 if (m == NULL || out_of_map (m, x, y)) 1816 if (!m || out_of_map (m, x, y))
1850 { 1817 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1818 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1819 return NULL;
1853 } 1820 }
1854 1821
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1822 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1823 if (tmp->arch == at)
1857 return tmp; 1824 return tmp;
1858 1825
1859 return NULL; 1826 return NULL;
1860} 1827}
… …
1871 { 1838 {
1872 LOG (llevError, "Present called outside map.\n"); 1839 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1840 return NULL;
1874 } 1841 }
1875 1842
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1843 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1844 if (tmp->type == type)
1878 return tmp; 1845 return tmp;
1879 1846
1880 return NULL; 1847 return NULL;
1881} 1848}
… …
2662} 2629}
2663 2630
2664const char * 2631const char *
2665object::debug_desc () const 2632object::debug_desc () const
2666{ 2633{
2667 static char info[256 * 3]; 2634 static char info[256 * 4];
2668 return debug_desc (info); 2635 return debug_desc (info);
2669} 2636}
2670 2637

Diff Legend

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