diff options
| author | Alexander Gavrilov | 2012-04-10 18:21:19 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-04-10 18:21:19 +0400 |
| commit | b15d2da819b434f94dc7bd2cd22bbab93c992565 (patch) | |
| tree | 8eee470ad903ccdbcd3a558b54f64a7b69a07316 /plugins/probe.cpp | |
| parent | 249be0c1a0e267e806a8b0b1342f1f58f53e44fd (diff) | |
| download | dfhack-b15d2da819b434f94dc7bd2cd22bbab93c992565.tar.gz dfhack-b15d2da819b434f94dc7bd2cd22bbab93c992565.tar.bz2 dfhack-b15d2da819b434f94dc7bd2cd22bbab93c992565.tar.xz | |
Get rid of some obsolete api functions, and restructure MapCache.
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 c2a82840..b34f68d4 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -127,13 +127,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) { @@ -250,7 +251,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) { @@ -273,7 +274,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; } |
