… | |
… | |
254 | /* This is really a spellbook check - really, we should |
254 | /* This is really a spellbook check - really, we should |
255 | * check all objects in the inventory. |
255 | * check all objects in the inventory. |
256 | */ |
256 | */ |
257 | if (ob1->inv || ob2->inv) |
257 | if (ob1->inv || ob2->inv) |
258 | { |
258 | { |
259 | /* if one object has inventory but the other doesn't, not equiv */ |
259 | if (!(ob1->inv && ob2->inv)) |
260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
260 | return 0; /* inventories differ in length */ |
261 | return 0; |
|
|
262 | |
261 | |
263 | /* Now check to see if the two inventory objects could merge */ |
262 | if (ob1->inv->below || ob2->inv->below) |
|
|
263 | return 0; /* more than one object in inv */ |
|
|
264 | |
264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | return 0; |
266 | return 0; /* inventory objexts differ */ |
266 | |
267 | |
267 | /* inventory ok - still need to check rest of this object to see |
268 | /* inventory ok - still need to check rest of this object to see |
268 | * if it is valid. |
269 | * if it is valid. |
269 | */ |
270 | */ |
270 | } |
271 | } |
… | |
… | |
305 | { |
306 | { |
306 | ob1->optimise (); |
307 | ob1->optimise (); |
307 | ob2->optimise (); |
308 | ob2->optimise (); |
308 | |
309 | |
309 | if (ob1->self || ob2->self) |
310 | if (ob1->self || ob2->self) |
310 | if (!cfperl_can_merge (ob1, ob2)) |
311 | { |
|
|
312 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
313 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
314 | |
|
|
315 | if (k1 != k2) |
311 | return 0; |
316 | return 0; |
|
|
317 | else if (k1 == 0) |
|
|
318 | return 1; |
|
|
319 | else if (!cfperl_can_merge (ob1, ob2)) |
|
|
320 | return 0; |
|
|
321 | } |
312 | } |
322 | } |
313 | |
323 | |
314 | /* Everything passes, must be OK. */ |
324 | /* Everything passes, must be OK. */ |
315 | return 1; |
325 | return 1; |
316 | } |
326 | } |
… | |
… | |
374 | /* |
384 | /* |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
385 | * get_nearest_part(multi-object, object 2) returns the part of the |
376 | * multi-object 1 which is closest to the second object. |
386 | * multi-object 1 which is closest to the second object. |
377 | * If it's not a multi-object, it is returned. |
387 | * If it's not a multi-object, it is returned. |
378 | */ |
388 | */ |
379 | |
|
|
380 | object * |
389 | object * |
381 | get_nearest_part (object *op, const object *pl) |
390 | get_nearest_part (object *op, const object *pl) |
382 | { |
391 | { |
383 | object *tmp, *closest; |
392 | object *tmp, *closest; |
384 | int last_dist, i; |
393 | int last_dist, i; |
… | |
… | |
429 | } |
438 | } |
430 | |
439 | |
431 | /* |
440 | /* |
432 | * Sets the owner and sets the skill and exp pointers to owner's current |
441 | * Sets the owner and sets the skill and exp pointers to owner's current |
433 | * skill and experience objects. |
442 | * skill and experience objects. |
|
|
443 | * ACTUALLY NO! investigate! TODO |
434 | */ |
444 | */ |
435 | void |
445 | void |
436 | object::set_owner (object *owner) |
446 | object::set_owner (object *owner) |
437 | { |
447 | { |
|
|
448 | // allow objects which own objects |
438 | if (!owner) |
449 | if (owner) |
439 | return; |
|
|
440 | |
|
|
441 | /* next line added to allow objects which own objects */ |
|
|
442 | /* Add a check for ownercounts in here, as I got into an endless loop |
|
|
443 | * with the fireball owning a poison cloud which then owned the |
|
|
444 | * fireball. I believe that was caused by one of the objects getting |
|
|
445 | * freed and then another object replacing it. Since the ownercounts |
|
|
446 | * didn't match, this check is valid and I believe that cause is valid. |
|
|
447 | */ |
|
|
448 | while (owner->owner) |
450 | while (owner->owner) |
449 | owner = owner->owner; |
451 | owner = owner->owner; |
450 | |
452 | |
451 | this->owner = owner; |
453 | this->owner = owner; |
452 | } |
454 | } |
453 | |
455 | |
454 | int |
456 | int |
… | |
… | |
586 | object::copy_to (object *dst) |
588 | object::copy_to (object *dst) |
587 | { |
589 | { |
588 | *dst = *this; |
590 | *dst = *this; |
589 | |
591 | |
590 | if (speed < 0) |
592 | if (speed < 0) |
591 | dst->speed_left = speed_left - rndm (); |
593 | dst->speed_left -= rndm (); |
592 | |
594 | |
593 | dst->set_speed (dst->speed); |
595 | dst->set_speed (dst->speed); |
594 | } |
596 | } |
595 | |
597 | |
596 | void |
598 | void |
… | |
… | |
923 | |
925 | |
924 | if (!freed_map) |
926 | if (!freed_map) |
925 | { |
927 | { |
926 | freed_map = new maptile; |
928 | freed_map = new maptile; |
927 | |
929 | |
|
|
930 | freed_map->path = "<freed objects map>"; |
928 | freed_map->name = "/internal/freed_objects_map"; |
931 | freed_map->name = "/internal/freed_objects_map"; |
929 | freed_map->width = 3; |
932 | freed_map->width = 3; |
930 | freed_map->height = 3; |
933 | freed_map->height = 3; |
931 | |
934 | |
932 | freed_map->alloc (); |
935 | freed_map->alloc (); |
… | |
… | |
960 | return; |
963 | return; |
961 | |
964 | |
962 | if (destroy_inventory) |
965 | if (destroy_inventory) |
963 | destroy_inv (false); |
966 | destroy_inv (false); |
964 | |
967 | |
|
|
968 | if (is_head ()) |
965 | if (sound_destroy) |
969 | if (sound_destroy) |
966 | play_sound (sound_destroy); |
970 | play_sound (sound_destroy); |
967 | else if (flag [FLAG_MONSTER]) |
971 | else if (flag [FLAG_MONSTER]) |
968 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
972 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
969 | |
973 | |
970 | attachable::destroy (); |
974 | attachable::destroy (); |
971 | } |
975 | } |
972 | |
976 | |
973 | /* |
977 | /* |
… | |
… | |
1088 | if (map->in_memory == MAP_SAVING) |
1092 | if (map->in_memory == MAP_SAVING) |
1089 | return; |
1093 | return; |
1090 | |
1094 | |
1091 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1095 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1092 | |
1096 | |
|
|
1097 | if (object *pl = ms.player ()) |
|
|
1098 | { |
|
|
1099 | if (pl->container == this) |
|
|
1100 | /* If a container that the player is currently using somehow gets |
|
|
1101 | * removed (most likely destroyed), update the player view |
|
|
1102 | * appropriately. |
|
|
1103 | */ |
|
|
1104 | pl->close_container (); |
|
|
1105 | |
|
|
1106 | pl->contr->ns->floorbox_update (); |
|
|
1107 | } |
|
|
1108 | |
1093 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1109 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1094 | { |
1110 | { |
1095 | /* No point updating the players look faces if he is the object |
1111 | /* No point updating the players look faces if he is the object |
1096 | * being removed. |
1112 | * being removed. |
1097 | */ |
1113 | */ |
1098 | |
|
|
1099 | if (tmp->type == PLAYER && tmp != this) |
|
|
1100 | { |
|
|
1101 | /* If a container that the player is currently using somehow gets |
|
|
1102 | * removed (most likely destroyed), update the player view |
|
|
1103 | * appropriately. |
|
|
1104 | */ |
|
|
1105 | if (tmp->container == this) |
|
|
1106 | { |
|
|
1107 | flag [FLAG_APPLIED] = 0; |
|
|
1108 | tmp->container = 0; |
|
|
1109 | } |
|
|
1110 | |
|
|
1111 | if (tmp->contr->ns) |
|
|
1112 | tmp->contr->ns->floorbox_update (); |
|
|
1113 | } |
|
|
1114 | |
1114 | |
1115 | /* See if object moving off should effect something */ |
1115 | /* See if object moving off should effect something */ |
1116 | if (check_walk_off |
1116 | if (check_walk_off |
1117 | && ((move_type & tmp->move_off) |
1117 | && ((move_type & tmp->move_off) |
1118 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1118 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1150 | merge_ob (object *op, object *top) |
1150 | merge_ob (object *op, object *top) |
1151 | { |
1151 | { |
1152 | if (!op->nrof) |
1152 | if (!op->nrof) |
1153 | return 0; |
1153 | return 0; |
1154 | |
1154 | |
1155 | if (top) |
1155 | if (!top) |
1156 | for (top = op; top && top->above; top = top->above) |
1156 | for (top = op; top && top->above; top = top->above) |
1157 | ; |
1157 | ; |
1158 | |
1158 | |
1159 | for (; top; top = top->below) |
1159 | for (; top; top = top->below) |
1160 | { |
1160 | { |
… | |
… | |
1241 | |
1241 | |
1242 | object *top, *floor = NULL; |
1242 | object *top, *floor = NULL; |
1243 | |
1243 | |
1244 | op->remove (); |
1244 | op->remove (); |
1245 | |
1245 | |
1246 | #if 0 |
|
|
1247 | if (!m->active != !op->active) |
|
|
1248 | if (m->active) |
|
|
1249 | op->activate_recursive (); |
|
|
1250 | else |
|
|
1251 | op->deactivate_recursive (); |
|
|
1252 | #endif |
|
|
1253 | |
|
|
1254 | if (out_of_map (m, op->x, op->y)) |
|
|
1255 | { |
|
|
1256 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
1257 | #ifdef MANY_CORES |
|
|
1258 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1259 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1260 | * improperly inserted. |
|
|
1261 | */ |
|
|
1262 | abort (); |
|
|
1263 | #endif |
|
|
1264 | return op; |
|
|
1265 | } |
|
|
1266 | |
|
|
1267 | if (object *more = op->more) |
|
|
1268 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1269 | return 0; |
|
|
1270 | |
|
|
1271 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1272 | |
|
|
1273 | /* Ideally, the caller figures this out. However, it complicates a lot |
1246 | /* Ideally, the caller figures this out. However, it complicates a lot |
1274 | * of areas of callers (eg, anything that uses find_free_spot would now |
1247 | * of areas of callers (eg, anything that uses find_free_spot would now |
1275 | * need extra work |
1248 | * need extra work |
1276 | */ |
1249 | */ |
1277 | if (!xy_normalise (m, op->x, op->y)) |
1250 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1251 | { |
|
|
1252 | op->destroy (); |
1278 | return 0; |
1253 | return 0; |
|
|
1254 | } |
|
|
1255 | |
|
|
1256 | if (object *more = op->more) |
|
|
1257 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1258 | return 0; |
|
|
1259 | |
|
|
1260 | CLEAR_FLAG (op, FLAG_REMOVED); |
1279 | |
1261 | |
1280 | op->map = m; |
1262 | op->map = m; |
1281 | mapspace &ms = op->ms (); |
1263 | mapspace &ms = op->ms (); |
1282 | |
1264 | |
1283 | /* this has to be done after we translate the coordinates. |
1265 | /* this has to be done after we translate the coordinates. |
… | |
… | |
1318 | else |
1300 | else |
1319 | { |
1301 | { |
1320 | top = ms.bot; |
1302 | top = ms.bot; |
1321 | |
1303 | |
1322 | /* If there are other objects, then */ |
1304 | /* If there are other objects, then */ |
1323 | if ((!(flag & INS_MAP_LOAD)) && top) |
1305 | if (top) |
1324 | { |
1306 | { |
1325 | object *last = 0; |
1307 | object *last = 0; |
1326 | |
1308 | |
1327 | /* |
1309 | /* |
1328 | * If there are multiple objects on this space, we do some trickier handling. |
1310 | * If there are multiple objects on this space, we do some trickier handling. |
… | |
… | |
1380 | */ |
1362 | */ |
1381 | if (last && last->below && last != floor) |
1363 | if (last && last->below && last != floor) |
1382 | top = last->below; |
1364 | top = last->below; |
1383 | } |
1365 | } |
1384 | } /* If objects on this space */ |
1366 | } /* If objects on this space */ |
1385 | if (flag & INS_MAP_LOAD) |
|
|
1386 | top = ms.top; |
|
|
1387 | |
1367 | |
1388 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1368 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1389 | top = floor; |
1369 | top = floor; |
1390 | |
1370 | |
1391 | /* Top is the object that our object (op) is going to get inserted above. |
1371 | /* Top is the object that our object (op) is going to get inserted above. |
… | |
… | |
1424 | op->map->touch (); |
1404 | op->map->touch (); |
1425 | } |
1405 | } |
1426 | |
1406 | |
1427 | op->map->dirty = true; |
1407 | op->map->dirty = true; |
1428 | |
1408 | |
1429 | /* If we have a floor, we know the player, if any, will be above |
|
|
1430 | * it, so save a few ticks and start from there. |
|
|
1431 | */ |
|
|
1432 | if (!(flag & INS_MAP_LOAD)) |
|
|
1433 | if (object *pl = ms.player ()) |
1409 | if (object *pl = ms.player ()) |
1434 | if (pl->contr->ns) |
|
|
1435 | pl->contr->ns->floorbox_update (); |
1410 | pl->contr->ns->floorbox_update (); |
1436 | |
1411 | |
1437 | /* If this object glows, it may affect lighting conditions that are |
1412 | /* If this object glows, it may affect lighting conditions that are |
1438 | * visible to others on this map. But update_all_los is really |
1413 | * visible to others on this map. But update_all_los is really |
1439 | * an inefficient way to do this, as it means los for all players |
1414 | * an inefficient way to do this, as it means los for all players |
1440 | * on the map will get recalculated. The players could very well |
1415 | * on the map will get recalculated. The players could very well |
… | |
… | |
1678 | * be != op, if items are merged. -Tero |
1653 | * be != op, if items are merged. -Tero |
1679 | */ |
1654 | */ |
1680 | object * |
1655 | object * |
1681 | object::insert (object *op) |
1656 | object::insert (object *op) |
1682 | { |
1657 | { |
1683 | object *tmp, *otmp; |
|
|
1684 | |
|
|
1685 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1658 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1686 | op->remove (); |
1659 | op->remove (); |
1687 | |
1660 | |
1688 | if (op->more) |
1661 | if (op->more) |
1689 | { |
1662 | { |
… | |
… | |
1691 | return op; |
1664 | return op; |
1692 | } |
1665 | } |
1693 | |
1666 | |
1694 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1667 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1695 | CLEAR_FLAG (op, FLAG_REMOVED); |
1668 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1669 | |
1696 | if (op->nrof) |
1670 | if (op->nrof) |
1697 | { |
1671 | { |
1698 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1672 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1699 | if (object::can_merge (tmp, op)) |
1673 | if (object::can_merge (tmp, op)) |
1700 | { |
1674 | { |
1701 | /* return the original object and remove inserted object |
1675 | /* return the original object and remove inserted object |
1702 | (client needs the original object) */ |
1676 | (client needs the original object) */ |
1703 | tmp->nrof += op->nrof; |
1677 | tmp->nrof += op->nrof; |
… | |
… | |
1722 | add_weight (this, op->weight * op->nrof); |
1696 | add_weight (this, op->weight * op->nrof); |
1723 | } |
1697 | } |
1724 | else |
1698 | else |
1725 | add_weight (this, (op->weight + op->carrying)); |
1699 | add_weight (this, (op->weight + op->carrying)); |
1726 | |
1700 | |
1727 | otmp = this->in_player (); |
1701 | if (object *otmp = this->in_player ()) |
1728 | if (otmp && otmp->contr) |
|
|
1729 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1702 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1730 | otmp->update_stats (); |
1703 | otmp->update_stats (); |
1731 | |
1704 | |
|
|
1705 | op->owner = 0; // its his/hers now. period. |
1732 | op->map = 0; |
1706 | op->map = 0; |
1733 | op->env = this; |
1707 | op->env = this; |
1734 | op->above = 0; |
1708 | op->above = 0; |
1735 | op->below = 0; |
1709 | op->below = 0; |
1736 | op->x = 0, op->y = 0; |
1710 | op->x = op->y = 0; |
1737 | |
1711 | |
1738 | /* reset the light list and los of the players on the map */ |
1712 | /* reset the light list and los of the players on the map */ |
1739 | if ((op->glow_radius != 0) && map) |
1713 | if (op->glow_radius && map) |
1740 | { |
1714 | { |
1741 | #ifdef DEBUG_LIGHTS |
1715 | #ifdef DEBUG_LIGHTS |
1742 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1716 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1743 | #endif /* DEBUG_LIGHTS */ |
1717 | #endif /* DEBUG_LIGHTS */ |
1744 | if (map->darkness) |
1718 | if (map->darkness) |
… | |
… | |
2009 | * to search (see the freearr_x/y[] definition). |
1983 | * to search (see the freearr_x/y[] definition). |
2010 | * It returns a random choice among the alternatives found. |
1984 | * It returns a random choice among the alternatives found. |
2011 | * start and stop are where to start relative to the free_arr array (1,9 |
1985 | * start and stop are where to start relative to the free_arr array (1,9 |
2012 | * does all 4 immediate directions). This returns the index into the |
1986 | * does all 4 immediate directions). This returns the index into the |
2013 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1987 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
2014 | * Note - this only checks to see if there is space for the head of the |
|
|
2015 | * object - if it is a multispace object, this should be called for all |
|
|
2016 | * pieces. |
|
|
2017 | * Note2: This function does correctly handle tiled maps, but does not |
1988 | * Note: This function does correctly handle tiled maps, but does not |
2018 | * inform the caller. However, insert_ob_in_map will update as |
1989 | * inform the caller. However, insert_ob_in_map will update as |
2019 | * necessary, so the caller shouldn't need to do any special work. |
1990 | * necessary, so the caller shouldn't need to do any special work. |
2020 | * Note - updated to take an object instead of archetype - this is necessary |
1991 | * Note - updated to take an object instead of archetype - this is necessary |
2021 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1992 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2022 | * to know if the space in question will block the object. We can't use |
1993 | * to know if the space in question will block the object. We can't use |
… | |
… | |
2024 | * customized, changed states, etc. |
1995 | * customized, changed states, etc. |
2025 | */ |
1996 | */ |
2026 | int |
1997 | int |
2027 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1998 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2028 | { |
1999 | { |
|
|
2000 | int altern[SIZEOFFREE]; |
2029 | int index = 0, flag; |
2001 | int index = 0, flag; |
2030 | int altern[SIZEOFFREE]; |
|
|
2031 | |
2002 | |
2032 | for (int i = start; i < stop; i++) |
2003 | for (int i = start; i < stop; i++) |
2033 | { |
2004 | { |
2034 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2005 | mapxy pos (m, x, y); pos.move (i); |
2035 | if (!flag) |
2006 | |
|
|
2007 | if (!pos.normalise ()) |
|
|
2008 | continue; |
|
|
2009 | |
|
|
2010 | mapspace &ms = *pos; |
|
|
2011 | |
|
|
2012 | if (ms.flags () & P_IS_ALIVE) |
|
|
2013 | continue; |
|
|
2014 | |
|
|
2015 | /* However, often |
|
|
2016 | * ob doesn't have any move type (when used to place exits) |
|
|
2017 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2018 | */ |
|
|
2019 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2020 | { |
2036 | altern [index++] = i; |
2021 | altern [index++] = i; |
|
|
2022 | continue; |
|
|
2023 | } |
2037 | |
2024 | |
2038 | /* Basically, if we find a wall on a space, we cut down the search size. |
2025 | /* Basically, if we find a wall on a space, we cut down the search size. |
2039 | * In this way, we won't return spaces that are on another side of a wall. |
2026 | * In this way, we won't return spaces that are on another side of a wall. |
2040 | * This mostly work, but it cuts down the search size in all directions - |
2027 | * This mostly work, but it cuts down the search size in all directions - |
2041 | * if the space being examined only has a wall to the north and empty |
2028 | * if the space being examined only has a wall to the north and empty |
2042 | * spaces in all the other directions, this will reduce the search space |
2029 | * spaces in all the other directions, this will reduce the search space |
2043 | * to only the spaces immediately surrounding the target area, and |
2030 | * to only the spaces immediately surrounding the target area, and |
2044 | * won't look 2 spaces south of the target space. |
2031 | * won't look 2 spaces south of the target space. |
2045 | */ |
2032 | */ |
2046 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2033 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2034 | { |
2047 | stop = maxfree[i]; |
2035 | stop = maxfree[i]; |
|
|
2036 | continue; |
|
|
2037 | } |
|
|
2038 | |
|
|
2039 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2040 | * head of the object should correspond for the entire object. |
|
|
2041 | */ |
|
|
2042 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2043 | continue; |
|
|
2044 | |
|
|
2045 | if (ob->blocked (m, pos.x, pos.y)) |
|
|
2046 | continue; |
|
|
2047 | |
|
|
2048 | altern [index++] = i; |
2048 | } |
2049 | } |
2049 | |
2050 | |
2050 | if (!index) |
2051 | if (!index) |
2051 | return -1; |
2052 | return -1; |
2052 | |
2053 | |
… | |
… | |
2061 | */ |
2062 | */ |
2062 | int |
2063 | int |
2063 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2064 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2064 | { |
2065 | { |
2065 | for (int i = 0; i < SIZEOFFREE; i++) |
2066 | for (int i = 0; i < SIZEOFFREE; i++) |
2066 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2067 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2067 | return i; |
2068 | return i; |
2068 | |
2069 | |
2069 | return -1; |
2070 | return -1; |
2070 | } |
2071 | } |
2071 | |
2072 | |
… | |
… | |
2348 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2349 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2349 | * core dumps if they do. |
2350 | * core dumps if they do. |
2350 | * |
2351 | * |
2351 | * Add a check so we can't pick up invisible objects (0.93.8) |
2352 | * Add a check so we can't pick up invisible objects (0.93.8) |
2352 | */ |
2353 | */ |
2353 | |
|
|
2354 | int |
2354 | int |
2355 | can_pick (const object *who, const object *item) |
2355 | can_pick (const object *who, const object *item) |
2356 | { |
2356 | { |
2357 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2357 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2358 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2358 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2616 | &name, |
2616 | &name, |
2617 | title ? "\",title:\"" : "", |
2617 | title ? "\",title:\"" : "", |
2618 | title ? (const char *)title : "", |
2618 | title ? (const char *)title : "", |
2619 | flag_desc (flagdesc, 512), type); |
2619 | flag_desc (flagdesc, 512), type); |
2620 | |
2620 | |
2621 | if (env) |
2621 | if (!this->flag[FLAG_REMOVED] && env) |
2622 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2622 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2623 | |
2623 | |
2624 | if (map) |
2624 | if (map) |
2625 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2625 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2626 | |
2626 | |
… | |
… | |
2673 | old_container->flag [FLAG_APPLIED] = 0; |
2673 | old_container->flag [FLAG_APPLIED] = 0; |
2674 | container = 0; |
2674 | container = 0; |
2675 | |
2675 | |
2676 | esrv_update_item (UPD_FLAGS, this, old_container); |
2676 | esrv_update_item (UPD_FLAGS, this, old_container); |
2677 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2677 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2678 | play_sound (sound_find ("chest_close")); |
2678 | } |
2679 | } |
2679 | |
2680 | |
2680 | if (new_container) |
2681 | if (new_container) |
2681 | { |
2682 | { |
2682 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2683 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2698 | new_container->flag [FLAG_APPLIED] = 1; |
2699 | new_container->flag [FLAG_APPLIED] = 1; |
2699 | container = new_container; |
2700 | container = new_container; |
2700 | |
2701 | |
2701 | esrv_update_item (UPD_FLAGS, this, new_container); |
2702 | esrv_update_item (UPD_FLAGS, this, new_container); |
2702 | esrv_send_inventory (this, new_container); |
2703 | esrv_send_inventory (this, new_container); |
|
|
2704 | play_sound (sound_find ("chest_open")); |
2703 | } |
2705 | } |
2704 | } |
2706 | } |
2705 | |
2707 | |
2706 | object * |
2708 | object * |
2707 | object::force_find (const shstr name) |
2709 | object::force_find (const shstr name) |
… | |
… | |
2733 | force->flag [FLAG_APPLIED] = true; |
2735 | force->flag [FLAG_APPLIED] = true; |
2734 | |
2736 | |
2735 | insert (force); |
2737 | insert (force); |
2736 | } |
2738 | } |
2737 | |
2739 | |
|
|
2740 | void |
|
|
2741 | object::play_sound (faceidx sound) const |
|
|
2742 | { |
|
|
2743 | if (!sound) |
|
|
2744 | return; |
|
|
2745 | |
|
|
2746 | if (flag [FLAG_REMOVED]) |
|
|
2747 | return; |
|
|
2748 | |
|
|
2749 | if (env) |
|
|
2750 | { |
|
|
2751 | if (object *pl = in_player ()) |
|
|
2752 | pl->contr->play_sound (sound); |
|
|
2753 | } |
|
|
2754 | else |
|
|
2755 | map->play_sound (sound, x, y); |
|
|
2756 | } |
|
|
2757 | |