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.41 by root, Thu Sep 14 01:12:28 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 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}
512 511
513void 512void
514free_all_object_data () 513free_all_object_data ()
515{ 514{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 515 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 516}
539 517
540/* 518/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 519 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 520 * skill and experience objects.
612 590
613 /* What is not cleared is next, prev, and count */ 591 /* What is not cleared is next, prev, and count */
614 592
615 expmul = 1.0; 593 expmul = 1.0;
616 face = blank_face; 594 face = blank_face;
617 attacked_by_count = -1;
618 595
619 if (settings.casting_time) 596 if (settings.casting_time)
620 casting_time = -1; 597 casting_time = -1;
621} 598}
622 599
917 894
918 if (op->more != NULL) 895 if (op->more != NULL)
919 update_object (op->more, action); 896 update_object (op->more, action);
920} 897}
921 898
922static unordered_vector<object *> mortals; 899object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 900object::vector object::objects; // not yet used
901object *object::first;
924 902
925void object::free_mortals () 903void object::free_mortals ()
926{ 904{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 905 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 906 if ((*i)->refcnt)
929 ++i; // further delay freeing 907 ++i; // further delay freeing
930 else 908 else
931 { 909 {
932 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
933 //freed.push_back (*i);//D
934 delete *i; 910 delete *i;
935 mortals.erase (i); 911 mortals.erase (i);
936 } 912 }
937 913
938 if (mortals.size() && 0)//D 914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals)//D
917 {
918 lastmortals = mortals.size ();//D
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
940} 921}
941 922
942object::object () 923object::object ()
943{ 924{
944 SET_FLAG (this, FLAG_REMOVED); 925 SET_FLAG (this, FLAG_REMOVED);
945 926
946 expmul = 1.0; 927 expmul = 1.0;
947 face = blank_face; 928 face = blank_face;
948 attacked_by_count = -1;
949} 929}
950 930
951object::~object () 931object::~object ()
952{ 932{
953 free_key_values (this); 933 free_key_values (this);
957{ 937{
958 count = ++ob_count; 938 count = ++ob_count;
959 uuid = gen_uuid (); 939 uuid = gen_uuid ();
960 940
961 prev = 0; 941 prev = 0;
962 next = objects; 942 next = object::first;
963 943
964 if (objects) 944 if (object::first)
965 objects->prev = this; 945 object::first->prev = this;
966 946
967 objects = this; 947 object::first = this;
968} 948}
969 949
970void object::unlink () 950void object::unlink ()
971{ 951{
972 //count = 0;//D
973 if (!prev && !next) return;//D
974
975 if (this == objects) 952 if (this == object::first)
976 objects = next; 953 object::first = next;
977 954
978 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next; 956 if (prev) prev->next = next;
980 if (next) next->prev = prev; 957 if (next) next->prev = prev;
981 958
983 next = 0; 960 next = 0;
984} 961}
985 962
986object *object::create () 963object *object::create ()
987{ 964{
988 object *op;
989
990 if (freed.empty ())
991 op = new object; 965 object *op = new object;
992 else
993 {
994 // highly annoying, but the only way to get it stable right now
995 op = freed.back ();
996 freed.pop_back ();
997 op->~object ();
998 new ((void *) op) object;
999 }
1000
1001 op->link (); 966 op->link ();
1002 return op; 967 return op;
1003} 968}
1004 969
1005/* 970/*
1022 987
1023 if (!QUERY_FLAG (this, FLAG_REMOVED)) 988 if (!QUERY_FLAG (this, FLAG_REMOVED))
1024 remove_ob (this); 989 remove_ob (this);
1025 990
1026 SET_FLAG (this, FLAG_FREED); 991 SET_FLAG (this, FLAG_FREED);
1027
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029 992
1030 if (more) 993 if (more)
1031 { 994 {
1032 more->free (free_inventory); 995 more->free (free_inventory);
1033 more = 0; 996 more = 0;
1073 op = tmp; 1036 op = tmp;
1074 } 1037 }
1075 } 1038 }
1076 } 1039 }
1077 1040
1041 // clear those pointers that likely might have circular references to us
1078 owner = 0; 1042 owner = 0;
1043 enemy = 0;
1044 attacked_by = 0;
1079 1045
1080 /* Remove object from the active list */ 1046 /* Remove object from the active list */
1081 speed = 0; 1047 speed = 0;
1082 update_ob_speed (this); 1048 update_ob_speed (this);
1083 1049
1095sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1096{ 1062{
1097 while (op != NULL) 1063 while (op != NULL)
1098 { 1064 {
1099 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1067
1103 op->carrying -= weight; 1068 op->carrying -= weight;
1104 op = op->env; 1069 op = op->env;
1105 } 1070 }
1106} 1071}
1107 1072
1115 */ 1080 */
1116 1081
1117void 1082void
1118remove_ob (object *op) 1083remove_ob (object *op)
1119{ 1084{
1085 object *tmp, *last = 0;
1120 object * 1086 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1087
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1088 int check_walk_off;
1130 mapstruct * 1089 maptile *m;
1131 m;
1132 1090
1133 sint16 1091 sint16 x, y;
1134 x,
1135 y;
1136 1092
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1138 return; 1094 return;
1139 1095
1140 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
1233 op->below = 0; 1189 op->below = 0;
1234 1190
1235 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1236 return; 1192 return;
1237 1193
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1240 1195
1241 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)
1242 { 1197 {
1243 /* 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
1262 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1263 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))
1264 { 1219 {
1265 move_apply (tmp, op, NULL); 1220 move_apply (tmp, op, NULL);
1266 1221
1267 if (was_destroyed (op, tag)) 1222 if (op->destroyed ());
1268 {
1269 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);
1270 }
1271 } 1224 }
1272 1225
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1227
1275 if (tmp->above == tmp) 1228 if (tmp->above == tmp)
1328 free_object (op); 1281 free_object (op);
1329 return top; 1282 return top;
1330 } 1283 }
1331 } 1284 }
1332 1285
1333 return NULL; 1286 return 0;
1334} 1287}
1335 1288
1336/* 1289/*
1337 * 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
1338 * job preparing multi-part monsters 1291 * job preparing multi-part monsters
1339 */ 1292 */
1340object * 1293object *
1341insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1294insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342{ 1295{
1343 object *tmp; 1296 object *tmp;
1344 1297
1345 if (op->head) 1298 if (op->head)
1346 op = op->head; 1299 op = op->head;
1374 * NULL if 'op' was destroyed 1327 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1328 * just 'op' otherwise
1376 */ 1329 */
1377 1330
1378object * 1331object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1332insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1333{
1381 object *tmp, *top, *floor = NULL; 1334 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1335 sint16 x, y;
1383 1336
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1337 if (QUERY_FLAG (op, FLAG_FREED))
1665 remove_ob (tmp); 1618 remove_ob (tmp);
1666 free_object (tmp); 1619 free_object (tmp);
1667 } 1620 }
1668 } 1621 }
1669 1622
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1623 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1624
1672 tmp1->x = op->x; 1625 tmp1->x = op->x;
1673 tmp1->y = op->y; 1626 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1627 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1628}
1974 */ 1927 */
1975 1928
1976int 1929int
1977check_move_on (object *op, object *originator) 1930check_move_on (object *op, object *originator)
1978{ 1931{
1979 object * 1932 object *tmp;
1980 tmp; 1933 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1934 int x = op->x, y = op->y;
1987 1935
1988 MoveType 1936 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1937
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1938 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1939 return 0;
1995
1996 tag = op->count;
1997 1940
1998 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);
1999 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);
2000 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);
2001 1944
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2005 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2063 ((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))
2064 { 2007 {
2065 move_apply (tmp, op, originator); 2008 move_apply (tmp, op, originator);
2066 2009
2067 if (was_destroyed (op, tag)) 2010 if (op->destroyed ())
2068 return 1; 2011 return 1;
2069 2012
2070 /* what the person/creature stepped onto has moved the object 2013 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 2014 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 2015 * have a feeling strange problems would result.
2084 * a matching archetype at the given map and coordinates. 2027 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 2028 * The first matching object is returned, or NULL if none.
2086 */ 2029 */
2087 2030
2088object * 2031object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 2032present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 2033{
2091 object * 2034 object *
2092 tmp; 2035 tmp;
2093 2036
2094 if (m == NULL || out_of_map (m, x, y)) 2037 if (m == NULL || out_of_map (m, x, y))
2107 * a matching type variable at the given map and coordinates. 2050 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 2051 * The first matching object is returned, or NULL if none.
2109 */ 2052 */
2110 2053
2111object * 2054object *
2112present (unsigned char type, mapstruct *m, int x, int y) 2055present (unsigned char type, maptile *m, int x, int y)
2113{ 2056{
2114 object * 2057 object *
2115 tmp; 2058 tmp;
2116 2059
2117 if (out_of_map (m, x, y)) 2060 if (out_of_map (m, x, y))
2257 * the archetype because that isn't correct if the monster has been 2200 * the archetype because that isn't correct if the monster has been
2258 * customized, changed states, etc. 2201 * customized, changed states, etc.
2259 */ 2202 */
2260 2203
2261int 2204int
2262find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2205find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2263{ 2206{
2264 int 2207 int
2265 i, 2208 i,
2266 index = 0, flag; 2209 index = 0, flag;
2267 static int 2210 static int
2288 return -1; 2231 return -1;
2289 return altern[RANDOM () % index]; 2232 return altern[RANDOM () % index];
2290} 2233}
2291 2234
2292/* 2235/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2236 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2237 * find_free_spot(), but it will search max number of squares.
2295 * But it will return the first available spot, not a random choice. 2238 * But it will return the first available spot, not a random choice.
2296 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2239 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2297 */ 2240 */
2298 2241
2299int 2242int
2300find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2243find_first_free_spot (const object *ob, maptile *m, int x, int y)
2301{ 2244{
2302 int 2245 int
2303 i; 2246 i;
2304 2247
2305 for (i = 0; i < SIZEOFFREE; i++) 2248 for (i = 0; i < SIZEOFFREE; i++)
2369 * because we have to know what movement the thing looking to move 2312 * because we have to know what movement the thing looking to move
2370 * there is capable of. 2313 * there is capable of.
2371 */ 2314 */
2372 2315
2373int 2316int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2317find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2318{
2376 int 2319 int
2377 i, 2320 i,
2378 max = SIZEOFFREE, mflags; 2321 max = SIZEOFFREE, mflags;
2379 2322
2380 sint16 nx, ny; 2323 sint16 nx, ny;
2381 object * 2324 object *
2382 tmp; 2325 tmp;
2383 mapstruct * 2326 maptile *
2384 mp; 2327 mp;
2385 2328
2386 MoveType blocked, move_type; 2329 MoveType blocked, move_type;
2387 2330
2388 if (exclude && exclude->head) 2331 if (exclude && exclude->head)
2596 * Modified to be map tile aware -.MSW 2539 * Modified to be map tile aware -.MSW
2597 */ 2540 */
2598 2541
2599 2542
2600int 2543int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2544can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2545{
2603 sint16 dx, dy; 2546 sint16 dx, dy;
2604 int 2547 int
2605 mflags; 2548 mflags;
2606 2549
2686 if (prev) 2629 if (prev)
2687 prev->more = tmp; 2630 prev->more = tmp;
2688 prev = tmp; 2631 prev = tmp;
2689 } 2632 }
2690 2633
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2634 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2635 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2636
2697 return dst; 2637 return dst;
2698} 2638}
2699 2639
2700/* return true if the object was destroyed, 0 otherwise */
2701int
2702was_destroyed (const object *op, tag_t old_tag)
2703{
2704 /* checking for FLAG_FREED isn't necessary, but makes this function more
2705 * robust */
2706 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2707}
2708
2709/* GROS - Creates an object using a string representing its content. */ 2640/* GROS - Creates an object using a string representing its content. */
2710
2711/* 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 */
2712
2713/* 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, */
2714
2715/* 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. */
2716
2717/* 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. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2645/* Also remember that multiparts objects are not supported for now. */
2720 2646
2721object * 2647object *
2722load_object_str (const char *obstr) 2648load_object_str (const char *obstr)
2723{ 2649{
2724 object * 2650 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2651 char filename[MAX_BUF];
2728 2652
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2653 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2654
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2655 FILE *tempfile = fopen (filename, "w");
2733 2656
2734 if (tempfile == NULL) 2657 if (tempfile == NULL)
2735 { 2658 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2659 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2660 return NULL;
2758 * returns NULL if no match. 2681 * returns NULL if no match.
2759 */ 2682 */
2760object * 2683object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2684find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2685{
2763 object * 2686 object *tmp;
2764 tmp;
2765 2687
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2688 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2689 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2690 return tmp;
2769 2691
2777 * do the desired thing. 2699 * do the desired thing.
2778 */ 2700 */
2779key_value * 2701key_value *
2780get_ob_key_link (const object *ob, const char *key) 2702get_ob_key_link (const object *ob, const char *key)
2781{ 2703{
2782 key_value * 2704 key_value *link;
2783 link;
2784 2705
2785 for (link = ob->key_values; link != NULL; link = link->next) 2706 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2707 if (link->key == key)
2788 {
2789 return link; 2708 return link;
2790 }
2791 }
2792 2709
2793 return NULL; 2710 return NULL;
2794} 2711}
2795 2712
2796/* 2713/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines