summaryrefslogtreecommitdiff
path: root/plugins/probe.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-11-03 04:30:59 +0100
committerPetr Mrázek2011-11-03 04:30:59 +0100
commit4f0695a6d560eae69e270e9a46fa09f898a096cc (patch)
tree972973ccf4d6e024db5a34e4fa61456ae2dfd6e9 /plugins/probe.cpp
parent550cde83f3f53b0a288ed474d1c90e64dfb418c5 (diff)
downloaddfhack-4f0695a6d560eae69e270e9a46fa09f898a096cc.tar.gz
dfhack-4f0695a6d560eae69e270e9a46fa09f898a096cc.tar.bz2
dfhack-4f0695a6d560eae69e270e9a46fa09f898a096cc.tar.xz
Messing with materials.
Diffstat (limited to 'plugins/probe.cpp')
-rw-r--r--plugins/probe.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index 6006e77e..2289f1d0 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -103,7 +103,8 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters)
DFHack::Materials *Materials = c->getMaterials();
DFHack::VersionInfo* mem = c->vinfo;
DFHack::Maps *Maps = c->getMaps();
- bool hasmats = Materials->ReadInorganicMaterials();
+ std::vector<t_matglossInorganic> inorganic;
+ bool hasmats = Materials->CopyInorganicMaterials(inorganic);
if(!Maps->Start())
{
@@ -199,9 +200,9 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters)
{
con << "Layer material: " << dec << base_rock;
if(hasmats)
- con << " / " << Materials->inorganic[base_rock].id
+ con << " / " << inorganic[base_rock].id
<< " / "
- << Materials->inorganic[base_rock].name
+ << inorganic[base_rock].name
<< endl;
else
con << endl;
@@ -211,9 +212,9 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters)
{
con << "Vein material (final): " << dec << vein_rock;
if(hasmats)
- con << " / " << Materials->inorganic[vein_rock].id
+ con << " / " << inorganic[vein_rock].id
<< " / "
- << Materials->inorganic[vein_rock].name
+ << inorganic[vein_rock].name
<< endl;
else
con << endl;