MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Buildings.cpp 

Removed extra min/max checks.
develop
silverflyone 2023-04-05 11:49:14 +10:00
parent 181f0bdf72
commit 0cebad1078
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/modules/Buildings.cpp
Unescape Escape View File

@ -1649,11 +1649,11 @@ StockpileIterator& StockpileIterator::operator++() {
while (current >= block->items.size()) { while (current >= block->items.size()) {
// Out of items in this block; find the next block to search. // Out of items in this block; find the next block to search.
if (std::max(block->map_pos.x + 16, 0) <= std::min(std::max(stockpile->x2, 0), world->map.x_count-1)) { if (block->map_pos.x + 16 <= std::min(stockpile->x2, world->map.x_count-1)) {
block = Maps::getTileBlock(std::min(std::max(block->map_pos.x + 16, 0), world->map.x_count-1), block->map_pos.y, stockpile->z); block = Maps::getTileBlock(block->map_pos.x + 16, block->map_pos.y, stockpile->z);
current = 0; current = 0;
} else if (std::max(block->map_pos.y + 16, 0) <= std::min(std::max(stockpile->y2, 0), world->map.y_count-1)) { } else if (block->map_pos.y + 16 <= std::min(stockpile->y2, world->map.y_count-1)) {
block = Maps::getTileBlock(std::min(std::max(stockpile->x1, 0), world->map.x_count-1), std::min(std::max(block->map_pos.y + 16, 0), world->map.y_count-1), stockpile->z); block = Maps::getTileBlock(std::max(stockpile->x1, 0), block->map_pos.y + 16, stockpile->z);
current = 0; current = 0;
} else { } else {
// All items in all blocks have been checked. // All items in all blocks have been checked.