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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.48 by root, Thu Sep 14 23:13:48 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
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, 41short 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 42 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}; 43};
… …
447void 445void
448dump_all_objects (void) 446dump_all_objects (void)
449{ 447{
450 object *op; 448 object *op;
451 449
452 for (op = objects; op != NULL; op = op->next) 450 for (op = object::first; op != NULL; op = op->next)
453 { 451 {
454 dump_object (op); 452 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); 453 fprintf (logfile, "Object %s\n", errmsg);
456 } 454 }
457} 455}
458 456
459/* 457/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 458 * get_nearest_part(multi-object, object 2) returns the part of the
… …
483object * 481object *
484find_object (tag_t i) 482find_object (tag_t i)
485{ 483{
486 object *op; 484 object *op;
487 485
488 for (op = objects; op != NULL; op = op->next) 486 for (op = object::first; op != NULL; op = op->next)
489 if (op->count == i) 487 if (op->count == i)
490 break; 488 break;
489
491 return op; 490 return op;
492} 491}
493 492
494/* 493/*
495 * Returns the first object which has a name equal to the argument. 494 * Returns the first object which has a name equal to the argument.
… …
501find_object_name (const char *str) 500find_object_name (const char *str)
502{ 501{
503 shstr_cmp str_ (str); 502 shstr_cmp str_ (str);
504 object *op; 503 object *op;
505 504
506 for (op = objects; op != NULL; op = op->next) 505 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 506 if (op->name == str_)
508 break; 507 break;
509 508
510 return op; 509 return op;
511} 510}
… …
895 894
896 if (op->more != NULL) 895 if (op->more != NULL)
897 update_object (op->more, action); 896 update_object (op->more, action);
898} 897}
899 898
900static unordered_vector<object *> mortals; 899object::vector object::mortals;
900object::vector object::objects; // not yet used
901object *object::first;
901 902
902void object::free_mortals () 903void object::free_mortals ()
903{ 904{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 905 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 906 if ((*i)->refcnt)
906 ++i; // further delay freeing 907 ++i; // further delay freeing
907 else 908 else
908 { 909 {
909 delete *i; 910 delete *i;
… …
936{ 937{
937 count = ++ob_count; 938 count = ++ob_count;
938 uuid = gen_uuid (); 939 uuid = gen_uuid ();
939 940
940 prev = 0; 941 prev = 0;
941 next = objects; 942 next = object::first;
942 943
943 if (objects) 944 if (object::first)
944 objects->prev = this; 945 object::first->prev = this;
945 946
946 objects = this; 947 object::first = this;
947} 948}
948 949
949void object::unlink () 950void object::unlink ()
950{ 951{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 952 if (this == object::first)
955 objects = next; 953 object::first = next;
956 954
957 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 956 if (prev) prev->next = next;
959 if (next) next->prev = prev; 957 if (next) next->prev = prev;
960 958
… …
1038 op = tmp; 1036 op = tmp;
1039 } 1037 }
1040 } 1038 }
1041 } 1039 }
1042 1040
1041 // clear those pointers that likely might have circular references to us
1043 owner = 0; 1042 owner = 0;
1043 enemy = 0;
1044 attacked_by = 0;
1044 1045
1045 /* Remove object from the active list */ 1046 /* Remove object from the active list */
1046 speed = 0; 1047 speed = 0;
1047 update_ob_speed (this); 1048 update_ob_speed (this);
1048 1049
… …
1060sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1061{ 1062{
1062 while (op != NULL) 1063 while (op != NULL)
1063 { 1064 {
1064 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 } 1067
1068 op->carrying -= weight; 1068 op->carrying -= weight;
1069 op = op->env; 1069 op = op->env;
1070 } 1070 }
1071} 1071}
1072 1072
… …
1080 */ 1080 */
1081 1081
1082void 1082void
1083remove_ob (object *op) 1083remove_ob (object *op)
1084{ 1084{
1085 object *tmp, *last = 0;
1085 object * 1086 object *otmp;
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090 1087
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off; 1088 int check_walk_off;
1095 mapstruct * 1089 mapstruct *m;
1096 m;
1097 1090
1098 sint16 1091 sint16 x, y;
1099 x,
1100 y;
1101 1092
1102 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1103 return; 1094 return;
1104 1095
1105 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
… …
1198 op->below = 0; 1189 op->below = 0;
1199 1190
1200 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1201 return; 1192 return;
1202 1193
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1205 1195
1206 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1196 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1207 { 1197 {
1208 /* No point updating the players look faces if he is the object 1198 /* No point updating the players look faces if he is the object
… …
1227 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1228 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229 { 1219 {
1230 move_apply (tmp, op, NULL); 1220 move_apply (tmp, op, NULL);
1231 1221
1232 if (was_destroyed (op, tag)) 1222 if (op->destroyed ());
1233 {
1234 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1223 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1235 }
1236 } 1224 }
1237 1225
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1227
1240 if (tmp->above == tmp) 1228 if (tmp->above == tmp)
… …
1293 free_object (op); 1281 free_object (op);
1294 return top; 1282 return top;
1295 } 1283 }
1296 } 1284 }
1297 1285
1298 return NULL; 1286 return 0;
1299} 1287}
1300 1288
1301/* 1289/*
1302 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1290 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1303 * job preparing multi-part monsters 1291 * job preparing multi-part monsters
… …
1630 remove_ob (tmp); 1618 remove_ob (tmp);
1631 free_object (tmp); 1619 free_object (tmp);
1632 } 1620 }
1633 } 1621 }
1634 1622
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1623 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1624
1637 tmp1->x = op->x; 1625 tmp1->x = op->x;
1638 tmp1->y = op->y; 1626 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1627 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1628}
… …
1939 */ 1927 */
1940 1928
1941int 1929int
1942check_move_on (object *op, object *originator) 1930check_move_on (object *op, object *originator)
1943{ 1931{
1944 object * 1932 object *tmp;
1945 tmp; 1933 mapstruct *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1934 int x = op->x, y = op->y;
1952 1935
1953 MoveType 1936 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1937
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1938 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1939 return 0;
1960
1961 tag = op->count;
1962 1940
1963 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1941 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1964 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1942 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1965 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1943 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1966 1944
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2005 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 2006 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029 { 2007 {
2030 move_apply (tmp, op, originator); 2008 move_apply (tmp, op, originator);
2031 2009
2032 if (was_destroyed (op, tag)) 2010 if (op->destroyed ())
2033 return 1; 2011 return 1;
2034 2012
2035 /* what the person/creature stepped onto has moved the object 2013 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 2014 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 2015 * have a feeling strange problems would result.
… …
2651 if (prev) 2629 if (prev)
2652 prev->more = tmp; 2630 prev->more = tmp;
2653 prev = tmp; 2631 prev = tmp;
2654 } 2632 }
2655 2633
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2634 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2635 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2636
2662 return dst; 2637 return dst;
2663} 2638}
2664 2639
2665/* return true if the object was destroyed, 0 otherwise */
2666int
2667was_destroyed (const object *op, tag_t old_tag)
2668{
2669 /* checking for FLAG_FREED isn't necessary, but makes this function more
2670 * robust */
2671 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672}
2673
2674/* GROS - Creates an object using a string representing its content. */ 2640/* GROS - Creates an object using a string representing its content. */
2675
2676/* Basically, we save the content of the string to a temp file, then call */ 2641/* Basically, we save the content of the string to a temp file, then call */
2677
2678/* load_object on it. I admit it is a highly inefficient way to make things, */ 2642/* load_object on it. I admit it is a highly inefficient way to make things, */
2679
2680/* but it was simple to make and allows reusing the load_object function. */ 2643/* but it was simple to make and allows reusing the load_object function. */
2681
2682/* Remember not to use load_object_str in a time-critical situation. */ 2644/* Remember not to use load_object_str in a time-critical situation. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2645/* Also remember that multiparts objects are not supported for now. */
2685 2646
2686object * 2647object *
2687load_object_str (const char *obstr) 2648load_object_str (const char *obstr)
2688{ 2649{
2689 object * 2650 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2651 char filename[MAX_BUF];
2693 2652
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2653 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2654
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2655 FILE *tempfile = fopen (filename, "w");
2698 2656
2699 if (tempfile == NULL) 2657 if (tempfile == NULL)
2700 { 2658 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2659 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2660 return NULL;
… …
2723 * returns NULL if no match. 2681 * returns NULL if no match.
2724 */ 2682 */
2725object * 2683object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2684find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2685{
2728 object * 2686 object *tmp;
2729 tmp;
2730 2687
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2688 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2689 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2690 return tmp;
2734 2691
… …
2742 * do the desired thing. 2699 * do the desired thing.
2743 */ 2700 */
2744key_value * 2701key_value *
2745get_ob_key_link (const object *ob, const char *key) 2702get_ob_key_link (const object *ob, const char *key)
2746{ 2703{
2747 key_value * 2704 key_value *link;
2748 link;
2749 2705
2750 for (link = ob->key_values; link != NULL; link = link->next) 2706 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2707 if (link->key == key)
2753 {
2754 return link; 2708 return link;
2755 }
2756 }
2757 2709
2758 return NULL; 2710 return NULL;
2759} 2711}
2760 2712
2761/* 2713/*

Diff Legend

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