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.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}
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 && lastmortals > 100)//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/*
1007 * 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
1008 * free objects. The IS_FREED() flag is set in the object. 973 * free objects. The IS_FREED() flag is set in the object.
1009 * The object must have been removed by remove_ob() first for 974 * The object must have been removed by remove_ob() first for
1010 * this function to succeed. 975 * this function to succeed.
1011 * 976 *
1012 * 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
1013 * inventory to the ground. 978 * inventory to the ground.
1014 */ 979 */
1015void object::free (bool free_inventory) 980void object::destroy (bool destroy_inventory)
1016{ 981{
1017 if (QUERY_FLAG (this, FLAG_FREED)) 982 if (QUERY_FLAG (this, FLAG_FREED))
1018 return; 983 return;
1019 984
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 985 if (QUERY_FLAG (this, FLAG_FRIENDLY))
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 992
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029
1030 if (more) 993 if (more)
1031 { 994 {
1032 more->free (free_inventory); 995 more->destroy (destroy_inventory);
1033 more = 0; 996 more = 0;
1034 } 997 }
1035 998
1036 if (inv) 999 if (inv)
1037 { 1000 {
1038 /* Only if the space blocks everything do we not process - 1001 /* Only if the space blocks everything do we not process -
1039 * if some form of movement is allowed, let objects 1002 * if some form of movement is allowed, let objects
1040 * drop on that space. 1003 * drop on that space.
1041 */ 1004 */
1042 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)
1043 { 1006 {
1044 object *op = inv; 1007 object *op = inv;
1045 1008
1046 while (op) 1009 while (op)
1047 { 1010 {
1048 object *tmp = op->below; 1011 object *tmp = op->below;
1049 op->free (free_inventory); 1012 op->destroy (destroy_inventory);
1050 op = tmp; 1013 op = tmp;
1051 } 1014 }
1052 } 1015 }
1053 else 1016 else
1054 { /* Put objects in inventory onto this space */ 1017 { /* Put objects in inventory onto this space */
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;
1045
1046 // only relevant for players(?), but make sure of it anyways
1047 contr = 0;
1079 1048
1080 /* Remove object from the active list */ 1049 /* Remove object from the active list */
1081 speed = 0; 1050 speed = 0;
1082 update_ob_speed (this); 1051 update_ob_speed (this);
1083 1052
1095sub_weight (object *op, signed long weight) 1064sub_weight (object *op, signed long weight)
1096{ 1065{
1097 while (op != NULL) 1066 while (op != NULL)
1098 { 1067 {
1099 if (op->type == CONTAINER) 1068 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1070
1103 op->carrying -= weight; 1071 op->carrying -= weight;
1104 op = op->env; 1072 op = op->env;
1105 } 1073 }
1106} 1074}
1107 1075
1115 */ 1083 */
1116 1084
1117void 1085void
1118remove_ob (object *op) 1086remove_ob (object *op)
1119{ 1087{
1088 object *tmp, *last = 0;
1120 object * 1089 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1090
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1091 int check_walk_off;
1130 mapstruct * 1092 maptile *m;
1131 m;
1132 1093
1133 sint16 1094 sint16 x, y;
1134 x,
1135 y;
1136 1095
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1096 if (QUERY_FLAG (op, FLAG_REMOVED))
1138 return; 1097 return;
1139 1098
1140 SET_FLAG (op, FLAG_REMOVED); 1099 SET_FLAG (op, FLAG_REMOVED);
1233 op->below = 0; 1192 op->below = 0;
1234 1193
1235 if (op->map->in_memory == MAP_SAVING) 1194 if (op->map->in_memory == MAP_SAVING)
1236 return; 1195 return;
1237 1196
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1240 1198
1241 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)
1242 { 1200 {
1243 /* 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
1258 1216
1259 tmp->contr->socket.update_look = 1; 1217 tmp->contr->socket.update_look = 1;
1260 } 1218 }
1261 1219
1262 /* See if player moving off should effect something */ 1220 /* 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)) 1221 if (check_walk_off
1222 && ((op->move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1264 { 1224 {
1265 move_apply (tmp, op, NULL); 1225 move_apply (tmp, op, NULL);
1266 1226
1267 if (was_destroyed (op, tag)) 1227 if (op->destroyed ())
1268 {
1269 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 ());
1270 }
1271 } 1229 }
1272 1230
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1232
1275 if (tmp->above == tmp) 1233 if (tmp->above == tmp)
1328 free_object (op); 1286 free_object (op);
1329 return top; 1287 return top;
1330 } 1288 }
1331 } 1289 }
1332 1290
1333 return NULL; 1291 return 0;
1334} 1292}
1335 1293
1336/* 1294/*
1337 * 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
1338 * job preparing multi-part monsters 1296 * job preparing multi-part monsters
1339 */ 1297 */
1340object * 1298object *
1341insert_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)
1342{ 1300{
1343 object *tmp; 1301 object *tmp;
1344 1302
1345 if (op->head) 1303 if (op->head)
1346 op = op->head; 1304 op = op->head;
1374 * NULL if 'op' was destroyed 1332 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1333 * just 'op' otherwise
1376 */ 1334 */
1377 1335
1378object * 1336object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1337insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1338{
1381 object *tmp, *top, *floor = NULL; 1339 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1340 sint16 x, y;
1383 1341
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1342 if (QUERY_FLAG (op, FLAG_FREED))
1665 remove_ob (tmp); 1623 remove_ob (tmp);
1666 free_object (tmp); 1624 free_object (tmp);
1667 } 1625 }
1668 } 1626 }
1669 1627
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1628 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1629
1672 tmp1->x = op->x; 1630 tmp1->x = op->x;
1673 tmp1->y = op->y; 1631 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1632 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1633}
1974 */ 1932 */
1975 1933
1976int 1934int
1977check_move_on (object *op, object *originator) 1935check_move_on (object *op, object *originator)
1978{ 1936{
1979 object * 1937 object *tmp;
1980 tmp; 1938 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1939 int x = op->x, y = op->y;
1987 1940
1988 MoveType 1941 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1942
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1943 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1944 return 0;
1995
1996 tag = op->count;
1997 1945
1998 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);
1999 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);
2000 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);
2001 1949
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2010 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)) 2011 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2064 { 2012 {
2065 move_apply (tmp, op, originator); 2013 move_apply (tmp, op, originator);
2066 2014
2067 if (was_destroyed (op, tag)) 2015 if (op->destroyed ())
2068 return 1; 2016 return 1;
2069 2017
2070 /* what the person/creature stepped onto has moved the object 2018 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 2019 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 2020 * have a feeling strange problems would result.
2084 * a matching archetype at the given map and coordinates. 2032 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 2033 * The first matching object is returned, or NULL if none.
2086 */ 2034 */
2087 2035
2088object * 2036object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 2037present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 2038{
2091 object * 2039 object *
2092 tmp; 2040 tmp;
2093 2041
2094 if (m == NULL || out_of_map (m, x, y)) 2042 if (m == NULL || out_of_map (m, x, y))
2107 * a matching type variable at the given map and coordinates. 2055 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 2056 * The first matching object is returned, or NULL if none.
2109 */ 2057 */
2110 2058
2111object * 2059object *
2112present (unsigned char type, mapstruct *m, int x, int y) 2060present (unsigned char type, maptile *m, int x, int y)
2113{ 2061{
2114 object * 2062 object *
2115 tmp; 2063 tmp;
2116 2064
2117 if (out_of_map (m, x, y)) 2065 if (out_of_map (m, x, y))
2257 * 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
2258 * customized, changed states, etc. 2206 * customized, changed states, etc.
2259 */ 2207 */
2260 2208
2261int 2209int
2262find_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)
2263{ 2211{
2264 int 2212 int
2265 i, 2213 i,
2266 index = 0, flag; 2214 index = 0, flag;
2267 static int 2215 static int
2288 return -1; 2236 return -1;
2289 return altern[RANDOM () % index]; 2237 return altern[RANDOM () % index];
2290} 2238}
2291 2239
2292/* 2240/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2241 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2242 * find_free_spot(), but it will search max number of squares.
2295 * 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.
2296 * 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.
2297 */ 2245 */
2298 2246
2299int 2247int
2300find_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)
2301{ 2249{
2302 int 2250 int
2303 i; 2251 i;
2304 2252
2305 for (i = 0; i < SIZEOFFREE; i++) 2253 for (i = 0; i < SIZEOFFREE; i++)
2369 * 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
2370 * there is capable of. 2318 * there is capable of.
2371 */ 2319 */
2372 2320
2373int 2321int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2322find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2323{
2376 int 2324 int
2377 i, 2325 i,
2378 max = SIZEOFFREE, mflags; 2326 max = SIZEOFFREE, mflags;
2379 2327
2380 sint16 nx, ny; 2328 sint16 nx, ny;
2381 object * 2329 object *
2382 tmp; 2330 tmp;
2383 mapstruct * 2331 maptile *
2384 mp; 2332 mp;
2385 2333
2386 MoveType blocked, move_type; 2334 MoveType blocked, move_type;
2387 2335
2388 if (exclude && exclude->head) 2336 if (exclude && exclude->head)
2596 * Modified to be map tile aware -.MSW 2544 * Modified to be map tile aware -.MSW
2597 */ 2545 */
2598 2546
2599 2547
2600int 2548int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2549can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2550{
2603 sint16 dx, dy; 2551 sint16 dx, dy;
2604 int 2552 int
2605 mflags; 2553 mflags;
2606 2554
2686 if (prev) 2634 if (prev)
2687 prev->more = tmp; 2635 prev->more = tmp;
2688 prev = tmp; 2636 prev = tmp;
2689 } 2637 }
2690 2638
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2639 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2640 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2641
2697 return dst; 2642 return dst;
2698} 2643}
2699 2644
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. */ 2645/* 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 */ 2646/* 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, */ 2647/* 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. */ 2648/* 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. */ 2649/* Remember not to use load_object_str in a time-critical situation. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2650/* Also remember that multiparts objects are not supported for now. */
2720 2651
2721object * 2652object *
2722load_object_str (const char *obstr) 2653load_object_str (const char *obstr)
2723{ 2654{
2724 object * 2655 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2656 char filename[MAX_BUF];
2728 2657
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2658 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2659
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2660 FILE *tempfile = fopen (filename, "w");
2733 2661
2734 if (tempfile == NULL) 2662 if (tempfile == NULL)
2735 { 2663 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2664 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2665 return NULL;
2758 * returns NULL if no match. 2686 * returns NULL if no match.
2759 */ 2687 */
2760object * 2688object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2689find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2690{
2763 object * 2691 object *tmp;
2764 tmp;
2765 2692
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2693 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2694 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2695 return tmp;
2769 2696
2777 * do the desired thing. 2704 * do the desired thing.
2778 */ 2705 */
2779key_value * 2706key_value *
2780get_ob_key_link (const object *ob, const char *key) 2707get_ob_key_link (const object *ob, const char *key)
2781{ 2708{
2782 key_value * 2709 key_value *link;
2783 link;
2784 2710
2785 for (link = ob->key_values; link != NULL; link = link->next) 2711 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2712 if (link->key == key)
2788 {
2789 return link; 2713 return link;
2790 }
2791 }
2792 2714
2793 return NULL; 2715 return NULL;
2794} 2716}
2795 2717
2796/* 2718/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines