| … | |
… | |
| 1057 | esrv_del_item (pl->contr, count); |
1057 | esrv_del_item (pl->contr, count); |
| 1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
| 1059 | |
1059 | |
| 1060 | adjust_weight (env, -total_weight ()); |
1060 | adjust_weight (env, -total_weight ()); |
| 1061 | |
1061 | |
| 1062 | *(above ? &above->below : &env->inv) = below; |
|
|
| 1063 | |
|
|
| 1064 | if (below) |
|
|
| 1065 | below->above = above; |
|
|
| 1066 | |
|
|
| 1067 | /* we set up values so that it could be inserted into |
1062 | /* we set up values so that it could be inserted into |
| 1068 | * the map, but we don't actually do that - it is up |
1063 | * the map, but we don't actually do that - it is up |
| 1069 | * to the caller to decide what we want to do. |
1064 | * to the caller to decide what we want to do. |
| 1070 | */ |
1065 | */ |
| 1071 | map = env->map; |
1066 | map = env->map; |
| 1072 | x = env->x; |
1067 | x = env->x; |
| 1073 | y = env->y; |
1068 | y = env->y; |
|
|
1069 | |
|
|
1070 | // make sure cmov optimisation is applicable |
|
|
1071 | *(above ? &above->below : &env->inv) = below; |
|
|
1072 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1073 | |
| 1074 | above = 0; |
1074 | above = 0; |
| 1075 | below = 0; |
1075 | below = 0; |
| 1076 | env = 0; |
1076 | env = 0; |
| 1077 | |
1077 | |
| 1078 | /* NO_FIX_PLAYER is set when a great many changes are being |
1078 | /* NO_FIX_PLAYER is set when a great many changes are being |
| … | |
… | |
| 1108 | |
1108 | |
| 1109 | esrv_del_item (pl->contr, count); |
1109 | esrv_del_item (pl->contr, count); |
| 1110 | } |
1110 | } |
| 1111 | |
1111 | |
| 1112 | /* link the object above us */ |
1112 | /* link the object above us */ |
| 1113 | if (above) |
1113 | // re-link, make sure compiler can easily use cmove |
| 1114 | above->below = below; |
1114 | *(above ? &above->below : &ms.top) = below; |
| 1115 | else |
1115 | *(below ? &below->above : &ms.bot) = above; |
| 1116 | ms.top = below; /* we were top, set new top */ |
|
|
| 1117 | |
|
|
| 1118 | /* Relink the object below us, if there is one */ |
|
|
| 1119 | if (below) |
|
|
| 1120 | below->above = above; |
|
|
| 1121 | else |
|
|
| 1122 | { |
|
|
| 1123 | /* Nothing below, which means we need to relink map object for this space |
|
|
| 1124 | * use translated coordinates in case some oddness with map tiling is |
|
|
| 1125 | * evident |
|
|
| 1126 | */ |
|
|
| 1127 | if (GET_MAP_OB (map, x, y) != this) |
|
|
| 1128 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
| 1129 | |
|
|
| 1130 | ms.bot = above; /* goes on above it. */ |
|
|
| 1131 | } |
|
|
| 1132 | |
1116 | |
| 1133 | above = 0; |
1117 | above = 0; |
| 1134 | below = 0; |
1118 | below = 0; |
| 1135 | |
1119 | |
| 1136 | if (map->in_memory == MAP_SAVING) |
1120 | if (map->in_memory == MAP_SAVING) |
| … | |
… | |
| 1283 | * just 'op' otherwise |
1267 | * just 'op' otherwise |
| 1284 | */ |
1268 | */ |
| 1285 | object * |
1269 | object * |
| 1286 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1270 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
| 1287 | { |
1271 | { |
| 1288 | assert (!op->flag [FLAG_FREED]); |
|
|
| 1289 | |
|
|
| 1290 | op->remove (); |
1272 | op->remove (); |
| 1291 | |
1273 | |
| 1292 | /* Ideally, the caller figures this out. However, it complicates a lot |
1274 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1293 | * of areas of callers (eg, anything that uses find_free_spot would now |
1275 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1294 | * need extra work |
1276 | * need extra work |
| … | |
… | |
| 1312 | */ |
1294 | */ |
| 1313 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1295 | if (op->nrof && !(flag & INS_NO_MERGE)) |
| 1314 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1296 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
| 1315 | if (object::can_merge (op, tmp)) |
1297 | if (object::can_merge (op, tmp)) |
| 1316 | { |
1298 | { |
| 1317 | // TODO: we atcually want to update tmp, not op, |
1299 | // TODO: we actually want to update tmp, not op, |
| 1318 | // but some caller surely breaks when we return tmp |
1300 | // but some caller surely breaks when we return tmp |
| 1319 | // from here :/ |
1301 | // from here :/ |
| 1320 | op->nrof += tmp->nrof; |
1302 | op->nrof += tmp->nrof; |
| 1321 | tmp->destroy (1); |
1303 | tmp->destroy (1); |
| 1322 | } |
1304 | } |
| … | |
… | |
| 1327 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1309 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
| 1328 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1310 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
| 1329 | |
1311 | |
| 1330 | if (flag & INS_BELOW_ORIGINATOR) |
1312 | if (flag & INS_BELOW_ORIGINATOR) |
| 1331 | { |
1313 | { |
| 1332 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1314 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) |
| 1333 | { |
1315 | { |
| 1334 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1316 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
| 1335 | abort (); |
1317 | abort (); |
| 1336 | } |
1318 | } |
| 1337 | |
1319 | |
| 1338 | op->above = originator; |
1320 | op->above = originator; |
| 1339 | op->below = originator->below; |
1321 | op->below = originator->below; |
| 1340 | |
|
|
| 1341 | if (op->below) |
|
|
| 1342 | op->below->above = op; |
|
|
| 1343 | else |
|
|
| 1344 | ms.bot = op; |
|
|
| 1345 | |
|
|
| 1346 | /* since *below* originator, no need to update top */ |
|
|
| 1347 | originator->below = op; |
1322 | originator->below = op; |
|
|
1323 | |
|
|
1324 | *(op->below ? &op->below->above : &ms.bot) = op; |
| 1348 | } |
1325 | } |
| 1349 | else |
1326 | else |
| 1350 | { |
1327 | { |
| 1351 | object *top, *floor = NULL; |
1328 | object *floor = 0; |
| 1352 | |
1329 | object *top = ms.top; |
| 1353 | top = ms.bot; |
|
|
| 1354 | |
1330 | |
| 1355 | /* If there are other objects, then */ |
1331 | /* If there are other objects, then */ |
| 1356 | if (top) |
1332 | if (top) |
| 1357 | { |
1333 | { |
| 1358 | object *last = 0; |
|
|
| 1359 | |
|
|
| 1360 | /* |
1334 | /* |
| 1361 | * If there are multiple objects on this space, we do some trickier handling. |
1335 | * If there are multiple objects on this space, we do some trickier handling. |
| 1362 | * We've already dealt with merging if appropriate. |
1336 | * We've already dealt with merging if appropriate. |
| 1363 | * Generally, we want to put the new object on top. But if |
1337 | * Generally, we want to put the new object on top. But if |
| 1364 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1338 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
| … | |
… | |
| 1367 | * once we get to them. This reduces the need to traverse over all of |
1341 | * once we get to them. This reduces the need to traverse over all of |
| 1368 | * them when adding another one - this saves quite a bit of cpu time |
1342 | * them when adding another one - this saves quite a bit of cpu time |
| 1369 | * when lots of spells are cast in one area. Currently, it is presumed |
1343 | * when lots of spells are cast in one area. Currently, it is presumed |
| 1370 | * that flying non pickable objects are spell objects. |
1344 | * that flying non pickable objects are spell objects. |
| 1371 | */ |
1345 | */ |
| 1372 | for (top = ms.bot; top; top = top->above) |
1346 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
| 1373 | { |
1347 | { |
| 1374 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1348 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
| 1375 | floor = top; |
1349 | floor = tmp; |
| 1376 | |
1350 | |
| 1377 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1351 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
| 1378 | { |
1352 | { |
| 1379 | /* We insert above top, so we want this object below this */ |
1353 | /* We insert above top, so we want this object below this */ |
| 1380 | top = top->below; |
1354 | top = tmp->below; |
| 1381 | break; |
1355 | break; |
| 1382 | } |
1356 | } |
| 1383 | |
1357 | |
| 1384 | last = top; |
1358 | top = tmp; |
| 1385 | } |
1359 | } |
| 1386 | |
|
|
| 1387 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
| 1388 | top = last; |
|
|
| 1389 | |
1360 | |
| 1390 | /* We let update_position deal with figuring out what the space |
1361 | /* We let update_position deal with figuring out what the space |
| 1391 | * looks like instead of lots of conditions here. |
1362 | * looks like instead of lots of conditions here. |
| 1392 | * makes things faster, and effectively the same result. |
1363 | * makes things faster, and effectively the same result. |
| 1393 | */ |
1364 | */ |
| … | |
… | |
| 1400 | */ |
1371 | */ |
| 1401 | if (!(flag & INS_ON_TOP) |
1372 | if (!(flag & INS_ON_TOP) |
| 1402 | && ms.flags () & P_BLOCKSVIEW |
1373 | && ms.flags () & P_BLOCKSVIEW |
| 1403 | && (op->face && !faces [op->face].visibility)) |
1374 | && (op->face && !faces [op->face].visibility)) |
| 1404 | { |
1375 | { |
|
|
1376 | object *last; |
|
|
1377 | |
| 1405 | for (last = top; last != floor; last = last->below) |
1378 | for (last = top; last != floor; last = last->below) |
| 1406 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1379 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
| 1407 | break; |
1380 | break; |
| 1408 | |
1381 | |
| 1409 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
| … | |
… | |
| 1420 | top = floor; |
1393 | top = floor; |
| 1421 | |
1394 | |
| 1422 | /* Top is the object that our object (op) is going to get inserted above. |
1395 | /* Top is the object that our object (op) is going to get inserted above. |
| 1423 | */ |
1396 | */ |
| 1424 | |
1397 | |
| 1425 | /* First object on this space */ |
1398 | /* no top found, insert on top */ |
| 1426 | if (!top) |
1399 | if (!top) |
| 1427 | { |
1400 | { |
| 1428 | op->above = ms.bot; |
|
|
| 1429 | |
|
|
| 1430 | if (op->above) |
|
|
| 1431 | op->above->below = op; |
|
|
| 1432 | |
|
|
| 1433 | op->below = 0; |
1401 | op->above = 0; |
|
|
1402 | op->below = ms.top; |
| 1434 | ms.bot = op; |
1403 | ms.top = op; |
|
|
1404 | |
|
|
1405 | *(op->below ? &op->below->above : &ms.bot) = op; |
| 1435 | } |
1406 | } |
| 1436 | else |
1407 | else |
| 1437 | { /* get inserted into the stack above top */ |
1408 | { /* get inserted into the stack above top */ |
| 1438 | op->above = top->above; |
1409 | op->above = top->above; |
| 1439 | |
|
|
| 1440 | if (op->above) |
|
|
| 1441 | op->above->below = op; |
1410 | top->above = op; |
| 1442 | |
1411 | |
| 1443 | op->below = top; |
1412 | op->below = top; |
| 1444 | top->above = op; |
1413 | *(op->above ? &op->above->below : &ms.top) = op; |
| 1445 | } |
1414 | } |
| 1446 | |
|
|
| 1447 | if (!op->above) |
|
|
| 1448 | ms.top = op; |
|
|
| 1449 | } /* else not INS_BELOW_ORIGINATOR */ |
1415 | } /* else not INS_BELOW_ORIGINATOR */ |
| 1450 | |
1416 | |
| 1451 | if (op->type == PLAYER) |
1417 | if (op->type == PLAYER) |
| 1452 | { |
1418 | { |
| 1453 | op->contr->do_los = 1; |
1419 | op->contr->do_los = 1; |
