… | |
… | |
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 (); |
… | |
… | |
1147 | merge_ob (object *op, object *top) |
1150 | merge_ob (object *op, object *top) |
1148 | { |
1151 | { |
1149 | if (!op->nrof) |
1152 | if (!op->nrof) |
1150 | return 0; |
1153 | return 0; |
1151 | |
1154 | |
1152 | if (top) |
1155 | if (!top) |
1153 | for (top = op; top && top->above; top = top->above) |
1156 | for (top = op; top && top->above; top = top->above) |
1154 | ; |
1157 | ; |
1155 | |
1158 | |
1156 | for (; top; top = top->below) |
1159 | for (; top; top = top->below) |
1157 | { |
1160 | { |
… | |
… | |
1238 | |
1241 | |
1239 | object *top, *floor = NULL; |
1242 | object *top, *floor = NULL; |
1240 | |
1243 | |
1241 | op->remove (); |
1244 | op->remove (); |
1242 | |
1245 | |
1243 | if (out_of_map (m, op->x, op->y)) |
|
|
1244 | { |
|
|
1245 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
1246 | #ifdef MANY_CORES |
|
|
1247 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1248 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1249 | * improperly inserted. |
|
|
1250 | */ |
|
|
1251 | abort (); |
|
|
1252 | #endif |
|
|
1253 | return op; |
|
|
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); |
|
|
1261 | |
|
|
1262 | /* Ideally, the caller figures this out. However, it complicates a lot |
1246 | /* Ideally, the caller figures this out. However, it complicates a lot |
1263 | * 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 |
1264 | * need extra work |
1248 | * need extra work |
1265 | */ |
1249 | */ |
1266 | if (!xy_normalise (m, op->x, op->y)) |
1250 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1251 | { |
|
|
1252 | op->destroy (); |
1267 | 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); |
1268 | |
1261 | |
1269 | op->map = m; |
1262 | op->map = m; |
1270 | mapspace &ms = op->ms (); |
1263 | mapspace &ms = op->ms (); |
1271 | |
1264 | |
1272 | /* this has to be done after we translate the coordinates. |
1265 | /* this has to be done after we translate the coordinates. |
… | |
… | |
1307 | else |
1300 | else |
1308 | { |
1301 | { |
1309 | top = ms.bot; |
1302 | top = ms.bot; |
1310 | |
1303 | |
1311 | /* If there are other objects, then */ |
1304 | /* If there are other objects, then */ |
1312 | if ((!(flag & INS_MAP_LOAD)) && top) |
1305 | if (top) |
1313 | { |
1306 | { |
1314 | object *last = 0; |
1307 | object *last = 0; |
1315 | |
1308 | |
1316 | /* |
1309 | /* |
1317 | * 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. |
… | |
… | |
1369 | */ |
1362 | */ |
1370 | if (last && last->below && last != floor) |
1363 | if (last && last->below && last != floor) |
1371 | top = last->below; |
1364 | top = last->below; |
1372 | } |
1365 | } |
1373 | } /* If objects on this space */ |
1366 | } /* If objects on this space */ |
1374 | if (flag & INS_MAP_LOAD) |
|
|
1375 | top = ms.top; |
|
|
1376 | |
1367 | |
1377 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1368 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1378 | top = floor; |
1369 | top = floor; |
1379 | |
1370 | |
1380 | /* 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. |
… | |
… | |
1413 | op->map->touch (); |
1404 | op->map->touch (); |
1414 | } |
1405 | } |
1415 | |
1406 | |
1416 | op->map->dirty = true; |
1407 | op->map->dirty = true; |
1417 | |
1408 | |
1418 | if (!(flag & INS_MAP_LOAD)) |
|
|
1419 | if (object *pl = ms.player ()) |
1409 | if (object *pl = ms.player ()) |
1420 | pl->contr->ns->floorbox_update (); |
1410 | pl->contr->ns->floorbox_update (); |
1421 | |
1411 | |
1422 | /* If this object glows, it may affect lighting conditions that are |
1412 | /* If this object glows, it may affect lighting conditions that are |
1423 | * 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 |
1424 | * 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 |
1425 | * on the map will get recalculated. The players could very well |
1415 | * on the map will get recalculated. The players could very well |
… | |
… | |
1663 | * be != op, if items are merged. -Tero |
1653 | * be != op, if items are merged. -Tero |
1664 | */ |
1654 | */ |
1665 | object * |
1655 | object * |
1666 | object::insert (object *op) |
1656 | object::insert (object *op) |
1667 | { |
1657 | { |
1668 | object *tmp, *otmp; |
|
|
1669 | |
|
|
1670 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1658 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1671 | op->remove (); |
1659 | op->remove (); |
1672 | |
1660 | |
1673 | if (op->more) |
1661 | if (op->more) |
1674 | { |
1662 | { |
… | |
… | |
1676 | return op; |
1664 | return op; |
1677 | } |
1665 | } |
1678 | |
1666 | |
1679 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1667 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1680 | CLEAR_FLAG (op, FLAG_REMOVED); |
1668 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1669 | |
1681 | if (op->nrof) |
1670 | if (op->nrof) |
1682 | { |
1671 | { |
1683 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1672 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1684 | if (object::can_merge (tmp, op)) |
1673 | if (object::can_merge (tmp, op)) |
1685 | { |
1674 | { |
1686 | /* return the original object and remove inserted object |
1675 | /* return the original object and remove inserted object |
1687 | (client needs the original object) */ |
1676 | (client needs the original object) */ |
1688 | tmp->nrof += op->nrof; |
1677 | tmp->nrof += op->nrof; |
… | |
… | |
1707 | add_weight (this, op->weight * op->nrof); |
1696 | add_weight (this, op->weight * op->nrof); |
1708 | } |
1697 | } |
1709 | else |
1698 | else |
1710 | add_weight (this, (op->weight + op->carrying)); |
1699 | add_weight (this, (op->weight + op->carrying)); |
1711 | |
1700 | |
1712 | otmp = this->in_player (); |
1701 | if (object *otmp = this->in_player ()) |
1713 | if (otmp && otmp->contr) |
|
|
1714 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1702 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1715 | otmp->update_stats (); |
1703 | otmp->update_stats (); |
1716 | |
1704 | |
|
|
1705 | op->owner = 0; // its his/hers now. period. |
1717 | op->map = 0; |
1706 | op->map = 0; |
1718 | op->env = this; |
1707 | op->env = this; |
1719 | op->above = 0; |
1708 | op->above = 0; |
1720 | op->below = 0; |
1709 | op->below = 0; |
1721 | op->x = 0, op->y = 0; |
1710 | op->x = op->y = 0; |
1722 | |
1711 | |
1723 | /* 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 */ |
1724 | if ((op->glow_radius != 0) && map) |
1713 | if (op->glow_radius && map) |
1725 | { |
1714 | { |
1726 | #ifdef DEBUG_LIGHTS |
1715 | #ifdef DEBUG_LIGHTS |
1727 | 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); |
1728 | #endif /* DEBUG_LIGHTS */ |
1717 | #endif /* DEBUG_LIGHTS */ |
1729 | if (map->darkness) |
1718 | if (map->darkness) |
… | |
… | |
1994 | * to search (see the freearr_x/y[] definition). |
1983 | * to search (see the freearr_x/y[] definition). |
1995 | * It returns a random choice among the alternatives found. |
1984 | * It returns a random choice among the alternatives found. |
1996 | * 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 |
1997 | * does all 4 immediate directions). This returns the index into the |
1986 | * does all 4 immediate directions). This returns the index into the |
1998 | * 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) |
1999 | * Note - this only checks to see if there is space for the head of the |
|
|
2000 | * object - if it is a multispace object, this should be called for all |
|
|
2001 | * pieces. |
|
|
2002 | * Note2: This function does correctly handle tiled maps, but does not |
1988 | * Note: This function does correctly handle tiled maps, but does not |
2003 | * inform the caller. However, insert_ob_in_map will update as |
1989 | * inform the caller. However, insert_ob_in_map will update as |
2004 | * 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. |
2005 | * 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 |
2006 | * 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 |
2007 | * 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 |
… | |
… | |
2009 | * customized, changed states, etc. |
1995 | * customized, changed states, etc. |
2010 | */ |
1996 | */ |
2011 | int |
1997 | int |
2012 | 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) |
2013 | { |
1999 | { |
|
|
2000 | int altern[SIZEOFFREE]; |
2014 | int index = 0, flag; |
2001 | int index = 0, flag; |
2015 | int altern[SIZEOFFREE]; |
|
|
2016 | |
2002 | |
2017 | for (int i = start; i < stop; i++) |
2003 | for (int i = start; i < stop; i++) |
2018 | { |
2004 | { |
2019 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2005 | mapxy pos (m, x, y); pos.move (i); |
2020 | 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 | { |
2021 | altern [index++] = i; |
2021 | altern [index++] = i; |
|
|
2022 | continue; |
|
|
2023 | } |
2022 | |
2024 | |
2023 | /* 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. |
2024 | * 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. |
2025 | * 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 - |
2026 | * 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 |
2027 | * 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 |
2028 | * to only the spaces immediately surrounding the target area, and |
2030 | * to only the spaces immediately surrounding the target area, and |
2029 | * won't look 2 spaces south of the target space. |
2031 | * won't look 2 spaces south of the target space. |
2030 | */ |
2032 | */ |
2031 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2033 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2034 | { |
2032 | 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; |
2033 | } |
2049 | } |
2034 | |
2050 | |
2035 | if (!index) |
2051 | if (!index) |
2036 | return -1; |
2052 | return -1; |
2037 | |
2053 | |
… | |
… | |
2046 | */ |
2062 | */ |
2047 | int |
2063 | int |
2048 | 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) |
2049 | { |
2065 | { |
2050 | for (int i = 0; i < SIZEOFFREE; i++) |
2066 | for (int i = 0; i < SIZEOFFREE; i++) |
2051 | 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])) |
2052 | return i; |
2068 | return i; |
2053 | |
2069 | |
2054 | return -1; |
2070 | return -1; |
2055 | } |
2071 | } |
2056 | |
2072 | |