… | |
… | |
498 | if (!spaces) |
498 | if (!spaces) |
499 | return false; |
499 | return false; |
500 | |
500 | |
501 | for (int i = 0; i < size (); ++i) |
501 | for (int i = 0; i < size (); ++i) |
502 | { |
502 | { |
|
|
503 | #if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D |
503 | if (cede_count >= 500) |
504 | if (cede_count >= 500) |
504 | { |
505 | { |
505 | cede_count = 0; |
506 | cede_count = 0; |
506 | coroapi::cede (); |
507 | coroapi::cede (); |
507 | } |
508 | } |
|
|
509 | #endif |
508 | |
510 | |
509 | int unique = 0; |
511 | int unique = 0; |
510 | for (object *op = spaces [i].bot; op; op = op->above) |
512 | for (object *op = spaces [i].bot; op; op = op->above) |
511 | { |
513 | { |
512 | // count per-object, but cede only when modification-safe |
514 | // count per-object, but cede only when modification-safe |
… | |
… | |
1108 | */ |
1110 | */ |
1109 | void |
1111 | void |
1110 | mapspace::update_ () |
1112 | mapspace::update_ () |
1111 | { |
1113 | { |
1112 | object *tmp, *last = 0; |
1114 | object *tmp, *last = 0; |
1113 | uint8 flags = 0, light = 0, anywhere = 0; |
1115 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1114 | New_Face *top, *floor, *middle; |
1116 | New_Face *top, *floor, *middle; |
1115 | object *top_obj, *floor_obj, *middle_obj; |
1117 | object *top_obj, *floor_obj, *middle_obj; |
1116 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1118 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1117 | |
1119 | |
1118 | middle = blank_face; |
1120 | middle = blank_face; |
… | |
… | |
1606 | { |
1608 | { |
1607 | best_distance = tmpi; |
1609 | best_distance = tmpi; |
1608 | best = tmp; |
1610 | best = tmp; |
1609 | } |
1611 | } |
1610 | } |
1612 | } |
|
|
1613 | |
1611 | if (best != op1) |
1614 | if (best != op1) |
1612 | { |
1615 | { |
1613 | retval->distance_x += op1->x - best->x; |
1616 | retval->distance_x += op1->x - best->x; |
1614 | retval->distance_y += op1->y - best->y; |
1617 | retval->distance_y += op1->y - best->y; |
1615 | } |
1618 | } |
1616 | } |
1619 | } |
|
|
1620 | |
1617 | retval->part = best; |
1621 | retval->part = best; |
1618 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1622 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
1619 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1623 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1620 | } |
1624 | } |
1621 | } |
1625 | } |
1622 | |
1626 | |
1623 | /* this is basically the same as get_rangevector above, but instead of |
1627 | /* this is basically the same as get_rangevector above, but instead of |
… | |
… | |
1647 | { |
1651 | { |
1648 | retval->distance_x += op2->x - x; |
1652 | retval->distance_x += op2->x - x; |
1649 | retval->distance_y += op2->y - y; |
1653 | retval->distance_y += op2->y - y; |
1650 | |
1654 | |
1651 | retval->part = NULL; |
1655 | retval->part = NULL; |
1652 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1656 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
1653 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1657 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1654 | } |
1658 | } |
1655 | } |
1659 | } |
1656 | |
1660 | |
1657 | /* Returns true of op1 and op2 are effectively on the same map |
1661 | /* Returns true of op1 and op2 are effectively on the same map |