| … | |
… | |
| 915 | |
915 | |
| 916 | if (!freed_map) |
916 | if (!freed_map) |
| 917 | { |
917 | { |
| 918 | freed_map = new maptile; |
918 | freed_map = new maptile; |
| 919 | |
919 | |
|
|
920 | freed_map->path = "<freed objects map>"; |
| 920 | freed_map->name = "/internal/freed_objects_map"; |
921 | freed_map->name = "/internal/freed_objects_map"; |
| 921 | freed_map->width = 3; |
922 | freed_map->width = 3; |
| 922 | freed_map->height = 3; |
923 | freed_map->height = 3; |
| 923 | |
924 | |
| 924 | freed_map->alloc (); |
925 | freed_map->alloc (); |
| … | |
… | |
| 1230 | |
1231 | |
| 1231 | object *top, *floor = NULL; |
1232 | object *top, *floor = NULL; |
| 1232 | |
1233 | |
| 1233 | op->remove (); |
1234 | op->remove (); |
| 1234 | |
1235 | |
| 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 |
1236 | /* 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 |
1237 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1256 | * need extra work |
1238 | * need extra work |
| 1257 | */ |
1239 | */ |
| 1258 | if (!xy_normalise (m, op->x, op->y)) |
1240 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1241 | { |
|
|
1242 | op->destroy (); |
| 1259 | return 0; |
1243 | return 0; |
|
|
1244 | } |
|
|
1245 | |
|
|
1246 | if (object *more = op->more) |
|
|
1247 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1248 | return 0; |
|
|
1249 | |
|
|
1250 | CLEAR_FLAG (op, FLAG_REMOVED); |
| 1260 | |
1251 | |
| 1261 | op->map = m; |
1252 | op->map = m; |
| 1262 | mapspace &ms = op->ms (); |
1253 | mapspace &ms = op->ms (); |
| 1263 | |
1254 | |
| 1264 | /* this has to be done after we translate the coordinates. |
1255 | /* this has to be done after we translate the coordinates. |
| … | |
… | |
| 2005 | int index = 0, flag; |
1996 | int index = 0, flag; |
| 2006 | int altern[SIZEOFFREE]; |
1997 | int altern[SIZEOFFREE]; |
| 2007 | |
1998 | |
| 2008 | for (int i = start; i < stop; i++) |
1999 | for (int i = start; i < stop; i++) |
| 2009 | { |
2000 | { |
| 2010 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2001 | mapxy pos (m, x, y); pos.move (i); |
| 2011 | if (!flag) |
2002 | |
| 2012 | altern [index++] = i; |
2003 | if (!pos.normalise ()) |
|
|
2004 | continue; |
|
|
2005 | |
|
|
2006 | mapspace &ms = *pos; |
|
|
2007 | ms.update (); |
|
|
2008 | |
|
|
2009 | /* However, often |
|
|
2010 | * ob doesn't have any move type (when used to place exits) |
|
|
2011 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2012 | */ |
|
|
2013 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2014 | continue; |
| 2013 | |
2015 | |
| 2014 | /* Basically, if we find a wall on a space, we cut down the search size. |
2016 | /* 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. |
2017 | * 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 - |
2018 | * 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 |
2019 | * 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 |
2020 | * spaces in all the other directions, this will reduce the search space |
| 2019 | * to only the spaces immediately surrounding the target area, and |
2021 | * to only the spaces immediately surrounding the target area, and |
| 2020 | * won't look 2 spaces south of the target space. |
2022 | * won't look 2 spaces south of the target space. |
| 2021 | */ |
2023 | */ |
| 2022 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2024 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2025 | { |
| 2023 | stop = maxfree[i]; |
2026 | stop = maxfree[i]; |
|
|
2027 | continue; |
|
|
2028 | } |
|
|
2029 | |
|
|
2030 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2031 | * head of the object should correspond for the entire object. |
|
|
2032 | */ |
|
|
2033 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2034 | continue; |
|
|
2035 | |
|
|
2036 | altern [index++] = i; |
| 2024 | } |
2037 | } |
| 2025 | |
2038 | |
| 2026 | if (!index) |
2039 | if (!index) |
| 2027 | return -1; |
2040 | return -1; |
| 2028 | |
2041 | |
| … | |
… | |
| 2037 | */ |
2050 | */ |
| 2038 | int |
2051 | int |
| 2039 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2052 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
| 2040 | { |
2053 | { |
| 2041 | for (int i = 0; i < SIZEOFFREE; i++) |
2054 | for (int i = 0; i < SIZEOFFREE; i++) |
| 2042 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2055 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
| 2043 | return i; |
2056 | return i; |
| 2044 | |
2057 | |
| 2045 | return -1; |
2058 | return -1; |
| 2046 | } |
2059 | } |
| 2047 | |
2060 | |
