… | |
… | |
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; |
… | |
… | |
438 | { |
447 | { |
439 | // allow objects which own objects |
448 | // allow objects which own objects |
440 | if (owner) |
449 | if (owner) |
441 | while (owner->owner) |
450 | while (owner->owner) |
442 | owner = owner->owner; |
451 | owner = owner->owner; |
|
|
452 | |
|
|
453 | if (flag [FLAG_FREED]) |
|
|
454 | { |
|
|
455 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
456 | return; |
|
|
457 | } |
443 | |
458 | |
444 | this->owner = owner; |
459 | this->owner = owner; |
445 | } |
460 | } |
446 | |
461 | |
447 | int |
462 | int |
… | |
… | |
579 | object::copy_to (object *dst) |
594 | object::copy_to (object *dst) |
580 | { |
595 | { |
581 | *dst = *this; |
596 | *dst = *this; |
582 | |
597 | |
583 | if (speed < 0) |
598 | if (speed < 0) |
584 | dst->speed_left = speed_left - rndm (); |
599 | dst->speed_left -= rndm (); |
585 | |
600 | |
586 | dst->set_speed (dst->speed); |
601 | dst->set_speed (dst->speed); |
587 | } |
602 | } |
588 | |
603 | |
589 | void |
604 | void |
… | |
… | |
916 | |
931 | |
917 | if (!freed_map) |
932 | if (!freed_map) |
918 | { |
933 | { |
919 | freed_map = new maptile; |
934 | freed_map = new maptile; |
920 | |
935 | |
|
|
936 | freed_map->path = "<freed objects map>"; |
921 | freed_map->name = "/internal/freed_objects_map"; |
937 | freed_map->name = "/internal/freed_objects_map"; |
922 | freed_map->width = 3; |
938 | freed_map->width = 3; |
923 | freed_map->height = 3; |
939 | freed_map->height = 3; |
924 | |
940 | |
925 | freed_map->alloc (); |
941 | freed_map->alloc (); |
… | |
… | |
1140 | merge_ob (object *op, object *top) |
1156 | merge_ob (object *op, object *top) |
1141 | { |
1157 | { |
1142 | if (!op->nrof) |
1158 | if (!op->nrof) |
1143 | return 0; |
1159 | return 0; |
1144 | |
1160 | |
1145 | if (top) |
1161 | if (!top) |
1146 | for (top = op; top && top->above; top = top->above) |
1162 | for (top = op; top && top->above; top = top->above) |
1147 | ; |
1163 | ; |
1148 | |
1164 | |
1149 | for (; top; top = top->below) |
1165 | for (; top; top = top->below) |
1150 | { |
1166 | { |
… | |
… | |
1231 | |
1247 | |
1232 | object *top, *floor = NULL; |
1248 | object *top, *floor = NULL; |
1233 | |
1249 | |
1234 | op->remove (); |
1250 | op->remove (); |
1235 | |
1251 | |
1236 | if (out_of_map (m, op->x, op->y)) |
|
|
1237 | { |
|
|
1238 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
1239 | #ifdef MANY_CORES |
|
|
1240 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1241 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1242 | * improperly inserted. |
|
|
1243 | */ |
|
|
1244 | abort (); |
|
|
1245 | #endif |
|
|
1246 | return op; |
|
|
1247 | } |
|
|
1248 | |
|
|
1249 | if (object *more = op->more) |
|
|
1250 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1251 | return 0; |
|
|
1252 | |
|
|
1253 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1254 | |
|
|
1255 | /* Ideally, the caller figures this out. However, it complicates a lot |
1252 | /* Ideally, the caller figures this out. However, it complicates a lot |
1256 | * of areas of callers (eg, anything that uses find_free_spot would now |
1253 | * of areas of callers (eg, anything that uses find_free_spot would now |
1257 | * need extra work |
1254 | * need extra work |
1258 | */ |
1255 | */ |
1259 | if (!xy_normalise (m, op->x, op->y)) |
1256 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1257 | { |
|
|
1258 | op->destroy (); |
1260 | return 0; |
1259 | return 0; |
|
|
1260 | } |
|
|
1261 | |
|
|
1262 | if (object *more = op->more) |
|
|
1263 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1264 | return 0; |
|
|
1265 | |
|
|
1266 | CLEAR_FLAG (op, FLAG_REMOVED); |
1261 | |
1267 | |
1262 | op->map = m; |
1268 | op->map = m; |
1263 | mapspace &ms = op->ms (); |
1269 | mapspace &ms = op->ms (); |
1264 | |
1270 | |
1265 | /* this has to be done after we translate the coordinates. |
1271 | /* this has to be done after we translate the coordinates. |
… | |
… | |
1300 | else |
1306 | else |
1301 | { |
1307 | { |
1302 | top = ms.bot; |
1308 | top = ms.bot; |
1303 | |
1309 | |
1304 | /* If there are other objects, then */ |
1310 | /* If there are other objects, then */ |
1305 | if ((!(flag & INS_MAP_LOAD)) && top) |
1311 | if (top) |
1306 | { |
1312 | { |
1307 | object *last = 0; |
1313 | object *last = 0; |
1308 | |
1314 | |
1309 | /* |
1315 | /* |
1310 | * If there are multiple objects on this space, we do some trickier handling. |
1316 | * If there are multiple objects on this space, we do some trickier handling. |
… | |
… | |
1362 | */ |
1368 | */ |
1363 | if (last && last->below && last != floor) |
1369 | if (last && last->below && last != floor) |
1364 | top = last->below; |
1370 | top = last->below; |
1365 | } |
1371 | } |
1366 | } /* If objects on this space */ |
1372 | } /* If objects on this space */ |
1367 | if (flag & INS_MAP_LOAD) |
|
|
1368 | top = ms.top; |
|
|
1369 | |
1373 | |
1370 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1374 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1371 | top = floor; |
1375 | top = floor; |
1372 | |
1376 | |
1373 | /* Top is the object that our object (op) is going to get inserted above. |
1377 | /* Top is the object that our object (op) is going to get inserted above. |
… | |
… | |
1406 | op->map->touch (); |
1410 | op->map->touch (); |
1407 | } |
1411 | } |
1408 | |
1412 | |
1409 | op->map->dirty = true; |
1413 | op->map->dirty = true; |
1410 | |
1414 | |
1411 | if (!(flag & INS_MAP_LOAD)) |
|
|
1412 | if (object *pl = ms.player ()) |
1415 | if (object *pl = ms.player ()) |
1413 | pl->contr->ns->floorbox_update (); |
1416 | pl->contr->ns->floorbox_update (); |
1414 | |
1417 | |
1415 | /* If this object glows, it may affect lighting conditions that are |
1418 | /* If this object glows, it may affect lighting conditions that are |
1416 | * visible to others on this map. But update_all_los is really |
1419 | * visible to others on this map. But update_all_los is really |
1417 | * an inefficient way to do this, as it means los for all players |
1420 | * an inefficient way to do this, as it means los for all players |
1418 | * on the map will get recalculated. The players could very well |
1421 | * on the map will get recalculated. The players could very well |
… | |
… | |
1955 | * activate recursively a flag on an object inventory |
1958 | * activate recursively a flag on an object inventory |
1956 | */ |
1959 | */ |
1957 | void |
1960 | void |
1958 | flag_inv (object *op, int flag) |
1961 | flag_inv (object *op, int flag) |
1959 | { |
1962 | { |
1960 | if (op->inv) |
|
|
1961 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1963 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1962 | { |
1964 | { |
1963 | SET_FLAG (tmp, flag); |
1965 | SET_FLAG (tmp, flag); |
1964 | flag_inv (tmp, flag); |
1966 | flag_inv (tmp, flag); |
1965 | } |
1967 | } |
1966 | } |
1968 | } |
1967 | |
1969 | |
1968 | /* |
1970 | /* |
1969 | * deactivate recursively a flag on an object inventory |
1971 | * deactivate recursively a flag on an object inventory |
1970 | */ |
1972 | */ |
1971 | void |
1973 | void |
1972 | unflag_inv (object *op, int flag) |
1974 | unflag_inv (object *op, int flag) |
1973 | { |
1975 | { |
1974 | if (op->inv) |
|
|
1975 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1976 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1976 | { |
1977 | { |
1977 | CLEAR_FLAG (tmp, flag); |
1978 | CLEAR_FLAG (tmp, flag); |
1978 | unflag_inv (tmp, flag); |
1979 | unflag_inv (tmp, flag); |
1979 | } |
1980 | } |
1980 | } |
1981 | } |
1981 | |
1982 | |
1982 | /* |
1983 | /* |
1983 | * find_free_spot(object, map, x, y, start, stop) will search for |
1984 | * find_free_spot(object, map, x, y, start, stop) will search for |
1984 | * a spot at the given map and coordinates which will be able to contain |
1985 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
1986 | * to search (see the freearr_x/y[] definition). |
1987 | * to search (see the freearr_x/y[] definition). |
1987 | * It returns a random choice among the alternatives found. |
1988 | * It returns a random choice among the alternatives found. |
1988 | * start and stop are where to start relative to the free_arr array (1,9 |
1989 | * start and stop are where to start relative to the free_arr array (1,9 |
1989 | * does all 4 immediate directions). This returns the index into the |
1990 | * does all 4 immediate directions). This returns the index into the |
1990 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1991 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1991 | * Note - this only checks to see if there is space for the head of the |
|
|
1992 | * object - if it is a multispace object, this should be called for all |
|
|
1993 | * pieces. |
|
|
1994 | * Note2: This function does correctly handle tiled maps, but does not |
1992 | * Note: This function does correctly handle tiled maps, but does not |
1995 | * inform the caller. However, insert_ob_in_map will update as |
1993 | * inform the caller. However, insert_ob_in_map will update as |
1996 | * necessary, so the caller shouldn't need to do any special work. |
1994 | * necessary, so the caller shouldn't need to do any special work. |
1997 | * Note - updated to take an object instead of archetype - this is necessary |
1995 | * Note - updated to take an object instead of archetype - this is necessary |
1998 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1996 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1999 | * to know if the space in question will block the object. We can't use |
1997 | * to know if the space in question will block the object. We can't use |
… | |
… | |
2001 | * customized, changed states, etc. |
1999 | * customized, changed states, etc. |
2002 | */ |
2000 | */ |
2003 | int |
2001 | int |
2004 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2002 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2005 | { |
2003 | { |
|
|
2004 | int altern[SIZEOFFREE]; |
2006 | int index = 0, flag; |
2005 | int index = 0, flag; |
2007 | int altern[SIZEOFFREE]; |
|
|
2008 | |
2006 | |
2009 | for (int i = start; i < stop; i++) |
2007 | for (int i = start; i < stop; i++) |
2010 | { |
2008 | { |
2011 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2009 | mapxy pos (m, x, y); pos.move (i); |
2012 | if (!flag) |
2010 | |
|
|
2011 | if (!pos.normalise ()) |
|
|
2012 | continue; |
|
|
2013 | |
|
|
2014 | mapspace &ms = *pos; |
|
|
2015 | |
|
|
2016 | if (ms.flags () & P_IS_ALIVE) |
|
|
2017 | continue; |
|
|
2018 | |
|
|
2019 | /* However, often |
|
|
2020 | * ob doesn't have any move type (when used to place exits) |
|
|
2021 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2022 | */ |
|
|
2023 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2024 | { |
2013 | altern [index++] = i; |
2025 | altern [index++] = i; |
|
|
2026 | continue; |
|
|
2027 | } |
2014 | |
2028 | |
2015 | /* Basically, if we find a wall on a space, we cut down the search size. |
2029 | /* Basically, if we find a wall on a space, we cut down the search size. |
2016 | * In this way, we won't return spaces that are on another side of a wall. |
2030 | * In this way, we won't return spaces that are on another side of a wall. |
2017 | * This mostly work, but it cuts down the search size in all directions - |
2031 | * This mostly work, but it cuts down the search size in all directions - |
2018 | * if the space being examined only has a wall to the north and empty |
2032 | * if the space being examined only has a wall to the north and empty |
2019 | * spaces in all the other directions, this will reduce the search space |
2033 | * spaces in all the other directions, this will reduce the search space |
2020 | * to only the spaces immediately surrounding the target area, and |
2034 | * to only the spaces immediately surrounding the target area, and |
2021 | * won't look 2 spaces south of the target space. |
2035 | * won't look 2 spaces south of the target space. |
2022 | */ |
2036 | */ |
2023 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2037 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2038 | { |
2024 | stop = maxfree[i]; |
2039 | stop = maxfree[i]; |
|
|
2040 | continue; |
|
|
2041 | } |
|
|
2042 | |
|
|
2043 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2044 | * head of the object should correspond for the entire object. |
|
|
2045 | */ |
|
|
2046 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2047 | continue; |
|
|
2048 | |
|
|
2049 | if (ob->blocked (m, pos.x, pos.y)) |
|
|
2050 | continue; |
|
|
2051 | |
|
|
2052 | altern [index++] = i; |
2025 | } |
2053 | } |
2026 | |
2054 | |
2027 | if (!index) |
2055 | if (!index) |
2028 | return -1; |
2056 | return -1; |
2029 | |
2057 | |
… | |
… | |
2038 | */ |
2066 | */ |
2039 | int |
2067 | int |
2040 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2068 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2041 | { |
2069 | { |
2042 | for (int i = 0; i < SIZEOFFREE; i++) |
2070 | for (int i = 0; i < SIZEOFFREE; i++) |
2043 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2071 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2044 | return i; |
2072 | return i; |
2045 | |
2073 | |
2046 | return -1; |
2074 | return -1; |
2047 | } |
2075 | } |
2048 | |
2076 | |