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

Merge branch 'develop' of gh:dfhack/dfhack into develop

develop
lethosor 2017-03-18 00:36:43 -04:00
parent 400d22cb76 61c2fb0a11
commit f7f05724aa
1 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2584,25 +2584,65 @@ static void CopyLocalMap(df::world_data * worldData, df::world_region_details* w
auto south = riverTile->mutable_south(); auto south = riverTile->mutable_south();
auto west = riverTile->mutable_west(); auto west = riverTile->mutable_west();
north->set_active(worldRegionDetails->rivers_vertical.active[xx][yy]); if (xx < 16)
north->set_elevation(worldRegionDetails->rivers_vertical.elevation[xx][yy]); {
north->set_min_pos(worldRegionDetails->rivers_vertical.x_min[xx][yy]); north->set_active(worldRegionDetails->rivers_vertical.active[xx][yy]);
north->set_max_pos(worldRegionDetails->rivers_vertical.x_max[xx][yy]); north->set_elevation(worldRegionDetails->rivers_vertical.elevation[xx][yy]);
north->set_min_pos(worldRegionDetails->rivers_vertical.x_min[xx][yy]);
south->set_active(worldRegionDetails->rivers_vertical.active[xx][yy + 1]); north->set_max_pos(worldRegionDetails->rivers_vertical.x_max[xx][yy]);
south->set_elevation(worldRegionDetails->rivers_vertical.elevation[xx][yy + 1]); }
south->set_min_pos(worldRegionDetails->rivers_vertical.x_min[xx][yy + 1]); else
south->set_max_pos(worldRegionDetails->rivers_vertical.x_max[xx][yy + 1]); {
north->set_active(0);
west->set_active(worldRegionDetails->rivers_horizontal.active[xx][yy]); north->set_elevation(100);
west->set_elevation(worldRegionDetails->rivers_horizontal.elevation[xx][yy]); north->set_min_pos(-30000);
west->set_min_pos(worldRegionDetails->rivers_horizontal.y_min[xx][yy]); north->set_max_pos(-30000);
west->set_max_pos(worldRegionDetails->rivers_horizontal.y_max[xx][yy]); }
east->set_active(worldRegionDetails->rivers_horizontal.active[xx + 1][yy]); if (yy < 16 && xx < 16)
east->set_elevation(worldRegionDetails->rivers_horizontal.elevation[xx + 1][yy]); {
east->set_min_pos(worldRegionDetails->rivers_horizontal.y_min[xx + 1][yy]); south->set_active(worldRegionDetails->rivers_vertical.active[xx][yy + 1]);
east->set_max_pos(worldRegionDetails->rivers_horizontal.y_max[xx + 1][yy]); south->set_elevation(worldRegionDetails->rivers_vertical.elevation[xx][yy + 1]);
south->set_min_pos(worldRegionDetails->rivers_vertical.x_min[xx][yy + 1]);
south->set_max_pos(worldRegionDetails->rivers_vertical.x_max[xx][yy + 1]);
}
else
{
south->set_active(0);
south->set_elevation(100);
south->set_min_pos(-30000);
south->set_max_pos(-30000);
}
if (yy < 16)
{
west->set_active(worldRegionDetails->rivers_horizontal.active[xx][yy]);
west->set_elevation(worldRegionDetails->rivers_horizontal.elevation[xx][yy]);
west->set_min_pos(worldRegionDetails->rivers_horizontal.y_min[xx][yy]);
west->set_max_pos(worldRegionDetails->rivers_horizontal.y_max[xx][yy]);
}
else
{
west->set_active(0);
west->set_elevation(100);
west->set_min_pos(-30000);
west->set_max_pos(-30000);
}
if (xx < 16 && yy < 16)
{
east->set_active(worldRegionDetails->rivers_horizontal.active[xx + 1][yy]);
east->set_elevation(worldRegionDetails->rivers_horizontal.elevation[xx + 1][yy]);
east->set_min_pos(worldRegionDetails->rivers_horizontal.y_min[xx + 1][yy]);
east->set_max_pos(worldRegionDetails->rivers_horizontal.y_max[xx + 1][yy]);
}
else
{
east->set_active(0);
east->set_elevation(100);
east->set_min_pos(-30000);
east->set_max_pos(-30000);
}
} }
auto regionMap = worldData->region_map[pos_x][pos_y]; auto regionMap = worldData->region_map[pos_x][pos_y];