diff -r 7adbde38fac8 src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp    Sat Jan 02 19:19:42 2010 -0500
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp    Mon Jan 04 20:22:39 2010 +0200
@@ -129,10 +129,8 @@
  #define SPEED_RUN               (1.0f)
  #define SPEED_MOUNT             (1.6f)
   
-#define THRALL_WEAPON_MODEL     22106
-#define THRALL_WEAPON_INFO      218169346
-#define THRALL_SHIELD_MODEL     18662
-#define THRALL_SHIELD_INFO      234948100
+#define EQUIP_ID_WEAPON         927
+#define EQUIP_ID_SHIELD         20913
  #define THRALL_MODEL_UNEQUIPPED 17292
  #define THRALL_MODEL_EQUIPPED   18165
   
@@ -206,13 +204,8 @@
                  m_creature->SummonCreature(18764,2181.87,112.46,89.45,0.26,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
                  break;
              case 9:
-                DoScriptText(SAY_TH_ARMORY, m_creature);
-                m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, THRALL_WEAPON_MODEL);
-                //m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, THRALL_WEAPON_INFO);
-                //m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+1, 781);
-                m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, THRALL_SHIELD_MODEL);
-                //m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+2, THRALL_SHIELD_INFO);
-                //m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+3, 1038);
+    DoScriptText(SAY_TH_ARMORY, m_creature);
+                SetEquipmentSlots(false, EQUIP_ID_WEAPON, EQUIP_ID_SHIELD, EQUIP_NO_CHANGE);
                  break;
              case 10:
                  m_creature->SetDisplayId(THRALL_MODEL_EQUIPPED);