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

Merge pull request #3642 from randombk/remotefortressreader-reload 

Add option to force-fetch world blocks in RemoteFortressReader
develop
Myk 2023-08-07 20:01:56 -07:00 committed by GitHub
parent 970babe77c 031191ae9a
commit cd2d408006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -35,6 +35,7 @@ Template for new versions:
## Documentation ## Documentation
## API ## API
- `RemoteFortressReader`: add a ``force_reload`` option to the GetBlockList RPC API to return blocks regardless of whether they have changed since the last request
## Internals ## Internals

1
plugins/remotefortressreader/proto/RemoteFortressReader.proto
Unescape Escape View File

@ -526,6 +526,7 @@ message BlockRequest
optional int32 max_y = 5; optional int32 max_y = 5;
optional int32 min_z = 6; optional int32 min_z = 6;
optional int32 max_z = 7; optional int32 max_z = 7;
optional bool force_reload = 8;
} }
message BlockList message BlockList

9
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -1393,6 +1393,7 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
int max_y = in->max_y(); int max_y = in->max_y();
int min_z = in->min_z(); int min_z = in->min_z();
int max_z = in->max_z(); int max_z = in->max_z();
bool forceReload = in->force_reload();
bool firstBlock = true; //Always send all the buildings needed on the first block, and none on the rest. bool firstBlock = true; //Always send all the buildings needed on the first block, and none on the rest.
//stream.print("Got request for blocks from (%d, %d, %d) to (%d, %d, %d).\n", in->min_x(), in->min_y(), in->min_z(), in->max_x(), in->max_y(), in->max_z()); //stream.print("Got request for blocks from (%d, %d, %d) to (%d, %d, %d).\n", in->min_x(), in->min_y(), in->min_z(), in->max_x(), in->max_y(), in->max_z());
for (int zz = max_z - 1; zz >= min_z; zz--) for (int zz = max_z - 1; zz >= min_z; zz--)
@ -1440,19 +1441,19 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
bool itemsChanged = block->items.size() > 0; bool itemsChanged = block->items.size() > 0;
bool flows = block->flows.size() > 0; bool flows = block->flows.size() > 0;
RemoteFortressReader::MapBlock *net_block = nullptr; RemoteFortressReader::MapBlock *net_block = nullptr;
if (tileChanged || desChanged || spatterChanged || firstBlock || itemsChanged || flows) if (tileChanged || desChanged || spatterChanged || firstBlock || itemsChanged || flows || forceReload)
{ {
net_block = out->add_map_blocks(); net_block = out->add_map_blocks();
net_block->set_map_x(block->map_pos.x); net_block->set_map_x(block->map_pos.x);
net_block->set_map_y(block->map_pos.y); net_block->set_map_y(block->map_pos.y);
net_block->set_map_z(block->map_pos.z); net_block->set_map_z(block->map_pos.z);
} }
if (tileChanged) if (tileChanged || forceReload)
{ {
CopyBlock(block, net_block, &MC, pos); CopyBlock(block, net_block, &MC, pos);
blocks_sent++; blocks_sent++;
} }
if (desChanged) if (desChanged || forceReload)
CopyDesignation(block, net_block, &MC, pos); CopyDesignation(block, net_block, &MC, pos);
if (firstBlock) if (firstBlock)
{ {
@ -1460,7 +1461,7 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
CopyProjectiles(net_block); CopyProjectiles(net_block);
firstBlock = false; firstBlock = false;
} }
if (spatterChanged) if (spatterChanged || forceReload)
Copyspatters(block, net_block, &MC, pos); Copyspatters(block, net_block, &MC, pos);
if (itemsChanged) if (itemsChanged)
CopyItems(block, net_block, &MC, pos); CopyItems(block, net_block, &MC, pos);