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.44 by root, Thu Sep 14 17:29:27 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
… …
1063sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1064{ 1062{
1065 while (op != NULL) 1063 while (op != NULL)
1066 { 1064 {
1067 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1067
1071 op->carrying -= weight; 1068 op->carrying -= weight;
1072 op = op->env; 1069 op = op->env;
1073 } 1070 }
1074} 1071}
1075 1072
… …
1083 */ 1080 */
1084 1081
1085void 1082void
1086remove_ob (object *op) 1083remove_ob (object *op)
1087{ 1084{
1085 object *tmp, *last = 0;
1088 object * 1086 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1087
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1088 int check_walk_off;
1098 mapstruct * 1089 mapstruct *m;
1099 m;
1100 1090
1101 sint16 1091 sint16 x, y;
1102 x,
1103 y;
1104 1092
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1106 return; 1094 return;
1107 1095
1108 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
… …
1201 op->below = 0; 1189 op->below = 0;
1202 1190
1203 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1204 return; 1192 return;
1205 1193
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1208 1195
1209 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)
1210 { 1197 {
1211 /* 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
… …
1230 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1231 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))
1232 { 1219 {
1233 move_apply (tmp, op, NULL); 1220 move_apply (tmp, op, NULL);
1234 1221
1235 if (was_destroyed (op, tag)) 1222 if (op->destroyed ());
1236 {
1237 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);
1238 }
1239 } 1224 }
1240 1225
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1227
1243 if (tmp->above == tmp) 1228 if (tmp->above == tmp)
… …
1296 free_object (op); 1281 free_object (op);
1297 return top; 1282 return top;
1298 } 1283 }
1299 } 1284 }
1300 1285
1301 return NULL; 1286 return 0;
1302} 1287}
1303 1288
1304/* 1289/*
1305 * 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
1306 * job preparing multi-part monsters 1291 * job preparing multi-part monsters
… …
1633 remove_ob (tmp); 1618 remove_ob (tmp);
1634 free_object (tmp); 1619 free_object (tmp);
1635 } 1620 }
1636 } 1621 }
1637 1622
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1623 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1624
1640 tmp1->x = op->x; 1625 tmp1->x = op->x;
1641 tmp1->y = op->y; 1626 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1627 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1628}
… …
1942 */ 1927 */
1943 1928
1944int 1929int
1945check_move_on (object *op, object *originator) 1930check_move_on (object *op, object *originator)
1946{ 1931{
1947 object * 1932 object *tmp;
1948 tmp; 1933 mapstruct *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1934 int x = op->x, y = op->y;
1955 1935
1956 MoveType 1936 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1937
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1938 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1939 return 0;
1963
1964 tag = op->count;
1965 1940
1966 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);
1967 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);
1968 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);
1969 1944
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2005 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031 ((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))
2032 { 2007 {
2033 move_apply (tmp, op, originator); 2008 move_apply (tmp, op, originator);
2034 2009
2035 if (was_destroyed (op, tag)) 2010 if (op->destroyed ())
2036 return 1; 2011 return 1;
2037 2012
2038 /* what the person/creature stepped onto has moved the object 2013 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 2014 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 2015 * have a feeling strange problems would result.
… …
2654 if (prev) 2629 if (prev)
2655 prev->more = tmp; 2630 prev->more = tmp;
2656 prev = tmp; 2631 prev = tmp;
2657 } 2632 }
2658 2633
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2634 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2635 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2636
2665 return dst; 2637 return dst;
2666} 2638}
2667 2639
2668/* return true if the object was destroyed, 0 otherwise */
2669int
2670was_destroyed (const object *op, tag_t old_tag)
2671{
2672 /* checking for FLAG_FREED isn't necessary, but makes this function more
2673 * robust */
2674 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675}
2676
2677/* GROS - Creates an object using a string representing its content. */ 2640/* GROS - Creates an object using a string representing its content. */
2678
2679/* 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 */
2680
2681/* 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, */
2682
2683/* 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. */
2684
2685/* 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. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2645/* Also remember that multiparts objects are not supported for now. */
2688 2646
2689object * 2647object *
2690load_object_str (const char *obstr) 2648load_object_str (const char *obstr)
2691{ 2649{
2692 object * 2650 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2651 char filename[MAX_BUF];
2696 2652
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2653 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2654
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2655 FILE *tempfile = fopen (filename, "w");
2701 2656
2702 if (tempfile == NULL) 2657 if (tempfile == NULL)
2703 { 2658 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2659 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2660 return NULL;
… …
2726 * returns NULL if no match. 2681 * returns NULL if no match.
2727 */ 2682 */
2728object * 2683object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2684find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2685{
2731 object * 2686 object *tmp;
2732 tmp;
2733 2687
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2688 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2689 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2690 return tmp;
2737 2691
… …
2745 * do the desired thing. 2699 * do the desired thing.
2746 */ 2700 */
2747key_value * 2701key_value *
2748get_ob_key_link (const object *ob, const char *key) 2702get_ob_key_link (const object *ob, const char *key)
2749{ 2703{
2750 key_value * 2704 key_value *link;
2751 link;
2752 2705
2753 for (link = ob->key_values; link != NULL; link = link->next) 2706 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2707 if (link->key == key)
2756 {
2757 return link; 2708 return link;
2758 }
2759 }
2760 2709
2761 return NULL; 2710 return NULL;
2762} 2711}
2763 2712
2764/* 2713/*

Diff Legend

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