| … | |
… | |
| 1231 | |
1231 | |
| 1232 | object *top, *floor = NULL; |
1232 | object *top, *floor = NULL; |
| 1233 | |
1233 | |
| 1234 | op->remove (); |
1234 | op->remove (); |
| 1235 | |
1235 | |
| 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 |
1236 | /* 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 |
1237 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1257 | * need extra work |
1238 | * need extra work |
| 1258 | */ |
1239 | */ |
| 1259 | if (!xy_normalise (m, op->x, op->y)) |
1240 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1241 | { |
|
|
1242 | op->destroy (); |
| 1260 | 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); |
| 1261 | |
1251 | |
| 1262 | op->map = m; |
1252 | op->map = m; |
| 1263 | mapspace &ms = op->ms (); |
1253 | mapspace &ms = op->ms (); |
| 1264 | |
1254 | |
| 1265 | /* this has to be done after we translate the coordinates. |
1255 | /* this has to be done after we translate the coordinates. |
| … | |
… | |
| 1300 | else |
1290 | else |
| 1301 | { |
1291 | { |
| 1302 | top = ms.bot; |
1292 | top = ms.bot; |
| 1303 | |
1293 | |
| 1304 | /* If there are other objects, then */ |
1294 | /* If there are other objects, then */ |
| 1305 | if ((!(flag & INS_MAP_LOAD)) && top) |
1295 | if (top) |
| 1306 | { |
1296 | { |
| 1307 | object *last = 0; |
1297 | object *last = 0; |
| 1308 | |
1298 | |
| 1309 | /* |
1299 | /* |
| 1310 | * If there are multiple objects on this space, we do some trickier handling. |
1300 | * If there are multiple objects on this space, we do some trickier handling. |
| … | |
… | |
| 1362 | */ |
1352 | */ |
| 1363 | if (last && last->below && last != floor) |
1353 | if (last && last->below && last != floor) |
| 1364 | top = last->below; |
1354 | top = last->below; |
| 1365 | } |
1355 | } |
| 1366 | } /* If objects on this space */ |
1356 | } /* If objects on this space */ |
| 1367 | if (flag & INS_MAP_LOAD) |
|
|
| 1368 | top = ms.top; |
|
|
| 1369 | |
1357 | |
| 1370 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1358 | if (flag & INS_ABOVE_FLOOR_ONLY) |
| 1371 | top = floor; |
1359 | top = floor; |
| 1372 | |
1360 | |
| 1373 | /* Top is the object that our object (op) is going to get inserted above. |
1361 | /* Top is the object that our object (op) is going to get inserted above. |
| … | |
… | |
| 1406 | op->map->touch (); |
1394 | op->map->touch (); |
| 1407 | } |
1395 | } |
| 1408 | |
1396 | |
| 1409 | op->map->dirty = true; |
1397 | op->map->dirty = true; |
| 1410 | |
1398 | |
| 1411 | if (!(flag & INS_MAP_LOAD)) |
|
|
| 1412 | if (object *pl = ms.player ()) |
1399 | if (object *pl = ms.player ()) |
| 1413 | pl->contr->ns->floorbox_update (); |
1400 | pl->contr->ns->floorbox_update (); |
| 1414 | |
1401 | |
| 1415 | /* If this object glows, it may affect lighting conditions that are |
1402 | /* If this object glows, it may affect lighting conditions that are |
| 1416 | * visible to others on this map. But update_all_los is really |
1403 | * 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 |
1404 | * 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 |
1405 | * on the map will get recalculated. The players could very well |
| … | |
… | |
| 2001 | * customized, changed states, etc. |
1988 | * customized, changed states, etc. |
| 2002 | */ |
1989 | */ |
| 2003 | int |
1990 | int |
| 2004 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1991 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
| 2005 | { |
1992 | { |
|
|
1993 | int altern[SIZEOFFREE]; |
| 2006 | int index = 0, flag; |
1994 | int index = 0, flag; |
| 2007 | int altern[SIZEOFFREE]; |
|
|
| 2008 | |
1995 | |
| 2009 | for (int i = start; i < stop; i++) |
1996 | for (int i = start; i < stop; i++) |
| 2010 | { |
1997 | { |
| 2011 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1998 | mapxy pos (m, x, y); pos.move (i); |
| 2012 | if (!flag) |
1999 | |
|
|
2000 | if (!pos.normalise ()) |
|
|
2001 | continue; |
|
|
2002 | |
|
|
2003 | mapspace &ms = *pos; |
|
|
2004 | |
|
|
2005 | if (ms.flags () & P_IS_ALIVE) |
|
|
2006 | continue; |
|
|
2007 | |
|
|
2008 | /* However, often |
|
|
2009 | * ob doesn't have any move type (when used to place exits) |
|
|
2010 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2011 | */ |
|
|
2012 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2013 | { |
| 2013 | altern [index++] = i; |
2014 | altern [index++] = i; |
|
|
2015 | continue; |
|
|
2016 | } |
| 2014 | |
2017 | |
| 2015 | /* Basically, if we find a wall on a space, we cut down the search size. |
2018 | /* 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. |
2019 | * 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 - |
2020 | * 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 |
2021 | * 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 |
2022 | * spaces in all the other directions, this will reduce the search space |
| 2020 | * to only the spaces immediately surrounding the target area, and |
2023 | * to only the spaces immediately surrounding the target area, and |
| 2021 | * won't look 2 spaces south of the target space. |
2024 | * won't look 2 spaces south of the target space. |
| 2022 | */ |
2025 | */ |
| 2023 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2026 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2027 | { |
| 2024 | stop = maxfree[i]; |
2028 | stop = maxfree[i]; |
|
|
2029 | continue; |
|
|
2030 | } |
|
|
2031 | |
|
|
2032 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2033 | * head of the object should correspond for the entire object. |
|
|
2034 | */ |
|
|
2035 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2036 | continue; |
|
|
2037 | |
|
|
2038 | altern [index++] = i; |
| 2025 | } |
2039 | } |
| 2026 | |
2040 | |
| 2027 | if (!index) |
2041 | if (!index) |
| 2028 | return -1; |
2042 | return -1; |
| 2029 | |
2043 | |
| … | |
… | |
| 2038 | */ |
2052 | */ |
| 2039 | int |
2053 | int |
| 2040 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2054 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
| 2041 | { |
2055 | { |
| 2042 | for (int i = 0; i < SIZEOFFREE; i++) |
2056 | for (int i = 0; i < SIZEOFFREE; i++) |
| 2043 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2057 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
| 2044 | return i; |
2058 | return i; |
| 2045 | |
2059 | |
| 2046 | return -1; |
2060 | return -1; |
| 2047 | } |
2061 | } |
| 2048 | |
2062 | |
