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

Fix liquids bug with block brush, fix liquids bug with out-of-map painting.

develop
Petr Mrázek 2011-10-25 02:38:21 +02:00
parent 5962fc4e4f
commit 0c2a207fcd
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/liquids.cpp
Unescape Escape View File

@ -94,11 +94,11 @@ public:
coord_vec points(MapCache & mc, DFHack::DFCoord start) coord_vec points(MapCache & mc, DFHack::DFCoord start)
{ {
coord_vec v; coord_vec v;
DFHack::DFCoord blockc = start % 16; DFHack::DFCoord blockc = start / 16;
DFHack::DFCoord iterc = blockc * 16; DFHack::DFCoord iterc = blockc * 16;
if( !mc.testCoord(start) ) if( !mc.testCoord(start) )
return v; return v;
auto starty = iterc.y;
for(int xi = 0; xi < 16; xi++) for(int xi = 0; xi < 16; xi++)
{ {
for(int yi = 0; yi < 16; yi++) for(int yi = 0; yi < 16; yi++)
@ -106,6 +106,7 @@ public:
v.push_back(iterc); v.push_back(iterc);
iterc.y++; iterc.y++;
} }
iterc.y = starty;
iterc.x ++; iterc.x ++;
} }
return v; return v;
@ -405,7 +406,6 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
} }
else if(mode == "riversource") else if(mode == "riversource")
{ {
set <Block *> seen_blocks;
coord_vec::iterator iter = all_tiles.begin(); coord_vec::iterator iter = all_tiles.begin();
while (iter != all_tiles.end()) while (iter != all_tiles.end())
{ {
@ -447,7 +447,14 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
coord_vec::iterator iter = all_tiles.begin(); coord_vec::iterator iter = all_tiles.begin();
while (iter != all_tiles.end()) while (iter != all_tiles.end())
{ {
DFHack::DFCoord current = *iter; DFHack::DFCoord current = *iter; // current tile coord
DFHack::DFCoord curblock = current /16; // current block coord
// check if the block is actually there
if(!mcache.BlockAt(curblock))
{
iter ++;
continue;
}
DFHack::t_designation des = mcache.designationAt(current); DFHack::t_designation des = mcache.designationAt(current);
uint16_t tt = mcache.tiletypeAt(current); uint16_t tt = mcache.tiletypeAt(current);
DFHack::naked_designation & flow = des.bits; DFHack::naked_designation & flow = des.bits;
@ -493,7 +500,7 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
} }
mcache.setDesignationAt(current,des); mcache.setDesignationAt(current,des);
} }
seen_blocks.insert(mcache.BlockAt((*iter) / 16)); seen_blocks.insert(mcache.BlockAt(current / 16));
iter++; iter++;
} }
set <Block *>::iterator biter = seen_blocks.begin(); set <Block *>::iterator biter = seen_blocks.begin();