WotLK pre-3.2 gems fix

sql/world/base/ipp_aware_npcs.sql

@@ -17,9 +17,10 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN (
 
 UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk_ulduar' WHERE `entry` IN (34252);
 
-UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk_totc' WHERE `entry` IN (35498, 35577, 35496, 36208, 35500, 35497, 34244);
+UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk_totc' WHERE `entry` IN (35498, 35577, 35496, 36208, 35500, 35497, 34244, 28701);
 
-UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk_icc' WHERE `entry` IN (37776, 40160);
+# TODO: Harold Winston (32172) has rings from all patches, so he needs special phasing applied - for now make him require ICC progression
+UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk_icc' WHERE `entry` IN (37776, 40160, 37780, 32172);
 
 UPDATE `gameobject_template` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `entry` IN (195141);
 

sql/world/base/wotlk_vendors.sql

@@ -0,0 +1,7 @@
+-- Restore vendors to use pre-3.2 gems
+UPDATE `npc_vendor` SET `item`=36918 WHERE `item`=36919;
+UPDATE `npc_vendor` SET `item`=36921 WHERE `item`=36922;
+UPDATE `npc_vendor` SET `item`=36924 WHERE `item`=36925;
+UPDATE `npc_vendor` SET `item`=36927 WHERE `item`=36928;
+UPDATE `npc_vendor` SET `item`=36930 WHERE `item`=36931;
+UPDATE `npc_vendor` SET `item`=36933 WHERE `item`=36934;

src/naxx40Scripts/boss_sapphiron_40.cpp

@@ -89,7 +89,7 @@ enum Events
 class boss_sapphiron_40 : public CreatureScript
 {
 private:
-    static boolean isNaxx40Sapp(uint32 entry)
+    static bool isNaxx40Sapp(uint32 entry)
     {
         return (entry == NPC_SAPPHIRON_40);
     }