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.52 by root, Wed Sep 27 00:36:08 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
974 * it from the list of used objects, and puts it on the list of 972 * it from the list of used objects, and puts it on the list of
975 * free objects. The IS_FREED() flag is set in the object. 973 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 974 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 975 * this function to succeed.
978 * 976 *
979 * If free_inventory is set, free inventory as well. Else drop items in 977 * If destroy_inventory is set, free inventory as well. Else drop items in
980 * inventory to the ground. 978 * inventory to the ground.
981 */ 979 */
982void object::free (bool free_inventory) 980void object::destroy (bool destroy_inventory)
983{ 981{
984 if (QUERY_FLAG (this, FLAG_FREED)) 982 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 983 return;
986 984
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 985 if (QUERY_FLAG (this, FLAG_FRIENDLY))
992 990
993 SET_FLAG (this, FLAG_FREED); 991 SET_FLAG (this, FLAG_FREED);
994 992
995 if (more) 993 if (more)
996 { 994 {
997 more->free (free_inventory); 995 more->destroy (destroy_inventory);
998 more = 0; 996 more = 0;
999 } 997 }
1000 998
1001 if (inv) 999 if (inv)
1002 { 1000 {
1003 /* Only if the space blocks everything do we not process - 1001 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 1002 * if some form of movement is allowed, let objects
1005 * drop on that space. 1003 * drop on that space.
1006 */ 1004 */
1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 1005 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008 { 1006 {
1009 object *op = inv; 1007 object *op = inv;
1010 1008
1011 while (op) 1009 while (op)
1012 { 1010 {
1013 object *tmp = op->below; 1011 object *tmp = op->below;
1014 op->free (free_inventory); 1012 op->destroy (destroy_inventory);
1015 op = tmp; 1013 op = tmp;
1016 } 1014 }
1017 } 1015 }
1018 else 1016 else
1019 { /* Put objects in inventory onto this space */ 1017 { /* Put objects in inventory onto this space */
1043 // clear those pointers that likely might have circular references to us 1041 // clear those pointers that likely might have circular references to us
1044 owner = 0; 1042 owner = 0;
1045 enemy = 0; 1043 enemy = 0;
1046 attacked_by = 0; 1044 attacked_by = 0;
1047 1045
1046 // only relevant for players(?), but make sure of it anyways
1047 contr = 0;
1048
1048 /* Remove object from the active list */ 1049 /* Remove object from the active list */
1049 speed = 0; 1050 speed = 0;
1050 update_ob_speed (this); 1051 update_ob_speed (this);
1051 1052
1052 unlink (); 1053 unlink ();
1063sub_weight (object *op, signed long weight) 1064sub_weight (object *op, signed long weight)
1064{ 1065{
1065 while (op != NULL) 1066 while (op != NULL)
1066 { 1067 {
1067 if (op->type == CONTAINER) 1068 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1070
1071 op->carrying -= weight; 1071 op->carrying -= weight;
1072 op = op->env; 1072 op = op->env;
1073 } 1073 }
1074} 1074}
1075 1075
1083 */ 1083 */
1084 1084
1085void 1085void
1086remove_ob (object *op) 1086remove_ob (object *op)
1087{ 1087{
1088 object *tmp, *last = 0;
1088 object * 1089 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1090
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1091 int check_walk_off;
1098 mapstruct * 1092 maptile *m;
1099 m;
1100 1093
1101 sint16 1094 sint16 x, y;
1102 x,
1103 y;
1104 1095
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1096 if (QUERY_FLAG (op, FLAG_REMOVED))
1106 return; 1097 return;
1107 1098
1108 SET_FLAG (op, FLAG_REMOVED); 1099 SET_FLAG (op, FLAG_REMOVED);
1201 op->below = 0; 1192 op->below = 0;
1202 1193
1203 if (op->map->in_memory == MAP_SAVING) 1194 if (op->map->in_memory == MAP_SAVING)
1204 return; 1195 return;
1205 1196
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1208 1198
1209 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1199 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1210 { 1200 {
1211 /* No point updating the players look faces if he is the object 1201 /* No point updating the players look faces if he is the object
1226 1216
1227 tmp->contr->socket.update_look = 1; 1217 tmp->contr->socket.update_look = 1;
1228 } 1218 }
1229 1219
1230 /* See if player moving off should effect something */ 1220 /* 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)) 1221 if (check_walk_off
1222 && ((op->move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1232 { 1224 {
1233 move_apply (tmp, op, NULL); 1225 move_apply (tmp, op, NULL);
1234 1226
1235 if (was_destroyed (op, tag)) 1227 if (op->destroyed ())
1236 {
1237 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1228 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1238 }
1239 } 1229 }
1240 1230
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1232
1243 if (tmp->above == tmp) 1233 if (tmp->above == tmp)
1296 free_object (op); 1286 free_object (op);
1297 return top; 1287 return top;
1298 } 1288 }
1299 } 1289 }
1300 1290
1301 return NULL; 1291 return 0;
1302} 1292}
1303 1293
1304/* 1294/*
1305 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1295 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1306 * job preparing multi-part monsters 1296 * job preparing multi-part monsters
1307 */ 1297 */
1308object * 1298object *
1309insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1299insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1310{ 1300{
1311 object *tmp; 1301 object *tmp;
1312 1302
1313 if (op->head) 1303 if (op->head)
1314 op = op->head; 1304 op = op->head;
1342 * NULL if 'op' was destroyed 1332 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1333 * just 'op' otherwise
1344 */ 1334 */
1345 1335
1346object * 1336object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1337insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1338{
1349 object *tmp, *top, *floor = NULL; 1339 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1340 sint16 x, y;
1351 1341
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1342 if (QUERY_FLAG (op, FLAG_FREED))
1633 remove_ob (tmp); 1623 remove_ob (tmp);
1634 free_object (tmp); 1624 free_object (tmp);
1635 } 1625 }
1636 } 1626 }
1637 1627
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1628 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1629
1640 tmp1->x = op->x; 1630 tmp1->x = op->x;
1641 tmp1->y = op->y; 1631 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1632 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1633}
1942 */ 1932 */
1943 1933
1944int 1934int
1945check_move_on (object *op, object *originator) 1935check_move_on (object *op, object *originator)
1946{ 1936{
1947 object * 1937 object *tmp;
1948 tmp; 1938 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1939 int x = op->x, y = op->y;
1955 1940
1956 MoveType 1941 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1942
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1943 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1944 return 0;
1963
1964 tag = op->count;
1965 1945
1966 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1946 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); 1947 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); 1948 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1969 1949
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2010 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)) 2011 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2032 { 2012 {
2033 move_apply (tmp, op, originator); 2013 move_apply (tmp, op, originator);
2034 2014
2035 if (was_destroyed (op, tag)) 2015 if (op->destroyed ())
2036 return 1; 2016 return 1;
2037 2017
2038 /* what the person/creature stepped onto has moved the object 2018 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 2019 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 2020 * have a feeling strange problems would result.
2052 * a matching archetype at the given map and coordinates. 2032 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 2033 * The first matching object is returned, or NULL if none.
2054 */ 2034 */
2055 2035
2056object * 2036object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 2037present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 2038{
2059 object * 2039 object *
2060 tmp; 2040 tmp;
2061 2041
2062 if (m == NULL || out_of_map (m, x, y)) 2042 if (m == NULL || out_of_map (m, x, y))
2075 * a matching type variable at the given map and coordinates. 2055 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 2056 * The first matching object is returned, or NULL if none.
2077 */ 2057 */
2078 2058
2079object * 2059object *
2080present (unsigned char type, mapstruct *m, int x, int y) 2060present (unsigned char type, maptile *m, int x, int y)
2081{ 2061{
2082 object * 2062 object *
2083 tmp; 2063 tmp;
2084 2064
2085 if (out_of_map (m, x, y)) 2065 if (out_of_map (m, x, y))
2225 * the archetype because that isn't correct if the monster has been 2205 * the archetype because that isn't correct if the monster has been
2226 * customized, changed states, etc. 2206 * customized, changed states, etc.
2227 */ 2207 */
2228 2208
2229int 2209int
2230find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2210find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2231{ 2211{
2232 int 2212 int
2233 i, 2213 i,
2234 index = 0, flag; 2214 index = 0, flag;
2235 static int 2215 static int
2256 return -1; 2236 return -1;
2257 return altern[RANDOM () % index]; 2237 return altern[RANDOM () % index];
2258} 2238}
2259 2239
2260/* 2240/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2241 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2242 * find_free_spot(), but it will search max number of squares.
2263 * But it will return the first available spot, not a random choice. 2243 * But it will return the first available spot, not a random choice.
2264 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2244 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2265 */ 2245 */
2266 2246
2267int 2247int
2268find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2248find_first_free_spot (const object *ob, maptile *m, int x, int y)
2269{ 2249{
2270 int 2250 int
2271 i; 2251 i;
2272 2252
2273 for (i = 0; i < SIZEOFFREE; i++) 2253 for (i = 0; i < SIZEOFFREE; i++)
2337 * because we have to know what movement the thing looking to move 2317 * because we have to know what movement the thing looking to move
2338 * there is capable of. 2318 * there is capable of.
2339 */ 2319 */
2340 2320
2341int 2321int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2322find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2323{
2344 int 2324 int
2345 i, 2325 i,
2346 max = SIZEOFFREE, mflags; 2326 max = SIZEOFFREE, mflags;
2347 2327
2348 sint16 nx, ny; 2328 sint16 nx, ny;
2349 object * 2329 object *
2350 tmp; 2330 tmp;
2351 mapstruct * 2331 maptile *
2352 mp; 2332 mp;
2353 2333
2354 MoveType blocked, move_type; 2334 MoveType blocked, move_type;
2355 2335
2356 if (exclude && exclude->head) 2336 if (exclude && exclude->head)
2564 * Modified to be map tile aware -.MSW 2544 * Modified to be map tile aware -.MSW
2565 */ 2545 */
2566 2546
2567 2547
2568int 2548int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2549can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2550{
2571 sint16 dx, dy; 2551 sint16 dx, dy;
2572 int 2552 int
2573 mflags; 2553 mflags;
2574 2554
2654 if (prev) 2634 if (prev)
2655 prev->more = tmp; 2635 prev->more = tmp;
2656 prev = tmp; 2636 prev = tmp;
2657 } 2637 }
2658 2638
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2639 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2640 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2641
2665 return dst; 2642 return dst;
2666} 2643}
2667 2644
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. */ 2645/* 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 */ 2646/* 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, */ 2647/* 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. */ 2648/* 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. */ 2649/* Remember not to use load_object_str in a time-critical situation. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2650/* Also remember that multiparts objects are not supported for now. */
2688 2651
2689object * 2652object *
2690load_object_str (const char *obstr) 2653load_object_str (const char *obstr)
2691{ 2654{
2692 object * 2655 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2656 char filename[MAX_BUF];
2696 2657
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2658 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2659
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2660 FILE *tempfile = fopen (filename, "w");
2701 2661
2702 if (tempfile == NULL) 2662 if (tempfile == NULL)
2703 { 2663 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2664 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2665 return NULL;
2726 * returns NULL if no match. 2686 * returns NULL if no match.
2727 */ 2687 */
2728object * 2688object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2689find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2690{
2731 object * 2691 object *tmp;
2732 tmp;
2733 2692
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2693 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2694 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2695 return tmp;
2737 2696
2745 * do the desired thing. 2704 * do the desired thing.
2746 */ 2705 */
2747key_value * 2706key_value *
2748get_ob_key_link (const object *ob, const char *key) 2707get_ob_key_link (const object *ob, const char *key)
2749{ 2708{
2750 key_value * 2709 key_value *link;
2751 link;
2752 2710
2753 for (link = ob->key_values; link != NULL; link = link->next) 2711 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2712 if (link->key == key)
2756 {
2757 return link; 2713 return link;
2758 }
2759 }
2760 2714
2761 return NULL; 2715 return NULL;
2762} 2716}
2763 2717
2764/* 2718/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines