Merge pull request #3296 from myk002/myk_dig_now

[dig-now] fix smoothing job detection
develop
Myk 2023-04-24 14:16:19 -07:00 committed by GitHub
commit d5e302bc0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Fixes ## Fixes
- `buildingplan`: fixed size limit calculations for rollers - `buildingplan`: fixed size limit calculations for rollers
- `dig-now`: properly detect and complete smoothing designations that have been converted into active jobs
## Misc Improvements ## Misc Improvements
- `buildingplan`: planner panel is minimized by default and now remembers minimized state - `buildingplan`: planner panel is minimized by default and now remembers minimized state

@ -113,14 +113,10 @@ public:
case job_type::CarveUpDownStaircase: case job_type::CarveUpDownStaircase:
td.bits.dig = tile_dig_designation::UpDownStair; td.bits.dig = tile_dig_designation::UpDownStair;
break; break;
case job_type::DetailWall: case job_type::SmoothWall:
case job_type::DetailFloor: { case job_type::SmoothFloor:
df::tiletype tt = map.tiletypeAt(job->pos); td.bits.smooth = 1;
if (tileSpecial(tt) != df::tiletype_special::SMOOTH) {
td.bits.smooth = 1;
}
break; break;
}
case job_type::CarveTrack: case job_type::CarveTrack:
to.bits.carve_track_north = (job->item_category.whole >> 18) & 1; to.bits.carve_track_north = (job->item_category.whole >> 18) & 1;
to.bits.carve_track_south = (job->item_category.whole >> 19) & 1; to.bits.carve_track_south = (job->item_category.whole >> 19) & 1;