| … | |
… | |
| 305 | { |
305 | { |
| 306 | ob1->optimise (); |
306 | ob1->optimise (); |
| 307 | ob2->optimise (); |
307 | ob2->optimise (); |
| 308 | |
308 | |
| 309 | if (ob1->self || ob2->self) |
309 | if (ob1->self || ob2->self) |
| 310 | if (!cfperl_can_merge (ob1, ob2)) |
310 | { |
|
|
311 | int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; |
|
|
312 | int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; |
|
|
313 | |
|
|
314 | if (k1 != k2) |
| 311 | return 0; |
315 | return 0; |
|
|
316 | else if (k1 == 0) |
|
|
317 | return 1; |
|
|
318 | else if (!cfperl_can_merge (ob1, ob2)) |
|
|
319 | return 0; |
|
|
320 | } |
| 312 | } |
321 | } |
| 313 | |
322 | |
| 314 | /* Everything passes, must be OK. */ |
323 | /* Everything passes, must be OK. */ |
| 315 | return 1; |
324 | return 1; |
| 316 | } |
325 | } |
| … | |
… | |
| 578 | object::copy_to (object *dst) |
587 | object::copy_to (object *dst) |
| 579 | { |
588 | { |
| 580 | *dst = *this; |
589 | *dst = *this; |
| 581 | |
590 | |
| 582 | if (speed < 0) |
591 | if (speed < 0) |
| 583 | dst->speed_left = speed_left - rndm (); |
592 | dst->speed_left -= rndm (); |
| 584 | |
593 | |
| 585 | dst->set_speed (dst->speed); |
594 | dst->set_speed (dst->speed); |
| 586 | } |
595 | } |
| 587 | |
596 | |
| 588 | void |
597 | void |
| … | |
… | |
| 915 | |
924 | |
| 916 | if (!freed_map) |
925 | if (!freed_map) |
| 917 | { |
926 | { |
| 918 | freed_map = new maptile; |
927 | freed_map = new maptile; |
| 919 | |
928 | |
|
|
929 | freed_map->path = "<freed objects map>"; |
| 920 | freed_map->name = "/internal/freed_objects_map"; |
930 | freed_map->name = "/internal/freed_objects_map"; |
| 921 | freed_map->width = 3; |
931 | freed_map->width = 3; |
| 922 | freed_map->height = 3; |
932 | freed_map->height = 3; |
| 923 | |
933 | |
| 924 | freed_map->alloc (); |
934 | freed_map->alloc (); |
| … | |
… | |
| 1230 | |
1240 | |
| 1231 | object *top, *floor = NULL; |
1241 | object *top, *floor = NULL; |
| 1232 | |
1242 | |
| 1233 | op->remove (); |
1243 | op->remove (); |
| 1234 | |
1244 | |
| 1235 | if (out_of_map (m, op->x, op->y)) |
|
|
| 1236 | { |
|
|
| 1237 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
| 1238 | #ifdef MANY_CORES |
|
|
| 1239 | /* Better to catch this here, as otherwise the next use of this object |
|
|
| 1240 | * is likely to cause a crash. Better to find out where it is getting |
|
|
| 1241 | * improperly inserted. |
|
|
| 1242 | */ |
|
|
| 1243 | abort (); |
|
|
| 1244 | #endif |
|
|
| 1245 | return op; |
|
|
| 1246 | } |
|
|
| 1247 | |
|
|
| 1248 | if (object *more = op->more) |
|
|
| 1249 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
| 1250 | return 0; |
|
|
| 1251 | |
|
|
| 1252 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
| 1253 | |
|
|
| 1254 | /* Ideally, the caller figures this out. However, it complicates a lot |
1245 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1255 | * of areas of callers (eg, anything that uses find_free_spot would now |
1246 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1256 | * need extra work |
1247 | * need extra work |
| 1257 | */ |
1248 | */ |
| 1258 | if (!xy_normalise (m, op->x, op->y)) |
1249 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1250 | { |
|
|
1251 | op->destroy (); |
| 1259 | return 0; |
1252 | return 0; |
|
|
1253 | } |
|
|
1254 | |
|
|
1255 | if (object *more = op->more) |
|
|
1256 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1257 | return 0; |
|
|
1258 | |
|
|
1259 | CLEAR_FLAG (op, FLAG_REMOVED); |
| 1260 | |
1260 | |
| 1261 | op->map = m; |
1261 | op->map = m; |
| 1262 | mapspace &ms = op->ms (); |
1262 | mapspace &ms = op->ms (); |
| 1263 | |
1263 | |
| 1264 | /* this has to be done after we translate the coordinates. |
1264 | /* this has to be done after we translate the coordinates. |
| … | |
… | |
| 1299 | else |
1299 | else |
| 1300 | { |
1300 | { |
| 1301 | top = ms.bot; |
1301 | top = ms.bot; |
| 1302 | |
1302 | |
| 1303 | /* If there are other objects, then */ |
1303 | /* If there are other objects, then */ |
| 1304 | if ((!(flag & INS_MAP_LOAD)) && top) |
1304 | if (top) |
| 1305 | { |
1305 | { |
| 1306 | object *last = 0; |
1306 | object *last = 0; |
| 1307 | |
1307 | |
| 1308 | /* |
1308 | /* |
| 1309 | * If there are multiple objects on this space, we do some trickier handling. |
1309 | * If there are multiple objects on this space, we do some trickier handling. |
| … | |
… | |
| 1361 | */ |
1361 | */ |
| 1362 | if (last && last->below && last != floor) |
1362 | if (last && last->below && last != floor) |
| 1363 | top = last->below; |
1363 | top = last->below; |
| 1364 | } |
1364 | } |
| 1365 | } /* If objects on this space */ |
1365 | } /* If objects on this space */ |
| 1366 | if (flag & INS_MAP_LOAD) |
|
|
| 1367 | top = ms.top; |
|
|
| 1368 | |
1366 | |
| 1369 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1367 | if (flag & INS_ABOVE_FLOOR_ONLY) |
| 1370 | top = floor; |
1368 | top = floor; |
| 1371 | |
1369 | |
| 1372 | /* Top is the object that our object (op) is going to get inserted above. |
1370 | /* Top is the object that our object (op) is going to get inserted above. |
| … | |
… | |
| 1405 | op->map->touch (); |
1403 | op->map->touch (); |
| 1406 | } |
1404 | } |
| 1407 | |
1405 | |
| 1408 | op->map->dirty = true; |
1406 | op->map->dirty = true; |
| 1409 | |
1407 | |
| 1410 | if (!(flag & INS_MAP_LOAD)) |
|
|
| 1411 | if (object *pl = ms.player ()) |
1408 | if (object *pl = ms.player ()) |
| 1412 | pl->contr->ns->floorbox_update (); |
1409 | pl->contr->ns->floorbox_update (); |
| 1413 | |
1410 | |
| 1414 | /* If this object glows, it may affect lighting conditions that are |
1411 | /* If this object glows, it may affect lighting conditions that are |
| 1415 | * visible to others on this map. But update_all_los is really |
1412 | * visible to others on this map. But update_all_los is really |
| 1416 | * an inefficient way to do this, as it means los for all players |
1413 | * an inefficient way to do this, as it means los for all players |
| 1417 | * on the map will get recalculated. The players could very well |
1414 | * on the map will get recalculated. The players could very well |
| … | |
… | |
| 2000 | * customized, changed states, etc. |
1997 | * customized, changed states, etc. |
| 2001 | */ |
1998 | */ |
| 2002 | int |
1999 | int |
| 2003 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2000 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
| 2004 | { |
2001 | { |
|
|
2002 | int altern[SIZEOFFREE]; |
| 2005 | int index = 0, flag; |
2003 | int index = 0, flag; |
| 2006 | int altern[SIZEOFFREE]; |
|
|
| 2007 | |
2004 | |
| 2008 | for (int i = start; i < stop; i++) |
2005 | for (int i = start; i < stop; i++) |
| 2009 | { |
2006 | { |
| 2010 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2007 | mapxy pos (m, x, y); pos.move (i); |
| 2011 | if (!flag) |
2008 | |
|
|
2009 | if (!pos.normalise ()) |
|
|
2010 | continue; |
|
|
2011 | |
|
|
2012 | mapspace &ms = *pos; |
|
|
2013 | |
|
|
2014 | if (ms.flags () & P_IS_ALIVE) |
|
|
2015 | continue; |
|
|
2016 | |
|
|
2017 | /* However, often |
|
|
2018 | * ob doesn't have any move type (when used to place exits) |
|
|
2019 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2020 | */ |
|
|
2021 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2022 | { |
| 2012 | altern [index++] = i; |
2023 | altern [index++] = i; |
|
|
2024 | continue; |
|
|
2025 | } |
| 2013 | |
2026 | |
| 2014 | /* Basically, if we find a wall on a space, we cut down the search size. |
2027 | /* Basically, if we find a wall on a space, we cut down the search size. |
| 2015 | * In this way, we won't return spaces that are on another side of a wall. |
2028 | * In this way, we won't return spaces that are on another side of a wall. |
| 2016 | * This mostly work, but it cuts down the search size in all directions - |
2029 | * This mostly work, but it cuts down the search size in all directions - |
| 2017 | * if the space being examined only has a wall to the north and empty |
2030 | * if the space being examined only has a wall to the north and empty |
| 2018 | * spaces in all the other directions, this will reduce the search space |
2031 | * spaces in all the other directions, this will reduce the search space |
| 2019 | * to only the spaces immediately surrounding the target area, and |
2032 | * to only the spaces immediately surrounding the target area, and |
| 2020 | * won't look 2 spaces south of the target space. |
2033 | * won't look 2 spaces south of the target space. |
| 2021 | */ |
2034 | */ |
| 2022 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2035 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2036 | { |
| 2023 | stop = maxfree[i]; |
2037 | stop = maxfree[i]; |
|
|
2038 | continue; |
|
|
2039 | } |
|
|
2040 | |
|
|
2041 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2042 | * head of the object should correspond for the entire object. |
|
|
2043 | */ |
|
|
2044 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2045 | continue; |
|
|
2046 | |
|
|
2047 | altern [index++] = i; |
| 2024 | } |
2048 | } |
| 2025 | |
2049 | |
| 2026 | if (!index) |
2050 | if (!index) |
| 2027 | return -1; |
2051 | return -1; |
| 2028 | |
2052 | |
| … | |
… | |
| 2037 | */ |
2061 | */ |
| 2038 | int |
2062 | int |
| 2039 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2063 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
| 2040 | { |
2064 | { |
| 2041 | for (int i = 0; i < SIZEOFFREE; i++) |
2065 | for (int i = 0; i < SIZEOFFREE; i++) |
| 2042 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2066 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
| 2043 | return i; |
2067 | return i; |
| 2044 | |
2068 | |
| 2045 | return -1; |
2069 | return -1; |
| 2046 | } |
2070 | } |
| 2047 | |
2071 | |
