diff options
| author | Alexander Gavrilov | 2012-05-05 19:28:19 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-05-05 19:28:19 +0400 |
| commit | 4e084d0df78e4807b30d7eed9efddce41b8bc555 (patch) | |
| tree | d12ff10ca0c72842ef8ec496202f34aaf2e91f04 /plugins/probe.cpp | |
| parent | 1b5ce7b7170223f5f6303cd04ba7e1fb80c4ca70 (diff) | |
| parent | e1770fa62bebf1fe3fc4af7a6dbd9c7260b51c6e (diff) | |
| download | dfhack-4e084d0df78e4807b30d7eed9efddce41b8bc555.tar.gz dfhack-4e084d0df78e4807b30d7eed9efddce41b8bc555.tar.bz2 dfhack-4e084d0df78e4807b30d7eed9efddce41b8bc555.tar.xz | |
Merge remote-tracking branch 'rh73/master'
Diffstat (limited to 'plugins/probe.cpp')
| -rw-r--r-- | plugins/probe.cpp | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/plugins/probe.cpp b/plugins/probe.cpp index f7430af2..eb622e78 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -330,6 +330,39 @@ command_result df_probe (color_ostream &out, vector <string> & parameters) out << "global feature idx: " << block.global_feature << endl; out << std::endl; + + if(block.occupancy[tileX][tileY].bits.no_grow) + out << "no grow" << endl; + + for(size_t e=0; e<block.block_events.size(); e++) + { + df::block_square_event * blev = block.block_events[e]; + df::block_square_event_type blevtype = blev->getType(); + switch(blevtype) + { + case df::block_square_event_type::grass: + { + df::block_square_event_grassst * gr_ev = (df::block_square_event_grassst *)blev; + if(gr_ev->amount[tileX][tileY] > 0) + { + out << "amount of grass: " << (int)gr_ev->amount[tileX][tileY] << endl; + } + break; + } + case df::block_square_event_type::world_construction: + { + df::block_square_event_world_constructionst * co_ev = (df::block_square_event_world_constructionst*)blev; + uint16_t bits = co_ev->tile_bitmask[tileY]; + out << "construction bits: " << bits << endl; + break; + } + default: + //out << "unhandled block event type!" << endl; + break; + } + } + + return CR_OK; } @@ -417,14 +450,10 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters) break; } if(building.origin->is_room) //isRoom()) - out << ", is room"; - else - out << ", not a room"; + out << ", room"; if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage()) out << ", in construction"; out.print("\n"); - - } return CR_OK; } |
