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

Merge remote-tracking branch 'suokko/MapCache_reduce_latency_from_designation_to_jobs' into develop

develop
lethosor 2018-07-11 11:51:24 -04:00
parent 7afa3690bf 20bd03ab6d
commit 9ee368d456
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -46,6 +46,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `startdwarf`: fixed on 64-bit Linux - `startdwarf`: fixed on 64-bit Linux
## Misc Improvements ## Misc Improvements
- Reduced time for designation jobs from tools like `digv` to be assigned workers
- `embark-assistant`: switched to standard scrolling keys, improved spacing slightly - `embark-assistant`: switched to standard scrolling keys, improved spacing slightly
## API ## API

2
library/include/modules/MapCache.h
Unescape Escape View File

@ -55,7 +55,7 @@ class Block;
struct BiomeInfo { struct BiomeInfo {
// Determined by the 4-bit index in the designation bitfield // Determined by the 4-bit index in the designation bitfield
static const unsigned MAX_LAYERS = 16; static constexpr unsigned MAX_LAYERS = 16;
df::coord2d pos; df::coord2d pos;
int default_soil, default_stone, lava_stone; int default_soil, default_stone, lava_stone;

5
library/modules/MapCache.cpp
Unescape Escape View File

@ -79,10 +79,6 @@ using df::global::world;
extern bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index); extern bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index);
#ifdef LINUX_BUILD
const unsigned MapExtras::BiomeInfo::MAX_LAYERS;
#endif
const BiomeInfo MapCache::biome_stub = { const BiomeInfo MapCache::biome_stub = {
df::coord2d(), df::coord2d(),
-1, -1, -1, -1, -1, -1, -1, -1,
@ -742,6 +738,7 @@ bool MapExtras::Block::Write ()
{ {
COPY(block->designation, designation); COPY(block->designation, designation);
block->flags.bits.designated = true; block->flags.bits.designated = true;
block->dsgn_check_cooldown = 0;
dirty_designations = false; dirty_designations = false;
} }
if(dirty_tiles || dirty_veins) if(dirty_tiles || dirty_veins)