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.42 by root, Thu Sep 14 01:19:47 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}
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;
900object::vector object::objects; // not yet used
901object *object::first;
923 902
924void object::free_mortals () 903void object::free_mortals ()
925{ 904{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 905 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 906 if ((*i)->refcnt)
928 ++i; // further delay freeing 907 ++i; // further delay freeing
929 else 908 else
930 { 909 {
931 delete *i; 910 delete *i;
932 mortals.erase (i); 911 mortals.erase (i);
933 } 912 }
934 913
935 static int lastmortals = 0;//D 914 static int lastmortals = 0;//D
936 915
937 if (mortals.size() != lastmortals)//D 916 if (mortals.size() != lastmortals && lastmortals > 100)//D
938 { 917 {
939 lastmortals = mortals.size ();//D 918 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D 919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 } 920 }
942} 921}
… …
945{ 924{
946 SET_FLAG (this, FLAG_REMOVED); 925 SET_FLAG (this, FLAG_REMOVED);
947 926
948 expmul = 1.0; 927 expmul = 1.0;
949 face = blank_face; 928 face = blank_face;
950 attacked_by_count = -1;
951} 929}
952 930
953object::~object () 931object::~object ()
954{ 932{
955 free_key_values (this); 933 free_key_values (this);
… …
959{ 937{
960 count = ++ob_count; 938 count = ++ob_count;
961 uuid = gen_uuid (); 939 uuid = gen_uuid ();
962 940
963 prev = 0; 941 prev = 0;
964 next = objects; 942 next = object::first;
965 943
966 if (objects) 944 if (object::first)
967 objects->prev = this; 945 object::first->prev = this;
968 946
969 objects = this; 947 object::first = this;
970} 948}
971 949
972void object::unlink () 950void object::unlink ()
973{ 951{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 952 if (this == object::first)
978 objects = next; 953 object::first = next;
979 954
980 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 956 if (prev) prev->next = next;
982 if (next) next->prev = prev; 957 if (next) next->prev = prev;
983 958
… …
1061 op = tmp; 1036 op = tmp;
1062 } 1037 }
1063 } 1038 }
1064 } 1039 }
1065 1040
1041 // clear those pointers that likely might have circular references to us
1066 owner = 0; 1042 owner = 0;
1043 enemy = 0;
1044 attacked_by = 0;
1067 1045
1068 /* Remove object from the active list */ 1046 /* Remove object from the active list */
1069 speed = 0; 1047 speed = 0;
1070 update_ob_speed (this); 1048 update_ob_speed (this);
1071 1049
… …
1083sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1084{ 1062{
1085 while (op != NULL) 1063 while (op != NULL)
1086 { 1064 {
1087 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1067
1091 op->carrying -= weight; 1068 op->carrying -= weight;
1092 op = op->env; 1069 op = op->env;
1093 } 1070 }
1094} 1071}
1095 1072
… …
1103 */ 1080 */
1104 1081
1105void 1082void
1106remove_ob (object *op) 1083remove_ob (object *op)
1107{ 1084{
1085 object *tmp, *last = 0;
1108 object * 1086 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1087
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1088 int check_walk_off;
1118 mapstruct * 1089 maptile *m;
1119 m;
1120 1090
1121 sint16 1091 sint16 x, y;
1122 x,
1123 y;
1124 1092
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1126 return; 1094 return;
1127 1095
1128 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
… …
1221 op->below = 0; 1189 op->below = 0;
1222 1190
1223 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1224 return; 1192 return;
1225 1193
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1228 1195
1229 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)
1230 { 1197 {
1231 /* 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
… …
1246 1213
1247 tmp->contr->socket.update_look = 1; 1214 tmp->contr->socket.update_look = 1;
1248 } 1215 }
1249 1216
1250 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1251 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))
1252 { 1221 {
1253 move_apply (tmp, op, NULL); 1222 move_apply (tmp, op, NULL);
1254 1223
1255 if (was_destroyed (op, tag)) 1224 if (op->destroyed ())
1256 {
1257 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 ());
1258 }
1259 } 1226 }
1260 1227
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1228 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1229
1263 if (tmp->above == tmp) 1230 if (tmp->above == tmp)
… …
1316 free_object (op); 1283 free_object (op);
1317 return top; 1284 return top;
1318 } 1285 }
1319 } 1286 }
1320 1287
1321 return NULL; 1288 return 0;
1322} 1289}
1323 1290
1324/* 1291/*
1325 * 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
1326 * job preparing multi-part monsters 1293 * job preparing multi-part monsters
1327 */ 1294 */
1328object * 1295object *
1329insert_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)
1330{ 1297{
1331 object *tmp; 1298 object *tmp;
1332 1299
1333 if (op->head) 1300 if (op->head)
1334 op = op->head; 1301 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1329 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1330 * just 'op' otherwise
1364 */ 1331 */
1365 1332
1366object * 1333object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1334insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1335{
1369 object *tmp, *top, *floor = NULL; 1336 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1337 sint16 x, y;
1371 1338
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1339 if (QUERY_FLAG (op, FLAG_FREED))
… …
1653 remove_ob (tmp); 1620 remove_ob (tmp);
1654 free_object (tmp); 1621 free_object (tmp);
1655 } 1622 }
1656 } 1623 }
1657 1624
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1625 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1626
1660 tmp1->x = op->x; 1627 tmp1->x = op->x;
1661 tmp1->y = op->y; 1628 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1629 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1630}
… …
1962 */ 1929 */
1963 1930
1964int 1931int
1965check_move_on (object *op, object *originator) 1932check_move_on (object *op, object *originator)
1966{ 1933{
1967 object * 1934 object *tmp;
1968 tmp; 1935 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1936 int x = op->x, y = op->y;
1975 1937
1976 MoveType 1938 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1939
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1940 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1941 return 0;
1983
1984 tag = op->count;
1985 1942
1986 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);
1987 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);
1988 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);
1989 1946
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2007 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((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))
2052 { 2009 {
2053 move_apply (tmp, op, originator); 2010 move_apply (tmp, op, originator);
2054 2011
2055 if (was_destroyed (op, tag)) 2012 if (op->destroyed ())
2056 return 1; 2013 return 1;
2057 2014
2058 /* what the person/creature stepped onto has moved the object 2015 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 2016 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 2017 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 2029 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 2030 * The first matching object is returned, or NULL if none.
2074 */ 2031 */
2075 2032
2076object * 2033object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 2034present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 2035{
2079 object * 2036 object *
2080 tmp; 2037 tmp;
2081 2038
2082 if (m == NULL || out_of_map (m, x, y)) 2039 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 2052 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 2053 * The first matching object is returned, or NULL if none.
2097 */ 2054 */
2098 2055
2099object * 2056object *
2100present (unsigned char type, mapstruct *m, int x, int y) 2057present (unsigned char type, maptile *m, int x, int y)
2101{ 2058{
2102 object * 2059 object *
2103 tmp; 2060 tmp;
2104 2061
2105 if (out_of_map (m, x, y)) 2062 if (out_of_map (m, x, y))
… …
2245 * 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
2246 * customized, changed states, etc. 2203 * customized, changed states, etc.
2247 */ 2204 */
2248 2205
2249int 2206int
2250find_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)
2251{ 2208{
2252 int 2209 int
2253 i, 2210 i,
2254 index = 0, flag; 2211 index = 0, flag;
2255 static int 2212 static int
… …
2276 return -1; 2233 return -1;
2277 return altern[RANDOM () % index]; 2234 return altern[RANDOM () % index];
2278} 2235}
2279 2236
2280/* 2237/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2238 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2239 * find_free_spot(), but it will search max number of squares.
2283 * 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.
2284 * 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.
2285 */ 2242 */
2286 2243
2287int 2244int
2288find_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)
2289{ 2246{
2290 int 2247 int
2291 i; 2248 i;
2292 2249
2293 for (i = 0; i < SIZEOFFREE; i++) 2250 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * 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
2358 * there is capable of. 2315 * there is capable of.
2359 */ 2316 */
2360 2317
2361int 2318int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2319find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2320{
2364 int 2321 int
2365 i, 2322 i,
2366 max = SIZEOFFREE, mflags; 2323 max = SIZEOFFREE, mflags;
2367 2324
2368 sint16 nx, ny; 2325 sint16 nx, ny;
2369 object * 2326 object *
2370 tmp; 2327 tmp;
2371 mapstruct * 2328 maptile *
2372 mp; 2329 mp;
2373 2330
2374 MoveType blocked, move_type; 2331 MoveType blocked, move_type;
2375 2332
2376 if (exclude && exclude->head) 2333 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2541 * Modified to be map tile aware -.MSW
2585 */ 2542 */
2586 2543
2587 2544
2588int 2545int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2546can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2547{
2591 sint16 dx, dy; 2548 sint16 dx, dy;
2592 int 2549 int
2593 mflags; 2550 mflags;
2594 2551
… …
2674 if (prev) 2631 if (prev)
2675 prev->more = tmp; 2632 prev->more = tmp;
2676 prev = tmp; 2633 prev = tmp;
2677 } 2634 }
2678 2635
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2636 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2637 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2638
2685 return dst; 2639 return dst;
2686} 2640}
2687 2641
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2642/* GROS - Creates an object using a string representing its content. */
2698
2699/* 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 */
2700
2701/* 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, */
2702
2703/* 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. */
2704
2705/* 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. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2647/* Also remember that multiparts objects are not supported for now. */
2708 2648
2709object * 2649object *
2710load_object_str (const char *obstr) 2650load_object_str (const char *obstr)
2711{ 2651{
2712 object * 2652 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2653 char filename[MAX_BUF];
2716 2654
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2655 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2656
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2657 FILE *tempfile = fopen (filename, "w");
2721 2658
2722 if (tempfile == NULL) 2659 if (tempfile == NULL)
2723 { 2660 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2661 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2662 return NULL;
… …
2746 * returns NULL if no match. 2683 * returns NULL if no match.
2747 */ 2684 */
2748object * 2685object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2686find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2687{
2751 object * 2688 object *tmp;
2752 tmp;
2753 2689
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2690 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2691 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2692 return tmp;
2757 2693
… …
2765 * do the desired thing. 2701 * do the desired thing.
2766 */ 2702 */
2767key_value * 2703key_value *
2768get_ob_key_link (const object *ob, const char *key) 2704get_ob_key_link (const object *ob, const char *key)
2769{ 2705{
2770 key_value * 2706 key_value *link;
2771 link;
2772 2707
2773 for (link = ob->key_values; link != NULL; link = link->next) 2708 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2709 if (link->key == key)
2776 {
2777 return link; 2710 return link;
2778 }
2779 }
2780 2711
2781 return NULL; 2712 return NULL;
2782} 2713}
2783 2714
2784/* 2715/*

Diff Legend

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