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

diggingInvaders: fixed a major bug with edge sorting.

develop
expwnent 2012-12-17 00:17:07 -05:00
parent d79583a2c9
commit bf25ea5129
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/diggingInvaders/diggingInvaders.cpp
Unescape Escape View File

@ -110,10 +110,12 @@ public:
} }
bool operator==(const Edge& e) const { bool operator==(const Edge& e) const {
return (p1 == e.p1 && p2 == e.p2); return (cost == e.cost && p1 == e.p1 && p2 == e.p2);
} }
bool operator<(const Edge& e) const { bool operator<(const Edge& e) const {
if ( cost != e.cost )
return cost < e.cost;
if ( p1 != e.p1 ) if ( p1 != e.p1 )
return p1 < e.p1; return p1 < e.p1;
if ( p2 != e.p2 ) if ( p2 != e.p2 )
@ -183,9 +185,6 @@ command_result diggingInvadersFunc(color_ostream& out, std::vector<std::string>&
continue; continue;
if ( !Units::isCitizen(unit) && !unit->flags1.bits.active_invader ) if ( !Units::isCitizen(unit) && !unit->flags1.bits.active_invader )
continue; continue;
if ( unit->flags2.bits.resident ) {
out.print("resident\n");
}
if ( roots.find(unit->pos) != roots.end() ) if ( roots.find(unit->pos) != roots.end() )
continue; continue;
@ -203,11 +202,7 @@ command_result diggingInvadersFunc(color_ostream& out, std::vector<std::string>&
set<Edge> importantEdges; set<Edge> importantEdges;
int32_t dumb = 0;
while(roots.size() > 1) { while(roots.size() > 1) {
if ( dumb >= 1000 )
break;
dumb++;
set<df::coord> toDelete; set<df::coord> toDelete;
int32_t firstSize = edgeSet[*roots.begin()].size(); int32_t firstSize = edgeSet[*roots.begin()].size();
//out.print("%s, %d: root size = %d, first size = %d\n", __FILE__, __LINE__, roots.size(), firstSize); //out.print("%s, %d: root size = %d, first size = %d\n", __FILE__, __LINE__, roots.size(), firstSize);
@ -319,6 +314,8 @@ command_result diggingInvadersFunc(color_ostream& out, std::vector<std::string>&
if ( (*a).second < 2 ) if ( (*a).second < 2 )
continue; continue;
out.print("Requires action: (%d,%d,%d): %d\n", pos.x,pos.y,pos.z, (*a).second); out.print("Requires action: (%d,%d,%d): %d\n", pos.x,pos.y,pos.z, (*a).second);
df::map_block* block = Maps::getTileBlock(pos);
block->tiletype[pos.x&0x0F][pos.y&0x0F] = df::enums::tiletype::ConstructedStairUD;
} }
/*for ( auto a = importantPoints.begin(); a != importantPoints.end(); a++ ) { /*for ( auto a = importantPoints.begin(); a != importantPoints.end(); a++ ) {