Fix ageItem to work correctly, and update XML

cloonex · Aug 15, 2014 · ebda2d8 · ebda2d8
1 parent d959507
commit ebda2d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/library/xml b/library/xml
diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp
@@ -1010,18 +1010,18 @@ IMPLEMENT_VMETHOD_INTERPOSE(military_training_id_hook, process);
 struct craft_age_wear_hook : df::item_crafted {
     typedef df::item_crafted interpose_base;
 
-    DEFINE_VMETHOD_INTERPOSE(void, ageItem, (int amount))
+    DEFINE_VMETHOD_INTERPOSE(bool, ageItem, (int amount))
     {
         int orig_age = age;
         age += amount;
         if (age > 200000000)
             age = 200000000;
         if (age == orig_age)
-            return;
+            return false;
 
         MaterialInfo mat(mat_type, mat_index);
         if (!mat.isValid())
-            return;
+            return false;
         int wear = 0;
 
         if (mat.material->flags.is_set(material_flags::WOOD))
@@ -1032,10 +1032,12 @@ struct craft_age_wear_hook : df::item_crafted {
             mat.material->flags.is_set(material_flags::YARN))
             wear = 1;
         else
-            return;
+            return false;
         wear = ((orig_age % wear) + (age - orig_age)) / wear;
         if (wear > 0)
-            addWear(wear, false, false);
+            return incWearTimer(wear);
+        else
+            return false;
     }
 };
 IMPLEMENT_VMETHOD_INTERPOSE(craft_age_wear_hook, ageItem);
+5 −1		README.UPDATE
+1 −1		df.creature-raws.xml
+3 −3		df.history.xml
+7 −7		df.interaction.xml
+1 −1		df.itemimprovements.xml
+15 −14		df.items.xml
+1 −1		df.map.xml
+2 −2		df.meeting.xml
+1 −1		df.military.xml
+10 −2		df.units.xml
+2,688 −2,158		linux/all.csv
+18,197 −18,196		linux/globals.csv
+41 −41		linux/therapist.ini
+2 −0		make-csv.sh
+9 −3		make-scans.sh
+24 −4		match-vtables.pl
+57 −80		symbols.xml
+2,688 −2,158		windows/all.csv
+18,199 −18,198		windows/globals.csv
+41 −41		windows/therapist.ini