From 5e507163b87ccb96cd76064b4f3f49554c7bdf66 Mon Sep 17 00:00:00 2001
From: reverb <Flaming@.(none)>
Date: Wed, 27 Oct 2010 22:30:58 -0500
Subject: [PATCH] Material fix, custom reaction items seem to work again with
 offset update and bars work

---
 data/Memory-ng.xml            |  3 +++
 library/modules/Materials.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

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 @@
         <PETimeStamp value="0x4CA9D544" />
         <MD5 value="702b3ebaae468f73eb1411af54863013" />
         <Offsets>
+            <Group name="Materials">
+                <Address name="other" value="0x16A21FC"/> 0x16445F0 + 0x5DC0C see code at 0x9CFB01
+            </Group>
             <Group name="Creatures">
                 <Address name="current_civ" value="0x1484868 0x14848b8" />
                 <Address name="current_race" value="0x1484874 0x14848c4" />
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())