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.51 by root, Sun Sep 17 16:21:53 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;
910 mortals.erase (i); 911 mortals.erase (i);
911 } 912 }
912 913
913 static int lastmortals = 0;//D 914 static int lastmortals = 0;//D
914 915
915 if (mortals.size() != lastmortals)//D 916 if (mortals.size() != lastmortals && lastmortals > 100)//D
916 { 917 {
917 lastmortals = mortals.size ();//D 918 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D 919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 } 920 }
920} 921}
… …
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 maptile *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
… …
1223 1213
1224 tmp->contr->socket.update_look = 1; 1214 tmp->contr->socket.update_look = 1;
1225 } 1215 }
1226 1216
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
1219 && ((op->move_type & tmp->move_off)
1220 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229 { 1221 {
1230 move_apply (tmp, op, NULL); 1222 move_apply (tmp, op, NULL);
1231 1223
1232 if (was_destroyed (op, tag)) 1224 if (op->destroyed ())
1233 {
1234 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1225 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1235 }
1236 } 1226 }
1237 1227
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1228 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1229
1240 if (tmp->above == tmp) 1230 if (tmp->above == tmp)
… …
1293 free_object (op); 1283 free_object (op);
1294 return top; 1284 return top;
1295 } 1285 }
1296 } 1286 }
1297 1287
1298 return NULL; 1288 return 0;
1299} 1289}
1300 1290
1301/* 1291/*
1302 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1292 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1303 * job preparing multi-part monsters 1293 * job preparing multi-part monsters
1304 */ 1294 */
1305object * 1295object *
1306insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1296insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1307{ 1297{
1308 object *tmp; 1298 object *tmp;
1309 1299
1310 if (op->head) 1300 if (op->head)
1311 op = op->head; 1301 op = op->head;
… …
1339 * NULL if 'op' was destroyed 1329 * NULL if 'op' was destroyed
1340 * just 'op' otherwise 1330 * just 'op' otherwise
1341 */ 1331 */
1342 1332
1343object * 1333object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1334insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1335{
1346 object *tmp, *top, *floor = NULL; 1336 object *tmp, *top, *floor = NULL;
1347 sint16 x, y; 1337 sint16 x, y;
1348 1338
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1339 if (QUERY_FLAG (op, FLAG_FREED))
… …
1630 remove_ob (tmp); 1620 remove_ob (tmp);
1631 free_object (tmp); 1621 free_object (tmp);
1632 } 1622 }
1633 } 1623 }
1634 1624
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1625 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1626
1637 tmp1->x = op->x; 1627 tmp1->x = op->x;
1638 tmp1->y = op->y; 1628 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1629 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1630}
… …
1939 */ 1929 */
1940 1930
1941int 1931int
1942check_move_on (object *op, object *originator) 1932check_move_on (object *op, object *originator)
1943{ 1933{
1944 object * 1934 object *tmp;
1945 tmp; 1935 maptile *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1936 int x = op->x, y = op->y;
1952 1937
1953 MoveType 1938 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1939
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1940 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1941 return 0;
1960
1961 tag = op->count;
1962 1942
1963 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1943 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); 1944 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); 1945 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1966 1946
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2007 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)) 2008 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029 { 2009 {
2030 move_apply (tmp, op, originator); 2010 move_apply (tmp, op, originator);
2031 2011
2032 if (was_destroyed (op, tag)) 2012 if (op->destroyed ())
2033 return 1; 2013 return 1;
2034 2014
2035 /* what the person/creature stepped onto has moved the object 2015 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 2016 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 2017 * have a feeling strange problems would result.
… …
2049 * a matching archetype at the given map and coordinates. 2029 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 2030 * The first matching object is returned, or NULL if none.
2051 */ 2031 */
2052 2032
2053object * 2033object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 2034present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 2035{
2056 object * 2036 object *
2057 tmp; 2037 tmp;
2058 2038
2059 if (m == NULL || out_of_map (m, x, y)) 2039 if (m == NULL || out_of_map (m, x, y))
… …
2072 * a matching type variable at the given map and coordinates. 2052 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 2053 * The first matching object is returned, or NULL if none.
2074 */ 2054 */
2075 2055
2076object * 2056object *
2077present (unsigned char type, mapstruct *m, int x, int y) 2057present (unsigned char type, maptile *m, int x, int y)
2078{ 2058{
2079 object * 2059 object *
2080 tmp; 2060 tmp;
2081 2061
2082 if (out_of_map (m, x, y)) 2062 if (out_of_map (m, x, y))
… …
2222 * the archetype because that isn't correct if the monster has been 2202 * the archetype because that isn't correct if the monster has been
2223 * customized, changed states, etc. 2203 * customized, changed states, etc.
2224 */ 2204 */
2225 2205
2226int 2206int
2227find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2207find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2228{ 2208{
2229 int 2209 int
2230 i, 2210 i,
2231 index = 0, flag; 2211 index = 0, flag;
2232 static int 2212 static int
… …
2253 return -1; 2233 return -1;
2254 return altern[RANDOM () % index]; 2234 return altern[RANDOM () % index];
2255} 2235}
2256 2236
2257/* 2237/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2238 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2239 * find_free_spot(), but it will search max number of squares.
2260 * But it will return the first available spot, not a random choice. 2240 * But it will return the first available spot, not a random choice.
2261 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2241 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2262 */ 2242 */
2263 2243
2264int 2244int
2265find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2245find_first_free_spot (const object *ob, maptile *m, int x, int y)
2266{ 2246{
2267 int 2247 int
2268 i; 2248 i;
2269 2249
2270 for (i = 0; i < SIZEOFFREE; i++) 2250 for (i = 0; i < SIZEOFFREE; i++)
… …
2334 * because we have to know what movement the thing looking to move 2314 * because we have to know what movement the thing looking to move
2335 * there is capable of. 2315 * there is capable of.
2336 */ 2316 */
2337 2317
2338int 2318int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2319find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2320{
2341 int 2321 int
2342 i, 2322 i,
2343 max = SIZEOFFREE, mflags; 2323 max = SIZEOFFREE, mflags;
2344 2324
2345 sint16 nx, ny; 2325 sint16 nx, ny;
2346 object * 2326 object *
2347 tmp; 2327 tmp;
2348 mapstruct * 2328 maptile *
2349 mp; 2329 mp;
2350 2330
2351 MoveType blocked, move_type; 2331 MoveType blocked, move_type;
2352 2332
2353 if (exclude && exclude->head) 2333 if (exclude && exclude->head)
… …
2561 * Modified to be map tile aware -.MSW 2541 * Modified to be map tile aware -.MSW
2562 */ 2542 */
2563 2543
2564 2544
2565int 2545int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2546can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2547{
2568 sint16 dx, dy; 2548 sint16 dx, dy;
2569 int 2549 int
2570 mflags; 2550 mflags;
2571 2551
… …
2651 if (prev) 2631 if (prev)
2652 prev->more = tmp; 2632 prev->more = tmp;
2653 prev = tmp; 2633 prev = tmp;
2654 } 2634 }
2655 2635
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2636 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2637 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2638
2662 return dst; 2639 return dst;
2663} 2640}
2664 2641
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. */ 2642/* 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 */ 2643/* 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, */ 2644/* 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. */ 2645/* 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. */ 2646/* Remember not to use load_object_str in a time-critical situation. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2647/* Also remember that multiparts objects are not supported for now. */
2685 2648
2686object * 2649object *
2687load_object_str (const char *obstr) 2650load_object_str (const char *obstr)
2688{ 2651{
2689 object * 2652 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2653 char filename[MAX_BUF];
2693 2654
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2655 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2656
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2657 FILE *tempfile = fopen (filename, "w");
2698 2658
2699 if (tempfile == NULL) 2659 if (tempfile == NULL)
2700 { 2660 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2661 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2662 return NULL;
… …
2723 * returns NULL if no match. 2683 * returns NULL if no match.
2724 */ 2684 */
2725object * 2685object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2686find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2687{
2728 object * 2688 object *tmp;
2729 tmp;
2730 2689
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2690 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2691 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2692 return tmp;
2734 2693
… …
2742 * do the desired thing. 2701 * do the desired thing.
2743 */ 2702 */
2744key_value * 2703key_value *
2745get_ob_key_link (const object *ob, const char *key) 2704get_ob_key_link (const object *ob, const char *key)
2746{ 2705{
2747 key_value * 2706 key_value *link;
2748 link;
2749 2707
2750 for (link = ob->key_values; link != NULL; link = link->next) 2708 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2709 if (link->key == key)
2753 {
2754 return link; 2710 return link;
2755 }
2756 }
2757 2711
2758 return NULL; 2712 return NULL;
2759} 2713}
2760 2714
2761/* 2715/*

Diff Legend

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