… | |
… | |
354 | return 0; |
354 | return 0; |
355 | } |
355 | } |
356 | |
356 | |
357 | // adjust weight per container type ("of holding") |
357 | // adjust weight per container type ("of holding") |
358 | static sint32 |
358 | static sint32 |
359 | weight_adjust (object *op, sint32 weight) |
359 | weight_adjust_for (object *op, sint32 weight) |
360 | { |
360 | { |
361 | return op->type == CONTAINER |
361 | return op->type == CONTAINER |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | : weight; |
363 | : weight; |
364 | } |
364 | } |
… | |
… | |
370 | static void |
370 | static void |
371 | adjust_weight (object *op, sint32 weight) |
371 | adjust_weight (object *op, sint32 weight) |
372 | { |
372 | { |
373 | while (op) |
373 | while (op) |
374 | { |
374 | { |
|
|
375 | // adjust by actual difference to account for rounding errors |
|
|
376 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
375 | weight = weight_adjust (op, weight); |
377 | weight = weight_adjust_for (op, op->carrying) |
|
|
378 | - weight_adjust_for (op, op->carrying - weight); |
376 | |
379 | |
377 | if (!weight) |
380 | if (!weight) |
378 | return; |
381 | return; |
379 | |
382 | |
380 | op->carrying += weight; |
383 | op->carrying += weight; |
… | |
… | |
403 | op->update_weight (); |
406 | op->update_weight (); |
404 | |
407 | |
405 | sum += op->total_weight (); |
408 | sum += op->total_weight (); |
406 | } |
409 | } |
407 | |
410 | |
408 | sum = weight_adjust (this, sum); |
411 | sum = weight_adjust_for (this, sum); |
409 | |
412 | |
410 | if (sum != carrying) |
413 | if (sum != carrying) |
411 | { |
414 | { |
412 | carrying = sum; |
415 | carrying = sum; |
413 | |
416 | |
… | |
… | |
901 | * drop on that space. |
904 | * drop on that space. |
902 | */ |
905 | */ |
903 | if (!drop_to_ground |
906 | if (!drop_to_ground |
904 | || !map |
907 | || !map |
905 | || map->in_memory != MAP_ACTIVE |
908 | || map->in_memory != MAP_ACTIVE |
906 | || map->nodrop |
909 | || map->no_drop |
907 | || ms ().move_block == MOVE_ALL) |
910 | || ms ().move_block == MOVE_ALL) |
908 | { |
911 | { |
909 | while (inv) |
912 | while (inv) |
910 | { |
913 | { |
911 | inv->destroy_inv (false); |
914 | inv->destroy_inv (false); |
… | |
… | |
940 | |
943 | |
941 | static struct freed_map : maptile |
944 | static struct freed_map : maptile |
942 | { |
945 | { |
943 | freed_map () |
946 | freed_map () |
944 | { |
947 | { |
945 | path = "<freed objects map>"; |
948 | path = "<freed objects map>"; |
946 | name = "/internal/freed_objects_map"; |
949 | name = "/internal/freed_objects_map"; |
947 | width = 3; |
950 | width = 3; |
948 | height = 3; |
951 | height = 3; |
949 | nodrop = 1; |
952 | no_drop = 1; |
|
|
953 | no_reset = 1; |
950 | |
954 | |
951 | alloc (); |
955 | alloc (); |
952 | in_memory = MAP_ACTIVE; |
956 | in_memory = MAP_ACTIVE; |
953 | } |
957 | } |
954 | |
958 | |
… | |
… | |
1053 | if (object *pl = visible_to ()) |
1057 | if (object *pl = visible_to ()) |
1054 | esrv_del_item (pl->contr, count); |
1058 | esrv_del_item (pl->contr, count); |
1055 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1059 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1056 | |
1060 | |
1057 | adjust_weight (env, -total_weight ()); |
1061 | adjust_weight (env, -total_weight ()); |
1058 | |
|
|
1059 | *(above ? &above->below : &env->inv) = below; |
|
|
1060 | |
|
|
1061 | if (below) |
|
|
1062 | below->above = above; |
|
|
1063 | |
1062 | |
1064 | /* we set up values so that it could be inserted into |
1063 | /* we set up values so that it could be inserted into |
1065 | * the map, but we don't actually do that - it is up |
1064 | * the map, but we don't actually do that - it is up |
1066 | * to the caller to decide what we want to do. |
1065 | * to the caller to decide what we want to do. |
1067 | */ |
1066 | */ |
1068 | map = env->map; |
1067 | map = env->map; |
1069 | x = env->x; |
1068 | x = env->x; |
1070 | y = env->y; |
1069 | y = env->y; |
|
|
1070 | |
|
|
1071 | // make sure cmov optimisation is applicable |
|
|
1072 | *(above ? &above->below : &env->inv) = below; |
|
|
1073 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1074 | |
1071 | above = 0; |
1075 | above = 0; |
1072 | below = 0; |
1076 | below = 0; |
1073 | env = 0; |
1077 | env = 0; |
1074 | |
1078 | |
1075 | /* NO_FIX_PLAYER is set when a great many changes are being |
1079 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1105 | |
1109 | |
1106 | esrv_del_item (pl->contr, count); |
1110 | esrv_del_item (pl->contr, count); |
1107 | } |
1111 | } |
1108 | |
1112 | |
1109 | /* link the object above us */ |
1113 | /* link the object above us */ |
1110 | if (above) |
1114 | // re-link, make sure compiler can easily use cmove |
1111 | above->below = below; |
1115 | *(above ? &above->below : &ms.top) = below; |
1112 | else |
1116 | *(below ? &below->above : &ms.bot) = above; |
1113 | ms.top = below; /* we were top, set new top */ |
|
|
1114 | |
|
|
1115 | /* Relink the object below us, if there is one */ |
|
|
1116 | if (below) |
|
|
1117 | below->above = above; |
|
|
1118 | else |
|
|
1119 | { |
|
|
1120 | /* Nothing below, which means we need to relink map object for this space |
|
|
1121 | * use translated coordinates in case some oddness with map tiling is |
|
|
1122 | * evident |
|
|
1123 | */ |
|
|
1124 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1125 | 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 ()); |
|
|
1126 | |
|
|
1127 | ms.bot = above; /* goes on above it. */ |
|
|
1128 | } |
|
|
1129 | |
1117 | |
1130 | above = 0; |
1118 | above = 0; |
1131 | below = 0; |
1119 | below = 0; |
1132 | |
1120 | |
1133 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1280 | * just 'op' otherwise |
1268 | * just 'op' otherwise |
1281 | */ |
1269 | */ |
1282 | object * |
1270 | object * |
1283 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1284 | { |
1272 | { |
1285 | assert (!op->flag [FLAG_FREED]); |
|
|
1286 | |
|
|
1287 | op->remove (); |
1273 | op->remove (); |
1288 | |
1274 | |
1289 | /* Ideally, the caller figures this out. However, it complicates a lot |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1290 | * of areas of callers (eg, anything that uses find_free_spot would now |
1276 | * of areas of callers (eg, anything that uses find_free_spot would now |
1291 | * need extra work |
1277 | * need extra work |
1292 | */ |
1278 | */ |
1293 | if (!xy_normalise (m, op->x, op->y)) |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1294 | { |
1280 | { |
1295 | op->destroy (1); |
1281 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1296 | return 0; |
1282 | return 0; |
1297 | } |
1283 | } |
1298 | |
1284 | |
1299 | if (object *more = op->more) |
1285 | if (object *more = op->more) |
1300 | if (!insert_ob_in_map (more, m, originator, flag)) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1309 | */ |
1295 | */ |
1310 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1296 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1311 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1297 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1312 | if (object::can_merge (op, tmp)) |
1298 | if (object::can_merge (op, tmp)) |
1313 | { |
1299 | { |
1314 | // TODO: we atcually want to update tmp, not op, |
1300 | // TODO: we actually want to update tmp, not op, |
1315 | // but some caller surely breaks when we return tmp |
1301 | // but some caller surely breaks when we return tmp |
1316 | // from here :/ |
1302 | // from here :/ |
1317 | op->nrof += tmp->nrof; |
1303 | op->nrof += tmp->nrof; |
1318 | tmp->destroy (1); |
1304 | tmp->destroy (1); |
1319 | } |
1305 | } |
… | |
… | |
1324 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1310 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1325 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1311 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1326 | |
1312 | |
1327 | if (flag & INS_BELOW_ORIGINATOR) |
1313 | if (flag & INS_BELOW_ORIGINATOR) |
1328 | { |
1314 | { |
1329 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1315 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) |
1330 | { |
1316 | { |
1331 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1317 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1332 | abort (); |
1318 | abort (); |
1333 | } |
1319 | } |
1334 | |
1320 | |
1335 | op->above = originator; |
1321 | op->above = originator; |
1336 | op->below = originator->below; |
1322 | op->below = originator->below; |
1337 | |
|
|
1338 | if (op->below) |
|
|
1339 | op->below->above = op; |
|
|
1340 | else |
|
|
1341 | ms.bot = op; |
|
|
1342 | |
|
|
1343 | /* since *below* originator, no need to update top */ |
|
|
1344 | originator->below = op; |
1323 | originator->below = op; |
|
|
1324 | |
|
|
1325 | *(op->below ? &op->below->above : &ms.bot) = op; |
1345 | } |
1326 | } |
1346 | else |
1327 | else |
1347 | { |
1328 | { |
1348 | object *top, *floor = NULL; |
1329 | object *floor = 0; |
1349 | |
1330 | object *top = ms.top; |
1350 | top = ms.bot; |
|
|
1351 | |
1331 | |
1352 | /* If there are other objects, then */ |
1332 | /* If there are other objects, then */ |
1353 | if (top) |
1333 | if (top) |
1354 | { |
1334 | { |
1355 | object *last = 0; |
|
|
1356 | |
|
|
1357 | /* |
1335 | /* |
1358 | * If there are multiple objects on this space, we do some trickier handling. |
1336 | * If there are multiple objects on this space, we do some trickier handling. |
1359 | * We've already dealt with merging if appropriate. |
1337 | * We've already dealt with merging if appropriate. |
1360 | * Generally, we want to put the new object on top. But if |
1338 | * Generally, we want to put the new object on top. But if |
1361 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1339 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1364 | * once we get to them. This reduces the need to traverse over all of |
1342 | * once we get to them. This reduces the need to traverse over all of |
1365 | * them when adding another one - this saves quite a bit of cpu time |
1343 | * them when adding another one - this saves quite a bit of cpu time |
1366 | * when lots of spells are cast in one area. Currently, it is presumed |
1344 | * when lots of spells are cast in one area. Currently, it is presumed |
1367 | * that flying non pickable objects are spell objects. |
1345 | * that flying non pickable objects are spell objects. |
1368 | */ |
1346 | */ |
1369 | for (top = ms.bot; top; top = top->above) |
1347 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1370 | { |
1348 | { |
1371 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1349 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1372 | floor = top; |
1350 | floor = tmp; |
1373 | |
1351 | |
1374 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1352 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1375 | { |
1353 | { |
1376 | /* We insert above top, so we want this object below this */ |
1354 | /* We insert above top, so we want this object below this */ |
1377 | top = top->below; |
1355 | top = tmp->below; |
1378 | break; |
1356 | break; |
1379 | } |
1357 | } |
1380 | |
1358 | |
1381 | last = top; |
1359 | top = tmp; |
1382 | } |
1360 | } |
1383 | |
|
|
1384 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1385 | top = last; |
|
|
1386 | |
1361 | |
1387 | /* We let update_position deal with figuring out what the space |
1362 | /* We let update_position deal with figuring out what the space |
1388 | * looks like instead of lots of conditions here. |
1363 | * looks like instead of lots of conditions here. |
1389 | * makes things faster, and effectively the same result. |
1364 | * makes things faster, and effectively the same result. |
1390 | */ |
1365 | */ |
… | |
… | |
1397 | */ |
1372 | */ |
1398 | if (!(flag & INS_ON_TOP) |
1373 | if (!(flag & INS_ON_TOP) |
1399 | && ms.flags () & P_BLOCKSVIEW |
1374 | && ms.flags () & P_BLOCKSVIEW |
1400 | && (op->face && !faces [op->face].visibility)) |
1375 | && (op->face && !faces [op->face].visibility)) |
1401 | { |
1376 | { |
|
|
1377 | object *last; |
|
|
1378 | |
1402 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1404 | break; |
1381 | break; |
1405 | |
1382 | |
1406 | /* Check to see if we found the object that blocks view, |
1383 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1414 | } /* If objects on this space */ |
1391 | } /* If objects on this space */ |
1415 | |
1392 | |
1416 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1393 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1417 | top = floor; |
1394 | top = floor; |
1418 | |
1395 | |
1419 | /* Top is the object that our object (op) is going to get inserted above. |
1396 | // insert object above top, or bottom-most if top = 0 |
1420 | */ |
|
|
1421 | |
|
|
1422 | /* First object on this space */ |
|
|
1423 | if (!top) |
1397 | if (!top) |
1424 | { |
1398 | { |
|
|
1399 | op->below = 0; |
1425 | op->above = ms.bot; |
1400 | op->above = ms.bot; |
1426 | |
|
|
1427 | if (op->above) |
|
|
1428 | op->above->below = op; |
|
|
1429 | |
|
|
1430 | op->below = 0; |
|
|
1431 | ms.bot = op; |
1401 | ms.bot = op; |
|
|
1402 | |
|
|
1403 | *(op->above ? &op->above->below : &ms.top) = op; |
1432 | } |
1404 | } |
1433 | else |
1405 | else |
1434 | { /* get inserted into the stack above top */ |
1406 | { |
1435 | op->above = top->above; |
1407 | op->above = top->above; |
1436 | |
|
|
1437 | if (op->above) |
|
|
1438 | op->above->below = op; |
1408 | top->above = op; |
1439 | |
1409 | |
1440 | op->below = top; |
1410 | op->below = top; |
1441 | top->above = op; |
1411 | *(op->above ? &op->above->below : &ms.top) = op; |
1442 | } |
1412 | } |
1443 | |
1413 | } |
1444 | if (!op->above) |
|
|
1445 | ms.top = op; |
|
|
1446 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1447 | |
1414 | |
1448 | if (op->type == PLAYER) |
1415 | if (op->type == PLAYER) |
1449 | { |
1416 | { |
1450 | op->contr->do_los = 1; |
1417 | op->contr->do_los = 1; |
1451 | ++op->map->players; |
1418 | ++op->map->players; |