diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml index a157c0172..a8576e88f 100644 --- a/data/Memory-ng.xml +++ b/data/Memory-ng.xml @@ -1751,6 +1751,9 @@ + +
0x16445F0 + 0x5DC0C see code at 0x9CFB01 +
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp index b1a8afcb9..7ab9f8218 100644 --- a/library/modules/Materials.cpp +++ b/library/modules/Materials.cpp @@ -459,7 +459,7 @@ void Materials::ReadAllMaterials(void) this->ReadCreatureTypes(); this->ReadCreatureTypesEx(); this->ReadDescriptorColors(); - //this->ReadOthers(); + this->ReadOthers(); } std::string Materials::getDescription(t_material & mat) @@ -476,14 +476,14 @@ std::string Materials::getDescription(t_material & mat) return "?"; else { - if (mat.itemType == 0) { - if(mat.subIndex<0) - return "any inorganic"; - else - return this->inorganic[mat.subIndex].id; - } if (mat.subIndex>=this->other.size()) { + if (mat.itemType == 0) { + if(mat.subIndex<0) + return "any inorganic"; + else + return this->inorganic[mat.subIndex].id; + } if(mat.subIndex<0) return "any"; if(mat.subIndex>=this->raceEx.size())