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.39 by root, Wed Sep 13 02:05:19 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 freed.push_back (*i);//D
933 //delete *i; 910 delete *i;
934 mortals.erase (i); 911 mortals.erase (i);
935 } 912 }
936 913
937 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
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
939} 921}
940 922
941object::object () 923object::object ()
942{ 924{
943 SET_FLAG (this, FLAG_REMOVED); 925 SET_FLAG (this, FLAG_REMOVED);
944 926
945 expmul = 1.0; 927 expmul = 1.0;
946 face = blank_face; 928 face = blank_face;
947 attacked_by_count = -1;
948} 929}
949 930
950object::~object () 931object::~object ()
951{ 932{
952 free_key_values (this); 933 free_key_values (this);
953} 934}
954 935
955void object::link () 936void object::link ()
956{ 937{
957 count = ++ob_count; 938 count = ++ob_count;
939 uuid = gen_uuid ();
958 940
959 prev = 0; 941 prev = 0;
960 next = objects; 942 next = object::first;
961 943
962 if (objects) 944 if (object::first)
963 objects->prev = this; 945 object::first->prev = this;
964 946
965 objects = this; 947 object::first = this;
966} 948}
967 949
968void object::unlink () 950void object::unlink ()
969{ 951{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 952 if (this == object::first)
974 objects = next; 953 object::first = next;
975 954
976 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 956 if (prev) prev->next = next;
957 if (next) next->prev = prev;
958
980 prev = 0; 959 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 960 next = 0;
987 }
988} 961}
989 962
990object *object::create () 963object *object::create ()
991{ 964{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 965 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 966 op->link ();
1006 return op; 967 return op;
1007} 968}
1008 969
1009/* 970/*
1011 * 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
1012 * free objects. The IS_FREED() flag is set in the object. 973 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 974 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 975 * this function to succeed.
1015 * 976 *
1016 * 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
1017 * inventory to the ground. 978 * inventory to the ground.
1018 */ 979 */
1019void object::free (bool free_inventory) 980void object::destroy (bool destroy_inventory)
1020{ 981{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 982 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 983 return;
1023 984
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 985 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1029 990
1030 SET_FLAG (this, FLAG_FREED); 991 SET_FLAG (this, FLAG_FREED);
1031 992
1032 if (more) 993 if (more)
1033 { 994 {
1034 more->free (free_inventory); 995 more->destroy (destroy_inventory);
1035 more = 0; 996 more = 0;
1036 } 997 }
1037 998
1038 if (inv) 999 if (inv)
1039 { 1000 {
1040 /* Only if the space blocks everything do we not process - 1001 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 1002 * if some form of movement is allowed, let objects
1042 * drop on that space. 1003 * drop on that space.
1043 */ 1004 */
1044 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)
1045 { 1006 {
1046 object *op = inv; 1007 object *op = inv;
1047 1008
1048 while (op) 1009 while (op)
1049 { 1010 {
1050 object *tmp = op->below; 1011 object *tmp = op->below;
1051 op->free (free_inventory); 1012 op->destroy (destroy_inventory);
1052 op = tmp; 1013 op = tmp;
1053 } 1014 }
1054 } 1015 }
1055 else 1016 else
1056 { /* Put objects in inventory onto this space */ 1017 { /* Put objects in inventory onto this space */
1075 op = tmp; 1036 op = tmp;
1076 } 1037 }
1077 } 1038 }
1078 } 1039 }
1079 1040
1041 // clear those pointers that likely might have circular references to us
1080 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;
1081 1048
1082 /* Remove object from the active list */ 1049 /* Remove object from the active list */
1083 speed = 0; 1050 speed = 0;
1084 update_ob_speed (this); 1051 update_ob_speed (this);
1085 1052
1097sub_weight (object *op, signed long weight) 1064sub_weight (object *op, signed long weight)
1098{ 1065{
1099 while (op != NULL) 1066 while (op != NULL)
1100 { 1067 {
1101 if (op->type == CONTAINER) 1068 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1070
1105 op->carrying -= weight; 1071 op->carrying -= weight;
1106 op = op->env; 1072 op = op->env;
1107 } 1073 }
1108} 1074}
1109 1075
1117 */ 1083 */
1118 1084
1119void 1085void
1120remove_ob (object *op) 1086remove_ob (object *op)
1121{ 1087{
1088 object *tmp, *last = 0;
1122 object * 1089 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1090
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1091 int check_walk_off;
1132 mapstruct * 1092 maptile *m;
1133 m;
1134 1093
1135 sint16 1094 sint16 x, y;
1136 x,
1137 y;
1138 1095
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1096 if (QUERY_FLAG (op, FLAG_REMOVED))
1140 return; 1097 return;
1141 1098
1142 SET_FLAG (op, FLAG_REMOVED); 1099 SET_FLAG (op, FLAG_REMOVED);
1235 op->below = 0; 1192 op->below = 0;
1236 1193
1237 if (op->map->in_memory == MAP_SAVING) 1194 if (op->map->in_memory == MAP_SAVING)
1238 return; 1195 return;
1239 1196
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1242 1198
1243 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)
1244 { 1200 {
1245 /* 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
1260 1216
1261 tmp->contr->socket.update_look = 1; 1217 tmp->contr->socket.update_look = 1;
1262 } 1218 }
1263 1219
1264 /* See if player moving off should effect something */ 1220 /* See if player moving off should effect something */
1265 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))
1266 { 1224 {
1267 move_apply (tmp, op, NULL); 1225 move_apply (tmp, op, NULL);
1268 1226
1269 if (was_destroyed (op, tag)) 1227 if (op->destroyed ())
1270 {
1271 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 ());
1272 }
1273 } 1229 }
1274 1230
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1232
1277 if (tmp->above == tmp) 1233 if (tmp->above == tmp)
1330 free_object (op); 1286 free_object (op);
1331 return top; 1287 return top;
1332 } 1288 }
1333 } 1289 }
1334 1290
1335 return NULL; 1291 return 0;
1336} 1292}
1337 1293
1338/* 1294/*
1339 * 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
1340 * job preparing multi-part monsters 1296 * job preparing multi-part monsters
1341 */ 1297 */
1342object * 1298object *
1343insert_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)
1344{ 1300{
1345 object *tmp; 1301 object *tmp;
1346 1302
1347 if (op->head) 1303 if (op->head)
1348 op = op->head; 1304 op = op->head;
1376 * NULL if 'op' was destroyed 1332 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1333 * just 'op' otherwise
1378 */ 1334 */
1379 1335
1380object * 1336object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1337insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1338{
1383 object *tmp, *top, *floor = NULL; 1339 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1340 sint16 x, y;
1385 1341
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1342 if (QUERY_FLAG (op, FLAG_FREED))
1667 remove_ob (tmp); 1623 remove_ob (tmp);
1668 free_object (tmp); 1624 free_object (tmp);
1669 } 1625 }
1670 } 1626 }
1671 1627
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1628 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1629
1674 tmp1->x = op->x; 1630 tmp1->x = op->x;
1675 tmp1->y = op->y; 1631 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1632 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1633}
1976 */ 1932 */
1977 1933
1978int 1934int
1979check_move_on (object *op, object *originator) 1935check_move_on (object *op, object *originator)
1980{ 1936{
1981 object * 1937 object *tmp;
1982 tmp; 1938 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1939 int x = op->x, y = op->y;
1989 1940
1990 MoveType 1941 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1942
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1943 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1944 return 0;
1997
1998 tag = op->count;
1999 1945
2000 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);
2001 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);
2002 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);
2003 1949
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2010 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((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))
2066 { 2012 {
2067 move_apply (tmp, op, originator); 2013 move_apply (tmp, op, originator);
2068 2014
2069 if (was_destroyed (op, tag)) 2015 if (op->destroyed ())
2070 return 1; 2016 return 1;
2071 2017
2072 /* what the person/creature stepped onto has moved the object 2018 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 2019 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 2020 * have a feeling strange problems would result.
2086 * a matching archetype at the given map and coordinates. 2032 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 2033 * The first matching object is returned, or NULL if none.
2088 */ 2034 */
2089 2035
2090object * 2036object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 2037present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 2038{
2093 object * 2039 object *
2094 tmp; 2040 tmp;
2095 2041
2096 if (m == NULL || out_of_map (m, x, y)) 2042 if (m == NULL || out_of_map (m, x, y))
2109 * a matching type variable at the given map and coordinates. 2055 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 2056 * The first matching object is returned, or NULL if none.
2111 */ 2057 */
2112 2058
2113object * 2059object *
2114present (unsigned char type, mapstruct *m, int x, int y) 2060present (unsigned char type, maptile *m, int x, int y)
2115{ 2061{
2116 object * 2062 object *
2117 tmp; 2063 tmp;
2118 2064
2119 if (out_of_map (m, x, y)) 2065 if (out_of_map (m, x, y))
2259 * 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
2260 * customized, changed states, etc. 2206 * customized, changed states, etc.
2261 */ 2207 */
2262 2208
2263int 2209int
2264find_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)
2265{ 2211{
2266 int 2212 int
2267 i, 2213 i,
2268 index = 0, flag; 2214 index = 0, flag;
2269 static int 2215 static int
2290 return -1; 2236 return -1;
2291 return altern[RANDOM () % index]; 2237 return altern[RANDOM () % index];
2292} 2238}
2293 2239
2294/* 2240/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2241 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2242 * find_free_spot(), but it will search max number of squares.
2297 * 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.
2298 * 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.
2299 */ 2245 */
2300 2246
2301int 2247int
2302find_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)
2303{ 2249{
2304 int 2250 int
2305 i; 2251 i;
2306 2252
2307 for (i = 0; i < SIZEOFFREE; i++) 2253 for (i = 0; i < SIZEOFFREE; i++)
2371 * 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
2372 * there is capable of. 2318 * there is capable of.
2373 */ 2319 */
2374 2320
2375int 2321int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2322find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2323{
2378 int 2324 int
2379 i, 2325 i,
2380 max = SIZEOFFREE, mflags; 2326 max = SIZEOFFREE, mflags;
2381 2327
2382 sint16 nx, ny; 2328 sint16 nx, ny;
2383 object * 2329 object *
2384 tmp; 2330 tmp;
2385 mapstruct * 2331 maptile *
2386 mp; 2332 mp;
2387 2333
2388 MoveType blocked, move_type; 2334 MoveType blocked, move_type;
2389 2335
2390 if (exclude && exclude->head) 2336 if (exclude && exclude->head)
2598 * Modified to be map tile aware -.MSW 2544 * Modified to be map tile aware -.MSW
2599 */ 2545 */
2600 2546
2601 2547
2602int 2548int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2549can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2550{
2605 sint16 dx, dy; 2551 sint16 dx, dy;
2606 int 2552 int
2607 mflags; 2553 mflags;
2608 2554
2688 if (prev) 2634 if (prev)
2689 prev->more = tmp; 2635 prev->more = tmp;
2690 prev = tmp; 2636 prev = tmp;
2691 } 2637 }
2692 2638
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2639 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2640 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2641
2699 return dst; 2642 return dst;
2700} 2643}
2701 2644
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2645/* GROS - Creates an object using a string representing its content. */
2712
2713/* 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 */
2714
2715/* 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, */
2716
2717/* 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. */
2718
2719/* 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. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2650/* Also remember that multiparts objects are not supported for now. */
2722 2651
2723object * 2652object *
2724load_object_str (const char *obstr) 2653load_object_str (const char *obstr)
2725{ 2654{
2726 object * 2655 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2656 char filename[MAX_BUF];
2730 2657
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2658 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2659
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2660 FILE *tempfile = fopen (filename, "w");
2735 2661
2736 if (tempfile == NULL) 2662 if (tempfile == NULL)
2737 { 2663 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2664 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2665 return NULL;
2740 }; 2666 }
2667
2741 fprintf (tempfile, obstr); 2668 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2669 fclose (tempfile);
2743 2670
2744 op = get_object (); 2671 op = get_object ();
2745 2672
2759 * returns NULL if no match. 2686 * returns NULL if no match.
2760 */ 2687 */
2761object * 2688object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2689find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2690{
2764 object * 2691 object *tmp;
2765 tmp;
2766 2692
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2693 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2694 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2695 return tmp;
2770 2696
2778 * do the desired thing. 2704 * do the desired thing.
2779 */ 2705 */
2780key_value * 2706key_value *
2781get_ob_key_link (const object *ob, const char *key) 2707get_ob_key_link (const object *ob, const char *key)
2782{ 2708{
2783 key_value * 2709 key_value *link;
2784 link;
2785 2710
2786 for (link = ob->key_values; link != NULL; link = link->next) 2711 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2712 if (link->key == key)
2789 {
2790 return link; 2713 return link;
2791 }
2792 }
2793 2714
2794 return NULL; 2715 return NULL;
2795} 2716}
2796 2717
2797/* 2718/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines