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.109 by root, Sun Jan 7 21:54:59 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;
683 uuid = gen_uuid (); 680 uuid = gen_uuid ();
684 681
685 prev = 0; 682 refcnt_inc ();
686 next = object::first; 683 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 684}
693 685
694void object::unlink () 686void object::unlink ()
695{ 687{
696 if (this == object::first) 688 objects.erase (this);
697 object::first = next; 689 refcnt_dec ();
698
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} 690}
712 691
713void 692void
714object::activate () 693object::activate ()
715{ 694{
716 /* If already on active list, don't do anything */ 695 /* If already on active list, don't do anything */
717 if (active ()) 696 if (active)
718 return; 697 return;
719 698
720 if (has_active_speed ()) 699 if (has_active_speed ())
721 { 700 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} 701}
732 702
733void 703void
734object::activate_recursive () 704object::activate_recursive ()
735{ 705{
… …
749 */ 719 */
750void 720void
751object::deactivate () 721object::deactivate ()
752{ 722{
753 /* If not on the active list, nothing needs to be done */ 723 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 724 if (!active)
755 return; 725 return;
756 726
757 if (active_prev == 0) 727 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} 728}
773 729
774void 730void
775object::deactivate_recursive () 731object::deactivate_recursive ()
776{ 732{
777 for (object *op = inv; op; op = op->below) 733 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 734 op->deactivate_recursive ();
779 735
780 deactivate (); 736 deactivate ();
737}
738
739void
740object::set_flag_inv (int flag, int value)
741{
742 for (object *op = inv; op; op = op->below)
743 {
744 op->flag [flag] = value;
745 op->set_flag_inv (flag, value);
746 }
781} 747}
782 748
783/* 749/*
784 * Remove and free all objects in the inventory of the given object. 750 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 751 * object.c ?
… …
890 856
891 // clear those pointers that likely might have circular references to us 857 // clear those pointers that likely might have circular references to us
892 owner = 0; 858 owner = 0;
893 enemy = 0; 859 enemy = 0;
894 attacked_by = 0; 860 attacked_by = 0;
895
896 // only relevant for players(?), but make sure of it anyways
897 contr = 0;
898} 861}
899 862
900void 863void
901object::destroy (bool destroy_inventory) 864object::destroy (bool destroy_inventory)
902{ 865{
… …
1204 { 1167 {
1205 /* The part may be on a different map. */ 1168 /* The part may be on a different map. */
1206 1169
1207 object *more = op->more; 1170 object *more = op->more;
1208 1171
1209 /* We really need the caller to normalize coordinates - if 1172 /* We really need the caller to normalise coordinates - if
1210 * we set the map, that doesn't work if the location is within 1173 * 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 1174 * a map and this is straddling an edge. So only if coordinate
1212 * is clear wrong do we normalize it. 1175 * is clear wrong do we normalise it.
1213 */ 1176 */
1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215 more->map = get_map_from_coord (m, &more->x, &more->y); 1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1216 else if (!more->map) 1179 else if (!more->map)
1217 { 1180 {

Diff Legend

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