diff options
| author | Robert Heinrich | 2012-04-11 18:23:01 +0200 |
|---|---|---|
| committer | Robert Heinrich | 2012-04-11 18:23:01 +0200 |
| commit | 09aad951a6ffd0b80d108363a86388499bc8704e (patch) | |
| tree | e353216e9a009aadc70186b569a8c9c8742ed4b7 /plugins/probe.cpp | |
| parent | 2cf078419b22be998c1d06ae0bca94774c04c527 (diff) | |
| parent | 5d5502ae341030c58478dae2d04ba31ab2bfb93e (diff) | |
| download | dfhack-09aad951a6ffd0b80d108363a86388499bc8704e.tar.gz dfhack-09aad951a6ffd0b80d108363a86388499bc8704e.tar.bz2 dfhack-09aad951a6ffd0b80d108363a86388499bc8704e.tar.xz | |
Merge branch 'master' of git://github.com/angavrilov/dfhack
Diffstat (limited to 'plugins/probe.cpp')
| -rw-r--r-- | plugins/probe.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/probe.cpp b/plugins/probe.cpp index d5f03b81..37df180d 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -147,13 +147,14 @@ command_result df_probe (color_ostream &out, vector <string> & parameters) uint32_t tileY = cursorY % 16; MapExtras::Block * b = mc.BlockAt(cursor/16); - if(!b && !b->valid) + if(!b || !b->is_valid()) { out.printerr("No data.\n"); return CR_OK; } - mapblock40d & block = b->raw; - out.print("block addr: 0x%x\n\n", block.origin); + + auto &block = *b->getRaw(); + out.print("block addr: 0x%x\n\n", &block); /* if (showBlock) { @@ -270,7 +271,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters) t_feature local; t_feature global; - Maps::ReadFeatures(&(b->raw),&local,&global); + Maps::ReadFeatures(&block,&local,&global); PRINT_FLAG( des, feature_local ); if(local.type != -1) { @@ -293,7 +294,6 @@ command_result df_probe (color_ostream &out, vector <string> & parameters) << endl; out << "global feature idx: " << block.global_feature << endl; - out << "mystery: " << block.mystery << endl; out << std::endl; return CR_OK; } |
