Merge pull request #2571 from RosaryMala/probe

Enabled probe, and fixed the one thing preventing it from compiling.
develop
Myk 2023-01-09 01:48:39 -08:00 committed by GitHub
commit 80cdb08594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

@ -144,7 +144,7 @@ dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua)
dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua) dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
#dfhack_plugin(petcapRemover petcapRemover.cpp) #dfhack_plugin(petcapRemover petcapRemover.cpp)
#dfhack_plugin(plants plants.cpp) #dfhack_plugin(plants plants.cpp)
#dfhack_plugin(probe probe.cpp) dfhack_plugin(probe probe.cpp)
#dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) #dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua)
#dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua) #dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua)
#dfhack_plugin(regrass regrass.cpp) #dfhack_plugin(regrass regrass.cpp)

@ -477,8 +477,8 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters)
out.print(", subtype %i", building.subtype); out.print(", subtype %i", building.subtype);
break; break;
} }
if(building.origin->is_room) //isRoom()) if(building.origin->relations.size()) //Connected to rooms.
out << ", room"; out << ", " << building.origin->relations.size() << " rooms";
if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage()) if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage())
out << ", in construction"; out << ", in construction";
out.print("\n"); out.print("\n");