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

Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

develop
lethosor 2015-07-04 20:46:20 -04:00
parent 527b17d964 867e78b6fd
commit acb6eb7b53
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/remotefortressreader.cpp
Unescape Escape View File

@ -655,6 +655,15 @@ void CopyBlock(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetBloc
df::coord2d p = df::coord2d(xx, yy); df::coord2d p = df::coord2d(xx, yy);
t_matpair baseMat = block->baseMaterialAt(p); t_matpair baseMat = block->baseMaterialAt(p);
t_matpair staticMat = block->staticMaterialAt(p); t_matpair staticMat = block->staticMaterialAt(p);
switch (tileMaterial(tile))
{
case tiletype_material::FROZEN_LIQUID:
staticMat.mat_type = builtin_mats::WATER;
staticMat.mat_index = -1;
break;
default:
break;
}
RemoteFortressReader::MatPair * material = NetBlock->add_materials(); RemoteFortressReader::MatPair * material = NetBlock->add_materials();
material->set_mat_type(staticMat.mat_type); material->set_mat_type(staticMat.mat_type);
material->set_mat_index(staticMat.mat_index); material->set_mat_index(staticMat.mat_index);