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.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 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 for_all_objects (op)
400 if (op->count == i) 401 if (op->count == i)
401 return op; 402 return op;
402 403
403 return 0; 404 return 0;
404} 405}
405 406
406/* 407/*
407 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
410 */ 411 */
411
412object * 412object *
413find_object_name (const char *str) 413find_object_name (const char *str)
414{ 414{
415 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
416 object *op; 416 object *op;
417 417
418 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
419 if (op->name == str_) 419 if (op->name == str_)
420 break; 420 break;
421 421
422 return op; 422 return op;
423} 423}
… …
675object::~object () 675object::~object ()
676{ 676{
677 free_key_values (this); 677 free_key_values (this);
678} 678}
679 679
680static int object_count;
681
680void object::link () 682void object::link ()
681{ 683{
682 count = ++ob_count; 684 assert (!index);//D
683 uuid = gen_uuid (); 685 uuid = gen_uuid ();
686 count = ++object_count;
684 687
685 prev = 0; 688 refcnt_inc ();
686 next = object::first; 689 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 690}
693 691
694void object::unlink () 692void object::unlink ()
695{ 693{
696 if (this == object::first) 694 assert (index);//D
697 object::first = next; 695 objects.erase (this);
698 696 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} 697}
712 698
713void 699void
714object::activate () 700object::activate ()
715{ 701{
716 /* If already on active list, don't do anything */ 702 /* If already on active list, don't do anything */
717 if (active ()) 703 if (active)
718 return; 704 return;
719 705
720 if (has_active_speed ()) 706 if (has_active_speed ())
721 { 707 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} 708}
732 709
733void 710void
734object::activate_recursive () 711object::activate_recursive ()
735{ 712{
… …
749 */ 726 */
750void 727void
751object::deactivate () 728object::deactivate ()
752{ 729{
753 /* If not on the active list, nothing needs to be done */ 730 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 731 if (!active)
755 return; 732 return;
756 733
757 if (active_prev == 0) 734 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} 735}
773 736
774void 737void
775object::deactivate_recursive () 738object::deactivate_recursive ()
776{ 739{
777 for (object *op = inv; op; op = op->below) 740 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 741 op->deactivate_recursive ();
779 742
780 deactivate (); 743 deactivate ();
744}
745
746void
747object::set_flag_inv (int flag, int value)
748{
749 for (object *op = inv; op; op = op->below)
750 {
751 op->flag [flag] = value;
752 op->set_flag_inv (flag, value);
753 }
781} 754}
782 755
783/* 756/*
784 * Remove and free all objects in the inventory of the given object. 757 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 758 * object.c ?
… …
818 791
819 if (op->flag [FLAG_STARTEQUIP] 792 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 793 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 794 || op->type == RUNE
822 || op->type == TRAP 795 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 796 || op->flag [FLAG_IS_A_TEMPLATE]
797 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 798 op->destroy ();
825 else 799 else
826 map->insert (op, x, y); 800 map->insert (op, x, y);
827 } 801 }
828 } 802 }
… …
836} 810}
837 811
838void 812void
839object::do_destroy () 813object::do_destroy ()
840{ 814{
815 attachable::do_destroy ();
816
841 if (flag [FLAG_IS_LINKED]) 817 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 818 remove_button_link (this);
843 819
844 if (flag [FLAG_FRIENDLY]) 820 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 821 remove_friendly_object (this);
846 822
847 if (!flag [FLAG_REMOVED]) 823 if (!flag [FLAG_REMOVED])
848 remove (); 824 remove ();
849 825
850 if (flag [FLAG_FREED]) 826 destroy_inv (true);
851 return;
852 827
853 set_speed (0); 828 deactivate ();
829 unlink ();
854 830
855 flag [FLAG_FREED] = 1; 831 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 832
862 // hack to ensure that freed objects still have a valid map 833 // hack to ensure that freed objects still have a valid map
863 { 834 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 835 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 836
… …
890 861
891 // clear those pointers that likely might have circular references to us 862 // clear those pointers that likely might have circular references to us
892 owner = 0; 863 owner = 0;
893 enemy = 0; 864 enemy = 0;
894 attacked_by = 0; 865 attacked_by = 0;
895
896 // only relevant for players(?), but make sure of it anyways
897 contr = 0;
898} 866}
899 867
900void 868void
901object::destroy (bool destroy_inventory) 869object::destroy (bool destroy_inventory)
902{ 870{
… …
1204 { 1172 {
1205 /* The part may be on a different map. */ 1173 /* The part may be on a different map. */
1206 1174
1207 object *more = op->more; 1175 object *more = op->more;
1208 1176
1209 /* We really need the caller to normalize coordinates - if 1177 /* We really need the caller to normalise coordinates - if
1210 * we set the map, that doesn't work if the location is within 1178 * we set the map, that doesn't work if the location is within
1211 * a map and this is straddling an edge. So only if coordinate 1179 * a map and this is straddling an edge. So only if coordinate
1212 * is clear wrong do we normalize it. 1180 * is clear wrong do we normalise it.
1213 */ 1181 */
1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215 more->map = get_map_from_coord (m, &more->x, &more->y); 1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1216 else if (!more->map) 1184 else if (!more->map)
1217 { 1185 {

Diff Legend

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