diff options
339 files changed, 5883 insertions, 5660 deletions
diff --git a/sql/updates/world/2011_10_08_00_world_page_text.sql b/sql/updates/world/2011_10_08_00_world_page_text.sql new file mode 100644 index 00000000000..aa9aeee6ba4 --- /dev/null +++ b/sql/updates/world/2011_10_08_00_world_page_text.sql @@ -0,0 +1,128 @@ +-- Repair all page_text with HTML format content (Now you can see maps, centered titles and graphics in GO and items with page_texts) +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1>Horde Conscription Registration</H1>\n<BR></BR>\n<P>This person has demonstrated incredible feats of strength and skill in the name of the Horde. They should immediately be assigned to work in the Crossroads.</P>\n<BR></BR>\n<BR></BR>\n<P>Respectfully yours:</P>\n<BR></BR>\n<BR></BR>\n<BR></BR>\n<BR></BR>\n<P>Looks good to me.<BR></BR>\n- Takrin Pathseeker</P>\n</BODY>\n</HTML>' WHERE `entry`=340; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1>Horde Conscription Registration</H1>\n<BR></BR>\n<P>This person has demonstrated incredible feats of strength and skill in the name of the Horde. They should immediately be assigned to work in the Crossroads.</P>\n<BR></BR>\n<BR></BR>\n<P>Respectfully yours:\n<BR></BR>- Kargal Battlescar</P>\n<BR></BR>\n<BR></BR>\n<BR></BR>\n<P>Looks good to me.<BR></BR>\n- Takrin Pathseeker</P>\n</BODY>\n</HTML>' WHERE `entry`=341; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<H1 align=\"center\">\nEliza\n</H1>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<P align=\"center\">\nBeloved wife, may the earth sate your hunger.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=731; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<H1 align=\"center\">\nEliza\n</H1>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<P align=\"center\">\nBeloved wife, may the earth sate your hunger.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=750; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<P>\nIn memory of my dear mentor, Horatio M. Montgomery, M.D. Healer, Teacher, Friend.\n</P>\n<BR/>\n<H1 align=\"center\">\n50 BTFT - 25 ATFT\n</H1>\n<BR/>\n<P>\n\"The world is full of the sick and weary. It is our job, as healers, NAY, as men and women of medicine, to cleanse them ALL of the ''itis.''\"\n</P>\n<BR/>\n<P>\n- H.M.M., M.D., PhD, JD, Grandmaster Farmer, Dancer Extraordinaire, Friend to the Animals\n</P>\n<BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=1031; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<P>\nIn memory of my dear mentor, Horatio M. Montgomery, M.D. Healer, Teacher, Friend.\n</P>\n<BR/>\n<H1 align=\"center\">\n50 BTFT - 25 ATFT\n</H1>\n<BR/>\n<P>\n\"The world is full of the sick and weary. It is our job, as healers, NAY, as men and women of medicine, to cleanse them ALL of the ''itis.''\"\n</P>\n<BR/>\n<P>\n- H.M.M., M.D., PhD, JD, Grandmaster Farmer, Dancer Extraordinaire, Friend to the Animals\n</P>\n<BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=1050; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\9330_Gammerita_sepia_256\"/>\n</BODY>\n</HTML>' WHERE `entry`=1171; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\9330_Gammerita_sepia_256\"/>\n</BODY>\n</HTML>' WHERE `entry`=1190; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\Linken_sepia_256px\"/>\n</BODY>\n</HTML>' WHERE `entry`=1371; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\Linken_sepia_256px\"/>\n</BODY>\n</HTML>' WHERE `entry`=1391; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nCRYSTAL PYLON USER''S MANUAL\n</H1>\n<BR/>\n<P align=\"center\">\n\"A guide to collecting and using the power crystals of Un''Goro Crater\"\n</P>\n<BR/>\n<BR/>\n<P align=\"left\">\nChapter 1: The Northern Pylon\n</P>\n<BR/>\n<P align=\"left\">\nChapter 2: The Eastern Pylon\n</P>\n<BR/>\n<P align=\"left\">\nChapter 3: The Western Pylon\n</P>\n<BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=1491; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nCRYSTAL PYLON USER''S MANUAL\n</H1>\n<BR/>\n<P align=\"center\">\n\"A guide to collecting and using the power crystals of Un''Goro Crater\"\n</P>\n<BR/>\n<BR/>\n<P align=\"left\">\nChapter 1: The Northern Pylon\n</P>\n<BR/>\n<P align=\"left\">\nChapter 2: The Eastern Pylon\n</P>\n<BR/>\n<P align=\"left\">\nChapter 3: The Western Pylon\n</P>\n<BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=1510; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nChapter 1: THE NORTHERN PYLON\n</H1>\n<BR/>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_mini_north\" align=\"left\"/>\n<P align=\"right\">\nThe Northern\n<BR/>\nPylon accepts\n<BR/>\nyellow, red,\n<BR/>\nand green\n<BR/>\ncrystals.\n</P>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<P align=\"left\">\nThe Pylon focuses on the energy that can be created using yellow crystals as the main source of power.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=1511; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nNorthern Crystal Combinations\n</H1>\n<BR/>\n<P align=\"left\">\nThere are two possible effects: one that will produce damage, and one that will negate damage.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL CHARGE: Requires red and yellow crystals.\n<BR/>\nThis will produce a large explosion.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL RESTORE: Requires yellow and green crystals.\n<BR/>\nThis will provide you with a healing aura.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=1512; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nNORTHERN PYLON TABLE DIAGRAM\n</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_north\"/>\n</BODY>\n</HTML>' WHERE `entry`=1513; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nChapter 2: THE EASTERN PYLON\n</H1>\n<BR/>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_mini_east\" align=\"left\"/>\n<P align=\"right\">\nThe Eastern\n<BR/>\nPylon accepts\n<BR/>\nblue, yellow,\n<BR/>\nand green\n<BR/>\ncrystals.\n</P>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<P align=\"left\">\nThe Pylon focuses on the energy that can be created using blue crystals as the main source of power.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=1514; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nEastern Crystal Combinations\n</H1>\n<BR/>\n<P align=\"left\">\nThere are two possible effects: one provides bonus to spirit, and one that creates a damaging shield.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL FORCE: Requires blue and green crystals.\n<BR/>\nThis will provide you with an increase in spirit.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL SPIRE: Requires blue and yellow crystals.\n<BR/>\nThis will create a shield that does damage to attackers.\n</P>\n</BODY>\n</HTML>\n' WHERE `entry`=1515; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nEASTERN PYLON TABLE DIAGRAM\n</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_east\"/>\n</BODY>\n</HTML>' WHERE `entry`=1516; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nEASTERN PYLON TABLE DIAGRAM\n</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_east\"/>\n</BODY>\n</HTML>' WHERE `entry`=1530; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nChapter 3: THE WESTERN PYLON\n</H1>\n<BR/>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_mini_west\" align=\"left\"/>\n<P align=\"right\">\nThe Western\n<BR/>\nPylon accepts\n<BR/>\nred, green,\n<BR/>\nand blue\n<BR/>\ncrystals.\n</P>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<P align=\"left\">\nThe Pylon focuses on the energy that can be created using red crystals as the main source of power.\n</P>\n</BODY>\n</HTML>' WHERE `entry`=1531; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nWestern Crystal Combinations\n</H1>\n<BR/>\n<P align=\"left\">\nThere are two possible effects: one that increases your protection from damage, and one that weakens an enemy''s defenses.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL WARD: Requires red and green crystals.\n<BR/>\nThis will provide you with an increase to armor.\n</P>\n<BR/>\n<P align=\"left\">\nCRYSTAL YIELD: Requires blue and red crystals.\n<BR/>\nThis can lower the armor of a specific target.\n</P>\n</BODY>\n</HTML>' WHERE `entry`=1532; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nWESTERN PYLON TABLE DIAGRAM\n</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_west\"/>\n</BODY>\n</HTML>' WHERE `entry`=1533; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nWESTERN PYLON TABLE DIAGRAM\n</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\11482_crystals_west\"/>\n</BODY>\n</HTML>' WHERE `entry`=1550; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blackrock_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1635; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blasted_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1636; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1637; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_nightdragon_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1638; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blackrock_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1639; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_bldbank_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1640; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1641; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blackrock_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1642; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blasted_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1643; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1644; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blackrock_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1645; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_bldbank_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1646; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blasted_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1647; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1648; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_blackrock_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1649; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_bldbank_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1650; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_whipper_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1651; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1652; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\11733_ungoro_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=1690; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\14679_Tirion_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=2351; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\14679_Tirion_256\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=2370; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">A TREATISE ON MILITARY RANKS</H1><BR/>\n<IMG src=\"Interface\\PvPRankBadges\\PvPRankAlliance\" align=\"left\"/><BR/>\n<P align=\"right\">What follows are</P>\n<P align=\"right\">the military ranks</P>\n<P align=\"right\">of the Alliance,</P>\n<P align=\"right\">proceeded by such</P>\n<P align=\"right\">information as is</P>\n<P align=\"right\">known for the races</P>\n<P align=\"right\">of the Horde. Each</P>\n<P align=\"right\">is presented in two</P>\n<P align=\"right\">sections, the officers and then the enlisted, with the ranks of each listed in descending order from highest to lowest. Long live the Alliance!</P>\n</BODY>\n</HTML>' WHERE `entry`=2654; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE ALLIANCE</H1><BR/>\n<P align="center">Part 1</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank14" align="left"/><BR/>\n<P align="right">Grand Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank13" align="left"/><BR/>\n<P align="right">Field Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank12" align="left"/><BR/>\n<P align="right">Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank11" align="left"/><BR/>\n<P align="right">Commander</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank10" align="left"/><BR/>\n<P align="right">Lieutenant Commander</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2655; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE ALLIANCE</H1><BR/>\n<P align="center">Part 2</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank09" align="left"/><BR/>\n<P align="right">Knight-Champion</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank08" align="left"/><BR/>\n<P align="right">Knight-Captain</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank07" align="left"/><BR/>\n<P align="right">Knight-Lieutenant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank06" align="left"/><BR/>\n<P align="right">Knight</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2656; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">ENLISTED RANKS OF THE ALLIANCE</H1><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank05" align="left"/><BR/>\n<P align="right">Sergeant Major</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank04" align="left"/><BR/>\n<P align="right">Master Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank03" align="left"/><BR/>\n<P align="right">Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank02" align="left"/><BR/>\n<P align="right">Corporal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank01" align="left"/><BR/>\n<P align="right">Private</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2657; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE HORDE</H1><BR/>\n<P align="center">Part 1</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank14" align="left"/><BR/>\n<P align="right">High Warlord</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank13" align="left"/><BR/>\n<P align="right">Warlord</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank12" align="left"/><BR/>\n<P align="right">General</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank11" align="left"/><BR/>\n<P align="right">Lieutenant General</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank10" align="left"/><BR/>\n<P align="right">Champion</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2658; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">ENLISTED RANKS OF THE HORDE</H1><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank05" align="left"/><BR/>\n<P align="right">First Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank04" align="left"/><BR/>\n<P align="right">Senior Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank03" align="left"/><BR/>\n<P align="right">Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank02" align="left"/><BR/>\n<P align="right">Grunt</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank01" align="left"/><BR/>\n<P align="right">Scout</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2660; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">MILITARY RANKS OF THE HORDE & ALLIANCE</H1>\n<BR/>\n<BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRankHorde" align="left"/>\n<BR/>\n<P align="right">Throm''ka! In this</P>\n<P align="right">book you will find</P>\n<P align="right">many listings of</P>\n<P align="right">the military ranks</P>\n<P align="right">of the Horde and</P>\n<P align="right">the puny Alliance.</P>\n<P align="right">First will come the</P>\n<P align="right">Horde, then the Alliance,</P>\n<P align="right">each with listings of officers and enlisted ranks. As is fitting, the strongest are listed at the top, with the weaker listed below them.</P>\n</BODY>\n</HTML>' WHERE `entry`=2661; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE HORDE</H1><BR/>\n<P align="center">Part 1</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank14" align="left"/><BR/>\n<P align="right">High Warlord</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank13" align="left"/><BR/>\n<P align="right">Warlord</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank12" align="left"/><BR/>\n<P align="right">General</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank11" align="left"/><BR/>\n<P align="right">Lieutenant General</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank10" align="left"/><BR/>\n<P align="right">Champion</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2662; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE HORDE</H1><BR/>\n<P align="center">Part 2</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank09" align="left"/><BR/>\n<P align="right">Centurion</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank08" align="left"/><BR/>\n<P align="right">Legionnaire</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank07" align="left"/><BR/>\n<P align="right">Blood Guard</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank06" align="left"/><BR/>\n<P align="right">Stone Guard</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2663; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">HORDE ENLISTED RANKS</H1><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank05" align="left"/><BR/>\n<P align="right">First Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank04" align="left"/><BR/>\n<P align="right">Senior Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank03" align="left"/><BR/>\n<P align="right">Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank02" align="left"/><BR/>\n<P align="right">Grunt</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank01" align="left"/><BR/>\n<P align="right">Scout</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2664; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE ALLIANCE</H1><BR/>\n<P align="center">Part 1</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank14" align="left"/><BR/>\n<P align="right">Grand Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank13" align="left"/><BR/>\n<P align="right">Field Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank12" align="left"/><BR/>\n<P align="right">Marshal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank11" align="left"/><BR/>\n<P align="right">Commander</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank10" align="left"/><BR/>\n<P align="right">Lieutenant Commander</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2665; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">ALLIANCE MILITARY RANKS</H1><BR/>\n<P align=\"center\">OFFICERS</P><BR/>\n<P align=\"center\">Grand Marshal</P>\n<P align=\"center\">Field Marshal</P>\n<P align=\"center\">Marshal</P>\n<P align=\"center\">Commander</P>\n<P align=\"center\">Lieutenant Commander</P>\n<P align=\"center\">Knight-Champion</P>\n<P align=\"center\">Knight-Captain</P>\n<P align=\"center\">Knight-Lieutenant</P>\n<P align=\"center\">Knight</P><BR/>\n<P align=\"center\">ENLISTED</P><BR/>\n<P align=\"center\">Sergeant Major</P>\n<P align=\"center\">Master Sergeant</P>\n<P align=\"center\">Sergeant</P>\n<P align=\"center\">Corporal</P>\n<P align=\"center\">Private</P><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2676; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">HORDE MILITARY RANKS</H1><BR/>\n<P align=\"center\">OFFICERS</P><BR/>\n<P align=\"center\">High Warlord</P>\n<P align=\"center\">Warlord</P>\n<P align=\"center\">General</P>\n<P align=\"center\">Lieutenant General</P>\n<P align=\"center\">Champion</P>\n<P align=\"center\">Centurion</P>\n<P align=\"center\">Legionnaire</P>\n<P align=\"center\">Blood Guard</P>\n<P align=\"center\">Stone Guard</P><BR/>\n<P align=\"center\">ENLISTED</P><BR/>\n<P align=\"center\">First Sergeant</P>\n<P align=\"center\">Senior Sergeant</P>\n<P align=\"center\">Sergeant</P>\n<P align=\"center\">Grunt</P>\n<P align=\"center\">Scout</P><BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=2677; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<P align=\"left\">Here lies Durotan - first Chieftain of the Frostwolf Clan, and father of our honored Warchief, Thrall. He was the bravest of our kind - betrayed by those who would see our people enslaved. Durotan gave his life that our freedom might be gained. We honor him - and the legacy he passed on to us through his son.</P><BR/>\n<P align=\"left\">Drek''Thar, Far Seer of the Frostwolves </P>\n</BODY>\n</HTML>' WHERE `entry`=2731; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">HORDE MILITARY RANKS</H1><BR/>\n<P align=\"center\">OFFICERS</P><BR/>\n<P align=\"center\">High Warlord</P>\n<P align=\"center\">Warlord</P>\n<P align=\"center\">General</P>\n<P align=\"center\">Lieutenant General</P>\n<P align=\"center\">Champion</P>\n<P align=\"center\">Centurion</P>\n<P align=\"center\">Legionnaire</P>\n<P align=\"center\">Blood Guard</P>\n<P align=\"center\">Stone Guard</P><BR/>\n<P align=\"center\">ENLISTED</P><BR/>\n<P align=\"center\">First Sergeant</P>\n<P align=\"center\">Senior Sergeant</P>\n<P align=\"center\">Sergeant</P>\n<P align=\"center\">Grunt</P>\n<P align=\"center\">Scout</P><BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=2770; +UPDATE `page_text` SET `text`='You cannot understand a single word on this ledger. You don''t even know what language it is written in!' WHERE `entry`=2822; +UPDATE `page_text` SET `text`='<HTML>\r\n<BODY>\r\n<IMG src=\"Interface\\Pictures\\21037_crudemap_256\"/>\r\n</BODY>\r\n</HTML>\r\n' WHERE `entry`=2828; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE HORDE</H1><BR/>\n<P align="center">Part 2</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank09" align="left"/><BR/>\n<P align="right">Centurion</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank08" align="left"/><BR/>\n<P align="right">Legionnaire</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank07" align="left"/><BR/>\n<P align="right">Blood Guard</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank06" align="left"/><BR/>\n<P align="right">Stone Guard</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2854; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">ENLISTED RANKS OF THE HORDE</H1><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank05" align="left"/><BR/>\n<P align="right">First Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank04" align="left"/><BR/>\n<P align="right">Senior Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank03" align="left"/><BR/>\n<P align="right">Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank02" align="left"/><BR/>\n<P align="right">Grunt</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank01" align="left"/><BR/>\n<P align="right">Scout</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2855; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">OFFICER RANKS OF THE ALLIANCE</H1><BR/>\n<P align="center">Part 2</P>\n<IMG src="Interface\\PvPRankBadges\\PvPRank09" align="left"/><BR/>\n<P align="right">Knight-Champion</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank08" align="left"/><BR/>\n<P align="right">Knight-Captain</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank07" align="left"/><BR/>\n<P align="right">Knight-Lieutenant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank06" align="left"/><BR/>\n<P align="right">Knight</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2856; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align="center">ALLIANCE ENLISTED RANKS</H1><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank05" align="left"/><BR/>\n<P align="right">Sergeant Major</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank04" align="left"/><BR/>\n<P align="right">Master Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank03" align="left"/><BR/>\n<P align="right">Sergeant</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank02" align="left"/><BR/>\n<P align="right">Corporal</P><BR/><BR/>\n<IMG src="Interface\\PvPRankBadges\\PvPRank01" align="left"/><BR/>\n<P align="right">Private</P><BR/><BR/>\n</BODY>\n</HTML>' WHERE `entry`=2857; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">\nAnthony Ray Stark\n</H1>\n<H2 align=\"center\">\n1961 - 2005\n</H2>\n</BODY>\n</HTML>' WHERE `entry`=2858; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">BRAZIER OF INVOCATION: USER''S MANUAL</H1><BR/><P align=\"center\">Where to find Haunted Loci</P><BR/><P align=\"center\">INTRODUCTION</P><BR/><P align=\"left\">Contained within these pages are the locations of the fallen and corrupted spirits and souls involved in the Lord Valthalak''s Amulet Incident. Though you have already saved these former companions of mine, it would be my conjecture that repugnant echoes of the evil that once twisted their spirits still linger at those haunted loci. Such was the malevolent power of Lord Valthalak''s spirit.</P><BR/><P align=\"left\">Additionally, the brazier can be used to summon forth Lord Valathalak, though as before, extreme caution should be taken in doing so.</P><BR/></BODY></HTML>' WHERE `entry`=2859; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">INTRODUCTION, continued...</H1><BR/><P align=\"left\">The brazier itself functions just as the Brazier of Beckoning did. Simply place it within range of any of the five haunted loci and it will invoke the spirits of the dead.</P><BR/><P align=\"left\">As a side note, because I know that you''ll be interested in knowing, the Banner of Provocation can be used in similar fashion at the arena in Blackrock Depths. Be sure to teach Theldren and his goons a lesson for me every time you get a chance when you''re there.</P><BR/><P align=\"left\">Read on should you desire further enlightment.</P><BR/></BODY></HTML>' WHERE `entry`=2860; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">ISALIEN</H1><BR/><P align=\"center\">Night Elven Priestess of the Moon</P><BR/><P align=\"left\">When Isalien decided to take her leave of the company, she did so with the intention of making a pilgrimage to Dire Maul, the fallen, ancestral night elven city once known as Eldre''Thalas. Therein still stands a library of great knowledge, a sanctum that a small number of night elves have been able to hold back the tide from. She was intent upon finding answers both to her heritage and possibly concerning the amulet pieces. It should be noted that she was also a good friend of Falrin Treeshaper.</P><BR/></BODY></HTML>' WHERE `entry`=2861; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">ISALIEN, continued...</H1><BR/><P align=\"left\">Unfortunately, as she and her companion hippogryph, Empyrean, were entering the city, they were assailed by Alzzin the Wildshaper and his minions. There she fell, never to rise again. Perhaps it is for the best that Isalien never unlocked any further secrets from the evil magic that Lord Valthalak put into containing a portion of his essence in the amulet.</P><BR/><P align=\"left\">The open-aired chamber where Alzzin resides is one of these haunted loci.</P><BR/></BODY></HTML>' WHERE `entry`=2862; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">MOR GRAYHOOF</H1><BR/><P align=\"center\">Tauren Druid and First to Fall</P><BR/><P align=\"left\">Mor Grayhoof was ever a stalwart and trusted companion within The Veiled Blade. It is unfortunate that he was the first to fall to Lord Valthalak''s evil minions.</P><BR/><P align=\"left\">As we fled from Valthalak, we were being pursued by a veritable army of his spectral assassins and stalkers. The flight from Blackrock Spire was chaotic, to say the least. Unfortunately along the way, Mor somehow lost his footing, though I suspect that he was pushed. In any case, he fell down in to the recesses of the lower portion of the spire.</P><BR/></BODY></HTML>' WHERE `entry`=2863; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">MOR GRAYHOOF, continued...</H1><BR/><P align=\"left\">Later, we discovered that Mor had actually survived the fall. But there was to be no happy ending for my good friend; he was taken prisoner by the trolls of Tazz''Alaor. Not long after, as he was being tortured by War Master Voone, a group of Valthalak''s assassins jumped in and finished the job.</P><BR/><P align=\"left\">Should you seek to raise the echo of Mor Grayhoof''s spirit, War Master Voone''s chamber is a haunted location.</P><BR/></BODY></HTML>' WHERE `entry`=2864; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">JARIEN AND SOTHOS</H1><BR/><P align=\"center\">Siblings and would-be members of the Scarlet Crusade</P><BR/><P align=\"left\">Jarien and Sothos were two of the most intolerant people that I knew. Yet their skills as combatants were exceptional, and they came from money, which I suppose is why Anthion, the leader of The Veiled Blade, kept them on.</P><BR/><P align=\"left\">The siblings eventually found themselves enamored with the teachings and philosophy of the Scarlet Crusade. They had always exhibited a certain zeal in vanquishing any of the Scourge that we ran across in our travels, and it was suspected that their family had ties to the organization.</P><BR/></BODY></HTML>' WHERE `entry`=2865; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">JARIEN AND SOTHOS, continued...</H1><BR/><P align=\"left\">So it was that they found themselves facing the trials that are required of those that seek to join the Crusade. Of particular interest to them was a position of knighthood within the ranks; something that required more difficult testing apparently. For it was later discovered that Sothos actually failed his final test. Jarien would not have it though, and in open defiance she insisted that he be able to join her amongst the knights. From what we have gathered, Grand Crusader Dathrohan slew them both right on the spot in the middle of his chambers.</P><BR/><P align=\"left\">Thus it is that another of these haunted loci is The Crimson Throne inside The Scarlet Bastion at Stratholme.</P><BR/></BODY></HTML>' WHERE `entry`=2866; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">KORMOK</H1><BR/><P align=\"center\">Two-Headed Ogre Necromancer</P><BR/><P align=\"left\">What can be said about Kormok? He was a two-headed ogre of the caster variety who didn''t used to be all that bad. When we first took him into the fold it was as a prisoner on some job we''d accepted in Burning Steppes. He proved himself invaluable in helping us to get out of a sticky situation we fell into there, however, and so he came on as one of the company''s premier mages.</P><BR/><P align=\"left\">The odd thing about him though was the completely different nature of his two heads. One was always cheerful if not a little foolish, while the other was sly, calculating and had an almost dead look to its eyes. Kind of creepy really.</P><BR/></BODY></HTML>' WHERE `entry`=2867; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">KORMOK, continued...</H1><BR/><P align=\"left\">Later, through the course of our travels, Kormok became exposed to the necromantic side of magic. Unfortunately the creepy head exhibited an affinity for raising dead spirits, and took a perverse pleasure in it, especially in summoning forth the exiled spirits of Purgation Isle to do his bidding.</P><BR/><P align=\"left\">After the company disbanded, Kormok enrolled at the Scholomance to further his ''education''. The spectral assassins found entrance to the school all too easy, and slew him right there in front of his new master, Ras Frostwhisper.</P><BR/><P align=\"left\">This makes Ras Frostwhisper''s chamber one of the haunted locations where the brazier can be successfully utilized.</P><BR/></BODY></HTML>' WHERE `entry`=2868; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">LORD VALTHALAK</H1><BR/><P align=\"center\">Draconid Noble and former General of Blackrock Spire</P><BR/><P align=\"left\">Before General Drakkisath, there was Lord Valthalak, a draconid warlock of immense power. It is common for the leadership of the Spire to change hands, and unfortunately for us, we were going to play a part in the latest shift in power.</P><BR/><P align=\"left\">We''d been commissioned by a goblin smuggler-wizard out of Booty Bay, Gremnik Rizzlesprang, to steal Valthalak''s spellbook. We don''t know if he wanted to study it or sell it (or both), and it doesn''t matter now. What does matter is that we infiltrated the upper reaches of Blackrock Spire and slew Lord Valthalak in his lair. That''s when the fun really began.</P><BR/></BODY></HTML>' WHERE `entry`=2869; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">LORD VALTHALAK, continued...</H1><BR/><P align=\"left\">We had no idea of the depths of Valthalak''s magical knowledge where soul-manipulation was concerned, or we probably would never have taken on the job in the first place. But take it we did, and it proved to be the last job we ever would take.</P><BR/><P align=\"left\">Having slain Lord Valthalak, and taken his spellbook, Kormok must have sensed something about his amulet. He insisted on taking it as his share of the loot, which quickly devolved into a heated argument, and almost a fight, over the thing. We didn''t know at the time that the amulet actually housed a good portion of Valthalak''s spirit; we found that out later, much to our displeasure.</P><BR/></BODY></HTML>' WHERE `entry`=2870; +UPDATE `page_text` SET `text`='<HTML><BODY><H1 align=\"center\">LORD VALTHALAK, continued...</H1><BR/><P align=\"left\">Splitting the amulet into pieces, we fled from the newly risen ghost of Valthalak, as well his army of spectral assassins. And the noise we made fighting over the amulet had roused a number of the Spire''s remaining defenders!</P><BR/><P align=\"left\">Almost all of us made it out of Blackrock and thought we were safe. But, even from the beyond, Valthalak sent his minions at us no matter where we hid. The Veiled Blade soon broke apart after that mission, and then we were really easy pickings.</P><BR/><P align=\"left\">As you must know, this makes Lord Valthalak''s abode, what is now The Beast''s chamber in Blackrock Spire, the last of the haunted locations.</P><BR/></BODY></HTML>' WHERE `entry`=2871; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<IMG src=\"Interface\\Pictures\\24475_gordawg_256\"/>\n</BODY>\n</HTML>' WHERE `entry`=2944; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<BR/>\n<H1 align=\"center\">\nTHE GREEN HILLS OF STRANGLETHORN\n</H1>\n<BR/>\n<H3 align=\"center\">\nby Hemet Nesingwary\n</H3>\n</BODY>\n</HTML>' WHERE `entry`=2945; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<H1 align=\"center\">\nLAMENT OF THE HIGHBORNE\n</H1>\n<BR/>\n<IMG src=\"Interface\\FlavorImages\\BloodElfLogo-small\"/>\n</BODY>\n</HTML>' WHERE `entry`=2990; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>Loosely translated version...</P>\n<BR/>\n<P>By the light, by the light of the sun,</P>\n<P>Children of the blood,</P>\n<P>Our enemies are breaking through.</P>\n<P>Children of the blood,</P>\n<P>By the light,</P>\n<P>Failing children of the blood,</P>\n<P>They are breaking through.</P>\n<P>O children of the blood,</P>\n<P>By the light of the sun.</P>\n<P>Failing children of the blood,</P>\n<P>They are breaking through.</P>\n<P>O children of the blood,</P>\n<P>By the light of the sun,</P>\n<P>The sun.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=2991; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>Thalassian version...</P>\n<BR/>\n<P>Anar''alah, anar''alah belore,</P>\n<P>Sin''dorei,</P>\n<P>Shindu fallah na.</P>\n<P>Sin''dorei,</P>\n<P>Anar''alah,</P>\n<P>Shindu sin''dorei,</P>\n<P>Shindu fallah na.</P>\n<P>Sin''dorei,</P>\n<P>Anar''alah belore.</P>\n<P>Shindu sin''dorei,</P>\n<P>Shindu fallah na.</P>\n<P>Sin''dorei,</P>\n<P>Anar''alah belore,</P>\n<P>Belore.</P>\n</BODY>\n</HTML>' WHERE `entry`=2992; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>Okay, $N, this is a list of all the stuff that I''m going to need for our new super-secret, er..., super weapon. For now, let''s just call it \"Crafty''s Ultra-Advanced Proto-Typical Shortening Blaster\".</P>\n<BR/>\n<P>Trust me, it''s going to be far more revolutionary than that old, hokey world enlarger!</P>\n<BR/>\n<P>Anyway, don''t think too hard about it right now. Just get me this stuff and we''ll be golden!</P>\n</BODY>\n</HTML>' WHERE `entry`=3040; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<H1 align=\"center\">My Tools</H1>\n<BR/>\n<P>First things first... I need my tools. For a project this intricate no others will do!</P>\n<BR/>\n<P>When we had to run for our lives to escape from the pumping station -- that''s a whole different story -- I didn''t have time to pick them up. I mean, come on, I was running for my life! But I do remember that I left them under the pumping station to the east.</P>\n</BODY>\n</HTML>' WHERE `entry`=3041; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<H1 align=\"center\">An Overcharged Capacitor</H1>\n<BR/>\n<P>Any engineering hack worth their salt should be able to whip one of these up for you if you can''t create it yourself. Hell, I''d make one for you, but I''m missing my tools at the moment, remember?</P>\n<BR/>\n<P>So, do whatever it takes, but get me one. The project''s going nowhere without it. If you have to, head back to the southern continents and scour the auction house!</P>\n</BODY>\n</HTML>' WHERE `entry`=3042; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<H1 align=\"center\">A Handful of Rocknar''s Grit</H1>\n<BR/>\n<P>This last bit might be a little tricky to get, but it''s necessary to fashion the blaster''s lens from only the finest sand. That means obtaining it from a top-notch elemental.</P>\n<BR/>\n<P>Rocknar will do nicely. He was spotted to the southeast in the Frozen Reach between Unu''pe and the Wailing Ziggurat. Go break down his icy exterior to get to his rocky core and bring me back a handful.</P>\n</BODY>\n</HTML>' WHERE `entry`=3043; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">WANTED: HEMET NESINGWARY</H1>\n<H1 align=\"center\">FOR CRIMES AGAINST NATURE!</H1>\n<BR/>\n<IMG src=\"Interface\\Pictures\\obj_nesingwary_256\" align=\"center\"/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<BR/>\n<H1 align=\"center\">Artist''s rendition of \"The Extinctionator\" in his natural habitat: the burning hellfire of the underworld.</H1>\n<BR/>\n<H1 align=\"left\">Last Wildlife Holocaust Location: Nagrand, Outland</H1>\n<BR/>\n<H1 align=\"left\">Also Known As: The Great Game Hunter, The Butcher of Badlands, The Stranglethorn Ripper, Old Man Death, Hemet, Nessie, Ol'' Dirty, Ol'' Dirty D, Father of the Bounty, The Extinctionator</H1>\n<BR/>\n</BODY>\n</HTML>\n' WHERE `entry`=3057; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<H1 align=\"center\">The Diary of High General Abbendis</H1>\n<BR/>\n<IMG src=\"Interface\\FlavorImages\\ScarletCrusadeLogo\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=3092; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The voice whispered, \"Come to me.\" From the very beginning I knew that it was the Holy Light speaking to me in dreams. At last! After all of my years of prayers and good deeds, the cleansing of the blight of the unliving from the face of Azeroth. After all of the failures and resurrections.</P>\n<BR/>\n<P>Finally!</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3093; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>It happened again. \"Come to me...\", the Light commanded.</P>\n<BR/>\n<P>I woke up freezing, but it wasn''t cold in my chambers. I''m going to redouble my efforts! I''ll tell the high abbot tomorrow that I want prayers increased. No more half-measures!</P>\n<BR/>\n<P>The Holy Light has taken notice of our good work. I can feel it!</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3094; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>This time I was awake! It was very vivid, and yet for over a minute, in the middle of the warm, sunny day, my breath came out misted and chill. One of the priests noticed and dropped to his knees in prayer.</P>\n<BR/>\n<P>No one else heard the voice, though. At least the witness proves that I''m not going insane. Maybe I should ask Landgren to pray on the matter?</P>\n<BR/>\n<P>I''ll get Jordan and Street to scrutinize their recruiting efforts tomorrow. We''ve grown bloated with ranks of unbelievers who yearn only to destroy the undead. That''s not enough!</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3095; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The commander and the bishop were both receptive. Not that they had any choice. Bishop Street in particular seemed very enthusiastic. He spoke of a revival for the crusade and swore to ferret out the weak of faith within our ranks.</P>\n<BR/>\n<P>I told him to go easy. I''ve no intention of destroying the Crusade. However, I do like the sound of forming an elite cadre of the most faithful to do the Light''s bidding in Northrend. I fear the man''s friendship with LeCraft is slowly twisting him. They both have their uses, though.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3096; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>I will leave most of the Crusade here to continue mopping-up operations on the undead in our backyard. I imagine that once they have finished what we began, most will disband and go back to their homes to live in peace.</P>\n<BR/>\n<P>That somehow seems right. At our finest, we have always been the salt of the earth, rising up to take back our homes from the filth of the Scourge corruption, to return our Lordaeron to its former glory. To a time before the Scourge, before Arthas and regicide... before the Lich King.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3097; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>There have been whispers amongst the men about a day soon to come that will change everything for the Scarlet Crusade. Bishop Street has put a name to it, calling it the Crimson Dawn.</P>\n<BR/>\n<P>I will put some thought to this, though I can feel the truth of it in my bones. I pray that it will bring weal for us rather than woe.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3098; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The Light has spoken again with a great deal of urgency. I came away from the dream with a sense of impatience. I will not disappoint. There must be no more delays. We must soon be underway!</P>\n<BR/>\n<P>What a great coincidence then - and I had to control myself from showing my relief - this afternoon Captain Shely procured for us a number of new ships for the voyage. Perhaps it was no coincidence at all? The Holy Light expresses its will in ways that we are not meant to understand.</P>\n<BR/>\n<P>I will take the Sinner''s Folly as my flag. I think the name is most fitting.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3099; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Now I know why the Light has been pushing me to be underway. In the dead of night a Scourge necropolis appeared in the sky over us and out poured the minions of hell!</P>\n<BR/>\n<P>A new breed of death knight leads the assault. Already the casualties we''ve suffered have been catastrophic. With the Scourge able to strike at us anywhere and at will from above, there seems no way to mount a proper defense.</P>\n<BR/>\n<P>I fear that our intended expedition to Northrend is over before it has begun.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3100; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>I''ve been informed that Hearthglen and the surrounding area have already begun to assemble a host. High Commander Galvar Pureblood himself intends to lead them to save us. His efforts will be for naught.</P>\n<BR/>\n<P>I must see to it that my best couriers get through the enemy lines and warn him off. Hearthglen must prepare to dig in and rally the rest of the Crusade.</P>\n<BR/>\n<P>With any luck they''ll get through before nightfall.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3101; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<H1 align=\"center\">The Path of Redemption</H1>\n<BR/>\n<IMG src=\"Interface\\FlavorImages\\ScarletCrusadeLogo\"/>\n</BODY>\n</HTML>\n' WHERE `entry`=3121; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>The voice whispered, \"Come to me.\" From the very beginning I knew that it was the Holy Light speaking to me in dreams. At last! After all of my years of prayers and good deeds, the cleansing of the blight of the unliving from the face of Azeroth. After all of the failures and resurrections.</P>\n<BR/>\n<P>Finally!</P>\n</BODY>\n</HTML>' WHERE `entry`=3122; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>It happened again. \"Come to me...\", the Light commanded.</P>\n<BR/>\n<P>This time I woke up freezing, but it wasn''t cold in my chambers. I''m going to redouble my efforts! I''ll tell the high abbot tomorrow that I want prayers increased. No more half-measures!</P>\n<BR/>\n<P>The Holy Light has taken notice of our good work. I can feel it!</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3123; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>This time I was awake! It was very vivid, and yet for over a minute, in the middle of the warm, sunny day, my breath came out misted and chill. One of the priests noticed and dropped to his knees in prayer.</P>\n<BR/>\n<P>No one else heard the voice, though. At least the witness proves that I''m not going insane. Maybe I should ask Landgren to pray on the matter?</P>\n<BR/>\n<P>I''ll get Jordan and Street to scrutinize their recruiting efforts tomorrow. We''ve grown bloated with ranks of unbelievers who yearn only to destroy the undead. That''s not enough!</P>\n<BR/>\n</BODY>\n</HTML>\n\n\n\n' WHERE `entry`=3124; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The commander and the bishop were both receptive. Not that they had any choice. Bishop Street in particular seemed very enthusiastic. He spoke of a new crusade and swore to ferret out the weak of faith within our ranks.</P>\n<BR/>\n<P>I told him to go easy. We''re not destroying the Crusade so much as forming an elite cadre of the most faithful to do the Light''s bidding in Northrend. I fear the man''s friendship with LeCraft is slowly twisting him. They both have their uses, though.</P>\n<BR/>\n<P>Street''s talk of a new crusade, however, has me thinking. I believe that when this new force is assembled, I will give us a new name. It''ll have to be evocative of our new mission, yet still provide a tie to the past. I will pray with the high abbot on this.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3125; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>Our prayers have been answered. The high abbot was particularly moved by the force of the Light''s voice, its clarity, and sense of purpose.</P>\n<BR/>\n<P>Those of us going north - the most faithful - shall be known as the Scarlet Onslaught.</P>\n<BR/>\n<P>And an onslaught upon Northrend we shall be! The cancer of the Scourge threatens to overflow in the crown of the world and drown the rest of us. The time has come to take the fight directly to the Lich King''s doorstep.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3126; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>It is with trepidation that I gaze upon New Avalon, I somehow suspect for the last time. The fate of our cause lies in Northrend. I am filled with a sense of ominous foreboding for some reason. The mission ahead should shake away these concerns. I will put them out of my mind.</P>\n<BR/>\n<P>The Crimson Dawn is upon us.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3127; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<BR/>\n<P>It is with trepidation that I gaze upon New Avalon, I somehow suspect for the last time. The fate of our cause lies in Northrend. I am filled with a sense of ominous foreboding for some reason. The mission ahead should shake away these concerns. I will put them out of my mind.</P>\n<BR/>\n<P>The Crimson Dawn is upon us.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3129; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>There''s been no word from any of my couriers this morning. It''s clear that none of them made it through to Hearthglen. The Plaguelands are lost. Pureblood will come with his forces and they''ll be annihilated out in the open.</P>\n<BR/>\n<P>This afternoon I received a vision from the Light. In it, I saw the utter destruction of everything that we''ve built here. The message was clear - I was being told to take the remainder of the most faithful and abandon the Crusade to their doom.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3143; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Landgren later told me that he''d received the same vision. I cannot comprehend how the Light would tell us to take such a dishonorable action, but it is not my place to question - I am to obey, and obey I shall.</P>\n<BR/>\n<P>It was with trepidation that I gazed upon New Avalon, I suspect for the last time. Our fate lies in Northrend. I am filled with a sense of ominous foreboding for some reason. The mission ahead should shake away these concerns. I will put them out of my mind.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3144; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Perhaps with luck, High Commander Pureblood will somehow endure and marshal the survivors. I''m a coward - a dog running away with my tail tucked between my legs!</P>\n<BR/>\n<P>Two months they tell me that this journey is going to take. The other ships aren''t built for speed like the Folly. They''re carrying most of our forces and equipment, and they''re not much more than single sail freighters, but they''ll get there safely.</P>\n<BR/>\n<P>I''m not looking forward to this, but for the Light I will endure the sea sickness. I simply mustn''t let the others see.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3145; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>I''ve not written in a while. It''s as much as I can do to stand upright and not get sick. The men are beginning to wonder why I keep myself holed up in my cabin most of the time. It wouldn''t be good for morale for them to see me this way.</P>\n<BR/>\n<P>It shouldn''t be long now. I pray that it won''t be. Six weeks already and every day it seems that the weather gets worse. I can only hope that Northrend itself does not have such horrible weather. I wasn''t built for the cold.</P>\n<BR/>\n<P>The Holy Light has been silent for a very long time.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3146; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>We were attacked with no warning whatsoever! Giants in massive oared longships came out of the mist like ghosts! They were silent as the dead.</P>\n<BR/>\n<P>I lost a ship and all of the men on it. We fought with great courage and skill considering that we have only the most rudimentary naval combat training.</P>\n<BR/>\n<P>Afterward, the screams of our men who''d been taken captive by the giants echoed across the water. After a while it grew silent again. Bishop Street led the men in prayers.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3147; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>I awoke this morning in the middle of making adjustments to my maps. The Light was guiding my hand, showing me exactly where we must go.</P>\n<BR/>\n<P>We are close!</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3148; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Landfall!</P>\n<BR/>\n<P>Exiting the rowboat upon the beach, I planted our banner and was overcome by the Holy Light, which spoke through me. Today is the Crimson Dawn - the great day that we''ve waited for. This is to be the site of New Hearthglen. We are no longer the Scarlet Crusade. We are now the Scarlet Onslaught!</P>\n<BR/>\n<P>And an onslaught upon Northrend we shall be! The cancer of the Scourge threatens to overflow in the crown of the world and drown the rest of us. The time has come to take the fight directly to the Lich King''s doorstep!</P>\n</BODY>\n</HTML>' WHERE `entry`=3149; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>It''s been almost a month now and construction has proceeded apace. I''ve been too busy to write. My scouts tell me that this land is full of dragons and other strange beasts. We''ll keep to ourselves until we''re ready.</P>\n<BR/>\n<P>In the middle of services today, the high abbot proclaimed that a visitor would arrive soon - one that the Light was sending to lead us to victory.</P>\n<BR/>\n<P>I don''t know how I feel about that. Why didn''t the Light tell me? Have I not served faithfully? Now I''m to be replaced by some outsider?</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3150; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Admiral Barean Westwind showed up on my doorstep tonight! By all accounts he''d died upon these shores an age ago.</P>\n<BR/>\n<P>He didn''t look old enough and yet I knew that it was him. He claimed that he was the only survivor of his doomed fleet and that he''d survived only through the good graces of the Light.</P>\n</BODY>\n</HTML>' WHERE `entry`=3151; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>We stayed up speaking through the night and into the morning. He assured me that he had no intention of taking my place, but that the Light had instructed him to travel across the Great Dragonblight to serve as my advisor and commander in title only. He claimed that great change was coming to Northrend. The Alliance and the Horde were going to come en masse in response to a great plague that the Lich King was about to unleash upon them.</P>\n</BODY>\n</HTML>' WHERE `entry`=3152; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The men have taken to the grand admiral with great zeal, especially High Abbot Landgren and Bishop Street. Apparently the Holy Light whispered a new blessing to the admiral in his sleep, which he passed on to Landgren. Some of the men have converted to the priesthood and are now being called \"raven priests\".</P>\n<BR/>\n<P>Only Jordan seems unimpressed. I suppose that''s understandable. He probably feels his position is threatened if mine is.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3153; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Something doesn''t seem right. I can''t put my finger on it, but I cannot make myself fully trust the admiral. He''s done nothing wrong. Quite the contrary! And yet, I have to trust my gut.</P>\n<BR/>\n<P>I will pray for understanding. The Light delivered the admiral to lead us to victory and it is not my place to question its decisions. I will continue to obey. I am faithful.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3154; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>Another couple of months have passed. We''ve made great strides in the construction of New Hearthglen. The wall is almost complete as is the barracks. Kaleiki''s men are miracle workers.</P>\n<BR/>\n<P>My heart hasn''t been into writing. I''ve been avoiding putting my thoughts here for some reason. The Light hasn''t visited me of late, though the admiral assures me that this is nothing to worry about.</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3155; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>My men report that a small group of Forsaken have broken ground on a camp along the hillside to the north. On the other side of the hill, the Alliance have apparently begun the construction of a much larger base.</P>\n<BR/>\n<P>The admiral says that we should leave them be. There are other Horde forces gathered to the west that would surely come to their aid if we were to attack. I don''t feel good about it, but I see the logic in his reasoning.</P>\n</BODY>\n</HTML>' WHERE `entry`=3156; +UPDATE `page_text` SET `text`='<HTML>\n<BODY>\n<P>The first phase of construction is done. Admiral Westwind has ordered a group of my men to establish a toehold further to the north. He wouldn''t go into detail, claiming that he was being \"guided\" to do so.</P>\n<BR/>\n<P>We caught four spies from the Forsaken town, Venomspite, this afternoon. I''m going to have LeCraft torture them for information. If we only caught four, how many more have slipped in amongst us?</P>\n<BR/>\n<P>Why do I feel as if things are beginning to unravel?</P>\n</BODY>\n</HTML>\n' WHERE `entry`=3558; + +-- Missing gameobject "MILITARY RANKS OF THE HORDE & ALLIANCE" in Hall of Legends - Orgrimmar (map 1) +DELETE FROM `gameobject` WHERE `guid`=203 AND `id`=179707; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(203,179707,1,1,1,1655.29,-4213.86,56.469,1.95064,0,0,0.696499,0.717557,180,100,1); diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 02cbacb8db0..1e0b212dd45 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -46,8 +46,8 @@ void FollowerAI::AttackStart(Unit* who) } } -//This part provides assistance to a player that are attacked by pWho, even if out of normal aggro range -//It will cause me to attack pWho that are attacking _any_ player (which has been confirmed may happen also on offi) +//This part provides assistance to a player that are attacked by who, even if out of normal aggro range +//It will cause me to attack who that are attacking _any_ player (which has been confirmed may happen also on offi) //The flag (type_flag) is unconfirmed, but used here for further research and is a good candidate. bool FollowerAI::AssistPlayerInCombat(Unit* who) { diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index f85ea1f7b4b..e00abb03320 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -296,7 +296,6 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg) if (!team && plr) team = plr->GetBGTeam(); *data << uint8(team == ALLIANCE ? 1 : 0); // green or yellow - } *data << uint32(itr2->second->DamageDone); // damage done *data << uint32(itr2->second->HealingDone); // healing done @@ -1090,7 +1089,6 @@ void BattlegroundMgr::LoadBattleMastersEntry() } mBattleMastersMap[entry] = BattlegroundTypeId(bgTypeId); - } while (result->NextRow()); @@ -1129,4 +1127,4 @@ BattlegroundTypeId BattlegroundMgr::WeekendHolidayIdToBGType(HolidayIds holiday) bool BattlegroundMgr::IsBGWeekend(BattlegroundTypeId bgTypeId) { return IsHolidayActive(BGTypeToWeekendHolidayId(bgTypeId)); -} +}
\ No newline at end of file diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 07b5cadd118..c737e2b0b54 100755 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -153,9 +153,9 @@ bool ChatHandler::HandleSummonCommand(const char* args) return false; } - Map* pMap = m_session->GetPlayer()->GetMap(); + Map* map = m_session->GetPlayer()->GetMap(); - if (pMap->IsBattlegroundOrArena()) + if (map->IsBattlegroundOrArena()) { // only allow if gm mode is on if (!_player->isGameMaster()) @@ -175,12 +175,12 @@ bool ChatHandler::HandleSummonCommand(const char* args) if (!target->GetMap()->IsBattlegroundOrArena()) target->SetBattlegroundEntryPoint(); } - else if (pMap->IsDungeon()) + else if (map->IsDungeon()) { Map* cMap = target->GetMap(); - if (cMap->Instanceable() && cMap->GetInstanceId() != pMap->GetInstanceId()) - target->UnbindInstance(pMap->GetInstanceId(), target->GetDungeonDifficulty(), true); + if (cMap->Instanceable() && cMap->GetInstanceId() != map->GetInstanceId()) + target->UnbindInstance(map->GetInstanceId(), target->GetDungeonDifficulty(), true); // we are in instance, and can summon only player in our group with us as lead if (!m_session->GetPlayer()->GetGroup() || !target->GetGroup() || diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index cc6911e34a5..e76cbfcc76b 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -4124,7 +4124,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args) if (!player) player = m_session->GetPlayer(); - char* pMap = strtok((char*)args, " "); + char* map = strtok((char*)args, " "); char* pDiff = strtok(NULL, " "); int8 diff = -1; if (pDiff) @@ -4132,9 +4132,9 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args) uint16 counter = 0; uint16 MapId = 0; - if (strcmp(pMap, "all")) + if (strcmp(map, "all")) { - MapId = uint16(atoi(pMap)); + MapId = uint16(atoi(map)); if (!MapId) return false; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9996acbfe9e..5ac2fdcaca1 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2118,15 +2118,15 @@ void Creature::SetInCombatWithZone() return; } - Map* pMap = GetMap(); + Map* map = GetMap(); - if (!pMap->IsDungeon()) + if (!map->IsDungeon()) { - sLog->outError("Creature entry %u call SetInCombatWithZone for map (id: %u) that isn't an instance.", GetEntry(), pMap->GetId()); + sLog->outError("Creature entry %u call SetInCombatWithZone for map (id: %u) that isn't an instance.", GetEntry(), map->GetId()); return; } - Map::PlayerList const &PlList = pMap->GetPlayers(); + Map::PlayerList const &PlList = map->GetPlayers(); if (PlList.isEmpty()) return; diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index b5a857d1abc..3ff21645a27 100755 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -261,9 +261,9 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title uint32 questID = qmi.QuestId; - if (Quest const* pQuest = sObjectMgr->GetQuestTemplate(questID)) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(questID)) { - std::string title = pQuest->GetTitle(); + std::string title = quest->GetTitle(); int loc_idx = _session->GetSessionDbLocaleIndex(); if (loc_idx >= 0) @@ -272,8 +272,8 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title data << uint32(questID); data << uint32(qmi.QuestIcon); - data << int32(pQuest->GetQuestLevel()); - data << uint32(pQuest->GetFlags()); // 3.3.3 quest flags + data << int32(quest->GetQuestLevel()); + data << uint32(quest->GetFlags()); // 3.3.3 quest flags data << uint8(0); // 3.3.3 changes icon: blue question or yellow exclamation data << title; } diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index c6484c63e45..03da98d5624 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -545,14 +545,12 @@ void GameObject::Update(uint32 diff) loot.clear(); - if (GetOwnerGUID()) + //! If this is summoned by a spell with ie. SPELL_EFFECT_SUMMON_OBJECT_WILD, with or without owner, we check respawn criteria based on spell + //! The GetOwnerGUID() check is mostly for compatibility with hacky scripts - 99% of the time summoning should be done trough spells. + if (GetSpellId() || GetOwnerGUID()) { - if (Unit* owner = GetOwner()) - { - owner->RemoveGameObject(this, false); - SetRespawnTime(0); - Delete(); - } + SetRespawnTime(0); + Delete(); return; } @@ -612,6 +610,8 @@ void GameObject::Delete() if (GetOwnerGUID()) if (Unit* owner = GetOwner()) owner->RemoveGameObject(this, false); + else //! Owner not in world anymore + SetOwnerGUID(0); ASSERT (!GetOwnerGUID()); SendObjectDeSpawnAnim(GetGUID()); @@ -875,9 +875,9 @@ void GameObject::Respawn() } } -bool GameObject::ActivateToQuest(Player* pTarget) const +bool GameObject::ActivateToQuest(Player* target) const { - if (pTarget->HasQuestForGO(GetEntry())) + if (target->HasQuestForGO(GetEntry())) return true; if (!sObjectMgr->IsGameObjectForQuests(GetEntry())) @@ -888,13 +888,13 @@ bool GameObject::ActivateToQuest(Player* pTarget) const // scan GO chest with loot including quest items case GAMEOBJECT_TYPE_CHEST: { - if (LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), pTarget)) + if (LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), target)) { //TODO: fix this hack //look for battlegroundAV for some objects which are only activated after mine gots captured by own team if (GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S) - if (Battleground* bg = pTarget->GetBattleground()) - if (bg->GetTypeID(true) == BATTLEGROUND_AV && !(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(), pTarget->GetTeam()))) + if (Battleground* bg = target->GetBattleground()) + if (bg->GetTypeID(true) == BATTLEGROUND_AV && !(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(), target->GetTeam()))) return false; return true; } @@ -902,13 +902,13 @@ bool GameObject::ActivateToQuest(Player* pTarget) const } case GAMEOBJECT_TYPE_GENERIC: { - if (GetGOInfo()->_generic.questID == -1 || pTarget->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE) + if (GetGOInfo()->_generic.questID == -1 || target->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE) return true; break; } case GAMEOBJECT_TYPE_GOOBER: { - if (GetGOInfo()->goober.questId == -1 || pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) + if (GetGOInfo()->goober.questId == -1 || target->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) return true; break; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 49230569498..3402eaa64bc 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -745,7 +745,7 @@ class GameObject : public WorldObject, public GridObject<GameObject> bool hasQuest(uint32 quest_id) const; bool hasInvolvedQuest(uint32 quest_id) const; - bool ActivateToQuest(Player* pTarget) const; + bool ActivateToQuest(Player* target) const; void UseDoorOrButton(uint32 time_to_restore = 0, bool alternative = false); // 0 = use `gameobject`.`spawntimesecs` void ResetDoorOrButton(); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 161563b1127..4a8e2c9de0d 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3828,7 +3828,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen break; } } - } } @@ -4047,7 +4046,6 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) SetSkill(prevSkill->skill, prevSkill->step, skill_value, skill_max_value); } } - } else { @@ -4329,7 +4327,6 @@ void Player::_SaveSpellCooldowns(SQLTransaction& trans) } else ++itr; - } // if something changed execute if (!first_round) @@ -5567,7 +5564,6 @@ void Player::CleanupChannels() ch->Leave(GetGUID(), false); // not send to client, not remove from player's channel list if (ChannelMgr* cMgr = channelMgr(GetTeam())) cMgr->LeftChannel(ch->GetName()); // deleted channel if empty - } sLog->outDebug(LOG_FILTER_CHATSYS, "Player: channels cleaned up!"); } @@ -6973,16 +6969,16 @@ void Player::RewardReputation(Unit* pVictim, float rate) { // support for: Championing - http://www.wowwiki.com/Championing - Map const* pMap = GetMap(); - if (pMap && pMap->IsDungeon()) + Map const* map = GetMap(); + if (map && map->IsDungeon()) { - InstanceTemplate const* pInstance = sObjectMgr->GetInstanceTemplate(pMap->GetId()); - if (pInstance) + InstanceTemplate const* instance = sObjectMgr->GetInstanceTemplate(map->GetId()); + if (instance) { - AccessRequirement const* pAccessRequirement = sObjectMgr->GetAccessRequirement(pMap->GetId(), ((InstanceMap*)pMap)->GetDifficulty()); + AccessRequirement const* pAccessRequirement = sObjectMgr->GetAccessRequirement(map->GetId(), ((InstanceMap*)map)->GetDifficulty()); if (pAccessRequirement) { - if (!pMap->IsRaid() && pAccessRequirement->levelMin == 80) + if (!map->IsRaid() && pAccessRequirement->levelMin == 80) ChampioningFaction = GetChampioningFaction(); } } @@ -7032,29 +7028,29 @@ void Player::RewardReputation(Unit* pVictim, float rate) } //Calculate how many reputation points player gain with the quest -void Player::RewardReputation(Quest const* pQuest) +void Player::RewardReputation(Quest const* quest) { bool recruitAFriend = GetsRecruitAFriendBonus(false); // quest reputation reward/loss for (uint8 i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) { - if (!pQuest->RewRepFaction[i]) + if (!quest->RewRepFaction[i]) continue; - if (pQuest->RewRepValue[i]) + if (quest->RewRepValue[i]) { - int32 rep = CalculateReputationGain(GetQuestLevel(pQuest), pQuest->RewRepValue[i]/100, pQuest->RewRepFaction[i], true, true); + int32 rep = CalculateReputationGain(GetQuestLevel(quest), quest->RewRepValue[i]/100, quest->RewRepFaction[i], true, true); if (recruitAFriend) rep = int32(rep * (1 + sWorld->getRate(RATE_REPUTATION_RECRUIT_A_FRIEND_BONUS))); - if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->RewRepFaction[i])) + if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(quest->RewRepFaction[i])) GetReputationMgr().ModifyReputation(factionEntry, rep); } else { - uint32 row = ((pQuest->RewRepValueId[i] < 0) ? 1 : 0) + 1; - uint32 field = abs(pQuest->RewRepValueId[i]); + uint32 row = ((quest->RewRepValueId[i] < 0) ? 1 : 0) + 1; + uint32 field = abs(quest->RewRepValueId[i]); if (const QuestFactionRewEntry* pRow = sQuestFactionRewardStore.LookupEntry(row)) { @@ -7063,12 +7059,12 @@ void Player::RewardReputation(Quest const* pQuest) if (!repPoints) continue; - repPoints = CalculateReputationGain(GetQuestLevel(pQuest), repPoints, pQuest->RewRepFaction[i], true); + repPoints = CalculateReputationGain(GetQuestLevel(quest), repPoints, quest->RewRepFaction[i], true); if (recruitAFriend) repPoints = int32(repPoints * (1 + sWorld->getRate(RATE_REPUTATION_RECRUIT_A_FRIEND_BONUS))); - if (const FactionEntry* factionEntry = sFactionStore.LookupEntry(pQuest->RewRepFaction[i])) + if (const FactionEntry* factionEntry = sFactionStore.LookupEntry(quest->RewRepFaction[i])) GetReputationMgr().ModifyReputation(factionEntry, repPoints); } } @@ -14382,14 +14378,14 @@ void Player::PrepareQuestMenu(uint64 guid) for (QuestRelations::const_iterator i = pObjectQR.first; i != pObjectQR.second; ++i) { uint32 quest_id = i->second; - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (!pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (!quest) continue; - if (!CanTakeQuest(pQuest, false)) + if (!CanTakeQuest(quest, false)) continue; - if (pQuest->IsAutoComplete()) + if (quest->IsAutoComplete()) qm.AddMenuItem(quest_id, 4); else if (GetQuestStatus(quest_id) == QUEST_STATUS_NONE) qm.AddMenuItem(quest_id, 2); @@ -14420,7 +14416,7 @@ void Player::SendPreparedQuest(uint64 guid) else if (icon == 4) PlayerTalkClass->SendQuestGiverRequestItems(quest, guid, CanRewardQuest(quest, false), true); // Send completable on repeatable and autoCompletable quest if player don't have quest - // TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not) + // TODO: verify if check for !quest->IsDaily() is really correct (possibly not) else { Object* object = ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT | TYPEMASK_ITEM); @@ -14497,7 +14493,7 @@ bool Player::IsActiveQuest(uint32 quest_id) const return m_QuestStatus.find(quest_id) != m_QuestStatus.end(); } -Quest const* Player::GetNextQuest(uint64 guid, Quest const* pQuest) +Quest const* Player::GetNextQuest(uint64 guid, Quest const* quest) { QuestRelationBounds pObjectQR; @@ -14517,7 +14513,7 @@ Quest const* Player::GetNextQuest(uint64 guid, Quest const* pQuest) return NULL; } - uint32 nextQuestID = pQuest->GetNextQuestInChain(); + uint32 nextQuestID = quest->GetNextQuestInChain(); for (QuestRelations::const_iterator itr = pObjectQR.first; itr != pObjectQR.second; ++itr) { if (itr->second == nextQuestID) @@ -14527,41 +14523,41 @@ Quest const* Player::GetNextQuest(uint64 guid, Quest const* pQuest) return NULL; } -bool Player::CanSeeStartQuest(Quest const* pQuest) +bool Player::CanSeeStartQuest(Quest const* quest) { - if (SatisfyQuestRace(pQuest, false) && SatisfyQuestSkillOrClass(pQuest, false) && - SatisfyQuestExclusiveGroup(pQuest, false) && SatisfyQuestReputation(pQuest, false) && - SatisfyQuestPreviousQuest(pQuest, false) && SatisfyQuestNextChain(pQuest, false) && - SatisfyQuestPrevChain(pQuest, false) && SatisfyQuestDay(pQuest, false) && SatisfyQuestWeek(pQuest, false) && - !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, pQuest->GetQuestId(), this)) + if (SatisfyQuestRace(quest, false) && SatisfyQuestSkillOrClass(quest, false) && + SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) && + SatisfyQuestPreviousQuest(quest, false) && SatisfyQuestNextChain(quest, false) && + SatisfyQuestPrevChain(quest, false) && SatisfyQuestDay(quest, false) && SatisfyQuestWeek(quest, false) && + !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this)) { - return getLevel() + sWorld->getIntConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= pQuest->GetMinLevel(); + return getLevel() + sWorld->getIntConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= quest->GetMinLevel(); } return false; } -bool Player::CanTakeQuest(Quest const* pQuest, bool msg) +bool Player::CanTakeQuest(Quest const* quest, bool msg) { - return SatisfyQuestStatus(pQuest, msg) && SatisfyQuestExclusiveGroup(pQuest, msg) - && SatisfyQuestRace(pQuest, msg) && SatisfyQuestLevel(pQuest, msg) - && SatisfyQuestSkillOrClass(pQuest, msg) && SatisfyQuestReputation(pQuest, msg) - && SatisfyQuestPreviousQuest(pQuest, msg) && SatisfyQuestTimed(pQuest, msg) - && SatisfyQuestNextChain(pQuest, msg) && SatisfyQuestPrevChain(pQuest, msg) - && SatisfyQuestDay(pQuest, msg) && SatisfyQuestWeek(pQuest, msg) - && !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, pQuest->GetQuestId(), this) - && SatisfyQuestConditions(pQuest, msg); + return SatisfyQuestStatus(quest, msg) && SatisfyQuestExclusiveGroup(quest, msg) + && SatisfyQuestRace(quest, msg) && SatisfyQuestLevel(quest, msg) + && SatisfyQuestSkillOrClass(quest, msg) && SatisfyQuestReputation(quest, msg) + && SatisfyQuestPreviousQuest(quest, msg) && SatisfyQuestTimed(quest, msg) + && SatisfyQuestNextChain(quest, msg) && SatisfyQuestPrevChain(quest, msg) + && SatisfyQuestDay(quest, msg) && SatisfyQuestWeek(quest, msg) + && !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) + && SatisfyQuestConditions(quest, msg); } -bool Player::CanAddQuest(Quest const* pQuest, bool msg) +bool Player::CanAddQuest(Quest const* quest, bool msg) { if (!SatisfyQuestLog(msg)) return false; - uint32 srcitem = pQuest->GetSrcItemId(); + uint32 srcitem = quest->GetSrcItemId(); if (srcitem > 0) { - uint32 count = pQuest->GetSrcItemCount(); + uint32 count = quest->GetSrcItemCount(); ItemPosCountVec dest; InventoryResult msg2 = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, srcitem, count); @@ -14601,7 +14597,6 @@ bool Player::CanCompleteQuest(uint32 quest_id) if (q_status.m_status == QUEST_STATUS_INCOMPLETE) { - if (qInfo->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) { for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; i++) @@ -14649,92 +14644,92 @@ bool Player::CanCompleteQuest(uint32 quest_id) return false; } -bool Player::CanCompleteRepeatableQuest(Quest const* pQuest) +bool Player::CanCompleteRepeatableQuest(Quest const* quest) { // Solve problem that player don't have the quest and try complete it. // if repeatable she must be able to complete event if player don't have it. // Seem that all repeatable quest are DELIVER Flag so, no need to add more. - if (!CanTakeQuest(pQuest, false)) + if (!CanTakeQuest(quest, false)) return false; - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; i++) - if (pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i])) + if (quest->ReqItemId[i] && quest->ReqItemCount[i] && !HasItemCount(quest->ReqItemId[i], quest->ReqItemCount[i])) return false; - if (!CanRewardQuest(pQuest, false)) + if (!CanRewardQuest(quest, false)) return false; return true; } -bool Player::CanRewardQuest(Quest const* pQuest, bool msg) +bool Player::CanRewardQuest(Quest const* quest, bool msg) { // not auto complete quest and not completed quest (only cheating case, then ignore without message) - if (!pQuest->IsDFQuest() && !pQuest->IsAutoComplete() && !(pQuest->GetFlags() & QUEST_FLAGS_AUTOCOMPLETE) && GetQuestStatus(pQuest->GetQuestId()) != QUEST_STATUS_COMPLETE) + if (!quest->IsDFQuest() && !quest->IsAutoComplete() && !(quest->GetFlags() & QUEST_FLAGS_AUTOCOMPLETE) && GetQuestStatus(quest->GetQuestId()) != QUEST_STATUS_COMPLETE) return false; // daily quest can't be rewarded (25 daily quest already completed) - if (!SatisfyQuestDay(pQuest, true) || !SatisfyQuestWeek(pQuest, true)) + if (!SatisfyQuestDay(quest, true) || !SatisfyQuestWeek(quest, true)) return false; // rewarded and not repeatable quest (only cheating case, then ignore without message) - if (GetQuestRewardStatus(pQuest->GetQuestId())) + if (GetQuestRewardStatus(quest->GetQuestId())) return false; // prevent receive reward with quest items in bank - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) { for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; i++) { - if (pQuest->ReqItemCount[i]!= 0 && - GetItemCount(pQuest->ReqItemId[i]) < pQuest->ReqItemCount[i]) + if (quest->ReqItemCount[i]!= 0 && + GetItemCount(quest->ReqItemId[i]) < quest->ReqItemCount[i]) { if (msg) - SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL, pQuest->ReqItemId[i]); + SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL, quest->ReqItemId[i]); return false; } } } // prevent receive reward with low money and GetRewOrReqMoney() < 0 - if (pQuest->GetRewOrReqMoney() < 0 && !HasEnoughMoney(-pQuest->GetRewOrReqMoney())) + if (quest->GetRewOrReqMoney() < 0 && !HasEnoughMoney(-quest->GetRewOrReqMoney())) return false; return true; } -bool Player::CanRewardQuest(Quest const* pQuest, uint32 reward, bool msg) +bool Player::CanRewardQuest(Quest const* quest, uint32 reward, bool msg) { // prevent receive reward with quest items in bank or for not completed quest - if (!CanRewardQuest(pQuest, msg)) + if (!CanRewardQuest(quest, msg)) return false; - if (pQuest->GetRewChoiceItemsCount() > 0) + if (quest->GetRewChoiceItemsCount() > 0) { - if (pQuest->RewChoiceItemId[reward]) + if (quest->RewChoiceItemId[reward]) { ItemPosCountVec dest; - InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pQuest->RewChoiceItemId[reward], pQuest->RewChoiceItemCount[reward]); + InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, quest->RewChoiceItemId[reward], quest->RewChoiceItemCount[reward]); if (res != EQUIP_ERR_OK) { - SendEquipError(res, NULL, NULL, pQuest->RewChoiceItemId[reward]); + SendEquipError(res, NULL, NULL, quest->RewChoiceItemId[reward]); return false; } } } - if (pQuest->GetRewItemsCount() > 0) + if (quest->GetRewItemsCount() > 0) { - for (uint32 i = 0; i < pQuest->GetRewItemsCount(); ++i) + for (uint32 i = 0; i < quest->GetRewItemsCount(); ++i) { - if (pQuest->RewItemId[i]) + if (quest->RewItemId[i]) { ItemPosCountVec dest; - InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, pQuest->RewItemId[i], pQuest->RewItemCount[i]); + InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, quest->RewItemId[i], quest->RewItemCount[i]); if (res != EQUIP_ERR_OK) { - SendEquipError(res, NULL, NULL, pQuest->RewItemId[i]); + SendEquipError(res, NULL, NULL, quest->RewItemId[i]); return false; } } @@ -14744,12 +14739,12 @@ bool Player::CanRewardQuest(Quest const* pQuest, uint32 reward, bool msg) return true; } -void Player::AddQuest(Quest const* pQuest, Object* questGiver) +void Player::AddQuest(Quest const* quest, Object* questGiver) { uint16 log_slot = FindQuestSlot(0); ASSERT(log_slot < MAX_QUEST_LOG_SIZE); - uint32 quest_id = pQuest->GetQuestId(); + uint32 quest_id = quest->GetQuestId(); // if not exist then created with set uState == NEW and rewarded=false QuestStatusData& questStatusData = m_QuestStatus[quest_id]; @@ -14758,36 +14753,36 @@ void Player::AddQuest(Quest const* pQuest, Object* questGiver) questStatusData.m_status = QUEST_STATUS_INCOMPLETE; questStatusData.m_explored = false; - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) { for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) questStatusData.m_itemcount[i] = 0; } - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO)) { for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) questStatusData.m_creatureOrGOcount[i] = 0; } - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_PLAYER_KILL)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_PLAYER_KILL)) questStatusData.m_playercount = 0; - GiveQuestSourceItem(pQuest); - AdjustQuestReqItemCount(pQuest, questStatusData); + GiveQuestSourceItem(quest); + AdjustQuestReqItemCount(quest, questStatusData); - if (pQuest->GetRepObjectiveFaction()) - if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->GetRepObjectiveFaction())) + if (quest->GetRepObjectiveFaction()) + if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(quest->GetRepObjectiveFaction())) GetReputationMgr().SetVisible(factionEntry); - if (pQuest->GetRepObjectiveFaction2()) - if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->GetRepObjectiveFaction2())) + if (quest->GetRepObjectiveFaction2()) + if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(quest->GetRepObjectiveFaction2())) GetReputationMgr().SetVisible(factionEntry); uint32 qtime = 0; - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_TIMED)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_TIMED)) { - uint32 limittime = pQuest->GetLimitTime(); + uint32 limittime = quest->GetLimitTime(); // shared timed quest if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER) @@ -14807,8 +14802,8 @@ void Player::AddQuest(Quest const* pQuest, Object* questGiver) GetAchievementMgr().StartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, quest_id); //starting initial quest script - if (questGiver && pQuest->GetQuestStartScript() != 0) - GetMap()->ScriptsStart(sQuestStartScripts, pQuest->GetQuestStartScript(), questGiver, this); + if (questGiver && quest->GetQuestStartScript() != 0) + GetMap()->ScriptsStart(sQuestStartScripts, quest->GetQuestStartScript(), questGiver, this); // Some spells applied at quest activation SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id, true); @@ -14858,59 +14853,59 @@ void Player::IncompleteQuest(uint32 quest_id) } } -void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce) +void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool announce) { //this THING should be here to protect code from quest, which cast on player far teleport as a reward //should work fine, cause far teleport will be executed in Player::Update() SetCanDelayTeleport(true); - uint32 quest_id = pQuest->GetQuestId(); + uint32 quest_id = quest->GetQuestId(); for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) - if (pQuest->ReqItemId[i]) - DestroyItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i], true); + if (quest->ReqItemId[i]) + DestroyItemCount(quest->ReqItemId[i], quest->ReqItemCount[i], true); for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) { - if (pQuest->ReqSourceId[i]) + if (quest->ReqSourceId[i]) { - uint32 count = pQuest->ReqSourceCount[i]; - DestroyItemCount(pQuest->ReqSourceId[i], count ? count : 9999, true); + uint32 count = quest->ReqSourceCount[i]; + DestroyItemCount(quest->ReqSourceId[i], count ? count : 9999, true); } } RemoveTimedQuest(quest_id); - if (pQuest->GetRewChoiceItemsCount() > 0) + if (quest->GetRewChoiceItemsCount() > 0) { - if (uint32 itemId = pQuest->RewChoiceItemId[reward]) + if (uint32 itemId = quest->RewChoiceItemId[reward]) { ItemPosCountVec dest; - if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewChoiceItemCount[reward]) == EQUIP_ERR_OK) + if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, quest->RewChoiceItemCount[reward]) == EQUIP_ERR_OK) { Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); - SendNewItem(item, pQuest->RewChoiceItemCount[reward], true, false); + SendNewItem(item, quest->RewChoiceItemCount[reward], true, false); } } } - if (pQuest->GetRewItemsCount() > 0) + if (quest->GetRewItemsCount() > 0) { - for (uint32 i = 0; i < pQuest->GetRewItemsCount(); ++i) + for (uint32 i = 0; i < quest->GetRewItemsCount(); ++i) { - if (uint32 itemId = pQuest->RewItemId[i]) + if (uint32 itemId = quest->RewItemId[i]) { ItemPosCountVec dest; - if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewItemCount[i]) == EQUIP_ERR_OK) + if (CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemId, quest->RewItemCount[i]) == EQUIP_ERR_OK) { Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); - SendNewItem(item, pQuest->RewItemCount[i], true, false); + SendNewItem(item, quest->RewItemCount[i], true, false); } } } } - RewardReputation(pQuest); + RewardReputation(quest); uint16 log_slot = FindQuestSlot(quest_id); if (log_slot < MAX_QUEST_LOG_SIZE) @@ -14920,7 +14915,7 @@ void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool rewarded = (rewItr != m_RewardedQuests.end()); // Not give XP in case already completed once repeatable quest - uint32 XP = rewarded ? 0 : uint32(pQuest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST)); + uint32 XP = rewarded ? 0 : uint32(quest->XPValue(this)*sWorld->getRate(RATE_XP_QUEST)); // handle SPELL_AURA_MOD_XP_QUEST_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAuraEffectsByType(SPELL_AURA_MOD_XP_QUEST_PCT); @@ -14931,11 +14926,11 @@ void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) GiveXP(XP, NULL); else - moneyRew = int32(pQuest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY)); + moneyRew = int32(quest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY)); // Give player extra money if GetRewOrReqMoney > 0 and get ReqMoney if negative - if (pQuest->GetRewOrReqMoney()) - moneyRew += pQuest->GetRewOrReqMoney(); + if (quest->GetRewOrReqMoney()) + moneyRew += quest->GetRewOrReqMoney(); if (moneyRew) { @@ -14946,44 +14941,44 @@ void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, } // honor reward - if (uint32 honor = pQuest->CalculateHonorGain(getLevel())) + if (uint32 honor = quest->CalculateHonorGain(getLevel())) RewardHonor(NULL, 0, honor); // title reward - if (pQuest->GetCharTitleId()) + if (quest->GetCharTitleId()) { - if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId())) + if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(quest->GetCharTitleId())) SetTitle(titleEntry); } - if (pQuest->GetBonusTalents()) + if (quest->GetBonusTalents()) { - m_questRewardTalentCount+=pQuest->GetBonusTalents(); + m_questRewardTalentCount+=quest->GetBonusTalents(); InitTalentForLevel(); } - if (pQuest->GetRewArenaPoints()) - ModifyArenaPoints(pQuest->GetRewArenaPoints()); + if (quest->GetRewArenaPoints()) + ModifyArenaPoints(quest->GetRewArenaPoints()); // Send reward mail - if (uint32 mail_template_id = pQuest->GetRewMailTemplateId()) + if (uint32 mail_template_id = quest->GetRewMailTemplateId()) { //- TODO: Poor design of mail system SQLTransaction trans = CharacterDatabase.BeginTransaction(); - MailDraft(mail_template_id).SendMailTo(trans, this, questGiver, MAIL_CHECK_MASK_HAS_BODY, pQuest->GetRewMailDelaySecs()); + MailDraft(mail_template_id).SendMailTo(trans, this, questGiver, MAIL_CHECK_MASK_HAS_BODY, quest->GetRewMailDelaySecs()); CharacterDatabase.CommitTransaction(trans); } - if (pQuest->IsDaily() || pQuest->IsDFQuest()) + if (quest->IsDaily() || quest->IsDFQuest()) { SetDailyQuestStatus(quest_id); - if (pQuest->IsDaily()) + if (quest->IsDaily()) { GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST, quest_id); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY, quest_id); } } - else if (pQuest->IsWeekly()) + else if (quest->IsWeekly()) SetWeeklyQuestStatus(quest_id); RemoveActiveQuest(quest_id); @@ -14997,18 +14992,18 @@ void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, _SaveQuestStatus(trans); if (announce) - SendQuestReward(pQuest, XP, questGiver); + SendQuestReward(quest, XP, questGiver); // cast spells after mark quest complete (some spells have quest completed state requirements in spell_area data) - if (pQuest->GetRewSpellCast() > 0) - CastSpell(this, pQuest->GetRewSpellCast(), true); - else if (pQuest->GetRewSpell() > 0) - CastSpell(this, pQuest->GetRewSpell(), true); + if (quest->GetRewSpellCast() > 0) + CastSpell(this, quest->GetRewSpellCast(), true); + else if (quest->GetRewSpell() > 0) + CastSpell(this, quest->GetRewSpell(), true); - if (pQuest->GetZoneOrSort() > 0) - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE, pQuest->GetZoneOrSort()); + if (quest->GetZoneOrSort() > 0) + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE, quest->GetZoneOrSort()); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST, pQuest->GetQuestId()); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST, quest->GetQuestId()); uint32 zone = 0; uint32 area = 0; @@ -15043,7 +15038,7 @@ void Player::RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, void Player::FailQuest(uint32 questId) { - if (Quest const* pQuest = sObjectMgr->GetQuestTemplate(questId)) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(questId)) { SetQuestStatus(questId, QUEST_STATUS_FAILED); @@ -15055,7 +15050,7 @@ void Player::FailQuest(uint32 questId) SetQuestSlotState(log_slot, QUEST_STATE_FAIL); } - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_TIMED)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_TIMED)) { QuestStatusData& q_status = m_QuestStatus[questId]; @@ -15069,13 +15064,13 @@ void Player::FailQuest(uint32 questId) // Destroy quest items on quest failure. for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) - if (pQuest->ReqItemId[i] > 0 && pQuest->ReqItemCount[i] > 0) + if (quest->ReqItemId[i] > 0 && quest->ReqItemCount[i] > 0) // Destroy items recieved on starting the quest. - DestroyItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i], true, true); + DestroyItemCount(quest->ReqItemId[i], quest->ReqItemCount[i], true, true); for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) - if (pQuest->ReqSourceId[i] > 0 && pQuest->ReqSourceCount[i] > 0) + if (quest->ReqSourceId[i] > 0 && quest->ReqSourceCount[i] > 0) // Destroy items recieved during the quest. - DestroyItemCount(pQuest->ReqSourceId[i], pQuest->ReqSourceCount[i], true, true); + DestroyItemCount(quest->ReqSourceId[i], quest->ReqSourceCount[i], true, true); } } @@ -15458,12 +15453,12 @@ bool Player::SatisfyQuestWeek(Quest const* qInfo, bool /*msg*/) return m_weeklyquests.find(qInfo->GetQuestId()) == m_weeklyquests.end(); } -bool Player::GiveQuestSourceItem(Quest const* pQuest) +bool Player::GiveQuestSourceItem(Quest const* quest) { - uint32 srcitem = pQuest->GetSrcItemId(); + uint32 srcitem = quest->GetSrcItemId(); if (srcitem > 0) { - uint32 count = pQuest->GetSrcItemCount(); + uint32 count = quest->GetSrcItemCount(); if (count <= 0) count = 1; @@ -15612,19 +15607,19 @@ uint16 Player::GetReqKillOrCastCurrentCount(uint32 quest_id, int32 entry) return 0; } -void Player::AdjustQuestReqItemCount(Quest const* pQuest, QuestStatusData& questStatusData) +void Player::AdjustQuestReqItemCount(Quest const* quest, QuestStatusData& questStatusData) { - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) { for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) { - uint32 reqitemcount = pQuest->ReqItemCount[i]; + uint32 reqitemcount = quest->ReqItemCount[i]; if (reqitemcount != 0) { - uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i], true); + uint32 curitemcount = GetItemCount(quest->ReqItemId[i], true); questStatusData.m_itemcount[i] = std::min(curitemcount, reqitemcount); - m_QuestStatusSave[pQuest->GetQuestId()] = true; + m_QuestStatusSave[quest->GetQuestId()] = true; } } } @@ -16167,9 +16162,9 @@ void Player::SendQuestComplete(uint32 quest_id) } } -void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object* questGiver) +void Player::SendQuestReward(Quest const* quest, uint32 XP, Object* questGiver) { - uint32 questid = pQuest->GetQuestId(); + uint32 questid = quest->GetQuestId(); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_COMPLETE quest = %u", questid); sGameEventMgr->HandleQuestComplete(questid); WorldPacket data(SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4)); @@ -16178,21 +16173,21 @@ void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object* questGiver) if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { data << uint32(XP); - data << uint32(pQuest->GetRewOrReqMoney()); + data << uint32(quest->GetRewOrReqMoney()); } else { data << uint32(0); - data << uint32(pQuest->GetRewOrReqMoney() + int32(pQuest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY))); + data << uint32(quest->GetRewOrReqMoney() + int32(quest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY))); } - data << 10 * Trinity::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorMultiplier()); - data << uint32(pQuest->GetBonusTalents()); // bonus talents - data << uint32(pQuest->GetRewArenaPoints()); + data << 10 * Trinity::Honor::hk_honor_at_level(getLevel(), quest->GetRewHonorMultiplier()); + data << uint32(quest->GetBonusTalents()); // bonus talents + data << uint32(quest->GetRewArenaPoints()); GetSession()->SendPacket(&data); - if (pQuest->GetQuestCompleteScript() != 0) - GetMap()->ScriptsStart(sQuestEndScripts, pQuest->GetQuestCompleteScript(), questGiver, this); + if (quest->GetQuestCompleteScript() != 0) + GetMap()->ScriptsStart(sQuestEndScripts, quest->GetQuestCompleteScript(), questGiver, this); } void Player::SendQuestFailed(uint32 questId, InventoryResult reason) @@ -16226,19 +16221,19 @@ void Player::SendCanTakeQuestResponse(uint32 msg) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_INVALID"); } -void Player::SendQuestConfirmAccept(const Quest* pQuest, Player* pReceiver) +void Player::SendQuestConfirmAccept(const Quest* quest, Player* pReceiver) { if (pReceiver) { - std::string strTitle = pQuest->GetTitle(); + std::string strTitle = quest->GetTitle(); int loc_idx = pReceiver->GetSession()->GetSessionDbLocaleIndex(); if (loc_idx >= 0) - if (const QuestLocale* pLocale = sObjectMgr->GetQuestLocale(pQuest->GetQuestId())) + if (const QuestLocale* pLocale = sObjectMgr->GetQuestLocale(quest->GetQuestId())) ObjectMgr::GetLocaleString(pLocale->Title, loc_idx, strTitle); WorldPacket data(SMSG_QUEST_CONFIRM_ACCEPT, (4 + strTitle.size() + 8)); - data << uint32(pQuest->GetQuestId()); + data << uint32(quest->GetQuestId()); data << strTitle; data << uint64(GetGUID()); pReceiver->GetSession()->SendPacket(&data); @@ -16259,50 +16254,50 @@ void Player::SendPushToPartyResponse(Player* player, uint32 msg) } } -void Player::SendQuestUpdateAddItem(Quest const* /*pQuest*/, uint32 /*item_idx*/, uint16 /*count*/) +void Player::SendQuestUpdateAddItem(Quest const* /*quest*/, uint32 /*item_idx*/, uint16 /*count*/) { WorldPacket data(SMSG_QUESTUPDATE_ADD_ITEM, 0); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTUPDATE_ADD_ITEM"); - //data << pQuest->ReqItemId[item_idx]; + //data << quest->ReqItemId[item_idx]; //data << count; GetSession()->SendPacket(&data); } -void Player::SendQuestUpdateAddCreatureOrGo(Quest const* pQuest, uint64 guid, uint32 creatureOrGO_idx, uint16 old_count, uint16 add_count) +void Player::SendQuestUpdateAddCreatureOrGo(Quest const* quest, uint64 guid, uint32 creatureOrGO_idx, uint16 old_count, uint16 add_count) { ASSERT(old_count + add_count < 65536 && "mob/GO count store in 16 bits 2^16 = 65536 (0..65536)"); - int32 entry = pQuest->ReqCreatureOrGOId[ creatureOrGO_idx ]; + int32 entry = quest->ReqCreatureOrGOId[ creatureOrGO_idx ]; if (entry < 0) // client expected gameobject template id in form (id|0x80000000) entry = (-entry) | 0x80000000; WorldPacket data(SMSG_QUESTUPDATE_ADD_KILL, (4*4+8)); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTUPDATE_ADD_KILL"); - data << uint32(pQuest->GetQuestId()); + data << uint32(quest->GetQuestId()); data << uint32(entry); data << uint32(old_count + add_count); - data << uint32(pQuest->ReqCreatureOrGOCount[ creatureOrGO_idx ]); + data << uint32(quest->ReqCreatureOrGOCount[ creatureOrGO_idx ]); data << uint64(guid); GetSession()->SendPacket(&data); - uint16 log_slot = FindQuestSlot(pQuest->GetQuestId()); + uint16 log_slot = FindQuestSlot(quest->GetQuestId()); if (log_slot < MAX_QUEST_LOG_SIZE) SetQuestSlotCounter(log_slot, creatureOrGO_idx, GetQuestSlotCounter(log_slot, creatureOrGO_idx)+add_count); } -void Player::SendQuestUpdateAddPlayer(Quest const* pQuest, uint16 old_count, uint16 add_count) +void Player::SendQuestUpdateAddPlayer(Quest const* quest, uint16 old_count, uint16 add_count) { ASSERT(old_count + add_count < 65536 && "player count store in 16 bits"); WorldPacket data(SMSG_QUESTUPDATE_ADD_PVP_KILL, (3*4)); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTUPDATE_ADD_PVP_KILL"); - data << uint32(pQuest->GetQuestId()); + data << uint32(quest->GetQuestId()); data << uint32(old_count + add_count); - data << uint32(pQuest->GetPlayersSlain()); + data << uint32(quest->GetPlayersSlain()); GetSession()->SendPacket(&data); - uint16 log_slot = FindQuestSlot(pQuest->GetQuestId()); + uint16 log_slot = FindQuestSlot(quest->GetQuestId()); if (log_slot < MAX_QUEST_LOG_SIZE) SetQuestSlotCounter(log_slot, QUEST_PVP_KILL_SLOT, GetQuestSlotCounter(log_slot, QUEST_PVP_KILL_SLOT) + add_count); } @@ -17664,8 +17659,8 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) uint32 quest_id = fields[0].GetUInt32(); // used to be new, no delete? - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (quest) { // find or create QuestStatusData& questStatusData = m_QuestStatus[quest_id]; @@ -17683,7 +17678,7 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) time_t quest_time = time_t(fields[3].GetUInt32()); - if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_TIMED) && !GetQuestRewardStatus(quest_id)) + if (quest->HasFlag(QUEST_TRINITY_FLAGS_TIMED) && !GetQuestRewardStatus(quest_id)) { AddTimedQuest(quest_id); @@ -17748,21 +17743,21 @@ void Player::_LoadQuestStatusRewarded(PreparedQueryResult result) uint32 quest_id = fields[0].GetUInt32(); // used to be new, no delete? - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (quest) { // learn rewarded spell if unknown - learnQuestRewardedSpells(pQuest); + learnQuestRewardedSpells(quest); // set rewarded title if any - if (pQuest->GetCharTitleId()) + if (quest->GetCharTitleId()) { - if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId())) + if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(quest->GetCharTitleId())) SetTitle(titleEntry); } - if (pQuest->GetBonusTalents()) - m_questRewardTalentCount += pQuest->GetBonusTalents(); + if (quest->GetBonusTalents()) + m_questRewardTalentCount += quest->GetBonusTalents(); } m_RewardedQuests.insert(quest_id); @@ -17808,8 +17803,8 @@ void Player::_LoadDailyQuestStatus(PreparedQueryResult result) // save _any_ from daily quest times (it must be after last reset anyway) m_lastDailyQuestTime = (time_t)fields[1].GetUInt64(); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (!pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (!quest) continue; SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx, quest_id); @@ -17832,8 +17827,8 @@ void Player::_LoadWeeklyQuestStatus(PreparedQueryResult result) do { uint32 quest_id = (*result)[0].GetUInt32(); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (!pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (!quest) continue; m_weeklyquests.insert(quest_id); @@ -18481,7 +18476,6 @@ void Player::SaveToDB() // save pet (hunter pet level and experience and all type pets health/mana). if (Pet* pet = GetPet()) pet->SavePetToDB(PET_SAVE_AS_CURRENT); - } // fast save function for item/money cheating preventing - save only inventory and money state @@ -19544,7 +19538,6 @@ void Player::VehicleSpellInitialize() if (!veh) return; - uint8 cooldownCount = veh->m_CreatureSpellCooldowns.size() + veh->m_CreatureCategoryCooldowns.size(); WorldPacket data(SMSG_PET_SPELLS, 8 + 2 + 4 + 4 + 4 * 10 + 1 + 1 + cooldownCount * (4 + 2 + 4 + 4)); @@ -19880,7 +19873,6 @@ void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type) Player* owner = ObjectAccessor::FindPlayer(ownerguid); if (owner) owner->GetSession()->SendPetitionQueryOpcode(petitionguid); - } while (result->NextRow()); if (type == 10) @@ -21517,7 +21509,6 @@ void Player::SendInitialPacketsBeforeAddToMap() // SMSG_PET_GUIDS // SMSG_UPDATE_WORLD_STATE // SMSG_POWER_UPDATE - } void Player::SendInitialPacketsAfterAddToMap() @@ -21891,7 +21882,6 @@ void Player::SetDailyQuestStatus(uint32 quest_id) break; } } - } else { m_DFQuests.insert(quest_id); @@ -24310,7 +24300,6 @@ void Player::UpdateSpecCount(uint8 count) for (ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ++itr) trans->PAppend("INSERT INTO character_action (guid, button, action, type, spec) VALUES ('%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), uint32(itr->first), uint32(itr->second.GetAction()), uint32(itr->second.GetType()), 1); - } // Delete spec data for removed spec. else if (count < curCount) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index f4d1b30b97a..862b271c464 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1382,23 +1382,23 @@ class Player : public Unit, public GridObject<Player> /*** QUEST SYSTEM ***/ /*********************************************************/ - int32 GetQuestLevel(Quest const* pQuest) const { return pQuest && (pQuest->GetQuestLevel() > 0) ? pQuest->GetQuestLevel() : getLevel(); } + int32 GetQuestLevel(Quest const* quest) const { return quest && (quest->GetQuestLevel() > 0) ? quest->GetQuestLevel() : getLevel(); } void PrepareQuestMenu(uint64 guid); void SendPreparedQuest(uint64 guid); bool IsActiveQuest(uint32 quest_id) const; - Quest const* GetNextQuest(uint64 guid, Quest const* pQuest); - bool CanSeeStartQuest(Quest const* pQuest); - bool CanTakeQuest(Quest const* pQuest, bool msg); - bool CanAddQuest(Quest const* pQuest, bool msg); + Quest const* GetNextQuest(uint64 guid, Quest const* quest); + bool CanSeeStartQuest(Quest const* quest); + bool CanTakeQuest(Quest const* quest, bool msg); + bool CanAddQuest(Quest const* quest, bool msg); bool CanCompleteQuest(uint32 quest_id); - bool CanCompleteRepeatableQuest(Quest const* pQuest); - bool CanRewardQuest(Quest const* pQuest, bool msg); - bool CanRewardQuest(Quest const* pQuest, uint32 reward, bool msg); - void AddQuest(Quest const* pQuest, Object* questGiver); + bool CanCompleteRepeatableQuest(Quest const* quest); + bool CanRewardQuest(Quest const* quest, bool msg); + bool CanRewardQuest(Quest const* quest, uint32 reward, bool msg); + void AddQuest(Quest const* quest, Object* questGiver); void CompleteQuest(uint32 quest_id); void IncompleteQuest(uint32 quest_id); - void RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce = true); + void RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool announce = true); void FailQuest(uint32 quest_id); bool SatisfyQuestSkillOrClass(Quest const* qInfo, bool msg); bool SatisfyQuestLevel(Quest const* qInfo, bool msg); @@ -1414,7 +1414,7 @@ class Player : public Unit, public GridObject<Player> bool SatisfyQuestPrevChain(Quest const* qInfo, bool msg); bool SatisfyQuestDay(Quest const* qInfo, bool msg); bool SatisfyQuestWeek(Quest const* qInfo, bool msg); - bool GiveQuestSourceItem(Quest const* pQuest); + bool GiveQuestSourceItem(Quest const* quest); bool TakeQuestSourceItem(uint32 questId, bool msg); bool GetQuestRewardStatus(uint32 quest_id) const; QuestStatus GetQuestStatus(uint32 quest_id) const; @@ -1480,15 +1480,15 @@ class Player : public Unit, public GridObject<Player> bool CanShareQuest(uint32 quest_id) const; void SendQuestComplete(uint32 quest_id); - void SendQuestReward(Quest const* pQuest, uint32 XP, Object* questGiver); + void SendQuestReward(Quest const* quest, uint32 XP, Object* questGiver); void SendQuestFailed(uint32 questId, InventoryResult reason = EQUIP_ERR_OK); void SendQuestTimerFailed(uint32 quest_id); void SendCanTakeQuestResponse(uint32 msg); - void SendQuestConfirmAccept(Quest const* pQuest, Player* pReceiver); + void SendQuestConfirmAccept(Quest const* quest, Player* pReceiver); void SendPushToPartyResponse(Player* player, uint32 msg); - void SendQuestUpdateAddItem(Quest const* pQuest, uint32 item_idx, uint16 count); - void SendQuestUpdateAddCreatureOrGo(Quest const* pQuest, uint64 guid, uint32 creatureOrGO_idx, uint16 old_count, uint16 add_count); - void SendQuestUpdateAddPlayer(Quest const* pQuest, uint16 old_count, uint16 add_count); + void SendQuestUpdateAddItem(Quest const* quest, uint32 item_idx, uint16 count); + void SendQuestUpdateAddCreatureOrGo(Quest const* quest, uint64 guid, uint32 creatureOrGO_idx, uint16 old_count, uint16 add_count); + void SendQuestUpdateAddPlayer(Quest const* quest, uint16 old_count, uint16 add_count); uint64 GetDivider() { return m_divider; } void SetDivider(uint64 guid) { m_divider = guid; } @@ -2032,7 +2032,7 @@ class Player : public Unit, public GridObject<Player> ReputationMgr const& GetReputationMgr() const { return m_reputationMgr; } ReputationRank GetReputationRank(uint32 faction_id) const; void RewardReputation(Unit* pVictim, float rate); - void RewardReputation(Quest const* pQuest); + void RewardReputation(Quest const* quest); void UpdateSkillsForLevel(); void UpdateSkillsToMaxSkillsForLevel(); // for .levelup @@ -2756,7 +2756,7 @@ class Player : public Unit, public GridObject<Player> void AddKnownCurrency(uint32 itemId); int32 CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool for_quest, bool noQuestBonus = false); - void AdjustQuestReqItemCount(Quest const* pQuest, QuestStatusData& questStatusData); + void AdjustQuestReqItemCount(Quest const* quest, QuestStatusData& questStatusData); bool IsCanDelayTeleport() const { return m_bCanDelayTeleport; } void SetCanDelayTeleport(bool setting) { m_bCanDelayTeleport = setting; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index eab1a9aae48..6d02d943f63 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3043,8 +3043,8 @@ bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skip // We don't do loop here to explicitly show that melee spell is excluded. // Maybe later some special spells will be excluded too. - // if checkInstant then instant spells shouldn't count as being casted - if (!skipInstant && m_currentSpells[CURRENT_GENERIC_SPELL] && !m_currentSpells[CURRENT_GENERIC_SPELL]->CalcCastTime()) + // if skipInstant then instant spells shouldn't count as being casted + if (skipInstant && m_currentSpells[CURRENT_GENERIC_SPELL] && !m_currentSpells[CURRENT_GENERIC_SPELL]->CalcCastTime()) return false; // generic spells are casted when they are not finished and not delayed @@ -5038,6 +5038,7 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit* victim, uint32 /*damage*/, AuraEf return true; } +//victim may be NULL bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggeredByAura, SpellInfo const* procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown) { SpellInfo const* dummySpell = triggeredByAura->GetSpellInfo(); @@ -5706,6 +5707,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Glyph of Polymorph case 56375: { + if(!target) + return false; target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE, 0, target->GetAura(32409)); // SW:D shall not be removed. target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE_PERCENT); target->RemoveAurasByType(SPELL_AURA_PERIODIC_LEECH); @@ -5763,6 +5766,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Blessing of Ancient Kings (Val'anyr, Hammer of Ancient Kings) case 64411: { + if(!victim) + return false; basepoints0 = int32(CalculatePctN(damage, 15)); if (AuraEffect* aurEff = victim->GetAuraEffect(64413, 0, GetGUID())) { @@ -6062,6 +6067,9 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Divine Aegis if (dummySpell->SpellIconID == 2820) { + if(!target) + return false; + // Multiple effects stack, so let's try to find this aura. int32 bonus = 0; if (AuraEffect const* aurEff = target->GetAuraEffect(47753, 0)) @@ -6229,6 +6237,9 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Glyph of Shred case 54815: { + if(!target) + return false; + // try to find spell Rip on the target if (AuraEffect const* AurEff = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00800000, 0x0, 0x0, GetGUID())) { @@ -6522,6 +6533,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Explosive Shot if (procSpell->SpellFamilyFlags[2] & 0x200) { + if(!victim) + return false; if (AuraEffect const* pEff = victim->GetAuraEffect(SPELL_AURA_PERIODIC_DUMMY, SPELLFAMILY_HUNTER, 0x0, 0x80000000, 0x0, GetGUID())) basepoints0 = pEff->GetSpellInfo()->CalcPowerCost(this, SpellSchoolMask(pEff->GetSpellInfo()->SchoolMask)) * 4/10/3; } @@ -7218,6 +7231,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Item - Shaman T10 Elemental 4P Bonus case 70817: { + if(!target) + return false; // try to find spell Flame Shock on the target if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 0x10000000, 0x0, 0x0, GetGUID())) { @@ -8718,24 +8733,10 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg if (!victim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, procSpell, this)) return false; break; - // Deathbringer Saurfang - Rune of Blood - case 72408: - // can proc only if target is marked with rune - // this should be handled by targetAuraSpell, but because 72408 is not passive - // one failed proc will remove the entire aura - if (!victim->HasAura(72410)) - return false; - break; // Deathbringer Saurfang - Blood Beast's Blood Link case 72176: basepoints0 = 3; break; - // Deathbringer Saurfang - Mark of the Fallen Champion - case 72256: - // this should be handled by targetAuraSpell, but because 72408 is not passive - // one failed proc will remove the entire aura - CastSpell((Unit*)NULL, trigger_spell_id, true, NULL, triggeredByAura); - return true; case 15337: // Improved Spirit Tap (Rank 1) case 15338: // Improved Spirit Tap (Rank 2) { @@ -14149,13 +14150,13 @@ uint32 createProcExtendMask(SpellNonMeleeDamage* damageInfo, SpellMissInfo missC return procEx; } -void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage, SpellInfo const* procAura) +void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage, SpellInfo const* procAura) { // Player is loaded now - do not allow passive spell casts to proc if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->GetSession()->PlayerLoading()) return; // For melee/ranged based attack need update skills and set some Aura states if victim present - if (procFlag & MELEE_BASED_TRIGGER_MASK && pTarget) + if (procFlag & MELEE_BASED_TRIGGER_MASK && target) { // Update skills here for players if (GetTypeId() == TYPEID_PLAYER) @@ -14163,12 +14164,12 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, // On melee based hit/miss/resist need update skill (for victim and attacker) if (procExtra & (PROC_EX_NORMAL_HIT|PROC_EX_MISS|PROC_EX_RESIST)) { - if (pTarget->GetTypeId() != TYPEID_PLAYER && pTarget->GetCreatureType() != CREATURE_TYPE_CRITTER) - ToPlayer()->UpdateCombatSkills(pTarget, attType, isVictim); + if (target->GetTypeId() != TYPEID_PLAYER && target->GetCreatureType() != CREATURE_TYPE_CRITTER) + ToPlayer()->UpdateCombatSkills(target, attType, isVictim); } // Update defence if player is victim and parry/dodge/block else if (isVictim && procExtra & (PROC_EX_DODGE|PROC_EX_PARRY|PROC_EX_BLOCK)) - ToPlayer()->UpdateCombatSkills(pTarget, attType, true); + ToPlayer()->UpdateCombatSkills(target, attType, true); } // If exist crit/parry/dodge/block need update aura state (for victim and attacker) if (procExtra & (PROC_EX_CRITICAL_HIT|PROC_EX_PARRY|PROC_EX_DODGE|PROC_EX_BLOCK)) @@ -14213,7 +14214,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, // Overpower on victim dodge if (procExtra & PROC_EX_DODGE && GetTypeId() == TYPEID_PLAYER && getClass() == CLASS_WARRIOR) { - ToPlayer()->AddComboPoints(pTarget, 1); + ToPlayer()->AddComboPoints(target, 1); StartReactiveTimer(REACTIVE_OVERPOWER); } } @@ -14233,7 +14234,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, if (isVictim) procExtra &= ~PROC_EX_INTERNAL_REQ_FAMILY; SpellInfo const* spellProto = itr->second->GetBase()->GetSpellInfo(); - if (!IsTriggeredAtSpellProcEvent(pTarget, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent)) + if (!IsTriggeredAtSpellProcEvent(target, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent)) continue; // Triggered spells not triggering additional spells @@ -14293,7 +14294,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, // This bool is needed till separate aura effect procs are still here bool handled = false; - if (HandleAuraProc(pTarget, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled)) + if (HandleAuraProc(target, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled)) { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), Id); takeCharges = true; @@ -14314,15 +14315,15 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); // Don`t drop charge or add cooldown for not started trigger - if (HandleProcTriggerSpell(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } case SPELL_AURA_PROC_TRIGGER_DAMAGE: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: doing %u damage from spell id %u (triggered by %s aura of spell %u)", triggeredByAura->GetAmount(), spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - SpellNonMeleeDamage damageInfo(this, pTarget, spellInfo->Id, spellInfo->SchoolMask); - uint32 damage = SpellDamageBonus(pTarget, spellInfo, triggeredByAura->GetAmount(), SPELL_DIRECT_DAMAGE); + SpellNonMeleeDamage damageInfo(this, target, spellInfo->Id, spellInfo->SchoolMask); + uint32 damage = SpellDamageBonus(target, spellInfo, triggeredByAura->GetAmount(), SPELL_DIRECT_DAMAGE); CalculateSpellDamageTaken(&damageInfo, damage, spellInfo); DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); SendSpellNonMeleeDamageLog(&damageInfo); @@ -14334,31 +14335,31 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, case SPELL_AURA_DUMMY: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleDummyAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleDummyAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } case SPELL_AURA_OBS_MOD_POWER: sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleObsModEnergyAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleObsModEnergyAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; case SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN: sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleModDamagePctTakenAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleModDamagePctTakenAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; case SPELL_AURA_MOD_MELEE_HASTE: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s haste aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleHasteAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleHasteAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } case SPELL_AURA_OVERRIDE_CLASS_SCRIPTS: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleOverrideClassScriptAuraProc(pTarget, damage, triggeredByAura, procSpell, cooldown)) + if (HandleOverrideClassScriptAuraProc(target, damage, triggeredByAura, procSpell, cooldown)) takeCharges = true; break; } @@ -14384,7 +14385,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (HandleProcTriggerSpell(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (HandleProcTriggerSpell(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } @@ -14418,12 +14419,12 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, break; case SPELL_AURA_MOD_DAMAGE_FROM_CASTER: // Compare casters - if (triggeredByAura->GetCasterGUID() == pTarget->GetGUID()) + if (triggeredByAura->GetCasterGUID() == target->GetGUID()) takeCharges = true; break; case SPELL_AURA_MOD_SPELL_CRIT_CHANCE: sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s spell crit chance aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); - if (procSpell && HandleSpellCritChanceAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) + if (procSpell && HandleSpellCritChanceAuraProc(target, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; // CC Auras which use their amount amount to drop @@ -15867,8 +15868,8 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au return false; // Set charmed - Map* pMap = GetMap(); - if (!IsVehicle() || (IsVehicle() && pMap && !pMap->IsBattleground())) + Map* map = GetMap(); + if (!IsVehicle() || (IsVehicle() && map && !map->IsBattleground())) setFaction(charmer->getFaction()); charmer->SetCharm(this, true); @@ -15973,8 +15974,8 @@ void Unit::RemoveCharmedBy(Unit* charmer) CombatStop(); // TODO: CombatStop(true) may cause crash (interrupt spells) getHostileRefManager().deleteReferences(); DeleteThreatList(); - Map* pMap = GetMap(); - if (!IsVehicle() || (IsVehicle() && pMap && !pMap->IsBattleground())) + Map* map = GetMap(); + if (!IsVehicle() || (IsVehicle() && map && !map->IsBattleground())) RestoreFaction(); GetMotionMaster()->InitDefault(); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 269df57301c..8f052ab41ae 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -618,6 +618,7 @@ enum UnitFlags2 UNIT_FLAG2_DISARM_OFFHAND = 0x00000080, UNIT_FLAG2_DISARM_RANGED = 0x00000400, // this does not disable ranged weapon display (maybe additional flag needed?) UNIT_FLAG2_REGENERATE_POWER = 0x00000800, + UNIT_FLAG2_ALLOW_ENEMY_INTERACT = 0x00004000, UNIT_FLAG2_ALLOW_CHEAT_SPELLS = 0x00040000, // allows casting spells with AttributesEx7 & SPELL_ATTR7_IS_CHEAT_SPELL }; @@ -1443,7 +1444,7 @@ class Unit : public WorldObject int32 DealHeal(Unit* pVictim, uint32 addhealth); void ProcDamageAndSpell(Unit* pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellInfo const* procSpell = NULL, SpellInfo const* procAura = NULL); - void ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage, SpellInfo const* procAura = NULL); + void ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellInfo const* procSpell, uint32 damage, SpellInfo const* procAura = NULL); void GetProcAurasTriggeredOnEvent(std::list<AuraApplication*>& aurasTriggeringProc, std::list<AuraApplication*>* procAuras, ProcEventInfo eventInfo); void TriggerAurasProcOnEvent(CalcDamageInfo& damageInfo); diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 77296b73f81..c351efb334f 100755 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -396,4 +396,4 @@ template Pet* ObjectAccessor::GetObjectInWorld<Pet>(uint32 mapid, float x, float template Creature* ObjectAccessor::GetObjectInWorld<Creature>(uint32 mapid, float x, float y, uint64 guid, Creature* /*fake*/); template Corpse* ObjectAccessor::GetObjectInWorld<Corpse>(uint32 mapid, float x, float y, uint64 guid, Corpse* /*fake*/); template GameObject* ObjectAccessor::GetObjectInWorld<GameObject>(uint32 mapid, float x, float y, uint64 guid, GameObject* /*fake*/); -template DynamicObject* ObjectAccessor::GetObjectInWorld<DynamicObject>(uint32 mapid, float x, float y, uint64 guid, DynamicObject* /*fake*/); +template DynamicObject* ObjectAccessor::GetObjectInWorld<DynamicObject>(uint32 mapid, float x, float y, uint64 guid, DynamicObject* /*fake*/);
\ No newline at end of file diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 0ea30cabff7..0cd15143cee 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -808,6 +808,9 @@ namespace Trinity if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem()) return false; + if(!u->isTargetableForAttack(false)) + return false; + return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u); } private: @@ -1025,11 +1028,12 @@ namespace Trinity return false; if (m_force) + { if (!me->IsValidAttackTarget(u)) return false; - else - if (!me->canStartAttack(u, false)) - return false; + } + else if (!me->canStartAttack(u, false)) + return false; m_range = me->GetDistance(u); // use found unit range as new range limit for next check return true; @@ -1196,9 +1200,9 @@ namespace Trinity { public: AllGameObjectsWithEntryInRange(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {} - bool operator() (GameObject* pGo) + bool operator() (GameObject* go) { - if (pGo->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pGo, m_fRange, false)) + if (go->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(go, m_fRange, false)) return true; return false; @@ -1265,9 +1269,9 @@ namespace Trinity { public: AllWorldObjectsInRange(const WorldObject* pObject, float fMaxRange) : m_pObject(pObject), m_fRange(fMaxRange) {} - bool operator() (WorldObject* pGo) + bool operator() (WorldObject* go) { - return m_pObject->IsWithinDist(pGo, m_fRange, false); + return m_pObject->IsWithinDist(go, m_fRange, false); } private: const WorldObject* m_pObject; diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index ca946b4a2c0..bc2648ed02b 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -626,4 +626,4 @@ uint32 InstanceSaveManager::GetNumBoundGroupsTotal() ret += itr->second->GetGroupCount(); return ret; -} +}
\ No newline at end of file diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index b2c504dfb9f..b9b9ed281fa 100755 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -253,35 +253,35 @@ void InstanceScript::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, if (!uiGuid) return; - GameObject* pGo = instance->GetGameObject(uiGuid); + GameObject* go = instance->GetGameObject(uiGuid); - if (pGo) + if (go) { - if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON) + if (go->GetGoType() == GAMEOBJECT_TYPE_DOOR || go->GetGoType() == GAMEOBJECT_TYPE_BUTTON) { - if (pGo->getLootState() == GO_READY) - pGo->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState); - else if (pGo->getLootState() == GO_ACTIVATED) - pGo->ResetDoorOrButton(); + if (go->getLootState() == GO_READY) + go->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState); + else if (go->getLootState() == GO_ACTIVATED) + go->ResetDoorOrButton(); } else - sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", pGo->GetEntry(), pGo->GetGoType()); + sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", go->GetEntry(), go->GetGoType()); } } void InstanceScript::DoRespawnGameObject(uint64 uiGuid, uint32 uiTimeToDespawn) { - if (GameObject* pGo = instance->GetGameObject(uiGuid)) + if (GameObject* go = instance->GetGameObject(uiGuid)) { //not expect any of these should ever be handled - if (pGo->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE || pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || - pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON || pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP) + if (go->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE || go->GetGoType() == GAMEOBJECT_TYPE_DOOR || + go->GetGoType() == GAMEOBJECT_TYPE_BUTTON || go->GetGoType() == GAMEOBJECT_TYPE_TRAP) return; - if (pGo->isSpawned()) + if (go->isSpawned()) return; - pGo->SetRespawnTime(uiTimeToDespawn); + go->SetRespawnTime(uiTimeToDespawn); } } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 1f26bba5f24..4096154fa37 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -31,7 +31,6 @@ #include "ObjectMgr.h" #include "Group.h" - union u_map_magic { char asChar[4]; @@ -1642,7 +1641,6 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps, float maxSearchD return vmapHeight; else return mapHeight; // better use .map surface height - } else return vmapHeight; // we have only vmapHeight (if have) @@ -2694,7 +2692,6 @@ void BattlegroundMap::RemoveAllPlayers() if (Player* plr = itr->getSource()) if (!plr->IsBeingTeleportedFar()) plr->TeleportTo(plr->GetBattlegroundEntryPoint()); - } Creature* diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index ff6bdac5156..8359a49a316 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -420,8 +420,8 @@ class Map : public GridRefManager<NGridType> GameObject* GetGameObject(uint64 guid); DynamicObject* GetDynamicObject(uint64 guid); - MapInstanced* ToMapInstanced(){ if (Instanceable()) return reinterpret_cast<MapInstanced*>(this); else return NULL; } - const MapInstanced* ToMapInstanced() const { if (Instanceable()) return (const MapInstanced*)((MapInstanced*)this); else return NULL; } + MapInstanced* ToMainstanced(){ if (Instanceable()) return reinterpret_cast<MapInstanced*>(this); else return NULL; } + const MapInstanced* ToMainstanced() const { if (Instanceable()) return (const MapInstanced*)((MapInstanced*)this); else return NULL; } InstanceMap* ToInstanceMap(){ if (IsDungeon()) return reinterpret_cast<InstanceMap*>(this); else return NULL; } const InstanceMap* ToInstanceMap() const { if (IsDungeon()) return (const InstanceMap*)((InstanceMap*)this); else return NULL; } diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 88bfc9cdb69..418218a52b3 100755 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -264,4 +264,4 @@ bool MapInstanced::CanEnter(Player* /*player*/) { //ASSERT(false); return true; -} +}
\ No newline at end of file diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 4684e96c79c..0b7abacad28 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -432,4 +432,4 @@ void MapManager::FreeInstanceId(uint32 instanceId) SetNextInstanceId(instanceId); _instanceIds[instanceId] = false; -} +}
\ No newline at end of file diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index fa18cd801a4..380af30c175 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -53,6 +53,7 @@ enum Gender // Race value is index in ChrRaces.dbc enum Races { + RACE_NONE = 0, RACE_HUMAN = 1, RACE_ORC = 2, RACE_DWARF = 3, diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 801b95e4c42..03accce42ed 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -838,8 +838,8 @@ void PoolMgr::LoadFromDB() uint32 entry = fields[0].GetUInt32(); uint32 pool_id = fields[1].GetUInt32(); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry); - if (!pQuest) + Quest const* quest = sObjectMgr->GetQuestTemplate(entry); + if (!quest) { sLog->outErrorDb("`pool_quest` has a non existing quest template (Entry: %u) defined for pool id (%u), skipped.", entry, pool_id); continue; @@ -851,16 +851,16 @@ void PoolMgr::LoadFromDB() continue; } - if (!pQuest->IsDailyOrWeekly()) + if (!quest->IsDailyOrWeekly()) { sLog->outErrorDb("`pool_quest` has an quest (%u) which is not daily or weekly in pool id (%u), use ExclusiveGroup instead, skipped.", entry, pool_id); continue; } if (poolTypeMap[pool_id] == QUEST_NONE) - poolTypeMap[pool_id] = pQuest->IsDaily() ? QUEST_DAILY : QUEST_WEEKLY; + poolTypeMap[pool_id] = quest->IsDaily() ? QUEST_DAILY : QUEST_WEEKLY; - int32 currType = pQuest->IsDaily() ? QUEST_DAILY : QUEST_WEEKLY; + int32 currType = quest->IsDaily() ? QUEST_DAILY : QUEST_WEEKLY; if (poolTypeMap[pool_id] != currType) { @@ -980,9 +980,9 @@ void PoolMgr::ChangeDailyQuests() { for (PoolGroupQuestMap::iterator itr = mPoolQuestGroups.begin(); itr != mPoolQuestGroups.end(); ++itr) { - if (Quest const* pQuest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId())) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId())) { - if (pQuest->IsWeekly()) + if (quest->IsWeekly()) continue; UpdatePool<Quest>(itr->GetPoolId(), 1); // anything non-zero means don't load from db @@ -996,9 +996,9 @@ void PoolMgr::ChangeWeeklyQuests() { for (PoolGroupQuestMap::iterator itr = mPoolQuestGroups.begin(); itr != mPoolQuestGroups.end(); ++itr) { - if (Quest const* pQuest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId())) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(itr->GetFirstEqualChancedObjectId())) { - if (pQuest->IsDaily()) + if (quest->IsDaily()) continue; UpdatePool<Quest>(itr->GetPoolId(), 1); diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index d33d338fe82..3ded63fe812 100755 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -553,7 +553,7 @@ void Map::ScriptsProcess() else { pTarget = source->ToPlayer(); - if (pTarget) + if (target) { if (target->GetTypeId() != TYPEID_UNIT && target->GetTypeId() != TYPEID_GAMEOBJECT && target->GetTypeId() != TYPEID_PLAYER) { diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d37938eba48..120227c172d 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -155,7 +155,7 @@ class ScriptRegistry if (!V) \ return R; -void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) +void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* target) { if (!pSource) { @@ -198,21 +198,21 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) switch (pData->uiType) { case CHAT_TYPE_SAY: - pSource->MonsterSay(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterSay(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; case CHAT_TYPE_YELL: - pSource->MonsterYell(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterYell(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; case CHAT_TYPE_TEXT_EMOTE: - pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterTextEmote(iTextEntry, target ? target->GetGUID() : 0); break; case CHAT_TYPE_BOSS_EMOTE: - pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0, true); + pSource->MonsterTextEmote(iTextEntry, target ? target->GetGUID() : 0, true); break; case CHAT_TYPE_WHISPER: { - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID()); + if (target && target->GetTypeId() == TYPEID_PLAYER) + pSource->MonsterWhisper(iTextEntry, target->GetGUID()); else sLog->outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); @@ -220,15 +220,15 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) } case CHAT_TYPE_BOSS_WHISPER: { - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true); + if (target && target->GetTypeId() == TYPEID_PLAYER) + pSource->MonsterWhisper(iTextEntry, target->GetGUID(), true); else sLog->outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); break; } case CHAT_TYPE_ZONE_YELL: - pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; } } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 5925992a3c2..b3ba7f0a89c 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -69,7 +69,7 @@ struct OutdoorPvPData; #define VISIBLE_RANGE 166.0f //MAX visible range (size of grid) // Generic scripting text function. -void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* pTarget = NULL); +void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL); /* TODO: Add more script type classes. diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index ef5a3b8184f..8c6f5626101 100755 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -64,13 +64,13 @@ void SystemMgr::LoadScriptTexts() do { Field* pFields = result->Fetch(); - StringTextData pTemp; + StringTextData temp; int32 iId = pFields[0].GetInt32(); - pTemp.uiSoundId = pFields[1].GetUInt32(); - pTemp.uiType = pFields[2].GetUInt32(); - pTemp.uiLanguage = pFields[3].GetUInt32(); - pTemp.uiEmote = pFields[4].GetUInt32(); + temp.uiSoundId = pFields[1].GetUInt32(); + temp.uiType = pFields[2].GetUInt32(); + temp.uiLanguage = pFields[3].GetUInt32(); + temp.uiEmote = pFields[4].GetUInt32(); if (iId >= 0) { @@ -84,19 +84,19 @@ void SystemMgr::LoadScriptTexts() continue; } - if (pTemp.uiSoundId) + if (temp.uiSoundId) { - if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId)) - sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId); + if (!GetSoundEntriesStore()->LookupEntry(temp.uiSoundId)) + sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, temp.uiSoundId); } - if (!GetLanguageDescByID(pTemp.uiLanguage)) - sLog->outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage); + if (!GetLanguageDescByID(temp.uiLanguage)) + sLog->outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, temp.uiLanguage); - if (pTemp.uiType > CHAT_TYPE_ZONE_YELL) - sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType); + if (temp.uiType > CHAT_TYPE_ZONE_YELL) + sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, temp.uiType); - m_mTextDataMap[iId] = pTemp; + m_mTextDataMap[iId] = temp; ++uiCount; } while (result->NextRow()); @@ -125,13 +125,13 @@ void SystemMgr::LoadScriptTextsCustom() do { Field* pFields = result->Fetch(); - StringTextData pTemp; + StringTextData temp; int32 iId = pFields[0].GetInt32(); - pTemp.uiSoundId = pFields[1].GetUInt32(); - pTemp.uiType = pFields[2].GetUInt32(); - pTemp.uiLanguage = pFields[3].GetUInt32(); - pTemp.uiEmote = pFields[4].GetUInt32(); + temp.uiSoundId = pFields[1].GetUInt32(); + temp.uiType = pFields[2].GetUInt32(); + temp.uiLanguage = pFields[3].GetUInt32(); + temp.uiEmote = pFields[4].GetUInt32(); if (iId >= 0) { @@ -145,19 +145,19 @@ void SystemMgr::LoadScriptTextsCustom() continue; } - if (pTemp.uiSoundId) + if (temp.uiSoundId) { - if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId)) - sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId); + if (!GetSoundEntriesStore()->LookupEntry(temp.uiSoundId)) + sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, temp.uiSoundId); } - if (!GetLanguageDescByID(pTemp.uiLanguage)) - sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage); + if (!GetLanguageDescByID(temp.uiLanguage)) + sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, temp.uiLanguage); - if (pTemp.uiType > CHAT_TYPE_ZONE_YELL) - sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType); + if (temp.uiType > CHAT_TYPE_ZONE_YELL) + sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, temp.uiType); - m_mTextDataMap[iId] = pTemp; + m_mTextDataMap[iId] = temp; ++uiCount; } while (result->NextRow()); @@ -195,28 +195,28 @@ void SystemMgr::LoadScriptWaypoints() do { Field* pFields = result->Fetch(); - ScriptPointMove pTemp; + ScriptPointMove temp; - pTemp.uiCreatureEntry = pFields[0].GetUInt32(); - uint32 uiEntry = pTemp.uiCreatureEntry; - pTemp.uiPointId = pFields[1].GetUInt32(); - pTemp.fX = pFields[2].GetFloat(); - pTemp.fY = pFields[3].GetFloat(); - pTemp.fZ = pFields[4].GetFloat(); - pTemp.uiWaitTime = pFields[5].GetUInt32(); + temp.uiCreatureEntry = pFields[0].GetUInt32(); + uint32 uiEntry = temp.uiCreatureEntry; + temp.uiPointId = pFields[1].GetUInt32(); + temp.fX = pFields[2].GetFloat(); + temp.fY = pFields[3].GetFloat(); + temp.fZ = pFields[4].GetFloat(); + temp.uiWaitTime = pFields[5].GetUInt32(); - CreatureTemplate const* pCInfo = sObjectMgr->GetCreatureTemplate(pTemp.uiCreatureEntry); + CreatureTemplate const* pCInfo = sObjectMgr->GetCreatureTemplate(temp.uiCreatureEntry); if (!pCInfo) { - sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry); + sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", temp.uiCreatureEntry); continue; } if (!pCInfo->ScriptID) - sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry); + sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", temp.uiCreatureEntry); - m_mPointMoveMap[uiEntry].push_back(pTemp); + m_mPointMoveMap[uiEntry].push_back(temp); ++count; } while (result->NextRow()); diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 13bbacaf878..d4ca425d606 100755 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -686,6 +686,7 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte sLog->outDetail("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow()); sLog->outChar("Account: %d (IP: %s) Create Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), createInfo->Name.c_str(), newChar.GetGUIDLow()); sScriptMgr->OnPlayerCreate(&newChar); + sWorld->AddCharacterNameData(newChar.GetGUIDLow(), std::string(newChar.GetName()), newChar.getGender(), newChar.getRace(), newChar.getClass()); delete createInfo; _charCreateCallback.SetParam(NULL); @@ -741,6 +742,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket & recv_data) sLog->outDetail("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); sLog->outChar("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); sScriptMgr->OnPlayerDelete(guid); + sWorld->DeleteCharaceterNameData(guid); if (sLog->IsOutCharDump()) // optimize GetPlayerDump call { @@ -1414,6 +1416,7 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data) Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair); CharacterDatabase.PExecute("UPDATE characters set name = '%s', at_login = at_login & ~ %u WHERE guid ='%u'", newname.c_str(), uint32(AT_LOGIN_CUSTOMIZE), GUID_LOPART(guid)); CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid ='%u'", GUID_LOPART(guid)); + sWorld->UpdateCharacterNameData(GUID_LOPART(guid), newname, gender); WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1+8+(newname.size()+1)+6); data << uint8(RESPONSE_SUCCESS); @@ -1631,6 +1634,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) SQLTransaction trans = CharacterDatabase.BeginTransaction(); trans->PAppend("UPDATE `characters` SET name='%s', race='%u', at_login=at_login & ~ %u WHERE guid='%u'", newname.c_str(), race, used_loginFlag, lowGuid); trans->PAppend("DELETE FROM character_declinedname WHERE guid ='%u'", lowGuid); + sWorld->UpdateCharacterNameData(GUID_LOPART(guid), newname, gender, race); BattlegroundTeamId team = BG_TEAM_ALLIANCE; diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp index 34dc612cc78..9277464ca21 100755 --- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp @@ -31,91 +31,44 @@ #include "Pet.h" #include "MapManager.h" -void WorldSession::SendNameQueryOpcode(Player* p) +void WorldSession::SendNameQueryOpcode(uint64 guid) { - if (!p) - return; + Player* player = NULL; + const CharacterNameData* nameData = sWorld->GetCharacterNameData(GUID_LOPART(guid)); + if (nameData) + player = ObjectAccessor::FindPlayer(guid); + // guess size WorldPacket data(SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+10)); - data.append(p->GetPackGUID()); // player guid + data.appendPackGUID(guid); data << uint8(0); // added in 3.1 - data << p->GetName(); // played name - data << uint8(0); // realm name for cross realm BG usage - data << uint8(p->getRace()); - data << uint8(p->getGender()); - data << uint8(p->getClass()); - if (DeclinedName const* names = p->GetDeclinedNames()) + if (nameData) { - data << uint8(1); // is declined - for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) - data << names->name[i]; + data << nameData->m_name; // played name + data << uint8(0); // realm name for cross realm BG usage + data << uint8(nameData->m_race); + data << uint8(nameData->m_gender); + data << uint8(nameData->m_class); } else - data << uint8(0); // is not declined - - SendPacket(&data); -} - -void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid) -{ - QueryResultFuture lFutureResult = - CharacterDatabase.AsyncPQuery( - !sWorld->getBoolConfig(CONFIG_DECLINED_NAMES_USED) ? - // ------- Query Without Declined Names -------- - // 0 1 2 3 4 - "SELECT guid, name, race, gender, class " - "FROM characters WHERE guid = '%u'" - : - // --------- Query With Declined Names --------- - // 0 1 2 3 4 - "SELECT characters.guid, name, race, gender, class, " - // 5 6 7 8 9 - "genitive, dative, accusative, instrumental, prepositional " - "FROM characters LEFT JOIN character_declinedname ON characters.guid = character_declinedname.guid WHERE characters.guid = '%u'", - GUID_LOPART(guid) - ); - - _nameQueryCallbacks.insert(lFutureResult); - -// CharacterDatabase.AsyncPQuery(&WorldSession::SendNameQueryOpcodeFromDBCallBack, GetAccountId(), -} - -void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult result) -{ - if (!result) - return; - - Field* fields = result->Fetch(); - uint32 guid = fields[0].GetUInt32(); - std::string name = fields[1].GetString(); - uint8 pRace = 0, pGender = 0, pClass = 0; - if (name == "") - name = GetTrinityString(LANG_NON_EXIST_CHARACTER); - else { - pRace = fields[2].GetUInt8(); - pGender = fields[3].GetUInt8(); - pClass = fields[4].GetUInt8(); + data << std::string(GetTrinityString(LANG_NON_EXIST_CHARACTER)); + data << uint32(0); } - // guess size - WorldPacket data(SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+1+10)); - data.appendPackGUID(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER)); - data << uint8(0); // added in 3.1 - data << name; - data << uint8(0); // realm name for cross realm BG usage - data << uint8(pRace); // race - data << uint8(pGender); // gender - data << uint8(pClass); // class - - // if the first declined name field (5) is empty, the rest must be too - if (sWorld->getBoolConfig(CONFIG_DECLINED_NAMES_USED) && fields[5].GetString() != "") + + if (player) { - data << uint8(1); // is declined - for (int i = 5; i < MAX_DECLINED_NAME_CASES+5; ++i) - data << fields[i].GetString(); + if (DeclinedName const* names = player->GetDeclinedNames()) + { + data << uint8(1); // is declined + for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i) + data << names->name[i]; + } + else + data << uint8(0); // is not declined } - else - data << uint8(0); // is not declined + else //TODO: decline names may also need to be stored in char name data + data << uint8(0); SendPacket(&data); } @@ -126,10 +79,10 @@ void WorldSession::HandleNameQueryOpcode(WorldPacket& recv_data) recv_data >> guid; - if (Player* pChar = ObjectAccessor::FindPlayer(guid)) - SendNameQueryOpcode(pChar); - else - SendNameQueryOpcodeFromDB(guid); + // This is disable by default to prevent lots of console spam + // sLog->outString("HandleNameQueryOpcode %u", guid); + + SendNameQueryOpcode(guid); } void WorldSession::HandleQueryTimeOpcode(WorldPacket & /*recv_data*/) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 7c4cd1fec85..cc57b72d9b4 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -984,22 +984,6 @@ void WorldSession::ProcessQueryCallbacks() { QueryResult result; - //! HandleNameQueryOpcode - while (!_nameQueryCallbacks.is_empty()) - { - QueryResultFuture lResult; - ACE_Time_Value timeout = ACE_Time_Value::zero; - if (_nameQueryCallbacks.next_readable(lResult, &timeout) != 1) - break; - - if (lResult.ready()) - { - lResult.get(result); - SendNameQueryOpcodeFromDBCallBack(result); - lResult.cancel(); - } - } - //! HandleCharEnumOpcode if (_charEnumCallback.ready()) { diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index cac707773da..2337f2a34b2 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -278,9 +278,7 @@ class WorldSession void SendAuthWaitQue(uint32 position); //void SendTestCreatureQueryOpcode(uint32 entry, uint64 guid, uint32 testvalue); - void SendNameQueryOpcode(Player* p); - void SendNameQueryOpcodeFromDB(uint64 guid); - void SendNameQueryOpcodeFromDBCallBack(QueryResult result); + void SendNameQueryOpcode(uint64 guid); void SendTrainerList(uint64 guid); void SendTrainerList(uint64 guid, const std::string& strTitle); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 55dc29e5ef4..4876f435f55 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4655,7 +4655,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (target->GetTypeId() != TYPEID_PLAYER) return; // ..while they are casting - if (target->IsNonMeleeSpellCasted(false, false, true, false, false)) + if (target->IsNonMeleeSpellCasted(false, false, true, false, true)) if (AuraEffect* aurEff = caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_WARRIOR, 2775, 0)) switch (aurEff->GetId()) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index dffdfad17e5..16243396ebb 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1433,7 +1433,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, const uint32 effectMask, bool if (m_spellInfo->Speed > 0.0f && unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) && unit->GetCharmerOrOwnerGUID() != m_caster->GetGUID()) return SPELL_MISS_EVADE; - if (m_caster->IsValidAttackTarget(unit)) + if (m_caster->_IsValidAttackTarget(unit, m_spellInfo)) { unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_HITBYSPELL); //TODO: This is a hack. But we do not know what types of stealth should be interrupted by CC @@ -1825,6 +1825,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin && !m_caster->isInFrontInMap(*next, max_range)) || !m_caster->canSeeOrDetect(*next) || !cur->IsWithinLOSInMap(*next) + || (*next)->GetCreatureType() == CREATURE_TYPE_CRITTER || ((GetSpellInfo()->AttributesEx6 & SPELL_ATTR6_CANT_TARGET_CROWD_CONTROLLED) && !(*next)->CanFreeMove())) { ++next; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index ee4b771f6fe..926a2280d18 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -257,16 +257,16 @@ void Spell::EffectResurrectNew(SpellEffIndex effIndex) if (!unitTarget->IsInWorld()) return; - Player* pTarget = unitTarget->ToPlayer(); + Player* target = unitTarget->ToPlayer(); - if (pTarget->isRessurectRequested()) // already have one active request + if (target->isRessurectRequested()) // already have one active request return; uint32 health = damage; uint32 mana = m_spellInfo->Effects[effIndex].MiscValue; - ExecuteLogEffectResurrect(effIndex, pTarget); - pTarget->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana); - SendResurrectRequest(pTarget); + ExecuteLogEffectResurrect(effIndex, target); + target->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana); + SendResurrectRequest(target); } void Spell::EffectInstaKill(SpellEffIndex /*effIndex*/) @@ -1922,18 +1922,18 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) } break; case 66550: // teleports outside (Isle of Conquest) - if (Player* pTarget = unitTarget->ToPlayer()) + if (Player* target = unitTarget->ToPlayer()) { - if (pTarget->GetTeamId() == TEAM_ALLIANCE) + if (target->GetTeamId() == TEAM_ALLIANCE) m_targets.SetDst(442.24f, -835.25f, 44.30f, 0.06f, 628); else m_targets.SetDst(1120.43f, -762.11f, 47.92f, 2.94f, 628); } break; case 66551: // teleports inside (Isle of Conquest) - if (Player* pTarget = unitTarget->ToPlayer()) + if (Player* target = unitTarget->ToPlayer()) { - if (pTarget->GetTeamId() == TEAM_ALLIANCE) + if (target->GetTeamId() == TEAM_ALLIANCE) m_targets.SetDst(389.57f, -832.38f, 48.65f, 3.00f, 628); else m_targets.SetDst(1174.85f, -763.24f, 48.72f, 6.26f, 628); @@ -5625,23 +5625,23 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) if (!sWorld->getBoolConfig(CONFIG_CAST_UNSTUCK)) return; - Player* pTarget = (Player*)m_caster; + Player* target = (Player*)m_caster; sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell Effect: Stuck"); - sLog->outDetail("Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", pTarget->GetName(), pTarget->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); + sLog->outDetail("Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", target->GetName(), target->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); - if (pTarget->isInFlight()) + if (target->isInFlight()) return; - pTarget->TeleportTo(pTarget->GetStartPosition(), m_caster == m_caster ? TELE_TO_SPELL : 0); + target->TeleportTo(target->GetStartPosition(), m_caster == m_caster ? TELE_TO_SPELL : 0); // homebind location is loaded always - // pTarget->TeleportTo(pTarget->m_homebindMapId, pTarget->m_homebindX, pTarget->m_homebindY, pTarget->m_homebindZ, pTarget->GetOrientation(), (m_caster == m_caster ? TELE_TO_SPELL : 0)); + // target->TeleportTo(target->m_homebindMapId, target->m_homebindX, target->m_homebindY, target->m_homebindZ, target->GetOrientation(), (m_caster == m_caster ? TELE_TO_SPELL : 0)); // Stuck spell trigger Hearthstone cooldown SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(8690); if (!spellInfo) return; - Spell spell(pTarget, spellInfo, TRIGGERED_FULL_MASK); + Spell spell(target, spellInfo, TRIGGERED_FULL_MASK); spell.SendSpellCooldown(); } @@ -5983,18 +5983,18 @@ void Spell::EffectResurrect(SpellEffIndex effIndex) break; } - Player* pTarget = unitTarget->ToPlayer(); + Player* target = unitTarget->ToPlayer(); - if (pTarget->isRessurectRequested()) // already have one active request + if (target->isRessurectRequested()) // already have one active request return; - uint32 health = pTarget->CountPctFromMaxHealth(damage); - uint32 mana = CalculatePctN(pTarget->GetMaxPower(POWER_MANA), damage); + uint32 health = target->CountPctFromMaxHealth(damage); + uint32 mana = CalculatePctN(target->GetMaxPower(POWER_MANA), damage); - ExecuteLogEffectResurrect(effIndex, pTarget); + ExecuteLogEffectResurrect(effIndex, target); - pTarget->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana); - SendResurrectRequest(pTarget); + target->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana); + SendResurrectRequest(target); } void Spell::EffectAddExtraAttacks(SpellEffIndex effIndex) @@ -6291,9 +6291,9 @@ void Spell::EffectQuestClear(SpellEffIndex effIndex) uint32 quest_id = m_spellInfo->Effects[effIndex].MiscValue; - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); - if (!pQuest) + if (!quest) return; // Player has never done this quest diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 8f888f8fb85..92fa001fe46 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -352,6 +352,15 @@ bool PlayerDumpWriter::GetDump(uint32 guid, std::string &dump) DumpReturn PlayerDumpWriter::WriteDump(const std::string& file, uint32 guid) { + if (sWorld->getBoolConfig(CONFIG_PDUMP_NO_PATHS)) + if (strstr(file.c_str(), "\\") || strstr(file.c_str(), "/")) + return DUMP_FILE_OPEN_ERROR; + if (sWorld->getBoolConfig(CONFIG_PDUMP_NO_OVERWRITE)) + if (FILE* f = fopen(file.c_str(), "r")) + { + fclose(f); + return DUMP_FILE_OPEN_ERROR; + } FILE* fout = fopen(file.c_str(), "w"); if (!fout) return DUMP_FILE_OPEN_ERROR; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 6794d99db32..28657faedb1 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1185,6 +1185,10 @@ void World::LoadConfigSettings(bool reload) // MySQL ping time interval m_int_configs[CONFIG_DB_PING_INTERVAL] = ConfigMgr::GetIntDefault("MaxPingTime", 30); + // misc + m_bool_configs[CONFIG_PDUMP_NO_PATHS] = ConfigMgr::GetBoolDefault("PlayerDump.DisallowPaths", true); + m_bool_configs[CONFIG_PDUMP_NO_OVERWRITE] = ConfigMgr::GetBoolDefault("PlayerDump.DisallowOverwrite", true); + sScriptMgr->OnConfigLoad(reload); } @@ -1723,6 +1727,8 @@ void World::SetInitialWorldSettings() sLog->outString("Calculate random battleground reset time..." ); InitRandomBGResetTime(); + LoadCharacterNameData(); + // possibly enable db logging; avoid massive startup spam by doing it here. if (sLog->GetLogDBLater()) { @@ -2842,3 +2848,56 @@ void World::ProcessQueryCallbacks() } } } + +void World::LoadCharacterNameData() +{ + sLog->outString("Loading character name data"); + + QueryResult result = CharacterDatabase.Query("SELECT guid, name, race, gender, class FROM characters"); + if (!result) + { + sLog->outError("No character name data loaded, empty query"); + return; + } + + uint32 count = 0; + + do + { + Field *fields = result->Fetch(); + AddCharacterNameData(fields[0].GetUInt32(), fields[1].GetString(), + fields[3].GetUInt8() /*gender*/, fields[2].GetUInt8() /*race*/, fields[4].GetUInt8() /*class*/); + ++count; + } while (result->NextRow()); + + sLog->outString("Loaded name data for %u characters", count); +} + +void World::AddCharacterNameData(uint32 guid, const std::string& name, uint8 gender, uint8 race, uint8 playerClass) +{ + CharacterNameData& data = _characterNameDataMap[guid]; + data.m_name = name; + data.m_race = race; + data.m_gender = gender; + data.m_class = playerClass; +} + +void World::UpdateCharacterNameData(uint32 guid, const std::string& name, uint8 gender, uint8 race) +{ + std::map<uint32, CharacterNameData>::iterator itr = _characterNameDataMap.find(guid); + if (itr == _characterNameDataMap.end()) + return; + itr->second.m_name = name; + itr->second.m_gender = gender; + if(race != RACE_NONE) + itr->second.m_race = race; +} + +const CharacterNameData* World::GetCharacterNameData(uint32 guid) const +{ + std::map<uint32, CharacterNameData>::const_iterator itr = _characterNameDataMap.find(guid); + if (itr != _characterNameDataMap.end()) + return &itr->second; + else + return NULL; +} diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 75a3f674b19..06dc0066bb4 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -158,6 +158,8 @@ enum WorldBoolConfigs CONFIG_ALLOW_TICKETS, CONFIG_DBC_ENFORCE_ITEM_ATTRIBUTES, CONFIG_PRESERVE_CUSTOM_CHANNELS, + CONFIG_PDUMP_NO_PATHS, + CONFIG_PDUMP_NO_OVERWRITE, BOOL_CONFIG_VALUE_COUNT }; @@ -511,6 +513,14 @@ struct CliCommandHolder typedef UNORDERED_MAP<uint32, WorldSession*> SessionMap; +struct CharacterNameData +{ + std::string m_name; + uint8 m_class; + uint8 m_race; + uint8 m_gender; +}; + /// The World class World { @@ -729,6 +739,11 @@ class World bool isEventKillStart; + const CharacterNameData* GetCharacterNameData(uint32 guid) const; + void AddCharacterNameData(uint32 guid, const std::string& name, uint8 gender, uint8 race, uint8 playerClass); + void UpdateCharacterNameData(uint32 guid, const std::string& name, uint8 gender, uint8 race = RACE_NONE); + void DeleteCharaceterNameData(uint32 guid) { _characterNameDataMap.erase(guid); } + uint32 GetCleaningFlags() const { return m_CleaningFlags; } void SetCleaningFlags(uint32 flags) { m_CleaningFlags = flags; } protected: @@ -816,7 +831,9 @@ class World std::list<std::string> m_Autobroadcasts; - private: + std::map<uint32, CharacterNameData> _characterNameDataMap; + void LoadCharacterNameData(); + void ProcessQueryCallbacks(); ACE_Future_Set<PreparedQueryResult> m_realmCharCallbacks; }; diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 1b3454e5ae6..80dd2dc366a 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -60,7 +60,7 @@ public: return commandTable; } - static bool HandleAccountAddonCommand(ChatHandler* handler, const char* args) + static bool HandleAccountAddonCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -69,11 +69,11 @@ public: return false; } - char *szExp = strtok((char*)args, " "); + char* exp = strtok((char*)args, " "); - uint32 account_id = handler->GetSession()->GetAccountId(); + uint32 accountId = handler->GetSession()->GetAccountId(); - int expansion = atoi(szExp); //get int anyway (0 if error) + int expansion = atoi(exp); //get int anyway (0 if error) if (expansion < 0 || uint8(expansion) > sWorld->getIntConfig(CONFIG_EXPANSION)) { handler->SendSysMessage(LANG_IMPROPER_VALUE); @@ -82,78 +82,74 @@ public: } // No SQL injection - LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id); + LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, accountId); handler->PSendSysMessage(LANG_ACCOUNT_ADDON, expansion); return true; } /// Create an account - static bool HandleAccountCreateCommand(ChatHandler* handler, const char* args) + static bool HandleAccountCreateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; ///- %Parse the command line arguments - char *szAcc = strtok((char*)args, " "); - char *szPassword = strtok(NULL, " "); - if (!szAcc || !szPassword) + char* accountName = strtok((char*)args, " "); + char* password = strtok(NULL, " "); + if (!accountName || !password) return false; - // normalized in AccountMgr::CreateAccount - std::string account_name = szAcc; - std::string password = szPassword; - - AccountOpResult result = AccountMgr::CreateAccount(account_name, password); + AccountOpResult result = AccountMgr::CreateAccount(std::string(accountName), std::string(password)); switch (result) { - case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); - break; - case AOR_NAME_TOO_LONG: - handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG); - handler->SetSentErrorMessage(true); - return false; - case AOR_NAME_ALREDY_EXIST: - handler->SendSysMessage(LANG_ACCOUNT_ALREADY_EXIST); - handler->SetSentErrorMessage(true); - return false; - case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; - default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; + case AOR_OK: + handler->PSendSysMessage(LANG_ACCOUNT_CREATED, accountName); + break; + case AOR_NAME_TOO_LONG: + handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG); + handler->SetSentErrorMessage(true); + return false; + case AOR_NAME_ALREDY_EXIST: + handler->SendSysMessage(LANG_ACCOUNT_ALREADY_EXIST); + handler->SetSentErrorMessage(true); + return false; + case AOR_DB_INTERNAL_ERROR: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, accountName); + handler->SetSentErrorMessage(true); + return false; + default: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED, accountName); + handler->SetSentErrorMessage(true); + return false; } return true; } /// Delete a user account and all associated characters in this realm - /// \todo This function has to be enhanced to respect the login/realm split (delete char, delete account chars in realm, delete account chars in realm then delete account - static bool HandleAccountDeleteCommand(ChatHandler* handler, const char* args) + /// \todo This function has to be enhanced to respect the login/realm split (delete char, delete account chars in realm then delete account) + static bool HandleAccountDeleteCommand(ChatHandler* handler, char const* args) { if (!*args) return false; ///- Get the account name from the command line - char *account_name_str=strtok ((char*)args, " "); - if (!account_name_str) + char* account = strtok((char*)args, " "); + if (!account) return false; - std::string account_name = account_name_str; - if (!AccountMgr::normalizeString(account_name)) + std::string accountName = account; + if (!AccountMgr::normalizeString(accountName)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } - uint32 account_id = AccountMgr::GetId(account_name); - if (!account_id) + uint32 accountId = AccountMgr::GetId(accountName); + if (!accountId) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -161,34 +157,34 @@ public: /// Commands not recommended call from chat, but support anyway /// can delete only for account with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL, account_id, true)) + if (handler->HasLowerSecurityAccount(NULL, accountId, true)) return false; - AccountOpResult result = AccountMgr::DeleteAccount(account_id); + AccountOpResult result = AccountMgr::DeleteAccount(accountId); switch (result) { - case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); - break; - case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; - case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; - default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; + case AOR_OK: + handler->PSendSysMessage(LANG_ACCOUNT_DELETED, accountName.c_str()); + break; + case AOR_NAME_NOT_EXIST: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; + case AOR_DB_INTERNAL_ERROR: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; + default: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; } return true; } /// Display info on users currently in the realm - static bool HandleAccountOnlineListCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleAccountOnlineListCommand(ChatHandler* handler, char const* /*args*/) { ///- Get the list of accounts ID logged to the realm QueryResult resultDB = CharacterDatabase.Query("SELECT name, account, map, zone FROM characters WHERE online > 0"); @@ -218,6 +214,7 @@ public: "LEFT JOIN account_access aa " "ON (a.id = aa.id) " "WHERE a.id = '%u'", account); + if (resultLogin) { Field* fieldsLogin = resultLogin->Fetch(); @@ -229,13 +226,13 @@ public: else handler->PSendSysMessage(LANG_ACCOUNT_LIST_ERROR, name.c_str()); - }while (resultDB->NextRow()); + } while (resultDB->NextRow()); handler->SendSysMessage(LANG_ACCOUNT_LIST_BAR); return true; } - static bool HandleAccountLockCommand(ChatHandler* handler, const char* args) + static bool HandleAccountLockCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -244,15 +241,15 @@ public: return false; } - std::string argstr = (char*)args; - if (argstr == "on") + std::string param = (char*)args; + if (param == "on") { LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED); return true; } - if (argstr == "off") + if (param == "off") { LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED); @@ -264,7 +261,7 @@ public: return false; } - static bool HandleAccountPasswordCommand(ChatHandler* handler, const char* args) + static bool HandleAccountPasswordCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -273,95 +270,95 @@ public: return false; } - char *old_pass = strtok((char*)args, " "); - char *new_pass = strtok(NULL, " "); - char *new_pass_c = strtok(NULL, " "); + char* oldPassword = strtok((char*)args, " "); + char* newPassword = strtok(NULL, " "); + char* passwordConfirmation = strtok(NULL, " "); - if (!old_pass || !new_pass || !new_pass_c) + if (!oldPassword || !newPassword || !passwordConfirmation) { handler->SendSysMessage(LANG_CMD_SYNTAX); handler->SetSentErrorMessage(true); return false; } - if (!AccountMgr::CheckPassword(handler->GetSession()->GetAccountId(), std::string(old_pass))) + if (!AccountMgr::CheckPassword(handler->GetSession()->GetAccountId(), std::string(oldPassword))) { handler->SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD); handler->SetSentErrorMessage(true); return false; } - if (strcmp(new_pass, new_pass_c) != 0) + if (strcmp(newPassword, passwordConfirmation) != 0) { handler->SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH); handler->SetSentErrorMessage(true); return false; } - AccountOpResult result = AccountMgr::ChangePassword(handler->GetSession()->GetAccountId(), std::string(new_pass)); + AccountOpResult result = AccountMgr::ChangePassword(handler->GetSession()->GetAccountId(), std::string(newPassword)); switch (result) { - case AOR_OK: - handler->SendSysMessage(LANG_COMMAND_PASSWORD); - break; - case AOR_PASS_TOO_LONG: - handler->SendSysMessage(LANG_PASSWORD_TOO_LONG); - handler->SetSentErrorMessage(true); - return false; - default: - handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD); - handler->SetSentErrorMessage(true); - return false; + case AOR_OK: + handler->SendSysMessage(LANG_COMMAND_PASSWORD); + break; + case AOR_PASS_TOO_LONG: + handler->SendSysMessage(LANG_PASSWORD_TOO_LONG); + handler->SetSentErrorMessage(true); + return false; + default: + handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD); + handler->SetSentErrorMessage(true); + return false; } return true; } - static bool HandleAccountCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleAccountCommand(ChatHandler* handler, char const* /*args*/) { - AccountTypes gmlevel = handler->GetSession()->GetSecurity(); - handler->PSendSysMessage(LANG_ACCOUNT_LEVEL, uint32(gmlevel)); + AccountTypes gmLevel = handler->GetSession()->GetSecurity(); + handler->PSendSysMessage(LANG_ACCOUNT_LEVEL, uint32(gmLevel)); return true; } /// Set/Unset the expansion level for an account - static bool HandleAccountSetAddonCommand(ChatHandler* handler, const char *args) + static bool HandleAccountSetAddonCommand(ChatHandler* handler, char const* args) { ///- Get the command line arguments - char *szAcc = strtok((char*)args, " "); - char *szExp = strtok(NULL, " "); + char* account = strtok((char*)args, " "); + char* exp = strtok(NULL, " "); - if (!szAcc) + if (!account) return false; - std::string account_name; - uint32 account_id; + std::string accountName; + uint32 accountId; - if (!szExp) + if (!exp) { Player* player = handler->getSelectedPlayer(); if (!player) return false; - account_id = player->GetSession()->GetAccountId(); - AccountMgr::GetName(account_id, account_name); - szExp = szAcc; + accountId = player->GetSession()->GetAccountId(); + AccountMgr::GetName(accountId, accountName); + exp = account; } else { ///- Convert Account name to Upper Format - account_name = szAcc; - if (!AccountMgr::normalizeString(account_name)) + accountName = account; + if (!AccountMgr::normalizeString(accountName)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } - account_id = AccountMgr::GetId(account_name); - if (!account_id) + accountId = AccountMgr::GetId(accountName); + if (!accountId) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -370,21 +367,21 @@ public: // Let set addon state only for lesser (strong) security level // or to self account - if (handler->GetSession() && handler->GetSession()->GetAccountId () != account_id && - handler->HasLowerSecurityAccount (NULL, account_id, true)) + if (handler->GetSession() && handler->GetSession()->GetAccountId () != accountId && + handler->HasLowerSecurityAccount(NULL, accountId, true)) return false; - int expansion = atoi(szExp); //get int anyway (0 if error) + int expansion = atoi(exp); //get int anyway (0 if error) if (expansion < 0 || uint8(expansion) > sWorld->getIntConfig(CONFIG_EXPANSION)) return false; // No SQL injection - LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id); - handler->PSendSysMessage(LANG_ACCOUNT_SETADDON, account_name.c_str(), account_id, expansion); + LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, accountId); + handler->PSendSysMessage(LANG_ACCOUNT_SETADDON, accountName.c_str(), accountId, expansion); return true; } - static bool HandleAccountSetGmLevelCommand(ChatHandler* handler, const char *args) + static bool HandleAccountSetGmLevelCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -433,16 +430,16 @@ public: // handler->getSession() == NULL only for console targetAccountId = (isAccountNameGiven) ? AccountMgr::GetId(targetAccountName) : handler->getSelectedPlayer()->GetSession()->GetAccountId(); int32 gmRealmID = (isAccountNameGiven) ? atoi(arg3) : atoi(arg2); - uint32 plSecurity; + uint32 playerSecurity; if (handler->GetSession()) - plSecurity = AccountMgr::GetSecurity(handler->GetSession()->GetAccountId(), gmRealmID); + playerSecurity = AccountMgr::GetSecurity(handler->GetSession()->GetAccountId(), gmRealmID); else - plSecurity = SEC_CONSOLE; + playerSecurity = SEC_CONSOLE; // can set security level only for target with less security and to less security that we have // This is also reject self apply in fact targetSecurity = AccountMgr::GetSecurity(targetAccountId, gmRealmID); - if (targetSecurity >= plSecurity || gm >= plSecurity) + if (targetSecurity >= playerSecurity || gm >= playerSecurity) { handler->SendSysMessage(LANG_YOURS_SECURITY_IS_LOW); handler->SetSentErrorMessage(true); @@ -450,7 +447,7 @@ public: } // Check and abort if the target gm has a higher rank on one of the realms and the new realm is -1 - if (gmRealmID == -1 && !AccountMgr::IsConsoleAccount(plSecurity)) + if (gmRealmID == -1 && !AccountMgr::IsConsoleAccount(playerSecurity)) { QueryResult result = LoginDatabase.PQuery("SELECT * FROM account_access WHERE id = '%u' AND gmlevel > '%d'", targetAccountId, gm); if (result) @@ -477,72 +474,74 @@ public: if (gm != 0) LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', '%d')", targetAccountId, gm, realmID); + handler->PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm); return true; } /// Set password for account - static bool HandleAccountSetPasswordCommand(ChatHandler* handler, const char *args) + static bool HandleAccountSetPasswordCommand(ChatHandler* handler, char const* args) { if (!*args) return false; ///- Get the command line arguments - char *szAccount = strtok ((char*)args, " "); - char *szPassword1 = strtok (NULL, " "); - char *szPassword2 = strtok (NULL, " "); + char* account = strtok((char*)args, " "); + char* password = strtok(NULL, " "); + char* passwordConfirmation = strtok(NULL, " "); - if (!szAccount||!szPassword1 || !szPassword2) + if (!account || !password || !passwordConfirmation) return false; - std::string account_name = szAccount; - if (!AccountMgr::normalizeString(account_name)) + std::string accountName = account; + if (!AccountMgr::normalizeString(accountName)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } - uint32 targetAccountId = AccountMgr::GetId(account_name); + uint32 targetAccountId = AccountMgr::GetId(accountName); if (!targetAccountId) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); handler->SetSentErrorMessage(true); return false; } /// can set password only for target with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL, targetAccountId, true)) + if (handler->HasLowerSecurityAccount(NULL, targetAccountId, true)) return false; - if (strcmp(szPassword1, szPassword2)) + if (strcmp(password, passwordConfirmation)) { - handler->SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH); - handler->SetSentErrorMessage (true); + handler->SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH); + handler->SetSentErrorMessage(true); return false; } - AccountOpResult result = AccountMgr::ChangePassword(targetAccountId, szPassword1); + AccountOpResult result = AccountMgr::ChangePassword(targetAccountId, password); switch (result) { - case AOR_OK: - handler->SendSysMessage(LANG_COMMAND_PASSWORD); - break; - case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); - handler->SetSentErrorMessage(true); - return false; - case AOR_PASS_TOO_LONG: - handler->SendSysMessage(LANG_PASSWORD_TOO_LONG); - handler->SetSentErrorMessage(true); - return false; - default: - handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD); - handler->SetSentErrorMessage(true); - return false; + case AOR_OK: + handler->SendSysMessage(LANG_COMMAND_PASSWORD); + break; + case AOR_NAME_NOT_EXIST: + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; + case AOR_PASS_TOO_LONG: + handler->SendSysMessage(LANG_PASSWORD_TOO_LONG); + handler->SetSentErrorMessage(true); + return false; + default: + handler->SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD); + handler->SetSentErrorMessage(true); + return false; } + return true; } }; diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index 88e07a07fe7..61ce13f0ecb 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -45,7 +45,7 @@ public: return commandTable; } - static bool HandleAchievementAddCommand(ChatHandler* handler, const char *args) + static bool HandleAchievementAddCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -53,8 +53,8 @@ public: uint32 achievementId = atoi((char*)args); if (!achievementId) { - if (char* cId = handler->extractKeyFromLink((char*)args, "Hachievement")) - achievementId = atoi(cId); + if (char* id = handler->extractKeyFromLink((char*)args, "Hachievement")) + achievementId = atoi(id); if (!achievementId) return false; } @@ -67,8 +67,8 @@ public: return false; } - if (AchievementEntry const* pAE = GetAchievementStore()->LookupEntry(achievementId)) - target->CompletedAchievement(pAE); + if (AchievementEntry const* achievementEntry = GetAchievementStore()->LookupEntry(achievementId)) + target->CompletedAchievement(achievementEntry); return true; } diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index dca2f1e4f0e..11e46a8c878 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -98,7 +98,7 @@ public: return commandTable; } - static bool HandleDebugPlayCinematicCommand(ChatHandler* handler, const char* args) + static bool HandleDebugPlayCinematicCommand(ChatHandler* handler, char const* args) { // USAGE: .debug play cinematic #cinematicid // #cinematicid - ID decimal number from CinemaicSequences.dbc (1st column) @@ -109,20 +109,20 @@ public: return false; } - uint32 dwId = atoi((char*)args); + uint32 id = atoi((char*)args); - if (!sCinematicSequencesStore.LookupEntry(dwId)) + if (!sCinematicSequencesStore.LookupEntry(id)) { - handler->PSendSysMessage(LANG_CINEMATIC_NOT_EXIST, dwId); + handler->PSendSysMessage(LANG_CINEMATIC_NOT_EXIST, id); handler->SetSentErrorMessage(true); return false; } - handler->GetSession()->GetPlayer()->SendCinematicStart(dwId); + handler->GetSession()->GetPlayer()->SendCinematicStart(id); return true; } - static bool HandleDebugPlayMovieCommand(ChatHandler* handler, const char* args) + static bool HandleDebugPlayMovieCommand(ChatHandler* handler, char const* args) { // USAGE: .debug play movie #movieid // #movieid - ID decimal number from Movie.dbc (1st column) @@ -133,21 +133,21 @@ public: return false; } - uint32 dwId = atoi((char*)args); + uint32 id = atoi((char*)args); - if (!sMovieStore.LookupEntry(dwId)) + if (!sMovieStore.LookupEntry(id)) { - handler->PSendSysMessage(LANG_MOVIE_NOT_EXIST, dwId); + handler->PSendSysMessage(LANG_MOVIE_NOT_EXIST, id); handler->SetSentErrorMessage(true); return false; } - handler->GetSession()->GetPlayer()->SendMovieStart(dwId); + handler->GetSession()->GetPlayer()->SendMovieStart(id); return true; } //Play sound - static bool HandleDebugPlaySoundCommand(ChatHandler* handler, const char* args) + static bool HandleDebugPlaySoundCommand(ChatHandler* handler, char const* args) { // USAGE: .debug playsound #soundid // #soundid - ID decimal number from SoundEntries.dbc (1st column) @@ -158,11 +158,11 @@ public: return false; } - uint32 dwSoundId = atoi((char*)args); + uint32 soundId = atoi((char*)args); - if (!sSoundEntriesStore.LookupEntry(dwSoundId)) + if (!sSoundEntriesStore.LookupEntry(soundId)) { - handler->PSendSysMessage(LANG_SOUND_NOT_EXIST, dwSoundId); + handler->PSendSysMessage(LANG_SOUND_NOT_EXIST, soundId); handler->SetSentErrorMessage(true); return false; } @@ -176,48 +176,48 @@ public: } if (handler->GetSession()->GetPlayer()->GetSelection()) - unit->PlayDistanceSound(dwSoundId, handler->GetSession()->GetPlayer()); + unit->PlayDistanceSound(soundId, handler->GetSession()->GetPlayer()); else - unit->PlayDirectSound(dwSoundId, handler->GetSession()->GetPlayer()); + unit->PlayDirectSound(soundId, handler->GetSession()->GetPlayer()); - handler->PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId); + handler->PSendSysMessage(LANG_YOU_HEAR_SOUND, soundId); return true; } - static bool HandleDebugSendSpellFailCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendSpellFailCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* px = strtok((char*)args, " "); - if (!px) + char* result = strtok((char*)args, " "); + if (!result) return false; - uint8 failnum = (uint8)atoi(px); - if (failnum == 0 && *px != '0') + uint8 failNum = (uint8)atoi(result); + if (failNum == 0 && *result != '0') return false; - char* p1 = strtok(NULL, " "); - uint8 failarg1 = p1 ? (uint8)atoi(p1) : 0; + char* fail1 = strtok(NULL, " "); + uint8 failArg1 = fail1 ? (uint8)atoi(fail1) : 0; - char* p2 = strtok(NULL, " "); - uint8 failarg2 = p2 ? (uint8)atoi(p2) : 0; + char* fail2 = strtok(NULL, " "); + uint8 failArg2 = fail2 ? (uint8)atoi(fail2) : 0; WorldPacket data(SMSG_CAST_FAILED, 5); data << uint8(0); data << uint32(133); - data << uint8(failnum); - if (p1 || p2) - data << uint32(failarg1); - if (p2) - data << uint32(failarg2); + data << uint8(failNum); + if (fail1 || fail2) + data << uint32(failArg1); + if (fail2) + data << uint32(failArg2); handler->GetSession()->SendPacket(&data); return true; } - static bool HandleDebugSendEquipErrorCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendEquipErrorCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -227,7 +227,7 @@ public: return true; } - static bool HandleDebugSendSellErrorCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendSellErrorCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -237,7 +237,7 @@ public: return true; } - static bool HandleDebugSendBuyErrorCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendBuyErrorCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -247,7 +247,7 @@ public: return true; } - static bool HandleDebugSendOpcodeCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugSendOpcodeCommand(ChatHandler* handler, char const* /*args*/) { Unit* unit = handler->getSelectedUnit(); Player* player = NULL; @@ -255,7 +255,9 @@ public: player = handler->GetSession()->GetPlayer(); else player = (Player*)unit; - if (!unit) unit = player; + + if (!unit) + unit = player; std::ifstream ifs("opcode.txt"); if (ifs.bad()) @@ -296,9 +298,7 @@ public: } // regular data else - { ifs.putback(commentToken[1]); - } } parsedStream.put(commentToken[0]); } @@ -418,7 +418,7 @@ public: return true; } - static bool HandleDebugUpdateWorldStateCommand(ChatHandler* handler, const char* args) + static bool HandleDebugUpdateWorldStateCommand(ChatHandler* handler, char const* args) { char* w = strtok((char*)args, " "); char* s = strtok(NULL, " "); @@ -432,14 +432,16 @@ public: return true; } - static bool HandleDebugAreaTriggersCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugAreaTriggersCommand(ChatHandler* handler, char const* /*args*/) { Player* player = handler->GetSession()->GetPlayer(); if (!player->isDebugAreaTriggers) { handler->PSendSysMessage(LANG_DEBUG_AREATRIGGER_ON); player->isDebugAreaTriggers = true; - } else { + } + else + { handler->PSendSysMessage(LANG_DEBUG_AREATRIGGER_OFF); player->isDebugAreaTriggers = false; } @@ -447,12 +449,12 @@ public: } //Send notification in channel - static bool HandleDebugSendChannelNotifyCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendChannelNotifyCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - const char *name = "test"; + char const* name = "test"; uint8 code = atoi(args); WorldPacket data(SMSG_CHANNEL_NOTIFY, (1+10)); @@ -465,12 +467,12 @@ public: } //Send notification in chat - static bool HandleDebugSendChatMsgCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendChatMsgCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - const char *msg = "testtest"; + char const* msg = "testtest"; uint8 type = atoi(args); WorldPacket data; ChatHandler::FillMessageData(&data, handler->GetSession(), type, 0, "chan", handler->GetSession()->GetPlayer()->GetGUID(), msg, handler->GetSession()->GetPlayer()); @@ -478,54 +480,64 @@ public: return true; } - static bool HandleDebugSendQuestPartyMsgCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendQuestPartyMsgCommand(ChatHandler* handler, char const* args) { uint32 msg = atol((char*)args); handler->GetSession()->GetPlayer()->SendPushToPartyResponse(handler->GetSession()->GetPlayer(), msg); return true; } - static bool HandleDebugGetLootRecipientCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugGetLootRecipientCommand(ChatHandler* handler, char const* /*args*/) { Creature* target = handler->getSelectedCreature(); if (!target) return false; - handler->PSendSysMessage("Loot recipient for creature %s (GUID %u, DB GUID %u) is %s", target->GetName(), target->GetGUIDLow(), target->GetDBTableGUIDLow(), target->hasLootRecipient()?(target->GetLootRecipient()?target->GetLootRecipient()->GetName():"offline"):"no loot recipient"); + handler->PSendSysMessage("Loot recipient for creature %s (GUID %u, DB GUID %u) is %s", target->GetName(), target->GetGUIDLow(), target->GetDBTableGUIDLow(), target->hasLootRecipient() ? (target->GetLootRecipient() ? target->GetLootRecipient()->GetName() : "offline") : "no loot recipient"); return true; } - static bool HandleDebugSendQuestInvalidMsgCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendQuestInvalidMsgCommand(ChatHandler* handler, char const* args) { uint32 msg = atol((char*)args); handler->GetSession()->GetPlayer()->SendCanTakeQuestResponse(msg); return true; } - static bool HandleDebugGetItemStateCommand(ChatHandler* handler, const char* args) + static bool HandleDebugGetItemStateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - std::string state_str = args; + std::string itemState = args; ItemUpdateState state = ITEM_UNCHANGED; - bool list_queue = false, check_all = false; - if (state_str == "unchanged") state = ITEM_UNCHANGED; - else if (state_str == "changed") state = ITEM_CHANGED; - else if (state_str == "new") state = ITEM_NEW; - else if (state_str == "removed") state = ITEM_REMOVED; - else if (state_str == "queue") list_queue = true; - else if (state_str == "check_all") check_all = true; - else return false; + bool listQueue = false; + bool checkAll = false; + + if (itemState == "unchanged") + state = ITEM_UNCHANGED; + else if (itemState == "changed") + state = ITEM_CHANGED; + else if (itemState == "new") + state = ITEM_NEW; + else if (itemState == "removed") + state = ITEM_REMOVED; + else if (itemState == "queue") + listQueue = true; + else if (itemState == "check_all") + checkAll = true; + else + return false; Player* player = handler->getSelectedPlayer(); - if (!player) player = handler->GetSession()->GetPlayer(); + if (!player) + player = handler->GetSession()->GetPlayer(); - if (!list_queue && !check_all) + if (!listQueue && !checkAll) { - state_str = "The player has the following " + state_str + " items: "; - handler->SendSysMessage(state_str.c_str()); + itemState = "The player has the following " + itemState + " items: "; + handler->SendSysMessage(itemState.c_str()); for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) @@ -546,60 +558,73 @@ public: } } - if (list_queue) + if (listQueue) { - std::vector<Item*> &updateQueue = player->GetItemUpdateQueue(); + std::vector<Item*>& updateQueue = player->GetItemUpdateQueue(); for (size_t i = 0; i < updateQueue.size(); ++i) { Item* item = updateQueue[i]; - if (!item) continue; + if (!item) + continue; Bag* container = item->GetContainer(); - uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); + uint8 bagSlot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); std::string st; switch (item->GetState()) { - case ITEM_UNCHANGED: st = "unchanged"; break; - case ITEM_CHANGED: st = "changed"; break; - case ITEM_NEW: st = "new"; break; - case ITEM_REMOVED: st = "removed"; break; + case ITEM_UNCHANGED: + st = "unchanged"; + break; + case ITEM_CHANGED: + st = "changed"; + break; + case ITEM_NEW: + st = "new"; + break; + case ITEM_REMOVED: + st = "removed"; + break; } - handler->PSendSysMessage("bag: %d slot: %d guid: %d - state: %s", bag_slot, item->GetSlot(), item->GetGUIDLow(), st.c_str()); + handler->PSendSysMessage("bag: %d slot: %d guid: %d - state: %s", bagSlot, item->GetSlot(), item->GetGUIDLow(), st.c_str()); } if (updateQueue.empty()) handler->PSendSysMessage("The player's updatequeue is empty"); } - if (check_all) + if (checkAll) { bool error = false; - std::vector<Item*> &updateQueue = player->GetItemUpdateQueue(); + std::vector<Item*>& updateQueue = player->GetItemUpdateQueue(); for (uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i) { if (i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END) continue; Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i); - if (!item) continue; + if (!item) + continue; if (item->GetSlot() != i) { handler->PSendSysMessage("Item with slot %d and guid %d has an incorrect slot value: %d", i, item->GetGUIDLow(), item->GetSlot()); - error = true; continue; + error = true; + continue; } if (item->GetOwnerGUID() != player->GetGUID()) { handler->PSendSysMessage("The item with slot %d and itemguid %d does have non-matching owner guid (%d) and player guid (%d) !", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (Bag* container = item->GetContainer()) { handler->PSendSysMessage("The item with slot %d and guid %d has a container (slot: %d, guid: %d) but shouldn't!", item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (item->IsInUpdateQueue()) @@ -608,25 +633,29 @@ public: if (qp > updateQueue.size()) { handler->PSendSysMessage("The item with slot %d and guid %d has its queuepos (%d) larger than the update queue size! ", item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; + error = true; + continue; } if (updateQueue[qp] == NULL) { handler->PSendSysMessage("The item with slot %d and guid %d has its queuepos (%d) pointing to NULL in the queue!", item->GetSlot(), item->GetGUIDLow(), qp); - error = true; continue; + error = true; + continue; } if (updateQueue[qp] != item) { handler->PSendSysMessage("The item with slot %d and guid %d has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); - error = true; continue; + error = true; + continue; } } else if (item->GetState() != ITEM_UNCHANGED) { handler->PSendSysMessage("The item with slot %d and guid %d is not in queue but should be (state: %d)!", item->GetSlot(), item->GetGUIDLow(), item->GetState()); - error = true; continue; + error = true; + continue; } if (Bag* bag = item->ToBag()) @@ -634,31 +663,36 @@ public: for (uint8 j = 0; j < bag->GetBagSize(); ++j) { Item* item2 = bag->GetItemByPos(j); - if (!item2) continue; + if (!item2) + continue; if (item2->GetSlot() != j) { handler->PSendSysMessage("The item in bag %d and slot %d (guid: %d) has an incorrect slot value: %d", bag->GetSlot(), j, item2->GetGUIDLow(), item2->GetSlot()); - error = true; continue; + error = true; + continue; } if (item2->GetOwnerGUID() != player->GetGUID()) { handler->PSendSysMessage("The item in bag %d at slot %d and with itemguid %d, the owner's guid (%d) and the player's guid (%d) don't match!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), GUID_LOPART(item2->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; + error = true; + continue; } Bag* container = item2->GetContainer(); if (!container) { handler->PSendSysMessage("The item in bag %d at slot %d with guid %d has no container!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (container != bag) { handler->PSendSysMessage("The item in bag %d at slot %d with guid %d has a different container(slot %d guid %d)!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (item2->IsInUpdateQueue()) @@ -667,25 +701,29 @@ public: if (qp > updateQueue.size()) { handler->PSendSysMessage("The item in bag %d at slot %d having guid %d has a queuepos (%d) larger than the update queue size! ", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp); - error = true; continue; + error = true; + continue; } if (updateQueue[qp] == NULL) { handler->PSendSysMessage("The item in bag %d at slot %d having guid %d has a queuepos (%d) that points to NULL in the queue!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp); - error = true; continue; + error = true; + continue; } if (updateQueue[qp] != item2) { handler->PSendSysMessage("The item in bag %d at slot %d having guid %d has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow()); - error = true; continue; + error = true; + continue; } } else if (item2->GetState() != ITEM_UNCHANGED) { handler->PSendSysMessage("The item in bag %d at slot %d having guid %d is not in queue but should be (state: %d)!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), item2->GetState()); - error = true; continue; + error = true; + continue; } } } @@ -694,33 +732,40 @@ public: for (size_t i = 0; i < updateQueue.size(); ++i) { Item* item = updateQueue[i]; - if (!item) continue; + if (!item) + continue; if (item->GetOwnerGUID() != player->GetGUID()) { handler->PSendSysMessage("queue(" SIZEFMTD "): For the item with guid %d, the owner's guid (%d) and the player's guid (%d) don't match!", i, item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (item->GetQueuePos() != i) { handler->PSendSysMessage("queue(" SIZEFMTD "): For the item with guid %d, the queuepos doesn't match it's position in the queue!", i, item->GetGUIDLow()); - error = true; continue; + error = true; + continue; } - if (item->GetState() == ITEM_REMOVED) continue; + if (item->GetState() == ITEM_REMOVED) + continue; + Item* test = player->GetItemByPos(item->GetBagSlot(), item->GetSlot()); if (test == NULL) { handler->PSendSysMessage("queue(" SIZEFMTD "): The bag(%d) and slot(%d) values for the item with guid %d are incorrect, the player doesn't have any item at that position!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow()); - error = true; continue; + error = true; + continue; } if (test != item) { handler->PSendSysMessage("queue(" SIZEFMTD "): The bag(%d) and slot(%d) values for the item with guid %d are incorrect, an item which guid is %d is there instead!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), test->GetGUIDLow()); - error = true; continue; + error = true; + continue; } } if (!error) @@ -730,54 +775,54 @@ public: return true; } - static bool HandleDebugBattlegroundCommand(ChatHandler* /*handler*/, const char* /*args*/) + static bool HandleDebugBattlegroundCommand(ChatHandler* /*handler*/, char const* /*args*/) { sBattlegroundMgr->ToggleTesting(); return true; } - static bool HandleDebugArenaCommand(ChatHandler* /*handler*/, const char* /*args*/) + static bool HandleDebugArenaCommand(ChatHandler* /*handler*/, char const* /*args*/) { sBattlegroundMgr->ToggleArenaTesting(); return true; } - static bool HandleDebugThreatListCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugThreatListCommand(ChatHandler* handler, char const* /*args*/) { Creature* target = handler->getSelectedCreature(); if (!target || target->isTotem() || target->isPet()) return false; - std::list<HostileReference*>& tlist = target->getThreatManager().getThreatList(); + std::list<HostileReference*>& threatList = target->getThreatManager().getThreatList(); std::list<HostileReference*>::iterator itr; - uint32 cnt = 0; + uint32 count = 0; handler->PSendSysMessage("Threat list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); - for (itr = tlist.begin(); itr != tlist.end(); ++itr) + for (itr = threatList.begin(); itr != threatList.end(); ++itr) { Unit* unit = (*itr)->getTarget(); if (!unit) continue; - ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); + ++count; + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", count, unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); } handler->SendSysMessage("End of threat list."); return true; } - static bool HandleDebugHostileRefListCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugHostileRefListCommand(ChatHandler* handler, char const* /*args*/) { Unit* target = handler->getSelectedUnit(); if (!target) target = handler->GetSession()->GetPlayer(); HostileReference* ref = target->getHostileRefManager().getFirst(); - uint32 cnt = 0; + uint32 count = 0; handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); while (ref) { if (Unit* unit = ref->getSource()->getOwner()) { - ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); + ++count; + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", count, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); } ref = ref->next(); } @@ -785,7 +830,7 @@ public: return true; } - static bool HandleDebugSetVehicleIdCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSetVehicleIdCommand(ChatHandler* handler, char const* args) { Unit* target = handler->getSelectedUnit(); if (!target || target->IsVehicle()) @@ -804,7 +849,7 @@ public: return true; } - static bool HandleDebugEnterVehicleCommand(ChatHandler* handler, const char* args) + static bool HandleDebugEnterVehicleCommand(ChatHandler* handler, char const* args) { Unit* target = handler->getSelectedUnit(); if (!target || !target->IsVehicle()) @@ -839,7 +884,7 @@ public: return true; } - static bool HandleDebugSpawnVehicleCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSpawnVehicleCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -885,7 +930,7 @@ public: return true; } - static bool HandleDebugSendLargePacketCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDebugSendLargePacketCommand(ChatHandler* handler, char const* /*args*/) { const char* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. "; std::ostringstream ss; @@ -895,7 +940,7 @@ public: return true; } - static bool HandleDebugSendSetPhaseShiftCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSendSetPhaseShiftCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -905,7 +950,7 @@ public: return true; } - static bool HandleDebugGetItemValueCommand(ChatHandler* handler, const char* args) + static bool HandleDebugGetItemValueCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -934,7 +979,7 @@ public: return true; } - static bool HandleDebugSetItemValueCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSetItemValueCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -963,7 +1008,7 @@ public: return true; } - static bool HandleDebugItemExpireCommand(ChatHandler* handler, const char* args) + static bool HandleDebugItemExpireCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -986,17 +1031,17 @@ public: } //show animation - static bool HandleDebugAnimCommand(ChatHandler* handler, const char* args) + static bool HandleDebugAnimCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - uint32 anim_id = atoi((char*)args); - handler->GetSession()->GetPlayer()->HandleEmoteCommand(anim_id); + uint32 animId = atoi((char*)args); + handler->GetSession()->GetPlayer()->HandleEmoteCommand(animId); return true; } - static bool HandleDebugSetAuraStateCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSetAuraStateCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -1026,16 +1071,16 @@ public: return true; } - static bool HandleDebugSetValueCommand(ChatHandler* handler, const char* args) + static bool HandleDebugSetValueCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); - char* pz = strtok(NULL, " "); + char* x = strtok((char*)args, " "); + char* y = strtok(NULL, " "); + char* z = strtok(NULL, " "); - if (!px || !py) + if (!x || !y) return false; WorldObject* target = handler->getSelectedObject(); @@ -1048,41 +1093,42 @@ public: uint64 guid = target->GetGUID(); - uint32 Opcode = (uint32)atoi(px); - if (Opcode >= target->GetValuesCount()) + uint32 opcode = (uint32)atoi(x); + if (opcode >= target->GetValuesCount()) { - handler->PSendSysMessage(LANG_TOO_BIG_INDEX, Opcode, GUID_LOPART(guid), target->GetValuesCount()); + handler->PSendSysMessage(LANG_TOO_BIG_INDEX, opcode, GUID_LOPART(guid), target->GetValuesCount()); return false; } - bool isint32 = true; - if (pz) - isint32 = (bool)atoi(pz); - if (isint32) + bool isInt32 = true; + if (z) + isInt32 = (bool)atoi(z); + + if (isInt32) { - uint32 iValue = (uint32)atoi(py); - target->SetUInt32Value(Opcode, iValue); - handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); + uint32 value = (uint32)atoi(y); + target->SetUInt32Value(opcode , value); + handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), opcode, value); } else { - float fValue = (float)atof(py); - target->SetFloatValue(Opcode, fValue); - handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); + float value = (float)atof(y); + target->SetFloatValue(opcode , value); + handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), opcode, value); } return true; } - static bool HandleDebugGetValueCommand(ChatHandler* handler, const char* args) + static bool HandleDebugGetValueCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* px = strtok((char*)args, " "); - char* pz = strtok(NULL, " "); + char* x = strtok((char*)args, " "); + char* z = strtok(NULL, " "); - if (!px) + if (!x) return false; Unit* target = handler->getSelectedUnit(); @@ -1095,62 +1141,62 @@ public: uint64 guid = target->GetGUID(); - uint32 Opcode = (uint32)atoi(px); - if (Opcode >= target->GetValuesCount()) + uint32 opcode = (uint32)atoi(x); + if (opcode >= target->GetValuesCount()) { - handler->PSendSysMessage(LANG_TOO_BIG_INDEX, Opcode, GUID_LOPART(guid), target->GetValuesCount()); + handler->PSendSysMessage(LANG_TOO_BIG_INDEX, opcode, GUID_LOPART(guid), target->GetValuesCount()); return false; } - bool isint32 = true; - if (pz) - isint32 = (bool)atoi(pz); + bool isInt32 = true; + if (z) + isInt32 = (bool)atoi(z); - if (isint32) + if (isInt32) { - uint32 iValue = target->GetUInt32Value(Opcode); - handler->PSendSysMessage(LANG_GET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); + uint32 value = target->GetUInt32Value(opcode); + handler->PSendSysMessage(LANG_GET_UINT_FIELD, GUID_LOPART(guid), opcode, value); } else { - float fValue = target->GetFloatValue(Opcode); - handler->PSendSysMessage(LANG_GET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); + float value = target->GetFloatValue(opcode); + handler->PSendSysMessage(LANG_GET_FLOAT_FIELD, GUID_LOPART(guid), opcode, value); } return true; } - static bool HandleDebugMod32ValueCommand(ChatHandler* handler, const char* args) + static bool HandleDebugMod32ValueCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); + char* x = strtok((char*)args, " "); + char* y = strtok(NULL, " "); - if (!px || !py) + if (!x || !y) return false; - uint32 Opcode = (uint32)atoi(px); - int Value = atoi(py); + uint32 opcode = (uint32)atoi(x); + int value = atoi(y); - if (Opcode >= handler->GetSession()->GetPlayer()->GetValuesCount()) + if (opcode >= handler->GetSession()->GetPlayer()->GetValuesCount()) { - handler->PSendSysMessage(LANG_TOO_BIG_INDEX, Opcode, handler->GetSession()->GetPlayer()->GetGUIDLow(), handler->GetSession()->GetPlayer()->GetValuesCount()); + handler->PSendSysMessage(LANG_TOO_BIG_INDEX, opcode, handler->GetSession()->GetPlayer()->GetGUIDLow(), handler->GetSession()->GetPlayer()->GetValuesCount()); return false; } - int CurrentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(Opcode); + int currentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(opcode); - CurrentValue += Value; - handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode, (uint32)CurrentValue); + currentValue += value; + handler->GetSession()->GetPlayer()->SetUInt32Value(opcode , (uint32)currentValue); - handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); + handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, opcode, currentValue); return true; } - static bool HandleDebugUpdateCommand(ChatHandler* handler, const char* args) + static bool HandleDebugUpdateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -1158,49 +1204,48 @@ public: uint32 updateIndex; uint32 value; - char* pUpdateIndex = strtok((char*)args, " "); + char* index = strtok((char*)args, " "); - Unit* chr = handler->getSelectedUnit(); - if (chr == NULL) + Unit* unit = handler->getSelectedUnit(); + if (!unit) { handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); handler->SetSentErrorMessage(true); return false; } - if (!pUpdateIndex) - { + if (!index) return true; - } - updateIndex = atoi(pUpdateIndex); + + updateIndex = atoi(index); //check updateIndex - if (chr->GetTypeId() == TYPEID_PLAYER) - { - if (updateIndex >= PLAYER_END) return true; - } - else + if (unit->GetTypeId() == TYPEID_PLAYER) { - if (updateIndex >= UNIT_END) return true; + if (updateIndex >= PLAYER_END) + return true; } + else if (updateIndex >= UNIT_END) + return true; - char* pvalue = strtok(NULL, " "); - if (!pvalue) + char* val = strtok(NULL, " "); + if (!val) { - value=chr->GetUInt32Value(updateIndex); + value = unit->GetUInt32Value(updateIndex); - handler->PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(), updateIndex, value); + handler->PSendSysMessage(LANG_UPDATE, unit->GetGUIDLow(), updateIndex, value); return true; } - value=atoi(pvalue); + value = atoi(val); - handler->PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(), updateIndex, value); + handler->PSendSysMessage(LANG_UPDATE_CHANGE, unit->GetGUIDLow(), updateIndex, value); - chr->SetUInt32Value(updateIndex, value); + unit->SetUInt32Value(updateIndex, value); return true; } - static bool HandleDebugSet32BitCommand(ChatHandler* handler, const char* args) + + static bool HandleDebugSet32BitCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -1213,21 +1258,21 @@ public: return false; } - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); + char* x = strtok((char*)args, " "); + char* y = strtok(NULL, " "); - if (!px || !py) + if (!x || !y) return false; - uint32 Opcode = (uint32)atoi(px); - uint32 Value = (uint32)atoi(py); - if (Value > 32) //uint32 = 32 bits + uint32 opcode = (uint32)atoi(x); + uint32 val = (uint32)atoi(y); + if (val > 32) //uint32 = 32 bits return false; - uint32 iValue = Value ? 1 << (Value - 1) : 0; - target->SetUInt32Value(Opcode, iValue); + uint32 value = val ? 1 << (val - 1) : 0; + target->SetUInt32Value(opcode, value); - handler->PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue); + handler->PSendSysMessage(LANG_SET_32BIT_FIELD, opcode, value); return true; } }; diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 20ade38d676..3bd745df4f4 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -49,7 +49,7 @@ public: return commandTable; } - static bool HandleEventActiveListCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleEventActiveListCommand(ChatHandler* handler, char const* /*args*/) { uint32 counter = 0; @@ -60,13 +60,13 @@ public: for (GameEventMgr::ActiveEvents::const_iterator itr = activeEvents.begin(); itr != activeEvents.end(); ++itr) { - uint32 event_id = *itr; - GameEventData const& eventData = events[event_id]; + uint32 eventId = *itr; + GameEventData const& eventData = events[eventId]; if (handler->GetSession()) - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, event_id, event_id, eventData.description.c_str(), active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, eventId, eventId, eventData.description.c_str(), active); else - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, event_id, eventData.description.c_str(), active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, eventId, eventData.description.c_str(), active); ++counter; } @@ -78,28 +78,28 @@ public: return true; } - static bool HandleEventInfoCommand(ChatHandler* handler, const char* args) + static bool HandleEventInfoCommand(ChatHandler* handler, char const* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameevent"); + if (!id) return false; - uint32 event_id = atoi(cId); + uint32 eventId = atoi(id); GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap(); - if (event_id >=events.size()) + if (eventId >= events.size()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); handler->SetSentErrorMessage(true); return false; } - GameEventData const& eventData = events[event_id]; + GameEventData const& eventData = events[eventId]; if (!eventData.isValid()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); @@ -108,47 +108,47 @@ public: } GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); - bool active = activeEvents.find(event_id) != activeEvents.end(); + bool active = activeEvents.find(eventId) != activeEvents.end(); char const* activeStr = active ? handler->GetTrinityString(LANG_ACTIVE) : ""; std::string startTimeStr = TimeToTimestampStr(eventData.start); std::string endTimeStr = TimeToTimestampStr(eventData.end); - uint32 delay = sGameEventMgr->NextCheck(event_id); - time_t nextTime = time(NULL)+delay; - std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-"; + uint32 delay = sGameEventMgr->NextCheck(eventId); + time_t nextTime = time(NULL) + delay; + std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL) + delay) : "-"; std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE); std::string lengthStr = secsToTimeString(eventData.length * MINUTE); - handler->PSendSysMessage(LANG_EVENT_INFO, event_id, eventData.description.c_str(), activeStr, + handler->PSendSysMessage(LANG_EVENT_INFO, eventId, eventData.description.c_str(), activeStr, startTimeStr.c_str(), endTimeStr.c_str(), occurenceStr.c_str(), lengthStr.c_str(), nextStr.c_str()); return true; } - static bool HandleEventStartCommand(ChatHandler* handler, const char* args) + static bool HandleEventStartCommand(ChatHandler* handler, char const* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameevent"); + if (!id) return false; - int32 event_id = atoi(cId); + int32 eventId = atoi(id); GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap(); - if (event_id < 1 || uint32(event_id) >= events.size()) + if (eventId < 1 || uint32(eventId) >= events.size()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); handler->SetSentErrorMessage(true); return false; } - GameEventData const& eventData = events[event_id]; + GameEventData const& eventData = events[eventId]; if (!eventData.isValid()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); @@ -157,39 +157,39 @@ public: } GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); - if (activeEvents.find(event_id) != activeEvents.end()) + if (activeEvents.find(eventId) != activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, event_id); + handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, eventId); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StartEvent(event_id, true); + sGameEventMgr->StartEvent(eventId, true); return true; } - static bool HandleEventStopCommand(ChatHandler* handler, const char* args) + static bool HandleEventStopCommand(ChatHandler* handler, char const* args) { if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameevent"); + if (!id) return false; - int32 event_id = atoi(cId); + int32 eventId = atoi(id); GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap(); - if (event_id < 1 || uint32(event_id) >= events.size()) + if (eventId < 1 || uint32(eventId) >= events.size()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); handler->SetSentErrorMessage(true); return false; } - GameEventData const& eventData = events[event_id]; + GameEventData const& eventData = events[eventId]; if (!eventData.isValid()) { handler->SendSysMessage(LANG_EVENT_NOT_EXIST); @@ -199,14 +199,14 @@ public: GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); - if (activeEvents.find(event_id) == activeEvents.end()) + if (activeEvents.find(eventId) == activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, event_id); + handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, eventId); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StopEvent(event_id, true); + sGameEventMgr->StopEvent(eventId, true); return true; } }; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 9a7146c641c..2a352e92d01 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -53,7 +53,7 @@ public: } // Enables or disables hiding of the staff badge - static bool HandleGMChatCommand(ChatHandler* handler, const char* args) + static bool HandleGMChatCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -65,16 +65,16 @@ public: return true; } - std::string argstr = (char*)args; + std::string param = (char*)args; - if (argstr == "on") + if (param == "on") { handler->GetSession()->GetPlayer()->SetGMChat(true); handler->GetSession()->SendNotification(LANG_GM_CHAT_ON); return true; } - if (argstr == "off") + if (param == "off") { handler->GetSession()->GetPlayer()->SetGMChat(false); handler->GetSession()->SendNotification(LANG_GM_CHAT_OFF); @@ -86,7 +86,7 @@ public: return false; } - static bool HandleGMFlyCommand(ChatHandler* handler, const char* args) + static bool HandleGMFlyCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -112,17 +112,17 @@ public: return true; } - static bool HandleGMListIngameCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleGMListIngameCommand(ChatHandler* handler, char const* /*args*/) { bool first = true; bool footer = false; ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder<Player>::GetLock(), true); - HashMapHolder<Player>::MapType &m = sObjectAccessor->GetPlayers(); + HashMapHolder<Player>::MapType& m = sObjectAccessor->GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { - AccountTypes itr_sec = itr->second->GetSession()->GetSecurity(); - if ((itr->second->isGameMaster() || (!AccountMgr::IsPlayerAccount(itr_sec) && itr_sec <= AccountTypes(sWorld->getIntConfig(CONFIG_GM_LEVEL_IN_GM_LIST)))) && + AccountTypes itrSec = itr->second->GetSession()->GetSecurity(); + if ((itr->second->isGameMaster() || (!AccountMgr::IsPlayerAccount(itrSec) && itrSec <= AccountTypes(sWorld->getIntConfig(CONFIG_GM_LEVEL_IN_GM_LIST)))) && (!handler->GetSession() || itr->second->IsVisibleGloballyFor(handler->GetSession()->GetPlayer()))) { if (first) @@ -132,12 +132,12 @@ public: handler->SendSysMessage(LANG_GMS_ON_SRV); handler->SendSysMessage("========================"); } - const char* name = itr->second->GetName(); - uint8 security = itr_sec; + char const* name = itr->second->GetName(); + uint8 security = itrSec; uint8 max = ((16 - strlen(name)) / 2); uint8 max2 = max; - if (((max)+(max2)+(strlen(name))) == 16) - max2 = ((max)-1); + if ((max + max2 + strlen(name)) == 16) + max2 = max - 1; if (handler->GetSession()) handler->PSendSysMessage("| %s GMLevel %u", name, security); else @@ -152,7 +152,7 @@ public: } /// Display the list of GMs - static bool HandleGMListFullCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleGMListFullCommand(ChatHandler* handler, char const* /*args*/) { ///- Get the accounts with GM Level >0 QueryResult result = LoginDatabase.PQuery("SELECT a.username, aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel >= %u", SEC_MODERATOR); @@ -164,19 +164,17 @@ public: do { Field* fields = result->Fetch(); - const char* name = fields[0].GetCString(); + char const* name = fields[0].GetCString(); uint8 security = fields[1].GetUInt8(); - uint8 max = ((16 - strlen(name)) / 2); + uint8 max = (16 - strlen(name)) / 2; uint8 max2 = max; - if (((max)+(max2)+(strlen(name))) == 16) - max2 = ((max)-1); + if ((max + max2 + strlen(name)) == 16) + max2 = max - 1; if (handler->GetSession()) handler->PSendSysMessage("| %s GMLevel %u", name, security); else handler->PSendSysMessage("|%*s%s%*s| %u |", max, " ", name, max2, " ", security); - } - while (result->NextRow()); - + } while (result->NextRow()); handler->SendSysMessage("========================"); } else @@ -185,24 +183,24 @@ public: } //Enable\Disable Invisible mode - static bool HandleGMVisibleCommand(ChatHandler* handler, const char* args) + static bool HandleGMVisibleCommand(ChatHandler* handler, char const* args) { if (!*args) { - handler->PSendSysMessage(LANG_YOU_ARE, handler->GetSession()->GetPlayer()->isGMVisible() ? handler->GetTrinityString(LANG_VISIBLE) : handler->GetTrinityString(LANG_INVISIBLE)); + handler->PSendSysMessage(LANG_YOU_ARE, handler->GetSession()->GetPlayer()->isGMVisible() ? handler->GetTrinityString(LANG_VISIBLE) : handler->GetTrinityString(LANG_INVISIBLE)); return true; } - std::string argstr = (char*)args; + std::string param = (char*)args; - if (argstr == "on") + if (param == "on") { handler->GetSession()->GetPlayer()->SetGMVisible(true); handler->GetSession()->SendNotification(LANG_INVISIBLE_VISIBLE); return true; } - if (argstr == "off") + if (param == "off") { handler->GetSession()->SendNotification(LANG_INVISIBLE_INVISIBLE); handler->GetSession()->GetPlayer()->SetGMVisible(false); @@ -215,7 +213,7 @@ public: } //Enable\Disable GM Mode - static bool HandleGMCommand(ChatHandler* handler, const char* args) + static bool HandleGMCommand(ChatHandler* handler, char const* args) { if (!*args) { @@ -226,9 +224,9 @@ public: return true; } - std::string argstr = (char*)args; + std::string param = (char*)args; - if (argstr == "on") + if (param == "on") { handler->GetSession()->GetPlayer()->SetGameMaster(true); handler->GetSession()->SendNotification(LANG_GM_ON); @@ -240,7 +238,7 @@ public: return true; } - if (argstr == "off") + if (param == "off") { handler->GetSession()->GetPlayer()->SetGameMaster(false); handler->GetSession()->SendNotification(LANG_GM_OFF); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 118ab9eb13a..5ed2d6a3dd8 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -57,6 +57,7 @@ public: }; return commandTable; } + /** \brief Teleport the GM to the specified creature * * .gocreature <GUID> --> TP using creature.guid @@ -68,59 +69,52 @@ public: * you will be teleported to the first one that is found. */ //teleport to creature - static bool HandleGoCreatureCommand(ChatHandler* handler, const char* args) + static bool HandleGoCreatureCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - Player* _player = handler->GetSession()->GetPlayer(); + + Player* player = handler->GetSession()->GetPlayer(); // "id" or number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* pParam1 = handler->extractKeyFromLink((char*)args, "Hcreature"); - if (!pParam1) + char* param1 = handler->extractKeyFromLink((char*)args, "Hcreature"); + if (!param1) return false; std::ostringstream whereClause; // User wants to teleport to the NPC's template entry - if (strcmp(pParam1, "id") == 0) + if (strcmp(param1, "id") == 0) { - //sLog->outError("DEBUG: ID found"); - // Get the "creature_template.entry" // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r char* tail = strtok(NULL, ""); if (!tail) return false; - char* cId = handler->extractKeyFromLink(tail, "Hcreature_entry"); - if (!cId) + char* id = handler->extractKeyFromLink(tail, "Hcreature_entry"); + if (!id) return false; - int32 tEntry = atoi(cId); - //sLog->outError("DEBUG: ID value: %d", tEntry); - if (!tEntry) + int32 entry = atoi(id); + if (!entry) return false; - whereClause << "WHERE id = '" << tEntry << '\''; + whereClause << "WHERE id = '" << entry << '\''; } else { - //sLog->outError("DEBUG: ID *not found*"); - - int32 guid = atoi(pParam1); + int32 guid = atoi(param1); // Number is invalid - maybe the user specified the mob's name if (!guid) { - std::string name = pParam1; + std::string name = param1; WorldDatabase.EscapeString(name); whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << '\''; } else - { whereClause << "WHERE guid = '" << guid << '\''; - } } - //sLog->outError("DEBUG: %s", whereClause.c_str()); QueryResult result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z, orientation, map, guid, id FROM creature %s", whereClause.str().c_str()); if (!result) @@ -137,12 +131,12 @@ public: float y = fields[1].GetFloat(); float z = fields[2].GetFloat(); float ort = fields[3].GetFloat(); - int mapid = fields[4].GetUInt16(); + int mapId = fields[4].GetUInt16(); uint32 guid = fields[5].GetUInt32(); uint32 id = fields[6].GetUInt32(); // if creature is in same map with caster go at its current location - if (Creature* creature = sObjectAccessor->GetCreature(*_player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) + if (Creature* creature = sObjectAccessor->GetCreature(*player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) { x = creature->GetPositionX(); y = creature->GetPositionY(); @@ -150,46 +144,47 @@ public: ort = creature->GetOrientation(); } - if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) + if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); return false; } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - _player->TeleportTo(mapid, x, y, z, ort); + player->TeleportTo(mapId, x, y, z, ort); return true; } - static bool HandleGoGraveyardCommand(ChatHandler* handler, const char* args) + + static bool HandleGoGraveyardCommand(ChatHandler* handler, char const* args) { - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); if (!*args) return false; - char *gyId = strtok((char*)args, " "); + char* gyId = strtok((char*)args, " "); if (!gyId) return false; - int32 i_gyId = atoi(gyId); + int32 graveyardId = atoi(gyId); - if (!i_gyId) + if (!graveyardId) return false; - WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(i_gyId); + WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(graveyardId); if (!gy) { - handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, i_gyId); + handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, graveyardId); handler->SetSentErrorMessage(true); return false; } @@ -202,93 +197,92 @@ public: } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - _player->TeleportTo(gy->map_id, gy->x, gy->y, gy->z, _player->GetOrientation()); + player->TeleportTo(gy->map_id, gy->x, gy->y, gy->z, player->GetOrientation()); return true; } + //teleport to grid - static bool HandleGoGridCommand(ChatHandler* handler, const char* args) + static bool HandleGoGridCommand(ChatHandler* handler, char const* args) { - if (!*args) return false; - Player* _player = handler->GetSession()->GetPlayer(); + if (!*args) + return false; + + Player* player = handler->GetSession()->GetPlayer(); - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); - char* pmapid = strtok(NULL, " "); + char* gridX = strtok((char*)args, " "); + char* gridY = strtok(NULL, " "); + char* id = strtok(NULL, " "); - if (!px || !py) + if (!gridX || !gridY) return false; - float grid_x = (float)atof(px); - float grid_y = (float)atof(py); - uint32 mapid; - if (pmapid) - mapid = (uint32)atoi(pmapid); - else mapid = _player->GetMapId(); + uint32 mapId = id ? (uint32)atoi(id) : player->GetMapId(); // center of grid - float x = (grid_x-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; - float y = (grid_y-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; + float x = ((float)atof(gridX) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS; + float y = ((float)atof(gridY) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS; - if (!MapManager::IsValidMapCoord(mapid, x, y)) + if (!MapManager::IsValidMapCoord(mapId, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); return false; } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - Map const* map = sMapMgr->CreateBaseMap(mapid); + Map const* map = sMapMgr->CreateBaseMap(mapId); float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y)); - _player->TeleportTo(mapid, x, y, z, _player->GetOrientation()); + player->TeleportTo(mapId, x, y, z, player->GetOrientation()); return true; } + //teleport to gameobject - static bool HandleGoObjectCommand(ChatHandler* handler, const char* args) + static bool HandleGoObjectCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - int32 guid = atoi(cId); + int32 guid = atoi(id); if (!guid) return false; float x, y, z, ort; - int mapid; + int mapId; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(guid)) + if (GameObjectData const* goData = sObjectMgr->GetGOData(guid)) { - x = go_data->posX; - y = go_data->posY; - z = go_data->posZ; - ort = go_data->orientation; - mapid = go_data->mapid; + x = goData->posX; + y = goData->posY; + z = goData->posZ; + ort = goData->orientation; + mapId = goData->mapid; } else { @@ -297,45 +291,46 @@ public: return false; } - if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) + if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); return false; } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - _player->TeleportTo(mapid, x, y, z, ort); + player->TeleportTo(mapId, x, y, z, ort); return true; } - static bool HandleGoTaxinodeCommand(ChatHandler* handler, const char* args) + + static bool HandleGoTaxinodeCommand(ChatHandler* handler, char const* args) { - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); if (!*args) return false; - char* cNodeId = handler->extractKeyFromLink((char*)args, "Htaxinode"); - if (!cNodeId) + char* id = handler->extractKeyFromLink((char*)args, "Htaxinode"); + if (!id) return false; - int32 i_nodeId = atoi(cNodeId); - if (!i_nodeId) + int32 nodeId = atoi(id); + if (!nodeId) return false; - TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i_nodeId); + TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(nodeId); if (!node) { - handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, i_nodeId); + handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, nodeId); handler->SetSentErrorMessage(true); return false; } @@ -349,38 +344,39 @@ public: } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - _player->TeleportTo(node->map_id, node->x, node->y, node->z, _player->GetOrientation()); + player->TeleportTo(node->map_id, node->x, node->y, node->z, player->GetOrientation()); return true; } - static bool HandleGoTriggerCommand(ChatHandler* handler, const char* args) + + static bool HandleGoTriggerCommand(ChatHandler* handler, char const* args) { - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); if (!*args) return false; - char *atId = strtok((char*)args, " "); - if (!atId) + char* id = strtok((char*)args, " "); + if (!id) return false; - int32 i_atId = atoi(atId); + int32 areaTriggerId = atoi(id); - if (!i_atId) + if (!areaTriggerId) return false; - AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(i_atId); + AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(areaTriggerId); if (!at) { - handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, i_atId); + handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, areaTriggerId); handler->SetSentErrorMessage(true); return false; } @@ -393,49 +389,50 @@ public: } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - _player->TeleportTo(at->mapid, at->x, at->y, at->z, _player->GetOrientation()); + player->TeleportTo(at->mapid, at->x, at->y, at->z, player->GetOrientation()); return true; } + //teleport at coordinates - static bool HandleGoZoneXYCommand(ChatHandler* handler, const char* args) + static bool HandleGoZoneXYCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); + char* zoneX = strtok((char*)args, " "); + char* zoneY = strtok(NULL, " "); char* tail = strtok(NULL, ""); - char* cAreaId = handler->extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r + char* id = handler->extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r - if (!px || !py) + if (!zoneX || !zoneY) return false; - float x = (float)atof(px); - float y = (float)atof(py); + float x = (float)atof(zoneX); + float y = (float)atof(zoneY); // prevent accept wrong numeric args - if ((x == 0.0f && *px != '0') || (y == 0.0f && *py != '0')) + if ((x == 0.0f && *zoneX != '0') || (y == 0.0f && *zoneY != '0')) return false; - uint32 areaid = cAreaId ? (uint32)atoi(cAreaId) : _player->GetZoneId(); + uint32 areaId = id ? (uint32)atoi(id) : player->GetZoneId(); - AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(areaid); + AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(areaId); if (x < 0 || x > 100 || y < 0 || y > 100 || !areaEntry) { - handler->PSendSysMessage(LANG_INVALID_ZONE_COORD, x, y, areaid); + handler->PSendSysMessage(LANG_INVALID_ZONE_COORD, x, y, areaId); handler->SetSentErrorMessage(true); return false; } @@ -462,99 +459,90 @@ public: } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y)); - _player->TeleportTo(zoneEntry->mapid, x, y, z, _player->GetOrientation()); + player->TeleportTo(zoneEntry->mapid, x, y, z, player->GetOrientation()); return true; } + //teleport at coordinates, including Z and orientation - static bool HandleGoXYZCommand(ChatHandler* handler, const char* args) + static bool HandleGoXYZCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - Player* _player = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); - char* px = strtok((char*)args, " "); - char* py = strtok(NULL, " "); - char* pz = strtok(NULL, " "); - char* pmapid = strtok(NULL, " "); + char* goX = strtok((char*)args, " "); + char* goY = strtok(NULL, " "); + char* goZ = strtok(NULL, " "); + char* id = strtok(NULL, " "); char* port = strtok(NULL, " "); - if (!px || !py) + if (!goX || !goY) return false; - float x = (float)atof(px); - float y = (float)atof(py); + float x = (float)atof(goX); + float y = (float)atof(goY); float z; - float ort; - uint32 mapid; - - if (pmapid) - mapid = (uint32)atoi(pmapid); - else - mapid = _player->GetMapId(); - - if ( port ) - ort = (float)atof(port); - else - ort = _player->GetOrientation(); - - if ( pz ) + float ort = port ? (float)atof(port) : player->GetOrientation(); + uint32 mapId = id ? (uint32)atoi(id) : player->GetMapId(); + + if (goZ) { - z = (float)atof(pz); - if (!MapManager::IsValidMapCoord(mapid, x, y, z)) + z = (float)atof(goZ); + if (!MapManager::IsValidMapCoord(mapId, x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); return false; } } else { - if (!MapManager::IsValidMapCoord(mapid, x, y)) + if (!MapManager::IsValidMapCoord(mapId, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); return false; } - Map const* map = sMapMgr->CreateBaseMap(mapid); + Map const* map = sMapMgr->CreateBaseMap(mapId); z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y)); } // stop flight if need - if (_player->isInFlight()) + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } // save only in non-flight case else - _player->SaveRecallPosition(); - - _player->TeleportTo(mapid, x, y, z, ort); + player->SaveRecallPosition(); + player->TeleportTo(mapId, x, y, z, ort); return true; } - static bool HandleGoTicketCommand(ChatHandler* handler, const char* args) + + static bool HandleGoTicketCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char *sTicketId = strtok((char*)args, " "); - if (!sTicketId) + char* id = strtok((char*)args, " "); + if (!id) return false; - uint32 ticketId = atoi(sTicketId); + uint32 ticketId = atoi(id); if (!ticketId) return false; @@ -565,16 +553,16 @@ public: return true; } - Player* _player = handler->GetSession()->GetPlayer(); - if (_player->isInFlight()) + Player* player = handler->GetSession()->GetPlayer(); + if (player->isInFlight()) { - _player->GetMotionMaster()->MovementExpired(); - _player->CleanupAfterTaxiFlight(); + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); } else - _player->SaveRecallPosition(); + player->SaveRecallPosition(); - ticket->TeleportTo(_player); + ticket->TeleportTo(player); return true; } }; diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index f8e636fb961..3ea49345f5f 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -69,35 +69,35 @@ public: return commandTable; } - static bool HandleGameObjectActivateCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectActivateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* obj = NULL; + GameObject* object = NULL; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); + if (GameObjectData const* goData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, goData->id); - if (!obj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } // Activate - obj->SetLootState(GO_READY); - obj->UseDoorOrButton(10000); + object->SetLootState(GO_READY); + object->UseDoorOrButton(10000); handler->PSendSysMessage("Object activated!"); @@ -105,92 +105,92 @@ public: } //spawn go - static bool HandleGameObjectAddCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectAddCommand(ChatHandler* handler, char const* args) { if (!*args) return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); + if (!id) return false; - uint32 id = atol(cId); - if (!id) + uint32 objectId = atol(id); + if (!objectId) return false; char* spawntimeSecs = strtok(NULL, " "); - const GameObjectTemplate* gInfo = sObjectMgr->GetGameObjectTemplate(id); + const GameObjectTemplate* objectInfo = sObjectMgr->GetGameObjectTemplate(objectId); - if (!gInfo) + if (!objectInfo) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, objectId); handler->SetSentErrorMessage(true); return false; } - if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) + if (objectInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(objectInfo->displayId)) { // report to DB errors log as in loading case - sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.", id, gInfo->type, gInfo->displayId); - handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, id); + sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.", objectId, objectInfo->type, objectInfo->displayId); + handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, objectId); handler->SetSentErrorMessage(true); return false; } - Player* chr = handler->GetSession()->GetPlayer(); - float x = float(chr->GetPositionX()); - float y = float(chr->GetPositionY()); - float z = float(chr->GetPositionZ()); - float o = float(chr->GetOrientation()); - Map* map = chr->GetMap(); + Player* player = handler->GetSession()->GetPlayer(); + float x = float(player->GetPositionX()); + float y = float(player->GetPositionY()); + float z = float(player->GetPositionZ()); + float o = float(player->GetOrientation()); + Map* map = player->GetMap(); - GameObject* pGameObj = new GameObject; - uint32 db_lowGUID = sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT); + GameObject* object = new GameObject; + uint32 guidLow = sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT); - if (!pGameObj->Create(db_lowGUID, gInfo->entry, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) + if (!object->Create(guidLow, objectInfo->entry, map, player->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) { - delete pGameObj; + delete object; return false; } if (spawntimeSecs) { uint32 value = atoi((char*)spawntimeSecs); - pGameObj->SetRespawnTime(value); - //sLog->outDebug(LOG_FILTER_TSCR, "*** spawntimeSecs: %d", value); + object->SetRespawnTime(value); } // fill the gameobject data and save to the db - pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); + object->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), player->GetPhaseMaskForSpawn()); // this will generate a new guid if the object is in an instance - if (!pGameObj->LoadFromDB(db_lowGUID, map)) + if (!object->LoadFromDB(guidLow, map)) { - delete pGameObj; + delete object; return false; } - map->Add(pGameObj); + map->Add(object); // TODO: is it really necessary to add both the real and DB table guid here ? - sObjectMgr->AddGameobjectToGrid(db_lowGUID, sObjectMgr->GetGOData(db_lowGUID)); + sObjectMgr->AddGameobjectToGrid(guidLow, sObjectMgr->GetGOData(guidLow)); - handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, id, gInfo->name.c_str(), db_lowGUID, x, y, z); + handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, objectId, objectInfo->name.c_str(), guidLow, x, y, z); return true; } // add go, temp only - static bool HandleGameObjectAddTempCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectAddTempCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - char* charID = strtok((char*)args, " "); - if (!charID) + + char* id = strtok((char*)args, " "); + if (!id) return false; - Player* chr = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); char* spawntime = strtok(NULL, " "); uint32 spawntm = 300; @@ -198,46 +198,47 @@ public: if (spawntime) spawntm = atoi((char*)spawntime); - float x = chr->GetPositionX(); - float y = chr->GetPositionY(); - float z = chr->GetPositionZ(); - float ang = chr->GetOrientation(); + float x = player->GetPositionX(); + float y = player->GetPositionY(); + float z = player->GetPositionZ(); + float ang = player->GetOrientation(); float rot2 = sin(ang/2); float rot3 = cos(ang/2); - uint32 id = atoi(charID); + uint32 objectId = atoi(id); - chr->SummonGameObject(id, x, y, z, ang, 0, 0, rot2, rot3, spawntm); + player->SummonGameObject(objectId, x, y, z, ang, 0, 0, rot2, rot3, spawntm); return true; } - static bool HandleGameObjectTargetCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectTargetCommand(ChatHandler* handler, char const* args) { - Player* pl = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); QueryResult result; GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr->GetActiveEventList(); + if (*args) { // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); + if (!id) return false; - uint32 id = atol(cId); + uint32 objectId = atol(id); - if (id) + if (objectId) result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), id); + player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), objectId); else { - std::string name = cId; + std::string name = id; WorldDatabase.EscapeString(name); result = WorldDatabase.PQuery( "SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ " "FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), name.c_str()); + player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), name.c_str()); } } else @@ -250,8 +251,8 @@ public: { if (initString) { - eventFilter << "OR eventEntry IN (" <<*itr; - initString =false; + eventFilter << "OR eventEntry IN (" << *itr; + initString = false; } else eventFilter << ',' << *itr; @@ -277,25 +278,25 @@ public: bool found = false; float x, y, z, o; - uint32 lowguid, id; - uint16 mapid, phase; - uint32 pool_id; + uint32 guidLow, id; + uint16 mapId, phase; + uint32 poolId; do { Field* fields = result->Fetch(); - lowguid = fields[0].GetUInt32(); + guidLow = fields[0].GetUInt32(); id = fields[1].GetUInt32(); x = fields[2].GetFloat(); y = fields[3].GetFloat(); z = fields[4].GetFloat(); o = fields[5].GetFloat(); - mapid = fields[6].GetUInt16(); + mapId = fields[6].GetUInt16(); phase = fields[7].GetUInt16(); - pool_id = sPoolMgr->IsPartOfAPool<GameObject>(lowguid); - if (!pool_id || sPoolMgr->IsSpawnedObject<GameObject>(lowguid)) + poolId = sPoolMgr->IsPartOfAPool<GameObject>(guidLow); + if (!poolId || sPoolMgr->IsSpawnedObject<GameObject>(guidLow)) found = true; - } while (result->NextRow() && (!found)); + } while (result->NextRow() && !found); if (!found) { @@ -303,21 +304,21 @@ public: return false; } - GameObjectTemplate const* goI = sObjectMgr->GetGameObjectTemplate(id); + GameObjectTemplate const* objectInfo = sObjectMgr->GetGameObjectTemplate(id); - if (!goI) + if (!objectInfo) { handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); return false; } - GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid, id, HIGHGUID_GAMEOBJECT)); + GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(guidLow, id, HIGHGUID_GAMEOBJECT)); - handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name.c_str(), lowguid, id, x, y, z, mapid, o, phase); + handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, guidLow, objectInfo->name.c_str(), guidLow, id, x, y, z, mapId, o, phase); if (target) { - int32 curRespawnDelay = int32(target->GetRespawnTimeEx()-time(NULL)); + int32 curRespawnDelay = int32(target->GetRespawnTimeEx() - time(NULL)); if (curRespawnDelay < 0) curRespawnDelay = 0; @@ -330,219 +331,217 @@ public: } //delete object by selection or guid - static bool HandleGameObjectDeleteCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectDeleteCommand(ChatHandler* handler, char const* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* obj = NULL; + GameObject* object = NULL; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); + if (GameObjectData const* gameObjectData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, gameObjectData->id); - if (!obj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } - uint64 owner_guid = obj->GetOwnerGUID(); - if (owner_guid) + uint64 ownerGuid = object->GetOwnerGUID(); + if (ownerGuid) { - Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), owner_guid); - if (!owner || !IS_PLAYER_GUID(owner_guid)) + Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), ownerGuid); + if (!owner || !IS_PLAYER_GUID(ownerGuid)) { - handler->PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, GUID_LOPART(owner_guid), obj->GetGUIDLow()); + handler->PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, GUID_LOPART(ownerGuid), object->GetGUIDLow()); handler->SetSentErrorMessage(true); return false; } - owner->RemoveGameObject(obj, false); + owner->RemoveGameObject(object, false); } - obj->SetRespawnTime(0); // not save respawn time - obj->Delete(); - obj->DeleteFromDB(); + object->SetRespawnTime(0); // not save respawn time + object->Delete(); + object->DeleteFromDB(); - handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, obj->GetGUIDLow()); + handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, object->GetGUIDLow()); return true; } //turn selected object - static bool HandleGameObjectTurnCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectTurnCommand(ChatHandler* handler, char const* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* obj = NULL; + GameObject* object = NULL; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); + if (GameObjectData const* gameObjectData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, gameObjectData->id); - if (!obj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } - char* po = strtok(NULL, " "); + char* orientation = strtok(NULL, " "); float o; - if (po) - { - o = (float)atof(po); - } + if (orientation) + o = (float)atof(orientation); else { - Player* chr = handler->GetSession()->GetPlayer(); - o = chr->GetOrientation(); + Player* player = handler->GetSession()->GetPlayer(); + o = player->GetOrientation(); } - obj->Relocate(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), o); - obj->UpdateRotationFields(); - obj->DestroyForNearbyPlayers(); - obj->UpdateObjectVisibility(); + object->Relocate(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), o); + object->UpdateRotationFields(); + object->DestroyForNearbyPlayers(); + object->UpdateObjectVisibility(); - obj->SaveToDB(); - obj->Refresh(); + object->SaveToDB(); + object->Refresh(); - handler->PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name.c_str(), obj->GetGUIDLow(), o); + handler->PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, object->GetGUIDLow(), object->GetGOInfo()->name.c_str(), object->GetGUIDLow(), o); return true; } //move selected object - static bool HandleGameObjectMoveCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectMoveCommand(ChatHandler* handler, char const* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* obj = NULL; + GameObject* object = NULL; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); + if (GameObjectData const* gameObjectData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, gameObjectData->id); - if (!obj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } - char* px = strtok(NULL, " "); - char* py = strtok(NULL, " "); - char* pz = strtok(NULL, " "); + char* toX = strtok(NULL, " "); + char* toY = strtok(NULL, " "); + char* toZ = strtok(NULL, " "); - if (!px) + if (!toX) { - Player* chr = handler->GetSession()->GetPlayer(); - obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation()); - obj->DestroyForNearbyPlayers(); - obj->UpdateObjectVisibility(); + Player* player = handler->GetSession()->GetPlayer(); + object->Relocate(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), object->GetOrientation()); + object->DestroyForNearbyPlayers(); + object->UpdateObjectVisibility(); } else { - if (!py || !pz) + if (!toY || !toZ) return false; - float x = (float)atof(px); - float y = (float)atof(py); - float z = (float)atof(pz); + float x = (float)atof(toX); + float y = (float)atof(toY); + float z = (float)atof(toZ); - if (!MapManager::IsValidMapCoord(obj->GetMapId(), x, y, z)) + if (!MapManager::IsValidMapCoord(object->GetMapId(), x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, obj->GetMapId()); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, object->GetMapId()); handler->SetSentErrorMessage(true); return false; } - obj->Relocate(x, y, z, obj->GetOrientation()); - obj->DestroyForNearbyPlayers(); - obj->UpdateObjectVisibility(); + object->Relocate(x, y, z, object->GetOrientation()); + object->DestroyForNearbyPlayers(); + object->UpdateObjectVisibility(); } - obj->SaveToDB(); - obj->Refresh(); + object->SaveToDB(); + object->Refresh(); - handler->PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name.c_str(), obj->GetGUIDLow()); + handler->PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, object->GetGUIDLow(), object->GetGOInfo()->name.c_str(), object->GetGUIDLow()); return true; } - //set pahsemask for selected object - static bool HandleGameObjectSetPhaseCommand(ChatHandler* handler, const char* args) + //set phasemask for selected object + static bool HandleGameObjectSetPhaseCommand(ChatHandler* handler, char const* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* obj = NULL; + GameObject* object = NULL; // by DB guid - if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); + if (GameObjectData const* gameObjectData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, gameObjectData->id); - if (!obj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } - char* phaseStr = strtok (NULL, " "); - uint32 phasemask = phaseStr? atoi(phaseStr) : 0; - if (phasemask == 0) + char* phase = strtok (NULL, " "); + uint32 phaseMask = phase ? atoi(phase) : 0; + if (phaseMask == 0) { handler->SendSysMessage(LANG_BAD_VALUE); handler->SetSentErrorMessage(true); return false; } - obj->SetPhaseMask(phasemask, true); - obj->SaveToDB(); + object->SetPhaseMask(phaseMask, true); + object->SaveToDB(); return true; } - static bool HandleGameObjectNearCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectNearCommand(ChatHandler* handler, char const* args) { float distance = (!*args) ? 10.0f : (float)(atof(args)); uint32 count = 0; - Player* pl = handler->GetSession()->GetPlayer(); + Player* player = handler->GetSession()->GetPlayer(); QueryResult result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, map, " "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ " "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), - pl->GetMapId(), pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), distance*distance); + player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), + player->GetMapId(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), distance * distance); if (result) { @@ -554,14 +553,14 @@ public: float x = fields[2].GetFloat(); float y = fields[3].GetFloat(); float z = fields[4].GetFloat(); - uint16 mapid = fields[5].GetUInt16(); + uint16 mapId = fields[5].GetUInt16(); - GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(entry); + GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(entry); - if (!gInfo) + if (!gameObjectInfo) continue; - handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name.c_str(), x, y, z, mapid); + handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gameObjectInfo->name.c_str(), x, y, z, mapId); ++count; } while (result->NextRow()); @@ -572,99 +571,97 @@ public: } //show info of gameobject - static bool HandleGameObjectInfoCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectInfoCommand(ChatHandler* handler, char const* args) { uint32 entry = 0; uint32 type = 0; - uint32 displayid = 0; + uint32 displayId = 0; std::string name; uint32 lootId = 0; if (!*args) { - if (WorldObject* obj = handler->getSelectedObject()) - entry = obj->GetEntry(); + if (WorldObject* object = handler->getSelectedObject()) + entry = object->GetEntry(); else entry = atoi((char*)args); } - GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(entry); + GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(entry); - if (!goinfo) + if (!gameObjectInfo) return false; - type = goinfo->type; - displayid = goinfo->displayId; - name = goinfo->name; + type = gameObjectInfo->type; + displayId = gameObjectInfo->displayId; + name = gameObjectInfo->name; if (type == GAMEOBJECT_TYPE_CHEST) - lootId = goinfo->chest.lootId; + lootId = gameObjectInfo->chest.lootId; else if (type == GAMEOBJECT_TYPE_FISHINGHOLE) - lootId = goinfo->fishinghole.lootId; + lootId = gameObjectInfo->fishinghole.lootId; handler->PSendSysMessage(LANG_GOINFO_ENTRY, entry); handler->PSendSysMessage(LANG_GOINFO_TYPE, type); handler->PSendSysMessage(LANG_GOINFO_LOOTID, lootId); - handler->PSendSysMessage(LANG_GOINFO_DISPLAYID, displayid); + handler->PSendSysMessage(LANG_GOINFO_DISPLAYID, displayId); handler->PSendSysMessage(LANG_GOINFO_NAME, name.c_str()); return true; } - static bool HandleGameObjectSetStateCommand(ChatHandler* handler, const char* args) + static bool HandleGameObjectSetStateCommand(ChatHandler* handler, char const* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); - if (!cId) + char* id = handler->extractKeyFromLink((char*)args, "Hgameobject"); + if (!id) return false; - uint32 lowguid = atoi(cId); - if (!lowguid) + uint32 guidLow = atoi(id); + if (!guidLow) return false; - GameObject* gobj = NULL; + GameObject* object = NULL; - if (GameObjectData const* goData = sObjectMgr->GetGOData(lowguid)) - gobj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id); + if (GameObjectData const* gameObjectData = sObjectMgr->GetGOData(guidLow)) + object = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guidLow, gameObjectData->id); - if (!gobj) + if (!object) { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); + handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow); handler->SetSentErrorMessage(true); return false; } - char* ctype = strtok(NULL, " "); - if (!ctype) + char* type = strtok(NULL, " "); + if (!type) return false; - int32 type = atoi(ctype); - if (type < 0) + int32 objectType = atoi(type); + if (objectType < 0) { - if (type == -1) - gobj->SendObjectDeSpawnAnim(gobj->GetGUID()); - else if (type == -2) - { + if (objectType == -1) + object->SendObjectDeSpawnAnim(object->GetGUID()); + else if (objectType == -2) return false; - } return true; } - char* cstate = strtok(NULL, " "); - if (!cstate) + char* state = strtok(NULL, " "); + if (!state) return false; - int32 state = atoi(cstate); + int32 objectState = atoi(state); - if (type < 4) - gobj->SetByteValue(GAMEOBJECT_BYTES_1, type, state); - else if (type == 4) + if (objectType < 4) + object->SetByteValue(GAMEOBJECT_BYTES_1, objectType, objectState); + else if (objectType == 4) { WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM, 8+4); - data << gobj->GetGUID(); - data << (uint32)(state); - gobj->SendMessageToSet(&data, true); + data << object->GetGUID(); + data << (uint32)(objectState); + object->SendMessageToSet(&data, true); } - handler->PSendSysMessage("Set gobject type %d state %d", type, state); + handler->PSendSysMessage("Set gobject type %d state %d", objectType, objectState); return true; } }; diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index a616588367c..31d8cd3c8f2 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -66,9 +66,9 @@ public: uint32 entry = atol(cId); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry); + Quest const* quest = sObjectMgr->GetQuestTemplate(entry); - if (!pQuest) + if (!quest) { handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); handler->SetSentErrorMessage(true); @@ -87,9 +87,9 @@ public: } // ok, normal (creature/GO starting) quest - if (player->CanAddQuest(pQuest, true)) + if (player->CanAddQuest(quest, true)) { - player->AddQuest(pQuest, NULL); + player->AddQuest(quest, NULL); if (player->CanCompleteQuest(entry)) player->CompleteQuest(entry); @@ -116,9 +116,9 @@ public: uint32 entry = atol(cId); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry); + Quest const* quest = sObjectMgr->GetQuestTemplate(entry); - if (!pQuest) + if (!quest) { handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); handler->SetSentErrorMessage(true); @@ -163,10 +163,10 @@ public: uint32 entry = atol(cId); - Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry); + Quest const* quest = sObjectMgr->GetQuestTemplate(entry); // If player doesn't have the quest - if (!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE) + if (!quest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE) { handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); handler->SetSentErrorMessage(true); @@ -176,8 +176,8 @@ public: // Add quest items for quests that require items for (uint8 x = 0; x < QUEST_ITEM_OBJECTIVES_COUNT; ++x) { - uint32 id = pQuest->ReqItemId[x]; - uint32 count = pQuest->ReqItemCount[x]; + uint32 id = quest->ReqItemId[x]; + uint32 count = quest->ReqItemCount[x]; if (!id || !count) continue; @@ -195,10 +195,10 @@ public: // All creature/GO slain/casted (not required, but otherwise it will display "Creature slain 0/10") for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i) { - int32 creature = pQuest->ReqCreatureOrGOId[i]; - uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i]; + int32 creature = quest->ReqCreatureOrGOId[i]; + uint32 creaturecount = quest->ReqCreatureOrGOCount[i]; - if (uint32 spell_id = pQuest->ReqSpell[i]) + if (uint32 spell_id = quest->ReqSpell[i]) { for (uint16 z = 0; z < creaturecount; ++z) player->CastedCreatureOrGO(creature, 0, spell_id); @@ -217,9 +217,9 @@ public: } // If the quest requires reputation to complete - if (uint32 repFaction = pQuest->GetRepObjectiveFaction()) + if (uint32 repFaction = quest->GetRepObjectiveFaction()) { - uint32 repValue = pQuest->GetRepObjectiveValue(); + uint32 repValue = quest->GetRepObjectiveValue(); uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(repFaction)) @@ -227,9 +227,9 @@ public: } // If the quest requires a SECOND reputation to complete - if (uint32 repFaction = pQuest->GetRepObjectiveFaction2()) + if (uint32 repFaction = quest->GetRepObjectiveFaction2()) { - uint32 repValue2 = pQuest->GetRepObjectiveValue2(); + uint32 repValue2 = quest->GetRepObjectiveValue2(); uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue2) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(repFaction)) @@ -237,7 +237,7 @@ public: } // If the quest requires money - int32 ReqOrRewMoney = pQuest->GetRewOrReqMoney(); + int32 ReqOrRewMoney = quest->GetRewOrReqMoney(); if (ReqOrRewMoney < 0) player->ModifyMoney(-ReqOrRewMoney); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 39ddbc2f6fc..f205d1d7932 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -49,19 +49,19 @@ class go_shadowforge_brazier : public GameObjectScript public: go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - if (InstanceScript* pInstance = pGo->GetInstanceScript()) + if (InstanceScript* instance = go->GetInstanceScript()) { - if (pInstance->GetData(TYPE_LYCEUM) == IN_PROGRESS) - pInstance->SetData(TYPE_LYCEUM, DONE); + if (instance->GetData(TYPE_LYCEUM) == IN_PROGRESS) + instance->SetData(TYPE_LYCEUM, DONE); else - pInstance->SetData(TYPE_LYCEUM, IN_PROGRESS); + instance->SetData(TYPE_LYCEUM, IN_PROGRESS); // If used brazier open linked doors (North or South) - if (pGo->GetGUID() == pInstance->GetData64(DATA_SF_BRAZIER_N)) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GOLEM_DOOR_N), true); - else if (pGo->GetGUID() == pInstance->GetData64(DATA_SF_BRAZIER_S)) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GOLEM_DOOR_S), true); + if (go->GetGUID() == instance->GetData64(DATA_SF_BRAZIER_N)) + instance->HandleGameObject(instance->GetData64(DATA_GOLEM_DOOR_N), true); + else if (go->GetGUID() == instance->GetData64(DATA_SF_BRAZIER_S)) + instance->HandleGameObject(instance->GetData64(DATA_GOLEM_DOOR_S), true); } return false; } @@ -108,12 +108,12 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { - if (InstanceScript* pInstance = player->GetInstanceScript()) + if (InstanceScript* instance = player->GetInstanceScript()) { - if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE) + if (instance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || instance->GetData(TYPE_RING_OF_LAW) == DONE) return false; - pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS); + instance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS); player->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0); return false; @@ -152,11 +152,11 @@ public: { npc_grimstoneAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); MobSpawnId = rand()%6; } - InstanceScript* pInstance; + InstanceScript* instance; uint8 EventPhase; uint32 Event_Timer; @@ -235,10 +235,10 @@ public: Event_Timer = 5000; break; case 5: - if (pInstance) + if (instance) { - pInstance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me); - pInstance->SetData(TYPE_RING_OF_LAW, DONE); + instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me); + instance->SetData(TYPE_RING_OF_LAW, DONE); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_grimstone: event reached end and set complete."); } break; @@ -247,12 +247,12 @@ public: void HandleGameObject(uint32 id, bool open) { - pInstance->HandleGameObject(pInstance->GetData64(id), open); + instance->HandleGameObject(instance->GetData64(id), open); } void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; if (MobDeath_Timer) @@ -641,14 +641,14 @@ public: player->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID()); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); } return true; } bool OnGossipHello(Player* player, Creature* creature) { - if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) + if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(2846, creature->GetGUID()); @@ -665,12 +665,12 @@ public: switch (i) { case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break; - case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + case 1:instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 2: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); break; } } @@ -685,14 +685,14 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); } } void UpdateAI(const uint32 diff) { - if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; - if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED) + if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; + if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED) { me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -765,10 +765,10 @@ public: { if (quest->GetQuestId() == 4322) {PlayerStart = player; - if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) + if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) { CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); - pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); creature->setFaction(11); } @@ -780,7 +780,7 @@ public: { npc_marshal_windsorAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } void WaypointReached(uint32 i) @@ -800,13 +800,13 @@ public: break; case 12: me->Say(SAY_WINDSOR_6, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_IN_PROGRESS); break; case 13: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 14: - pInstance->SetData(DATA_GATE_SR, 0); + instance->SetData(DATA_GATE_SR, 0); me->setFaction(11); break; case 16: @@ -816,14 +816,14 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 18: - pInstance->SetData(DATA_GATE_SC, 0); + instance->SetData(DATA_GATE_SC, 0); break; case 19: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); - pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } } @@ -842,25 +842,25 @@ public: void JustDied(Unit* slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); + instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) { - if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; - if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) + if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; + if (instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); - if (!pInstance->GetData(DATA_GATE_D) && pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED) + if (!instance->GetData(DATA_GATE_D) && instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED) { me->Say(SAY_WINDSOR_4_2, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START); + instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START); } - if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) + if (instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) { me->Say(SAY_WINDSOR_4_3, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); } - if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED) + if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED) { me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -1009,7 +1009,7 @@ public: case 32: me->Say(SAY_REGINALD_WINDSOR_20_2, LANG_UNIVERSAL, PlayerGUID); PlayerStart->GroupEventHappens(QUEST_JAIL_BREAK, me); - pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); break; } } @@ -1046,53 +1046,53 @@ public: void JustDied(Unit* slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); + instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) { - if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; + if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; if (wp == 7) { - if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) + if (!instance->GetData(DATA_GATE_J) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_JAZ, 1); - pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_CREATURE_JAZ, 1); + instance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); } - if (pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_CREATURE_JAZ) && instance->GetData(DATA_CREATURE_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); } } else if (wp == 11) { - if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) + if (!instance->GetData(DATA_GATE_S) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_SHILL, 1); - pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_CREATURE_SHILL, 1); + instance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); } - if (pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_CREATURE_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) { - pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); SetEscortPaused(false); } } else if (wp == 20) { - if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) + if (!instance->GetData(DATA_GATE_C) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_CREST, 1); + instance->SetData(DATA_CREATURE_CREST, 1); me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); } - if (pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_CREATURE_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); } } - if (pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); + if (instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); npc_escortAI::UpdateAI(diff); } }; @@ -1131,14 +1131,14 @@ public: player->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID()); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); + instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); } return true; } bool OnGossipHello(Player* player, Creature* creature) { - if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) + if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(2847, creature->GetGUID()); @@ -1160,7 +1160,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); } } @@ -1170,20 +1170,20 @@ public: { case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 2: - pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 4: me->SetVisibility(VISIBILITY_OFF); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); + instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); break; } } void UpdateAI(const uint32 diff) { - if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; - if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED) + if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; + if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED) { me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -1265,10 +1265,10 @@ public: { npc_rocknotAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BreakKeg_Timer; uint32 BreakDoor_Timer; @@ -1284,13 +1284,13 @@ public: void DoGo(uint32 id, uint32 state) { - if (GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(id))) - pGo->SetGoState((GOState)state); + if (GameObject* go = instance->instance->GetGameObject(instance->GetData64(id))) + go->SetGoState((GOState)state); } void WaypointReached(uint32 i) { - if (!pInstance) + if (!instance) return; switch (i) @@ -1316,7 +1316,7 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; if (BreakKeg_Timer) @@ -1337,12 +1337,12 @@ public: DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future //spell by trap has effect61, this indicate the bar go hostile - if (Unit* tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) + if (Unit* tmp = Unit::GetUnit(*me, instance->GetData64(DATA_PHALANX))) tmp->setFaction(14); //for later, this event(s) has alot more to it. //optionally, DONE can trigger bar to go hostile. - pInstance->SetData(TYPE_BAR, DONE); + instance->SetData(TYPE_BAR, DONE); BreakDoor_Timer = 0; } else BreakDoor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 2fc97caa3dd..4c6bbf33e59 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -91,8 +91,8 @@ public: // When he die open door to last chamber void JustDied(Unit* who) { - if (InstanceScript* pInstance = who->GetInstanceScript()) - pInstance->HandleGameObject(pInstance->GetData64(DATA_THRONE_DOOR), true); + if (InstanceScript* instance = who->GetInstanceScript()) + instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 16fdae555a2..aecb3445b01 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -71,10 +71,10 @@ public: break; case GOSSIP_ACTION_INFO_DEF+22: player->CLOSE_GOSSIP_MENU(); - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { //are 5 minutes expected? go template may have data to despawn when used at quest - pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE), MINUTE*5); + instance->DoRespawnGameObject(instance->GetData64(DATA_GO_CHALICE), MINUTE*5); } break; } @@ -127,9 +127,9 @@ public: creature->setFaction(FACTION_HOSTILE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); creature->AI()->AttackStart(player); - InstanceScript* pInstance = creature->GetInstanceScript(); - if (pInstance) - pInstance->SetData64(DATA_EVENSTARTER, player->GetGUID()); + InstanceScript* instance = creature->GetInstanceScript(); + if (instance) + instance->SetData64(DATA_EVENSTARTER, player->GetGUID()); break; } return true; @@ -152,10 +152,10 @@ public: { boss_doomrelAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ShadowVolley_Timer; uint32 Immolate_Timer; uint32 CurseOfWeakness_Timer; @@ -175,9 +175,9 @@ public: // was set before event start, so set again me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_GHOSTKILL) >= 7) + if (instance->GetData(DATA_GHOSTKILL) >= 7) me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE); else me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -197,14 +197,14 @@ public: if (me->isAlive()) me->GetMotionMaster()->MoveTargetedHome(); me->SetLootRecipient(NULL); - if (pInstance) - pInstance->SetData64(DATA_EVENSTARTER, 0); + if (instance) + instance->SetData64(DATA_EVENSTARTER, 0); } void JustDied(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_GHOSTKILL, 1); + if (instance) + instance->SetData(DATA_GHOSTKILL, 1); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 94181105be4..36135d6ea55 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -73,14 +73,14 @@ class instance_blackrock_depths : public InstanceMapScript public: instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", 230) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_blackrock_depths_InstanceMapScript(pMap); + return new instance_blackrock_depths_InstanceMapScript(map); } struct instance_blackrock_depths_InstanceMapScript : public InstanceScript { - instance_blackrock_depths_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 0a8a4a88191..85d80bee062 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -261,7 +261,7 @@ public: && unit->HasAura(SPELL_BROODAF_BRONZE) && unit->HasAura(SPELL_BROODAF_GREEN)) { - //pTarget->RemoveAllAuras(); + //target->RemoveAllAuras(); //DoCast(target, SPELL_CHROMATIC_MUT_1); //Chromatic mutation is causing issues diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 7903bee11a7..13574a71b8b 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -249,7 +249,7 @@ public: void MoveInLineOfSight(Unit* who) { - //We simply use this function to find players until we can use pMap->GetPlayers() + //We simply use this function to find players until we can use map->GetPlayers() if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who)) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 929e201d71c..cef44bb446a 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -51,10 +51,10 @@ public: { boss_mr_smiteAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiTrashTimer; uint32 uiSlamTimer; @@ -126,11 +126,11 @@ public: ++uiHealth; DoCastAOE(SPELL_SMITE_STOMP, false); SetCombatMovement(false); - if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_SMITE_CHEST))) + if (instance) + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_SMITE_CHEST))) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(1, pGo->GetPositionX() - 3.0f, pGo->GetPositionY(), pGo->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, go->GetPositionX() - 3.0f, go->GetPositionY(), go->GetPositionZ()); } } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 058e295b646..13e2832bfde 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -38,18 +38,18 @@ public: bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) { - InstanceScript* pInstance = player->GetInstanceScript(); + InstanceScript* instance = player->GetInstanceScript(); - if (!pInstance) + if (!instance) { player->GetSession()->SendNotification("Instance script not initialized"); return true; } - if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED) + if (instance->GetData(EVENT_STATE)!= CANNON_NOT_USED) return false; if (targets.GetGOTarget() && targets.GetGOTarget()->GetEntry() == GO_DEFIAS_CANNON) { - pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED); + instance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED); } player->DestroyItemCount(item->GetEntry(), 1, true); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 2d626a64895..ae0042dcfa5 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -53,7 +53,7 @@ class instance_deadmines : public InstanceMapScript struct instance_deadmines_InstanceMapScript : public InstanceScript { - instance_deadmines_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 FactoryDoorGUID; uint64 IronCladDoorGUID; @@ -251,9 +251,9 @@ class instance_deadmines : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_deadmines_InstanceMapScript(pMap); + return new instance_deadmines_InstanceMapScript(map); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 364dd8532db..1cbe48ae5da 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -113,9 +113,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_EVENT) == NOT_STARTED) + if (instance && instance->GetData(TYPE_EVENT) == NOT_STARTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, creature->GetGUID()); @@ -127,12 +127,12 @@ public: { npc_blastmaster_emi_shortfuseAI(Creature* creature) : npc_escortAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); creature->RestoreFaction(); Reset(); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiTimer; @@ -170,63 +170,63 @@ public: for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { - if (GameObject* pGo = GameObject::GetGameObject(*me, *itr)) + if (GameObject* go = GameObject::GetGameObject(*me, *itr)) { - if (pGo) + if (go) { - if (Creature* trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) + if (Creature* trigger = go->SummonTrigger(go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 1)) { //visual effects are not working! trigger->CastSpell(trigger, 11542, true); trigger->CastSpell(trigger, 35470, true); } - pGo->RemoveFromWorld(); - //pGo->CastSpell(me, 12158); makes all die?! + go->RemoveFromWorld(); + //go->CastSpell(me, 12158); makes all die?! } } } if (bBool) { - if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0, false, pGo); + if (instance) + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + instance->HandleGameObject(0, false, go); }else - if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0, false, pGo); + if (instance) + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT))) + instance->HandleGameObject(0, false, go); } void SetInFace(bool bBool) { - if (!pInstance) + if (!instance) return; if (bBool) { - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - me->SetFacingToObject(pGo); + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + me->SetFacingToObject(go); }else - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - me->SetFacingToObject(pGo); + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT))) + me->SetFacingToObject(go); } void RestoreAll() { - if (!pInstance) + if (!instance) return; - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0, false, pGo); + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + instance->HandleGameObject(0, false, go); - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0, false, pGo); + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT))) + instance->HandleGameObject(0, false, go); if (!GoSummonList.empty()) for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { - if (GameObject* pGo = GameObject::GetGameObject(*me, *itr)) - pGo->RemoveFromWorld(); + if (GameObject* go = GameObject::GetGameObject(*me, *itr)) + go->RemoveFromWorld(); } if (!SummonList.empty()) @@ -242,7 +242,7 @@ public: } } - void AggroAllPlayers(Creature* pTemp) + void AggroAllPlayers(Creature* temp) { Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); @@ -258,9 +258,9 @@ public: if (player->isAlive()) { - pTemp->SetInCombatWith(player); - player->SetInCombatWith(pTemp); - pTemp->AddThreat(player, 0.0f); + temp->SetInCombatWith(player); + player->SetInCombatWith(temp); + temp->AddThreat(player, 0.0f); } } } @@ -320,16 +320,16 @@ public: NextStep(1500, true); break; case 2: - if (!pInstance) + if (!instance) return; switch (uiValue) { case 1: - pInstance->SetData(TYPE_EVENT, IN_PROGRESS); + instance->SetData(TYPE_EVENT, IN_PROGRESS); break; case 2: - pInstance->SetData(TYPE_EVENT, DONE); + instance->SetData(TYPE_EVENT, DONE); NextStep(5000, false, 22); break; } @@ -354,10 +354,10 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 2: - if (GameObject* pGo = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* go = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000)) { - GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! + GoSummonList.push_back(go->GetGUID()); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! } Summon(3); break; @@ -369,10 +369,10 @@ public: DoScriptText(SAY_BLASTMASTER_19, me); break; case 4: - if (GameObject* pGo = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* go = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000)) { - GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + GoSummonList.push_back(go->GetGUID()); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } break; case 5: @@ -389,18 +389,18 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 7: - if (GameObject* pGo = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* go = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000)) { - GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! + GoSummonList.push_back(go->GetGUID()); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! Summon(6); } break; case 8: - if (GameObject* pGo = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* go = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000)) { - GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! + GoSummonList.push_back(go->GetGUID()); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it! } break; case 9: @@ -444,9 +444,9 @@ public: SetInFace(true); DoScriptText(SAY_BLASTMASTER_5, me); Summon(1); - if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0, true, pGo); + if (instance) + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + instance->HandleGameObject(0, true, go); NextStep(3000, true); break; case 7: @@ -490,9 +490,9 @@ public: case 16: DoScriptText(SAY_BLASTMASTER_23, me); SetInFace(false); - if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0, true, pGo); + if (instance) + if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT))) + instance->HandleGameObject(0, true, go); NextStep(2000, true); break; case 17: diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index d0642d3a24d..cf9a3ffc9c1 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -25,14 +25,14 @@ class instance_gnomeregan : public InstanceMapScript public: instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_gnomeregan_InstanceMapScript(pMap); + return new instance_gnomeregan_InstanceMapScript(map); } struct instance_gnomeregan_InstanceMapScript : public InstanceScript { - instance_gnomeregan_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map) { } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 98e40acc4e1..fc2860dad5a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -78,10 +78,10 @@ public: { AddId[i] = 0; } - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 AddGUID[4]; @@ -110,14 +110,14 @@ public: SpawnAdds(); } - if (pInstance) - pInstance->SetData(TYPE_MOROES, NOT_STARTED); + if (instance) + instance->SetData(TYPE_MOROES, NOT_STARTED); } void StartEvent() { - if (pInstance) - pInstance->SetData(TYPE_MOROES, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_MOROES, IN_PROGRESS); DoZoneInCombat(); } @@ -140,14 +140,14 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_MOROES, DONE); + if (instance) + instance->SetData(TYPE_MOROES, DONE); DeSpawnAdds(); //remove aura from spell Garrote when Moroes dies - if (pInstance) - pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GARROTE); + if (instance) + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GARROTE); } void SpawnAdds() @@ -237,7 +237,7 @@ public: if (!UpdateVictim()) return; - if (pInstance && !pInstance->GetData(TYPE_MOROES)) + if (instance && !instance->GetData(TYPE_MOROES)) { EnterEvadeMode(); return; @@ -318,7 +318,7 @@ public: struct boss_moroes_guestAI : public ScriptedAI { - InstanceScript* pInstance; + InstanceScript* instance; uint64 GuestGUID[4]; @@ -327,21 +327,21 @@ struct boss_moroes_guestAI : public ScriptedAI for (uint8 i = 0; i < 4; ++i) GuestGUID[i] = 0; - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } void Reset() { - if (pInstance) - pInstance->SetData(TYPE_MOROES, NOT_STARTED); + if (instance) + instance->SetData(TYPE_MOROES, NOT_STARTED); } void AcquireGUID() { - if (!pInstance) + if (!instance) return; - uint64 MoroesGUID = pInstance->GetData64(DATA_MOROES); + uint64 MoroesGUID = instance->GetData64(DATA_MOROES); Creature* Moroes = (Unit::GetCreature((*me), MoroesGUID)); if (Moroes) { @@ -369,7 +369,7 @@ struct boss_moroes_guestAI : public ScriptedAI void UpdateAI(const uint32 /*diff*/) { - if (pInstance && !pInstance->GetData(TYPE_MOROES)) + if (instance && !instance->GetData(TYPE_MOROES)) EnterEvadeMode(); DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index c970bb7152d..2bcfab80056 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -72,7 +72,7 @@ public: { boss_netherspiteAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); for (int i=0; i<3; ++i) { @@ -82,7 +82,7 @@ public: } } - InstanceScript* pInstance; + InstanceScript* instance; bool PortalPhase; bool Berserk; @@ -247,7 +247,7 @@ public: void HandleDoors(bool open) // Massive Door switcher { - if (GameObject* Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) + if (GameObject* Door = GameObject::GetGameObject(*me, instance ? instance->GetData64(DATA_GO_MASSIVE_DOOR) : 0)) Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index e691bbbb95f..63ca3e32e6e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -72,11 +72,11 @@ public: { boss_nightbaneAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Intro = true; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Phase; @@ -125,12 +125,12 @@ public: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->setActive(true); - if (pInstance) + if (instance) { - if (pInstance->GetData(TYPE_NIGHTBANE) == DONE || pInstance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS) + if (instance->GetData(TYPE_NIGHTBANE) == DONE || instance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS) me->DisappearAndDie(); else - pInstance->SetData(TYPE_NIGHTBANE, NOT_STARTED); + instance->SetData(TYPE_NIGHTBANE, NOT_STARTED); } HandleTerraceDoors(true); @@ -147,17 +147,17 @@ public: void HandleTerraceDoors(bool open) { - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_MASTERS_TERRACE_DOOR_1), open); - pInstance->HandleGameObject(pInstance->GetData64(DATA_MASTERS_TERRACE_DOOR_2), open); + instance->HandleGameObject(instance->GetData64(DATA_MASTERS_TERRACE_DOOR_1), open); + instance->HandleGameObject(instance->GetData64(DATA_MASTERS_TERRACE_DOOR_2), open); } } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); HandleTerraceDoors(false); me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0); @@ -171,8 +171,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(TYPE_NIGHTBANE, DONE); + if (instance) + instance->SetData(TYPE_NIGHTBANE, DONE); HandleTerraceDoors(true); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 40d984d70a3..5f8a9ad6f1c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -185,10 +185,10 @@ public: { boss_malchezaarAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 EnfeebleTimer; uint32 EnfeebleResetTimer; uint32 ShadowNovaTimer; @@ -234,8 +234,8 @@ public: SunderArmorTimer = urand(5000, 10000); phase = 1; - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } void KilledUnit(Unit* /*victim*/) @@ -255,16 +255,16 @@ public: for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i) positions.push_back(&InfernalPoints[i]); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), false); // Open the door leading further in + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), false); // Open the door leading further in } void InfernalCleanup() diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index e13ef8f62e1..f97fc49eb7c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -95,10 +95,10 @@ public: { boss_aranAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SecondarySpellTimer; uint32 NormalCastTimer; @@ -149,11 +149,11 @@ public: Drinking = false; DrinkInturrupted = false; - if (pInstance) + if (instance) { // Not in progress - pInstance->SetData(TYPE_ARAN, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), true); + instance->SetData(TYPE_ARAN, NOT_STARTED); + instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true); } } @@ -166,10 +166,10 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_ARAN, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), true); + instance->SetData(TYPE_ARAN, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true); } } @@ -177,10 +177,10 @@ public: { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_ARAN, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false); + instance->SetData(TYPE_ARAN, IN_PROGRESS); + instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false); } } @@ -228,9 +228,9 @@ public: { if (CloseDoorTimer <= diff) { - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false); CloseDoorTimer = 0; } } else CloseDoorTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index fb7feb5f267..ea7e3113246 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -70,10 +70,10 @@ public: { mob_kilrekAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 TerestianGUID; @@ -87,7 +87,7 @@ public: void EnterCombat(Unit* /*who*/) { - if (!pInstance) + if (!instance) { ERROR_INST_DATA(me); return; @@ -96,9 +96,9 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - uint64 TerestianGUID = pInstance->GetData64(DATA_TERESTIAN); + uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN); if (TerestianGUID) { Unit* Terestian = Unit::GetUnit((*me), TerestianGUID); @@ -262,10 +262,10 @@ public: { for (uint8 i = 0; i < 2; ++i) PortalGUID[i] = 0; - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 PortalGUID[2]; uint8 PortalsCount; @@ -303,8 +303,8 @@ public: SummonedPortals = false; Berserk = false; - if (pInstance) - pInstance->SetData(TYPE_TERESTIAN, NOT_STARTED); + if (instance) + instance->SetData(TYPE_TERESTIAN, NOT_STARTED); me->RemoveAurasDueToSpell(SPELL_BROKEN_PACT); @@ -359,8 +359,8 @@ public: DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_TERESTIAN, DONE); + if (instance) + instance->SetData(TYPE_TERESTIAN, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index a6239394784..8454150d830 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -88,11 +88,11 @@ EndScriptData */ #define CREATURE_CYCLONE 18412 #define CREATURE_CRONE 18168 -void SummonCroneIfReady(InstanceScript* pInstance, Creature* creature) +void SummonCroneIfReady(InstanceScript* instance, Creature* creature) { - pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount + instance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount - if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4) + if (instance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4) { if (Creature* pCrone = creature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, creature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { @@ -116,10 +116,10 @@ public: { boss_dorotheeAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AggroTimer; @@ -158,8 +158,8 @@ public: { DoScriptText(SAY_DOROTHEE_DEATH, me); - if (pInstance) - SummonCroneIfReady(pInstance, me); + if (instance) + SummonCroneIfReady(instance, me); } void AttackStart(Unit* who) @@ -298,10 +298,10 @@ public: { boss_strawmanAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AggroTimer; uint32 BrainBashTimer; @@ -357,8 +357,8 @@ public: { DoScriptText(SAY_STRAWMAN_DEATH, me); - if (pInstance) - SummonCroneIfReady(pInstance, me); + if (instance) + SummonCroneIfReady(instance, me); } void KilledUnit(Unit* /*victim*/) @@ -413,10 +413,10 @@ public: { boss_tinheadAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AggroTimer; uint32 CleaveTimer; @@ -463,8 +463,8 @@ public: { DoScriptText(SAY_TINHEAD_DEATH, me); - if (pInstance) - SummonCroneIfReady(pInstance, me); + if (instance) + SummonCroneIfReady(instance, me); } void KilledUnit(Unit* /*victim*/) @@ -523,10 +523,10 @@ public: { boss_roarAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AggroTimer; uint32 MangleTimer; @@ -571,8 +571,8 @@ public: { DoScriptText(SAY_ROAR_DEATH, me); - if (pInstance) - SummonCroneIfReady(pInstance, me); + if (instance) + SummonCroneIfReady(instance, me); } void KilledUnit(Unit* /*victim*/) @@ -632,10 +632,10 @@ public: { boss_croneAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 CycloneTimer; uint32 ChainLightningTimer; @@ -662,13 +662,13 @@ public: { DoScriptText(SAY_CRONE_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_OPERA, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true); + instance->SetData(TYPE_OPERA, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true); - if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) + if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); } } @@ -807,10 +807,10 @@ public: { boss_bigbadwolfAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ChaseTimer; uint32 FearTimer; @@ -847,13 +847,13 @@ public: { DoPlaySoundToSet(me, SOUND_WOLF_DEATH); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_OPERA, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true); + instance->SetData(TYPE_OPERA, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true); - if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) + if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); } } @@ -1006,13 +1006,13 @@ public: { boss_julianneAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); EntryYellTimer = 1000; AggroYellTimer = 10000; IsFakingDeath = false; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 EntryYellTimer; uint32 AggroYellTimer; @@ -1095,12 +1095,12 @@ public: { DoScriptText(SAY_JULIANNE_DEATH02, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_OPERA, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true); - if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) + instance->SetData(TYPE_OPERA, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true); + if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); } } @@ -1129,12 +1129,12 @@ public: { boss_romuloAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); EntryYellTimer = 8000; AggroYellTimer = 15000; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 JulianneGUID; uint32 Phase; @@ -1250,13 +1250,13 @@ public: { DoScriptText(SAY_ROMULO_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_OPERA, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true); + instance->SetData(TYPE_OPERA, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true); + instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true); - if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) + if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR))) pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 15c697198d0..3dd37fc66c7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -48,14 +48,14 @@ class instance_karazhan : public InstanceMapScript public: instance_karazhan() : InstanceMapScript("instance_karazhan", 532) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_karazhan_InstanceMapScript(pMap); + return new instance_karazhan_InstanceMapScript(map); } struct instance_karazhan_InstanceMapScript : public InstanceScript { - instance_karazhan_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string strSaveData; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index b8025c1adee..6a9831655a9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -113,10 +113,10 @@ public: { RaidWiped = false; m_uiEventId = 0; - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 m_uiSpotlightGUID; @@ -138,20 +138,20 @@ public: PerformanceReady = false; - if (pInstance) - m_uiEventId = pInstance->GetData(DATA_OPERA_PERFORMANCE); + if (instance) + m_uiEventId = instance->GetData(DATA_OPERA_PERFORMANCE); } void StartEvent() { - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_OPERA, IN_PROGRESS); + instance->SetData(TYPE_OPERA, IN_PROGRESS); //resets count for this event, in case earlier failed if (m_uiEventId == EVENT_OZ) - pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, IN_PROGRESS); + instance->SetData(DATA_OPERA_OZ_DEATHCOUNT, IN_PROGRESS); Start(false, false); } @@ -160,14 +160,14 @@ public: void WaypointReached(uint32 i) { - if (!pInstance) + if (!instance) return; switch (i) { case 0: DoCast(me, SPELL_TUXEDO, false); - pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_STAGEDOORLEFT)); + instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT)); break; case 4: TalkCount = 0; @@ -183,12 +183,12 @@ public: } break; case 8: - pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_STAGEDOORLEFT)); + instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT)); PerformanceReady = true; break; case 9: PrepareEncounter(); - pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_CURTAINS)); + instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_CURTAINS)); break; } } @@ -291,11 +291,11 @@ public: { if (WipeTimer <= diff) { - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) + Map* map = me->GetMap(); + if (!map->IsDungeon()) return; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (PlayerList.isEmpty()) return; @@ -361,10 +361,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { // Check for death of Moroes and if opera event is not done already - if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE) + if (instance->GetData(TYPE_MOROES) == DONE && instance->GetData(TYPE_OPERA) != DONE) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -426,10 +426,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { // Check if Shade of Aran event is done - if (pInstance->GetData(TYPE_ARAN) == DONE) + if (instance->GetData(TYPE_ARAN) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); } @@ -476,10 +476,10 @@ public: { npc_image_of_medivhAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 ArcanagosGUID; @@ -494,9 +494,9 @@ public: { ArcanagosGUID = 0; - if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0) + if (instance && instance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0) { - pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID()); + instance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID()); (*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]); Step = 0; }else @@ -537,7 +537,7 @@ public: uint32 NextStep(uint32 Step) { Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); - Map* pMap = me->GetMap(); + Map* map = me->GetMap(); switch (Step) { case 0: return 9999999; @@ -593,9 +593,9 @@ public: me->SetVisible(false); me->ClearInCombat(); - if (pMap->IsDungeon()) + if (map->IsDungeon()) { - InstanceMap::PlayerList const &PlayerList = pMap->GetPlayers(); + InstanceMap::PlayerList const &PlayerList = map->GetPlayers(); for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource()->isAlive()) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 6802d1817a3..ce4a2a10cac 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -91,10 +91,10 @@ public: { boss_felblood_kaelthasAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 FireballTimer; uint32 PhoenixTimer; @@ -138,10 +138,10 @@ public: Phase = 0; - if (pInstance) + if (instance) { - pInstance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), true); + instance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED); + instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), true); // Open the big encounter door. Close it in Aggro and open it only in JustDied(and here) // Small door opened after event are expected to be closed by default } @@ -151,10 +151,10 @@ public: { DoScriptText(SAY_DEATH, me); - if (!pInstance) + if (!instance) return; - pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), true); + instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), true); // Open the encounter door } @@ -166,10 +166,10 @@ public: void EnterCombat(Unit* /*who*/) { - if (!pInstance) + if (!instance) return; - pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), false); + instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), false); //Close the encounter door, open it in JustDied/Reset } @@ -361,10 +361,10 @@ public: DoScriptText(SAY_GRAVITY_LAPSE, me); FirstGravityLapse = false; - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_STATUE_LEFT), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_STATUE_RIGHT), true); + instance->HandleGameObject(instance->GetData64(DATA_KAEL_STATUE_LEFT), true); + instance->HandleGameObject(instance->GetData64(DATA_KAEL_STATUE_RIGHT), true); } }else { @@ -485,10 +485,10 @@ public: { mob_felkael_phoenixAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BurnTimer; uint32 Death_Timer; bool Rebirth; @@ -520,7 +520,7 @@ public: } //Don't really die in all phases of Kael'Thas - if (pInstance && pInstance->GetData(DATA_KAELTHAS_EVENT) == 0) + if (instance && instance->GetData(DATA_KAELTHAS_EVENT) == 0) { //prevent death damage = 0; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index ae7d7aba9f1..719c42c0a57 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -101,12 +101,12 @@ public: { boss_priestess_delrissaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); memset(&m_auiLackeyGUID, 0, sizeof(m_auiLackeyGUID)); LackeyEntryList.clear(); } - InstanceScript* pInstance; + InstanceScript* instance; std::vector<uint32> LackeyEntryList; uint64 m_auiLackeyGUID[MAX_ACTIVE_LACKEY]; @@ -137,8 +137,8 @@ public: //this mean she at some point evaded void JustReachedHome() { - if (pInstance) - pInstance->SetData(DATA_DELRISSA_EVENT, FAIL); + if (instance) + instance->SetData(DATA_DELRISSA_EVENT, FAIL); } void EnterCombat(Unit* who) @@ -157,8 +157,8 @@ public: } } - if (pInstance) - pInstance->SetData(DATA_DELRISSA_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_DELRISSA_EVENT, IN_PROGRESS); } void InitializeLackeys() @@ -224,11 +224,11 @@ public: { DoScriptText(SAY_DEATH, me); - if (!pInstance) + if (!instance) return; - if (pInstance->GetData(DATA_DELRISSA_DEATH_COUNT) == MAX_ACTIVE_LACKEY) - pInstance->SetData(DATA_DELRISSA_EVENT, DONE); + if (instance->GetData(DATA_DELRISSA_DEATH_COUNT) == MAX_ACTIVE_LACKEY) + instance->SetData(DATA_DELRISSA_EVENT, DONE); else { if (me->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE)) @@ -342,12 +342,12 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI { boss_priestess_lackey_commonAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); memset(&m_auiLackeyGUIDs, 0, sizeof(m_auiLackeyGUIDs)); AcquireGUIDs(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 m_auiLackeyGUIDs[MAX_ACTIVE_LACKEY]; uint32 ResetThreatTimer; @@ -365,7 +365,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI ResetThreatTimer = urand(5000, 20000); // in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her) - if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DELRISSA) : 0)) + if (Creature* pDelrissa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_DELRISSA) : 0)) { if (!pDelrissa->isAlive()) pDelrissa->Respawn(); @@ -377,7 +377,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI if (!who) return; - if (pInstance) + if (instance) { for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { @@ -391,7 +391,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA))) + if (Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA))) { if (pDelrissa->isAlive() && !pDelrissa->getVictim()) { @@ -404,11 +404,11 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI void JustDied(Unit* /*killer*/) { - if (!pInstance) + if (!instance) return; - Creature* pDelrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA)); - uint32 uiLackeyDeathCount = pInstance->GetData(DATA_DELRISSA_DEATH_COUNT); + Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)); + uint32 uiLackeyDeathCount = instance->GetData(DATA_DELRISSA_DEATH_COUNT); if (!pDelrissa) return; @@ -416,7 +416,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI //should delrissa really yell if dead? DoScriptText(LackeyDeath[uiLackeyDeathCount].id, pDelrissa); - pInstance->SetData(DATA_DELRISSA_DEATH_COUNT, SPECIAL); + instance->SetData(DATA_DELRISSA_DEATH_COUNT, SPECIAL); //increase local var, since we now may have four dead ++uiLackeyDeathCount; @@ -429,26 +429,26 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI if (!pDelrissa->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE)) pDelrissa->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - pInstance->SetData(DATA_DELRISSA_EVENT, DONE); + instance->SetData(DATA_DELRISSA_EVENT, DONE); } } } void KilledUnit(Unit* victim) { - if (!pInstance) + if (!instance) return; - if (Creature* Delrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA))) + if (Creature* Delrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA))) Delrissa->AI()->KilledUnit(victim); } void AcquireGUIDs() { - if (!pInstance) + if (!instance) return; - if (Creature* Delrissa = (Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA)))) + if (Creature* Delrissa = (Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))) { for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) m_auiLackeyGUIDs[i] = CAST_AI(boss_priestess_delrissa::boss_priestess_delrissaAI, Delrissa->AI())->m_auiLackeyGUID[i]; @@ -1055,14 +1055,14 @@ public: if (Freezing_Trap_Timer <= diff) { //attempt find go summoned from spell (casted by me) - GameObject* pGo = me->GetGameObject(SPELL_FREEZING_TRAP); + GameObject* go = me->GetGameObject(SPELL_FREEZING_TRAP); - //if we have a pGo, we need to wait (only one trap at a time) - if (pGo) + //if we have a go, we need to wait (only one trap at a time) + if (go) Freezing_Trap_Timer = 2500; else { - //if pGo does not exist, then we can cast + //if go does not exist, then we can cast DoCast(me->getVictim(), SPELL_FREEZING_TRAP); Freezing_Trap_Timer = 15000; } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 35269bb296d..305ce97687a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -65,23 +65,23 @@ public: { boss_selin_fireheartAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Crystals.clear(); //GUIDs per instance is static, so we only need to load them once. - if (pInstance) + if (instance) { - uint32 size = pInstance->GetData(DATA_FEL_CRYSTAL_SIZE); + uint32 size = instance->GetData(DATA_FEL_CRYSTAL_SIZE); for (uint8 i = 0; i < size; ++i) { - uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL); + uint64 guid = instance->GetData64(DATA_FEL_CRYSTAL); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Selin: Adding Fel Crystal " UI64FMTD " to list", guid); Crystals.push_back(guid); } } } - InstanceScript* pInstance; + InstanceScript* instance; std::list<uint64> Crystals; @@ -98,7 +98,7 @@ public: void Reset() { - if (pInstance) + if (instance) { //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i) for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) @@ -115,11 +115,11 @@ public: } } - pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); + instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); // Open the big encounter door. Close it in Aggro and open it only in JustDied(and here) // Small door opened after event are expected to be closed by default // Set Inst data for encounter - pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED); + instance->SetData(DATA_SELIN_EVENT, NOT_STARTED); } else sLog->outError(ERROR_INST_DATA); DrainLifeTimer = 3000 + rand()%4000; @@ -196,8 +196,8 @@ public: { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), false); + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), false); //Close the encounter door, open it in JustDied/Reset } @@ -232,12 +232,12 @@ public: { DoScriptText(SAY_DEATH, me); - if (!pInstance) + if (!instance) return; - pInstance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete! - pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); // Open the encounter door - pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_DOOR), true); // Open the door leading further in + instance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete! + instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); // Open the encounter door + instance->HandleGameObject(instance->GetData64(DATA_SELIN_DOOR), true); // Open the door leading further in ShatterRemainingCrystals(); } @@ -343,9 +343,9 @@ public: void JustDied(Unit* /*killer*/) { - if (InstanceScript* pInstance = me->GetInstanceScript()) + if (InstanceScript* instance = me->GetInstanceScript()) { - Creature* Selin = (Unit::GetCreature(*me, pInstance->GetData64(DATA_SELIN))); + Creature* Selin = (Unit::GetCreature(*me, instance->GetData64(DATA_SELIN))); if (Selin && Selin->isAlive()) { if (CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->CrystalGUID == me->GetGUID()) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 94575fb8aae..906bbe6f528 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -73,10 +73,10 @@ public: { boss_vexallusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ChainLightningTimer; uint32 ArcaneShockTimer; @@ -92,8 +92,8 @@ public: IntervalHealthAmount = 1; Enraged = false; - if (pInstance) - pInstance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } void KilledUnit(Unit* /*victim*/) @@ -103,16 +103,16 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_VEXALLUS_EVENT, DONE); + if (instance) + instance->SetData(DATA_VEXALLUS_EVENT, DONE); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index dd8031626bb..69d8ecbae62 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -40,14 +40,14 @@ class instance_magisters_terrace : public InstanceMapScript public: instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace", 585) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_magisters_terrace_InstanceMapScript(pMap); + return new instance_magisters_terrace_InstanceMapScript(map); } struct instance_magisters_terrace_InstanceMapScript : public InstanceScript { - instance_magisters_terrace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; uint32 DelrissaDeathCount; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 3e95c613f23..b47e9cd1666 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -128,12 +128,12 @@ public: // some targeting issues with the spell, so use this workaround as temporary solution void DoWorkaroundForQuestCredit() { - Map* pMap = me->GetMap(); + Map* map = me->GetMap(); - if (!pMap || pMap->IsHeroic()) + if (!map || map->IsHeroic()) return; - Map::PlayerList const &lList = pMap->GetPlayers(); + Map::PlayerList const &lList = map->GetPlayers(); if (lList.isEmpty()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 9a3913cb7dd..395f4f3ace4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -313,9 +313,9 @@ class go_acherus_soul_prison : public GameObjectScript public: go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - if (Creature* anchor = pGo->FindNearestCreature(29521, 15)) + if (Creature* anchor = go->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (Creature* prisoner = Creature::GetCreature(*player, prisonerGUID)) CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 481c8647c82..ebd30aa2f5d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -177,9 +177,9 @@ class npc_koltira_deathweaver : public CreatureScript public: npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_BREAKOUT) + if (quest->GetQuestId() == QUEST_BREAKOUT) { creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -305,9 +305,9 @@ public: break; case 4: { - Creature* pTemp = Unit::GetCreature(*me, m_uiValrothGUID); + Creature* temp = Unit::GetCreature(*me, m_uiValrothGUID); - if (!pTemp || !pTemp->isAlive()) + if (!temp || !temp->isAlive()) { DoScriptText(SAY_BREAKOUT8, me); m_uiWave_Timer = 5000; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 2dc4553c3fa..aea25af87bf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -395,16 +395,16 @@ public: //UpdateWorldState(me->GetMap(), WORLD_STATE_COUNTDOWN, 0); UpdateWorldState(me->GetMap(), WORLD_STATE_EVENT_BEGIN, 0); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - pTemp->setDeathState(JUST_DIED); - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) - pTemp->setDeathState(JUST_DIED); - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) - pTemp->setDeathState(JUST_DIED); - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) - pTemp->setDeathState(JUST_DIED); - if (Creature* pTemp = Unit::GetCreature(*me, uiRayneGUID)) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + temp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) + temp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) + temp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) + temp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiRayneGUID)) + temp->setDeathState(JUST_DIED); uiTirionGUID = 0; uiKorfaxGUID = 0; @@ -414,25 +414,25 @@ public: for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiDefenderGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiDefenderGUID[i])) + temp->setDeathState(JUST_DIED); uiDefenderGUID[i] = 0; } for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiEarthshatterGUID[i])) + temp->setDeathState(JUST_DIED); uiEarthshatterGUID[i] = 0; } - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) - pTemp->Respawn(); - if (Creature* pTemp = Unit::GetCreature(*me, uiOrbazGUID)) - pTemp->Respawn(); - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) - pTemp->Respawn(); - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->Respawn(); + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) + temp->Respawn(); + if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID)) + temp->Respawn(); + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) + temp->Respawn(); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->Respawn(); uiKoltiraGUID = 0; uiOrbazGUID = 0; @@ -440,26 +440,26 @@ public: uiLichKingGUID = 0; for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiAbominationGUID[i])) + temp->setDeathState(JUST_DIED); uiAbominationGUID[i] = 0; } for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiBehemothGUID[i])) + temp->setDeathState(JUST_DIED); uiBehemothGUID[i] = 0; } for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiGhoulGUID[i])) + temp->setDeathState(JUST_DIED); uiGhoulGUID[i] = 0; } for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i])) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiWarriorGUID[i])) + temp->setDeathState(JUST_DIED); uiWarriorGUID[i] = 0; } } @@ -509,10 +509,10 @@ public: SetHoldState(true); SpawnNPC(); - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN07, pTemp); - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN08, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN07, temp); + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN08, temp); for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i) NPCChangeTarget(uiGhoulGUID[i]); @@ -529,10 +529,10 @@ public: me->Unmount(); me->CastSpell(me, SPELL_THE_MIGHT_OF_MOGRAINE, true); // need to fix, on player only - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) - pTemp->Unmount(); - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) - pTemp->Unmount(); + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) + temp->Unmount(); + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) + temp->Unmount(); bIsBattle = true; break; @@ -547,35 +547,35 @@ public: DoScriptText(EMOTE_LIGHT_OF_DAWN05, me); if (me->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) me->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN); - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) { - if (pTemp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) - pTemp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN); - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[19].x, LightofDawnLoc[19].y, LightofDawnLoc[19].z); + if (temp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) + temp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[19].x, LightofDawnLoc[19].y, LightofDawnLoc[19].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) { - if (pTemp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) - pTemp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN); - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[21].x, LightofDawnLoc[21].y, LightofDawnLoc[21].z); + if (temp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0)) + temp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[21].x, LightofDawnLoc[21].y, LightofDawnLoc[21].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) { - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[10].x, LightofDawnLoc[10].y, LightofDawnLoc[10].z); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[10].x, LightofDawnLoc[10].y, LightofDawnLoc[10].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) { - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[13].x, LightofDawnLoc[13].y, LightofDawnLoc[13].z); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[13].x, LightofDawnLoc[13].y, LightofDawnLoc[13].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) { - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[16].x, LightofDawnLoc[16].y, LightofDawnLoc[16].z); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[16].x, LightofDawnLoc[16].y, LightofDawnLoc[16].z); } JumpToNextStep(10000); } break; @@ -583,10 +583,10 @@ public: DoScriptText(SAY_LIGHT_OF_DAWN27, me); me->SetStandState(UNIT_STAND_STATE_KNEEL); - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_KNEEL); - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_KNEEL); + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) + temp->SetStandState(UNIT_STAND_STATE_KNEEL); + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) + temp->SetStandState(UNIT_STAND_STATE_KNEEL); SetHoldState(true); break; case 5: @@ -604,8 +604,8 @@ public: break; case 8: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP)); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - me->CastSpell(pTemp, SPELL_ASHBRINGER, true); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + me->CastSpell(temp, SPELL_ASHBRINGER, true); DoScriptText(EMOTE_LIGHT_OF_DAWN14, me); SetHoldState(true); break; @@ -663,10 +663,10 @@ public: uiPhase_timer = 500; if (uiSummon_counter < ENCOUNTER_GHOUL_NUMBER) { - Unit* pTemp = me->SummonCreature(NPC_ACHERUS_GHOUL, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->setFaction(2084); - uiGhoulGUID[uiSummon_counter] = pTemp->GetGUID(); + Unit* temp = me->SummonCreature(NPC_ACHERUS_GHOUL, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->setFaction(2084); + uiGhoulGUID[uiSummon_counter] = temp->GetGUID(); ++uiSummon_counter; } else @@ -681,10 +681,10 @@ public: uiPhase_timer = 500; if (uiSummon_counter < ENCOUNTER_ABOMINATION_NUMBER) { - Unit* pTemp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->setFaction(2084); - uiAbominationGUID[uiSummon_counter] = pTemp->GetGUID(); + Unit* temp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->setFaction(2084); + uiAbominationGUID[uiSummon_counter] = temp->GetGUID(); ++uiSummon_counter; } else @@ -699,10 +699,10 @@ public: uiPhase_timer = 500; if (uiSummon_counter < ENCOUNTER_WARRIOR_NUMBER) { - Unit* pTemp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->setFaction(2084); - uiWarriorGUID[uiSummon_counter] = pTemp->GetGUID(); + Unit* temp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->setFaction(2084); + uiWarriorGUID[uiSummon_counter] = temp->GetGUID(); ++uiSummon_counter; } else @@ -717,10 +717,10 @@ public: uiPhase_timer = 500; if (uiSummon_counter < ENCOUNTER_BEHEMOTH_NUMBER) { - Unit* pTemp = me->SummonCreature(NPC_FLESH_BEHEMOTH, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->setFaction(2084); - uiBehemothGUID[uiSummon_counter] = pTemp->GetGUID(); + Unit* temp = me->SummonCreature(NPC_FLESH_BEHEMOTH, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->setFaction(2084); + uiBehemothGUID[uiSummon_counter] = temp->GetGUID(); ++uiSummon_counter; } else @@ -737,52 +737,52 @@ public: case 9: // charge begins SetHoldState(false); - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) { - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiOrbazGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID)) { - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) { - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); } for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i])) - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + if (Creature* temp = Unit::GetCreature(*me, uiAbominationGUID[i])) + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i])) - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + if (Creature* temp = Unit::GetCreature(*me, uiBehemothGUID[i])) + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i])) - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + if (Creature* temp = Unit::GetCreature(*me, uiGhoulGUID[i])) + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i])) - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); + if (Creature* temp = Unit::GetCreature(*me, uiWarriorGUID[i])) + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z); JumpToNextStep(5000); break; // ******* After battle ***************************************************************** case 11: // Tirion starts to speak - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN28, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN28, temp); JumpToNextStep(21000); break; case 12: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN29, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN29, temp); JumpToNextStep(13000); break; case 13: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN30, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN30, temp); JumpToNextStep(13000); break; @@ -793,22 +793,22 @@ public: break; case 15: // summon gate - if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_ALEXANDROS_MOGRAINE, LightofDawnLoc[22].x, LightofDawnLoc[22].y, LightofDawnLoc[22].z, LightofDawnLoc[22].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Unit* temp = me->SummonCreature(NPC_HIGHLORD_ALEXANDROS_MOGRAINE, LightofDawnLoc[22].x, LightofDawnLoc[22].y, LightofDawnLoc[22].z, LightofDawnLoc[22].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) { - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pTemp->CastSpell(pTemp, SPELL_ALEXANDROS_MOGRAINE_SPAWN, true); - DoScriptText(EMOTE_LIGHT_OF_DAWN06, pTemp); - uiAlexandrosGUID = pTemp->GetGUID(); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + temp->CastSpell(temp, SPELL_ALEXANDROS_MOGRAINE_SPAWN, true); + DoScriptText(EMOTE_LIGHT_OF_DAWN06, temp); + uiAlexandrosGUID = temp->GetGUID(); } JumpToNextStep(4000); break; case 16: // Alexandros out - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[23].x, LightofDawnLoc[23].y, LightofDawnLoc[23].z); - DoScriptText(SAY_LIGHT_OF_DAWN32, pTemp); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[23].x, LightofDawnLoc[23].y, LightofDawnLoc[23].z); + DoScriptText(SAY_LIGHT_OF_DAWN32, temp); } SetHoldState(false); // makes darion turns back JumpToNextStep(5000); @@ -821,103 +821,103 @@ public: break; case 18: // Darion's spirit out - if (Unit* pTemp = me->SummonCreature(NPC_DARION_MOGRAINE, LightofDawnLoc[24].x, LightofDawnLoc[24].y, LightofDawnLoc[24].z, LightofDawnLoc[24].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Unit* temp = me->SummonCreature(NPC_DARION_MOGRAINE, LightofDawnLoc[24].x, LightofDawnLoc[24].y, LightofDawnLoc[24].z, LightofDawnLoc[24].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) { - DoScriptText(SAY_LIGHT_OF_DAWN35, pTemp); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - uiDarionGUID = pTemp->GetGUID(); + DoScriptText(SAY_LIGHT_OF_DAWN35, temp); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + uiDarionGUID = temp->GetGUID(); } JumpToNextStep(4000); break; case 19: // runs to father - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) { - DoScriptText(EMOTE_LIGHT_OF_DAWN07, pTemp); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[25].x, LightofDawnLoc[25].y, LightofDawnLoc[25].z); + DoScriptText(EMOTE_LIGHT_OF_DAWN07, temp); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[25].x, LightofDawnLoc[25].y, LightofDawnLoc[25].z); } JumpToNextStep(4000); break; case 20: - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN36, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN36, temp); JumpToNextStep(4000); break; case 21: - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) - DoScriptText(EMOTE_LIGHT_OF_DAWN08, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) + DoScriptText(EMOTE_LIGHT_OF_DAWN08, temp); JumpToNextStep(4000); break; case 22: - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN37, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN37, temp); JumpToNextStep(8000); break; case 23: - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN38, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN38, temp); JumpToNextStep(8000); break; case 24: - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN39, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN39, temp); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion moves forward here - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[1].x, LightofDawnLoc[1].y, LightofDawnLoc[1].z); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion moves forward here + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[1].x, LightofDawnLoc[1].y, LightofDawnLoc[1].z); JumpToNextStep(15000); break; case 25: - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN40, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN40, temp); JumpToNextStep(11000); break; case 26: - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN41, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN41, temp); JumpToNextStep(5000); break; case 27: - if (Creature* pTemp = Unit::GetCreature(*me, uiDarionGUID)) - pTemp->setDeathState(JUST_DIED); + if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID)) + temp->setDeathState(JUST_DIED); JumpToNextStep(24000); break; case 28: - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN42, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN42, temp); JumpToNextStep(6000); break; case 29: // lich king spawns - if (Unit* pTemp = me->SummonCreature(NPC_THE_LICH_KING, LightofDawnLoc[26].x, LightofDawnLoc[26].y, LightofDawnLoc[26].z, LightofDawnLoc[26].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Unit* temp = me->SummonCreature(NPC_THE_LICH_KING, LightofDawnLoc[26].x, LightofDawnLoc[26].y, LightofDawnLoc[26].z, LightofDawnLoc[26].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) { - DoScriptText(SAY_LIGHT_OF_DAWN43, pTemp); - uiLichKingGUID = pTemp->GetGUID(); + DoScriptText(SAY_LIGHT_OF_DAWN43, temp); + uiLichKingGUID = temp->GetGUID(); if (Unit* pAlex = Unit::GetCreature(*me, uiAlexandrosGUID)) - pTemp->CastSpell(pAlex, SPELL_SOUL_FEAST_ALEX, false); + temp->CastSpell(pAlex, SPELL_SOUL_FEAST_ALEX, false); } JumpToNextStep(2000); break; case 30: - if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) // just hide him + if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) // just hide him { - DoScriptText(EMOTE_LIGHT_OF_DAWN09, pTemp); - pTemp->SetVisible(false); + DoScriptText(EMOTE_LIGHT_OF_DAWN09, temp); + temp->SetVisible(false); } - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) { - pTemp->InterruptNonMeleeSpells(false); - DoScriptText(SAY_LIGHT_OF_DAWN45, pTemp); + temp->InterruptNonMeleeSpells(false); + DoScriptText(SAY_LIGHT_OF_DAWN45, temp); } JumpToNextStep(3000); break; @@ -930,8 +930,8 @@ public: break; case 32: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[27].x, LightofDawnLoc[27].y, LightofDawnLoc[27].z); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[27].x, LightofDawnLoc[27].y, LightofDawnLoc[27].z); JumpToNextStep(6000); break; @@ -946,10 +946,10 @@ public: break; case 35: // Lich king counterattacks - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) { - pTemp->HandleEmoteCommand(EMOTE_ONESHOT_KICK); - DoScriptText(SAY_LIGHT_OF_DAWN46, pTemp); + temp->HandleEmoteCommand(EMOTE_ONESHOT_KICK); + DoScriptText(SAY_LIGHT_OF_DAWN46, temp); } me->SetSpeed(MOVE_RUN, 6.0f); me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -963,33 +963,33 @@ public: break; case 38: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN47, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN47, temp); JumpToNextStep(8000); break; case 39: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN48, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN48, temp); JumpToNextStep(15000); break; case 40: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN49, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN49, temp); JumpToNextStep(17000); break; case 41: // Lich king - Apocalypse - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) { - DoScriptText(EMOTE_LIGHT_OF_DAWN11, pTemp); - DoScriptText(SAY_LIGHT_OF_DAWN51, pTemp); + DoScriptText(EMOTE_LIGHT_OF_DAWN11, temp); + DoScriptText(SAY_LIGHT_OF_DAWN51, temp); if (Unit* pTirion = Unit::GetCreature(*me, uiTirionGUID)) { pTirion->SetStandState(UNIT_STAND_STATE_KNEEL); - //pTemp->CastSpell(pTirion, SPELL_APOCALYPSE, false); // not working - pTemp->CastSpell(pTirion, SPELL_SOUL_FEAST_TIRION, false); + //temp->CastSpell(pTirion, SPELL_APOCALYPSE, false); // not working + temp->CastSpell(pTirion, SPELL_SOUL_FEAST_TIRION, false); DoScriptText(EMOTE_LIGHT_OF_DAWN12, pTirion); } } @@ -1001,106 +1001,106 @@ public: float fLichPositionX = 0, fLichPositionY = 0, fLichPositionZ = 0; - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) { - fLichPositionX = pTemp->GetPositionX(); - fLichPositionY = pTemp->GetPositionY(); - fLichPositionZ = pTemp->GetPositionZ(); + fLichPositionX = temp->GetPositionX(); + fLichPositionY = temp->GetPositionY(); + fLichPositionZ = temp->GetPositionZ(); } if (fLichPositionX && fLichPositionY) { - Unit* pTemp; - pTemp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetSpeed(MOVE_RUN, 2.0f); - pTemp->setFaction(me->getFaction()); - pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); - uiDefenderGUID[0] = pTemp->GetGUID(); - - pTemp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetSpeed(MOVE_RUN, 2.0f); - pTemp->setFaction(me->getFaction()); - pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); - uiEarthshatterGUID[0] = pTemp->GetGUID(); + Unit* temp; + temp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetSpeed(MOVE_RUN, 2.0f); + temp->setFaction(me->getFaction()); + temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); + uiDefenderGUID[0] = temp->GetGUID(); + + temp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetSpeed(MOVE_RUN, 2.0f); + temp->setFaction(me->getFaction()); + temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); + uiEarthshatterGUID[0] = temp->GetGUID(); } - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetSpeed(MOVE_RUN, 2.0f); - pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); - DoScriptText(SAY_LIGHT_OF_DAWN50, pTemp); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetSpeed(MOVE_RUN, 2.0f); + temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); + DoScriptText(SAY_LIGHT_OF_DAWN50, temp); } - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetSpeed(MOVE_RUN, 2.0f); - pTemp->HandleEmoteCommand(EMOTE_STATE_ATTACK_UNARMED); - pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetSpeed(MOVE_RUN, 2.0f); + temp->HandleEmoteCommand(EMOTE_STATE_ATTACK_UNARMED); + temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); } - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->SetSpeed(MOVE_RUN, 2.0f); - pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->SetSpeed(MOVE_RUN, 2.0f); + temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ); } } JumpToNextStep(4500); break; case 43: // They all got kicked - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(EMOTE_LIGHT_OF_DAWN13, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(EMOTE_LIGHT_OF_DAWN13, temp); - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - pTemp->SetSpeed(MOVE_RUN, 6.0f); - pTemp->SetStandState(UNIT_STAND_STATE_DEAD); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[14].x, LightofDawnLoc[14].y, LightofDawnLoc[14].z); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + temp->SetSpeed(MOVE_RUN, 6.0f); + temp->SetStandState(UNIT_STAND_STATE_DEAD); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[14].x, LightofDawnLoc[14].y, LightofDawnLoc[14].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - pTemp->SetSpeed(MOVE_RUN, 6.0f); - pTemp->SetStandState(UNIT_STAND_STATE_DEAD); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[11].x, LightofDawnLoc[11].y, LightofDawnLoc[11].z); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + temp->SetSpeed(MOVE_RUN, 6.0f); + temp->SetStandState(UNIT_STAND_STATE_DEAD); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[11].x, LightofDawnLoc[11].y, LightofDawnLoc[11].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - pTemp->SetSpeed(MOVE_RUN, 6.0f); - pTemp->SetStandState(UNIT_STAND_STATE_DEAD); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[17].x, LightofDawnLoc[17].y, LightofDawnLoc[17].z); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + temp->SetSpeed(MOVE_RUN, 6.0f); + temp->SetStandState(UNIT_STAND_STATE_DEAD); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[17].x, LightofDawnLoc[17].y, LightofDawnLoc[17].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiDefenderGUID[0])) + if (Creature* temp = Unit::GetCreature(*me, uiDefenderGUID[0])) { - pTemp->SetSpeed(MOVE_RUN, 6.0f); - pTemp->SetStandState(UNIT_STAND_STATE_DEAD); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z); + temp->SetSpeed(MOVE_RUN, 6.0f); + temp->SetStandState(UNIT_STAND_STATE_DEAD); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[0])) + if (Creature* temp = Unit::GetCreature(*me, uiEarthshatterGUID[0])) { - pTemp->SetSpeed(MOVE_RUN, 6.0f); - pTemp->SetStandState(UNIT_STAND_STATE_DEAD); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z); + temp->SetSpeed(MOVE_RUN, 6.0f); + temp->SetStandState(UNIT_STAND_STATE_DEAD); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z); } JumpToNextStep(3000); break; case 44: // make them stand up - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_STAND); - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_STAND); - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_STAND); + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) + temp->SetStandState(UNIT_STAND_STATE_STAND); + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) + temp->SetStandState(UNIT_STAND_STATE_STAND); + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) + temp->SetStandState(UNIT_STAND_STATE_STAND); JumpToNextStep(1000); break; @@ -1121,182 +1121,182 @@ public: case 47: // Ashbringer rebirth me->SetStandState(UNIT_STAND_STATE_KNEEL); DoScriptText(EMOTE_LIGHT_OF_DAWN15, me); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) { - pTemp->SetStandState(UNIT_STAND_STATE_STAND); - pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_HIGHLORD_TIRION_FORDRING)); - pTemp->CastSpell(pTemp, SPELL_REBIRTH_OF_THE_ASHBRINGER, false); + temp->SetStandState(UNIT_STAND_STATE_STAND); + temp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_HIGHLORD_TIRION_FORDRING)); + temp->CastSpell(temp, SPELL_REBIRTH_OF_THE_ASHBRINGER, false); } JumpToNextStep(1000); break; case 48: // Show the cleansing effect (dawn of light) - //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) - // pGo->SetPhaseMask(128, true); + //if (GameObject* go = me->GetMap()->GetGameObject(uiDawnofLightGUID)) + // go->SetPhaseMask(128, true); me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896f, -5287.914f, 83.066f, 0, 0, 0, 0, 0, 30000); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) { - if (pTemp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0)) - pTemp->RemoveAurasDueToSpell(SPELL_REBIRTH_OF_THE_ASHBRINGER); - pTemp->CastSpell(pTemp, 41542, false); // workarounds, light expoded, makes it cool - pTemp->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); + if (temp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0)) + temp->RemoveAurasDueToSpell(SPELL_REBIRTH_OF_THE_ASHBRINGER); + temp->CastSpell(temp, 41542, false); // workarounds, light expoded, makes it cool + temp->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); } - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->InterruptNonMeleeSpells(false); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->InterruptNonMeleeSpells(false); JumpToNextStep(2500); break; case 49: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN54, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN54, temp); JumpToNextStep(4000); break; case 50: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN55, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN55, temp); JumpToNextStep(5000); break; case 51: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN56, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN56, temp); JumpToNextStep(1000); break; case 52: // Tiron charges - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) { - DoScriptText(EMOTE_LIGHT_OF_DAWN16, pTemp); - pTemp->CastSpell(pTemp, SPELL_TIRION_CHARGE, false); // jumping charge - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); - pTemp->SetSpeed(MOVE_RUN, 3.0f); // workarounds, make Tirion still running - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[2].x, LightofDawnLoc[2].y, LightofDawnLoc[2].z); - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->Relocate(LightofDawnLoc[28].x, LightofDawnLoc[28].y, LightofDawnLoc[28].z); // workarounds, he should kick back by Tirion, but here we relocate him + DoScriptText(EMOTE_LIGHT_OF_DAWN16, temp); + temp->CastSpell(temp, SPELL_TIRION_CHARGE, false); // jumping charge + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); + temp->SetSpeed(MOVE_RUN, 3.0f); // workarounds, make Tirion still running + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[2].x, LightofDawnLoc[2].y, LightofDawnLoc[2].z); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->Relocate(LightofDawnLoc[28].x, LightofDawnLoc[28].y, LightofDawnLoc[28].z); // workarounds, he should kick back by Tirion, but here we relocate him } JumpToNextStep(1500); break; case 53: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN57, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN57, temp); JumpToNextStep(1000); break; case 54: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) { - pTemp->SetSpeed(MOVE_RUN, 1.0f); + temp->SetSpeed(MOVE_RUN, 1.0f); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[29].x, LightofDawnLoc[29].y, LightofDawnLoc[29].z); // 26 + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[29].x, LightofDawnLoc[29].y, LightofDawnLoc[29].z); // 26 } JumpToNextStep(4000); break; case 55: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_KNEEL); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->SetStandState(UNIT_STAND_STATE_KNEEL); JumpToNextStep(2000); break; case 56: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->SetStandState(UNIT_STAND_STATE_STAND); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->SetStandState(UNIT_STAND_STATE_STAND); JumpToNextStep(1500); break; case 57: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN58, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN58, temp); JumpToNextStep(10000); break; case 58: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN59, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN59, temp); JumpToNextStep(10000); break; case 59: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->CastSpell(pTemp, SPELL_TELEPORT_VISUAL, false); - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion runs to Darion + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->CastSpell(temp, SPELL_TELEPORT_VISUAL, false); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion runs to Darion { - pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - pTemp->SetSpeed(MOVE_RUN, 1.0f); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[6].x, LightofDawnLoc[6].y, LightofDawnLoc[6].z); + temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + temp->SetSpeed(MOVE_RUN, 1.0f); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[6].x, LightofDawnLoc[6].y, LightofDawnLoc[6].z); } JumpToNextStep(2500); break; case 60: - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) // Lich king disappears here + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) // Lich king disappears here { - DoScriptText(EMOTE_LIGHT_OF_DAWN17, pTemp); - pTemp->Kill(pTemp); + DoScriptText(EMOTE_LIGHT_OF_DAWN17, temp); + temp->Kill(temp); } JumpToNextStep(10000); break; case 61: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN60, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN60, temp); JumpToNextStep(3000); break; case 62: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) { - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[7].x, LightofDawnLoc[7].y, LightofDawnLoc[7].z); + temp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[7].x, LightofDawnLoc[7].y, LightofDawnLoc[7].z); } JumpToNextStep(5500); break; case 63: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) { - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[8].x, LightofDawnLoc[8].y, LightofDawnLoc[8].z); - DoScriptText(SAY_LIGHT_OF_DAWN61, pTemp); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[8].x, LightofDawnLoc[8].y, LightofDawnLoc[8].z); + DoScriptText(SAY_LIGHT_OF_DAWN61, temp); } JumpToNextStep(15000); break; case 64: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN62, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN62, temp); JumpToNextStep(7000); break; case 65: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN63, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN63, temp); JumpToNextStep(10000); break; case 66: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN64, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN64, temp); JumpToNextStep(11000); break; case 67: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN65, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN65, temp); JumpToNextStep(10000); break; case 68: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN66, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN66, temp); JumpToNextStep(8000); break; case 69: - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN67, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN67, temp); JumpToNextStep(10000); break; @@ -1307,8 +1307,8 @@ public: break; case 71: - //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // Turn off dawn of light - // pGo->SetPhaseMask(0, true); + //if (GameObject* go = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // Turn off dawn of light + // go->SetPhaseMask(0, true); { Map* map = me->GetMap(); // search players with in 50 yards for quest credit @@ -1331,14 +1331,14 @@ public: break; case 73: - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) - pTemp->DespawnOrUnsummon(); - if (Creature* pTemp = Unit::GetCreature(*me, uiOrbazGUID)) - pTemp->DespawnOrUnsummon(); - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) - pTemp->DespawnOrUnsummon(); - if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID)) - pTemp->DespawnOrUnsummon(); + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) + temp->DespawnOrUnsummon(); + if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID)) + temp->DespawnOrUnsummon(); + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) + temp->DespawnOrUnsummon(); + if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) + temp->DespawnOrUnsummon(); me->DespawnOrUnsummon(); break; } @@ -1419,12 +1419,12 @@ public: if (uiFight_duration <= diff + 5000) { if (!uiTirionGUID) - if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) + if (Unit* temp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) { - pTemp->setFaction(me->getFaction()); - pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP)); - DoScriptText(SAY_LIGHT_OF_DAWN25, pTemp); - uiTirionGUID = pTemp->GetGUID(); + temp->setFaction(me->getFaction()); + temp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP)); + DoScriptText(SAY_LIGHT_OF_DAWN25, temp); + uiTirionGUID = temp->GetGUID(); } } if (uiFight_duration <= diff) @@ -1453,69 +1453,69 @@ public: for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i) DespawnNPC(uiWarriorGUID[i]); - if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID)) { - pTemp->RemoveAllAuras(); - pTemp->DeleteThreatList(); - pTemp->CombatStop(true); - pTemp->AttackStop(); - pTemp->setFaction(me->getFaction()); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[9].x, LightofDawnLoc[9].y, LightofDawnLoc[9].z); + temp->RemoveAllAuras(); + temp->DeleteThreatList(); + temp->CombatStop(true); + temp->AttackStop(); + temp->setFaction(me->getFaction()); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[9].x, LightofDawnLoc[9].y, LightofDawnLoc[9].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID)) { - pTemp->RemoveAllAuras(); - pTemp->DeleteThreatList(); - pTemp->CombatStop(true); - pTemp->AttackStop(); - pTemp->setFaction(me->getFaction()); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[12].x, LightofDawnLoc[12].y, LightofDawnLoc[12].z); + temp->RemoveAllAuras(); + temp->DeleteThreatList(); + temp->CombatStop(true); + temp->AttackStop(); + temp->setFaction(me->getFaction()); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[12].x, LightofDawnLoc[12].y, LightofDawnLoc[12].z); } - if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID)) { - pTemp->RemoveAllAuras(); - pTemp->DeleteThreatList(); - pTemp->CombatStop(true); - pTemp->AttackStop(); - pTemp->setFaction(me->getFaction()); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[15].x, LightofDawnLoc[15].y, LightofDawnLoc[15].z); + temp->RemoveAllAuras(); + temp->DeleteThreatList(); + temp->CombatStop(true); + temp->AttackStop(); + temp->setFaction(me->getFaction()); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[15].x, LightofDawnLoc[15].y, LightofDawnLoc[15].z); } DespawnNPC(uiRayneGUID); - if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID)) { - pTemp->RemoveAllAuras(); - pTemp->DeleteThreatList(); - pTemp->CombatStop(true); - pTemp->AttackStop(); - pTemp->setFaction(me->getFaction()); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[18].x, LightofDawnLoc[18].y, LightofDawnLoc[18].z); - pTemp->CastSpell(pTemp, SPELL_THE_LIGHT_OF_DAWN, false); + temp->RemoveAllAuras(); + temp->DeleteThreatList(); + temp->CombatStop(true); + temp->AttackStop(); + temp->setFaction(me->getFaction()); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[18].x, LightofDawnLoc[18].y, LightofDawnLoc[18].z); + temp->CastSpell(temp, SPELL_THE_LIGHT_OF_DAWN, false); } - if (Creature* pTemp = Unit::GetCreature(*me, uiOrbazGUID)) - DoScriptText(EMOTE_LIGHT_OF_DAWN04, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID)) + DoScriptText(EMOTE_LIGHT_OF_DAWN04, temp); - if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID)) + if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID)) { - pTemp->RemoveAllAuras(); - pTemp->DeleteThreatList(); - pTemp->CombatStop(true); - pTemp->AttackStop(); - pTemp->setFaction(me->getFaction()); - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[20].x, LightofDawnLoc[20].y, LightofDawnLoc[20].z); - pTemp->CastSpell(pTemp, SPELL_THE_LIGHT_OF_DAWN, false); + temp->RemoveAllAuras(); + temp->DeleteThreatList(); + temp->CombatStop(true); + temp->AttackStop(); + temp->setFaction(me->getFaction()); + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[20].x, LightofDawnLoc[20].y, LightofDawnLoc[20].z); + temp->CastSpell(temp, SPELL_THE_LIGHT_OF_DAWN, false); } - if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) - DoScriptText(SAY_LIGHT_OF_DAWN26, pTemp); + if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) + DoScriptText(SAY_LIGHT_OF_DAWN26, temp); SetHoldState(false); @@ -1533,130 +1533,130 @@ public: void NPCChangeTarget(uint64 ui_GUID) { - if (Creature* pTemp = Unit::GetCreature(*me, ui_GUID)) - if (pTemp->isAlive()) + if (Creature* temp = Unit::GetCreature(*me, ui_GUID)) + if (temp->isAlive()) if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarger->isAlive()) { - // pTemp->DeleteThreatList(); - pTemp->AddThreat(pTarger, 0.0f); - pTemp->AI()->AttackStart(pTarger); - pTemp->SetInCombatWith(pTarger); - pTarger->SetInCombatWith(pTemp); - // pTemp->GetMotionMaster()->MoveChase(pTarger, 20.0f); + // temp->DeleteThreatList(); + temp->AddThreat(pTarger, 0.0f); + temp->AI()->AttackStart(pTarger); + temp->SetInCombatWith(pTarger); + pTarger->SetInCombatWith(temp); + // temp->GetMotionMaster()->MoveChase(pTarger, 20.0f); } } void SpawnNPC() { - Unit* pTemp = NULL; + Unit* temp = NULL; // Death for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiGhoulGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiGhoulGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_ACHERUS_GHOUL, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2084); - uiGhoulGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_ACHERUS_GHOUL, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2084); + uiGhoulGUID[i] = temp->GetGUID(); } } for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiAbominationGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2084); - uiAbominationGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2084); + uiAbominationGUID[i] = temp->GetGUID(); } } for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiWarriorGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiWarriorGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2084); - uiWarriorGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2084); + uiWarriorGUID[i] = temp->GetGUID(); } } for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiBehemothGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiBehemothGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_FLESH_BEHEMOTH, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2084); - uiBehemothGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_FLESH_BEHEMOTH, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2084); + uiBehemothGUID[i] = temp->GetGUID(); } } // Dawn for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiDefenderGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiDefenderGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiDefenderGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiDefenderGUID[i] = temp->GetGUID(); } } for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i) { - pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i]); - if (!pTemp) + temp = Unit::GetCreature(*me, uiEarthshatterGUID[i]); + if (!temp) { - pTemp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiEarthshatterGUID[i] = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiEarthshatterGUID[i] = temp->GetGUID(); } } - pTemp = Unit::GetCreature(*me, uiKorfaxGUID); - if (!pTemp) + temp = Unit::GetCreature(*me, uiKorfaxGUID); + if (!temp) { - pTemp = me->SummonCreature(NPC_KORFAX_CHAMPION_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiKorfaxGUID = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_KORFAX_CHAMPION_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiKorfaxGUID = temp->GetGUID(); } - pTemp = Unit::GetCreature(*me, uiMaxwellGUID); - if (!pTemp) + temp = Unit::GetCreature(*me, uiMaxwellGUID); + if (!temp) { - pTemp = me->SummonCreature(NPC_LORD_MAXWELL_TYROSUS, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiMaxwellGUID = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_LORD_MAXWELL_TYROSUS, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiMaxwellGUID = temp->GetGUID(); } - pTemp = Unit::GetCreature(*me, uiEligorGUID); - if (!pTemp) + temp = Unit::GetCreature(*me, uiEligorGUID); + if (!temp) { - pTemp = me->SummonCreature(NPC_COMMANDER_ELIGOR_DAWNBRINGER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiEligorGUID = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_COMMANDER_ELIGOR_DAWNBRINGER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiEligorGUID = temp->GetGUID(); } - pTemp = Unit::GetCreature(*me, uiRayneGUID); - if (!pTemp) + temp = Unit::GetCreature(*me, uiRayneGUID); + if (!temp) { - pTemp = me->SummonCreature(NPC_RAYNE, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - pTemp->setFaction(2089); - me->AddThreat(pTemp, 0.0f); - uiRayneGUID = pTemp->GetGUID(); + temp = me->SummonCreature(NPC_RAYNE, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); + temp->setFaction(2089); + me->AddThreat(temp, 0.0f); + uiRayneGUID = temp->GetGUID(); } } void DespawnNPC(uint64 pGUID) { - if (Creature* pTemp = Unit::GetCreature(*me, pGUID)) - if (pTemp->isAlive()) + if (Creature* temp = Unit::GetCreature(*me, pGUID)) + if (temp->isAlive()) { - pTemp->SetVisible(false); - pTemp->Kill(pTemp); + temp->SetVisible(false); + temp->Kill(temp); } } }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 9296bd09bbc..667e1cd279e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -361,10 +361,10 @@ public: { boss_headless_horsemanAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 headGUID; uint64 PlayerGUID; @@ -413,8 +413,8 @@ public: headGUID = 0; } - //if (pInstance) - // pInstance->SetData(DATA_HORSEMAN_EVENT, NOT_STARTED); + //if (instance) + // instance->SetData(DATA_HORSEMAN_EVENT, NOT_STARTED); } void FlyMode() @@ -450,8 +450,8 @@ public: break; } case 6: - if (pInstance) - pInstance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject + if (instance) + instance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject break; case 19: me->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); @@ -473,8 +473,8 @@ public: void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); DoZoneInCombat(); } void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);} @@ -503,10 +503,10 @@ public: Player* SelectRandomPlayer(float range = 0.0f, bool checkLoS = true) { - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) return NULL; + Map* map = me->GetMap(); + if (!map->IsDungeon()) return NULL; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList::const_iterator i; if (PlayerList.isEmpty()) return NULL; @@ -542,8 +542,8 @@ public: flame->CastSpell(flame, SPELL_BODY_FLAME, false); if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); - if (pInstance) - pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); + if (instance) + instance->SetData(DATA_HORSEMAN_EVENT, DONE); } void SpellHit(Unit* caster, const SpellInfo* spell) @@ -824,12 +824,12 @@ public: bool OnGossipHello(Player* player, GameObject* soil) { - InstanceScript* pInstance = player->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = player->GetInstanceScript(); + if (instance) { - if (pInstance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED) + if (instance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED) return true; - pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); + instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); } /* if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && player->getLevel() > 64) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index bb857f8362b..2277d867455 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -51,10 +51,10 @@ public: { boss_interrogator_vishasAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool Yell30; bool Yell60; @@ -77,11 +77,11 @@ public: void JustDied(Unit* /*Killer*/) { - if (!pInstance) + if (!instance) return; //Any other actions to do with vorrel? setStandState? - if (Unit* vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) + if (Unit* vorrel = Unit::GetUnit(*me, instance->GetData64(DATA_VORREL))) DoScriptText(SAY_TRIGGER_VORREL, vorrel); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index a10f3ee4a5c..3b788c72cd8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -67,10 +67,10 @@ public: { boss_scarlet_commander_mograineAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiCrusaderStrike_Timer; uint32 m_uiHammerOfJustice_Timer; @@ -89,9 +89,9 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetStandState(UNIT_STAND_STATE_STAND); - if (m_pInstance) + if (m_instance) if (me->isAlive()) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); + m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); m_bHasDied = false; m_bHeal = false; @@ -100,10 +100,10 @@ public: void JustReachedHome() { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT != NOT_STARTED)) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL); + if (m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT != NOT_STARTED)) + m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL); } } @@ -125,13 +125,13 @@ public: if (uiDamage < me->GetHealth() || m_bHasDied || m_bFakeDeath) return; - if (!m_pInstance) + if (!m_instance) return; //On first death, fake death and open door, as well as initiate whitemane if exist - if (Unit* Whitemane = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_WHITEMANE))) + if (Unit* Whitemane = Unit::GetUnit((*me), m_instance->GetData64(DATA_WHITEMANE))) { - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS); + m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS); Whitemane->GetMotionMaster()->MovePoint(1, 1163.113370f, 1398.856812f, 32.527786f); @@ -165,8 +165,8 @@ public: DoScriptText(SAY_MO_RESSURECTED, me); m_bFakeDeath = false; - if (m_pInstance) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, SPECIAL); + if (m_instance) + m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, SPECIAL); } } @@ -175,10 +175,10 @@ public: if (!UpdateVictim()) return; - if (m_bHasDied && !m_bHeal && m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL) + if (m_bHasDied && !m_bHeal && m_instance && m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL) { //On ressurection, stop fake death and heal whitemane and resume fight - if (Unit* Whitemane = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_WHITEMANE))) + if (Unit* Whitemane = Unit::GetUnit((*me), m_instance->GetData64(DATA_WHITEMANE))) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -232,10 +232,10 @@ public: { boss_high_inquisitor_whitemaneAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiHeal_Timer; uint32 m_uiPowerWordShield_Timer; @@ -255,14 +255,14 @@ public: m_bCanResurrectCheck = false; m_bCanResurrect = false; - if (m_pInstance) + if (m_instance) if (me->isAlive()) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); + m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); } void AttackStart(Unit* who) { - if (m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED) + if (m_instance && m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED) return; ScriptedAI::AttackStart(who); @@ -286,9 +286,9 @@ public: if (m_bCanResurrect) { //When casting resuruction make sure to delay so on rez when reinstate battle deepsleep runs out - if (m_pInstance && m_uiWait_Timer <= uiDiff) + if (m_instance && m_uiWait_Timer <= uiDiff) { - if (Unit* Mograine = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_MOGRAINE))) + if (Unit* Mograine = Unit::GetUnit((*me), m_instance->GetData64(DATA_MOGRAINE))) { DoCast(Mograine, SPELL_SCARLETRESURRECTION); DoScriptText(SAY_WH_RESSURECT, me); @@ -322,9 +322,9 @@ public: if (!HealthAbovePct(75)) target = me; - if (m_pInstance) + if (m_instance) { - if (Creature* pMograine = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_MOGRAINE))) + if (Creature* pMograine = Unit::GetCreature((*me), m_instance->GetData64(DATA_MOGRAINE))) { // checking m_bCanResurrectCheck prevents her healing Mograine while he is "faking death" if (m_bCanResurrectCheck && pMograine->isAlive() && !pMograine->HealthAbovePct(75)) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 256525379cd..ba3759e7062 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -38,14 +38,14 @@ class instance_scarlet_monastery : public InstanceMapScript public: instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery", 189) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_scarlet_monastery_InstanceMapScript(pMap); + return new instance_scarlet_monastery_InstanceMapScript(map); } struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript { - instance_scarlet_monastery_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 PumpkinShrineGUID; uint64 HorsemanGUID; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 4e935280a6e..12dd67e009d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -64,10 +64,10 @@ public: { boss_darkmaster_gandlingAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ArcaneMissiles_Timer; uint32 ShadowShield_Timer; @@ -88,8 +88,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(TYPE_GANDLING, DONE); + if (instance) + instance->SetData(TYPE_GANDLING, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index f7760fc8ca0..4ea79c8332a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -60,12 +60,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0); + instance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 16e7ecfd4bc..a5c1436153b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -60,12 +60,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0); + instance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 1b4ae929e17..e7388503177 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -67,12 +67,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0); + instance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 3b6d3557265..ac9a62f2b27 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -56,12 +56,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0); + instance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index f3743230fc8..a575d039dfa 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -60,12 +60,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0); + instance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index cedcd626261..052e950b4e8 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -62,12 +62,12 @@ public: void JustDied(Unit* /*killer*/) { - InstanceScript* pInstance = me->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = me->GetInstanceScript(); + if (instance) { - pInstance->SetData(DATA_THERAVENIAN_DEATH, 0); + instance->SetData(DATA_THERAVENIAN_DEATH, 0); - if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) + if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS) me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index ccbe8336097..a96fe8b935b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -42,14 +42,14 @@ class instance_scholomance : public InstanceMapScript public: instance_scholomance() : InstanceMapScript("instance_scholomance", 289) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_scholomance_InstanceMapScript(pMap); + return new instance_scholomance_InstanceMapScript(map); } struct instance_scholomance_InstanceMapScript : public InstanceScript { - instance_scholomance_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_scholomance_InstanceMapScript(Map* map) : InstanceScript(map) {} //Lord Alexei Barov, Doctor Theolen Krastinov, The Ravenian, Lorekeeper Polkelt, Instructor Malicia and the Lady Illucia Barov. bool IsBossDied[6]; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 5de6143e5a4..d5a641fc0f6 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -59,14 +59,14 @@ class instance_shadowfang_keep : public InstanceMapScript public: instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep", 33) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_shadowfang_keep_InstanceMapScript(pMap); + return new instance_shadowfang_keep_InstanceMapScript(map); } struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript { - instance_shadowfang_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index e034fa098f4..666bc690f8d 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -78,9 +78,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE) + if (instance && instance->GetData(TYPE_FREE_NPC) != DONE && instance->GetData(TYPE_RETHILGORE) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -92,11 +92,11 @@ public: { npc_shadowfang_prisonerAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); uiNpcEntry = c->GetEntry(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiNpcEntry; void WaypointReached(uint32 uiPoint) @@ -125,8 +125,8 @@ public: else DoScriptText(SAY_POST1_DOOR_AD, me); - if (pInstance) - pInstance->SetData(TYPE_FREE_NPC, DONE); + if (instance) + instance->SetData(TYPE_FREE_NPC, DONE); break; case 13: if (uiNpcEntry != NPC_ASH) @@ -155,10 +155,10 @@ public: { npc_arugal_voidwalkerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiDarkOffering; @@ -189,8 +189,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(TYPE_FENRUS, pInstance->GetData(TYPE_FENRUS) + 1); + if (instance) + instance->SetData(TYPE_FENRUS, instance->GetData(TYPE_FENRUS) + 1); } }; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 65f6e6fbf69..86cd3019fd8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -91,10 +91,10 @@ public: { boss_baron_rivendareAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ShadowBolt_Timer; uint32 Cleave_Timer; @@ -109,14 +109,14 @@ public: MortalStrike_Timer = 12000; // RaiseDead_Timer = 30000; SummonSkeletons_Timer = 34000; - if (pInstance && pInstance->GetData(TYPE_RAMSTEIN) == DONE) - pInstance->SetData(TYPE_BARON, NOT_STARTED); + if (instance && instance->GetData(TYPE_RAMSTEIN) == DONE) + instance->SetData(TYPE_BARON, NOT_STARTED); } void AttackStart(Unit* who) { - if (pInstance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door - pInstance->SetData(TYPE_BARON, IN_PROGRESS); + if (instance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door + instance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } @@ -128,8 +128,8 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(TYPE_BARON, DONE); + if (instance) + instance->SetData(TYPE_BARON, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index bdd12326a8f..3cd6078eb41 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -45,10 +45,10 @@ public: { boss_baroness_anastariAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BansheeWail_Timer; uint32 BansheeCurse_Timer; @@ -69,8 +69,8 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(TYPE_BARONESS, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_BARONESS, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 521348dd0db..cb423d9a781 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -45,10 +45,10 @@ public: { boss_maleki_the_pallidAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Frostbolt_Timer; uint32 IceTomb_Timer; @@ -67,8 +67,8 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(TYPE_PALLID, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_PALLID, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 34faab240f6..13ce7631be5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -45,10 +45,10 @@ public: { boss_nerubenkanAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 EncasingWebs_Timer; uint32 PierceArmor_Timer; @@ -69,8 +69,8 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(TYPE_NERUB, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_NERUB, IN_PROGRESS); } void RaiseUndeadScarab(Unit* victim) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index 980e8e41a6a..b93d289e0cc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -56,10 +56,10 @@ public: { boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 HolyLight_Timer; uint32 DivineShield_Timer; @@ -69,24 +69,24 @@ public: HolyLight_Timer = 20000; DivineShield_Timer = 20000; - if (pInstance) + if (instance) { switch (me->GetEntry()) { case SH_AELMAR: - pInstance->SetData(TYPE_SH_AELMAR, 0); + instance->SetData(TYPE_SH_AELMAR, 0); break; case SH_CATHELA: - pInstance->SetData(TYPE_SH_CATHELA, 0); + instance->SetData(TYPE_SH_CATHELA, 0); break; case SH_GREGOR: - pInstance->SetData(TYPE_SH_GREGOR, 0); + instance->SetData(TYPE_SH_GREGOR, 0); break; case SH_NEMAS: - pInstance->SetData(TYPE_SH_NEMAS, 0); + instance->SetData(TYPE_SH_NEMAS, 0); break; case SH_VICAR: - pInstance->SetData(TYPE_SH_VICAR, 0); + instance->SetData(TYPE_SH_VICAR, 0); break; } } @@ -98,27 +98,27 @@ public: void JustDied(Unit* Killer) { - if (pInstance) + if (instance) { switch (me->GetEntry()) { case SH_AELMAR: - pInstance->SetData(TYPE_SH_AELMAR, 2); + instance->SetData(TYPE_SH_AELMAR, 2); break; case SH_CATHELA: - pInstance->SetData(TYPE_SH_CATHELA, 2); + instance->SetData(TYPE_SH_CATHELA, 2); break; case SH_GREGOR: - pInstance->SetData(TYPE_SH_GREGOR, 2); + instance->SetData(TYPE_SH_GREGOR, 2); break; case SH_NEMAS: - pInstance->SetData(TYPE_SH_NEMAS, 2); + instance->SetData(TYPE_SH_NEMAS, 2); break; case SH_VICAR: - pInstance->SetData(TYPE_SH_VICAR, 2); + instance->SetData(TYPE_SH_VICAR, 2); break; } - if (pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER) + if (instance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER) CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index aa9ba7b74b3..5d7e6c9467e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -45,10 +45,10 @@ public: { boss_ramstein_the_gorgerAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Trample_Timer; uint32 Knockout_Timer; @@ -71,8 +71,8 @@ public: mob->AI()->AttackStart(me->SelectNearestTarget(100.0f)); } - if (pInstance) - pInstance->SetData(TYPE_RAMSTEIN, DONE); + if (instance) + instance->SetData(TYPE_RAMSTEIN, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 2f8d333735f..39019c46850 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Stratholme SD%Complete: 100 -SDComment: Misc mobs for instance. pGo-script to apply aura and start event for quest 8945 +SDComment: Misc mobs for instance. go-script to apply aura and start event for quest 8945 SDCategory: Stratholme EndScriptData */ @@ -43,14 +43,14 @@ class go_gauntlet_gate : public GameObjectScript public: go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - InstanceScript* pInstance = pGo->GetInstanceScript(); + InstanceScript* instance = go->GetInstanceScript(); - if (!pInstance) + if (!instance) return false; - if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED) + if (instance->GetData(TYPE_BARON_RUN) != NOT_STARTED) return false; if (Group* group = player->GetGroup()) @@ -63,15 +63,15 @@ public: if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pGroupie->HasAura(SPELL_BARON_ULTIMATUM) && - pGroupie->GetMap() == pGo->GetMap()) + pGroupie->GetMap() == go->GetMap()) pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true); } } else if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !player->HasAura(SPELL_BARON_ULTIMATUM) && - player->GetMap() == pGo->GetMap()) + player->GetMap() == go->GetMap()) player->CastSpell(player, SPELL_BARON_ULTIMATUM, true); - pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS); + instance->SetData(TYPE_BARON_RUN, IN_PROGRESS); return false; } @@ -177,9 +177,9 @@ public: { if (Die_Timer <= diff) { - if (Unit* pTemp = Unit::GetUnit(*me, Tagger)) + if (Unit* temp = Unit::GetUnit(*me, Tagger)) { - CAST_PLR(pTemp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); + CAST_PLR(temp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); me->Kill(me); } } else Die_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 7c807859cbe..931fc46a85a 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -44,14 +44,14 @@ class instance_sunken_temple : public InstanceMapScript public: instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", 109) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_sunken_temple_InstanceMapScript(pMap); + return new instance_sunken_temple_InstanceMapScript(map); } struct instance_sunken_temple_InstanceMapScript : public InstanceScript { - instance_sunken_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map) { } diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index caffb6c55d4..50eb34e6ffb 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -56,10 +56,10 @@ class go_atalai_statue : public GameObjectScript public: go_atalai_statue() : GameObjectScript("go_atalai_statue") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - if (InstanceScript* pInstance = player->GetInstanceScript()) - pInstance->SetData(EVENT_STATE, pGo->GetEntry()); + if (InstanceScript* instance = player->GetInstanceScript()) + instance->SetData(EVENT_STATE, go->GetEntry()); return false; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 5123bd2c0ec..75bca682660 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -80,11 +80,11 @@ public: { boss_brutallusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Intro = true; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SlashTimer; uint32 BurnTimer; @@ -115,16 +115,16 @@ public: DoCast(me, SPELL_DUAL_WIELD, true); - if (pInstance) - pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -136,9 +136,9 @@ public: { DoScriptText(YELL_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE); + instance->SetData(DATA_BRUTALLUS_EVENT, DONE); float x, y, z; me->GetPosition(x, y, z); me->SummonCreature(FELMYST, x, y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0); @@ -155,7 +155,7 @@ public: { if (!Intro || IsIntro) return; - Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0); if (Madrigosa) { Madrigosa->Respawn(); @@ -191,7 +191,7 @@ public: void DoIntro() { - Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0); + Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0); if (!Madrigosa) return; @@ -271,8 +271,8 @@ public: { if (!me->IsValidAttackTarget(who)) return; - if (pInstance && Intro) - pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL); + if (instance && Intro) + instance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL); if (Intro && !IsIntro) StartIntro(); @@ -292,7 +292,7 @@ public: { if (IntroFrostBoltTimer <= diff) { - if (Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0)) + if (Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0)) { Madrigosa->CastSpell(me, SPELL_INTRO_FROSTBOLT, true); IntroFrostBoltTimer = 2000; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 4ca0846b04c..d00f2b8de48 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -99,10 +99,10 @@ public: { boss_sacrolashAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool SisterDeath; bool Enraged; @@ -118,9 +118,9 @@ public: { Enraged = false; - if (pInstance) + if (instance) { - Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS)); if (Temp) { if (Temp->isDead()) @@ -142,23 +142,23 @@ public: SisterDeath = false; } - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } void EnterCombat(Unit* who) { DoZoneInCombat(); - if (pInstance) + if (instance) { - Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -174,8 +174,8 @@ public: { DoScriptText(SAY_SAC_DEAD, me); - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE); } else me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -228,10 +228,10 @@ public: { if (!SisterDeath) { - if (pInstance) + if (instance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); + Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_ALYTHESS_DEAD, me); @@ -357,11 +357,11 @@ public: { boss_alythessAI(Creature* c) : Scripted_NoMovementAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); IntroStepCounter = 10; } - InstanceScript* pInstance; + InstanceScript* instance; bool SisterDeath; bool Enraged; @@ -380,9 +380,9 @@ public: { Enraged = false; - if (pInstance) + if (instance) { - Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH)); if (Temp) { if (Temp->isDead()) @@ -405,23 +405,23 @@ public: SisterDeath = false; } - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } void EnterCombat(Unit* who) { DoZoneInCombat(); - if (pInstance) + if (instance) { - Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } void AttackStart(Unit* who) @@ -468,8 +468,8 @@ public: { DoScriptText(YELL_ALY_DEAD, me); - if (pInstance) - pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE); + if (instance) + instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE); } else me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -524,7 +524,7 @@ public: uint32 IntroStep(uint32 step) { - Creature* Sacrolash = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_SACROLASH) : 0); + Creature* Sacrolash = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_SACROLASH) : 0); switch (step) { case 0: return 0; @@ -564,10 +564,10 @@ public: if (!SisterDeath) { - if (pInstance) + if (instance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); + Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_SACROLASH_DEAD, me); @@ -579,9 +579,9 @@ public: } if (!me->getVictim()) { - if (pInstance) + if (instance) { - Creature* sisiter = Unit::GetCreature((*me), pInstance->GetData64(DATA_SACROLASH)); + Creature* sisiter = Unit::GetCreature((*me), instance->GetData64(DATA_SACROLASH)); if (sisiter && !sisiter->isDead() && sisiter->getVictim()) { me->AddThreat(sisiter->getVictim(), 0.0f); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index b79ec3a542d..4de719d684e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -117,10 +117,10 @@ public: { boss_felmystAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; PhaseFelmyst phase; EventMap events; @@ -144,8 +144,8 @@ public: DespawnSummons(MOB_VAPOR_TRAIL); me->setActive(false); - if (pInstance) - pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -158,8 +158,8 @@ public: DoCast(me, AURA_NOXIOUS_FUMES, true); EnterPhase(PHASE_GROUND); - if (pInstance) - pInstance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); } void AttackStart(Unit* who) @@ -188,8 +188,8 @@ public: { DoScriptText(YELL_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_FELMYST_EVENT, DONE); + if (instance) + instance->SetData(DATA_FELMYST_EVENT, DONE); } void SpellHit(Unit* caster, const SpellInfo* spell) @@ -284,7 +284,7 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!target) - target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0); if (!target) { @@ -311,7 +311,7 @@ public: Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!target) - target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0); if (!target) { @@ -319,7 +319,7 @@ public: return; } - //pTarget->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support + //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support Creature* pVapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (pVapor) { @@ -341,7 +341,7 @@ public: { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!target) - target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0); if (!target) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index df20eab39de..2e4e92685ea 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -117,14 +117,14 @@ public: { boss_kalecgosAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); SathGUID = 0; DoorGUID = 0; bJustReset = false; me->setActive(true); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ArcaneBuffetTimer; uint32 FrostBreathTimer; @@ -146,10 +146,10 @@ public: void Reset() { - if (pInstance) + if (instance) { - SathGUID = pInstance->GetData64(DATA_SATHROVARR); - pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); + SathGUID = instance->GetData64(DATA_SATHROVARR); + instance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); } if (Creature* Sath = Unit::GetCreature(*me, SathGUID)) @@ -351,8 +351,8 @@ public: DoScriptText(SAY_EVIL_AGGRO, me); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -445,7 +445,7 @@ public: struct boss_kalecAI : public ScriptedAI { - InstanceScript* pInstance; + InstanceScript* instance; uint32 RevitalizeTimer; uint32 HeroicStrikeTimer; @@ -458,13 +458,13 @@ public: boss_kalecAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } void Reset() { - if (pInstance) - SathGUID = pInstance->GetData64(DATA_SATHROVARR); + if (instance) + SathGUID = instance->GetData64(DATA_SATHROVARR); RevitalizeTimer = 5000; HeroicStrikeTimer = 3000; @@ -540,14 +540,14 @@ class kalecgos_teleporter : public GameObjectScript public: kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { uint8 SpectralPlayers = 0; - Map* pMap = pGo->GetMap(); - if (!pMap->IsDungeon()) + Map* map = go->GetMap(); + if (!map->IsDungeon()) return true; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5) @@ -577,12 +577,12 @@ public: { boss_sathrovarrAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); KalecGUID = 0; KalecgosGUID = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 CorruptionStrikeTimer; uint32 AgonyCurseTimer; @@ -600,10 +600,10 @@ public: { me->SetFullHealth();//dunno why it does not resets health at evade.. me->setActive(true); - if (pInstance) + if (instance) { - KalecgosGUID = pInstance->GetData64(DATA_KALECGOS_DRAGON); - pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); + KalecgosGUID = instance->GetData64(DATA_KALECGOS_DRAGON); + instance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED); } if (KalecGUID) { @@ -669,15 +669,15 @@ public: CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = true; } - if (pInstance) - pInstance->SetData(DATA_KALECGOS_EVENT, DONE); + if (instance) + instance->SetData(DATA_KALECGOS_EVENT, DONE); } void TeleportAllPlayersBack() { - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) return; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + if (!map->IsDungeon()) return; + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index e81d4975378..b29a0c491cc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -253,10 +253,10 @@ public: { boss_kalecgos_kjAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 OrbsEmpowered; uint8 EmpowerCount; @@ -275,19 +275,19 @@ public: GameObject* GetOrb(int32 index) { - if (!pInstance) + if (!instance) return NULL; switch (index) { case 0: - return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1)); + return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1)); case 1: - return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_2)); + return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_2)); case 2: - return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_3)); + return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_3)); case 3: - return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_4)); + return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_4)); } return NULL; @@ -374,19 +374,19 @@ class go_orb_of_the_blue_flight : public GameObjectScript public: go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35) + if (go->GetUInt32Value(GAMEOBJECT_FACTION) == 35) { - InstanceScript* pInstance = pGo->GetInstanceScript(); + InstanceScript* instance = go->GetInstanceScript(); player->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); player->CastSpell(player, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false); - pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0); + go->SetUInt32Value(GAMEOBJECT_FACTION, 0); - if (Creature* pKalec = Unit::GetCreature(*player, pInstance->GetData64(DATA_KALECGOS_KJ))) + if (Creature* pKalec = Unit::GetCreature(*player, instance->GetData64(DATA_KALECGOS_KJ))) CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->SetRingOfBlueFlames(); - pGo->Refresh(); + go->Refresh(); } return true; } @@ -408,10 +408,10 @@ public: { mob_kiljaeden_controllerAI(Creature* c) : Scripted_NoMovementAI(c), summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList summons; bool bSummonedDeceivers; @@ -434,7 +434,7 @@ public: { phase = PHASE_DECEIVERS; - if (Creature* pKalecKJ = Unit::GetCreature((*me), pInstance->GetData64(DATA_KALECGOS_KJ))) + if (Creature* pKalecKJ = Unit::GetCreature((*me), instance->GetData64(DATA_KALECGOS_KJ))) CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalecKJ->AI())->ResetOrbs(); deceiverDeathCount = 0; bSummonedDeceivers = false; @@ -467,7 +467,7 @@ public: { if (uiRandomSayTimer < diff) { - if (pInstance && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED) + if (instance && instance->GetData(DATA_MURU_EVENT) != DONE && instance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED) DoScriptText(RAND(SAY_KJ_OFFCOMBAT1, SAY_KJ_OFFCOMBAT2, SAY_KJ_OFFCOMBAT3, SAY_KJ_OFFCOMBAT4, SAY_KJ_OFFCOMBAT5), me); uiRandomSayTimer = 30000; } else uiRandomSayTimer -= diff; @@ -508,10 +508,10 @@ public: { boss_kiljaedenAI(Creature* c) : Scripted_NoMovementAI(c), summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList summons; uint8 Phase; @@ -567,9 +567,9 @@ public: OrbActivated = false; SpeechBegins = true; - if (pInstance) + if (instance) { - if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ))) + if (Creature* pKalec = Unit::GetCreature(*me, instance->GetData64(DATA_KALECGOS_KJ))) pKalec->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES); } me->SetFloatValue(UNIT_FIELD_COMBATREACH, 12); @@ -616,8 +616,8 @@ public: DoScriptText(SAY_KJ_DEATH, me); summons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_KILJAEDEN_EVENT, DONE); + if (instance) + instance->SetData(DATA_KILJAEDEN_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -631,9 +631,9 @@ public: summons.DespawnAll(); // Reset the controller - if (pInstance) + if (instance) { - if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER))) + if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER))) CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->Reset(); } } @@ -722,11 +722,11 @@ public: if (Speeches[speechCount].timer < SpeechTimer) { SpeechTimer = 0; - if (pInstance) - if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].creature))) + if (instance) + if (Creature* pSpeechCreature = Unit::GetCreature(*me, instance->GetData64(Speeches[speechCount].creature))) DoScriptText(Speeches[speechCount].textid, pSpeechCreature); if (speechCount == 12) - if (Creature* pAnveena = Unit::GetCreature(*me, pInstance->GetData64(DATA_ANVEENA))) + if (Creature* pAnveena = Unit::GetCreature(*me, instance->GetData64(DATA_ANVEENA))) pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false); // ChangeTimers(true, 10000); // Kil should do an emote while screaming without attacking for 10 seconds if (speechCount == speechPhaseEnd) @@ -825,8 +825,8 @@ public: } break; case TIMER_ORBS_EMPOWER: //Phase 3 - if (pInstance) - if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ))) + if (instance) + if (Creature* pKalec = Unit::GetCreature(*me, instance->GetData64(DATA_KALECGOS_KJ))) { switch (Phase) { @@ -922,10 +922,10 @@ public: { mob_hand_of_the_deceiverAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ShadowBoltVolleyTimer; uint32 FelfirePortalTimer; @@ -935,8 +935,8 @@ public: // TODO: Timers! ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment. FelfirePortalTimer = 20000; - if (pInstance) - pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); } void JustSummoned(Creature* summoned) @@ -947,10 +947,10 @@ public: void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_KILJAEDEN_EVENT, IN_PROGRESS); - if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER))) + instance->SetData(DATA_KILJAEDEN_EVENT, IN_PROGRESS); + if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER))) pControl->AddThreat(who, 1.0f); } me->InterruptNonMeleeSpells(true); @@ -958,10 +958,10 @@ public: void JustDied(Unit* /*killer*/) { - if (!pInstance) + if (!instance) return; - if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER))) + if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER))) ++(CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount); } @@ -1181,10 +1181,10 @@ public: { mob_shield_orbAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bPointReached; bool bClockwise; @@ -1237,7 +1237,7 @@ public: if (uiTimer <= diff) { - if (Unit* random = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0)) + if (Unit* random = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0)) DoCast(random, SPELL_SHADOW_BOLT, false); uiTimer = urand(500, 1000); } else uiTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 50a5c83c370..fd11b4a4985 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -115,10 +115,10 @@ public: { boss_entropiusAI(Creature* c) : ScriptedAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList Summons; uint32 BlackHoleSummonTimer; @@ -130,8 +130,8 @@ public: Summons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -139,8 +139,8 @@ public: DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); - if (pInstance) - pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } void JustSummoned(Creature* summoned) @@ -165,8 +165,8 @@ public: { Summons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_MURU_EVENT, DONE); + if (instance) + instance->SetData(DATA_MURU_EVENT, DONE); } void UpdateAI(const uint32 diff) @@ -215,10 +215,10 @@ public: { boss_muruAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList Summons; uint8 Phase; @@ -242,16 +242,16 @@ public: Summons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY, false); - if (pInstance) - pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } void DamageTaken(Unit* /*done_by*/, uint32 &damage) @@ -292,9 +292,9 @@ public: { if (Timer[TIMER_PHASE] <= diff) { - if (!pInstance) + if (!instance) return; - switch (pInstance->GetData(DATA_MURU_EVENT)) + switch (instance->GetData(DATA_MURU_EVENT)) { case NOT_STARTED: Reset(); @@ -380,10 +380,10 @@ public: { npc_muru_portalAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList Summons; @@ -406,8 +406,8 @@ public: void JustSummoned(Creature* summoned) { - if (pInstance) - if (Player* Target = Unit::GetPlayer(*me, pInstance->GetData64(DATA_PLAYER_GUID))) + if (instance) + if (Player* Target = Unit::GetPlayer(*me, instance->GetData64(DATA_PLAYER_GUID))) summoned->AI()->AttackStart(Target); Summons.Summon(summoned); @@ -435,7 +435,7 @@ public: { if (!SummonSentinel) { - if (InAction && pInstance && pInstance->GetData(DATA_MURU_EVENT) == NOT_STARTED) + if (InAction && instance && instance->GetData(DATA_MURU_EVENT) == NOT_STARTED) Reset(); return; } @@ -583,10 +583,10 @@ public: { npc_blackholeAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 DespawnTimer; uint32 SpellTimer; @@ -607,7 +607,7 @@ public: { if (SpellTimer <= diff) { - Unit* Victim = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + Unit* Victim = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0); switch (NeedForAHack) { case 0: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 10ffb3703e0..a6d631a5b85 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -42,14 +42,14 @@ class instance_sunwell_plateau : public InstanceMapScript public: instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", 580) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_sunwell_plateau_InstanceMapScript(pMap); + return new instance_sunwell_plateau_InstanceMapScript(map); } struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript { - instance_sunwell_plateau_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 06b04e0ca6a..74c9e6b66b4 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -65,7 +65,7 @@ class boss_archaedas : public CreatureScript { boss_archaedasAI(Creature* creature) : ScriptedAI(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } uint32 uiTremorTimer; @@ -75,7 +75,7 @@ class boss_archaedas : public CreatureScript bool bGuardiansAwake; bool bVaultWalkersAwake; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -87,8 +87,8 @@ class boss_archaedas : public CreatureScript bGuardiansAwake = false; bVaultWalkersAwake = false; - if (pInstance) - pInstance->SetData(0, 5); // respawn any dead minions + if (instance) + instance->SetData(0, 5); // respawn any dead minions me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); @@ -132,7 +132,7 @@ class boss_archaedas : public CreatureScript void UpdateAI(const uint32 uiDiff) { - if (!pInstance) + if (!instance) return; // we're still doing awaken animation if (bWakingUp && iAwakenTimer >= 0) @@ -142,7 +142,7 @@ class boss_archaedas : public CreatureScript } else if (bWakingUp && iAwakenTimer <= 0) { bWakingUp = false; - AttackStart(Unit::GetUnit(*me, pInstance->GetData64(0))); + AttackStart(Unit::GetUnit(*me, instance->GetData64(0))); return; // dont want to continue until we finish the AttackStart method } @@ -153,7 +153,7 @@ class boss_archaedas : public CreatureScript // wake a wall minion if (uiWallMinionTimer <= uiDiff) { - pInstance->SetData (DATA_MINIONS, IN_PROGRESS); + instance->SetData (DATA_MINIONS, IN_PROGRESS); uiWallMinionTimer = 10000; } else uiWallMinionTimer -= uiDiff; @@ -161,12 +161,12 @@ class boss_archaedas : public CreatureScript //If we are <66 summon the guardians if (!bGuardiansAwake && !HealthAbovePct(66)) { - ActivateMinion(pInstance->GetData64(5), true); // EarthenGuardian1 - ActivateMinion(pInstance->GetData64(6), true); // EarthenGuardian2 - ActivateMinion(pInstance->GetData64(7), true); // EarthenGuardian3 - ActivateMinion(pInstance->GetData64(8), true); // EarthenGuardian4 - ActivateMinion(pInstance->GetData64(9), true); // EarthenGuardian5 - ActivateMinion(pInstance->GetData64(10), false); // EarthenGuardian6 + ActivateMinion(instance->GetData64(5), true); // EarthenGuardian1 + ActivateMinion(instance->GetData64(6), true); // EarthenGuardian2 + ActivateMinion(instance->GetData64(7), true); // EarthenGuardian3 + ActivateMinion(instance->GetData64(8), true); // EarthenGuardian4 + ActivateMinion(instance->GetData64(9), true); // EarthenGuardian5 + ActivateMinion(instance->GetData64(10), false); // EarthenGuardian6 me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON); bGuardiansAwake = true; @@ -175,10 +175,10 @@ class boss_archaedas : public CreatureScript //If we are <33 summon the vault walkers if (!bVaultWalkersAwake && !HealthAbovePct(33)) { - ActivateMinion(pInstance->GetData64(1), true); // VaultWalker1 - ActivateMinion(pInstance->GetData64(2), true); // VaultWalker2 - ActivateMinion(pInstance->GetData64(3), true); // VaultWalker3 - ActivateMinion(pInstance->GetData64(4), false); // VaultWalker4 + ActivateMinion(instance->GetData64(1), true); // VaultWalker1 + ActivateMinion(instance->GetData64(2), true); // VaultWalker2 + ActivateMinion(instance->GetData64(3), true); // VaultWalker3 + ActivateMinion(instance->GetData64(4), false); // VaultWalker4 me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON2); bVaultWalkersAwake = true; @@ -198,10 +198,10 @@ class boss_archaedas : public CreatureScript void JustDied (Unit* /*killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door - pInstance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions + instance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door + instance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions } } }; @@ -234,7 +234,7 @@ class mob_archaedas_minions : public CreatureScript { mob_archaedas_minionsAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } uint32 uiArcing_Timer; @@ -242,7 +242,7 @@ class mob_archaedas_minions : public CreatureScript bool bWakingUp; bool bAmIAwake; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -293,7 +293,7 @@ class mob_archaedas_minions : public CreatureScript { bWakingUp = false; bAmIAwake = true; - // AttackStart(Unit::GetUnit(*me, pInstance->GetData64(0))); // whoWokeArchaedasGUID + // AttackStart(Unit::GetUnit(*me, instance->GetData64(0))); // whoWokeArchaedasGUID return; // dont want to continue until we finish the AttackStart method } @@ -333,10 +333,10 @@ class mob_stonekeepers : public CreatureScript { mob_stonekeepersAI(Creature* creature) : ScriptedAI(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -365,8 +365,8 @@ class mob_stonekeepers : public CreatureScript void JustDied(Unit* /*attacker*/) { DoCast (me, SPELL_SELF_DESTRUCT, true); - if (pInstance) - pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper + if (instance) + instance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper } }; @@ -396,13 +396,13 @@ class go_altar_of_archaedas : public GameObjectScript bool OnGossipHello(Player* player, GameObject* /*pGO*/) { - InstanceScript* pInstance = player->GetInstanceScript(); - if (!pInstance) + InstanceScript* instance = player->GetInstanceScript(); + if (!instance) return false; player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false); - pInstance->SetData64(0, player->GetGUID()); // activate archaedas + instance->SetData64(0, player->GetGUID()); // activate archaedas return false; } }; @@ -425,15 +425,15 @@ class go_altar_of_the_keepers : public GameObjectScript { } - bool OnGossipHello(Player* player, GameObject* /*pGo*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) { - InstanceScript* pInstance = player->GetInstanceScript(); - if (!pInstance) + InstanceScript* instance = player->GetInstanceScript(); + if (!instance) return false; player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false); - pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers + instance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers return false; } }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 094caaa1ec8..0b97274310a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -42,7 +42,7 @@ class instance_uldaman : public InstanceMapScript struct instance_uldaman_InstanceMapScript : public InstanceScript { - instance_uldaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) { } @@ -480,9 +480,9 @@ class instance_uldaman : public InstanceMapScript } // end GetData64 }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_uldaman_InstanceMapScript(pMap); + return new instance_uldaman_InstanceMapScript(map); } }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 6c7d986842d..0a80900edf4 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -110,10 +110,10 @@ class go_keystone_chamber : public GameObjectScript public: go_keystone_chamber() : GameObjectScript("go_keystone_chamber") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - if (InstanceScript* pInstance = pGo->GetInstanceScript()) - pInstance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state. + if (InstanceScript* instance = go->GetInstanceScript()) + instance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state. return false; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 542e11d15da..ba2d638d45f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -74,9 +74,9 @@ class boss_akilzon : public CreatureScript { boss_akilzonAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 BirdGUIDs[8]; uint64 TargetGUID; @@ -97,8 +97,8 @@ class boss_akilzon : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_AKILZONEVENT, NOT_STARTED); StaticDisruption_Timer = urand(10000, 20000); //10 to 20 seconds (bosskillers) GustOfWind_Timer = urand(20000, 30000); //20 to 30 seconds(bosskillers) @@ -127,16 +127,16 @@ class boss_akilzon : public CreatureScript me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_ONAGGRO); //DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); } void JustDied(Unit* /*Killer*/) { me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_ONDEATH); - if (pInstance) - pInstance->SetData(DATA_AKILZONEVENT, DONE); + if (instance) + instance->SetData(DATA_AKILZONEVENT, DONE); DespawnSummons(); } @@ -170,14 +170,14 @@ class boss_akilzon : public CreatureScript void SetWeather(uint32 weather, float grade) { - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) + Map* map = me->GetMap(); + if (!map->IsDungeon()) return; WorldPacket data(SMSG_WEATHER, (4+4+4)); data << uint32(weather) << float(grade) << uint8(0); - pMap->SendToPlayers(&data); + map->SendToPlayers(&data); } void HandleStormSequence(Unit* Cloud) // 1: begin, 2-9: tick, 10: end diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 9ccf957120d..a3c7aae4132 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -85,10 +85,10 @@ class boss_halazzi : public CreatureScript { boss_halazziAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 FrenzyTimer; uint32 SaberlashTimer; @@ -105,8 +105,8 @@ class boss_halazzi : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_HALAZZIEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_HALAZZIEVENT, NOT_STARTED); TransformCount = 0; BerserkTimer = 600000; @@ -120,8 +120,8 @@ class boss_halazzi : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_AGGRO); @@ -326,8 +326,8 @@ class boss_halazzi : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(DATA_HALAZZIEVENT, DONE); + if (instance) + instance->SetData(DATA_HALAZZIEVENT, DONE); me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_DEATH); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 213b37190ac..d4d4e7314b4 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -177,11 +177,11 @@ static PlayerAbilityStruct PlayerAbility[][3] = struct boss_hexlord_addAI : public ScriptedAI { - InstanceScript* pInstance; + InstanceScript* instance; boss_hexlord_addAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } void Reset() {} @@ -190,7 +190,7 @@ struct boss_hexlord_addAI : public ScriptedAI void UpdateAI(const uint32 /*diff*/) { - if (pInstance && pInstance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS) + if (instance && instance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS) { EnterEvadeMode(); return; @@ -213,13 +213,13 @@ class boss_hexlord_malacrass : public CreatureScript { boss_hex_lord_malacrassAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); SelectAddEntry(); for (uint8 i = 0; i < 4; ++i) AddGUID[i] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 AddGUID[4]; uint32 AddEntry[4]; @@ -237,8 +237,8 @@ class boss_hexlord_malacrass : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_HEXLORDEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_HEXLORDEVENT, NOT_STARTED); SpiritBolts_Timer = 20000; DrainPower_Timer = 60000; @@ -255,8 +255,8 @@ class boss_hexlord_malacrass : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); DoZoneInCombat(); me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0); @@ -292,8 +292,8 @@ class boss_hexlord_malacrass : public CreatureScript void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_HEXLORDEVENT, DONE); + if (instance) + instance->SetData(DATA_HEXLORDEVENT, DONE); me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_DEATH); @@ -359,9 +359,9 @@ class boss_hexlord_malacrass : public CreatureScript if (CheckAddState_Timer <= diff) { for (uint8 i = 0; i < 4; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, AddGUID[i])) - if (pTemp->isAlive() && !pTemp->getVictim()) - pTemp->AI()->AttackStart(me->getVictim()); + if (Creature* temp = Unit::GetCreature(*me, AddGUID[i])) + if (temp->isAlive() && !temp->getVictim()) + temp->AI()->AttackStart(me->getVictim()); CheckAddState_Timer = 5000; } else CheckAddState_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 9638936a3d1..d2ad81b4910 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -115,10 +115,10 @@ class boss_janalai : public CreatureScript { boss_janalaiAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 FireBreathTimer; uint32 BombTimer; @@ -137,8 +137,8 @@ class boss_janalai : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_JANALAIEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_JANALAIEVENT, NOT_STARTED); FireBreathTimer = 8000; BombTimer = 30000; @@ -163,8 +163,8 @@ class boss_janalai : public CreatureScript { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_JANALAIEVENT, DONE); + if (instance) + instance->SetData(DATA_JANALAIEVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -174,8 +174,8 @@ class boss_janalai : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, me); // DoZoneInCombat(); @@ -375,9 +375,9 @@ class boss_janalai : public CreatureScript BombSequenceTimer = 100; //Teleport every Player into the middle - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) return; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + if (!map->IsDungeon()) return; + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->getSource()) if (i_pl->isAlive()) @@ -488,10 +488,10 @@ class mob_janalai_hatcher : public CreatureScript { mob_janalai_hatcherAI(Creature* c) : ScriptedAI(c) { - pInstance =c->GetInstanceScript(); + instance =c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 waypoint; uint32 HatchNum; @@ -561,7 +561,7 @@ class mob_janalai_hatcher : public CreatureScript void UpdateAI(const uint32 diff) { - if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) + if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { me->DisappearAndDie(); return; @@ -621,10 +621,10 @@ class mob_janalai_hatchling : public CreatureScript { mob_janalai_hatchlingAI(Creature* c) : ScriptedAI(c) { - pInstance =c->GetInstanceScript(); + instance =c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BuffetTimer; void Reset() @@ -642,7 +642,7 @@ class mob_janalai_hatchling : public CreatureScript void UpdateAI(const uint32 diff) { - if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) + if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { me->DisappearAndDie(); return; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 21e895e26bf..17968766a5f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -105,10 +105,10 @@ class boss_nalorakk : public CreatureScript { MoveEvent = true; MovePhase = 0; - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BrutalSwipe_Timer; uint32 Mangle_Timer; @@ -142,8 +142,8 @@ class boss_nalorakk : public CreatureScript (*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]); } - if (pInstance) - pInstance->SetData(DATA_NALORAKKEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_NALORAKKEVENT, NOT_STARTED); Surge_Timer = 15000 + rand()%5000; BrutalSwipe_Timer = 7000 + rand()%5000; @@ -269,8 +269,8 @@ class boss_nalorakk : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_AGGRO); @@ -279,8 +279,8 @@ class boss_nalorakk : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(DATA_NALORAKKEVENT, DONE); + if (instance) + instance->SetData(DATA_NALORAKKEVENT, DONE); me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_DEATH); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index f5acbc8d976..ae6a25d2c17 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -153,9 +153,9 @@ class boss_zuljin : public CreatureScript { boss_zuljinAI(Creature* c) : ScriptedAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 SpiritGUID[4]; uint64 ClawTargetGUID; @@ -186,8 +186,8 @@ class boss_zuljin : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_ZULJINEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ZULJINEVENT, NOT_STARTED); Phase = 0; @@ -223,8 +223,8 @@ class boss_zuljin : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); DoZoneInCombat(); @@ -254,8 +254,8 @@ class boss_zuljin : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(DATA_ZULJINEVENT, DONE); + if (instance) + instance->SetData(DATA_ZULJINEVENT, DONE); me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_DEATH); @@ -608,7 +608,7 @@ class mob_zuljin_vortex : public CreatureScript void Reset() {} - void EnterCombat(Unit* /*pTarget*/) {} + void EnterCombat(Unit* /*target*/) {} void SpellHit(Unit* caster, const SpellInfo* spell) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 806536b7a59..2785c61dec5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -61,7 +61,7 @@ class instance_zulaman : public InstanceMapScript struct instance_zulaman_InstanceMapScript : public InstanceScript { - instance_zulaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 HarkorsSatchelGUID; uint64 TanzarsTrunkGUID; @@ -314,9 +314,9 @@ class instance_zulaman : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_zulaman_InstanceMapScript(pMap); + return new instance_zulaman_InstanceMapScript(map); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 10055b1fa01..a6eb4c91d4c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -51,10 +51,10 @@ class npc_forest_frog : public CreatureScript { npc_forest_frogAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void Reset() {} @@ -62,7 +62,7 @@ class npc_forest_frog : public CreatureScript void DoSpawnRandom() { - if (pInstance) + if (instance) { uint32 cEntry = 0; switch (rand()%10) @@ -79,15 +79,15 @@ class npc_forest_frog : public CreatureScript case 9: cEntry = 24455; break; //Hollee } - if (!pInstance->GetData(TYPE_RAND_VENDOR_1)) + if (!instance->GetData(TYPE_RAND_VENDOR_1)) if (rand()%10 == 1) cEntry = 24408; //Gunter - if (!pInstance->GetData(TYPE_RAND_VENDOR_2)) + if (!instance->GetData(TYPE_RAND_VENDOR_2)) if (rand()%10 == 1) cEntry = 24409; //Kyren if (cEntry) me->UpdateEntry(cEntry); - if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1, DONE); - if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2, DONE); + if (cEntry == 24408) instance->SetData(TYPE_RAND_VENDOR_1, DONE); + if (cEntry == 24409) instance->SetData(TYPE_RAND_VENDOR_2, DONE); } } @@ -167,11 +167,11 @@ class npc_zulaman_hostage : public CreatureScript return true; creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - InstanceScript* pInstance = creature->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = creature->GetInstanceScript(); + if (instance) { - //uint8 progress = pInstance->GetData(DATA_CHESTLOOTED); - pInstance->SetData(DATA_CHESTLOOTED, 0); + //uint8 progress = instance->GetData(DATA_CHESTLOOTED); + instance->SetData(DATA_CHESTLOOTED, 0); float x, y, z; creature->GetPosition(x, y, z); uint32 entry = creature->GetEntry(); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 15c72992766..076545ae9d4 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -61,10 +61,10 @@ class boss_arlokk : public CreatureScript { boss_arlokkAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiShadowWordPain_Timer; uint32 m_uiGouge_Timer; @@ -110,8 +110,8 @@ class boss_arlokk : public CreatureScript void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(DATA_ARLOKK, NOT_STARTED); + if (m_instance) + m_instance->SetData(DATA_ARLOKK, NOT_STARTED); //we should be summoned, so despawn me->DespawnOrUnsummon(); @@ -124,8 +124,8 @@ class boss_arlokk : public CreatureScript me->SetDisplayId(MODEL_ID_NORMAL); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (m_pInstance) - m_pInstance->SetData(DATA_ARLOKK, DONE); + if (m_instance) + m_instance->SetData(DATA_ARLOKK, DONE); } void DoSummonPhanters() @@ -269,14 +269,14 @@ class go_gong_of_bethekk : public GameObjectScript { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - if (InstanceScript* m_pInstance = pGo->GetInstanceScript()) + if (InstanceScript* m_instance = go->GetInstanceScript()) { - if (m_pInstance->GetData(DATA_ARLOKK) == DONE || m_pInstance->GetData(DATA_ARLOKK) == IN_PROGRESS) + if (m_instance->GetData(DATA_ARLOKK) == DONE || m_instance->GetData(DATA_ARLOKK) == IN_PROGRESS) return true; - m_pInstance->SetData(DATA_ARLOKK, IN_PROGRESS); + m_instance->SetData(DATA_ARLOKK, IN_PROGRESS); return true; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 1c8a1eef388..77b8955158a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -57,10 +57,10 @@ class boss_hakkar : public CreatureScript { boss_hakkarAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 BloodSiphon_Timer; uint32 CorruptedBlood_Timer; @@ -156,9 +156,9 @@ class boss_hakkar : public CreatureScript //Checking if Jeklik is dead. If not we cast her Aspect if (CheckJeklik_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_JEKLIK) != DONE) + if (m_instance->GetData(DATA_JEKLIK) != DONE) { if (AspectOfJeklik_Timer <= diff) { @@ -173,9 +173,9 @@ class boss_hakkar : public CreatureScript //Checking if Venoxis is dead. If not we cast his Aspect if (CheckVenoxis_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_VENOXIS) != DONE) + if (m_instance->GetData(DATA_VENOXIS) != DONE) { if (AspectOfVenoxis_Timer <= diff) { @@ -190,9 +190,9 @@ class boss_hakkar : public CreatureScript //Checking if Marli is dead. If not we cast her Aspect if (CheckMarli_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_MARLI) != DONE) + if (m_instance->GetData(DATA_MARLI) != DONE) { if (AspectOfMarli_Timer <= diff) { @@ -208,9 +208,9 @@ class boss_hakkar : public CreatureScript //Checking if Thekal is dead. If not we cast his Aspect if (CheckThekal_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_THEKAL) != DONE) + if (m_instance->GetData(DATA_THEKAL) != DONE) { if (AspectOfThekal_Timer <= diff) { @@ -225,9 +225,9 @@ class boss_hakkar : public CreatureScript //Checking if Arlokk is dead. If yes we cast her Aspect if (CheckArlokk_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_ARLOKK) != DONE) + if (m_instance->GetData(DATA_ARLOKK) != DONE) { if (AspectOfArlokk_Timer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 7c339a342af..fcb492d47f7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -56,10 +56,10 @@ class boss_jeklik : public CreatureScript { boss_jeklikAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 Charge_Timer; uint32 SonicBurst_Timer; @@ -98,8 +98,8 @@ class boss_jeklik : public CreatureScript { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(DATA_JEKLIK, DONE); + if (m_instance) + m_instance->SetData(DATA_JEKLIK, DONE); } void UpdateAI(const uint32 diff) @@ -238,10 +238,10 @@ class mob_batrider : public CreatureScript { mob_batriderAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 Bomb_Timer; uint32 Check_Timer; @@ -274,9 +274,9 @@ class mob_batrider : public CreatureScript //Check_Timer if (Check_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_JEKLIK) == DONE) + if (m_instance->GetData(DATA_JEKLIK) == DONE) { me->setDeathState(JUST_DIED); me->RemoveCorpse(); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index b8eaefbd0f8..7c8e53038ab 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -189,12 +189,12 @@ class mob_healing_ward : public CreatureScript { mob_healing_wardAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 Heal_Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -210,9 +210,9 @@ class mob_healing_ward : public CreatureScript //Heal_Timer if (Heal_Timer <= diff) { - if (pInstance) + if (instance) { - Unit* pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO)); + Unit* pJindo = Unit::GetUnit((*me), instance->GetData64(DATA_JINDO)); if (pJindo) DoCast(pJindo, SPELL_HEAL); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 6135c076920..f70c764f306 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -57,7 +57,7 @@ class boss_mandokir : public CreatureScript { boss_mandokirAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } uint32 KillCount; @@ -72,7 +72,7 @@ class boss_mandokir : public CreatureScript float targetY; float targetZ; - InstanceScript* m_pInstance; + InstanceScript* m_instance; bool endWatch; bool someWatched; @@ -116,9 +116,9 @@ class boss_mandokir : public CreatureScript { DoScriptText(SAY_DING_KILL, me); - if (m_pInstance) + if (m_instance) { - uint64 JindoGUID = m_pInstance->GetData64(DATA_JINDO); + uint64 JindoGUID = m_instance->GetData64(DATA_JINDO); if (JindoGUID) { if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID)) @@ -256,9 +256,9 @@ class boss_mandokir : public CreatureScript //Checking if Ohgan is dead. If yes Mandokir will enrage. if (Check_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_OHGAN) == DONE) + if (m_instance->GetData(DATA_OHGAN) == DONE) { if (!RaptorDead) { @@ -296,11 +296,11 @@ class mob_ohgan : public CreatureScript { mob_ohganAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } uint32 SunderArmor_Timer; - InstanceScript* m_pInstance; + InstanceScript* m_instance; void Reset() { @@ -311,8 +311,8 @@ class mob_ohgan : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (m_pInstance) - m_pInstance->SetData(DATA_OHGAN, DONE); + if (m_instance) + m_instance->SetData(DATA_OHGAN, DONE); } void UpdateAI (const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 793a404736a..b9ae61c122e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -53,10 +53,10 @@ class boss_marli : public CreatureScript { boss_marliAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 SpawnStartSpiders_Timer; uint32 PoisonVolley_Timer; @@ -91,8 +91,8 @@ class boss_marli : public CreatureScript void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(DATA_MARLI, DONE); + if (m_instance) + m_instance->SetData(DATA_MARLI, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 9dc2512e8c5..4fbb5cd1109 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -68,7 +68,7 @@ class boss_thekal : public CreatureScript { boss_thekalAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } uint32 MortalCleave_Timer; @@ -81,7 +81,7 @@ class boss_thekal : public CreatureScript uint32 Check_Timer; uint32 Resurrect_Timer; - InstanceScript* m_pInstance; + InstanceScript* m_instance; bool Enraged; bool PhaseTwo; bool WasDead; @@ -111,14 +111,14 @@ class boss_thekal : public CreatureScript void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(DATA_THEKAL, DONE); + if (m_instance) + m_instance->SetData(DATA_THEKAL, DONE); } void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(DATA_THEKAL, NOT_STARTED); + if (m_instance) + m_instance->SetData(DATA_THEKAL, NOT_STARTED); } void UpdateAI(const uint32 diff) @@ -129,26 +129,26 @@ class boss_thekal : public CreatureScript //Check_Timer for the death of LorKhan and Zath. if (!WasDead && Check_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_LORKHAN) == SPECIAL) + if (m_instance->GetData(DATA_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->setFaction(14); pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); pLorKhan->SetFullHealth(); - m_pInstance->SetData(DATA_LORKHAN, DONE); + m_instance->SetData(DATA_LORKHAN, DONE); } } - if (m_pInstance->GetData(DATA_ZATH) == SPECIAL) + if (m_instance->GetData(DATA_ZATH) == SPECIAL) { //Resurrect Zath - Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH)); if (pZath) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -156,7 +156,7 @@ class boss_thekal : public CreatureScript pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); pZath->SetFullHealth(); - m_pInstance->SetData(DATA_ZATH, DONE); + m_instance->SetData(DATA_ZATH, DONE); } } } @@ -185,8 +185,8 @@ class boss_thekal : public CreatureScript me->SetStandState(UNIT_STAND_STATE_SLEEP); me->AttackStop(); - if (m_pInstance) - m_pInstance->SetData(DATA_THEKAL, SPECIAL); + if (m_instance) + m_instance->SetData(DATA_THEKAL, SPECIAL); WasDead=true; } @@ -279,7 +279,7 @@ class mob_zealot_lorkhan : public CreatureScript { mob_zealot_lorkhanAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } uint32 Shield_Timer; @@ -290,7 +290,7 @@ class mob_zealot_lorkhan : public CreatureScript bool FakeDeath; - InstanceScript* m_pInstance; + InstanceScript* m_instance; void Reset() { @@ -302,8 +302,8 @@ class mob_zealot_lorkhan : public CreatureScript FakeDeath = false; - if (m_pInstance) - m_pInstance->SetData(DATA_LORKHAN, NOT_STARTED); + if (m_instance) + m_instance->SetData(DATA_LORKHAN, NOT_STARTED); me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -335,10 +335,10 @@ class mob_zealot_lorkhan : public CreatureScript //Casting Greaterheal to Thekal or Zath if they are in meele range. if (GreaterHeal_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)); - Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)); + Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL)); + Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH)); if (!pThekal || !pZath) return; @@ -369,12 +369,12 @@ class mob_zealot_lorkhan : public CreatureScript //Check_Timer for the death of LorKhan and Zath. if (!FakeDeath && Check_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_THEKAL) == SPECIAL) + if (m_instance->GetData(DATA_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -383,10 +383,10 @@ class mob_zealot_lorkhan : public CreatureScript } } - if (m_pInstance->GetData(DATA_ZATH) == SPECIAL) + if (m_instance->GetData(DATA_ZATH) == SPECIAL) { //Resurrect Zath - if (Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH))) + if (Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH))) { pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -409,8 +409,8 @@ class mob_zealot_lorkhan : public CreatureScript me->setFaction(35); me->AttackStop(); - if (m_pInstance) - m_pInstance->SetData(DATA_LORKHAN, SPECIAL); + if (m_instance) + m_instance->SetData(DATA_LORKHAN, SPECIAL); FakeDeath = true; } @@ -439,7 +439,7 @@ class mob_zealot_zath : public CreatureScript { mob_zealot_zathAI(Creature* c) : ScriptedAI(c) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } uint32 SweepingStrikes_Timer; @@ -451,7 +451,7 @@ class mob_zealot_zath : public CreatureScript bool FakeDeath; - InstanceScript* m_pInstance; + InstanceScript* m_instance; void Reset() { @@ -464,8 +464,8 @@ class mob_zealot_zath : public CreatureScript FakeDeath = false; - if (m_pInstance) - m_pInstance->SetData(DATA_ZATH, NOT_STARTED); + if (m_instance) + m_instance->SetData(DATA_ZATH, NOT_STARTED); me->SetStandState(UNIT_STAND_STATE_STAND); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -522,12 +522,12 @@ class mob_zealot_zath : public CreatureScript //Check_Timer for the death of LorKhan and Zath. if (!FakeDeath && Check_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(DATA_LORKHAN) == SPECIAL) + if (m_instance->GetData(DATA_LORKHAN) == SPECIAL) { //Resurrect LorKhan - if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN))) + if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN))) { pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -536,10 +536,10 @@ class mob_zealot_zath : public CreatureScript } } - if (m_pInstance->GetData(DATA_THEKAL) == SPECIAL) + if (m_instance->GetData(DATA_THEKAL) == SPECIAL) { //Resurrect Thekal - if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL))) + if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL))) { pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -562,8 +562,8 @@ class mob_zealot_zath : public CreatureScript me->setFaction(35); me->AttackStop(); - if (m_pInstance) - m_pInstance->SetData(DATA_ZATH, SPECIAL); + if (m_instance) + m_instance->SetData(DATA_ZATH, SPECIAL); FakeDeath = true; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index a977699f342..e059b7945ee 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -36,7 +36,7 @@ class instance_zulgurub : public InstanceMapScript struct instance_zulgurub_InstanceMapScript : public InstanceScript { - instance_zulgurub_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map) {} //If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too. uint32 m_auiEncounter[MAX_ENCOUNTERS]; @@ -153,9 +153,9 @@ class instance_zulgurub : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_zulgurub_InstanceMapScript(pMap); + return new instance_zulgurub_InstanceMapScript(map); } }; diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 38fcf63b090..89adfee87c4 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -57,9 +57,9 @@ class npc_00x09hl : public CreatureScript public: npc_00x09hl() : CreatureScript("npc_00x09hl") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09) + if (quest->GetQuestId() == QUEST_RESQUE_OOX_09) { creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -71,7 +71,7 @@ public: DoScriptText(SAY_OOX_START, creature, player); if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } @@ -191,15 +191,15 @@ class npc_rinji : public CreatureScript public: npc_rinji() : CreatureScript("npc_rinji") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED) + if (quest->GetQuestId() == QUEST_RINJI_TRAPPED) { - if (GameObject* pGo = creature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE)) - pGo->UseDoorOrButton(); + if (GameObject* go = creature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE)) + go->UseDoorOrButton(); if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 083a27568bd..6e5429582e7 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -43,11 +43,11 @@ class npc_corporal_keeshan : public CreatureScript public: npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION) + if (quest->GetQuestId() == QUEST_MISSING_IN_ACTION) { - CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), pQuest); + CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), quest); DoScriptText(SAY_CORPORAL_1, creature); } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 32b4fc0e19a..68ab0432bb3 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -225,9 +225,9 @@ class pyrewood_ambush : public CreatureScript public: pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest *quest) { - if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress) + if (quest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress) { CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress = true; CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->Phase = 0; diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 25fa0352548..09533ab4ccb 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -90,9 +90,9 @@ class npc_bartleby : public CreatureScript public: npc_bartleby() : CreatureScript("npc_bartleby") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_BEAT) + if (quest->GetQuestId() == QUEST_BEAT) { creature->setFaction(FACTION_ENEMY); creature->AI()->AttackStart(player); @@ -162,9 +162,9 @@ class npc_dashel_stonefist : public CreatureScript public: npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8) + if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT8) { creature->setFaction(FACTION_HOSTILE); CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, creature->AI())->AttackStart(player); @@ -696,9 +696,9 @@ class npc_tyrion : public CreatureScript public: npc_tyrion() : CreatureScript("npc_tyrion") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_THE_ATTACK) + if (quest->GetQuestId() == QUEST_THE_ATTACK) { if (Creature* pSpybot = creature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) { diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index e2a7ea9d3c6..e6c528e4c89 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -48,9 +48,9 @@ class npc_calvin_montague : public CreatureScript public: npc_calvin_montague() : CreatureScript("npc_calvin_montague") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_590) + if (quest->GetQuestId() == QUEST_590) { creature->setFaction(FACTION_HOSTILE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -171,7 +171,7 @@ class go_mausoleum_door : public GameObjectScript public: go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { } - bool OnGossipHello(Player* player, GameObject* /*pGo*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; @@ -193,14 +193,14 @@ class go_mausoleum_trigger : public GameObjectScript public: go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; if (GameObject* pDoor = player->FindNearestGameObject(GO_DOOR, 30.0f)) { - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); return true; } diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 7c0703d158b..e82da353cd0 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -54,9 +54,9 @@ class npc_daphne_stilwell : public CreatureScript public: npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_TOME_VALOR) + if (quest->GetQuestId() == QUEST_TOME_VALOR) { DoScriptText(SAY_DS_START, creature); diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index f6d53d2bb51..cb5fa6782ac 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -144,9 +144,9 @@ class npc_mikhail : public CreatureScript public: npc_mikhail() : CreatureScript("npc_mikhail") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) + if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) { Creature* pSlim = creature->FindNearestCreature(NPC_TAPOKE_SLIM_JAHN, 25.0f); @@ -157,7 +157,7 @@ public: pSlim->CastSpell(pSlim, SPELL_STEALTH, true); if (npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI* pEscortAI = CAST_AI(npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI, pSlim->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return false; } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 7823e84f29a..4aa2cea958b 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -37,7 +37,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player* player, GameObject* /*pGo*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -51,15 +51,15 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - InstanceScript* pInstance = pGo->GetInstanceScript(); + InstanceScript* instance = go->GetInstanceScript(); - if (pInstance) + if (instance) { - pGo->SetGoState(GO_STATE_ACTIVE); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); - pInstance->SetData(DATA_FIRE, pInstance->GetData(DATA_FIRE) + 1); + go->SetGoState(GO_STATE_ACTIVE); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + instance->SetData(DATA_FIRE, instance->GetData(DATA_FIRE) + 1); return true; } return false; @@ -87,10 +87,10 @@ public: AttackPlayer(); } - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiRavageTimer; uint32 uiFrostNovaTimer; @@ -183,8 +183,8 @@ public: void JustDied(Unit* /*killer*/) { if (me->isSummon()) //we are not a normal spawn. - if (pInstance) - pInstance->SetData(DATA_EVENT, pInstance->GetData(DATA_EVENT) + 1); + if (instance) + instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1); } }; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 455ea4c4796..8f1d0025c5b 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -38,32 +38,32 @@ public: { boss_aku_maiAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiPoisonCloudTimer; bool bIsEnraged; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { uiPoisonCloudTimer = urand(5000, 9000); bIsEnraged = false; - if (pInstance) - pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED); + if (instance) + instance->SetData(TYPE_AKU_MAI, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(TYPE_AKU_MAI, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_AKU_MAI, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(TYPE_AKU_MAI, DONE); + if (instance) + instance->SetData(TYPE_AKU_MAI, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 0a137b7eac0..a03c0a01d41 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -37,30 +37,30 @@ public: { boss_gelihastAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiNetTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { uiNetTimer = urand(2000, 4000); - if (pInstance) - pInstance->SetData(TYPE_GELIHAST, NOT_STARTED); + if (instance) + instance->SetData(TYPE_GELIHAST, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(TYPE_GELIHAST, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_GELIHAST, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(TYPE_GELIHAST, DONE); + if (instance) + instance->SetData(TYPE_GELIHAST, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 09a9b52353b..0a282dafac3 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -46,34 +46,34 @@ public: { boss_kelrisAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiMindBlastTimer; uint32 uiSleepTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { uiMindBlastTimer = urand(2000, 5000); uiSleepTimer = urand(9000, 12000); - if (pInstance) - pInstance->SetData(TYPE_KELRIS, NOT_STARTED); + if (instance) + instance->SetData(TYPE_KELRIS, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(TYPE_KELRIS, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_KELRIS, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_KELRIS, DONE); + if (instance) + instance->SetData(TYPE_KELRIS, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index cf79dfee77d..abfb91d5d6e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -56,14 +56,14 @@ class instance_blackfathom_deeps : public InstanceMapScript public: instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_blackfathom_deeps_InstanceMapScript(pMap); + return new instance_blackfathom_deeps_InstanceMapScript(map); } struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript { - instance_blackfathom_deeps_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 m_uiTwilightLordKelrisGUID; uint64 m_uiShrine1GUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index aab3aaeef77..6ea2b21fe65 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -66,8 +66,8 @@ public: { boss_anetheronAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; } @@ -75,7 +75,7 @@ public: uint32 SleepTimer; uint32 AuraTimer; uint32 InfernoTimer; - bool pGo; + bool go; uint32 pos; void Reset() @@ -86,14 +86,14 @@ public: AuraTimer = 5000; InfernoTimer = 45000; - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); + if (instance && IsEvent) + instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); + if (instance && IsEvent) + instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } @@ -120,9 +120,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance) + if (i == 7 && instance) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -131,8 +131,8 @@ public: void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, DONE); + if (instance && IsEvent) + instance->SetData(DATA_ANETHERONEVENT, DONE); DoPlaySoundToSet(me, SOUND_ONDEATH); me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); } @@ -143,10 +143,10 @@ public: { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); @@ -250,15 +250,15 @@ public: { mob_towering_infernalAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); - if (pInstance) - AnetheronGUID = pInstance->GetData64(DATA_ANETHERON); + instance = c->GetInstanceScript(); + if (instance) + AnetheronGUID = instance->GetData64(DATA_ANETHERON); } uint32 ImmolationTimer; uint32 CheckTimer; uint64 AnetheronGUID; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index da316cb91c7..f4252ad3d45 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -88,11 +88,11 @@ public: { mob_ancient_wispAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); ArchimondeGUID = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 ArchimondeGUID; uint32 CheckTimer; @@ -100,8 +100,8 @@ public: { CheckTimer = 1000; - if (pInstance) - ArchimondeGUID = pInstance->GetData64(DATA_ARCHIMONDE); + if (instance) + ArchimondeGUID = instance->GetData64(DATA_ARCHIMONDE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -235,10 +235,10 @@ public: { boss_archimondeAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 DoomfireSpiritGUID; uint64 WorldTreeGUID; @@ -264,8 +264,8 @@ public: void Reset() { - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); DoomfireSpiritGUID = 0; damageTaken = 0; @@ -297,8 +297,8 @@ public: DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } void KilledUnit(Unit* victim) @@ -339,8 +339,8 @@ public: hyjal_trashAI::JustDied(victim); DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, DONE); + if (instance) + instance->SetData(DATA_ARCHIMONDEEVENT, DONE); } bool CanUseFingerOfDeath() @@ -460,15 +460,15 @@ public: { if (!me->isInCombat()) { - if (pInstance) + if (instance) { // Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished. - if ((pInstance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35))) + if ((instance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35))) { me->SetVisible(false); me->setFaction(35); } - else if ((pInstance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35))) + else if ((instance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35))) { me->setFaction(1720); me->SetVisible(true); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 35c81432d5f..3f9bca5925b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -57,8 +57,8 @@ public: { boss_azgalorAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; } @@ -69,7 +69,7 @@ public: uint32 EnrageTimer; bool enraged; - bool pGo; + bool go; uint32 pos; void Reset() @@ -82,14 +82,14 @@ public: EnrageTimer = 600000; enraged = false; - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); + if (instance && IsEvent) + instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); + if (instance && IsEvent) + instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } @@ -116,9 +116,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance) + if (i == 7 && instance) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -127,8 +127,8 @@ public: void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, DONE); + if (instance && IsEvent) + instance->SetData(DATA_AZGALOREVENT, DONE); DoPlaySoundToSet(me, SOUND_ONDEATH); } @@ -138,10 +138,10 @@ public: { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); @@ -217,16 +217,16 @@ public: { mob_lesser_doomguardAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - if (pInstance) - AzgalorGUID = pInstance->GetData64(DATA_AZGALOR); + instance = c->GetInstanceScript(); + if (instance) + AzgalorGUID = instance->GetData64(DATA_AZGALOR); } uint32 CrippleTimer; uint32 WarstompTimer; uint32 CheckTimer; uint64 AzgalorGUID; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 670ccabd322..eabfbfc024c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -54,8 +54,8 @@ public: { boss_kazrogalAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; } @@ -63,7 +63,7 @@ public: uint32 WarStompTimer; uint32 MarkTimer; uint32 MarkTimerBase; - bool pGo; + bool go; uint32 pos; void Reset() @@ -74,14 +74,14 @@ public: MarkTimer = 45000; MarkTimerBase = 45000; - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); + if (instance && IsEvent) + instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); + if (instance && IsEvent) + instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } @@ -108,9 +108,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance) + if (i == 7 && instance) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -119,8 +119,8 @@ public: void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, DONE); + if (instance && IsEvent) + instance->SetData(DATA_KAZROGALEVENT, DONE); DoPlaySoundToSet(me, SOUND_ONDEATH); } @@ -130,10 +130,10 @@ public: { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index e2e9372522f..1537b6eed3b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -60,8 +60,8 @@ public: { boss_rage_winterchillAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; } @@ -69,7 +69,7 @@ public: uint32 DecayTimer; uint32 NovaTimer; uint32 IceboltTimer; - bool pGo; + bool go; uint32 pos; void Reset() @@ -80,14 +80,14 @@ public: NovaTimer = 15000; IceboltTimer = 10000; - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); + if (instance && IsEvent) + instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); + if (instance && IsEvent) + instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } @@ -110,9 +110,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance) + if (i == 7 && instance) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -121,8 +121,8 @@ public: void JustDied(Unit* victim) { hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); + if (instance && IsEvent) + instance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); DoPlaySoundToSet(me, SOUND_ONDEATH); me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); } @@ -133,10 +133,10 @@ public: { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 385e86e5069..6186369a3a0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -312,7 +312,7 @@ float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde hyjalAI::hyjalAI(Creature* c) : npc_escortAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); VeinsSpawned[0] = false; VeinsSpawned[1] = false; for (uint8 i=0; i<14; ++i) @@ -392,15 +392,15 @@ void hyjalAI::Reset() memset(Spells, 0, sizeof(Spell) * HYJAL_AI_MAX_SPELLS); //Reset Instance Data for trash count - if (pInstance) + if (instance) { - if ((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL)) + if ((!instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL)) { //Reset World States - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); - pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); + instance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); + instance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + instance->SetData(DATA_RESET_TRASH_COUNT, 0); } } else sLog->outError(ERROR_INST_DATA); @@ -510,9 +510,9 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) CAST_AI(hyjal_trashAI, creature->AI())->IsEvent = true; break; } - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE) + if (instance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE) creature->SetDisableReputationGain(true);//no repu for solo farming } // Check if Creature is a boss. @@ -531,14 +531,14 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3] if (rand()%4 == 0) Talk(RALLY); - if (!pInstance) + if (!instance) { sLog->outError(ERROR_INST_DATA); return; } InfernalCount = 0;//reset infernal count every new wave - EnemyCount = pInstance->GetData(DATA_TRASH); + EnemyCount = instance->GetData(DATA_TRASH); for (uint8 i = 0; i < 18; ++i) { if (wave[Count].Mob[i]) @@ -552,11 +552,11 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3] stateValue -= 9; // Subtract 9 from it to give the proper wave number if we are greater than 8 // Set world state to our current wave number - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, stateValue); // Set world state to our current wave number + instance->DoUpdateWorldState(WORLD_STATE_WAVES, stateValue); // Set world state to our current wave number // Enable world state - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); // Enable world state + instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); // Enable world state - pInstance->SetData(DATA_TRASH, EnemyCount); // Send data for instance script to update count + instance->SetData(DATA_TRASH, EnemyCount); // Send data for instance script to update count if (!Debug) NextWaveTimer = wave[Count].WaveTimer; @@ -569,11 +569,11 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3] else { // Set world state for waves to 0 to disable it. - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); + instance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); // Set World State for enemies invading to 1. - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 1); + instance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 1); Summon = false; } @@ -582,7 +582,7 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3] void hyjalAI::StartEvent(Player* player) { - if (!player || IsDummy || !pInstance) + if (!player || IsDummy || !instance) return; Talk(BEGIN); @@ -596,17 +596,17 @@ void hyjalAI::StartEvent(Player* player) me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + instance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); + instance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); DeSpawnVeins(); } uint32 hyjalAI::GetInstanceData(uint32 Event) { - if (pInstance) - return pInstance->GetData(Event); + if (instance) + return instance->GetData(Event); else sLog->outError(ERROR_INST_DATA); return 0; @@ -650,13 +650,13 @@ void hyjalAI::Talk(uint32 id) void hyjalAI::Retreat() { - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_RETREAT, SPECIAL); + instance->SetData(TYPE_RETREAT, SPECIAL); if (Faction == 0) { - pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); + instance->SetData(DATA_ALLIANCE_RETREAT, 1); AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]); AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]); Start(false, false); @@ -664,7 +664,7 @@ void hyjalAI::Retreat() } if (Faction == 1) { - pInstance->SetData(DATA_HORDE_RETREAT, 1); + instance->SetData(DATA_HORDE_RETREAT, 1); Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000); if (JainaDummy) { @@ -710,28 +710,28 @@ void hyjalAI::SpawnVeins() void hyjalAI::DeSpawnVeins() { - if (!pInstance) + if (!instance) return; if (Faction == 1) { - Creature* unit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Creature* unit=Unit::GetCreature((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (!unit)return; hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); if (!ai)return; for (uint8 i = 0; i<7; ++i) { - if (GameObject* gem = pInstance->instance->GetGameObject(ai->VeinGUID[i])) + if (GameObject* gem = instance->instance->GetGameObject(ai->VeinGUID[i])) gem->Delete(); } } else if (Faction) { - Creature* unit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); + Creature* unit=Unit::GetCreature((*me), instance->GetData64(DATA_THRALL)); if (!unit)return; hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); if (!ai)return; for (uint8 i = 7; i<14; ++i) { - if (GameObject* gem = pInstance->instance->GetGameObject(ai->VeinGUID[i])) + if (GameObject* gem = instance->instance->GetGameObject(ai->VeinGUID[i])) gem->Delete(); } } @@ -754,7 +754,7 @@ void hyjalAI::UpdateAI(const uint32 diff) switch (me->GetEntry()) { case JAINA: - if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT)) + if (instance && instance->GetData(DATA_ALLIANCE_RETREAT)) { me->SetVisible(false); HideNearPos(me->GetPositionX(), me->GetPositionY()); @@ -766,7 +766,7 @@ void hyjalAI::UpdateAI(const uint32 diff) else me->SetVisible(true); break; case THRALL: //thrall - if (pInstance && pInstance->GetData(DATA_HORDE_RETREAT)) + if (instance && instance->GetData(DATA_HORDE_RETREAT)) { me->SetVisible(false); HideNearPos(me->GetPositionX(), me->GetPositionY()); @@ -830,9 +830,9 @@ void hyjalAI::UpdateAI(const uint32 diff) if (Summon) { - if (pInstance && EnemyCount) + if (instance && EnemyCount) { - EnemyCount = pInstance->GetData(DATA_TRASH); + EnemyCount = instance->GetData(DATA_TRASH); if (!EnemyCount) NextWaveTimer = 5000; } @@ -870,8 +870,8 @@ void hyjalAI::UpdateAI(const uint32 diff) CheckTimer = 0; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); BossGUID[i] = 0; - if (pInstance) - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it + if (instance) + instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it } } } @@ -919,17 +919,17 @@ void hyjalAI::JustDied(Unit* /*killer*/) RespawnTimer = 120000; Talk(DEATH); Summons.DespawnAll();//despawn all wave's summons - if (pInstance) + if (instance) {//reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress) - if (pInstance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS) - pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); - pInstance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die + if (instance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS) + instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); + if (instance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS) + instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); + if (instance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS) + instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); + if (instance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS) + instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); + instance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die } } void hyjalAI::HideNearPos(float x, float y) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index edf310109d7..9f37df3063f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -212,7 +212,7 @@ struct hyjalAI : public npc_escortAI void Talk(uint32 id); // Searches for the appropriate yell and sound and uses it to inform the raid of various things public: - InstanceScript* pInstance; + InstanceScript* instance; uint64 PlayerGUID; uint64 BossGUID[2]; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 8ca0ba5efd2..ef75307c625 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -157,7 +157,7 @@ float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the hyjal_trashAI::hyjal_trashAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); IsEvent = false; Delay = 0; LastOverronPos = 0; @@ -175,8 +175,8 @@ void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage) if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet())) { damageTaken += damage; - if (pInstance) - pInstance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage + if (instance) + instance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage } } @@ -379,12 +379,12 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) void hyjal_trashAI::JustDied(Unit* /*victim*/) { - if (!pInstance) + if (!instance) return; if (IsEvent && !me->isWorldBoss()) - pInstance->SetData(DATA_TRASH, 0);//signal trash is dead + instance->SetData(DATA_TRASH, 0);//signal trash is dead - if ((pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !me->isWorldBoss()) || (damageTaken < me->GetMaxHealth()/4 && me->isWorldBoss())) + if ((instance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !me->isWorldBoss()) || (damageTaken < me->GetMaxHealth()/4 && me->isWorldBoss())) me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot } @@ -397,14 +397,14 @@ public: { mob_giant_infernalAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); meteor = false;//call once! CanMove = false; Delay = rand()%30000; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetDisplayId(MODEL_INVIS); - pGo = false; + go = false; pos = 0; Reset(); } @@ -412,7 +412,7 @@ public: bool meteor; bool CanMove; bool WpEnabled; - bool pGo; + bool go; uint32 pos; uint32 spawnTimer; uint32 FlameBuffetTimer; @@ -430,11 +430,11 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 0 && pInstance && !IsOverrun) + if (i == 0 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -471,14 +471,14 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetDisplayId(me->GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID)); CanMove = true; - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) + if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); - } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ + } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){ //do overrun } } @@ -490,10 +490,10 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3), HordeWPs[7][1]+irand(-3, 3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall Start(true, true); @@ -541,13 +541,13 @@ public: { mob_abominationAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 KnockDownTimer; uint32 pos; void Reset() @@ -558,15 +558,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -590,12 +590,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -642,13 +642,13 @@ public: { mob_ghoulAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 FrenzyTimer; uint32 pos; uint32 MoveTimer; @@ -663,15 +663,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -697,12 +697,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -751,13 +751,13 @@ public: { mob_necromancerAI(Creature* c) : hyjal_trashAI(c), summons(me) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } SummonList summons; - bool pGo; + bool go; uint32 ShadowBoltTimer; uint32 pos; void Reset() @@ -777,15 +777,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -819,12 +819,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -872,13 +872,13 @@ public: { mob_bansheeAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 CourseTimer; uint32 WailTimer; uint32 ShellTimer; @@ -893,15 +893,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -917,12 +917,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -977,13 +977,13 @@ public: { mob_crypt_fiendAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 WebTimer; uint32 pos; void Reset() @@ -994,15 +994,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -1018,12 +1018,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -1069,13 +1069,13 @@ public: { mob_fel_stalkerAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 ManaBurnTimer; uint32 pos; void Reset() @@ -1086,15 +1086,15 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 7 && pInstance && !IsOverrun) + if (i == 7 && instance && !IsOverrun) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); }else{ - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE)); if (target && target->isAlive()) me->AddThreat(target, 0.0f); } @@ -1110,12 +1110,12 @@ public: npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); @@ -1161,13 +1161,13 @@ public: { mob_frost_wyrmAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; Reset(); } - bool pGo; + bool go; uint32 FrostBreathTimer; uint32 pos; uint32 MoveTimer; @@ -1182,9 +1182,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 2 && pInstance && !IsOverrun) + if (i == 2 && instance && !IsOverrun) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) { me->AddThreat(target, 0.0f); @@ -1195,8 +1195,8 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance && IsEvent) - pInstance->SetData(DATA_TRASH, 0);//signal trash is dead + if (instance && IsEvent) + instance->SetData(DATA_TRASH, 0);//signal trash is dead float x, y, z; me->GetPosition(x, y, z); @@ -1217,10 +1217,10 @@ public: } if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { if (!useFlyPath) { @@ -1278,14 +1278,14 @@ public: { mob_gargoyleAI(Creature* c) : hyjal_trashAI(c) { - pInstance = c->GetInstanceScript(); - pGo = false; + instance = c->GetInstanceScript(); + go = false; pos = 0; DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0; Reset(); } - bool pGo; + bool go; uint32 StrikeTimer; uint32 pos; uint32 MoveTimer; @@ -1304,9 +1304,9 @@ public: void WaypointReached(uint32 i) { pos = i; - if (i == 2 && pInstance && !IsOverrun) + if (i == 2 && instance && !IsOverrun) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_THRALL)); if (target && target->isAlive()) { me->AddThreat(target, 0.0f); @@ -1335,10 +1335,10 @@ public: } if (IsEvent) { - if (!pGo) + if (!go) { - pGo = true; - if (pInstance) + go = true; + if (instance) { if (!useFlyPath) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h index 94b71313dd2..e2017b1f260 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -34,7 +34,7 @@ struct hyjal_trashAI : public npc_escortAI void DamageTaken(Unit* done_by, uint32 &damage); public: - InstanceScript* pInstance; + InstanceScript* instance; bool IsEvent; uint32 Delay; uint32 LastOverronPos; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index e3d57414b94..0e5233d6620 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -46,14 +46,14 @@ class instance_hyjal : public InstanceMapScript public: instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_mount_hyjal_InstanceMapScript(pMap); + return new instance_mount_hyjal_InstanceMapScript(map); } struct instance_mount_hyjal_InstanceMapScript : public InstanceScript { - instance_mount_hyjal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; @@ -193,11 +193,11 @@ public: { Creature* unit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); - Map* pMap = creature->GetMap(); - if (pMap->IsDungeon() && unit) + Map* map = creature->GetMap(); + if (map->IsDungeon() && unit) { unit->SetVisible(false); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (PlayerList.isEmpty()) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index b0b75c53e52..8354f1d873c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -62,7 +62,7 @@ public: { boss_epochAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint8 uiStep; @@ -73,7 +73,7 @@ public: uint32 uiTimeStopTimer; uint32 uiCurseOfExertionTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -84,16 +84,16 @@ public: uiTimeStopTimer = 21300; uiWoundingStrikeTimer = 5300; - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -135,8 +135,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, DONE); + if (instance) + instance->SetData(DATA_EPOCH_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 30482d27655..0b8faa71299 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -45,21 +45,21 @@ public: { boss_infinite_corruptorAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 /*diff*/) @@ -73,8 +73,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, DONE); + if (instance) + instance->SetData(DATA_INFINITE_EVENT, DONE); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 3912ef90c9c..1a43472365a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -78,7 +78,7 @@ public: { boss_mal_ganisAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiCarrionSwarmTimer; @@ -94,7 +94,7 @@ public: CombatPhases Phase; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -107,15 +107,15 @@ public: uiSleepTimer = urand(15000, 20000); uiOutroTimer = 1000; - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } void DamageTaken(Unit* done_by, uint32 &damage) @@ -154,13 +154,13 @@ public: return; } - if (Creature* pArthas = me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0)) + if (Creature* pArthas = me->GetCreature(*me, instance ? instance->GetData64(DATA_ARTHAS) : 0)) if (pArthas->isDead()) { EnterEvadeMode(); me->DisappearAndDie(); - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, FAIL); + if (instance) + instance->SetData(DATA_MAL_GANIS_EVENT, FAIL); } if (uiCarrionSwarmTimer < diff) @@ -204,7 +204,7 @@ public: uiOutroTimer = 8000; break; case 2: - me->SetTarget(pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0); + me->SetTarget(instance ? instance->GetData64(DATA_ARTHAS) : 0); me->HandleEmoteCommand(29); DoScriptText(SAY_ESCAPE_SPEECH_2, me); ++uiOutroStep; @@ -233,13 +233,13 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_MAL_GANIS_EVENT, DONE); + instance->SetData(DATA_MAL_GANIS_EVENT, DONE); // give achievement credit to players. criteria use spell 58630 which doesn't exist. - if (pInstance) - pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58630); + if (instance) + instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58630); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 7f5ef2cb36e..4c00dd5bb2b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -59,8 +59,8 @@ public: { boss_meathookAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); - if (pInstance) + instance = c->GetInstanceScript(); + if (instance) DoScriptText(SAY_SPAWN, me); } @@ -68,7 +68,7 @@ public: uint32 uiDiseaseTimer; uint32 uiFrenzyTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -76,16 +76,16 @@ public: uiDiseaseTimer = urand(2000, 4000); //approx 3s uiFrenzyTimer = urand(21000, 26000); //made it up - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -120,8 +120,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); + if (instance) + instance->SetData(DATA_MEATHOOK_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 782d70070bd..246e4bee24e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -68,8 +68,8 @@ public: { boss_salrammAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); - if (pInstance) + instance = c->GetInstanceScript(); + if (instance) DoScriptText(SAY_SPAWN, me); } @@ -79,7 +79,7 @@ public: uint32 uiStealFleshTimer; uint32 uiSummonGhoulsTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -89,16 +89,16 @@ public: uiStealFleshTimer = 12345; uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -147,8 +147,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, DONE); + if (instance) + instance->SetData(DATA_SALRAMM_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 3aee0ba30d0..02f9435db49 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -327,11 +327,11 @@ public: { npc_arthasAI(Creature* creature) : npc_escortAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); Reset(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bStepping; uint32 uiStep; @@ -375,9 +375,9 @@ public: uiMalganisGUID = 0; uiInfiniteGUID = 0; - if (pInstance) { - pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); - switch (pInstance->GetData(DATA_ARTHAS_EVENT)) + if (instance) { + instance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); + switch (instance->GetData(DATA_ARTHAS_EVENT)) { case NOT_STARTED: bStepping = true; @@ -400,8 +400,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); + if (instance) + instance->SetData(DATA_ARTHAS_EVENT, FAIL); } void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) @@ -411,14 +411,14 @@ public: for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) { if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; - if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) + if (Creature* temp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - guidVector[i-timeRiftID-1] = pTemp->GetGUID(); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); + guidVector[i-timeRiftID-1] = temp->GetGUID(); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); + temp->SetReactState(REACT_PASSIVE); + temp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) - uiEpochGUID = pTemp->GetGUID(); + uiEpochGUID = temp->GetGUID(); } } } @@ -428,9 +428,9 @@ public: for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { if ((uint32)WavesLocations[waveID][i][0] == 0) break; - if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0], WavesLocations[waveID][i][1], WavesLocations[waveID][i][2], WavesLocations[waveID][i][3], WavesLocations[waveID][i][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) + if (Creature* temp = me->SummonCreature((uint32)WavesLocations[waveID][i][0], WavesLocations[waveID][i][1], WavesLocations[waveID][i][2], WavesLocations[waveID][i][3], WavesLocations[waveID][i][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - guidVector[i] = pTemp->GetGUID(); + guidVector[i] = temp->GetGUID(); } } } @@ -535,8 +535,8 @@ public: DoScriptText(SAY_PHASE403, me); break; case 36: - if (pInstance) - if (GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SHKAF_GATE))) + if (instance) + if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_SHKAF_GATE))) pGate->SetGoState(GO_STATE_ACTIVE); break; case 45: @@ -860,8 +860,8 @@ public: DoScriptText(SAY_PHASE209, me); uiBossEvent = DATA_MEATHOOK_EVENT; - if (pInstance) - pInstance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); me->SetReactState(REACT_DEFENSIVE); SetDespawnAtFar(false); @@ -875,7 +875,7 @@ public: case 53: case 55: case 57: - if (pInstance->GetData(uiBossEvent) != DONE) + if (instance->GetData(uiBossEvent) != DONE) { SpawnWaveGroup(uiWave, uiWaveGUID); uiWave++; @@ -890,7 +890,7 @@ public: case 54: case 56: case 58: - if (pInstance->GetData(uiBossEvent) != DONE) + if (instance->GetData(uiBossEvent) != DONE) { uint32 mobCounter = 0; uint32 deadCounter = 0; @@ -899,8 +899,8 @@ public: if (uiWaveGUID[i] == 0) break; ++mobCounter; - Unit* pTemp = Unit::GetCreature(*me, uiWaveGUID[i]); - if (!pTemp || pTemp->isDead()) + Unit* temp = Unit::GetCreature(*me, uiWaveGUID[i]); + if (!temp || temp->isDead()) ++deadCounter; } @@ -914,7 +914,7 @@ public: break; case 49: //Summon Boss case 59: - if (pInstance->GetData(uiBossEvent) != DONE) + if (instance->GetData(uiBossEvent) != DONE) { uint32 uiBossID = 0; if (uiBossEvent == DATA_MEATHOOK_EVENT) @@ -933,9 +933,9 @@ public: break; case 50: //Wait Boss death case 60: - if (pInstance) + if (instance) { - if (pInstance->GetData(uiBossEvent) == DONE) + if (instance->GetData(uiBossEvent) == DONE) { JumpToNextStep(1000); if (uiBossEvent == DATA_MEATHOOK_EVENT) @@ -947,7 +947,7 @@ public: uiBossEvent = DATA_EPOCH_EVENT; } } - else if (pInstance->GetData(uiBossEvent) == FAIL) + else if (instance->GetData(uiBossEvent) == FAIL) npc_escortAI::EnterEvadeMode(); else uiPhaseTimer = 10000; @@ -1031,10 +1031,10 @@ public: case 77: //Make cratures attackable for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) + if (Creature* temp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); - pTemp->SetReactState(REACT_AGGRESSIVE); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); + temp->SetReactState(REACT_AGGRESSIVE); } JumpToNextStep(5000); break; @@ -1068,8 +1068,8 @@ public: JumpToNextStep(1000); break; case 80: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + if (instance) + if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { SpawnTimeRift(17, &uiEpochGUID); if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) @@ -1079,14 +1079,14 @@ public: JumpToNextStep(18000); break; case 81: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + if (instance) + if (instance->GetData(DATA_EPOCH_EVENT) != DONE) DoScriptText(SAY_PHASE315, me); JumpToNextStep(6000); break; case 82: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + if (instance) + if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) { @@ -1100,9 +1100,9 @@ public: JumpToNextStep(1000); break; case 83: - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_EPOCH_EVENT) == DONE) + if (instance->GetData(DATA_EPOCH_EVENT) == DONE) { uiGossipStep = 3; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -1110,7 +1110,7 @@ public: uiBossEvent = DATA_MAL_GANIS_EVENT; JumpToNextStep(15000); } - else if (pInstance->GetData(DATA_EPOCH_EVENT) == FAIL) + else if (instance->GetData(DATA_EPOCH_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else uiPhaseTimer = 10000; @@ -1130,8 +1130,8 @@ public: uiMalganisGUID = pMalganis->GetGUID(); pMalganis->SetReactState(REACT_PASSIVE); } - if (pInstance) - if (GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAL_GANIS_GATE_1))) + if (instance) + if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_MAL_GANIS_GATE_1))) pGate->SetGoState(GO_STATE_ACTIVE); SetHoldState(false); bStepping = false; @@ -1152,14 +1152,14 @@ public: JumpToNextStep(1000); break; case 88: - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == DONE) + if (instance->GetData(DATA_MAL_GANIS_EVENT) == DONE) { SetHoldState(false); JumpToNextStep(1000); } - else if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) + else if (instance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else uiPhaseTimer = 10000; @@ -1173,10 +1173,10 @@ public: JumpToNextStep(7000); break; case 90: - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D - me->SetTarget(pInstance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind + instance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D + me->SetTarget(instance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind } DoScriptText(SAY_PHASE504, me); bStepping = false; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index d69036f3819..168d78baa87 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -40,14 +40,14 @@ class instance_culling_of_stratholme : public InstanceMapScript public: instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_culling_of_stratholme_InstanceMapScript(pMap); + return new instance_culling_of_stratholme_InstanceMapScript(map); } struct instance_culling_of_stratholme_InstanceMapScript : public InstanceScript { - instance_culling_of_stratholme_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_culling_of_stratholme_InstanceMapScript(Map* map) : InstanceScript(map) { _arthasGUID = 0; _meathookGUID = 0; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 4c89fcfe5b4..30f3c4c056c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -57,10 +57,10 @@ public: { boss_aeonusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SandBreath_Timer; uint32 TimeStop_Timer; @@ -97,10 +97,10 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_RIFT, DONE); - pInstance->SetData(TYPE_MEDIVH, DONE);//FIXME: later should be removed + instance->SetData(TYPE_RIFT, DONE); + instance->SetData(TYPE_MEDIVH, DONE);//FIXME: later should be removed } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 1566058aef0..aa775e0947d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -57,10 +57,10 @@ public: { boss_chrono_lord_dejaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ArcaneBlast_Timer; uint32 TimeLapse_Timer; @@ -104,8 +104,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_RIFT, SPECIAL); + if (instance) + instance->SetData(TYPE_RIFT, SPECIAL); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index b9a3c954771..9e62244498f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -56,10 +56,10 @@ public: { boss_temporusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Haste_Timer; uint32 SpellReflection_Timer; @@ -88,8 +88,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_RIFT, SPECIAL); + if (instance) + instance->SetData(TYPE_RIFT, SPECIAL); } void MoveInLineOfSight(Unit* who) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index e1ea473998d..653781a1d3f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -70,10 +70,10 @@ public: { npc_medivh_bmAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SpellCorrupt_Timer; uint32 Check_Timer; @@ -86,10 +86,10 @@ public: { SpellCorrupt_Timer = 0; - if (!pInstance) + if (!instance) return; - if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) + if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) DoCast(me, SPELL_CHANNEL, true); else if (me->HasAura(SPELL_CHANNEL)) me->RemoveAura(SPELL_CHANNEL); @@ -99,22 +99,22 @@ public: void MoveInLineOfSight(Unit* who) { - if (!pInstance) + if (!instance) return; if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) { - if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS || pInstance->GetData(TYPE_MEDIVH) == DONE) + if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS || instance->GetData(TYPE_MEDIVH) == DONE) return; DoScriptText(SAY_INTRO, me); - pInstance->SetData(TYPE_MEDIVH, IN_PROGRESS); + instance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; } else if (who->GetTypeId() == TYPEID_UNIT && me->IsWithinDistInMap(who, 15.0f)) { - if (pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) + if (instance->GetData(TYPE_MEDIVH) != IN_PROGRESS) return; uint32 entry = who->GetEntry(); @@ -133,7 +133,7 @@ public: void AttackStart(Unit* /*who*/) { - //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) + //if (instance && instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; //ScriptedAI::AttackStart(who); @@ -163,14 +163,14 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; if (SpellCorrupt_Timer) { if (SpellCorrupt_Timer <= diff) { - pInstance->SetData(TYPE_MEDIVH, SPECIAL); + instance->SetData(TYPE_MEDIVH, SPECIAL); if (me->HasAura(SPELL_CORRUPT_AEONUS)) SpellCorrupt_Timer = 1000; @@ -185,7 +185,7 @@ public: { if (Check_Timer <= diff) { - uint32 pct = pInstance->GetData(DATA_SHIELD); + uint32 pct = instance->GetData(DATA_SHIELD); Check_Timer = 5000; @@ -206,7 +206,7 @@ public: } //if we reach this it means event was running but at some point reset. - if (pInstance->GetData(TYPE_MEDIVH) == NOT_STARTED) + if (instance->GetData(TYPE_MEDIVH) == NOT_STARTED) { me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); @@ -214,7 +214,7 @@ public: return; } - if (pInstance->GetData(TYPE_RIFT) == DONE) + if (instance->GetData(TYPE_RIFT) == DONE) { DoScriptText(SAY_WIN, me); Check_Timer = 0; @@ -223,7 +223,7 @@ public: me->RemoveAura(SPELL_CHANNEL); //TODO: start the post-event here - pInstance->SetData(TYPE_MEDIVH, DONE); + instance->SetData(TYPE_MEDIVH, DONE); } } else Check_Timer -= diff; } @@ -263,10 +263,10 @@ public: { npc_time_riftAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 TimeRiftWave_Timer; uint8 mRiftWaveCount; @@ -279,10 +279,10 @@ public: TimeRiftWave_Timer = 15000; mRiftWaveCount = 0; - if (!pInstance) + if (!instance) return; - mPortalCount = pInstance->GetData(DATA_PORTAL_COUNT); + mPortalCount = instance->GetData(DATA_PORTAL_COUNT); if (mPortalCount < 6) mWaveId = 0; @@ -298,7 +298,7 @@ public: if (!creature_entry) return; - if (pInstance && pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) + if (instance && instance->GetData(TYPE_MEDIVH) != IN_PROGRESS) { me->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); @@ -312,7 +312,7 @@ public: pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); if (Unit* Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) - if (Unit* temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) + if (Unit* temp = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_MEDIVH) : 0)) Summon->AddThreat(temp, 0.0f); } @@ -337,7 +337,7 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; if (TimeRiftWave_Timer <= diff) @@ -352,8 +352,8 @@ public: sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: not casting anylonger, i need to die."); me->setDeathState(JUST_DIED); - if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) - pInstance->SetData(TYPE_RIFT, SPECIAL); + if (instance->GetData(TYPE_RIFT) == IN_PROGRESS) + instance->SetData(TYPE_RIFT, SPECIAL); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 46eef1d8bb4..659a22178f9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -66,14 +66,14 @@ class instance_dark_portal : public InstanceMapScript public: instance_dark_portal() : InstanceMapScript("instance_dark_portal", 269) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_dark_portal_InstanceMapScript(pMap); + return new instance_dark_portal_InstanceMapScript(map); } struct instance_dark_portal_InstanceMapScript : public InstanceScript { - instance_dark_portal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_dark_portal_InstanceMapScript(Map* map) : InstanceScript(map) { } @@ -294,22 +294,22 @@ public: CurrentRiftId = tmp; - Creature* pTemp = pMedivh->SummonCreature(C_TIME_RIFT, + Creature* temp = pMedivh->SummonCreature(C_TIME_RIFT, PortalLocation[tmp][0], PortalLocation[tmp][1], PortalLocation[tmp][2], PortalLocation[tmp][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - if (pTemp) + if (temp) { - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (Creature* pBoss = SummonedPortalBoss(pTemp)) + if (Creature* pBoss = SummonedPortalBoss(temp)) { if (pBoss->GetEntry() == C_AEONUS) pBoss->AddThreat(pMedivh, 0.0f); else { - pBoss->AddThreat(pTemp, 0.0f); - pTemp->CastSpell(pBoss, SPELL_RIFT_CHANNEL, false); + pBoss->AddThreat(temp, 0.0f); + temp->CastSpell(pBoss, SPELL_RIFT_CHANNEL, false); } } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index fca0545292a..f09308a6724 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -54,10 +54,10 @@ public: { boss_captain_skarlocAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Holy_Light_Timer; uint32 Cleanse_Timer; @@ -92,8 +92,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) - pInstance->SetData(TYPE_THRALL_PART1, DONE); + if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + instance->SetData(TYPE_THRALL_PART1, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index b20882958d9..5b201e50bcb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -56,10 +56,10 @@ public: { boss_epoch_hunterAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SandBreath_Timer; uint32 ImpendingDeath_Timer; @@ -88,8 +88,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) - pInstance->SetData(TYPE_THRALL_PART4, DONE); + if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + instance->SetData(TYPE_THRALL_PART4, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index b88aeaefe81..28f095dbaf8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -38,12 +38,12 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { - if (InstanceScript* pInstance = pGO->GetInstanceScript()) + if (InstanceScript* instance = pGO->GetInstanceScript()) { - if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE) + if (instance->GetData(TYPE_BARREL_DIVERSION) == DONE) return false; - pInstance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS); + instance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS); } return false; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 115fa1ededb..cdcbbf04c60 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -42,14 +42,14 @@ class instance_old_hillsbrad : public InstanceMapScript public: instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_old_hillsbrad_InstanceMapScript(pMap); + return new instance_old_hillsbrad_InstanceMapScript(map); } struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript { - instance_old_hillsbrad_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; uint32 mBarrelCount; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 4f49c08f16a..1f0342b3804 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -76,8 +76,8 @@ public: if (creature->isQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - InstanceScript* pInstance = creature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS, 1)) + InstanceScript* instance = creature->GetInstanceScript(); + if (instance && instance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS, 1)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) @@ -201,15 +201,15 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); - pInstance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); + instance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); + instance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } DoScriptText(SAY_TH_START_EVENT_PART1, creature); @@ -230,8 +230,8 @@ public: case GOSSIP_ACTION_INFO_DEF+20: player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, creature->GetGUID()); creature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000); - if (pInstance) - pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); DoScriptText(SAY_TH_START_EVENT_PART2, creature); @@ -240,8 +240,8 @@ public: case GOSSIP_ACTION_INFO_DEF+3: player->CLOSE_GOSSIP_MENU(); - if (pInstance) - pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP(); break; } @@ -256,22 +256,22 @@ public: player->SendPreparedQuest(creature->GetGUID()); } - InstanceScript* pInstance = creature->GetInstanceScript(); - if (pInstance) + InstanceScript* instance = creature->GetInstanceScript(); + if (instance) { - if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) + if (instance->GetData(TYPE_BARREL_DIVERSION) == DONE && !instance->GetData(TYPE_THRALL_EVENT)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(GOSSIP_ID_START, creature->GetGUID()); } - if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) + if (instance->GetData(TYPE_THRALL_PART1) == DONE && !instance->GetData(TYPE_THRALL_PART2)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, creature->GetGUID()); } - if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) + if (instance->GetData(TYPE_THRALL_PART2) == DONE && !instance->GetData(TYPE_THRALL_PART3)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, creature->GetGUID()); @@ -284,12 +284,12 @@ public: { npc_thrall_old_hillsbradAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); HadMount = false; me->setActive(true); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 TarethaGUID; @@ -298,7 +298,7 @@ public: void WaypointReached(uint32 i) { - if (!pInstance) + if (!instance) return; switch (i) @@ -372,7 +372,7 @@ public: //make horsie run off SetEscortPaused(true); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(TYPE_THRALL_PART2, DONE); + instance->SetData(TYPE_THRALL_PART2, DONE); SetRun(); break; case 64: @@ -411,7 +411,7 @@ public: me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 94: - if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) + if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA)) { if (Unit* Taretha = Unit::GetUnit((*me), TarethaGUID)) DoScriptText(SAY_TA_ESCAPED, Taretha, me); @@ -419,7 +419,7 @@ public: break; case 95: DoScriptText(SAY_TH_MEET_TARETHA, me); - pInstance->SetData(TYPE_THRALL_PART3, DONE); + instance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: @@ -437,16 +437,16 @@ public: case 106: { //trigger taretha to run down outside - if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA))) + if (Creature* Taretha = instance->instance->GetCreature(instance->GetData64(DATA_TARETHA))) { if (Player* player = GetPlayerForEscort()) CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, player->GetGUID()); } //kill credit Creature for quest - Map* pMap = me->GetMap(); - Map::PlayerList const& players = pMap->GetPlayers(); - if (!players.isEmpty() && pMap->IsDungeon()) + Map* map = me->GetMap(); + Map::PlayerList const& players = map->GetPlayers(); + if (!players.isEmpty() && map->IsDungeon()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { @@ -534,8 +534,8 @@ public: } void JustDied(Unit* slayer) { - if (pInstance) - pInstance->SetData(TYPE_THRALL_EVENT, FAIL); + if (instance) + instance->SetData(TYPE_THRALL_EVENT, FAIL); // Don't do a yell if he kills self (if player goes too far or at the end). if (slayer == me) @@ -584,7 +584,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -594,13 +594,13 @@ public: { player->CLOSE_GOSSIP_MENU(); - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) { - pInstance->SetData(TYPE_THRALL_PART4, IN_PROGRESS); - if (pInstance->GetData64(DATA_EPOCH) == 0) + instance->SetData(TYPE_THRALL_PART4, IN_PROGRESS); + if (instance->GetData64(DATA_EPOCH) == 0) creature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) + if (uint64 ThrallGUID = instance->GetData64(DATA_THRALL)) { Creature* Thrall = (Unit::GetCreature((*creature), ThrallGUID)); if (Thrall) @@ -613,8 +613,8 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) + InstanceScript* instance = creature->GetInstanceScript(); + if (instance && instance->GetData(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, creature->GetGUID()); @@ -626,10 +626,10 @@ public: { npc_tarethaAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void WaypointReached(uint32 i) { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index d9eaf0d255c..c76cc790274 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -114,11 +114,11 @@ public: { boss_onyxiaAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; uint32 m_uiPhase; @@ -169,11 +169,11 @@ public: m_uiSummonWhelpCount = 0; m_bIsMoving = false; - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(DATA_ONYXIA, NOT_STARTED); - m_pInstance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + m_instance->SetData(DATA_ONYXIA, NOT_STARTED); + m_instance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); + m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } } @@ -182,17 +182,17 @@ public: DoScriptText(SAY_AGGRO, me); me->SetInCombatWithZone(); - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(DATA_ONYXIA, IN_PROGRESS); - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + m_instance->SetData(DATA_ONYXIA, IN_PROGRESS); + m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } } void JustDied(Unit* /*killer*/) { - if (m_pInstance) - m_pInstance->SetData(DATA_ONYXIA, DONE); + if (m_instance) + m_instance->SetData(DATA_ONYXIA, DONE); Summons.DespawnAll(); } @@ -265,8 +265,8 @@ public: me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25); me->SetSpeed(MOVE_FLIGHT, 1.0f); DoScriptText(SAY_PHASE_2_TRANS, me); - if (m_pInstance) - m_pInstance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); + if (m_instance) + m_instance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); m_uiWhelpTimer = 5000; m_uiLairGuardTimer = 15000; break; @@ -301,9 +301,9 @@ public: (pSpell->Id >= 22267 && pSpell->Id <= 22268)) && (target->GetTypeId() == TYPEID_PLAYER)) { - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(DATA_SHE_DEEP_BREATH_MORE, FAIL); + m_instance->SetData(DATA_SHE_DEEP_BREATH_MORE, FAIL); } } } @@ -362,8 +362,8 @@ public: Trinity::GameObjectInRangeCheck check(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 15); Trinity::GameObjectLastSearcher<Trinity::GameObjectInRangeCheck> searcher(me, pFloor, check); me->VisitNearbyGridObject(30, searcher); - if (m_pInstance && pFloor) - m_pInstance->SetData64(DATA_FLOOR_ERUPTION_GUID, pFloor->GetGUID()); + if (m_instance && pFloor) + m_instance->SetData64(DATA_FLOOR_ERUPTION_GUID, pFloor->GetGUID()); m_uiBellowingRoarTimer = 30000; } else @@ -409,8 +409,8 @@ public: if (HealthBelowPct(40)) { m_uiPhase = PHASE_END; - if (m_pInstance) - m_pInstance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); + if (m_instance) + m_instance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); DoScriptText(SAY_PHASE_3_TRANS, me); SetCombatMovement(true); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 1c69e72befe..a727164564a 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -30,14 +30,14 @@ class instance_onyxias_lair : public InstanceMapScript public: instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_onyxias_lair_InstanceMapScript(pMap); + return new instance_onyxias_lair_InstanceMapScript(map); } struct instance_onyxias_lair_InstanceMapScript : public InstanceScript { - instance_onyxias_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map) {} //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed @@ -90,9 +90,9 @@ public: case GO_WHELP_SPAWNER: Position goPos; go->GetPosition(&goPos); - if (Creature* pTemp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* temp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN)) { - pTemp->SetInCombatWithZone(); + temp->SetInCombatWithZone(); ++m_uiManyWhelpsCounter; } break; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 0082839e38f..764b9a1523f 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -25,14 +25,14 @@ class instance_razorfen_downs : public InstanceMapScript public: instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", 129) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_razorfen_downs_InstanceMapScript(pMap); + return new instance_razorfen_downs_InstanceMapScript(map); } struct instance_razorfen_downs_InstanceMapScript : public InstanceScript { - instance_razorfen_downs_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_razorfen_downs_InstanceMapScript(Map* map) : InstanceScript(map) { } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 62fe67b4520..9ad593da2ed 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -96,11 +96,11 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { //basic support, not blizzlike data is missing... - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); + instance->SetData(DATA_GONG_WAVES, instance->GetData(DATA_GONG_WAVES)+1); return true; } @@ -128,10 +128,10 @@ public: { npc_tomb_creatureAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiWebTimer; @@ -160,8 +160,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); + if (instance) + instance->SetData(DATA_GONG_WAVES, instance->GetData(DATA_GONG_WAVES)+1); } }; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 568bf355d06..b747fa31f36 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -33,14 +33,14 @@ class instance_razorfen_kraul : public InstanceMapScript public: instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_razorfen_kraul_InstanceMapScript(pMap); + return new instance_razorfen_kraul_InstanceMapScript(map); } struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript { - instance_razorfen_kraul_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 DoorWardGUID; int WardKeeperDeath; @@ -78,10 +78,10 @@ public: void Update(uint32 /*diff*/) { if (WardKeeperDeath == WARD_KEEPERS_NR) - if (GameObject* pGo = instance->GetGameObject(DoorWardGUID)) + if (GameObject* go = instance->GetGameObject(DoorWardGUID)) { - pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33); - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); + go->SetGoState(GO_STATE_ACTIVE); } } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index c057430bd18..1a9d3f7a557 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -51,10 +51,10 @@ public: { boss_kriAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Cleave_Timer; uint32 ToxicVolley_Timer; @@ -79,13 +79,13 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2) + if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2) // Unlootable if death me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - pInstance->SetData(DATA_BUG_TRIO_DEATH, 1); + instance->SetData(DATA_BUG_TRIO_DEATH, 1); } } void UpdateAI(const uint32 diff) @@ -119,7 +119,7 @@ public: //Checking if Vem is dead. If yes we will enrage. if (Check_Timer <= diff) { - if (pInstance && pInstance->GetData(DATA_VEMISDEAD)) + if (instance && instance->GetData(DATA_VEMISDEAD)) { DoCast(me, SPELL_ENRAGE); VemDead = true; @@ -148,10 +148,10 @@ public: { boss_vemAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Charge_Timer; uint32 KnockBack_Timer; @@ -170,13 +170,13 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_VEM_DEATH, 0); - if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2) + instance->SetData(DATA_VEM_DEATH, 0); + if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2) // Unlootable if death me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - pInstance->SetData(DATA_BUG_TRIO_DEATH, 1); + instance->SetData(DATA_BUG_TRIO_DEATH, 1); } } @@ -241,10 +241,10 @@ public: { boss_yaujAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Heal_Timer; uint32 Fear_Timer; @@ -263,12 +263,12 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2) + if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2) // Unlootable if death me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - pInstance->SetData(DATA_BUG_TRIO_DEATH, 1); + instance->SetData(DATA_BUG_TRIO_DEATH, 1); } for (uint8 i = 0; i < 10; ++i) @@ -301,10 +301,10 @@ public: //Casting Heal to other twins or herself. if (Heal_Timer <= diff) { - if (pInstance) + if (instance) { - Unit* pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); - Unit* pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); + Unit* pKri = Unit::GetUnit((*me), instance->GetData64(DATA_KRI)); + Unit* pVem = Unit::GetUnit((*me), instance->GetData64(DATA_VEM)); switch (urand(0, 2)) { @@ -330,9 +330,9 @@ public: { if (!VemDead) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_VEMISDEAD)) + if (instance->GetData(DATA_VEMISDEAD)) { DoCast(me, SPELL_ENRAGE); VemDead = true; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 7244d78e83d..dd2531d5aad 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -178,12 +178,12 @@ public: { eye_of_cthunAI(Creature* c) : Scripted_NoMovementAI(c) { - pInst = c->GetInstanceScript(); - if (!pInst) + instance = c->GetInstanceScript(); + if (!instance) sLog->outError("TSCR: No Instance eye_of_cthunAI"); } - InstanceScript* pInst; + InstanceScript* instance; //Global variables uint32 PhaseTimer; @@ -222,8 +222,8 @@ public: me->SetVisible(true); //Reset Phase - if (pInst) - pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); + if (instance) + instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); //to avoid having a following void zone Creature* pPortal= me->FindNearestCreature(MOB_CTHUN_PORTAL, 10); @@ -234,8 +234,8 @@ public: void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); - if (pInst) - pInst->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); + if (instance) + instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); } void SpawnEyeTentacle(float x, float y) @@ -253,10 +253,10 @@ public: return; //No instance - if (!pInst) + if (!instance) return; - uint32 currentPhase = pInst->GetData(DATA_CTHUN_PHASE); + uint32 currentPhase = instance->GetData(DATA_CTHUN_PHASE); if (currentPhase == PHASE_EYE_GREEN_BEAM || currentPhase == PHASE_EYE_RED_BEAM) { // EyeTentacleTimer @@ -319,7 +319,7 @@ public: if (PhaseTimer <= diff) { //Switch to Dark Beam - pInst->SetData(DATA_CTHUN_PHASE, PHASE_EYE_RED_BEAM); + instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_RED_BEAM); me->InterruptNonMeleeSpells(false); me->SetReactState(REACT_PASSIVE); @@ -379,7 +379,7 @@ public: if (PhaseTimer <= diff) { //Switch to Eye Beam - pInst->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); + instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); BeamTimer = 3000; ClawTentacleTimer = 12500; //4 per Eye beam phase (unsure if they spawn during Dark beam) @@ -421,10 +421,10 @@ public: void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance - if (!pInst) + if (!instance) return; - switch (pInst->GetData(DATA_CTHUN_PHASE)) + switch (instance->GetData(DATA_CTHUN_PHASE)) { case PHASE_EYE_GREEN_BEAM: case PHASE_EYE_RED_BEAM: @@ -445,7 +445,7 @@ public: me->SetTarget(0); //Death animation/respawning; - pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_TRANSITION); + instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_TRANSITION); me->SetHealth(0); damage = 0; @@ -484,12 +484,12 @@ public: { SetCombatMovement(false); - pInst = c->GetInstanceScript(); - if (!pInst) + instance = c->GetInstanceScript(); + if (!instance) sLog->outError("TSCR: No Instance eye_of_cthunAI"); } - InstanceScript* pInst; + InstanceScript* instance; //Out of combat whisper timer uint32 WisperTimer; @@ -544,8 +544,8 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); me->SetVisible(false); - if (pInst) - pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); + if (instance) + instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -606,11 +606,11 @@ public: //WisperTimer if (WisperTimer <= diff) { - Map* pMap = me->GetMap(); - if (!pMap->IsDungeon()) return; + Map* map = me->GetMap(); + if (!map->IsDungeon()) return; //Play random sound to the zone - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) { @@ -631,10 +631,10 @@ public: me->SetTarget(0); //No instance - if (!pInst) + if (!instance) return; - uint32 currentPhase = pInst->GetData(DATA_CTHUN_PHASE); + uint32 currentPhase = instance->GetData(DATA_CTHUN_PHASE); if (currentPhase == PHASE_CTHUN_STOMACH || currentPhase == PHASE_CTHUN_WEAK) { // EyeTentacleTimer @@ -663,7 +663,7 @@ public: if (PhaseTimer <= diff) { //Switch - pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_STOMACH); + instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_STOMACH); //Switch to c'thun model me->InterruptNonMeleeSpells(false); @@ -711,7 +711,7 @@ public: //Weaken if (FleshTentaclesKilled > 1) { - pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_WEAK); + instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_WEAK); DoScriptText(EMOTE_WEAKENED, me); PhaseTimer = 45000; @@ -855,7 +855,7 @@ public: if (PhaseTimer <= diff) { //Switch - pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_STOMACH); + instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_STOMACH); //Remove purple coloration me->RemoveAurasDueToSpell(SPELL_PURPLE_COLORATION); @@ -880,17 +880,17 @@ public: void JustDied(Unit* /*killer*/) { - if (pInst) - pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); + if (instance) + instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance - if (!pInst) + if (!instance) return; - switch (pInst->GetData(DATA_CTHUN_PHASE)) + switch (instance->GetData(DATA_CTHUN_PHASE)) { case PHASE_CTHUN_STOMACH: //Not weakened so reduce damage by 99% diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 62d92c35489..c501a060194 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -63,10 +63,10 @@ struct boss_twinemperorsAI : public ScriptedAI { boss_twinemperorsAI(Creature* c): ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Heal_Timer; uint32 Teleport_Timer; @@ -97,8 +97,8 @@ struct boss_twinemperorsAI : public ScriptedAI Creature* GetOtherBoss() { - if (pInstance) - return Unit::GetCreature(*me, pInstance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR)); + if (instance) + return Unit::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR)); else return NULL; } @@ -204,7 +204,7 @@ struct boss_twinemperorsAI : public ScriptedAI void TeleportToMyBrother() { - if (!pInstance) + if (!instance) return; Teleport_Timer = TELEPORTTIME; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 6a29dab356c..3b0d38fe2d4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -31,14 +31,14 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript public: instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_temple_of_ahnqiraj_InstanceMapScript(pMap); + return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript { - instance_temple_of_ahnqiraj_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) {} //If Vem is dead... bool IsBossDied[3]; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 945b8b7bc63..36864245305 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -33,14 +33,14 @@ class instance_wailing_caverns : public InstanceMapScript public: instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", 43) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_wailing_caverns_InstanceMapScript(pMap); + return new instance_wailing_caverns_InstanceMapScript(map); } struct instance_wailing_caverns_InstanceMapScript : public InstanceScript { - instance_wailing_caverns_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 7cc1b71a97f..cf72c0305c6 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -88,12 +88,12 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { player->CLOSE_GOSSIP_MENU(); - if (pInstance) - pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); DoScriptText(SAY_MAKE_PREPARATIONS, creature); @@ -109,21 +109,21 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); - if (pInstance) + if (instance) { creature->CastSpell(player, SPELL_MARK_OF_THE_WILD_RANK_2, true); - if ((pInstance->GetData(TYPE_LORD_COBRAHN) == DONE) && (pInstance->GetData(TYPE_LORD_PYTHAS) == DONE) && - (pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE)) + if ((instance->GetData(TYPE_LORD_COBRAHN) == DONE) && (instance->GetData(TYPE_LORD_PYTHAS) == DONE) && + (instance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (instance->GetData(TYPE_LORD_SERPENTIS) == DONE)) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, creature->GetGUID()); - if (!pInstance->GetData(TYPE_NARALEX_YELLED)) + if (!instance->GetData(TYPE_NARALEX_YELLED)) { DoScriptText(SAY_AT_LAST, creature); - pInstance->SetData(TYPE_NARALEX_YELLED, 1); + instance->SetData(TYPE_NARALEX_YELLED, 1); } } else @@ -138,7 +138,7 @@ public: { npc_disciple_of_naralexAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); eventTimer = 0; currentEvent = 0; eventProgress = 0; @@ -149,11 +149,11 @@ public: uint32 eventTimer; uint32 currentEvent; uint32 eventProgress; - InstanceScript* pInstance; + InstanceScript* instance; void WaypointReached(uint32 i) { - if (!pInstance) + if (!instance) return; switch (i) @@ -161,16 +161,16 @@ public: case 4: eventProgress = 1; currentEvent = TYPE_NARALEX_PART1; - pInstance->SetData(TYPE_NARALEX_PART1, IN_PROGRESS); + instance->SetData(TYPE_NARALEX_PART1, IN_PROGRESS); break; case 5: DoScriptText(SAY_MUST_CONTINUE, me); - pInstance->SetData(TYPE_NARALEX_PART1, DONE); + instance->SetData(TYPE_NARALEX_PART1, DONE); break; case 11: eventProgress = 1; currentEvent = TYPE_NARALEX_PART2; - pInstance->SetData(TYPE_NARALEX_PART2, IN_PROGRESS); + instance->SetData(TYPE_NARALEX_PART2, IN_PROGRESS); break; case 19: DoScriptText(SAY_BEYOND_THIS_CORRIDOR, me); @@ -178,7 +178,7 @@ public: case 24: eventProgress = 1; currentEvent = TYPE_NARALEX_PART3; - pInstance->SetData(TYPE_NARALEX_PART3, IN_PROGRESS); + instance->SetData(TYPE_NARALEX_PART3, IN_PROGRESS); break; } } @@ -195,12 +195,12 @@ public: void JustDied(Unit* /*slayer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_NARALEX_EVENT, FAIL); - pInstance->SetData(TYPE_NARALEX_PART1, FAIL); - pInstance->SetData(TYPE_NARALEX_PART2, FAIL); - pInstance->SetData(TYPE_NARALEX_PART3, FAIL); + instance->SetData(TYPE_NARALEX_EVENT, FAIL); + instance->SetData(TYPE_NARALEX_PART1, FAIL); + instance->SetData(TYPE_NARALEX_PART2, FAIL); + instance->SetData(TYPE_NARALEX_PART3, FAIL); } } @@ -214,12 +214,12 @@ public: if (currentEvent != TYPE_NARALEX_PART3) npc_escortAI::UpdateAI(diff); - if (!pInstance) + if (!instance) return; if (eventTimer <= diff) { eventTimer = 0; - if (pInstance->GetData(currentEvent) == IN_PROGRESS) + if (instance->GetData(currentEvent) == IN_PROGRESS) { switch (currentEvent) { @@ -249,7 +249,7 @@ public: { //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(true); DoScriptText(SAY_CAVERNS_PURIFIED, me); - pInstance->SetData(TYPE_NARALEX_PART2, DONE); + instance->SetData(TYPE_NARALEX_PART2, DONE); if (me->HasAura(SPELL_SERPENTINE_CLEANSING)) me->RemoveAura(SPELL_SERPENTINE_CLEANSING); } @@ -268,7 +268,7 @@ public: ++eventProgress; eventTimer = 15000; //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoCast(naralex, SPELL_NARALEXS_AWAKENING, true); DoScriptText(EMOTE_AWAKENING_RITUAL, me); } @@ -277,7 +277,7 @@ public: { ++eventProgress; eventTimer = 15000; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -288,7 +288,7 @@ public: { ++eventProgress; eventTimer = 30000; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -302,26 +302,26 @@ public: if (eventProgress == 5) { ++eventProgress; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); - pInstance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); + instance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } else - if (eventProgress == 6 && pInstance->GetData(TYPE_MUTANUS_THE_DEVOURER) == DONE) + if (eventProgress == 6 && instance->GetData(TYPE_MUTANUS_THE_DEVOURER) == DONE) { ++eventProgress; eventTimer = 3000; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { AchievementEntry const* AchievWC = GetAchievementStore()->LookupEntry(ACHIEVEMENT_WAILING_CAVERNS); if (AchievWC) { - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map && map->IsDungeon()) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) itr->getSource()->CompletedAchievement(AchievWC); } @@ -338,7 +338,7 @@ public: { ++eventProgress; eventTimer = 6000; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoScriptText(SAY_THANK_YOU, naralex); } else @@ -346,7 +346,7 @@ public: { ++eventProgress; eventTimer = 8000; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { DoScriptText(SAY_FAREWELL, naralex); naralex->AddAura(SPELL_FLIGHT_FORM, naralex); @@ -360,7 +360,7 @@ public: { ++eventProgress; eventTimer = 1500; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) naralex->GetMotionMaster()->MovePoint(25, naralex->GetPositionX(), naralex->GetPositionY(), naralex->GetPositionZ()); } else @@ -368,7 +368,7 @@ public: { ++eventProgress; eventTimer = 2500; - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { naralex->GetMotionMaster()->MovePoint(0, 117.095512f, 247.107971f, -96.167870f); naralex->GetMotionMaster()->MovePoint(1, 90.388809f, 276.135406f, -83.389801f); @@ -379,10 +379,10 @@ public: else if (eventProgress == 11) { - if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) + if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) naralex->SetVisible(false); me->SetVisible(false); - pInstance->SetData(TYPE_NARALEX_PART3, DONE); + instance->SetData(TYPE_NARALEX_PART3, DONE); } break; } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 8b4b1df4420..d48a8fee197 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -92,14 +92,14 @@ class instance_zulfarrak : public InstanceMapScript public: instance_zulfarrak() : InstanceMapScript("instance_zulfarrak", 209) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_zulfarrak_InstanceMapScript(pMap); + return new instance_zulfarrak_InstanceMapScript(map); } struct instance_zulfarrak_InstanceMapScript : public InstanceScript { - instance_zulfarrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 GahzRillaEncounter; uint64 ZumrahGUID; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 45ec61aacb4..97ad7cea315 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -75,15 +75,15 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { - if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS) + if (instance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(1517, creature->GetGUID()); } else - if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_NOT_STARTED) + if (instance->GetData(EVENT_PYRAMID) == PYRAMID_NOT_STARTED) player->SEND_GOSSIP_MENU(1515, creature->GetGUID()); else player->SEND_GOSSIP_MENU(1516, creature->GetGUID()); @@ -101,11 +101,11 @@ public: { npc_sergeant_blyAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); postGossipStep = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 postGossipStep; uint32 Text_Timer; @@ -131,7 +131,7 @@ public: { case 1: //weegli doesn't fight - he goes & blows up the door - if (Creature* pWeegli = pInstance->instance->GetCreature(pInstance->GetData64(ENTRY_WEEGLI))) + if (Creature* pWeegli = instance->instance->GetCreature(instance->GetData64(ENTRY_WEEGLI))) pWeegli->AI()->DoAction(0); DoScriptText(SAY_1, me); Text_Timer = 5000; @@ -145,11 +145,11 @@ public: if (Player* target = Player::GetPlayer(*me, PlayerGUID)) AttackStart(target); - if (pInstance) + if (instance) { - switchFactionIfAlive(pInstance, ENTRY_RAVEN); - switchFactionIfAlive(pInstance, ENTRY_ORO); - switchFactionIfAlive(pInstance, ENTRY_MURTA); + switchFactionIfAlive(instance, ENTRY_RAVEN); + switchFactionIfAlive(instance, ENTRY_ORO); + switchFactionIfAlive(instance, ENTRY_MURTA); } } postGossipStep++; @@ -185,9 +185,9 @@ public: Text_Timer = 0; } - void switchFactionIfAlive(InstanceScript* pInstance, uint32 entry) + void switchFactionIfAlive(InstanceScript* instance, uint32 entry) { - if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) + if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry))) if (crew->isAlive()) crew->setFaction(FACTION_HOSTILE); } @@ -199,9 +199,9 @@ public: +## go_troll_cage +######*/ -void initBlyCrewMember(InstanceScript* pInstance, uint32 entry, float x, float y, float z) +void initBlyCrewMember(InstanceScript* instance, uint32 entry, float x, float y, float z) { - if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) + if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry))) { crew->SetReactState(REACT_AGGRESSIVE); crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -216,17 +216,17 @@ class go_troll_cage : public GameObjectScript public: go_troll_cage() : GameObjectScript("go_troll_cage") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - if (InstanceScript* pInstance = pGo->GetInstanceScript()) + if (InstanceScript* instance = go->GetInstanceScript()) { - pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); + instance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance, ENTRY_BLY, 1884.99f, 1263, 41.52f); - initBlyCrewMember(pInstance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f); - initBlyCrewMember(pInstance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f); - initBlyCrewMember(pInstance, ENTRY_WEEGLI, 1890, 1263, 41.52f); - initBlyCrewMember(pInstance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f); + initBlyCrewMember(instance, ENTRY_BLY, 1884.99f, 1263, 41.52f); + initBlyCrewMember(instance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f); + initBlyCrewMember(instance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f); + initBlyCrewMember(instance, ENTRY_WEEGLI, 1890, 1263, 41.52f); + initBlyCrewMember(instance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f); } return false; } @@ -272,9 +272,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { - switch (pInstance->GetData(EVENT_PYRAMID)) + switch (instance->GetData(EVENT_PYRAMID)) { case PYRAMID_KILLED_ALL_TROLLS: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -300,7 +300,7 @@ public: { npc_weegli_blastfuseAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); destroyingDoor=false; Bomb_Timer = 10000; LandMine_Timer = 30000; @@ -309,12 +309,12 @@ public: uint32 Bomb_Timer; uint32 LandMine_Timer; bool destroyingDoor; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { - /*if (pInstance) - pInstance->SetData(0, NOT_STARTED);*/ + /*if (instance) + instance->SetData(0, NOT_STARTED);*/ } void AttackStart(Unit* victim) @@ -324,8 +324,8 @@ public: void JustDied(Unit* /*victim*/) { - /*if (pInstance) - pInstance->SetData(0, DONE);*/ + /*if (instance) + instance->SetData(0, DONE);*/ } void UpdateAI(const uint32 diff) @@ -355,18 +355,18 @@ public: void MovementInform(uint32 /*type*/, uint32 /*id*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) + if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { - pInstance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); + instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); DoScriptText(SAY_WEEGLI_OHNO, me); me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else if (destroyingDoor) { - pInstance->DoUseDoorOrButton(pInstance->GetData64(GO_END_DOOR)); + instance->DoUseDoorOrButton(instance->GetData64(GO_END_DOOR)); //TODO: leave the area... me->DespawnOrUnsummon(); }; @@ -410,19 +410,19 @@ class go_shallow_grave : public GameObjectScript public: go_shallow_grave() : GameObjectScript("go_shallow_grave") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { // randomly summon a zombie or dead hero the first time a grave is used - if (pGo->GetUseCount() == 0) + if (go->GetUseCount() == 0) { uint32 randomchance = urand(0, 100); if (randomchance < ZOMBIE_CHANCE) - pGo->SummonCreature(ZOMBIE, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + go->SummonCreature(ZOMBIE, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); else if ((randomchance-ZOMBIE_CHANCE) < DEAD_HERO_CHANCE) - pGo->SummonCreature(DEAD_HERO, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + go->SummonCreature(DEAD_HERO, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); } - pGo->AddUse(); + go->AddUse(); return false; } diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 58432eb9e01..a33ed68879f 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -329,9 +329,9 @@ class npc_muglash : public CreatureScript if (player) DoScriptText(SAY_MUG_BRAZIER, me, player); - if (GameObject* pGo = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2)) + if (GameObject* go = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2)) { - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); SetEscortPaused(true); } break; diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index ef6a6dd1f90..88e46e7fb26 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -354,10 +354,10 @@ public: if (Teleport_Timer <= diff) { //temp solution - unit can't be teleported by core using spelleffect 5, only players - Map* pMap = me->GetMap(); - if (pMap) + Map* map = me->GetMap(); + if (map) { - pMap->CreatureRelocation(me, 3706.39f, -3969.15f, 35.9118f, 0); + map->CreatureRelocation(me, 3706.39f, -3969.15f, 35.9118f, 0); me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0); } //begin swimming and summon depth charges diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index b572d132c26..57ff1448a7e 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -586,11 +586,11 @@ class go_ravager_cage : public GameObjectScript public: go_ravager_cage() : GameObjectScript("go_ravager_cage") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) { - if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) + if (Creature* ravager = go->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) { ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ravager->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 01325d5bfff..a6450fab6ea 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -70,15 +70,15 @@ class npc_kerlonian : public CreatureScript public: npc_kerlonian() : CreatureScript("npc_kerlonian") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_SLEEPER_AWAKENED) + if (quest->GetQuestId() == QUEST_SLEEPER_AWAKENED) { if (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); DoScriptText(SAY_KER_START, creature, player); - pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, pQuest); + pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, quest); } } @@ -209,9 +209,9 @@ class npc_prospector_remtravel : public CreatureScript public: npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) + if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) { if (npc_escortAI* pEscortAI = CAST_AI(npc_prospector_remtravel::npc_prospector_remtravelAI, creature->AI())) pEscortAI->Start(false, false, player->GetGUID()); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index e79ab78f46b..5b1c285d7b3 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -431,9 +431,9 @@ class npc_private_hendel : public CreatureScript public: npc_private_hendel() : CreatureScript("npc_private_hendel") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) + if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) creature->setFaction(FACTION_HOSTILE); return true; diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 98e1130d3f7..ff7ae84c892 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -94,9 +94,9 @@ class npc_oox22fe : public CreatureScript public: npc_oox22fe() : CreatureScript("npc_oox22fe") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_RESCUE_OOX22FE) + if (quest->GetQuestId() == QUEST_RESCUE_OOX22FE) { DoScriptText(SAY_OOX_START, creature); //change that the npc is not lying dead on the ground diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 947c5236e14..4cea827e5e7 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -162,10 +162,10 @@ public: case 1: if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = unit->GetGameObject(SPELL_LUNCH)) + if (GameObject* go = unit->GetGameObject(SPELL_LUNCH)) { m_bIsMovingToLunch = true; - me->GetMotionMaster()->MovePoint(POINT_ID, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ()); + me->GetMotionMaster()->MovePoint(POINT_ID, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ()); } } break; diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 549d741459e..fa5f6850689 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -506,12 +506,12 @@ class npc_tooga : public CreatureScript public: npc_tooga() : CreatureScript("npc_tooga") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_TOOGA) + if (quest->GetQuestId() == QUEST_TOOGA) { if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, creature->AI())) - pToogaAI->StartFollow(player, FACTION_TOOG_ESCORTEE, pQuest); + pToogaAI->StartFollow(player, FACTION_TOOG_ESCORTEE, quest); } return true; diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp index 0d93fd2b5bb..dc4fab4066e 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/teldrassil.cpp @@ -48,12 +48,12 @@ class npc_mist : public CreatureScript public: npc_mist() : CreatureScript("npc_mist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_MIST) + if (quest->GetQuestId() == QUEST_MIST) { if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) - pMistAI->StartFollow(player, FACTION_DARNASSUS, pQuest); + pMistAI->StartFollow(player, FACTION_DARNASSUS, quest); } return true; diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 41d64ea5e19..25954d2bf52 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -101,9 +101,9 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_FREE_FROM_HOLD) + if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { creature->setFaction(FACTION_ESCORTEE); creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -111,7 +111,7 @@ public: DoScriptText(SAY_GIL_START, creature, player); if (npc_giltharesAI* pEscortAI = CAST_AI(npc_gilthares::npc_giltharesAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } @@ -606,9 +606,9 @@ public: SetRun(false); break; case 17: - if (Creature* pTemp = me->SummonCreature(NPC_MERCENARY, 1128.489f, -3037.611f, 92.701f, 1.472f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000)) + if (Creature* temp = me->SummonCreature(NPC_MERCENARY, 1128.489f, -3037.611f, 92.701f, 1.472f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000)) { - DoScriptText(SAY_MERCENARY, pTemp); + DoScriptText(SAY_MERCENARY, temp); me->SummonCreature(NPC_MERCENARY, 1160.172f, -2980.168f, 97.313f, 3.690f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); } break; diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 273396dd904..041f477a0b2 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -54,12 +54,12 @@ class npc_kanati : public CreatureScript public: npc_kanati() : CreatureScript("npc_kanati") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_PROTECT_KANATI) + if (quest->GetQuestId() == QUEST_PROTECT_KANATI) { if (npc_kanatiAI* pEscortAI = CAST_AI(npc_kanati::npc_kanatiAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest, true); + pEscortAI->Start(false, false, player->GetGUID(), quest, true); } return true; } @@ -142,15 +142,15 @@ class npc_lakota_windsong : public CreatureScript public: npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_FREE_AT_LAST) + if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { DoScriptText(SAY_LAKO_START, creature, player); creature->setFaction(FACTION_ESCORTEE_LAKO); if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } @@ -227,15 +227,15 @@ class npc_paoka_swiftmountain : public CreatureScript public: npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_HOMEWARD) + if (quest->GetQuestId() == QUEST_HOMEWARD) { DoScriptText(SAY_START, creature, player); creature->setFaction(FACTION_ESCORTEE); if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } @@ -408,12 +408,12 @@ class go_panther_cage : public GameObjectScript public: go_panther_cage() : GameObjectScript("go_panther_cage") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { if (player->GetQuestStatus(5151) == QUEST_STATUS_INCOMPLETE) { - if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true)) + if (Creature* panther = go->FindNearestCreature(ENRAGED_PANTHER, 5, true)) { panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); panther->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 51f63ff5a8d..15d900ef45d 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -180,14 +180,14 @@ class npc_ringo : public CreatureScript public: npc_ringo() : CreatureScript("npc_ringo") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_A_LITTLE_HELP) + if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { if (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); - pRingoAI->StartFollow(player, FACTION_ESCORTEE, pQuest); + pRingoAI->StartFollow(player, FACTION_ESCORTEE, quest); } } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index efbc2c45e40..545dc79453d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -93,10 +93,10 @@ public: { boss_anub_arakAI(Creature* c) : ScriptedAI(c), lSummons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bChanneling; bool bGuardianSummoned; @@ -135,10 +135,10 @@ public: lSummons.DespawnAll(); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); - pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + instance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); + instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } } @@ -162,10 +162,10 @@ public: void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + instance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); + instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } } @@ -329,8 +329,8 @@ public: { DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_ANUBARAK_EVENT, DONE); + if (instance) + instance->SetData(DATA_ANUBARAK_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index afb04ace085..dea3d6eaede 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -53,12 +53,12 @@ public: { boss_hadronoxAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); fMaxDistance = 50.0f; bFirstTime = true; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiAcidTimer; uint32 uiLeechTimer; @@ -83,8 +83,8 @@ public: uiDoorsTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiCheckDistanceTimer = 2*IN_MILLISECONDS; - if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) - pInstance->SetData(DATA_HADRONOX_EVENT, FAIL); + if (instance && (instance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) + instance->SetData(DATA_HADRONOX_EVENT, FAIL); bFirstTime = false; } @@ -101,14 +101,14 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(DATA_HADRONOX_EVENT, DONE); + if (instance) + instance->SetData(DATA_HADRONOX_EVENT, DONE); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); me->SetInCombatWithZone(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 42d03f05e51..6a734035005 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -96,10 +96,10 @@ public: { boss_krik_thirAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiMindFlayTimer; uint32 uiCurseFatigueTimer; @@ -110,8 +110,8 @@ public: uiMindFlayTimer = 15*IN_MILLISECONDS; uiCurseFatigueTimer = 12*IN_MILLISECONDS; - if (pInstance) - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -120,8 +120,8 @@ public: Summon(); uiSummonTimer = 15*IN_MILLISECONDS; - if (pInstance) - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS); } void Summon() @@ -181,8 +181,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); + if (instance) + instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 4ea135a2294..6b8299e6c4b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -33,7 +33,7 @@ public: struct instance_azjol_nerub_InstanceScript : public InstanceScript { - instance_azjol_nerub_InstanceScript(Map* pMap) : InstanceScript(pMap) {} + instance_azjol_nerub_InstanceScript(Map* map) : InstanceScript(map) {} uint64 uiKrikthir; uint64 uiHadronox; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 03279579098..cde97f8d37b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -50,11 +50,11 @@ public: { boss_amanitarAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); bFirstTime = true; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiRootTimer; uint32 uiBashTimer; @@ -73,11 +73,11 @@ public: me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); - if (pInstance) + if (instance) { - pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI); + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI); if (!bFirstTime) - pInstance->SetData(DATA_AMANITAR_EVENT, FAIL); + instance->SetData(DATA_AMANITAR_EVENT, FAIL); else bFirstTime = false; } @@ -85,17 +85,17 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_AMANITAR_EVENT, DONE); - pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI); + instance->SetData(DATA_AMANITAR_EVENT, DONE); + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI); } } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); DoCast(me, SPELL_MINI, false); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index ea8771ab635..bc4d4ba5eea 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -69,10 +69,10 @@ public: { boss_volazjAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiMindFlayTimer; uint32 uiShadowBoltVolleyTimer; @@ -155,10 +155,10 @@ public: uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; uiShiverTimer = 15*IN_MILLISECONDS; - if (pInstance) + if (instance) { - pInstance->SetData(DATA_HERALD_VOLAZJ, NOT_STARTED); - pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT); + instance->SetData(DATA_HERALD_VOLAZJ, NOT_STARTED); + instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT); } // Visible for all players in insanity @@ -178,10 +178,10 @@ public: { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_HERALD_VOLAZJ, IN_PROGRESS); - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT); + instance->SetData(DATA_HERALD_VOLAZJ, IN_PROGRESS); + instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT); } } @@ -236,11 +236,11 @@ public: // Roll Insanity uint32 spell = GetSpellForPhaseMask(phase); uint32 spell2 = GetSpellForPhaseMask(nextPhase); - Map* pMap = me->GetMap(); - if (!pMap) + Map* map = me->GetMap(); + if (!map) return; - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -301,8 +301,8 @@ public: { DoScriptText(SAY_DEATH_1, me); - if (pInstance) - pInstance->SetData(DATA_HERALD_VOLAZJ, DONE); + if (instance) + instance->SetData(DATA_HERALD_VOLAZJ, DONE); Summons.DespawnAll(); ResetPlayersPhaseMask(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 05b8881a322..b2975797a02 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -75,12 +75,12 @@ public: { boss_jedoga_shadowseekerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); bFirstTime = true; bPreDone = false; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiOpFerTimer; uint32 uiCycloneTimer; @@ -109,14 +109,14 @@ public: bCanDown = false; volunteerWork = true; - if (pInstance) + if (instance) { if (!bFirstTime) - pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, FAIL); + instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, FAIL); - pInstance->SetData64(DATA_PL_JEDOGA_TARGET, 0); - pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, 0); - pInstance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0); + instance->SetData64(DATA_PL_JEDOGA_TARGET, 0); + instance->SetData64(DATA_ADD_JEDOGA_OPFER, 0); + instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0); } MoveUp(); @@ -125,12 +125,12 @@ public: void EnterCombat(Unit* who) { - if (!pInstance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) + if (!instance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; DoScriptText(TEXT_AGGRO, me); me->SetInCombatWithZone(); - pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, IN_PROGRESS); + instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, IN_PROGRESS); } void AttackStart(Unit* who) @@ -152,8 +152,8 @@ public: void JustDied(Unit* /*Killer*/) { DoScriptText(TEXT_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE); + if (instance) + instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE); } void DoAction(int32 const action) @@ -172,7 +172,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!pInstance || !who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) + if (!instance || !who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; if (!bPreDone && who->GetTypeId() == TYPEID_PLAYER && me->GetDistance(who) < 100.0f) @@ -181,7 +181,7 @@ public: bPreDone = true; } - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround) + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround) return; if (!me->getVictim() && me->canCreatureAttack(who)) @@ -205,12 +205,12 @@ public: void MoveDown() { - if (!pInstance) + if (!instance) return; bOpFerokFail = false; - pInstance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 0); + instance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 0); me->GetMotionMaster()->MovePoint(1, JedogaPosition[1]); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false); @@ -227,11 +227,11 @@ public: } else { - if (Unit* target = Unit::GetUnit(*me, pInstance->GetData64(DATA_PL_JEDOGA_TARGET))) + if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_PL_JEDOGA_TARGET))) { AttackStart(target); - pInstance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0); - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) + instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0); + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) EnterCombat(target); } else if (!me->isInCombat()) @@ -241,7 +241,7 @@ public: void MoveUp() { - if (!pInstance) + if (!instance) return; me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); @@ -253,8 +253,8 @@ public: me->LoadCreaturesAddon(); me->GetMotionMaster()->MovePoint(0, JedogaPosition[0]); - pInstance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 1); - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen(); + instance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 1); + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen(); bOnGround = false; uiOpFerTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); @@ -262,15 +262,15 @@ public: void OpferRufen() { - if (!pInstance) + if (!instance) return; - uint64 opfer = pInstance->GetData64(DATA_ADD_JEDOGA_INITIAND); + uint64 opfer = instance->GetData64(DATA_ADD_JEDOGA_INITIAND); if (opfer) { DoScriptText(RAND(TEXT_SACRIFICE_1_1, TEXT_SACRIFICE_1_2), me); - pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, opfer); + instance->SetData64(DATA_ADD_JEDOGA_OPFER, opfer); } else bCanDown = true; } @@ -288,10 +288,10 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && pInstance->GetData(DATA_ALL_INITIAND_DEAD)) + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && instance->GetData(DATA_ALL_INITIAND_DEAD)) MoveDown(); if (bOpFerok && !bOnGround && !bCanDown) Opfern(); @@ -357,10 +357,10 @@ public: { mob_jedoga_initiandAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 bCheckTimer; @@ -368,13 +368,13 @@ public: void Reset() { - if (!pInstance) + if (!instance) return; bWalking = false; bCheckTimer = 2*IN_MILLISECONDS; - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) { me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false); @@ -392,12 +392,12 @@ public: void JustDied(Unit* Killer) { - if (!Killer || !pInstance) + if (!Killer || !instance) return; if (bWalking) { - if (Creature* boss = ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_JEDOGA_SHADOWSEEKER))) + if (Creature* boss = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_JEDOGA_SHADOWSEEKER))) { if (!CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok) CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerokFail = true; @@ -405,23 +405,23 @@ public: boss->AI()->DoAction(ACTION_INITIAND_KILLED); } - pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, 0); + instance->SetData64(DATA_ADD_JEDOGA_OPFER, 0); bWalking = false; } if (Killer->GetTypeId() == TYPEID_PLAYER) - pInstance->SetData64(DATA_PL_JEDOGA_TARGET, Killer->GetGUID()); + instance->SetData64(DATA_PL_JEDOGA_TARGET, Killer->GetGUID()); } void EnterCombat(Unit* who) { - if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) + if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) return; } void AttackStart(Unit* victim) { - if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !victim) + if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !victim) return; ScriptedAI::AttackStart(victim); @@ -429,7 +429,7 @@ public: void MoveInLineOfSight(Unit* who) { - if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) + if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) return; ScriptedAI::MoveInLineOfSight(who); @@ -437,14 +437,14 @@ public: void MovementInform(uint32 uiType, uint32 uiPointId) { - if (uiType != POINT_MOTION_TYPE || !pInstance) + if (uiType != POINT_MOTION_TYPE || !instance) return; switch (uiPointId) { case 1: { - Creature* boss = me->GetMap()->GetCreature(pInstance->GetData64(DATA_JEDOGA_SHADOWSEEKER)); + Creature* boss = me->GetMap()->GetCreature(instance->GetData64(DATA_JEDOGA_SHADOWSEEKER)); if (boss) { CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok = true; @@ -458,9 +458,9 @@ public: void UpdateAI(const uint32 diff) { - if (pInstance && bCheckTimer <= diff) + if (instance && bCheckTimer <= diff) { - if (me->GetGUID() == pInstance->GetData64(DATA_ADD_JEDOGA_OPFER) && !bWalking) + if (me->GetGUID() == instance->GetData64(DATA_ADD_JEDOGA_OPFER) && !bWalking) { me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false); @@ -482,14 +482,14 @@ public: } if (!bWalking) { - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && me->HasAura(SPELL_SPHERE_VISUAL)) + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && me->HasAura(SPELL_SPHERE_VISUAL)) { me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); } - if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS && !me->HasAura(SPELL_SPHERE_VISUAL)) + if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS && !me->HasAura(SPELL_SPHERE_VISUAL)) { DoCast(me, SPELL_SPHERE_VISUAL, false); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); @@ -532,14 +532,14 @@ public: { npc_jedogas_aufseher_triggerAI(Creature* c) : Scripted_NoMovementAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); bRemoved = false; bRemoved2 = false; bCasted = false; bCasted2 = false; } - InstanceScript* pInstance; + InstanceScript* instance; bool bRemoved; bool bRemoved2; @@ -553,12 +553,12 @@ public: void UpdateAI(const uint32 /*diff*/) { - if (!pInstance) + if (!instance) return; if (!bRemoved && me->GetPositionX() > 440.0f) { - if (pInstance->GetData(DATA_PRINCE_TALDARAM_EVENT) == DONE) + if (instance->GetData(DATA_PRINCE_TALDARAM_EVENT) == DONE) { me->InterruptNonMeleeSpells(true); bRemoved = true; @@ -572,17 +572,17 @@ public: } if (!bRemoved2 && me->GetPositionX() < 440.0f) { - if (!bCasted2 && pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) + if (!bCasted2 && instance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) { DoCast(me, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_2, false); bCasted2 = true; } - if (bCasted2 && !pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) + if (bCasted2 && !instance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) { me->InterruptNonMeleeSpells(true); bCasted2 = false; } - if (!bRemoved2 && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == DONE) + if (!bRemoved2 && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == DONE) { me->InterruptNonMeleeSpells(true); bRemoved2 = true; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index c22a5489358..9a7dc2f2cc9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -81,7 +81,7 @@ public: { boss_taldaramAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } @@ -98,7 +98,7 @@ public: CombatPhase Phase; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -110,14 +110,14 @@ public: Phase = NORMAL; uiPhaseTimer = 0; uiEmbraceTarget = 0; - if (pInstance) - pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, me); } @@ -262,8 +262,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); + if (instance) + instance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); } void KilledUnit(Unit* victim) @@ -283,16 +283,16 @@ public: bool CheckSpheres() { - if (!pInstance) + if (!instance) return false; uint64 uiSphereGuids[2]; - uiSphereGuids[0] = pInstance->GetData64(DATA_SPHERE1); - uiSphereGuids[1] = pInstance->GetData64(DATA_SPHERE2); + uiSphereGuids[0] = instance->GetData64(DATA_SPHERE1); + uiSphereGuids[1] = instance->GetData64(DATA_SPHERE2); for (uint8 i=0; i < 2; ++i) { - GameObject* pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]); + GameObject* pSpheres = instance->instance->GetGameObject(uiSphereGuids[i]); if (!pSpheres) return false; if (pSpheres->GetGoState() != GO_STATE_ACTIVE) @@ -312,7 +312,7 @@ public: void RemovePrison() { - if (!pInstance) + if (!instance) return; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -320,8 +320,8 @@ public: me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation()); - uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); - pInstance->HandleGameObject(prison_GUID, true); + uint64 prison_GUID = instance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); + instance->HandleGameObject(prison_GUID, true); } }; @@ -340,11 +340,11 @@ public: { mob_taldaram_flamesphereAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiDespawnTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -388,9 +388,9 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); - Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0); + Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_PRINCE_TALDARAM) : 0); if (pPrinceTaldaram && pPrinceTaldaram->isAlive()) { // maybe these are hacks :( @@ -399,8 +399,8 @@ public: switch (pGO->GetEntry()) { - case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; - case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; + case GO_SPHERE1: instance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; + case GO_SPHERE2: instance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; } CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index e7c4b517cbf..5ba11dd5353 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -40,7 +40,7 @@ public: struct instance_ahnkahet_InstanceScript : public InstanceScript { - instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap) {} + instance_ahnkahet_InstanceScript(Map* map) : InstanceScript(map) {} uint64 Elder_Nadox; uint64 Prince_Taldaram; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 2a1c0bd6e91..187d82887e7 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -225,10 +225,10 @@ public: { boss_sartharionAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool m_bIsBerserk; bool m_bIsSoftEnraged; @@ -282,11 +282,11 @@ public: drakeCount = 0; // Drakes respawning system - if (pInstance) + if (instance) { - Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON)); - Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON)); - Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON)); + Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)); + Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)); + Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)); if (pTenebron) { pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); @@ -297,7 +297,7 @@ public: pTenebron->GetMotionMaster()->MoveTargetedHome(); }else { - if (pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) + if (instance->GetData(TYPE_TENEBRON_PREKILLED) == false) { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); @@ -315,7 +315,7 @@ public: pShadron->GetMotionMaster()->MoveTargetedHome(); }else { - if (pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) + if (instance->GetData(TYPE_SHADRON_PREKILLED) == false) { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); @@ -333,7 +333,7 @@ public: pVesperon->GetMotionMaster()->MoveTargetedHome(); }else { - if (pInstance->GetData(TYPE_VESPERON_PREKILLED) == false) + if (instance->GetData(TYPE_VESPERON_PREKILLED) == false) { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); @@ -346,8 +346,8 @@ public: void JustReachedHome() { - if (pInstance) - pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); + if (instance) + instance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -355,9 +355,9 @@ public: DoScriptText(SAY_SARTHARION_AGGRO, me); DoZoneInCombat(); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS); + instance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS); FetchDragons(); } } @@ -366,11 +366,11 @@ public: { DoScriptText(SAY_SARTHARION_DEATH, me); - if (pInstance) + if (instance) { - Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON)); - Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON)); - Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON)); + Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)); + Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)); + Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)); if (pTenebron && pTenebron->isAlive()) pTenebron->DisappearAndDie(); if (pShadron && pShadron->isAlive()) @@ -378,7 +378,7 @@ public: if (pVesperon && pVesperon->isAlive()) pVesperon->DisappearAndDie(); - pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); + instance->SetData(TYPE_SARTHARION_EVENT, DONE); } } @@ -409,15 +409,15 @@ public: void FetchDragons() { - if (!pInstance) + if (!instance) return; me->ResetLootMode(); drakeCount = 0; - Creature* pFetchTene = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON)); - Creature* pFetchShad = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON)); - Creature* pFetchVesp = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON)); + Creature* pFetchTene = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)); + Creature* pFetchShad = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)); + Creature* pFetchVesp = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)); //if at least one of the dragons are alive and are being called bool bCanUseWill = false; @@ -470,36 +470,36 @@ public: void CallDragon(uint32 uiDataId) { - if (pInstance) + if (instance) { - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(uiDataId))) { - if (pTemp->isAlive() && !pTemp->getVictim()) + if (temp->isAlive() && !temp->getVictim()) { - if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING)) - pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + if (temp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING)) + temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + if (temp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); int32 iTextId = 0; - switch (pTemp->GetEntry()) + switch (temp->GetEntry()) { case NPC_TENEBRON: iTextId = SAY_SARTHARION_CALL_TENEBRON; - pTemp->AddAura(SPELL_POWER_OF_TENEBRON, pTemp); - pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ); + temp->AddAura(SPELL_POWER_OF_TENEBRON, temp); + temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ); break; case NPC_SHADRON: iTextId = SAY_SARTHARION_CALL_SHADRON; - pTemp->AddAura(SPELL_POWER_OF_SHADRON, pTemp); - pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ); + temp->AddAura(SPELL_POWER_OF_SHADRON, temp); + temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ); break; case NPC_VESPERON: iTextId = SAY_SARTHARION_CALL_VESPERON; - pTemp->AddAura(SPELL_POWER_OF_VESPERON, pTemp); - pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ); + temp->AddAura(SPELL_POWER_OF_VESPERON, temp); + temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ); break; } @@ -511,10 +511,10 @@ public: void SendFlameTsunami() { - if (Map* pMap = me->GetMap()) - if (pMap->IsDungeon()) + if (Map* map = me->GetMap()) + if (map->IsDungeon()) { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -550,9 +550,9 @@ public: if (!UpdateVictim()) return; - Unit* pTene = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_TENEBRON) : 0); - Unit* pShad = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SHADRON) : 0); - Unit* pVesp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_VESPERON) : 0); + Unit* pTene = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_TENEBRON) : 0); + Unit* pShad = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_SHADRON) : 0); + Unit* pVesp = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_VESPERON) : 0); //spell will target dragons, if they are still alive at 35% if (!m_bIsBerserk && !HealthAbovePct(35) @@ -732,10 +732,10 @@ struct dummy_dragonAI : public ScriptedAI { dummy_dragonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 m_uiWaypointId; uint32 m_uiMoveNextTimer; @@ -763,13 +763,13 @@ struct dummy_dragonAI : public ScriptedAI void MovementInform(uint32 uiType, uint32 uiPointId) { - if (!pInstance || uiType != POINT_MOTION_TYPE) + if (!instance || uiType != POINT_MOTION_TYPE) return; // debug_log("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId); //if healers messed up the raid and we was already initialized - if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) { EnterEvadeMode(); return; @@ -812,11 +812,11 @@ struct dummy_dragonAI : public ScriptedAI //used when open portal and spawn mobs in phase void DoRaidWhisper(int32 iTextId) { - Map* pMap = me->GetMap(); + Map* map = me->GetMap(); - if (pMap && pMap->IsDungeon()) + if (map && map->IsDungeon()) { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) { @@ -842,7 +842,7 @@ struct dummy_dragonAI : public ScriptedAI case NPC_TENEBRON: { iTextId = WHISPER_HATCH_EGGS; - if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for (uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); @@ -857,7 +857,7 @@ struct dummy_dragonAI : public ScriptedAI case NPC_SHADRON: { iTextId = WHISPER_OPEN_PORTAL; - if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y, AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); else me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y, AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); @@ -867,7 +867,7 @@ struct dummy_dragonAI : public ScriptedAI case NPC_VESPERON: { iTextId = WHISPER_OPEN_PORTAL; - if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y, AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { @@ -914,14 +914,14 @@ struct dummy_dragonAI : public ScriptedAI case NPC_TENEBRON: iTextId = SAY_TENEBRON_DEATH; uiSpellId = SPELL_POWER_OF_TENEBRON; - if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) - pInstance->SetData(TYPE_TENEBRON_PREKILLED, 1); + if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + instance->SetData(TYPE_TENEBRON_PREKILLED, 1); break; case NPC_SHADRON: iTextId = SAY_SHADRON_DEATH; uiSpellId = SPELL_POWER_OF_SHADRON; - if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) - pInstance->SetData(TYPE_SHADRON_PREKILLED, 1); + if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + instance->SetData(TYPE_SHADRON_PREKILLED, 1); if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) { pAcolyte->Kill(pAcolyte); @@ -930,8 +930,8 @@ struct dummy_dragonAI : public ScriptedAI case NPC_VESPERON: iTextId = SAY_VESPERON_DEATH; uiSpellId = SPELL_POWER_OF_VESPERON; - if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) - pInstance->SetData(TYPE_VESPERON_PREKILLED, 1); + if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + instance->SetData(TYPE_VESPERON_PREKILLED, 1); if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) { pAcolyte->Kill(pAcolyte); @@ -943,16 +943,16 @@ struct dummy_dragonAI : public ScriptedAI me->RemoveAurasDueToSpell(uiSpellId); - if (pInstance) + if (instance) { - pInstance->DoRemoveAurasDueToSpellOnPlayers(uiSpellId); + instance->DoRemoveAurasDueToSpellOnPlayers(uiSpellId); // not if solo mini-boss fight - if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) return; // Twilight Revenge to main boss - if (Unit* pSartharion = Unit::GetUnit((*me), pInstance->GetData64(DATA_SARTHARION))) + if (Unit* pSartharion = Unit::GetUnit((*me), instance->GetData64(DATA_SARTHARION))) if (pSartharion->isAlive()) { pSartharion->RemoveAurasDueToSpell(uiSpellId); @@ -1289,28 +1289,28 @@ public: { mob_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiDespawnTimer; void Reset() { uiDespawnTimer = 28000; - if (pInstance) + if (instance) { Creature* target = NULL; //if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT - if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION)); + target = Unit::GetCreature((*me), instance->GetData64(DATA_SARTHARION)); if (target) target->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, target); } else { - target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON)); + target = Unit::GetCreature((*me), instance->GetData64(DATA_SHADRON)); if (target) target->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, target); } @@ -1321,9 +1321,9 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); + Creature* Shadron = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON)); if (Shadron) { (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; @@ -1351,12 +1351,12 @@ public: } //not solo fight, so main boss has deduff - pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SARTHARION)); + pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SARTHARION)); if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR); //event not in progress, then solo fight and must remove debuff mini-boss - pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); + pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON)); if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA); } @@ -1399,16 +1399,16 @@ public: { mob_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiDespawnTimer; void Reset() { uiDespawnTimer = 28000; - if (pInstance) + if (instance) { me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } @@ -1420,9 +1420,9 @@ public: me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); // remove twilight torment on Vesperon - if (pInstance) + if (instance) { - Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON)); + Creature* pVesperon = instance->instance->GetCreature(instance->GetData64(DATA_VESPERON)); if (pVesperon) (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; @@ -1451,9 +1451,9 @@ public: } } - pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TWILIGHT_TORMENT_VESP_ACO); - pInstance->DoRemoveAurasDueToSpellOnPlayers(57935); - pInstance->DoRemoveAurasDueToSpellOnPlayers(58835); // Components of spell Twilight Torment + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TWILIGHT_TORMENT_VESP_ACO); + instance->DoRemoveAurasDueToSpellOnPlayers(57935); + instance->DoRemoveAurasDueToSpellOnPlayers(58835); // Components of spell Twilight Torment } } @@ -1494,17 +1494,17 @@ public: { mob_twilight_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } uint32 m_uiFadeArmorTimer; uint32 m_uiHatchEggTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { - if (pInstance) + if (instance) { me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } @@ -1516,7 +1516,7 @@ public: { me->RemoveAllAuras(); - if (!pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (!instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) me->SummonCreature(NPC_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); else me->SummonCreature(NPC_SHARTHARION_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); @@ -1532,7 +1532,7 @@ public: { if (m_uiHatchEggTimer <= uiDiff) { - Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); + Creature* Tenebron = instance->instance->GetCreature(instance->GetData64(DATA_TENEBRON)); if (Tenebron) (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 671c6b8b6d1..fa685421141 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -29,14 +29,14 @@ class instance_obsidian_sanctum : public InstanceMapScript public: instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", 615) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_obsidian_sanctum_InstanceMapScript(pMap); + return new instance_obsidian_sanctum_InstanceMapScript(map); } struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript { - instance_obsidian_sanctum_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; uint64 m_uiSartharionGUID; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 80a94b5b4fc..e46dc3d741a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -102,12 +102,12 @@ public: { boss_eadricAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); creature->SetReactState(REACT_PASSIVE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiVenganceTimer; uint32 uiRadianceTimer; @@ -142,8 +142,8 @@ public: if (MovementType != POINT_MOTION_TYPE) return; - if (pInstance) - pInstance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE); + if (instance) + instance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE); me->DisappearAndDie(); } @@ -207,7 +207,7 @@ public: { boss_paletressAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); MemoryGUID = 0; creature->SetReactState(REACT_PASSIVE); @@ -215,7 +215,7 @@ public: creature->RestoreFaction(); } - InstanceScript* pInstance; + InstanceScript* instance; Creature* pMemory; uint64 MemoryGUID; @@ -268,8 +268,8 @@ public: if (MovementType != POINT_MOTION_TYPE || Point != 0) return; - if (pInstance) - pInstance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE); + if (instance) + instance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE); me->DisappearAndDie(); } @@ -437,13 +437,13 @@ public: { npc_argent_soldierAI(Creature* creature) : npc_escortAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); me->SetReactState(REACT_DEFENSIVE); SetDespawnAtEnd(false); uiWaypoint = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiWaypoint; @@ -532,8 +532,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); + if (instance) + instance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, instance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 55cfef0f160..fd84c1eec8a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -80,10 +80,10 @@ public: { boss_black_knightAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; std::list<uint64> SummonList; @@ -137,9 +137,9 @@ public: for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - if (pTemp) - pTemp->DisappearAndDie(); + if (Creature* temp = Unit::GetCreature(*me, *itr)) + if (temp) + temp->DisappearAndDie(); } SummonList.clear(); } @@ -288,8 +288,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); + if (instance) + instance->SetData(BOSS_BLACK_KNIGHT, DONE); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 50cd81ba1c7..2fbe381fed5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -91,9 +91,9 @@ const Point MovementPoint[] = {750.23f, 618.35f, 411.09f} }; */ -void AggroAllPlayers(Creature* pTemp) +void AggroAllPlayers(Creature* temp) { - Map::PlayerList const &PlList = pTemp->GetMap()->GetPlayers(); + Map::PlayerList const &PlList = temp->GetMap()->GetPlayers(); if (PlList.isEmpty()) return; @@ -107,11 +107,11 @@ void AggroAllPlayers(Creature* pTemp) if (player->isAlive()) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->SetInCombatWith(player); - player->SetInCombatWith(pTemp); - pTemp->AddThreat(player, 0.0f); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + temp->SetReactState(REACT_AGGRESSIVE); + temp->SetInCombatWith(player); + player->SetInCombatWith(temp); + temp->AddThreat(player, 0.0f); } } } @@ -119,14 +119,14 @@ void AggroAllPlayers(Creature* pTemp) bool GrandChampionsOutVehicle(Creature* me) { - InstanceScript* pInstance = me->GetInstanceScript(); + InstanceScript* instance = me->GetInstanceScript(); - if (!pInstance) + if (!instance) return false; - Creature* pGrandChampion1 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_1)); - Creature* pGrandChampion2 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_2)); - Creature* pGrandChampion3 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_3)); + Creature* pGrandChampion1 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_1)); + Creature* pGrandChampion2 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_2)); + Creature* pGrandChampion3 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_3)); if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3) { @@ -156,10 +156,10 @@ public: SetDespawnAtEnd(false); uiWaypointPath = 0; - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiChargeTimer; uint32 uiShieldBreakerTimer; @@ -208,12 +208,12 @@ public: switch (i) { case 2: - if ((pInstance && uiWaypointPath == 3) || uiWaypointPath == 2) - pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); + if ((instance && uiWaypointPath == 3) || uiWaypointPath == 2) + instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1); break; case 3: - if (pInstance) - pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); + if (instance) + instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1); break; } } @@ -310,7 +310,7 @@ public: { boss_warrior_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -323,7 +323,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiPhaseTimer; @@ -362,11 +362,11 @@ public: { bDone = true; - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1)) me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2)) me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3)) me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); EnterEvadeMode(); @@ -422,8 +422,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; @@ -443,7 +443,7 @@ public: { boss_mage_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -456,7 +456,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiPhaseTimer; @@ -496,15 +496,15 @@ public: { bDone = true; - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1)) me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2)) me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3)) me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); EnterEvadeMode(); bHome = true; @@ -561,8 +561,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; @@ -582,7 +582,7 @@ public: { boss_shaman_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -595,7 +595,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiPhaseTimer; @@ -641,15 +641,15 @@ public: { bDone = true; - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1)) me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2)) me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3)) me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); EnterEvadeMode(); bHome = true; @@ -708,8 +708,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; @@ -729,7 +729,7 @@ public: { boss_hunter_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -742,7 +742,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiPhaseTimer; @@ -787,15 +787,15 @@ public: { bDone = true; - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1)) me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2)) me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3)) me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); EnterEvadeMode(); bHome = true; @@ -863,8 +863,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; @@ -884,7 +884,7 @@ public: { boss_rouge_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); bDone = false; bHome = false; @@ -897,7 +897,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiPhaseTimer; @@ -934,15 +934,15 @@ public: { bDone = true; - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1)) me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2)) me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3)) me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); EnterEvadeMode(); bHome = true; @@ -984,8 +984,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + if (instance) + instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 415a82651ac..1f3db4c4976 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -31,14 +31,14 @@ class instance_trial_of_the_champion : public InstanceMapScript public: instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_trial_of_the_champion_InstanceMapScript(pMap); + return new instance_trial_of_the_champion_InstanceMapScript(map); } struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript { - instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index acbe54d0acd..2688005ee22 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -50,7 +50,7 @@ public: { npc_announcer_toc5AI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); uiSummonTimes = 0; uiPosition = 0; @@ -81,7 +81,7 @@ public: SetArgentChampion(); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiSummonTimes; uint8 uiPosition; @@ -125,8 +125,8 @@ public: break; case DATA_IN_POSITION: //movement done. me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); - if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) - pInstance->HandleGameObject(pGO->GetGUID(), false); + if (GameObject* pGO = GameObject::GetGameObject(*me, instance->GetData64(DATA_MAIN_GATE))) + instance->HandleGameObject(pGO->GetGUID(), false); NextStep(10000, false, 3); break; case DATA_LESSER_CHAMPIONS_DEFEATED: @@ -225,10 +225,10 @@ public: if (Vehicle* pVehicle = pBoss->GetVehicleKit()) if (Unit* unit = pVehicle->GetPassenger(0)) uiGrandChampionBoss1 = unit->GetGUID(); - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1); + instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); + instance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1); } pBoss->AI()->SetData(1, 0); break; @@ -241,10 +241,10 @@ public: if (Vehicle* pVehicle = pBoss->GetVehicleKit()) if (Unit* unit = pVehicle->GetPassenger(0)) uiGrandChampionBoss2 = unit->GetGUID(); - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2); + instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); + instance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2); } pBoss->AI()->SetData(2, 0); break; @@ -257,10 +257,10 @@ public: if (Vehicle* pVehicle = pBoss->GetVehicleKit()) if (Unit* unit = pVehicle->GetPassenger(0)) uiGrandChampionBoss3 = unit->GetGUID(); - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3); + instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); + instance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3); } pBoss->AI()->SetData(3, 0); break; @@ -350,30 +350,30 @@ public: void StartEncounter() { - if (!pInstance) + if (!instance) return; me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - if (pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) + if (instance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) { - if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) + if (instance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && instance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) { - if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) + if (instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) me->AI()->SetData(DATA_START, 0); - if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) + if (instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) DoStartArgentChampionEncounter(); } - if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) + if ((instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && + instance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || + instance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) me->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0); } } - void AggroAllPlayers(Creature* pTemp) + void AggroAllPlayers(Creature* temp) { Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); @@ -389,12 +389,12 @@ public: if (player->isAlive()) { - pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->SetInCombatWith(player); - player->SetInCombatWith(pTemp); - pTemp->AddThreat(player, 0.0f); + temp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + temp->SetReactState(REACT_AGGRESSIVE); + temp->SetInCombatWith(player); + player->SetInCombatWith(temp); + temp->AddThreat(player, 0.0f); } } } @@ -434,7 +434,7 @@ public: void JustSummoned(Creature* summon) { - if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) + if (instance && instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); summon->SetReactState(REACT_PASSIVE); @@ -468,22 +468,22 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); - if (pInstance && - ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && - pInstance->GetData(BOSS_BLACK_KNIGHT) == DONE && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)) + if (instance && + ((instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && + instance->GetData(BOSS_BLACK_KNIGHT) == DONE && + instance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || + instance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)) return false; - if (pInstance && - pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && - pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) + if (instance && + instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED && + instance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && + instance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && + instance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - else if (pInstance) + else if (instance) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index bc35dad822e..1ca1c69831c 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -136,10 +136,10 @@ public: { boss_anubarak_trialAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; std::list<uint64> m_vBurrowGUID; @@ -190,8 +190,8 @@ public: if (who->GetTypeId() == TYPEID_PLAYER) { DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me); - if (m_pInstance) - m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); + if (m_instance) + m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } @@ -206,20 +206,20 @@ public: void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(TYPE_ANUBARAK, FAIL); + if (m_instance) + m_instance->SetData(TYPE_ANUBARAK, FAIL); //Summon Scarab Swarms neutral at random places for (int i=0; i < 10; i++) - if (Creature* pTemp = me->SummonCreature(NPC_SCARAB, AnubarakLoc[1].GetPositionX()+urand(0, 50)-25, AnubarakLoc[1].GetPositionY()+urand(0, 50)-25, AnubarakLoc[1].GetPositionZ())) - pTemp->setFaction(31); + if (Creature* temp = me->SummonCreature(NPC_SCARAB, AnubarakLoc[1].GetPositionX()+urand(0, 50)-25, AnubarakLoc[1].GetPositionY()+urand(0, 50)-25, AnubarakLoc[1].GetPositionZ())) + temp->setFaction(31); } void JustDied(Unit* /*killer*/) { Summons.DespawnAll(); DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_ANUBARAK, DONE); + if (m_instance) + m_instance->SetData(TYPE_ANUBARAK, DONE); } void JustSummoned(Creature* summoned) @@ -255,8 +255,8 @@ public: DoScriptText(SAY_AGGRO, me); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetInCombatWithZone(); - if (m_pInstance) - m_pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS); + if (m_instance) + m_instance->SetData(TYPE_ANUBARAK, IN_PROGRESS); //Despawn Scarab Swarms neutral Summons.DoAction(NPC_SCARAB, ACTION_SCARAB_SUBMERGE); //Spawn Burrow @@ -421,10 +421,10 @@ public: { mob_swarm_scarabAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiDeterminationTimer; @@ -488,10 +488,10 @@ public: { mob_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiSpiderFrenzyTimer; uint32 m_uiSubmergeTimer; @@ -645,10 +645,10 @@ public: { mob_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiIncreaseSpeedTimer; uint8 m_uiSpeed; uint64 m_uiTargetGUID; @@ -680,7 +680,7 @@ public: Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID); if (!target || !target->isAlive() || !target->HasAura(SPELL_MARK)) { - if (Creature* pAnubarak = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_ANUBARAK))) + if (Creature* pAnubarak = Unit::GetCreature((*me), m_instance->GetData64(NPC_ANUBARAK))) pAnubarak->CastSpell(pAnubarak, SPELL_SPIKE_TELE, false); me->DisappearAndDie(); return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index ff342db5503..7be6775f705 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -64,10 +64,10 @@ public: { boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*) creature->GetInstanceScript(); + m_instance = (InstanceScript*) creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; uint32 m_uiChampionsNotStarted; uint32 m_uiChampionsFailed; @@ -101,7 +101,7 @@ public: vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARRIOR : NPC_ALLIANCE_WARRIOR); uint8 healersSubtracted = 2; - if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC) + if (m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC) healersSubtracted = 1; for (uint8 i = 0; i < healersSubtracted; ++i) { @@ -136,7 +136,7 @@ public: vHealersEntries.erase(vHealersEntries.begin()+pos); } - if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC) + if (m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC) for (uint8 i = 0; i < 4; ++i) vOtherEntries.erase(vOtherEntries.begin()+urand(0, vOtherEntries.size()-1)); @@ -168,22 +168,22 @@ public: for (uint8 i = 0; i < vChampionEntries.size(); ++i) { uint8 pos = urand(0, vChampionJumpTarget.size()-1); - if (Creature* pTemp = me->SummonCreature(vChampionEntries[i], vChampionJumpOrigin[urand(0, vChampionJumpOrigin.size()-1)], TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* temp = me->SummonCreature(vChampionEntries[i], vChampionJumpOrigin[urand(0, vChampionJumpOrigin.size()-1)], TEMPSUMMON_MANUAL_DESPAWN)) { - Summons.Summon(pTemp); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + Summons.Summon(temp); + temp->SetReactState(REACT_PASSIVE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); if (playerTeam == ALLIANCE) { - pTemp->SetHomePosition(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 0); - pTemp->GetMotionMaster()->MoveJump(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f); - pTemp->SetOrientation(0); + temp->SetHomePosition(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 0); + temp->GetMotionMaster()->MoveJump(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f); + temp->SetOrientation(0); } else { - pTemp->SetHomePosition((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 3); - pTemp->GetMotionMaster()->MoveJump((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f); - pTemp->SetOrientation(3); + temp->SetHomePosition((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 3); + temp->GetMotionMaster()->MoveJump((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f); + temp->SetOrientation(3); } } vChampionJumpTarget.erase(vChampionJumpTarget.begin()+pos); @@ -200,10 +200,10 @@ public: case 1: for (std::list<uint64>::iterator i = Summons.begin(); i != Summons.end(); ++i) { - if (Creature* pTemp = Unit::GetCreature(*me, *i)) + if (Creature* temp = Unit::GetCreature(*me, *i)) { - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + temp->SetReactState(REACT_AGGRESSIVE); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } } break; @@ -214,7 +214,7 @@ public: m_uiChampionsFailed++; if (m_uiChampionsFailed + m_uiChampionsKilled >= Summons.size()) { - m_pInstance->SetData(TYPE_CRUSADERS, FAIL); + m_instance->SetData(TYPE_CRUSADERS, FAIL); Summons.DespawnAll(); me->DespawnOrUnsummon(); } @@ -227,16 +227,16 @@ public: m_uiChampionsKilled = 0; m_bInProgress = true; Summons.DoZoneInCombat(); - m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS); + m_instance->SetData(TYPE_CRUSADERS, IN_PROGRESS); } break; case DONE: m_uiChampionsKilled++; if (m_uiChampionsKilled == 1) - m_pInstance->SetData(TYPE_CRUSADERS, SPECIAL); + m_instance->SetData(TYPE_CRUSADERS, SPECIAL); else if (m_uiChampionsKilled >= Summons.size()) { - m_pInstance->SetData(TYPE_CRUSADERS, DONE); + m_instance->SetData(TYPE_CRUSADERS, DONE); Summons.DespawnAll(); me->DespawnOrUnsummon(); } @@ -253,11 +253,11 @@ struct boss_faction_championsAI : public ScriptedAI { boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*) creature->GetInstanceScript(); + m_instance = (InstanceScript*) creature->GetInstanceScript(); mAIType = aitype; } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint64 championControllerGUID; uint32 mAIType; @@ -273,8 +273,8 @@ struct boss_faction_championsAI : public ScriptedAI void JustReachedHome() { - if (m_pInstance) - if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) + if (m_instance) + if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, FAIL); me->DespawnOrUnsummon(); } @@ -326,8 +326,8 @@ struct boss_faction_championsAI : public ScriptedAI void JustDied(Unit* /*killer*/) { if (mAIType != AI_PET) - if (m_pInstance) - if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) + if (m_instance) + if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, DONE); } @@ -335,8 +335,8 @@ struct boss_faction_championsAI : public ScriptedAI { DoCast(me, SPELL_ANTI_AOE, true); me->SetInCombatWithZone(); - if (m_pInstance) - if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) + if (m_instance) + if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, IN_PROGRESS); } @@ -351,18 +351,18 @@ struct boss_faction_championsAI : public ScriptedAI if (Player* player = players.begin()->getSource()) TeamInInstance = player->GetTeam(); - if (m_pInstance) + if (m_instance) { if (TeamInInstance == ALLIANCE) { - if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_VARIAN))) - DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0, 3), pTemp); // + cause we are on negative + if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_VARIAN))) + DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0, 3), temp); // + cause we are on negative } else - if (Creature* pTemp = me->FindNearestCreature(NPC_GARROSH, 300.f)) - DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0, 3), pTemp); // + cause we are on negative + if (Creature* temp = me->FindNearestCreature(NPC_GARROSH, 300.f)) + DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0, 3), temp); // + cause we are on negative - m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); + m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 962ecdff83f..ec573f75bc6 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -107,11 +107,11 @@ public: { boss_jaraxxusAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; @@ -126,8 +126,8 @@ public: void Reset() { - if (m_pInstance) - m_pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED); + if (m_instance) + m_instance->SetData(TYPE_JARAXXUS, NOT_STARTED); SetEquipmentSlots(false, EQUIP_MAIN, EQUIP_OFFHAND, EQUIP_RANGED); m_uiFelFireballTimer = 5*IN_MILLISECONDS; m_uiFelLightningTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); @@ -142,8 +142,8 @@ public: void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(TYPE_JARAXXUS, FAIL); + if (m_instance) + m_instance->SetData(TYPE_JARAXXUS, FAIL); DoCast(me, SPELL_JARAXXUS_CHAINS); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_PASSIVE); @@ -153,8 +153,8 @@ public: { if (who->GetTypeId() == TYPEID_PLAYER) { - if (m_pInstance) - m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); + if (m_instance) + m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } @@ -162,8 +162,8 @@ public: { Summons.DespawnAll(); DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_JARAXXUS, DONE); + if (m_instance) + m_instance->SetData(TYPE_JARAXXUS, DONE); } void JustSummoned(Creature* summoned) @@ -174,8 +174,8 @@ public: void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); - if (m_pInstance) - m_pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS); + if (m_instance) + m_instance->SetData(TYPE_JARAXXUS, IN_PROGRESS); DoScriptText(SAY_AGGRO, me); } @@ -299,11 +299,11 @@ public: { mob_infernal_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; @@ -354,11 +354,11 @@ public: { mob_fel_infernalAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiFelStreakTimer; void Reset() @@ -378,7 +378,7 @@ public: if (!UpdateVictim()) return; - if (m_pInstance && m_pInstance->GetData(TYPE_JARAXXUS) != IN_PROGRESS) + if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS) me->DespawnOrUnsummon(); if (m_uiFelStreakTimer <= uiDiff) @@ -408,11 +408,11 @@ public: { mob_nether_portalAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; @@ -463,13 +463,13 @@ public: { mob_mistress_of_painAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); - if (m_pInstance) - m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE); + m_instance = (InstanceScript*)creature->GetInstanceScript(); + if (m_instance) + m_instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE); Reset(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiShivanSlashTimer; uint32 m_uiSpinningStrikeTimer; uint32 m_uiMistressKissTimer; @@ -484,8 +484,8 @@ public: void JustDied(Unit* /*killer*/) { - if (m_pInstance) - m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); + if (m_instance) + m_instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); } void UpdateAI(const uint32 uiDiff) @@ -493,7 +493,7 @@ public: if (!UpdateVictim()) return; - if (m_pInstance && m_pInstance->GetData(TYPE_JARAXXUS) != IN_PROGRESS) + if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS) me->DespawnOrUnsummon(); if (m_uiShivanSlashTimer <= uiDiff) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 4824c46deb7..d4514dd547e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -123,10 +123,10 @@ public: { boss_gormokAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiImpaleTimer; uint32 m_uiStaggeringStompTimer; @@ -151,7 +151,7 @@ public: void EnterEvadeMode() { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } @@ -162,7 +162,7 @@ public: switch (uiId) { case 0: - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); me->SetInCombatWithZone(); @@ -172,16 +172,16 @@ public: void JustDied(Unit* /*killer*/) { - if (m_pInstance) - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE); + if (m_instance) + m_instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE); } void JustReachedHome() { - if (m_pInstance) + if (m_instance) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, FAIL); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->SetData(TYPE_NORTHREND_BEASTS, FAIL); } me->DespawnOrUnsummon(); } @@ -189,7 +189,7 @@ public: void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS); + m_instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS); } void JustSummoned(Creature* summon) @@ -262,12 +262,12 @@ public: { mob_snobold_vassalAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); - if (m_pInstance) - m_pInstance->SetData(DATA_SNOBOLD_COUNT, INCREASE); + m_instance = (InstanceScript*)creature->GetInstanceScript(); + if (m_instance) + m_instance->SetData(DATA_SNOBOLD_COUNT, INCREASE); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiFireBombTimer; uint32 m_uiBatterTimer; uint32 m_uiHeadCrackTimer; @@ -283,15 +283,15 @@ public: m_uiTargetGUID = 0; m_bTargetDied = false; - if (m_pInstance) - m_uiBossGUID = m_pInstance->GetData64(NPC_GORMOK); + if (m_instance) + m_uiBossGUID = m_instance->GetData64(NPC_GORMOK); //Workaround for Snobold me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } void EnterEvadeMode() { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } @@ -326,8 +326,8 @@ public: if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID)) if (target->isAlive()) target->RemoveAurasDueToSpell(SPELL_SNOBOLLED); - if (m_pInstance) - m_pInstance->SetData(DATA_SNOBOLD_COUNT, DECREASE); + if (m_instance) + m_instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); } void UpdateAI(const uint32 uiDiff) @@ -339,9 +339,9 @@ public: { if (!target->isAlive()) { - if (m_pInstance) + if (m_instance) { - Unit* gormok = ObjectAccessor::GetCreature(*me, m_pInstance->GetData64(NPC_GORMOK)); + Unit* gormok = ObjectAccessor::GetCreature(*me, m_instance->GetData64(NPC_GORMOK)); if (gormok && gormok->isAlive()) { SetCombatMovement(false); @@ -754,10 +754,10 @@ public: { boss_icehowlAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiFerociousButtTimer; uint32 m_uiArticBreathTimer; @@ -791,8 +791,8 @@ public: void JustDied(Unit* /*killer*/) { - if (m_pInstance) - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE); + if (m_instance) + m_instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE); } void MovementInform(uint32 uiType, uint32 uiId) @@ -820,7 +820,7 @@ public: m_bMovementFinish = true; break; case 2: - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); me->SetInCombatWithZone(); @@ -830,16 +830,16 @@ public: void EnterEvadeMode() { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } void JustReachedHome() { - if (m_pInstance) + if (m_instance) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, FAIL); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->SetData(TYPE_NORTHREND_BEASTS, FAIL); } me->DespawnOrUnsummon(); } @@ -848,15 +848,15 @@ public: { if (who->GetTypeId() == TYPEID_PLAYER) { - if (m_pInstance) - m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); + if (m_instance) + m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } void EnterCombat(Unit* /*who*/) { - if (m_pInstance) - m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); + if (m_instance) + m_instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); me->SetInCombatWithZone(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index dff484a4933..495faf6f855 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -143,10 +143,10 @@ struct boss_twin_baseAI : public ScriptedAI { boss_twin_baseAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; AuraStateType m_uiAuraState; @@ -190,8 +190,8 @@ struct boss_twin_baseAI : public ScriptedAI void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(TYPE_VALKIRIES, FAIL); + if (m_instance) + m_instance->SetData(TYPE_VALKIRIES, FAIL); Summons.DespawnAll(); me->DespawnOrUnsummon(); @@ -204,7 +204,7 @@ struct boss_twin_baseAI : public ScriptedAI switch (uiId) { case 1: - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); break; @@ -216,8 +216,8 @@ struct boss_twin_baseAI : public ScriptedAI if (who->GetTypeId() == TYPEID_PLAYER) { DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me); - if (m_pInstance) - m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); + if (m_instance) + m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0); } } @@ -231,12 +231,12 @@ struct boss_twin_baseAI : public ScriptedAI switch (summoned->GetEntry()) { case NPC_LIGHT_ESSENCE: - m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER); - m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER); + m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER); + m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER); break; case NPC_DARK_ESSENCE: - m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER); - m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER); + m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER); + m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER); break; case NPC_BULLET_CONTROLLER: me->m_Events.AddEvent(new OrbsDespawner(me), me->m_Events.CalculateTime(100)); @@ -248,7 +248,7 @@ struct boss_twin_baseAI : public ScriptedAI void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (m_pInstance) + if (m_instance) { if (Creature* pSister = GetSister()) { @@ -257,13 +257,13 @@ struct boss_twin_baseAI : public ScriptedAI me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); pSister->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - m_pInstance->SetData(TYPE_VALKIRIES, DONE); + m_instance->SetData(TYPE_VALKIRIES, DONE); Summons.DespawnAll(); } else { me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - m_pInstance->SetData(TYPE_VALKIRIES, SPECIAL); + m_instance->SetData(TYPE_VALKIRIES, SPECIAL); } } } @@ -273,20 +273,20 @@ struct boss_twin_baseAI : public ScriptedAI // Called when sister pointer needed Creature* GetSister() { - return Unit::GetCreature((*me), m_pInstance->GetData64(m_uiSisterNpcId)); + return Unit::GetCreature((*me), m_instance->GetData64(m_uiSisterNpcId)); } void EnterCombat(Unit* /*who*/) { me->SetInCombatWithZone(); - if (m_pInstance) + if (m_instance) { if (Creature* pSister = GetSister()) { me->AddAura(m_uiMyEmphatySpellId, pSister); pSister->SetInCombatWithZone(); } - m_pInstance->SetData(TYPE_VALKIRIES, IN_PROGRESS); + m_instance->SetData(TYPE_VALKIRIES, IN_PROGRESS); } DoScriptText(SAY_AGGRO, me); @@ -315,7 +315,7 @@ struct boss_twin_baseAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance || !UpdateVictim()) + if (!m_instance || !UpdateVictim()) return; switch (m_uiStage) @@ -406,10 +406,10 @@ public: { boss_fjolaAI(Creature* creature) : boss_twin_baseAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; void Reset() { boss_twin_baseAI::Reset(); @@ -429,17 +429,17 @@ public: m_uiTouchSpellId = SPELL_LIGHT_TOUCH; m_uiSpikeSpellId = SPELL_LIGHT_TWIN_SPIKE; - if (m_pInstance) + if (m_instance) { - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); + m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); } } void EnterCombat(Unit* who) { - if (m_pInstance) + if (m_instance) { - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); + m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); } me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); @@ -448,14 +448,14 @@ public: void EnterEvadeMode() { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); boss_twin_baseAI::EnterEvadeMode(); } void JustReachedHome() { - if (m_pInstance) - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + if (m_instance) + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); boss_twin_baseAI::JustReachedHome(); } @@ -552,10 +552,10 @@ struct mob_unleashed_ballAI : public ScriptedAI { mob_unleashed_ballAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiRangeCheckTimer; void MoveToNextPoint() diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 7566d9bc410..99a6abb91a9 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -33,7 +33,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript { - instance_trial_of_the_crusader_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 EncounterStatus[MAX_ENCOUNTERS]; uint32 TrialCounter; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 913484cbf77..76295f403fa 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -106,10 +106,10 @@ class npc_announcer_toc10 : public CreatureScript { npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; void Reset() { @@ -239,10 +239,10 @@ class boss_lich_king_toc : public CreatureScript { boss_lich_king_tocAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)creature->GetInstanceScript(); + m_instance = (InstanceScript*)creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiUpdateTimer; void Reset() @@ -254,7 +254,7 @@ class boss_lich_king_toc : public CreatureScript summoned->CastSpell(summoned, 51807, false); summoned->SetDisplayId(11686); } - if (m_pInstance) m_pInstance->SetData(TYPE_LICH_KING, IN_PROGRESS); + if (m_instance) m_instance->SetData(TYPE_LICH_KING, IN_PROGRESS); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); } @@ -265,77 +265,77 @@ class boss_lich_king_toc : public CreatureScript switch (uiId) { case 0: - m_pInstance->SetData(TYPE_EVENT, 5030); + m_instance->SetData(TYPE_EVENT, 5030); break; case 1: - m_pInstance->SetData(TYPE_EVENT, 5050); + m_instance->SetData(TYPE_EVENT, 5050); break; } } void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance) return; - if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_LICH_KING_1) return; + if (!m_instance) return; + if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_LICH_KING_1) return; - m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER); + m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER); if (m_uiUpdateTimer <= uiDiff) { - switch (m_pInstance->GetData(TYPE_EVENT)) + switch (m_instance->GetData(TYPE_EVENT)) { case 5010: DoScriptText(SAY_STAGE_4_02, me); m_uiUpdateTimer = 3000; me->GetMotionMaster()->MovePoint(0, LichKingLoc[0]); - m_pInstance->SetData(TYPE_EVENT, 5020); + m_instance->SetData(TYPE_EVENT, 5020); break; case 5030: DoScriptText(SAY_STAGE_4_04, me); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK); m_uiUpdateTimer = 10000; - m_pInstance->SetData(TYPE_EVENT, 5040); + m_instance->SetData(TYPE_EVENT, 5040); break; case 5040: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->GetMotionMaster()->MovePoint(1, LichKingLoc[1]); m_uiUpdateTimer = 1000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 5050: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 5060); + m_instance->SetData(TYPE_EVENT, 5060); break; case 5060: DoScriptText(SAY_STAGE_4_05, me); me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); m_uiUpdateTimer = 2500; - m_pInstance->SetData(TYPE_EVENT, 5070); + m_instance->SetData(TYPE_EVENT, 5070); break; case 5070: me->CastSpell(me, 68198, false); m_uiUpdateTimer = 1500; - m_pInstance->SetData(TYPE_EVENT, 5080); + m_instance->SetData(TYPE_EVENT, 5080); break; case 5080: - if (GameObject* pGoFloor = m_pInstance->instance->GetGameObject(m_pInstance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) + if (GameObject* pGoFloor = m_instance->instance->GetGameObject(m_instance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) pGoFloor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); me->CastSpell(me, 69016, false); - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(TYPE_LICH_KING, DONE); - Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_ANUBARAK)); - if (!pTemp || !pTemp->isAlive()) - pTemp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); + m_instance->SetData(TYPE_LICH_KING, DONE); + Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_ANUBARAK)); + if (!temp || !temp->isAlive()) + temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); } me->DespawnOrUnsummon(); m_uiUpdateTimer = 20000; break; } } else m_uiUpdateTimer -= uiDiff; - m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); + m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); } }; @@ -355,10 +355,10 @@ class npc_fizzlebang_toc : public CreatureScript { npc_fizzlebang_tocAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript*)me->GetInstanceScript(); + m_instance = (InstanceScript*)me->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; uint32 m_uiUpdateTimer; uint64 m_uiPortalGUID; @@ -367,12 +367,12 @@ class npc_fizzlebang_toc : public CreatureScript void JustDied(Unit* killer) { DoScriptText(SAY_STAGE_1_06, me, killer); - m_pInstance->SetData(TYPE_EVENT, 1180); - if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS))) + m_instance->SetData(TYPE_EVENT, 1180); + if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS))) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->SetInCombatWithZone(); + temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + temp->SetReactState(REACT_AGGRESSIVE); + temp->SetInCombatWithZone(); } } @@ -391,11 +391,11 @@ class npc_fizzlebang_toc : public CreatureScript { case 1: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (m_pInstance) + if (m_instance) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - m_pInstance->SetData(TYPE_EVENT, 1120); - m_pInstance->SetData(TYPE_EVENT_TIMER, 1000); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->SetData(TYPE_EVENT, 1120); + m_instance->SetData(TYPE_EVENT_TIMER, 1000); } break; } @@ -408,22 +408,22 @@ class npc_fizzlebang_toc : public CreatureScript void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance) return; + if (!m_instance) return; - if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG) return; + if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG) return; - m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER); + m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER); if (m_uiUpdateTimer <= uiDiff) { - switch (m_pInstance->GetData(TYPE_EVENT)) + switch (m_instance->GetData(TYPE_EVENT)) { case 1110: - m_pInstance->SetData(TYPE_EVENT, 1120); + m_instance->SetData(TYPE_EVENT, 1120); m_uiUpdateTimer = 4000; break; case 1120: DoScriptText(SAY_STAGE_1_02, me); - m_pInstance->SetData(TYPE_EVENT, 1130); + m_instance->SetData(TYPE_EVENT, 1130); m_uiUpdateTimer = 12000; break; case 1130: @@ -437,12 +437,12 @@ class npc_fizzlebang_toc : public CreatureScript pTrigger->SetDisplayId(22862); pTrigger->CastSpell(pTrigger, SPELL_WILFRED_PORTAL, false); } - m_pInstance->SetData(TYPE_EVENT, 1132); + m_instance->SetData(TYPE_EVENT, 1132); m_uiUpdateTimer = 4000; break; case 1132: me->GetMotionMaster()->MovementExpired(); - m_pInstance->SetData(TYPE_EVENT, 1134); + m_instance->SetData(TYPE_EVENT, 1134); m_uiUpdateTimer = 4000; break; case 1134: @@ -455,54 +455,54 @@ class npc_fizzlebang_toc : public CreatureScript m_uiPortalGUID = pPortal->GetGUID(); } m_uiUpdateTimer = 4000; - m_pInstance->SetData(TYPE_EVENT, 1135); + m_instance->SetData(TYPE_EVENT, 1135); break; case 1135: - m_pInstance->SetData(TYPE_EVENT, 1140); + m_instance->SetData(TYPE_EVENT, 1140); m_uiUpdateTimer = 3000; break; case 1140: DoScriptText(SAY_STAGE_1_04, me); - if (Creature* pTemp = me->SummonCreature(NPC_JARAXXUS, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 5.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* temp = me->SummonCreature(NPC_JARAXXUS, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 5.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY()-10, ToCCommonLoc[1].GetPositionZ()); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + temp->SetReactState(REACT_PASSIVE); + temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY()-10, ToCCommonLoc[1].GetPositionZ()); } - m_pInstance->SetData(TYPE_EVENT, 1142); + m_instance->SetData(TYPE_EVENT, 1142); m_uiUpdateTimer = 5000; break; case 1142: - if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS))) - pTemp->SetTarget(me->GetGUID()); + if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS))) + temp->SetTarget(me->GetGUID()); if (Creature* pTrigger = Unit::GetCreature(*me, m_uiTriggerGUID)) pTrigger->DespawnOrUnsummon(); if (Creature* pPortal = Unit::GetCreature(*me, m_uiPortalGUID)) pPortal->DespawnOrUnsummon(); - m_pInstance->SetData(TYPE_EVENT, 1144); + m_instance->SetData(TYPE_EVENT, 1144); m_uiUpdateTimer = 10000; break; case 1144: - if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS))) - DoScriptText(SAY_STAGE_1_05, pTemp); - m_pInstance->SetData(TYPE_EVENT, 1150); + if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS))) + DoScriptText(SAY_STAGE_1_05, temp); + m_instance->SetData(TYPE_EVENT, 1150); m_uiUpdateTimer = 5000; break; case 1150: - if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS))) + if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS))) { //1-shot Fizzlebang - pTemp->CastSpell(me, 67888, false); - me->SetInCombatWith(pTemp); - pTemp->AddThreat(me, 1000.0f); - pTemp->AI()->AttackStart(me); + temp->CastSpell(me, 67888, false); + me->SetInCombatWith(temp); + temp->AddThreat(me, 1000.0f); + temp->AI()->AttackStart(me); } - m_pInstance->SetData(TYPE_EVENT, 1160); + m_instance->SetData(TYPE_EVENT, 1160); m_uiUpdateTimer = 3000; break; } } else m_uiUpdateTimer -= uiDiff; - m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); + m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); } }; @@ -522,10 +522,10 @@ class npc_tirion_toc : public CreatureScript { npc_tirion_tocAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)me->GetInstanceScript(); + m_instance = (InstanceScript*)me->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiUpdateTimer; void Reset() {} @@ -534,271 +534,271 @@ class npc_tirion_toc : public CreatureScript void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance) return; - if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_TIRION) return; + if (!m_instance) return; + if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_TIRION) return; - m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER); + m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER); if (m_uiUpdateTimer <= uiDiff) { - switch (m_pInstance->GetData(TYPE_EVENT)) + switch (m_instance->GetData(TYPE_EVENT)) { case 110: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK); DoScriptText(SAY_STAGE_0_01, me); m_uiUpdateTimer = 22000; - m_pInstance->SetData(TYPE_EVENT, 120); + m_instance->SetData(TYPE_EVENT, 120); break; case 140: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK); DoScriptText(SAY_STAGE_0_02, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 150); + m_instance->SetData(TYPE_EVENT, 150); break; case 150: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); - if (m_pInstance->GetData(TYPE_BEASTS) != DONE) + if (m_instance->GetData(TYPE_BEASTS) != DONE) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); - if (Creature* pTemp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS)) + if (Creature* temp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS)) { - pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - pTemp->SetReactState(REACT_PASSIVE); + temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + temp->SetReactState(REACT_PASSIVE); } } m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 155); + m_instance->SetData(TYPE_EVENT, 155); break; case 155: - m_pInstance->SetData(TYPE_BEASTS, IN_PROGRESS); + m_instance->SetData(TYPE_BEASTS, IN_PROGRESS); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 160); + m_instance->SetData(TYPE_EVENT, 160); break; case 200: DoScriptText(SAY_STAGE_0_04, me); m_uiUpdateTimer = 8000; - m_pInstance->SetData(TYPE_EVENT, 205); + m_instance->SetData(TYPE_EVENT, 205); break; case 205: m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 210); + m_instance->SetData(TYPE_EVENT, 210); break; case 210: - if (m_pInstance->GetData(TYPE_BEASTS) != DONE) + if (m_instance->GetData(TYPE_BEASTS) != DONE) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - if (Creature* pTemp = me->SummonCreature(NPC_DREADSCALE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN)) + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + if (Creature* temp = me->SummonCreature(NPC_DREADSCALE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN)) { - pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ()); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - pTemp->SetReactState(REACT_PASSIVE); + temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ()); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + temp->SetReactState(REACT_PASSIVE); } - if (Creature* pTemp = me->SummonCreature(NPC_ACIDMAW, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* temp = me->SummonCreature(NPC_ACIDMAW, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN)) { - pTemp->SetVisible(true); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - pTemp->SetReactState(REACT_PASSIVE); + temp->SetVisible(true); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + temp->SetReactState(REACT_PASSIVE); } } m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 220); + m_instance->SetData(TYPE_EVENT, 220); break; case 220: - m_pInstance->SetData(TYPE_EVENT, 230); + m_instance->SetData(TYPE_EVENT, 230); break; case 300: DoScriptText(SAY_STAGE_0_05, me); m_uiUpdateTimer = 8000; - m_pInstance->SetData(TYPE_EVENT, 305); + m_instance->SetData(TYPE_EVENT, 305); break; case 305: m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 310); + m_instance->SetData(TYPE_EVENT, 310); break; case 310: - if (m_pInstance->GetData(TYPE_BEASTS) != DONE) + if (m_instance->GetData(TYPE_BEASTS) != DONE) { - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - if (Creature* pTemp = me->SummonCreature(NPC_ICEHOWL, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_DEAD_DESPAWN)) + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + if (Creature* temp = me->SummonCreature(NPC_ICEHOWL, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_DEAD_DESPAWN)) { - pTemp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); + temp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); } } m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 315); + m_instance->SetData(TYPE_EVENT, 315); break; case 315: - m_pInstance->SetData(TYPE_EVENT, 320); + m_instance->SetData(TYPE_EVENT, 320); break; case 400: DoScriptText(SAY_STAGE_0_06, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 666: DoScriptText(SAY_STAGE_0_WIPE, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 1010: DoScriptText(SAY_STAGE_1_01, me); m_uiUpdateTimer = 7000; - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); me->SummonCreature(NPC_FIZZLEBANG, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 1180: DoScriptText(SAY_STAGE_1_07, me); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 2000: DoScriptText(SAY_STAGE_1_08, me); m_uiUpdateTimer = 18000; - m_pInstance->SetData(TYPE_EVENT, 2010); + m_instance->SetData(TYPE_EVENT, 2010); break; case 2030: DoScriptText(SAY_STAGE_1_11, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 3000: DoScriptText(SAY_STAGE_2_01, me); m_uiUpdateTimer = 12000; - m_pInstance->SetData(TYPE_EVENT, 3050); + m_instance->SetData(TYPE_EVENT, 3050); break; case 3001: DoScriptText(SAY_STAGE_2_01, me); m_uiUpdateTimer = 12000; - m_pInstance->SetData(TYPE_EVENT, 3051); + m_instance->SetData(TYPE_EVENT, 3051); break; case 3060: DoScriptText(SAY_STAGE_2_03, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 3070); + m_instance->SetData(TYPE_EVENT, 3070); break; case 3061: DoScriptText(SAY_STAGE_2_03, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 3071); + m_instance->SetData(TYPE_EVENT, 3071); break; //Summoning crusaders case 3091: if (Creature* pChampionController = me->SummonCreature(NPC_CHAMPIONS_CONTROLLER, ToCCommonLoc[1])) pChampionController->AI()->SetData(0, HORDE); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 3092); + m_instance->SetData(TYPE_EVENT, 3092); break; //Summoning crusaders case 3090: if (Creature* pChampionController = me->SummonCreature(NPC_CHAMPIONS_CONTROLLER, ToCCommonLoc[1])) pChampionController->AI()->SetData(0, ALLIANCE); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 3092); + m_instance->SetData(TYPE_EVENT, 3092); break; case 3092: - if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) + if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(1, NOT_STARTED); - m_pInstance->SetData(TYPE_EVENT, 3095); + m_instance->SetData(TYPE_EVENT, 3095); break; //Crusaders battle end case 3100: DoScriptText(SAY_STAGE_2_06, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 4000: DoScriptText(SAY_STAGE_3_01, me); m_uiUpdateTimer = 13000; - m_pInstance->SetData(TYPE_EVENT, 4010); + m_instance->SetData(TYPE_EVENT, 4010); break; case 4010: DoScriptText(SAY_STAGE_3_02, me); - if (Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* temp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { - pTemp->SetVisible(false); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ()); - pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ()); + temp->SetVisible(false); + temp->SetReactState(REACT_PASSIVE); + temp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ()); + temp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ()); } - if (Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* temp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { - pTemp->SetVisible(false); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[2].GetPositionX(), TwinValkyrsLoc[2].GetPositionY(), TwinValkyrsLoc[2].GetPositionZ()); - pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[3].GetPositionX(), TwinValkyrsLoc[3].GetPositionY(), TwinValkyrsLoc[3].GetPositionZ()); + temp->SetVisible(false); + temp->SetReactState(REACT_PASSIVE); + temp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[2].GetPositionX(), TwinValkyrsLoc[2].GetPositionY(), TwinValkyrsLoc[2].GetPositionZ()); + temp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[3].GetPositionX(), TwinValkyrsLoc[3].GetPositionY(), TwinValkyrsLoc[3].GetPositionZ()); } m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 4015); + m_instance->SetData(TYPE_EVENT, 4015); break; case 4015: - m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_LIGHTBANE))) + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + if (Creature* temp = Unit::GetCreature((*me), m_instance->GetData64(NPC_LIGHTBANE))) { - pTemp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ()); - pTemp->SetVisible(true); + temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ()); + temp->SetVisible(true); } - if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_DARKBANE))) + if (Creature* temp = Unit::GetCreature((*me), m_instance->GetData64(NPC_DARKBANE))) { - pTemp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ()); - pTemp->SetVisible(true); + temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ()); + temp->SetVisible(true); } m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 4016); + m_instance->SetData(TYPE_EVENT, 4016); break; case 4016: - m_pInstance->SetData(TYPE_EVENT, 4017); + m_instance->SetData(TYPE_EVENT, 4017); break; case 4040: m_uiUpdateTimer = 60000; - m_pInstance->SetData(TYPE_EVENT, 5000); + m_instance->SetData(TYPE_EVENT, 5000); break; case 5000: DoScriptText(SAY_STAGE_4_01, me); m_uiUpdateTimer = 10000; - m_pInstance->SetData(TYPE_EVENT, 5005); + m_instance->SetData(TYPE_EVENT, 5005); break; case 5005: m_uiUpdateTimer = 8000; - m_pInstance->SetData(TYPE_EVENT, 5010); + m_instance->SetData(TYPE_EVENT, 5010); me->SummonCreature(NPC_LICH_KING_1, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5); break; case 5020: DoScriptText(SAY_STAGE_4_03, me); m_uiUpdateTimer = 1000; - m_pInstance->SetData(TYPE_EVENT, 0); + m_instance->SetData(TYPE_EVENT, 0); break; case 6000: me->NearTeleportTo(AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 4.0f); m_uiUpdateTimer = 20000; - m_pInstance->SetData(TYPE_EVENT, 6005); + m_instance->SetData(TYPE_EVENT, 6005); break; case 6005: DoScriptText(SAY_STAGE_4_06, me); m_uiUpdateTimer = 20000; - m_pInstance->SetData(TYPE_EVENT, 6010); + m_instance->SetData(TYPE_EVENT, 6010); break; case 6010: if (IsHeroic()) { DoScriptText(SAY_STAGE_4_07, me); m_uiUpdateTimer = 60000; - m_pInstance->SetData(TYPE_ANUBARAK, SPECIAL); - m_pInstance->SetData(TYPE_EVENT, 6020); - } else m_pInstance->SetData(TYPE_EVENT, 6030); + m_instance->SetData(TYPE_ANUBARAK, SPECIAL); + m_instance->SetData(TYPE_EVENT, 6020); + } else m_instance->SetData(TYPE_EVENT, 6030); break; case 6020: me->DespawnOrUnsummon(); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 6030); + m_instance->SetData(TYPE_EVENT, 6030); break; } } else m_uiUpdateTimer -= uiDiff; - m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); + m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); } }; @@ -818,10 +818,10 @@ class npc_garrosh_toc : public CreatureScript { npc_garrosh_tocAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)me->GetInstanceScript(); + m_instance = (InstanceScript*)me->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiUpdateTimer; void Reset() {} @@ -830,53 +830,53 @@ class npc_garrosh_toc : public CreatureScript void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance) return; - if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_GARROSH) return; + if (!m_instance) return; + if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_GARROSH) return; - m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER); + m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER); if (m_uiUpdateTimer <= uiDiff) { - switch (m_pInstance->GetData(TYPE_EVENT)) + switch (m_instance->GetData(TYPE_EVENT)) { case 130: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK); DoScriptText(SAY_STAGE_0_03h, me); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 132); + m_instance->SetData(TYPE_EVENT, 132); break; case 132: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 140); + m_instance->SetData(TYPE_EVENT, 140); break; case 2010: DoScriptText(SAY_STAGE_1_09, me); m_uiUpdateTimer = 9000; - m_pInstance->SetData(TYPE_EVENT, 2020); + m_instance->SetData(TYPE_EVENT, 2020); break; case 3050: DoScriptText(SAY_STAGE_2_02h, me); m_uiUpdateTimer = 15000; - m_pInstance->SetData(TYPE_EVENT, 3060); + m_instance->SetData(TYPE_EVENT, 3060); break; case 3070: DoScriptText(SAY_STAGE_2_04h, me); m_uiUpdateTimer = 6000; - m_pInstance->SetData(TYPE_EVENT, 3080); + m_instance->SetData(TYPE_EVENT, 3080); break; case 3081: DoScriptText(SAY_STAGE_2_05h, me); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 3091); + m_instance->SetData(TYPE_EVENT, 3091); break; case 4030: DoScriptText(SAY_STAGE_3_03h, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 4040); + m_instance->SetData(TYPE_EVENT, 4040); break; } } else m_uiUpdateTimer -= uiDiff; - m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); + m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); } }; @@ -896,10 +896,10 @@ class npc_varian_toc : public CreatureScript { npc_varian_tocAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = (InstanceScript*)me->GetInstanceScript(); + m_instance = (InstanceScript*)me->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiUpdateTimer; void Reset() {} @@ -908,53 +908,53 @@ class npc_varian_toc : public CreatureScript void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance) return; - if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_VARIAN) return; + if (!m_instance) return; + if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_VARIAN) return; - m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER); + m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER); if (m_uiUpdateTimer <= uiDiff) { - switch (m_pInstance->GetData(TYPE_EVENT)) + switch (m_instance->GetData(TYPE_EVENT)) { case 120: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK); DoScriptText(SAY_STAGE_0_03a, me); m_uiUpdateTimer = 2000; - m_pInstance->SetData(TYPE_EVENT, 122); + m_instance->SetData(TYPE_EVENT, 122); break; case 122: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 130); + m_instance->SetData(TYPE_EVENT, 130); break; case 2020: DoScriptText(SAY_STAGE_1_10, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 2030); + m_instance->SetData(TYPE_EVENT, 2030); break; case 3051: DoScriptText(SAY_STAGE_2_02a, me); m_uiUpdateTimer = 10000; - m_pInstance->SetData(TYPE_EVENT, 3061); + m_instance->SetData(TYPE_EVENT, 3061); break; case 3071: DoScriptText(SAY_STAGE_2_04a, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 3081); + m_instance->SetData(TYPE_EVENT, 3081); break; case 3080: DoScriptText(SAY_STAGE_2_05a, me); m_uiUpdateTimer = 3000; - m_pInstance->SetData(TYPE_EVENT, 3090); + m_instance->SetData(TYPE_EVENT, 3090); break; case 4020: DoScriptText(SAY_STAGE_3_03a, me); m_uiUpdateTimer = 5000; - m_pInstance->SetData(TYPE_EVENT, 4040); + m_instance->SetData(TYPE_EVENT, 4040); break; } } else m_uiUpdateTimer -= uiDiff; - m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); + m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer); } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index eda54abc7a5..e877126364e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -74,7 +74,7 @@ public: { boss_novosAI(Creature* c) : Scripted_NoMovementAI(c), lSummons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiTimer; @@ -89,7 +89,7 @@ public: CombatPhase Phase; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -107,15 +107,15 @@ public: if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_NOVOS_EVENT, NOT_STARTED); + instance->SetData(DATA_NOVOS_EVENT, NOT_STARTED); for (uint8 n = 0; n < 4; ++n) - luiCrystals.push_back(pInstance->GetData64(DATA_NOVOS_CRYSTAL_1 + n)); + luiCrystals.push_back(instance->GetData64(DATA_NOVOS_CRYSTAL_1 + n)); for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { - if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr)) - pTemp->SetGoState(GO_STATE_READY); + if (GameObject* temp = instance->instance->GetGameObject(*itr)) + temp->SetGoState(GO_STATE_READY); } } } @@ -127,14 +127,14 @@ public: uiCrystalHandlerTimer = 30*IN_MILLISECONDS; uiTimer = 1*IN_MILLISECONDS; DoCast(SPELL_ARCANE_FIELD); - if (pInstance) + if (instance) { for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { - if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr)) - pTemp->SetGoState(GO_STATE_ACTIVE); + if (GameObject* temp = instance->instance->GetGameObject(*itr)) + temp->SetGoState(GO_STATE_ACTIVE); } - pInstance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS); + instance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS); } me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -181,8 +181,8 @@ public: void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_NOVOS_EVENT, DONE); + if (instance) + instance->SetData(DATA_NOVOS_EVENT, DONE); lSummons.DespawnAll(); } @@ -219,9 +219,9 @@ public: { if (!luiCrystals.empty()) { - if (pInstance) - if (GameObject* pTemp = pInstance->instance->GetGameObject(luiCrystals.back())) - pTemp->SetGoState(GO_STATE_READY); + if (instance) + if (GameObject* temp = instance->instance->GetGameObject(luiCrystals.back())) + temp->SetGoState(GO_STATE_READY); luiCrystals.pop_back(); } if (luiCrystals.empty()) @@ -262,12 +262,12 @@ public: { mob_crystal_handlerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiFlashOfDarknessTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -276,7 +276,7 @@ public: void JustDied(Unit* /*killer*/) { - if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) + if (Creature* pNovos = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0)) CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->RemoveCrystal(); } @@ -298,7 +298,7 @@ public: { if (type != POINT_MOTION_TYPE || id != 0) return; - if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) + if (Creature* pNovos = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0)) if (Unit* target = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget()) AttackStart(target); } @@ -319,16 +319,16 @@ public: { mob_novos_minionAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void MovementInform(uint32 type, uint32 id) { if (type != POINT_MOTION_TYPE || id !=0) return; - if (Creature* Novos = ObjectAccessor::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) + if (Creature* Novos = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0)) { Novos->AI()->DoAction(ACTION_MINION_REACHED); if (Unit* target = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget()) diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 976633c2ade..e552341fd1e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -73,7 +73,7 @@ public: { boss_tharon_jaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiPhaseTimer; @@ -86,7 +86,7 @@ public: CombatPhase Phase; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -96,16 +96,16 @@ public: uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); Phase = SKELETAL; me->SetDisplayId(me->GetNativeDisplayId()); - if (pInstance) - pInstance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -155,9 +155,9 @@ public: SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit* pTemp = (*itr); - me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); - pTemp->SetDisplayId(MODEL_SKELETON); + Unit* temp = (*itr); + me->AddAura(SPELL_GIFT_OF_THARON_JA, temp); + temp->SetDisplayId(MODEL_SKELETON); } uiPhaseTimer = 20*IN_MILLISECONDS; uiLightningBreathTimer = urand(3*IN_MILLISECONDS, 4*IN_MILLISECONDS); @@ -210,10 +210,10 @@ public: SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - Unit* pTemp = (*itr); - if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA)) - pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA); - pTemp->DeMorph(); + Unit* temp = (*itr); + if (temp->HasAura(SPELL_GIFT_OF_THARON_JA)) + temp->RemoveAura(SPELL_GIFT_OF_THARON_JA); + temp->DeMorph(); } } else uiPhaseTimer -= diff; break; @@ -229,17 +229,17 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { // clean morph on players - Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers(); + Map::PlayerList const &PlayerList = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* player = i->getSource()) player->DeMorph(); - pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK); + instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK); - pInstance->SetData(DATA_THARON_JA_EVENT, DONE); + instance->SetData(DATA_THARON_JA_EVENT, DONE); } } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index aa7d1434080..fdd27c73171 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -63,7 +63,7 @@ public: { boss_trollgoreAI(Creature* c) : ScriptedAI(c), lSummons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiConsumeTimer; @@ -77,7 +77,7 @@ public: SummonList lSummons; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -94,16 +94,16 @@ public: me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); - if (pInstance) - pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -162,8 +162,8 @@ public: lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_TROLLGORE_EVENT, DONE); + if (instance) + instance->SetData(DATA_TROLLGORE_EVENT, DONE); } uint32 GetData(uint32 type) diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index c2217f0cb23..865f98a0203 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -49,7 +49,7 @@ public: struct instance_drak_tharon_InstanceScript : public InstanceScript { - instance_drak_tharon_InstanceScript(Map* pMap) : InstanceScript(pMap) {} + instance_drak_tharon_InstanceScript(Map* map) : InstanceScript(map) {} uint8 uiDredAchievCounter; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 9a37465fc1b..f6062951228 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -156,11 +156,11 @@ public: { npc_sylvanas_fosAI(Creature* creature) : ScriptedAI(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - InstanceScript* pInstance; + InstanceScript* instance; EventMap events; Phase phase; @@ -189,7 +189,7 @@ public: { if (phase == PHASE_INTRO) { - if (!pInstance) + if (!instance) return; events.Update(diff); @@ -282,11 +282,11 @@ public: { npc_jaina_fosAI(Creature* creature) : ScriptedAI(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - InstanceScript* pInstance; + InstanceScript* instance; EventMap events; Phase phase; @@ -315,7 +315,7 @@ public: { if (phase == PHASE_INTRO) { - if (!pInstance) + if (!instance) return; events.Update(diff); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index b8eb274280c..2eab25c51c1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -67,15 +67,15 @@ public: uiHopelessnessCount = 0; - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_FALRIC_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS); events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); @@ -86,8 +86,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, DONE); + if (instance) + instance->SetData(DATA_FALRIC_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index da5fe591aa1..eb8b0d06146 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -63,15 +63,15 @@ public: { boss_horAI::Reset(); - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MARWYN_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS); events.ScheduleEvent(EVENT_OBLITERATE, 30000); // TODO Check timer events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); @@ -83,8 +83,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, DONE); + if (instance) + instance->SetData(DATA_MARWYN_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 1f79f53ca86..cd9037d6489 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -207,10 +207,10 @@ public: { npc_jaina_or_sylvanas_horAI(Creature* creature) : ScriptedAI(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 uiUther; uint64 uiLichKing; @@ -249,7 +249,7 @@ public: case EVENT_START_INTRO: me->GetMotionMaster()->MovePoint(0, MoveThronePos); // Begining of intro is differents between factions as the speech sequence and timers are differents. - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) events.ScheduleEvent(EVENT_INTRO_A2_1, 0); else events.ScheduleEvent(EVENT_INTRO_H2_1, 0); @@ -266,7 +266,7 @@ public: break; case EVENT_INTRO_A2_3: // TODO: she's doing some kind of spell casting emote - pInstance->HandleGameObject(pInstance->GetData64(DATA_FROSTMOURNE), true); + instance->HandleGameObject(instance->GetData64(DATA_FROSTMOURNE), true); events.ScheduleEvent(EVENT_INTRO_A2_4, 10000); break; case EVENT_INTRO_A2_4: @@ -441,7 +441,7 @@ public: if (Creature* pUther = me->GetCreature(*me, uiUther)) { - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) DoScriptText(SAY_UTHER_INTRO_A2_9, pUther); else DoScriptText(SAY_UTHER_INTRO_H2_7, pUther); @@ -477,9 +477,9 @@ public: case EVENT_INTRO_LK_5: // summon Falric and Marwyn. then go back to the door - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) pFalric->SetVisible(true); - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) pMarwyn->SetVisible(true); if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) @@ -492,28 +492,28 @@ public: break; case EVENT_INTRO_LK_6: - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_1, pFalric); events.ScheduleEvent(EVENT_INTRO_LK_7, 2000); break; case EVENT_INTRO_LK_7: - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) DoScriptText(SAY_MARWYN_INTRO_1, pMarwyn); events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); break; case EVENT_INTRO_LK_8: - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_2, pFalric); events.ScheduleEvent(EVENT_INTRO_LK_9, 5000); break; case EVENT_INTRO_LK_9: - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) DoScriptText(SAY_JAINA_INTRO_END, me); else DoScriptText(SAY_SYLVANAS_INTRO_END, me); @@ -524,8 +524,8 @@ public: break; case EVENT_INTRO_END: - if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave + if (instance) + instance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave // Loralen or Koreln disappearAndDie() me->DisappearAndDie(); @@ -534,9 +534,9 @@ public: case EVENT_SKIP_INTRO: // TODO: implement - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) pFalric->SetVisible(true); - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) pMarwyn->SetVisible(true); me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 6237d7d57b0..2aab61b006c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -81,10 +81,10 @@ struct boss_horAI : ScriptedAI { boss_horAI(Creature* creature) : ScriptedAI(creature), summons(creature) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; EventMap events; SummonList summons; @@ -96,7 +96,7 @@ struct boss_horAI : ScriptedAI me->SetReactState(REACT_PASSIVE); } - void DamageTaken(Unit* /*pWho*/, uint32 &uiDamage) + void DamageTaken(Unit* /*who*/, uint32 &uiDamage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) uiDamage = 0; @@ -147,9 +147,9 @@ struct boss_horAI : ScriptedAI if (summons.empty()) { if (summoned->isAlive()) - pInstance->SetData(DATA_WAVE_COUNT, NOT_STARTED); + instance->SetData(DATA_WAVE_COUNT, NOT_STARTED); else - pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); + instance->SetData(DATA_WAVE_COUNT, SPECIAL); } } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 8e7155603eb..655856208cc 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -101,14 +101,14 @@ class instance_halls_of_reflection : public InstanceMapScript public: instance_halls_of_reflection() : InstanceMapScript("instance_halls_of_reflection", 668) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_halls_of_reflection_InstanceMapScript(pMap); + return new instance_halls_of_reflection_InstanceMapScript(map); } struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript { - instance_halls_of_reflection_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}; + instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map) {}; uint64 uiFalric; uint64 uiMarwyn; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index fa52f5d9505..1b40dab2aad 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -43,7 +43,7 @@ public: { boss_eckAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiBerserkTimer; @@ -53,7 +53,7 @@ public: bool bBerserk; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -64,14 +64,14 @@ public: bBerserk = false; - if (pInstance) - pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -126,8 +126,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); + if (instance) + instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); } }; @@ -147,17 +147,17 @@ public: { npc_ruins_dwellerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void JustDied(Unit* /*who*/) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID()); - if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0) + instance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID()); + if (instance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0) me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS); } } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 35bfbf49bde..ea1ac951eb6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -77,7 +77,7 @@ public: { boss_gal_darahAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiStampedeTimer; @@ -96,7 +96,7 @@ public: bool bStartOfTransformation; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -118,16 +118,16 @@ public: me->SetDisplayId(DISPLAY_TROLL); - if (pInstance) - pInstance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -269,8 +269,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_GAL_DARAH_EVENT, DONE); + if (instance) + instance->SetData(DATA_GAL_DARAH_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index ad973375c58..07ade9c0201 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -59,10 +59,10 @@ public: { boss_moorabiAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bPhase; @@ -79,8 +79,8 @@ public: uiTransformationTImer = 12*IN_MILLISECONDS; bPhase = false; - if (pInstance) - pInstance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -88,8 +88,8 @@ public: DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_MOJO_FRENZY, true); - if (pInstance) - pInstance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 uiDiff) @@ -155,8 +155,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MOORABI_EVENT, DONE); + if (instance) + instance->SetData(DATA_MOORABI_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 94b5fda5894..7e417a840f2 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -79,7 +79,7 @@ public: { boss_slad_ranAI(Creature* c) : ScriptedAI(c), lSummons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiPoisonNovaTimer; @@ -91,7 +91,7 @@ public: SummonList lSummons; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -103,16 +103,16 @@ public: lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -172,8 +172,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE); + if (instance) + instance->SetData(DATA_SLAD_RAN_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -222,7 +222,7 @@ public: } else uiGripOfSladRanTimer -= diff; } - InstanceScript* pInstance; + InstanceScript* instance; }; }; @@ -243,7 +243,7 @@ public: uint32 uiVenomousBiteTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 690b0f0a35e..d4c55d80dc0 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -33,16 +33,16 @@ class instance_gundrak : public InstanceMapScript public: instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_gundrak_InstanceMapScript(pMap); + return new instance_gundrak_InstanceMapScript(map); } struct instance_gundrak_InstanceMapScript : public InstanceScript { - instance_gundrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_gundrak_InstanceMapScript(Map* map) : InstanceScript(map) { - bHeroicMode = pMap->IsHeroic(); + bHeroicMode = map->IsHeroic(); } bool bHeroicMode; @@ -521,30 +521,30 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); uint64 uiStatue = 0; pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); pGO->SetGoState(GO_STATE_ACTIVE); - if (pInstance) + if (instance) { switch (pGO->GetEntry()) { case 192518: - uiStatue = pInstance->GetData64(DATA_SLAD_RAN_STATUE); + uiStatue = instance->GetData64(DATA_SLAD_RAN_STATUE); break; case 192519: - uiStatue = pInstance->GetData64(DATA_MOORABI_STATUE); + uiStatue = instance->GetData64(DATA_MOORABI_STATUE); break; case 192520: - uiStatue = pInstance->GetData64(DATA_DRAKKARI_COLOSSUS_STATUE); + uiStatue = instance->GetData64(DATA_DRAKKARI_COLOSSUS_STATUE); break; } - if (!pInstance->GetData64(DATA_STATUE_ACTIVATE)) + if (!instance->GetData64(DATA_STATUE_ACTIVATE)) { - pInstance->SetData64(DATA_STATUE_ACTIVATE, uiStatue); + instance->SetData64(DATA_STATUE_ACTIVATE, uiStatue); pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); pGO->SetGoState(GO_STATE_ACTIVE); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 44d608be46e..1688624be91 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -712,10 +712,6 @@ class boss_the_lich_king : public CreatureScript summon->SetReactState(REACT_PASSIVE); summon->CastSpell(summon, SPELL_DEFILE_AURA, false); break; - case NPC_VALKYR_SHADOWGUARD: - summon->CastSpell(summon, SPELL_WINGS_OF_THE_DAMNED, true); - summon->CastSpell(summon, SPELL_VALKYR_TARGET_SEARCH, true); - break; case NPC_FROSTMOURNE_TRIGGER: { summons.Summon(summon); @@ -1479,6 +1475,7 @@ class npc_valkyr_shadowguard : public CreatureScript { _events.Reset(); me->SetReactState(REACT_PASSIVE); + DoCast(me, SPELL_WINGS_OF_THE_DAMNED, false); me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); } @@ -1558,7 +1555,6 @@ class npc_valkyr_shadowguard : public CreatureScript void SetGUID(uint64 guid, int32 /* = 0*/) { _grabbedPlayer = guid; - _events.Reset(); } void UpdateAI(uint32 const diff) @@ -1576,8 +1572,11 @@ class npc_valkyr_shadowguard : public CreatureScript switch (eventId) { case EVENT_GRAB_PLAYER: - DoCastAOE(SPELL_VALKYR_TARGET_SEARCH); - _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000); + if (!_grabbedPlayer) + { + DoCastAOE(SPELL_VALKYR_TARGET_SEARCH); + _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000); + } break; case EVENT_MOVE_TO_DROP_POS: me->GetMotionMaster()->MovePoint(POINT_DROP_PLAYER, _dropPoint); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 01fe08f31e2..ab3046806db 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -796,6 +796,7 @@ class boss_sister_svalna : public CreatureScript { _JustReachedHome(); me->SetReactState(REACT_PASSIVE); + me->SetFlying(false); } void DoAction(int32 const action) @@ -843,22 +844,13 @@ class boss_sister_svalna : public CreatureScript _isEventInProgress = false; me->setActive(false); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); + me->SetFlying(false); } void SpellHitTarget(Unit* target, SpellInfo const* spell) { switch (spell->Id) { - case SPELL_REVIVE_CHAMPION: - { - if (!_isEventInProgress) - break; - Position pos; - me->GetPosition(&pos); - me->UpdateGroundPositionZ(pos.GetPositionX(), pos.GetPositionY(), pos.m_positionZ); - me->GetMotionMaster()->MovePoint(POINT_LAND, pos); - break; - } case SPELL_IMPALING_SPEAR_KILL: me->Kill(target); break; @@ -866,8 +858,8 @@ class boss_sister_svalna : public CreatureScript if (TempSummon* summon = target->SummonCreature(NPC_IMPALING_SPEAR, *target)) { Talk(EMOTE_SVALNA_IMPALE, target->GetGUID()); - summon->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_UNK1 | 0x4000); summon->CastCustomSpell(VEHICLE_SPELL_RIDE_HARDCODED, SPELLVALUE_BASE_POINT0, 1, target, false); + summon->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_UNK1 | UNIT_FLAG2_ALLOW_ENEMY_INTERACT); } break; default: @@ -902,7 +894,10 @@ class boss_sister_svalna : public CreatureScript break; case EVENT_IMPALING_SPEAR: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_IMPALING_SPEAR)) + { + DoCast(me, SPELL_AETHER_SHIELD); DoCast(target, SPELL_IMPALING_SPEAR); + } events.ScheduleEvent(EVENT_IMPALING_SPEAR, urand(20000, 25000)); break; default: @@ -1913,13 +1908,29 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list<Unit*>& unitList) { - unitList.remove_if (AliveCheck()); + unitList.remove_if(AliveCheck()); Trinity::RandomResizeList(unitList, 2); } + void Land(SpellEffIndex /*effIndex*/) + { + Creature* caster = GetCaster()->ToCreature(); + if (!caster) + return; + + Position pos; + caster->GetPosition(&pos); + caster->GetNearPosition(pos, 5.0f, 0.0f); + pos.m_positionZ = caster->GetBaseMap()->GetHeight(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), true, 20.0f); + pos.m_positionZ += 0.05f; + caster->SetHomePosition(pos); + caster->GetMotionMaster()->MovePoint(POINT_LAND, pos); + } + void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_svalna_revive_champion_SpellScript::RemoveAliveTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHit += SpellEffectFn(spell_svalna_revive_champion_SpellScript::Land, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1942,7 +1953,11 @@ class spell_svalna_remove_spear : public SpellScriptLoader { PreventHitDefaultEffect(effIndex); if (Creature* target = GetHitCreature()) - target->DespawnOrUnsummon(); + { + if (Unit* vehicle = target->GetVehicleBase()) + vehicle->RemoveAurasDueToSpell(SPELL_IMPALING_SPEAR); + target->DespawnOrUnsummon(1); + } } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 41bed882166..1242e90c2f3 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -78,6 +78,13 @@ class at_frozen_throne_teleport : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) { + if (player->isInCombat()) + { + if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(FROZEN_THRONE_TELEPORT)) + Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT); + return true; + } + if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 90078e44d10..a7235e34f3a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -21,6 +21,7 @@ #include "ScriptedCreature.h" #include "Map.h" #include "PoolMgr.h" +#include "AccountMgr.h" #include "icecrown_citadel.h" enum EventIds @@ -949,7 +950,7 @@ class instance_icecrown_citadel : public InstanceMapScript bool CheckRequiredBosses(uint32 bossId, Player const* player = NULL) const { - if (player && player->isGameMaster()) + if (player && AccountMgr::IsGMAccount(player->GetSession()->GetSecurity())) return true; switch (bossId) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 7307fad3701..9c3c9156d63 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -663,11 +663,11 @@ public: if (player->isGameMaster()) return false; - InstanceScript* pInstance = player->GetInstanceScript(); - if (!pInstance || pInstance->IsEncounterInProgress() || pInstance->GetBossState(BOSS_KELTHUZAD) == DONE) + InstanceScript* instance = player->GetInstanceScript(); + if (!instance || instance->IsEncounterInProgress() || instance->GetBossState(BOSS_KELTHUZAD) == DONE) return false; - Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*player, pInstance->GetData64(DATA_KELTHUZAD))); + Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*player, instance->GetData64(DATA_KELTHUZAD))); if (!pKelthuzad) return false; @@ -676,7 +676,7 @@ public: return false; pKelthuzadAI->AttackStart(player); - if (GameObject* trigger = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_TRIGGER))) + if (GameObject* trigger = instance->instance->GetGameObject(instance->GetData64(DATA_KELTHUZAD_TRIGGER))) { if (trigger->getLootState() == GO_READY) trigger->UseDoorOrButton(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index ce9f55ae0b6..d620289a72f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -84,7 +84,7 @@ public: boss_sapphironAI(Creature* c) : BossAI(c, BOSS_SAPPHIRON) , phase(PHASE_NULL) { - pMap = me->GetMap(); + map = me->GetMap(); } Phases phase; @@ -93,7 +93,7 @@ public: bool CanTheHundredClub; // needed for achievement: The Hundred Club(2146, 2147) uint32 CheckFrostResistTimer; - Map* pMap; + Map* map; void InitializeAI() { @@ -156,9 +156,9 @@ public: AchievementEntry const* AchievTheHundredClub = GetAchievementStore()->LookupEntry(ACHIEVEMENT_THE_HUNDRED_CLUB); if (AchievTheHundredClub) { - if (pMap && pMap->IsDungeon()) + if (map && map->IsDungeon()) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) itr->getSource()->CompletedAchievement(AchievTheHundredClub); } @@ -183,9 +183,9 @@ public: void CheckPlayersFrostResist() { - if (CanTheHundredClub && pMap && pMap->IsDungeon()) + if (CanTheHundredClub && map && map->IsDungeon()) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) @@ -215,8 +215,8 @@ public: { if (Player* player = Unit::GetPlayer(*me, itr->first)) player->RemoveAura(SPELL_ICEBOLT); - if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) - pGo->Delete(); + if (GameObject* go = GameObject::GetGameObject(*me, itr->second)) + go->Delete(); } iceblocks.clear(); } @@ -373,10 +373,10 @@ public: for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) { - if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) + if (GameObject* go = GameObject::GetGameObject(*me, itr->second)) { - if (pGo->IsInBetween(me, target, 2.0f) - && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) + if (go->IsInBetween(me, target, 2.0f) + && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(go->GetPositionX(), go->GetPositionY()) < 5.0f) { target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); targets.push_back(target); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index b8058afe488..c2099b1346b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -268,18 +268,18 @@ public: { mob_stalaggAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 powerSurgeTimer; uint32 magneticPullTimer; void Reset() { - if (pInstance) - if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (instance) + if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); powerSurgeTimer = urand(20000, 25000); @@ -293,8 +293,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (instance) + if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } @@ -306,7 +306,7 @@ public: if (magneticPullTimer <= uiDiff) { - if (Creature* pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN))) + if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) { Unit* pStalaggVictim = me->getVictim(); Unit* pFeugenVictim = pFeugen->getVictim(); @@ -354,17 +354,17 @@ public: { mob_feugenAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 staticFieldTimer; void Reset() { - if (pInstance) - if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (instance) + if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_RESET); staticFieldTimer = 5000; @@ -377,8 +377,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) + if (instance) + if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index db9fbc5a0a1..077aa708e14 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -107,14 +107,14 @@ class instance_naxxramas : public InstanceMapScript public: instance_naxxramas() : InstanceMapScript("instance_naxxramas", 533) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_naxxramas_InstanceMapScript(pMap); + return new instance_naxxramas_InstanceMapScript(map); } struct instance_naxxramas_InstanceMapScript : public InstanceScript { - instance_naxxramas_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map) { SetBossNumber(MAX_BOSS_NUMBER); LoadDoorData(doorData); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 1a153474416..caf6b64eea7 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -63,10 +63,10 @@ public: { boss_keristraszaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; std::list<uint64> intenseColdList; uint64 auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES]; @@ -90,8 +90,8 @@ public: RemovePrison(CheckContainmentSpheres()); - if (pInstance) - pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -99,16 +99,16 @@ public: DoScriptText(SAY_AGGRO, me); DoCastAOE(SPELL_INTENSE_COLD); - if (pInstance) - pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_KERISTRASZA_EVENT, DONE); + if (instance) + instance->SetData(DATA_KERISTRASZA_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -118,18 +118,18 @@ public: bool CheckContainmentSpheres(bool remove_prison = false) { - if (!pInstance) + if (!instance) return false; - auiContainmentSphereGUIDs[0] = pInstance->GetData64(ANOMALUS_CONTAINMET_SPHERE); - auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE); - auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE); + auiContainmentSphereGUIDs[0] = instance->GetData64(ANOMALUS_CONTAINMET_SPHERE); + auiContainmentSphereGUIDs[1] = instance->GetData64(ORMOROKS_CONTAINMET_SPHERE); + auiContainmentSphereGUIDs[2] = instance->GetData64(TELESTRAS_CONTAINMET_SPHERE); GameObject* ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i) { - ContainmentSpheres[i] = pInstance->instance->GetGameObject(auiContainmentSphereGUIDs[i]); + ContainmentSpheres[i] = instance->instance->GetGameObject(auiContainmentSphereGUIDs[i]); if (!ContainmentSpheres[i]) return false; if (ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE) @@ -210,9 +210,9 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); - Creature* pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); + Creature* pKeristrasza = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_KERISTRASZA) : 0); if (pKeristrasza && pKeristrasza->isAlive()) { // maybe these are hacks :( diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 7a3605af959..1c7b538eb02 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -69,10 +69,10 @@ public: { boss_magus_telestraAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 uiFireMagusGUID; uint64 uiFrostMagusGUID; @@ -115,24 +115,24 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetVisible(true); - if (pInstance) - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); + if (instance) + instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 386c925fab4..afbe3a123a8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -63,10 +63,10 @@ public: { boss_ormorokAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bFrenzy; bool bCrystalSpikes; @@ -93,24 +93,24 @@ public: bFrenzy = false; bCrystalSpikes = false; - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, DONE); + if (instance) + instance->SetData(DATA_ORMOROK_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -195,10 +195,10 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) + Unit* temp = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (temp && temp->GetTypeId() == TYPEID_PLAYER && temp->getClass() == Healer) { - target = pTemp; + target = temp; break; } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index d2130a4bada..cb81c5d54fe 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -31,14 +31,14 @@ class instance_nexus : public InstanceMapScript public: instance_nexus() : InstanceMapScript("instance_nexus", 576) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_nexus_InstanceMapScript(pMap); + return new instance_nexus_InstanceMapScript(map); } struct instance_nexus_InstanceMapScript : public InstanceScript { - instance_nexus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS]; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index a2db75d1600..e6b3416b89c 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -31,14 +31,14 @@ class instance_oculus : public InstanceMapScript public: instance_oculus() : InstanceMapScript("instance_oculus", 578) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_oculus_InstanceMapScript(pMap); + return new instance_oculus_InstanceMapScript(map); } struct instance_oculus_InstanceMapScript : public InstanceScript { - instance_oculus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) {} void Initialize() { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index c091906d490..8c97766f787 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -95,12 +95,12 @@ public: { boss_bjarngrimAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); m_uiStance = STANCE_DEFENSIVE; memset(&m_auiStormforgedLieutenantGUID, 0, sizeof(m_auiStormforgedLieutenantGUID)); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; bool m_bIsChangingStance; @@ -163,8 +163,8 @@ public: SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); + if (m_instance) + m_instance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -174,8 +174,8 @@ public: //must get both lieutenants here and make sure they are with him me->CallForHelp(30.0f); - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); + if (m_instance) + m_instance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -187,8 +187,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, DONE); + if (m_instance) + m_instance->SetData(TYPE_BJARNGRIM, DONE); } //TODO: remove when removal is done by the core @@ -371,10 +371,10 @@ public: { mob_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 m_uiArcWeld_Timer; uint32 m_uiRenewSteel_Timer; @@ -387,9 +387,9 @@ public: void EnterCombat(Unit* who) { - if (m_pInstance) + if (m_instance) { - if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) + if (Creature* pBjarngrim = m_instance->instance->GetCreature(m_instance->GetData64(DATA_BJARNGRIM))) { if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) pBjarngrim->AI()->AttackStart(who); @@ -413,9 +413,9 @@ public: if (m_uiRenewSteel_Timer <= uiDiff) { - if (m_pInstance) + if (m_instance) { - if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) + if (Creature* pBjarngrim = m_instance->instance->GetCreature(m_instance->GetData64(DATA_BJARNGRIM))) { if (pBjarngrim->isAlive()) DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 21a84ba0083..e7f8ad4e5e8 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -80,10 +80,10 @@ public: { boss_ionarAI(Creature* creature) : ScriptedAI(creature), lSparkList(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList lSparkList; @@ -116,16 +116,16 @@ public: if (!me->IsVisible()) me->SetVisible(true); - if (pInstance) - pInstance->SetData(TYPE_IONAR, NOT_STARTED); + if (instance) + instance->SetData(TYPE_IONAR, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(TYPE_IONAR, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_IONAR, IN_PROGRESS); } void JustDied(Unit* /*killer*/) @@ -134,8 +134,8 @@ public: lSparkList.DespawnAll(); - if (pInstance) - pInstance->SetData(TYPE_IONAR, DONE); + if (instance) + instance->SetData(TYPE_IONAR, DONE); } void KilledUnit(Unit* /*victim*/) @@ -310,10 +310,10 @@ public: { mob_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiCheckTimer; @@ -325,7 +325,7 @@ public: void MovementInform(uint32 uiType, uint32 uiPointId) { - if (uiType != POINT_MOTION_TYPE || !pInstance) + if (uiType != POINT_MOTION_TYPE || !instance) return; if (uiPointId == DATA_POINT_CALLBACK) @@ -340,7 +340,7 @@ public: void UpdateAI(const uint32 uiDiff) { // Despawn if the encounter is not running - if (pInstance && pInstance->GetData(TYPE_IONAR) != IN_PROGRESS) + if (instance && instance->GetData(TYPE_IONAR) != IN_PROGRESS) { me->DespawnOrUnsummon(); return; @@ -349,9 +349,9 @@ public: // Prevent them to follow players through the whole instance if (uiCheckTimer <= uiDiff) { - if (pInstance) + if (instance) { - Creature* pIonar = pInstance->instance->GetCreature(pInstance->GetData64(DATA_IONAR)); + Creature* pIonar = instance->instance->GetCreature(instance->GetData64(DATA_IONAR)); if (pIonar && pIonar->isAlive()) { if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 4e386ff9c17..a5ea1868686 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -72,10 +72,10 @@ public: { boss_lokenAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; bool m_bIsAura; @@ -97,10 +97,10 @@ public: m_uiHealthAmountModifier = 1; - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(TYPE_LOKEN, NOT_STARTED); - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); + m_instance->SetData(TYPE_LOKEN, NOT_STARTED); + m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); } } @@ -108,10 +108,10 @@ public: { DoScriptText(SAY_AGGRO, me); - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS); - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); + m_instance->SetData(TYPE_LOKEN, IN_PROGRESS); + m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); } } @@ -119,8 +119,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_LOKEN, DONE); + if (m_instance) + m_instance->SetData(TYPE_LOKEN, DONE); } void KilledUnit(Unit* /*victim*/) @@ -139,10 +139,10 @@ public: // workaround for PULSING_SHOCKWAVE if (m_uiPulsingShockwave_Timer <= uiDiff) { - Map* pMap = me->GetMap(); - if (pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map->IsDungeon()) { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (PlayerList.isEmpty()) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index d15d9ee6900..719d74a3bde 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -83,10 +83,10 @@ public: { boss_volkhanAI(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; std::list<uint64> m_lGolemGUIDList; @@ -121,16 +121,16 @@ public: DespawnGolem(); m_lGolemGUIDList.clear(); - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED); + if (m_instance) + m_instance->SetData(TYPE_VOLKHAN, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS); + if (m_instance) + m_instance->SetData(TYPE_VOLKHAN, IN_PROGRESS); } void AttackStart(Unit* who) @@ -151,18 +151,18 @@ public: DoScriptText(SAY_DEATH, me); DespawnGolem(); - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, DONE); + if (m_instance) + m_instance->SetData(TYPE_VOLKHAN, DONE); if (IsHeroic() && GolemsShattered < 5) { AchievementEntry const* AchievShatterResistant = GetAchievementStore()->LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT); if (AchievShatterResistant) { - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map && map->IsDungeon()) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) itr->getSource()->CompletedAchievement(AchievShatterResistant); } @@ -182,10 +182,10 @@ public: for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (Creature* temp = Unit::GetCreature(*me, *itr)) { - if (pTemp->isAlive()) - pTemp->DespawnOrUnsummon(); + if (temp->isAlive()) + temp->DespawnOrUnsummon(); } } @@ -199,12 +199,12 @@ public: for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (Creature* temp = Unit::GetCreature(*me, *itr)) { // Only shatter brittle golems - if (pTemp->isAlive() && pTemp->GetEntry() == NPC_BRITTLE_GOLEM) + if (temp->isAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM) { - pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); + temp->CastSpell(temp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); GolemsShattered += 1; } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 8d7731b3eee..c5c7f9546ba 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -38,14 +38,14 @@ class instance_halls_of_lightning : public InstanceMapScript public: instance_halls_of_lightning() : InstanceMapScript("instance_halls_of_lightning", 602) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_halls_of_lightning_InstanceMapScript(pMap); + return new instance_halls_of_lightning_InstanceMapScript(map); } struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript { - instance_halls_of_lightning_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_halls_of_lightning_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index fdb938fb1ef..375862c141c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -63,7 +63,7 @@ public: { boss_krystallusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiBoulderTossTimer; @@ -74,7 +74,7 @@ public: bool bIsSlam; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -86,15 +86,15 @@ public: uiStompTimer = 20000 + rand()%9000; uiShatterTimer = 0; - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -146,8 +146,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); + if (instance) + instance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index dcd71e41432..4ab09dbf67a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -67,10 +67,10 @@ public: { boss_maiden_of_griefAI(Creature* c) : ScriptedAI(c) { - pInstance = me->GetInstanceScript(); + instance = me->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 PartingSorrowTimer; uint32 StormOfGriefTimer; @@ -84,10 +84,10 @@ public: ShockOfSorrowTimer = 20000+rand()%5000; PillarOfWoeTimer = 5000 + rand()%10000; - if (pInstance) + if (instance) { - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED); - pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); + instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED); + instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); } } @@ -95,17 +95,17 @@ public: { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_MAIDEN_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS); - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); + instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS); + instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); } } @@ -161,8 +161,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); + if (instance) + instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index e8d6bd9f214..41dcd77d4bc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -92,7 +92,7 @@ public: { boss_sjonnirAI(Creature* c) : ScriptedAI(c), lSummons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } bool bIsFrenzy; @@ -108,7 +108,7 @@ public: SummonList lSummons; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -125,8 +125,8 @@ public: lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) @@ -135,16 +135,16 @@ public: uiEncounterTimer = 0; - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_SJONNIR_DOOR))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS); + instance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS); } } @@ -219,8 +219,8 @@ public: DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_SJONNIR_EVENT, DONE); + if (instance) + instance->SetData(DATA_SJONNIR_EVENT, DONE); } void KilledUnit(Unit* victim) { @@ -271,10 +271,10 @@ public: { if (uiMergeTimer <= diff) { - if (Creature* pTemp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true)) + if (Creature* temp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true)) { DoSpawnCreature(CREATURE_IRON_SLUDGE, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); - pTemp->DisappearAndDie(); + temp->DisappearAndDie(); me->DisappearAndDie(); } uiMergeTimer = 3000; @@ -303,15 +303,15 @@ public: { mob_iron_sludgeAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void JustDied(Unit* /*killer*/) { - if (pInstance) - if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR))) + if (instance) + if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SJONNIR))) Sjonnir->AI()->DoAction(ACTION_OOZE_DEAD); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index e5f3cfd7229..ec1464a5d6f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -144,11 +144,11 @@ public: { mob_tribuna_controllerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); SetCombatMovement(false); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiKaddrakEncounterTimer; uint32 uiMarnakEncounterTimer; @@ -170,12 +170,12 @@ public: bMarnakActivated = false; bAbedneumActivated = false; - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), false); } KaddrakGUIDList.clear(); @@ -300,7 +300,7 @@ public: { npc_brann_hosAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiStep; @@ -309,7 +309,7 @@ public: uint64 uiControllerGUID; std::list<uint64> lDwarfGUIDList; - InstanceScript* pInstance; + InstanceScript* instance; bool bIsBattle; bool bIsLowHP; @@ -328,8 +328,8 @@ public: DespawnDwarf(); - if (pInstance) - pInstance->SetData(DATA_BRANN_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_BRANN_EVENT, NOT_STARTED); } } @@ -339,9 +339,9 @@ public: return; for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) { - Creature* pTemp = Unit::GetCreature(*me, pInstance ? (*itr) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->DespawnOrUnsummon(); + Creature* temp = Unit::GetCreature(*me, instance ? (*itr) : 0); + if (temp && temp->isAlive()) + temp->DespawnOrUnsummon(); } lDwarfGUIDList.clear(); } @@ -366,8 +366,8 @@ public: break; case 17: DoScriptText(SAY_EVENT_INTRO_2, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); SetEscortPaused(true); JumpToNextStep(8500); @@ -442,11 +442,11 @@ public: switch (uiStep) { case 1: - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_BRANN_EVENT) != NOT_STARTED) + if (instance->GetData(DATA_BRANN_EVENT) != NOT_STARTED) return; - pInstance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); + instance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); } bIsBattle = false; DoScriptText(SAY_ESCORT_START, me); @@ -458,9 +458,9 @@ public: JumpToNextStep(0); break; case 5: - if (pInstance) - if (Creature* pTemp = (Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))) - DoScriptText(SAY_EVENT_INTRO_3_ABED, pTemp); + if (instance) + if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))) + DoScriptText(SAY_EVENT_INTRO_3_ABED, temp); JumpToNextStep(8500); break; case 6: @@ -468,17 +468,17 @@ public: JumpToNextStep(6500); break; case 7: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_A_2_KADD, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_A_2_KADD, temp); JumpToNextStep(12500); break; case 8: DoScriptText(SAY_EVENT_A_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true); + if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); break; case 9: @@ -491,18 +491,18 @@ public: JumpToNextStep(6000); break; case 11: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_B_2_MARN, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_B_2_MARN, temp); SpawnDwarf(1); JumpToNextStep(20000); break; case 12: DoScriptText(SAY_EVENT_B_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true); + if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bMarnakActivated = true; JumpToNextStep(10000); break; case 13: @@ -523,18 +523,18 @@ public: JumpToNextStep(20000); break; case 17: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_C_2_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_C_2_ABED, temp); SpawnDwarf(1); JumpToNextStep(20000); break; case 18: DoScriptText(SAY_EVENT_C_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true); + if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); break; case 19: @@ -551,9 +551,9 @@ public: JumpToNextStep(20000); break; case 22: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_2_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_D_2_ABED, temp); SpawnDwarf(1); JumpToNextStep(5000); break; @@ -575,9 +575,9 @@ public: JumpToNextStep(10000); break; case 27: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_4_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_D_4_ABED, temp); SpawnDwarf(1); JumpToNextStep(10000); break; @@ -585,25 +585,25 @@ public: me->SetReactState(REACT_DEFENSIVE); DoScriptText(SAY_EVENT_END_01, me); me->SetStandState(UNIT_STAND_STATE_STAND); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + if (instance) + instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true); + if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) + temp->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); bIsBattle = true; SetEscortPaused(false); JumpToNextStep(6500); break; case 29: DoScriptText(SAY_EVENT_END_02, me); - if (pInstance) - pInstance->SetData(DATA_BRANN_EVENT, DONE); + if (instance) + instance->SetData(DATA_BRANN_EVENT, DONE); me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true); JumpToNextStep(5500); break; case 30: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_03_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_03_ABED, temp); JumpToNextStep(8500); break; case 31: @@ -611,9 +611,9 @@ public: JumpToNextStep(11500); break; case 32: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_05_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_05_ABED, temp); JumpToNextStep(11500); break; case 33: @@ -621,9 +621,9 @@ public: JumpToNextStep(4500); break; case 34: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_07_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_07_ABED, temp); JumpToNextStep(22500); break; case 35: @@ -631,9 +631,9 @@ public: JumpToNextStep(7500); break; case 36: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_09_KADD, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_09_KADD, temp); JumpToNextStep(18500); break; case 37: @@ -641,9 +641,9 @@ public: JumpToNextStep(5500); break; case 38: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_11_KADD, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_11_KADD, temp); JumpToNextStep(20500); break; case 39: @@ -651,9 +651,9 @@ public: JumpToNextStep(2500); break; case 40: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_13_KADD, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_13_KADD, temp); JumpToNextStep(19500); break; case 41: @@ -661,9 +661,9 @@ public: JumpToNextStep(10500); break; case 42: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_15_MARN, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_15_MARN, temp); JumpToNextStep(6500); break; case 43: @@ -671,9 +671,9 @@ public: JumpToNextStep(6500); break; case 44: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_17_MARN, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_17_MARN, temp); JumpToNextStep(25500); break; case 45: @@ -681,9 +681,9 @@ public: JumpToNextStep(23500); break; case 46: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_19_MARN, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_19_MARN, temp); JumpToNextStep(3500); break; case 47: @@ -691,19 +691,19 @@ public: JumpToNextStep(8500); break; case 48: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_21_ABED, pTemp); + if (instance) + if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_21_ABED, temp); JumpToNextStep(5500); break; case 49: { - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), false); + instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), false); } Player* player = GetPlayerForEscort(); if (player) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index e46a7dae107..ffd3706a7e5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -32,14 +32,14 @@ class instance_halls_of_stone : public InstanceMapScript public: instance_halls_of_stone() : InstanceMapScript("instance_halls_of_stone", 599) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_halls_of_stone_InstanceMapScript(pMap); + return new instance_halls_of_stone_InstanceMapScript(map); } struct instance_halls_of_stone_InstanceMapScript : public InstanceScript { - instance_halls_of_stone_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_halls_of_stone_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 uiMaidenOfGrief; uint64 uiKrystallus; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 2c99b4d7246..3888cc43bc9 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -83,11 +83,11 @@ public: { boss_algalonAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Summon = false; // not in reset. intro speech done only once. } - InstanceScript* pInstance; + InstanceScript* instance; std::list<uint64> m_lCollapsingStarGUIDList; @@ -122,8 +122,8 @@ public: uiStep = 1; } - if (pInstance) - pInstance->SetData(BOSS_ALGALON, IN_PROGRESS); + if (instance) + instance->SetData(BOSS_ALGALON, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -136,8 +136,8 @@ public: Phase = 1; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (pInstance) - pInstance->SetData(BOSS_ALGALON, NOT_STARTED); + if (instance) + instance->SetData(BOSS_ALGALON, NOT_STARTED); BlackHoleGUID = 0; @@ -165,10 +165,10 @@ public: for (std::list<uint64>::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (Creature* temp = Unit::GetCreature(*me, *itr)) { - if (pTemp->isAlive()) - pTemp->DespawnOrUnsummon(); + if (temp->isAlive()) + temp->DespawnOrUnsummon(); } } m_lCollapsingStarGUIDList.clear(); @@ -217,8 +217,8 @@ public: me->DisappearAndDie(); - if (pInstance) - pInstance->SetData(BOSS_ALGALON, DONE); + if (instance) + instance->SetData(BOSS_ALGALON, DONE); return; } @@ -342,10 +342,10 @@ public: { mob_collapsing_starAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 BlackHoleExplosion_Timer; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 50f866ea920..ec336d3402c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -1655,6 +1655,12 @@ class spell_pursue : public SpellScriptLoader { PrepareSpellScript(spell_pursue_SpellScript); + bool Load() + { + _target = NULL; + return true; + } + void FilterTargets(std::list<Unit*>& targets) { targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster())); @@ -1673,7 +1679,6 @@ class spell_pursue : public SpellScriptLoader void FilterTargetsSubsequently(std::list<Unit*>& targets) { - ASSERT(_target); targets.clear(); targets.push_back(_target); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 33f265419e6..f5a87431550 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -24,11 +24,6 @@ #include "GridNotifiersImpl.h" #include "ulduar.h" -/* - * **** TODO **** - * Achievements * - */ - enum FreyaYells { // Freya @@ -188,6 +183,7 @@ enum FreyaNpcs enum FreyaActions { ACTION_ELDER_DEATH = 1, + ACTION_ELDER_FREYA_KILLED = 2, }; enum FreyaEvents @@ -331,7 +327,7 @@ class boss_freya : public CreatureScript void DamageTaken(Unit* /*who*/, uint32& damage) { - if (damage >= me->GetHealth() && instance) + if (damage >= me->GetHealth()) { damage = 0; DoScriptText(SAY_DEATH, me); @@ -351,11 +347,11 @@ class boss_freya : public CreatureScript Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n)); if (Elder[n] && Elder[n]->isAlive()) { - Elder[n]->setFaction(35); Elder[n]->RemoveAllAuras(); Elder[n]->AttackStop(); Elder[n]->CombatStop(true); Elder[n]->DeleteThreatList(); + Elder[n]->GetAI()->DoAction(ACTION_ELDER_FREYA_KILLED); } } } @@ -373,7 +369,7 @@ class boss_freya : public CreatureScript { me->AddAura(SPELL_DRAINED_OF_POWER, Elder[n]); Elder[n]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); - Elder[n]->RemoveLootMode(LOOT_MODE_DEFAULT); + Elder[n]->RemoveLootMode(LOOT_MODE_DEFAULT); //! Why? Elder[n]->AI()->AttackStart(who); Elder[n]->AddThreat(who, 250.0f); Elder[n]->SetInCombatWith(who); @@ -627,6 +623,21 @@ class boss_freya : public CreatureScript waveCount++; } + void JustDied(Unit* who) + { + //! Freya's chest is dynamically spawned on death by different spells. + const uint32 summonSpell[2][4] = + { + /* 0Elder, 1Elder, 2Elder, 3Elder */ + /* 10N */ {62950, 62953, 62955, 62957}, + /* 25N */ {62952, 62954, 62956, 62958} + }; + + who->CastSpell((Unit*)NULL, summonSpell[me->GetMap()->GetDifficulty()][elderCount], true); + + _JustDied(); + } + void JustSummoned(Creature* summoned) { switch (summoned->GetEntry()) @@ -796,6 +807,10 @@ class boss_elder_brightleaf : public CreatureScript ++elderCount; lumberjack = true; break; + case ACTION_ELDER_FREYA_KILLED: + me->DespawnOrUnsummon(10000); + _JustDied(); + break; } } @@ -918,6 +933,10 @@ class boss_elder_stonebark : public CreatureScript ++elderCount; lumberjack = true; break; + case ACTION_ELDER_FREYA_KILLED: + me->DespawnOrUnsummon(10000); + _JustDied(); + break; } } @@ -1027,6 +1046,10 @@ class boss_elder_ironbranch : public CreatureScript ++elderCount; lumberjack = true; break; + case ACTION_ELDER_FREYA_KILLED: + me->DespawnOrUnsummon(10000); + _JustDied(); + break; } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 50c6caffa04..3c5697a7995 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -69,7 +69,6 @@ class instance_ulduar : public InstanceMapScript uint64 ThorimChestGUID; uint64 HodirRareCacheGUID; uint64 HodirChestGUID; - uint64 FreyaChestGUID; uint64 HodirDoorGUID; uint64 HodirIceDoorGUID; uint64 ArchivumDoorGUID; @@ -107,7 +106,6 @@ class instance_ulduar : public InstanceMapScript ThorimChestGUID = 0; HodirRareCacheGUID = 0; HodirChestGUID = 0; - FreyaChestGUID = 0; LeviathanGateGUID = 0; VezaxDoorGUID = 0; HodirDoorGUID = 0; @@ -302,10 +300,6 @@ class instance_ulduar : public InstanceMapScript case GO_HODIR_CHEST: HodirChestGUID = gameObject->GetGUID(); break; - case GO_FREYA_CHEST_HERO: - case GO_FREYA_CHEST: - FreyaChestGUID = gameObject->GetGUID(); - break; case GO_LEVIATHAN_DOOR: AddDoor(gameObject, true); break; @@ -423,6 +417,7 @@ class instance_ulduar : public InstanceMapScript case BOSS_XT002: case BOSS_AURIAYA: case BOSS_MIMIRON: + case BOSS_FREYA: break; case BOSS_ASSEMBLY_OF_IRON: if (state == DONE) @@ -466,11 +461,6 @@ class instance_ulduar : public InstanceMapScript if (GameObject* gameObject = instance->GetGameObject(ThorimChestGUID)) gameObject->SetRespawnTime(gameObject->GetRespawnDelay()); break; - case BOSS_FREYA: - if (state == DONE) - if (GameObject* gameObject = instance->GetGameObject(FreyaChestGUID)) - gameObject->SetRespawnTime(gameObject->GetRespawnDelay()); - break; } return true; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index 4eaed6c9fad..f11212d535e 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -129,8 +129,6 @@ enum UlduarGameObjects GO_HODIR_RARE_CACHE_OF_WINTER_HERO = 194201, GO_HODIR_CHEST_HERO = 194308, GO_HODIR_CHEST = 194307, - GO_FREYA_CHEST_HERO = 194325, - GO_FREYA_CHEST = 194324, GO_LEVIATHAN_DOOR = 194905, GO_LEVIATHAN_GATE = 194630, GO_XT_002_DOOR = 194631, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index b3e12415fdc..55211f3f047 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -85,10 +85,10 @@ public: { boss_ingvar_the_plundererAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bIsUndead; bool bEventInProgress; @@ -117,8 +117,8 @@ public: uiSpawnResTimer = 3000; - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } void DamageTaken(Unit* /*done_by*/, uint32 &damage) @@ -164,16 +164,16 @@ public: { DoScriptText(YELL_AGGRO_1, me); - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { DoScriptText(YELL_DEAD_2, me); - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, DONE); + if (instance) + instance->SetData(DATA_INGVAR_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -298,11 +298,11 @@ public: { mob_annhylde_the_callerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } float x, y, z; - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiResurectTimer; uint32 uiResurectPhase; @@ -317,7 +317,7 @@ public: me->GetPosition(x, y, z); DoTeleportTo(x+1, y, z+30); - Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + Unit* ingvar = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_INGVAR) : 0); if (ingvar) { me->GetMotionMaster()->MovePoint(1, x, y, z+15); @@ -330,7 +330,7 @@ public: { if (type != POINT_MOTION_TYPE) return; - Unit* ingvar = Unit::GetUnit((*me), pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + Unit* ingvar = Unit::GetUnit((*me), instance ? instance->GetData64(DATA_INGVAR) : 0); if (ingvar) { switch (id) @@ -362,7 +362,7 @@ public: { if (uiResurectPhase == 1) { - Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + Unit* ingvar = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_INGVAR) : 0); if (ingvar) { ingvar->SetStandState(UNIT_STAND_STATE_STAND); @@ -373,7 +373,7 @@ public: } else if (uiResurectPhase == 2) { - if (Creature* ingvar = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0)) + if (Creature* ingvar = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_INGVAR) : 0)) { ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 029ebbfe8bc..0a3f2dc3078 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -126,10 +126,10 @@ public: { boss_kelesethAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 FrostTombTimer; uint32 SummonSkeletonsTimer; @@ -148,8 +148,8 @@ public: ResetTimer(); - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); } void KilledUnit(Unit* victim) @@ -169,18 +169,18 @@ public: AchievementEntry const* AchievOnTheRocks = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ON_THE_ROCKS); if (AchievOnTheRocks) { - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map && map->IsDungeon()) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) itr->getSource()->CompletedAchievement(AchievOnTheRocks); } } } - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); + if (instance) + instance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); } void EnterCombat(Unit* /*who*/) @@ -188,8 +188,8 @@ public: DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS); } void ResetTimer(uint32 inc = 0) @@ -269,10 +269,10 @@ public: { mob_vrykul_skeletonAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Respawn_Time; uint64 Target_Guid; uint32 Decrepify_Timer; @@ -328,7 +328,7 @@ public: void UpdateAI(const uint32 diff) { - if (pInstance && pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS) + if (instance && instance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS) { if (isDead) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 34825cec9bf..e828d81e05a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -71,10 +71,10 @@ public: { boss_skarvald_the_constructorAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool ghost; uint32 Charge_Timer; @@ -91,42 +91,42 @@ public: Check_Timer = 5000; ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); - if (!ghost && pInstance) + if (!ghost && instance) { - Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isDead()) CAST_CRE(dalronn)->Respawn(); - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); } } void EnterCombat(Unit* who) { - if (!ghost && pInstance) + if (!ghost && instance) { DoScriptText(YELL_SKARVALD_AGGRO, me); - Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) dalronn->getThreatManager().addThreat(who, 0.0f); - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); } } void JustDied(Unit* Killer) { - if (!ghost && pInstance) + if (!ghost && instance) { - Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN)); if (dalronn) { if (dalronn->isDead()) { DoScriptText(YELL_SKARVALD_DAL_DIED, me); - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { @@ -157,7 +157,7 @@ public: { if (ghost) { - if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) + if (instance && instance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -171,7 +171,7 @@ public: if (Check_Timer <= diff) { Check_Timer = 5000; - Unit* dalronn = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_DALRONN) : 0); + Unit* dalronn = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_DALRONN) : 0); if (dalronn && dalronn->isDead()) { Dalronn_isDead = true; @@ -223,10 +223,10 @@ public: { boss_dalronn_the_controllerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool ghost; uint32 ShadowBolt_Timer; @@ -248,44 +248,44 @@ public: AggroYell_Timer = 0; ghost = me->GetEntry() == MOB_DALRONN_GHOST; - if (!ghost && pInstance) + if (!ghost && instance) { - Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isDead()) CAST_CRE(skarvald)->Respawn(); - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); } } void EnterCombat(Unit* who) { - if (!ghost && pInstance) + if (!ghost && instance) { - Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; - if (pInstance) - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); } } void JustDied(Unit* Killer) { - if (!ghost && pInstance) + if (!ghost && instance) { - Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD)); if (skarvald) { if (skarvald->isDead()) { DoScriptText(YELL_DALRONN_SKA_DIED, me); - if (pInstance) - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); + if (instance) + instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { @@ -316,7 +316,7 @@ public: { if (ghost) { - if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) + if (instance && instance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -340,7 +340,7 @@ public: if (Check_Timer <= diff) { Check_Timer = 5000; - Unit* skarvald = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SKARVALD) : 0); + Unit* skarvald = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_SKARVALD) : 0); if (skarvald && skarvald->isDead()) { Skarvald_isDead = true; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 89bad9e7068..488c38f5a6e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -53,14 +53,14 @@ class instance_utgarde_keep : public InstanceMapScript public: instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", 574) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_utgarde_keep_InstanceMapScript(pMap); + return new instance_utgarde_keep_InstanceMapScript(map); } struct instance_utgarde_keep_InstanceMapScript : public InstanceScript { - instance_utgarde_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_utgarde_keep_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 Keleseth; uint64 Skarvald; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 34041445266..45ceb85a640 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -39,11 +39,11 @@ public: { npc_dragonflayer_forge_masterAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); fm_Type = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint8 fm_Type; void Reset() @@ -54,18 +54,18 @@ public: void CheckForge() { - if (pInstance) + if (instance) { switch (fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); break; } } @@ -74,18 +74,18 @@ public: void JustDied(Unit* /*killer*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); - if (pInstance) + if (instance) { switch (fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1, DONE); + instance->SetData(EVENT_FORGE_1, DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2, DONE); + instance->SetData(EVENT_FORGE_2, DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3, DONE); + instance->SetData(EVENT_FORGE_3, DONE); break; } } @@ -94,18 +94,18 @@ public: void EnterCombat(Unit* /*who*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); - if (pInstance) + if (instance) { switch (fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); + instance->SetData(EVENT_FORGE_1, IN_PROGRESS); break; case 2: - pInstance->SetData(EVENT_FORGE_2, IN_PROGRESS); + instance->SetData(EVENT_FORGE_2, IN_PROGRESS); break; case 3: - pInstance->SetData(EVENT_FORGE_3, IN_PROGRESS); + instance->SetData(EVENT_FORGE_3, IN_PROGRESS); break; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index e0164f46bd8..9fa9c7c9d4f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -96,7 +96,7 @@ public: { boss_palehoofAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcingSmashTimer; @@ -107,7 +107,7 @@ public: uint8 AddCount; bool DoneAdds[4]; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -123,31 +123,31 @@ public: currentPhase = PHASE_NONE; - if (pInstance) + if (instance) { - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); + instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); - Creature* pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); + Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN)); + if (temp && !temp->isAlive()) + temp->Respawn(); - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); + if (temp && !temp->isAlive()) + temp->Respawn(); - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); + if (temp && !temp->isAlive()) + temp->Respawn(); - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); + temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); + if (temp && !temp->isAlive()) + temp->Respawn(); - GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); - if (pGo) + GameObject* go = instance->instance->GetGameObject(instance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); + if (go) { - pGo->SetGoState(GO_STATE_READY); - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + go->SetGoState(GO_STATE_READY); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } } } @@ -183,9 +183,9 @@ public: if (!UpdateVictim()) return; - Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->DisappearAndDie(); + Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); + if (temp && temp->isAlive()) + temp->DisappearAndDie(); if (uiArcingSmashTimer <= diff) { @@ -212,11 +212,11 @@ public: void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); - Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->DisappearAndDie(); + if (instance) + instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); + Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); + if (temp && temp->isAlive()) + temp->DisappearAndDie(); } void KilledUnit(Unit* /*victim*/) @@ -228,7 +228,7 @@ public: { if (currentPhase == PHASE_NONE) { - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); me->SummonCreature(MOB_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN); } Phase move = PHASE_NONE; @@ -256,7 +256,7 @@ public: move = (Phase)(move % 4); } //send orb to summon spot - Creature* pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); if (pOrb && pOrb->isAlive()) { if (currentPhase == PHASE_NONE) @@ -299,14 +299,14 @@ public: { mob_ravenous_furbolgAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiChainLightingTimer; uint32 uiCrazedTimer; uint32 uiTerrifyingRoarTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -316,10 +316,10 @@ public: me->GetMotionMaster()->MoveTargetedHome(); - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + if (instance) + if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -371,9 +371,9 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -412,14 +412,14 @@ public: { mob_frenzied_worgenAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiMortalWoundTimer; uint32 uiEnrage1Timer; uint32 uiEnrage2Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -429,10 +429,10 @@ public: me->GetMotionMaster()->MoveTargetedHome(); - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + if (instance) + if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -480,15 +480,15 @@ public: who->SetInCombatWith(me); DoStartMovement(who); } - if (pInstance) - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); + Creature* pPalehoof = Unit::GetCreature((*me), instance->GetData64(DATA_GORTOK_PALEHOOF)); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -528,14 +528,14 @@ public: { mob_ferocious_rhinoAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiStompTimer; uint32 uiGoreTimer; uint32 uiGrievousWoundTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -545,10 +545,10 @@ public: me->GetMotionMaster()->MoveTargetedHome(); - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + if (instance) + if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -601,9 +601,9 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -648,14 +648,14 @@ public: { mob_massive_jormungarAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiAcidSpitTimer; uint32 uiAcidSplatterTimer; uint32 uiPoisonBreathTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -665,10 +665,10 @@ public: me->GetMotionMaster()->MoveTargetedHome(); - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + if (instance) + if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } @@ -722,9 +722,9 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } @@ -754,10 +754,10 @@ public: { mob_palehoof_orbAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SummonTimer; Phase currentPhase; @@ -782,11 +782,11 @@ public: Creature* pNext = NULL; switch (currentPhase) { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; - case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; default: break; } @@ -813,11 +813,11 @@ public: Creature* pNext = NULL; switch (id) { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; - case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; default: break; } if (pNext) @@ -836,9 +836,9 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* pGO) { - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); - Creature* pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + Creature* pPalehoof = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof && pPalehoof->isAlive()) { pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 1de46ca9de3..7b459e7410d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -170,10 +170,10 @@ public: { boss_skadiAI(Creature* c) : ScriptedAI(c), Summons(me) { - m_pInstance = c->GetInstanceScript(); + m_instance = c->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; SummonList Summons; uint64 m_uiGraufGUID; std::vector<uint64> triggersGUID; @@ -208,10 +208,10 @@ public: me->SetSpeed(MOVE_FLIGHT, 3.0f); if ((Unit::GetCreature((*me), m_uiGraufGUID) == NULL) && !me->IsMounted()) me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); + m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } } @@ -235,10 +235,10 @@ public: m_uiMovementTimer = 1000; m_uiSummonTimer = 10000; me->SetInCombatWithZone(); - if (m_pInstance) + if (m_instance) { - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS); - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS); + m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); m_uiMountTimer = 1000; @@ -411,8 +411,8 @@ public: { DoScriptText(SAY_DEATH, me); Summons.DespawnAll(); - if (m_pInstance) - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); + if (m_instance) + m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -463,10 +463,10 @@ public: bool OnGossipHello(Player* player, GameObject* pGO) { - InstanceScript* m_pInstance = pGO->GetInstanceScript(); - if (!m_pInstance) return false; + InstanceScript* m_instance = pGO->GetInstanceScript(); + if (!m_instance) return false; - if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) + if (Creature* pSkadi = Unit::GetCreature((*pGO), m_instance->GetData64(DATA_SKADI_THE_RUTHLESS))) { player->CastSpell(pSkadi, SPELL_RAPID_FIRE, true); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index ab6eae9a241..1b70de6244e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -98,7 +98,7 @@ public: { boss_svalaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiIntroTimer; @@ -110,7 +110,7 @@ public: TempSummon* pArthas; uint64 uiArthasGUID; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -119,8 +119,8 @@ public: uiIntroPhase = 0; uiArthasGUID = 0; - if (pInstance) - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); } void MoveInLineOfSight(Unit* who) @@ -221,10 +221,10 @@ public: { mob_ritual_channelerAI(Creature* c) :Scripted_NoMovementAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -234,8 +234,8 @@ public: // called by svala sorrowgrave to set guid of victim void DoAction(const int32 /*action*/) { - if (pInstance) - if (Unit* victim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) + if (instance) + if (Unit* victim = me->GetUnit(*me, instance->GetData64(DATA_SACRIFICED_PLAYER))) DoCast(victim, SPELL_PARALYZE); } @@ -260,7 +260,7 @@ public: { boss_svala_sorrowgraveAI(Creature* c) : ScriptedAI(c), summons(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiSinsterStrikeTimer; @@ -274,7 +274,7 @@ public: bool bSacrificed; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -292,10 +292,10 @@ public: summons.DespawnAll(); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - pInstance->SetData64(DATA_SACRIFICED_PLAYER, 0); + instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); + instance->SetData64(DATA_SACRIFICED_PLAYER, 0); } } @@ -303,8 +303,8 @@ public: { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } void JustSummoned(Creature* summon) @@ -353,9 +353,9 @@ public: me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY); DoTeleportTo(296.632f, -346.075f, 120.85f); Phase = SACRIFICING; - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); + instance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); for (uint8 i = 0; i < 3; ++i) if (Creature* summon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) @@ -373,8 +373,8 @@ public: { if (uiSacrificeTimer <= diff) { - Unit* pSacrificeTarget = pInstance ? Unit::GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL; - if (pInstance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive()) + Unit* pSacrificeTarget = instance ? Unit::GetUnit(*me, instance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL; + if (instance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive()) me->Kill(pSacrificeTarget, false); // durability damage? //go down @@ -397,13 +397,13 @@ public: void JustDied(Unit* killer) { - if (pInstance) + if (instance) { - Creature* pSvala = Unit::GetCreature((*me), pInstance->GetData64(DATA_SVALA)); + Creature* pSvala = Unit::GetCreature((*me), instance->GetData64(DATA_SVALA)); if (pSvala && pSvala->isAlive()) killer->Kill(pSvala); - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE); + instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE); } DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 4bfd2d53761..911be1815b3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -110,7 +110,7 @@ public: { boss_ymironAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); for (int i = 0; i < 4; ++i) m_uiActiveOrder[i] = i; for (int i = 0; i < 3; ++i) @@ -150,7 +150,7 @@ public: uint64 m_uiActivedCreatureGUID; uint64 m_uiOrbGUID; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -179,16 +179,16 @@ public: DespawnBoatGhosts(m_uiActivedCreatureGUID); DespawnBoatGhosts(m_uiOrbGUID); - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); } void SpellHitTarget(Unit* who, SpellInfo const* spell) @@ -213,12 +213,12 @@ public: { DoScriptText(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].say, me); DoCast(me, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit - if (Creature* pTemp = me->SummonCreature(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0)) + if (Creature* temp = me->SummonCreature(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0)) { - m_uiActivedCreatureGUID = pTemp->GetGUID(); - pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + m_uiActivedCreatureGUID = temp->GetGUID(); + temp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + temp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); switch (m_uiActiveOrder[m_uiActivedNumber]) { case 0: m_bIsActiveWithBJORN = true; break; @@ -284,13 +284,13 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* temp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { - pTemp->SetSpeed(MOVE_RUN, 0.4f); - pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - pTemp->SetDisplayId(11686); - m_uiOrbGUID = pTemp->GetGUID(); + temp->SetSpeed(MOVE_RUN, 0.4f); + temp->CastSpell(temp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + temp->SetDisplayId(11686); + m_uiOrbGUID = temp->GetGUID(); } m_bIsActiveWithBJORN = false; // only one orb } else m_uiAbility_BJORN_Timer -= diff; @@ -316,12 +316,12 @@ public: for (uint8 i = 0; i < 4; ++i) { //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) + if (Creature* temp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - pTemp->AddThreat(target, 0.0f); - pTemp->AI()->AttackStart(target); + temp->AddThreat(target, 0.0f); + temp->AI()->AttackStart(target); } } } @@ -370,8 +370,8 @@ public: DespawnBoatGhosts(m_uiActivedCreatureGUID); DespawnBoatGhosts(m_uiOrbGUID); - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); + if (instance) + instance->SetData(DATA_KING_YMIRON_EVENT, DONE); } void KilledUnit(Unit* /*victim*/) @@ -382,8 +382,8 @@ public: void DespawnBoatGhosts(uint64 m_uiCreatureGUID) { if (m_uiCreatureGUID) - if (Creature* pTemp = Unit::GetCreature(*me, m_uiCreatureGUID)) - pTemp->DisappearAndDie(); + if (Creature* temp = Unit::GetCreature(*me, m_uiCreatureGUID)) + temp->DisappearAndDie(); m_uiCreatureGUID = 0; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 5cc68e20f9f..5dbd431fe21 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -39,14 +39,14 @@ class instance_utgarde_pinnacle : public InstanceMapScript public: instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_pinnacle(pMap); + return new instance_pinnacle(map); } struct instance_pinnacle : public InstanceScript { - instance_pinnacle(Map* pMap) : InstanceScript(pMap) {} + instance_pinnacle(Map* map) : InstanceScript(map) {} uint64 uiSvalaSorrowgrave; uint64 uiGortokPalehoof; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 7ba12847750..25233eb92ef 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -59,7 +59,7 @@ public: { boss_cyanigosaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcaneVacuumTimer; @@ -68,7 +68,7 @@ public: uint32 uiTailSweepTimer; uint32 uiUncontrollableEnergyTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -77,26 +77,26 @@ public: uiManaDestructionTimer = 30000; uiTailSweepTimer = 20000; uiUncontrollableEnergyTimer = 25000; - if (pInstance) - pInstance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { - if (pInstance && pInstance->GetData(DATA_REMOVE_NPC) == 1) + if (instance && instance->GetData(DATA_REMOVE_NPC) == 1) { me->DespawnOrUnsummon(); - pInstance->SetData(DATA_REMOVE_NPC, 0); + instance->SetData(DATA_REMOVE_NPC, 0); } //Return since we have no target @@ -145,8 +145,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE); + if (instance) + instance->SetData(DATA_CYANIGOSA_EVENT, DONE); } void KilledUnit(Unit* victim) diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 5e816cc1488..584e5b8979a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -57,7 +57,7 @@ public: { boss_erekemAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiBloodlustTimer; @@ -66,7 +66,7 @@ public: uint32 uiLightningBoltTimer; uint32 uiEarthShieldTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -75,20 +75,20 @@ public: uiEarthShockTimer = urand(2000, 8000); uiLightningBoltTimer = urand(5000, 10000); uiEarthShieldTimer = 20000; - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } - if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { if (!pGuard1->isAlive()) pGuard1->Respawn(); } - if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard2->isAlive()) pGuard2->Respawn(); @@ -107,13 +107,13 @@ public: who->SetInCombatWith(me); DoStartMovement(who); - if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard1->getVictim() && pGuard1->AI()) pGuard1->AI()->AttackStart(who); } - if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (!pGuard2->getVictim() && pGuard2->AI()) @@ -127,19 +127,19 @@ public: DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_EARTH_SHIELD); - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_EREKEM_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -154,9 +154,9 @@ public: //spam stormstrike in hc mode if spawns are dead if (IsHeroic()) { - if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0)) + if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { - if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0)) + if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard1->isAlive() && !pGuard2->isAlive()) DoCast(me->getVictim(), SPELL_STORMSTRIKE); @@ -178,8 +178,8 @@ public: DoCast(target, SPELL_CHAIN_HEAL); //If one of the adds is dead spawn heals faster - Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); - Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; @@ -210,17 +210,17 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 13); } } } @@ -237,11 +237,11 @@ public: if (HealthBelowPct(85)) return me->GetGUID(); - Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); + Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75)) return pGuard1->GetGUID(); - Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0); + Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75)) return pGuard2->GetGUID(); @@ -272,14 +272,14 @@ public: { mob_erekem_guardAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiGushingWoundTimer; uint32 uiHowlingScreechTimer; uint32 uiStrikeTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 1bf13ffd5ce..622fc2355fa 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -83,7 +83,7 @@ public: { boss_ichoronAI(Creature* creature) : ScriptedAI(creature), m_waterElements(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } bool bIsExploded; @@ -93,7 +93,7 @@ public: uint32 uiBubbleCheckerTimer; uint32 uiWaterBoltVolleyTimer; - InstanceScript* pInstance; + InstanceScript* instance; SummonList m_waterElements; @@ -108,12 +108,12 @@ public: me->SetVisible(true); DespawnWaterElements(); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } @@ -123,18 +123,18 @@ public: DoCast(me, SPELL_PROTECTIVE_BUBBLE); - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_ICHORON_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -245,8 +245,8 @@ public: if (!m_waterElements.empty()) { for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr) - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - if (pTemp->isAlive()) + if (Creature* temp = Unit::GetCreature(*me, *itr)) + if (temp->isAlive()) { bIsWaterElementsAlive = true; break; @@ -286,17 +286,17 @@ public: DespawnWaterElements(); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 13); } } } @@ -308,7 +308,7 @@ public: summoned->SetSpeed(MOVE_RUN, 0.3f); summoned->GetMotionMaster()->MoveFollow(me, 0, 0); m_waterElements.push_back(summoned->GetGUID()); - pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); + instance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); } } @@ -317,7 +317,7 @@ public: if (summoned) { m_waterElements.remove(summoned->GetGUID()); - pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); + instance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); } } @@ -345,10 +345,10 @@ public: { mob_ichor_globuleAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiRangeCheck_Timer; @@ -367,9 +367,9 @@ public: { if (uiRangeCheck_Timer < uiDiff) { - if (pInstance) + if (instance) { - if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) + if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON))) { if (me->IsWithinDist(pIchoron, 2.0f, false)) { @@ -387,7 +387,7 @@ public: void JustDied(Unit* /*killer*/) { DoCast(me, SPELL_SPLASH); - if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) + if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON))) if (pIchoron->AI()) pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_KILLED); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 5f8318644d5..648c4a71762 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -43,7 +43,7 @@ public: { boss_lavanthorAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiFireboltTimer; @@ -51,7 +51,7 @@ public: uint32 uiLavaBurnTimer; uint32 uiCauterizingFlamesTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -59,29 +59,29 @@ public: uiFlameBreathTimer = 5000; uiLavaBurnTimer = 10000; uiCauterizingFlamesTimer = 3000; - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } void EnterCombat(Unit* /*who*/) { - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_LAVANTHOR_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -139,17 +139,17 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 3ebd7f771de..42ce12ec903 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -39,42 +39,42 @@ public: { boss_moraggAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiOpticLinkTimer; uint32 uiCorrosiveSalivaTimer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { uiOpticLinkTimer = 10000; uiCorrosiveSalivaTimer = 5000; - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } void EnterCombat(Unit* /*who*/) { - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_MORAGG_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -117,17 +117,17 @@ public: } void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index a49462813f2..d61b81e6ba7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -71,10 +71,10 @@ public: { boss_xevozzAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiSummonEtherealSphere_Timer; uint32 uiArcaneBarrageVolley_Timer; @@ -82,12 +82,12 @@ public: void Reset() { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } uiSummonEtherealSphere_Timer = urand(10000, 12000); @@ -138,18 +138,18 @@ public: void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_XEVOZZ_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -199,17 +199,17 @@ public: DespawnSphere(); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + instance->SetData(DATA_WAVE_COUNT, 13); } } } @@ -238,10 +238,10 @@ public: { mob_ethereal_sphereAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 uiSummonPlayers_Timer; uint32 uiRangeCheck_Timer; @@ -263,9 +263,9 @@ public: if (uiRangeCheck_Timer < uiDiff) { - if (pInstance) + if (instance) { - if (Creature* pXevozz = Unit::GetCreature(*me, pInstance->GetData64(DATA_XEVOZZ))) + if (Creature* pXevozz = Unit::GetCreature(*me, instance->GetData64(DATA_XEVOZZ))) { float fDistance = me->GetDistance2d(pXevozz); if (fDistance <= 3) @@ -282,10 +282,10 @@ public: { DoCast(me, SPELL_SUMMON_PLAYERS); // not working right - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map && map->IsDungeon()) { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index b02ea4bfc48..d0f29422912 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -63,10 +63,10 @@ public: { boss_zuramatAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 SpellVoidShiftTimer; uint32 SpellSummonVoidTimer; @@ -75,12 +75,12 @@ public: void Reset() { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } SpellShroudOfDarknessTimer = 22000; @@ -106,18 +106,18 @@ public: void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL))) + if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_ZURAMAT_CELL))) if (pDoor->GetGoState() == GO_STATE_READY) { EnterEvadeMode(); return; } - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) - pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) - pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); + if (instance->GetData(DATA_WAVE_COUNT) == 6) + instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS); + else if (instance->GetData(DATA_WAVE_COUNT) == 12) + instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } @@ -169,17 +169,17 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_WAVE_COUNT) == 6) + if (instance->GetData(DATA_WAVE_COUNT) == 6) { - pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 7); + instance->SetData(DATA_1ST_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 7); } - else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) + else if (instance->GetData(DATA_WAVE_COUNT) == 12) { - pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT, 13); + instance->SetData(DATA_2ND_BOSS_EVENT, DONE); + instance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index ad295ec1a9a..4df44f1c851 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -105,14 +105,14 @@ class instance_violet_hold : public InstanceMapScript public: instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_violet_hold_InstanceMapScript(pMap); + return new instance_violet_hold_InstanceMapScript(map); } struct instance_violet_hold_InstanceMapScript : public InstanceScript { - instance_violet_hold_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 uiMoragg; uint64 uiErekem; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 3270941ba3e..801ab408685 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -261,8 +261,8 @@ public: case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); CAST_AI(npc_sinclari_vh::npc_sinclariAI, (creature->AI()))->uiPhase = 1; - if (InstanceScript* pInstance = creature->GetInstanceScript()) - pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); + if (InstanceScript* instance = creature->GetInstanceScript()) + instance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); break; case GOSSIP_ACTION_INFO_DEF+2: player->SEND_GOSSIP_MENU(13854, creature->GetGUID()); @@ -277,9 +277,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (InstanceScript* pInstance = creature->GetInstanceScript()) + if (InstanceScript* instance = creature->GetInstanceScript()) { - switch (pInstance->GetData(DATA_MAIN_EVENT_PHASE)) + switch (instance->GetData(DATA_MAIN_EVENT_PHASE)) { case NOT_STARTED: case FAIL: // Allow to start event if not started or wiped @@ -307,10 +307,10 @@ public: { npc_sinclariAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint8 uiPhase; uint32 uiTimer; @@ -394,8 +394,8 @@ public: uiPhase = 5; break; case 5: - if (pInstance) - pInstance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS); me->SetReactState(REACT_PASSIVE); uiTimer = 0; uiPhase = 0; @@ -428,20 +428,20 @@ public: { mob_azure_saboteurAI(Creature* c):npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); bHasGotMovingPoints = false; uiBoss = 0; Reset(); } - InstanceScript* pInstance; + InstanceScript* instance; bool bHasGotMovingPoints; uint32 uiBoss; void Reset() { - if (pInstance && !uiBoss) - uiBoss = pInstance->GetData(DATA_WAVE_COUNT) == 6 ? pInstance->GetData(DATA_FIRST_BOSS) : pInstance->GetData(DATA_SECOND_BOSS); + if (instance && !uiBoss) + uiBoss = instance->GetData(DATA_WAVE_COUNT) == 6 ? instance->GetData(DATA_FIRST_BOSS) : instance->GetData(DATA_SECOND_BOSS); me->SetReactState(REACT_PASSIVE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -480,7 +480,7 @@ public: void UpdateAI(const uint32 diff) { - if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) + if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); npc_escortAI::UpdateAI(diff); @@ -529,10 +529,10 @@ public: { me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false); me->DisappearAndDie(); - Creature* pSaboPort = Unit::GetCreature((*me), pInstance->GetData64(DATA_SABOTEUR_PORTAL)); + Creature* pSaboPort = Unit::GetCreature((*me), instance->GetData64(DATA_SABOTEUR_PORTAL)); if (pSaboPort) pSaboPort->DisappearAndDie(); - pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1); + instance->SetData(DATA_START_BOSS_ENCOUNTER, 1); } }; @@ -552,7 +552,7 @@ public: { npc_teleportation_portalAI(Creature* c) : ScriptedAI(c), listOfMobs(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs bPortalGuardianOrKeeperOrEliteSpawn = false; } @@ -563,7 +563,7 @@ public: SummonList listOfMobs; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -577,16 +577,16 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) //Massive usage of pInstance, global check + if (!instance) //Massive usage of instance, global check return; - if (pInstance->GetData(DATA_REMOVE_NPC) == 1) + if (instance->GetData(DATA_REMOVE_NPC) == 1) { me->DespawnOrUnsummon(); - pInstance->SetData(DATA_REMOVE_NPC, 0); + instance->SetData(DATA_REMOVE_NPC, 0); } - uint8 uiWaveCount = pInstance->GetData(DATA_WAVE_COUNT); + uint8 uiWaveCount = instance->GetData(DATA_WAVE_COUNT); if ((uiWaveCount == 6) || (uiWaveCount == 12)) //Don't spawn mobs on boss encounters return; @@ -624,7 +624,7 @@ public: { if (bPortalGuardianOrKeeperOrEliteSpawn) { - uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4; + uint8 k = instance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4; for (uint8 i = 0; i < k; ++i) { uint32 entry = RAND(CREATURE_AZURE_INVADER_1, CREATURE_AZURE_INVADER_2, CREATURE_AZURE_SPELLBREAKER_1, CREATURE_AZURE_SPELLBREAKER_2, CREATURE_AZURE_MAGE_SLAYER_1, CREATURE_AZURE_MAGE_SLAYER_2, CREATURE_AZURE_BINDER_1, CREATURE_AZURE_BINDER_2); @@ -652,22 +652,22 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); + if (instance) + instance->SetData(DATA_WAVE_COUNT, instance->GetData(DATA_WAVE_COUNT)+1); } void JustSummoned(Creature* summoned) { listOfMobs.Summon(summoned); if (summoned) - pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); + instance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); } void SummonedMobDied(Creature* summoned) { listOfMobs.Despawn(summoned); if (summoned) - pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); + instance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); } }; @@ -677,15 +677,15 @@ struct violet_hold_trashAI : public npc_escortAI { violet_hold_trashAI(Creature* c):npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); bHasGotMovingPoints = false; - if (pInstance) - portalLocationID = pInstance->GetData(DATA_PORTAL_LOCATION); + if (instance) + portalLocationID = instance->GetData(DATA_PORTAL_LOCATION); Reset(); } public: - InstanceScript* pInstance; + InstanceScript* instance; bool bHasGotMovingPoints; uint32 portalLocationID; uint32 secondPortalRouteID; @@ -723,7 +723,7 @@ struct violet_hold_trashAI : public npc_escortAI void UpdateAI(const uint32) { - if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) + if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); if (!bHasGotMovingPoints) @@ -780,18 +780,18 @@ struct violet_hold_trashAI : public npc_escortAI void JustDied(Unit* /*unit*/) { - if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) + if (Creature* portal = Unit::GetCreature((*me), instance->GetData64(DATA_TELEPORTATION_PORTAL))) CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); - if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); + if (instance) + instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); } void CreatureStartAttackDoor() { me->SetReactState(REACT_PASSIVE); DoCast(SPELL_DESTROY_DOOR_SEAL); - if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1); + if (instance) + instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1); } }; @@ -810,7 +810,7 @@ public: { mob_azure_invaderAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiCleaveTimer; @@ -888,7 +888,7 @@ public: { mob_azure_binderAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcaneExplosionTimer; @@ -966,7 +966,7 @@ public: { mob_azure_mage_slayerAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcaneEmpowermentTimer; @@ -1026,7 +1026,7 @@ public: { mob_azure_raiderAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiConcussionBlowTimer; @@ -1078,7 +1078,7 @@ public: { mob_azure_stalkerAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiBackstabTimer; uint32 uiTacticalBlinkTimer; @@ -1137,7 +1137,7 @@ public: { mob_azure_spellbreakerAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcaneBlastTimer; @@ -1221,7 +1221,7 @@ public: { mob_azure_captainAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiMortalStrikeTimer; @@ -1273,7 +1273,7 @@ public: { mob_azure_sorcerorAI(Creature* c) : violet_hold_trashAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 uiArcaneStreamTimer; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index a0d64e38d49..9c40fbb3f82 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -598,9 +598,9 @@ public: if (TempSummon* summon = me->ToTempSummon()) if (summon->isSummon()) - if (Unit* pTemp = summon->GetSummoner()) - if (pTemp->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); + if (Unit* temp = summon->GetSummoner()) + if (temp->GetTypeId() == TYPEID_PLAYER) + CAST_PLR(temp)->KilledMonsterCredit(me->GetEntry(), 0); if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); @@ -794,15 +794,15 @@ public: return new npc_lurgglbrAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS) + if (quest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS) { - if (GameObject* pGo = creature->FindNearestGameObject(GO_CAGE, 5.0f)) + if (GameObject* go = creature->FindNearestGameObject(GO_CAGE, 5.0f)) { - pGo->SetRespawnTime(0); - pGo->SetGoType(GAMEOBJECT_TYPE_BUTTON); - pGo->UseDoorOrButton(20); + go->SetRespawnTime(0); + go->SetGoType(GAMEOBJECT_TYPE_BUTTON); + go->UseDoorOrButton(20); } if (npc_escortAI* pEscortAI = CAST_AI(npc_lurgglbr::npc_lurgglbrAI, creature->AI())) diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index aa391712ad1..f76ac69ab7a 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -348,9 +348,9 @@ class npc_daegarn : public CreatureScript public: npc_daegarn() : CreatureScript("npc_daegarn") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING) + if (quest->GetQuestId() == QUEST_DEFEAT_AT_RING) { if (npc_daegarnAI* pDaegarnAI = CAST_AI(npc_daegarn::npc_daegarnAI, creature->AI())) pDaegarnAI->StartEvent(player->GetGUID()); diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 5d38bcf9f16..b3f1fb1b8b0 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -433,9 +433,9 @@ public: return new npc_engineer_heliceAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_DISASTER) + if (quest->GetQuestId() == QUEST_DISASTER) { if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, creature->AI())) { diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 193c699f930..5dab265617e 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -527,25 +527,25 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - switch (pQuest->GetQuestId()) + switch (quest->GetQuestId()) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: - creature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, quest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER: - creature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, quest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_2: case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1: - creature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, quest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR: - creature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, quest->GetQuestId()); break; case QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND: - creature->AI()->SetData(1, pQuest->GetQuestId()); + creature->AI()->SetData(1, quest->GetQuestId()); break; } @@ -1088,10 +1088,10 @@ public: if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (Creature* temp = Unit::GetCreature(*me, *itr)) { - pTemp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :( - pTemp->AI()->AttackStart(unit); + temp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :( + temp->AI()->AttackStart(unit); } } } @@ -1131,13 +1131,13 @@ public: if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (Creature* temp = Unit::GetCreature(*me, *itr)) { - if (pTemp->GetPositionZ() >= 287.00f) + if (temp->GetPositionZ() >= 287.00f) continue; - if (pTemp->getVictim()) - pTemp->GetMotionMaster()->MoveChase(pTemp->getVictim()); + if (temp->getVictim()) + temp->GetMotionMaster()->MoveChase(temp->getVictim()); } } @@ -1151,8 +1151,8 @@ public: { if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - pTemp->DespawnOrUnsummon(); + if (Creature* temp = Unit::GetCreature(*me, *itr)) + temp->DespawnOrUnsummon(); if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND, killer); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 70c97b9073c..ab1057f042a 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -95,8 +95,8 @@ public: if (Inhibitmagic_Timer <= diff) { float dist; - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->getSource()) if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(me, 45))) diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index a77c0214730..ffe3e6081e7 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -66,10 +66,10 @@ public: { boss_talon_king_ikissAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ArcaneVolley_Timer; uint32 Sheep_Timer; @@ -122,8 +122,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_IKISSDOOREVENT, DONE); + if (instance) + instance->SetData(DATA_IKISSDOOREVENT, DONE); } void KilledUnit(Unit* /*victim*/) diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 068875924f2..eaa64cd9e16 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -37,14 +37,14 @@ class instance_sethekk_halls : public InstanceMapScript public: instance_sethekk_halls() : InstanceMapScript("instance_sethekk_halls", 556) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_sethekk_halls_InstanceMapScript(pMap); + return new instance_sethekk_halls_InstanceMapScript(map); } struct instance_sethekk_halls_InstanceMapScript : public InstanceScript { - instance_sethekk_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_sethekk_halls_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 AnzuEncounter; uint64 m_uiIkissDoorGUID; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 204de59e155..8f1453e51ee 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -58,10 +58,10 @@ public: { boss_ambassador_hellmawAI(Creature* creature) : npc_escortAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 EventCheck_Timer; uint32 CorrosiveAcid_Timer; @@ -81,17 +81,17 @@ public: IsBanished = true; Enraged = false; - if (m_pInstance && me->isAlive()) + if (m_instance && me->isAlive()) { - if (m_pInstance->GetData(TYPE_OVERSEER) != DONE) + if (m_instance->GetData(TYPE_OVERSEER) != DONE) DoCast(me, SPELL_BANISH, true); } } void JustReachedHome() { - if (m_pInstance) - m_pInstance->SetData(TYPE_HELLMAW, FAIL); + if (m_instance) + m_instance->SetData(TYPE_HELLMAW, FAIL); } void MoveInLineOfSight(Unit* who) @@ -114,15 +114,15 @@ public: IsBanished = false; Intro = true; - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(TYPE_HELLMAW) != FAIL) + if (m_instance->GetData(TYPE_HELLMAW) != FAIL) { DoScriptText(SAY_INTRO, me); Start(true, false, 0, NULL, false, true); } - m_pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS); + m_instance->SetData(TYPE_HELLMAW, IN_PROGRESS); } } @@ -140,8 +140,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (m_pInstance) - m_pInstance->SetData(TYPE_HELLMAW, DONE); + if (m_instance) + m_instance->SetData(TYPE_HELLMAW, DONE); } void UpdateAI(const uint32 diff) @@ -150,9 +150,9 @@ public: { if (EventCheck_Timer <= diff) { - if (m_pInstance) + if (m_instance) { - if (m_pInstance->GetData(TYPE_OVERSEER) == DONE) + if (m_instance->GetData(TYPE_OVERSEER) == DONE) { DoIntro(); return; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index f5439918ce2..1987c1bb01a 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -68,10 +68,10 @@ public: { boss_blackheart_the_inciterAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool InciteChaos; uint32 InciteChaos_Timer; @@ -87,8 +87,8 @@ public: Charge_Timer = 5000; Knockback_Timer = 15000; - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); } void KilledUnit(Unit* /*victim*/) @@ -100,16 +100,16 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); + if (instance) + instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index df2693c7b86..9b985d6d93e 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -149,11 +149,11 @@ public: { boss_grandmaster_vorpilAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Intro = false; } - InstanceScript* pInstance; + InstanceScript* instance; bool Intro, HelpYell; bool sumportals; @@ -172,8 +172,8 @@ public: HelpYell = false; destroyPortals(); - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED); } void summonPortals() @@ -237,8 +237,8 @@ public: DoScriptText(SAY_DEATH, me); destroyPortals(); - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); + if (instance) + instance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } void EnterCombat(Unit* /*who*/) @@ -246,8 +246,8 @@ public: DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); summonPortals(); - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS); } void MoveInLineOfSight(Unit* who) @@ -284,8 +284,8 @@ public: if (DrawShadows_Timer <= diff) { - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->getSource()) if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index f5b113cfff5..4c6aaadfec6 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -43,14 +43,14 @@ class instance_shadow_labyrinth : public InstanceMapScript public: instance_shadow_labyrinth() : InstanceMapScript("instance_shadow_labyrinth", 555) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_shadow_labyrinth_InstanceMapScript(pMap); + return new instance_shadow_labyrinth_InstanceMapScript(map); } struct instance_shadow_labyrinth_InstanceMapScript : public InstanceScript { - instance_shadow_labyrinth_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_shadow_labyrinth_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index ab307c5c647..5e126d4c6f7 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -55,9 +55,9 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - InstanceScript* pInstance = creature->GetInstanceScript(); + InstanceScript* instance = creature->GetInstanceScript(); - if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) + if (instance && (instance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (instance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 21ecab02293..8f37778b948 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -69,10 +69,10 @@ public: { boss_gurtogg_bloodboilAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 TargetGUID; @@ -93,8 +93,8 @@ public: void Reset() { - if (pInstance) - pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_GURTOGGBLOODBOILEVENT, NOT_STARTED); TargetGUID = 0; @@ -121,8 +121,8 @@ public: { DoZoneInCombat(); DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -132,8 +132,8 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); + if (instance) + instance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index d602b4d2aac..60845ae6365 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptPCH.h" #include "black_temple.h" -#define GETGO(obj, guid) GameObject* obj = pInstance->instance->GetGameObject(guid) +#define GETGO(obj, guid) GameObject* obj = instance->instance->GetGameObject(guid) #define GETUNIT(unit, guid) Unit* unit = Unit::GetUnit(*me, guid) #define GETCRE(cre, guid) Creature* cre = Unit::GetCreature(*me, guid) @@ -469,11 +469,11 @@ public: { boss_illidan_stormrageAI(Creature* c) : ScriptedAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); DoCast(me, SPELL_DUAL_WIELD, true); } - InstanceScript* pInstance; + InstanceScript* instance; PhaseIllidan Phase; EventIllidan Event; @@ -551,13 +551,13 @@ public: { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (!pInstance) + if (!instance) return; - pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, DONE); // Completed + instance->SetData(DATA_ILLIDANSTORMRAGEEVENT, DONE); // Completed for (uint8 i = DATA_GAMEOBJECT_ILLIDAN_DOOR_R; i < DATA_GAMEOBJECT_ILLIDAN_DOOR_L + 1; ++i) - pInstance->HandleGameObject(pInstance->GetData64(i), true); + instance->HandleGameObject(instance->GetData64(i), true); } void KilledUnit(Unit* victim) @@ -1370,11 +1370,11 @@ public: { npc_akama_illidanAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); JustCreated = true; } bool JustCreated; - InstanceScript* pInstance; + InstanceScript* instance; PhaseAkama Phase; bool Event; @@ -1394,28 +1394,28 @@ public: void Reset() { WalkCount = 0; - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED); + instance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED); - IllidanGUID = pInstance->GetData64(DATA_ILLIDANSTORMRAGE); - GateGUID = pInstance->GetData64(DATA_GAMEOBJECT_ILLIDAN_GATE); - DoorGUID[0] = pInstance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_R); - DoorGUID[1] = pInstance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_L); + IllidanGUID = instance->GetData64(DATA_ILLIDANSTORMRAGE); + GateGUID = instance->GetData64(DATA_GAMEOBJECT_ILLIDAN_GATE); + DoorGUID[0] = instance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_R); + DoorGUID[1] = instance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_L); if (JustCreated)//close all doors at create { - pInstance->HandleGameObject(GateGUID, false); + instance->HandleGameObject(GateGUID, false); for (uint8 i = 0; i < 2; ++i) - pInstance->HandleGameObject(DoorGUID[i], false); + instance->HandleGameObject(DoorGUID[i], false); //JustCreated = false; }else {//open all doors, raid wiped - pInstance->HandleGameObject(GateGUID, true); + instance->HandleGameObject(GateGUID, true); WalkCount = 1;//skip first wp for (uint8 i = 0; i < 2; ++i) - pInstance->HandleGameObject(DoorGUID[i], true); + instance->HandleGameObject(DoorGUID[i], true); } } else @@ -1485,12 +1485,12 @@ public: void BeginTalk() { - if (!pInstance) + if (!instance) return; - pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS); + instance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS); for (uint8 i = 0; i < 2; ++i) - pInstance->HandleGameObject(DoorGUID[i], false); + instance->HandleGameObject(DoorGUID[i], false); if (GETCRE(Illidan, IllidanGUID)) { Illidan->RemoveAurasDueToSpell(SPELL_KNEEL); @@ -1539,7 +1539,7 @@ public: void EnterPhase(PhaseAkama NextPhase) { - if (!pInstance) + if (!instance) return; switch (NextPhase) { @@ -1659,8 +1659,8 @@ public: me->InterruptNonMeleeSpells(true); Spirit[0]->InterruptNonMeleeSpells(true); Spirit[1]->InterruptNonMeleeSpells(true); - if (pInstance) - pInstance->HandleGameObject(GateGUID, true); + if (instance) + instance->HandleGameObject(GateGUID, true); Timer = 2000; break; case 4: @@ -1690,8 +1690,8 @@ public: { case 6: for (uint8 i = 0; i < 2; ++i) - if (pInstance) - pInstance->HandleGameObject(DoorGUID[i], true); + if (instance) + instance->HandleGameObject(DoorGUID[i], true); break; case 8: if (Phase == PHASE_WALK) @@ -1718,7 +1718,7 @@ public: { if (Check_Timer <= diff) { - if (pInstance && pInstance->GetData(DATA_ILLIDARICOUNCILEVENT) == DONE) + if (instance && instance->GetData(DATA_ILLIDARICOUNCILEVENT) == DONE) me->SetVisible(true); Check_Timer = 5000; @@ -1824,8 +1824,8 @@ public: void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() { - if (pInstance) - pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED); if (AkamaGUID) { @@ -2051,7 +2051,7 @@ public: DespawnTimer = 5000; if (who->HasAura(SPELL_ENRAGE)) who->RemoveAurasDueToSpell(SPELL_ENRAGE); // Dispel his enrage - //if (GameObject* CageTrap = pInstance->instance->GetGameObject(pInstance->GetData64(CageTrapGUID))) + //if (GameObject* CageTrap = instance->instance->GetGameObject(instance->GetData64(CageTrapGUID))) // CageTrap->SetLootState(GO_JUST_DEACTIVATED); } } @@ -2084,15 +2084,15 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { float x, y, z; player->GetPosition(x, y, z); // Grid search for nearest live Creature of entry 23304 within 10 yards - if (Creature* pTrigger = pGo->FindNearestCreature(23304, 10.0f)) + if (Creature* pTrigger = go->FindNearestCreature(23304, 10.0f)) CAST_AI(mob_cage_trap_trigger::cage_trap_triggerAI, pTrigger->AI())->Active = true; - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); return true; } @@ -2187,17 +2187,17 @@ public: { mob_parasitic_shadowfiendAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 IllidanGUID; uint32 CheckTimer; void Reset() { - if (pInstance) - IllidanGUID = pInstance->GetData64(DATA_ILLIDANSTORMRAGE); + if (instance) + IllidanGUID = instance->GetData64(DATA_ILLIDANSTORMRAGE); else IllidanGUID = 0; diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 62e33f0913b..a69ed1f7e7d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -92,10 +92,10 @@ public: { boss_shahrazAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 TargetGUID[3]; uint32 BeamTimer; @@ -114,8 +114,8 @@ public: void Reset() { - if (pInstance) - pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED); for (uint8 i = 0; i<3; ++i) TargetGUID[i] = 0; @@ -137,8 +137,8 @@ public: void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); DoZoneInCombat(); DoScriptText(SAY_AGGRO, me); @@ -151,8 +151,8 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); + if (instance) + instance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index c3bb4ee3d2b..1519713183d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -144,11 +144,11 @@ public: { boss_reliquary_of_soulsAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); EssenceGUID = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 EssenceGUID; @@ -161,8 +161,8 @@ public: void Reset() { - if (pInstance) - pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_RELIQUARYOFSOULSEVENT, NOT_STARTED); if (EssenceGUID) { @@ -184,8 +184,8 @@ public: { me->AddThreat(who, 10000.0f); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_RELIQUARYOFSOULSEVENT, IN_PROGRESS); Phase = 1; Counter = 0; @@ -228,8 +228,8 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); + if (instance) + instance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index cced0207ca1..ce1f8739493 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -204,14 +204,14 @@ public: { boss_shade_of_akamaAI(Creature* c) : ScriptedAI(c), summons(me) { - pInstance = c->GetInstanceScript(); - AkamaGUID = pInstance ? pInstance->GetData64(DATA_AKAMA_SHADE) : 0; + instance = c->GetInstanceScript(); + AkamaGUID = instance ? instance->GetData64(DATA_AKAMA_SHADE) : 0; me->setActive(true);//if view distance is too low me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } - InstanceScript* pInstance; + InstanceScript* instance; std::list<uint64> Channelers; std::list<uint64> Sorcerers; @@ -269,8 +269,8 @@ public: //me->GetMotionMaster()->MoveIdle(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN); - if (pInstance) - pInstance->SetData(DATA_SHADEOFAKAMAEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_SHADEOFAKAMAEVENT, NOT_STARTED); reseting = false; } @@ -575,9 +575,9 @@ public: { ShadeHasDied = false; StartCombat = false; - pInstance = c->GetInstanceScript(); - if (pInstance) - ShadeGUID = pInstance->GetData64(DATA_SHADEOFAKAMA); + instance = c->GetInstanceScript(); + if (instance) + ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); else ShadeGUID = NOT_STARTED; me->setActive(true); @@ -592,7 +592,7 @@ public: HasYelledOnce = false; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 ShadeGUID; @@ -643,17 +643,17 @@ public: void BeginEvent(Player* pl) { - if (!pInstance) + if (!instance) return; - ShadeGUID = pInstance->GetData64(DATA_SHADEOFAKAMA); + ShadeGUID = instance->GetData64(DATA_SHADEOFAKAMA); if (!ShadeGUID) return; Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)); if (Shade) { - pInstance->SetData(DATA_SHADEOFAKAMAEVENT, IN_PROGRESS); + instance->SetData(DATA_SHADEOFAKAMAEVENT, IN_PROGRESS); // Prevent players from trying to restart event me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->SetAkamaGUID(me->GetGUID()); @@ -743,8 +743,8 @@ public: if (ShadeHasDied && (WayPointId == 1)) { - if (pInstance) - pInstance->SetData(DATA_SHADEOFAKAMAEVENT, DONE); + if (instance) + instance->SetData(DATA_SHADEOFAKAMAEVENT, DONE); me->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[1].x, AkamaWP[1].y, AkamaWP[1].z); ++WayPointId; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 6785f7e4e9e..6941a175698 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -93,21 +93,21 @@ public: { boss_supremusAI(Creature* c) : ScriptedAI(c), summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; EventMap events; SummonList summons; uint32 phase; void Reset() { - if (pInstance) + if (instance) { if (me->isAlive()) { - pInstance->SetData(DATA_SUPREMUSEVENT, NOT_STARTED); + instance->SetData(DATA_SUPREMUSEVENT, NOT_STARTED); //ToggleDoors(true); } //else ToggleDoors(false); @@ -121,8 +121,8 @@ public: void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); ChangePhase(); events.ScheduleEvent(EVENT_BERSERK, 900000, GCD_CAST); @@ -157,10 +157,10 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_SUPREMUSEVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GAMEOBJECT_SUPREMUS_DOORS), true); + instance->SetData(DATA_SUPREMUSEVENT, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GAMEOBJECT_SUPREMUS_DOORS), true); } summons.DespawnAll(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 53e5fae888e..074bb16e7a0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -221,10 +221,10 @@ public: { boss_teron_gorefiendAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 IncinerateTimer; uint32 SummonDoomBlossomTimer; @@ -243,8 +243,8 @@ public: void Reset() { - if (pInstance) - pInstance->SetData(DATA_TERONGOREFIENDEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_TERONGOREFIENDEVENT, NOT_STARTED); IncinerateTimer = 20000 + rand()%11000; SummonDoomBlossomTimer = 12000; @@ -271,8 +271,8 @@ public: { if (me->IsWithinDistInMap(who, VISIBLE_RANGE) && me->IsWithinLOSInMap(who)) { - if (pInstance) - pInstance->SetData(DATA_TERONGOREFIENDEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_TERONGOREFIENDEVENT, IN_PROGRESS); me->GetMotionMaster()->Clear(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -293,8 +293,8 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_TERONGOREFIENDEVENT, DONE); + if (instance) + instance->SetData(DATA_TERONGOREFIENDEVENT, DONE); DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index c017b943954..1f603699060 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -74,10 +74,10 @@ public: { boss_najentusAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; EventMap events; uint64 SpineTargetGUID; @@ -88,8 +88,8 @@ public: SpineTargetGUID = 0; - if (pInstance) - pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); } void KilledUnit(Unit* /*victim*/) @@ -100,8 +100,8 @@ public: void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); + if (instance) + instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); DoScriptText(SAY_DEATH, me); } @@ -118,8 +118,8 @@ public: void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); @@ -212,14 +212,14 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - if (InstanceScript* pInstance = pGo->GetInstanceScript()) - if (Creature* Najentus = Unit::GetCreature(*pGo, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS))) + if (InstanceScript* instance = go->GetInstanceScript()) + if (Creature* Najentus = Unit::GetCreature(*go, instance->GetData64(DATA_HIGHWARLORDNAJENTUS))) if (CAST_AI(boss_najentus::boss_najentusAI, Najentus->AI())->RemoveImpalingSpine()) { player->CastSpell(player, SPELL_CREATE_NAJENTUS_SPINE, true); - pGo->Delete(); + go->Delete(); } return true; } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 71ee7d06f32..f7e98444be8 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -150,12 +150,12 @@ public: // finds and stores the GUIDs for each Council member using instance data system. void LoadCouncilGUIDs() { - if (InstanceScript* pInstance = me->GetInstanceScript()) + if (InstanceScript* instance = me->GetInstanceScript()) { - Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER); - Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW); - Council[2] = pInstance->GetData64(DATA_LADYMALANDE); - Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); + Council[0] = instance->GetData64(DATA_GATHIOSTHESHATTERER); + Council[1] = instance->GetData64(DATA_VERASDARKSHADOW); + Council[2] = instance->GetData64(DATA_LADYMALANDE); + Council[3] = instance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); } else sLog->outError(ERROR_INST_DATA); } @@ -219,12 +219,12 @@ public: { mob_illidari_councilAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) Council[i] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 Council[4]; @@ -257,10 +257,10 @@ public: pMember->AI()->EnterEvadeMode(); } - if (pInstance) + if (instance) { - pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, NOT_STARTED); - if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) + instance->SetData(DATA_ILLIDARICOUNCILEVENT, NOT_STARTED); + if (Creature* VoiceTrigger = (Unit::GetCreature(*me, instance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) VoiceTrigger->AI()->EnterEvadeMode(); } @@ -277,18 +277,18 @@ public: void StartEvent(Unit* target) { - if (!pInstance) + if (!instance) return; if (target && target->isAlive()) { - Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER); - Council[1] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); - Council[2] = pInstance->GetData64(DATA_LADYMALANDE); - Council[3] = pInstance->GetData64(DATA_VERASDARKSHADOW); + Council[0] = instance->GetData64(DATA_GATHIOSTHESHATTERER); + Council[1] = instance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); + Council[2] = instance->GetData64(DATA_LADYMALANDE); + Council[3] = instance->GetData64(DATA_VERASDARKSHADOW); // Start the event for the Voice Trigger - if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) + if (Creature* VoiceTrigger = (Unit::GetCreature(*me, instance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) { CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs(); CAST_AI(mob_blood_elf_council_voice_trigger::mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true; @@ -305,7 +305,7 @@ public: } } - pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, IN_PROGRESS); + instance->SetData(DATA_ILLIDARICOUNCILEVENT, IN_PROGRESS); EventBegun = true; } @@ -321,11 +321,11 @@ public: { if (DeathCount > 3) { - if (pInstance) + if (instance) { - if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) + if (Creature* VoiceTrigger = (Unit::GetCreature(*me, instance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) VoiceTrigger->DealDamage(VoiceTrigger, VoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE); + instance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE); //me->SummonCreature(AKAMAID, 746.466980f, 304.394989f, 311.90208f, 6.272870f, TEMPSUMMON_DEAD_DESPAWN, 0); } me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -380,7 +380,7 @@ struct boss_illidari_councilAI : public ScriptedAI { boss_illidari_councilAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) Council[i] = 0; LoadedGUIDs = false; @@ -388,15 +388,15 @@ struct boss_illidari_councilAI : public ScriptedAI uint64 Council[4]; - InstanceScript* pInstance; + InstanceScript* instance; bool LoadedGUIDs; void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - Creature* Controller = (Unit::GetCreature(*me, pInstance->GetData64(DATA_ILLIDARICOUNCIL))); + Creature* Controller = (Unit::GetCreature(*me, instance->GetData64(DATA_ILLIDARICOUNCIL))); if (Controller) CAST_AI(mob_illidari_council::mob_illidari_councilAI, Controller->AI())->StartEvent(who); } @@ -448,16 +448,16 @@ struct boss_illidari_councilAI : public ScriptedAI void LoadGUIDs() { - if (!pInstance) + if (!instance) { sLog->outError(ERROR_INST_DATA); return; } - Council[0] = pInstance->GetData64(DATA_LADYMALANDE); - Council[1] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); - Council[2] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER); - Council[3] = pInstance->GetData64(DATA_VERASDARKSHADOW); + Council[0] = instance->GetData64(DATA_LADYMALANDE); + Council[1] = instance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); + Council[2] = instance->GetData64(DATA_GATHIOSTHESHATTERER); + Council[3] = instance->GetData64(DATA_VERASDARKSHADOW); LoadedGUIDs = true; } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index d578b62c24b..3663372d751 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -45,14 +45,14 @@ class instance_black_temple : public InstanceMapScript public: instance_black_temple() : InstanceMapScript("instance_black_temple", 564) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_black_temple_InstanceMapScript(pMap); + return new instance_black_temple_InstanceMapScript(map); } struct instance_black_temple_InstanceMapScript : public InstanceScript { - instance_black_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_black_temple_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 141e5d1c277..3f6afc9c76e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -109,13 +109,13 @@ public: { boss_fathomlord_karathressAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Advisors[0] = 0; Advisors[1] = 0; Advisors[2] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 CataclysmicBolt_Timer; uint32 Enrage_Timer; @@ -133,12 +133,12 @@ public: BlessingOfTides = false; - if (pInstance) + if (instance) { uint64 RAdvisors[MAX_ADVISORS]; - RAdvisors[0] = pInstance->GetData64(DATA_SHARKKIS); - RAdvisors[1] = pInstance->GetData64(DATA_TIDALVESS); - RAdvisors[2] = pInstance->GetData64(DATA_CARIBDIS); + RAdvisors[0] = instance->GetData64(DATA_SHARKKIS); + RAdvisors[1] = instance->GetData64(DATA_TIDALVESS); + RAdvisors[2] = instance->GetData64(DATA_CARIBDIS); //Respawn of the 3 Advisors Creature* pAdvisor = NULL; for (int i=0; i<MAX_ADVISORS; ++i) @@ -152,7 +152,7 @@ public: pAdvisor->GetMotionMaster()->MoveTargetedHome(); } } - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } } @@ -177,17 +177,17 @@ public: void GetAdvisors() { - if (!pInstance) + if (!instance) return; - Advisors[0] = pInstance->GetData64(DATA_SHARKKIS); - Advisors[1] = pInstance->GetData64(DATA_TIDALVESS); - Advisors[2] = pInstance->GetData64(DATA_CARIBDIS); + Advisors[0] = instance->GetData64(DATA_SHARKKIS); + Advisors[1] = instance->GetData64(DATA_TIDALVESS); + Advisors[2] = instance->GetData64(DATA_CARIBDIS); } void StartEvent(Unit* who) { - if (!pInstance) + if (!instance) return; GetAdvisors(); @@ -195,8 +195,8 @@ public: DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -208,8 +208,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE); + if (instance) + instance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE); //support for quest 10944 me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); @@ -223,9 +223,9 @@ public: void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (target) { @@ -239,7 +239,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + if (instance && !instance->GetData(DATA_KARATHRESSEVENT)) { EnterEvadeMode(); return; @@ -319,10 +319,10 @@ public: { boss_fathomguard_sharkkisAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 LeechingThrow_Timer; uint32 TheBeastWithin_Timer; @@ -350,16 +350,16 @@ public: SummonedPet = 0; - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } void JustDied(Unit* /*victim*/) { - if (pInstance) + if (instance) { Creature* Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + Karathress = (Unit::GetCreature((*me), instance->GetData64(DATA_KARATHRESS))); if (Karathress) if (!me->isAlive() && Karathress) @@ -369,19 +369,19 @@ public: void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (target) { @@ -394,7 +394,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + if (instance && !instance->GetData(DATA_KARATHRESSEVENT)) { EnterEvadeMode(); return; @@ -473,10 +473,10 @@ public: { boss_fathomguard_tidalvessAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 FrostShock_Timer; uint32 Spitfire_Timer; @@ -490,16 +490,16 @@ public: PoisonCleansing_Timer = 30000; Earthbind_Timer = 45000; - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } void JustDied(Unit* /*victim*/) { - if (pInstance) + if (instance) { Creature* Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + Karathress = (Unit::GetCreature((*me), instance->GetData64(DATA_KARATHRESS))); if (Karathress) if (!me->isAlive() && Karathress) @@ -509,10 +509,10 @@ public: void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } DoCast(me, SPELL_WINDFURY_WEAPON); } @@ -520,9 +520,9 @@ public: void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (target) { @@ -535,7 +535,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + if (instance && !instance->GetData(DATA_KARATHRESSEVENT)) { EnterEvadeMode(); return; @@ -600,10 +600,10 @@ public: { boss_fathomguard_caribdisAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 WaterBoltVolley_Timer; uint32 TidalSurge_Timer; @@ -617,16 +617,16 @@ public: Heal_Timer = 55000; Cyclone_Timer = 30000+rand()%10000; - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } void JustDied(Unit* /*victim*/) { - if (pInstance) + if (instance) { Creature* Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + Karathress = (Unit::GetCreature((*me), instance->GetData64(DATA_KARATHRESS))); if (Karathress) if (!me->isAlive() && Karathress) @@ -636,19 +636,19 @@ public: void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER)); if (target) { @@ -661,7 +661,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + if (instance && !instance->GetData(DATA_KARATHRESSEVENT)) { EnterEvadeMode(); return; @@ -725,18 +725,18 @@ public: Unit* selectAdvisorUnit() { Unit* unit = NULL; - if (pInstance) + if (instance) { switch (rand()%4) { case 0: - unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESS)); break; case 1: - unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_SHARKKIS)); break; case 2: - unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_TIDALVESS)); break; case 3: unit = me; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 2820a2fdef2..a5e0f60fb6c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -90,10 +90,10 @@ public: { boss_hydross_the_unstableAI(Creature* c) : ScriptedAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 beams[2]; uint32 PosCheck_Timer; @@ -129,8 +129,8 @@ public: me->SetDisplayId(MODEL_CLEAN); - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED); beam = false; Summons.DespawnAll(); } @@ -170,8 +170,8 @@ public: { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -214,8 +214,8 @@ public: else DoScriptText(SAY_CLEAN_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, DONE); + if (instance) + instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, DONE); Summons.DespawnAll(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 19fdc454de3..fcb4b58a1ad 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -147,13 +147,13 @@ public: { boss_lady_vashjAI (Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Intro = false; JustCreated = true; c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped) } - InstanceScript* pInstance; + InstanceScript* instance; uint64 ShieldGeneratorChannel[4]; @@ -209,8 +209,8 @@ public: remo->setDeathState(JUST_DIED); } - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); ShieldGeneratorChannel[0] = 0; ShieldGeneratorChannel[1] = 0; ShieldGeneratorChannel[2] = 0; @@ -235,8 +235,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, DONE); + if (instance) + instance->SetData(DATA_LADYVASHJEVENT, DONE); } void StartEvent() @@ -245,17 +245,17 @@ public: Phase = 1; - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { //remove old tainted cores to prevent cheating in phase 2 - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (Player* i_pl = i->getSource()) @@ -551,7 +551,7 @@ public: if (Check_Timer <= diff) { //Start Phase 3 - if (pInstance && pInstance->GetData(DATA_CANSTARTPHASE3)) + if (instance && instance->GetData(DATA_CANSTARTPHASE3)) { //set life 50% me->SetHealth(me->CountPctFromMaxHealth(50)); @@ -589,10 +589,10 @@ public: { mob_enchanted_elementalAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 move; uint32 phase; float x, y, z; @@ -626,8 +626,8 @@ public: } } } - if (pInstance) - VashjGUID = pInstance->GetData64(DATA_LADYVASHJ); + if (instance) + VashjGUID = instance->GetData64(DATA_LADYVASHJ); } void EnterCombat(Unit* /*who*/) {} @@ -636,7 +636,7 @@ public: void UpdateAI(const uint32 diff) { - if (!pInstance) + if (!instance) return; if (!VashjGUID) @@ -691,10 +691,10 @@ public: { mob_tainted_elementalAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 PoisonBolt_Timer; uint32 Despawn_Timer; @@ -707,10 +707,10 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { Creature* Vashj = NULL; - Vashj = (Unit::GetCreature((*me), pInstance->GetData64(DATA_LADYVASHJ))); + Vashj = (Unit::GetCreature((*me), instance->GetData64(DATA_LADYVASHJ))); if (Vashj) CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->EventTaintedElementalDeath(); @@ -766,11 +766,11 @@ public: { mob_toxic_sporebatAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); EnterEvadeMode(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 movement_timer; uint32 ToxicSpore_Timer; @@ -837,11 +837,11 @@ public: //Check_Timer if (Check_Timer <= diff) { - if (pInstance) + if (instance) { //check if vashj is death Unit* Vashj = NULL; - Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); + Vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ)); if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashj::boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3)) { //remove @@ -924,10 +924,10 @@ public: { mob_shield_generator_channelAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Check_Timer; bool Casted; void Reset() @@ -945,13 +945,13 @@ public: void UpdateAI (const uint32 diff) { - if (!pInstance) + if (!instance) return; if (Check_Timer <= diff) { Unit* Vashj = NULL; - Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); + Vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ)); if (Vashj && Vashj->isAlive()) { @@ -976,16 +976,16 @@ public: bool OnUse(Player* player, Item* /*_Item*/, SpellCastTargets const& targets) { - InstanceScript* pInstance = player->GetInstanceScript(); + InstanceScript* instance = player->GetInstanceScript(); - if (!pInstance) + if (!instance) { player->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); return true; } Creature* Vashj = NULL; - Vashj = (Unit::GetCreature((*player), pInstance->GetData64(DATA_LADYVASHJ))); + Vashj = (Unit::GetCreature((*player), instance->GetData64(DATA_LADYVASHJ))); if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2)) { if (GameObject* gObj = targets.GetGOTarget()) @@ -1014,7 +1014,7 @@ public: return true; } - if (pInstance->GetData(identifier)) + if (instance->GetData(identifier)) { player->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); return true; @@ -1029,7 +1029,7 @@ public: Channel->setDeathState(JUST_DIED); } - pInstance->SetData(identifier, 1); + instance->SetData(identifier, 1); //remove this item player->DestroyItemCount(31088, 1, true); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index e1b3ab1308f..65cb0173cd7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -173,14 +173,14 @@ public: boss_leotheras_the_blindAI(Creature* c) : ScriptedAI(c) { c->GetPosition(x, y, z); - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); Demon = 0; for (uint8 i = 0; i < 3; ++i)//clear guids SpellBinderGUID[i] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Whirlwind_Timer; uint32 ChaosBlast_Timer; @@ -225,8 +225,8 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); DoCast(me, SPELL_DUAL_WIELD, true); me->SetCorpseDelay(1000*60*60); - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); } void CheckChannelers(/*bool DoEvade = true*/) @@ -273,8 +273,8 @@ public: void StartEvent() { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS); } void CheckBanish() @@ -302,10 +302,10 @@ public: // and reseting equipment me->LoadEquipment(me->GetEquipmentId()); - if (pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + if (instance && instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { Unit* victim = NULL; - victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); + victim = Unit::GetUnit(*me, instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); if (victim) me->getThreatManager().addThreat(victim, 1); StartEvent(); @@ -392,8 +392,8 @@ public: if (Creature* pDemon = Unit::GetCreature(*me, Demon)) pDemon->DespawnOrUnsummon(); } - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); + if (instance) + instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } void EnterCombat(Unit* /*who*/) @@ -675,12 +675,12 @@ public: { mob_greyheart_spellbinderAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); leotherasGUID = 0; AddedBanish = false; } - InstanceScript* pInstance; + InstanceScript* instance; uint64 leotherasGUID; @@ -694,9 +694,9 @@ public: Mindblast_Timer = 3000 + rand()%5000; Earthshock_Timer = 5000 + rand()%5000; - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); + instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); Creature* leotheras = Unit::GetCreature(*me, leotherasGUID); if (leotheras && leotheras->isAlive()) CAST_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); @@ -706,8 +706,8 @@ public: void EnterCombat(Unit* who) { me->InterruptNonMeleeSpells(false); - if (pInstance) - pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); + if (instance) + instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); } void JustRespawned() @@ -731,15 +731,15 @@ public: void UpdateAI(const uint32 diff) { - if (pInstance) + if (instance) { if (!leotherasGUID) - leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS); + leotherasGUID = instance->GetData64(DATA_LEOTHERAS); - if (!me->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + if (!me->isInCombat() && instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { Unit* victim = NULL; - victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); + victim = Unit::GetUnit(*me, instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); if (victim) AttackStart(victim); } @@ -751,7 +751,7 @@ public: return; } - if (pInstance && !pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + if (instance && !instance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) { EnterEvadeMode(); return; @@ -769,8 +769,8 @@ public: if (Earthshock_Timer <= diff) { - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { if (Player* i_pl = itr->getSource()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 7f84ce504e7..f69aa1f0757 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -80,10 +80,10 @@ public: { boss_the_lurker_belowAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList Summons; bool Spawned; @@ -103,7 +103,7 @@ public: bool CheckCanStart()//check if players fished { - if (pInstance && pInstance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) + if (instance && instance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) return false; return true; } @@ -128,10 +128,10 @@ public: Summons.DespawnAll(); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); - pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED); + instance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); + instance->SetData(DATA_STRANGE_POOL, NOT_STARTED); } DoCast(me, SPELL_SUBMERGE);//submerge anim me->SetVisible(false);//we start invis under water, submerged @@ -141,10 +141,10 @@ public: void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_THELURKERBELOWEVENT, DONE); - pInstance->SetData(DATA_STRANGE_POOL, IN_PROGRESS); + instance->SetData(DATA_THELURKERBELOWEVENT, DONE); + instance->SetData(DATA_STRANGE_POOL, IN_PROGRESS); } Summons.DespawnAll(); @@ -152,8 +152,8 @@ public: void EnterCombat(Unit* who) { - if (pInstance) - pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); Scripted_NoMovementAI::EnterCombat(who); } @@ -251,8 +251,8 @@ public: if (CheckTimer <= diff)//check if there are players in melee range { InRange = false; - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map* map = me->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -266,10 +266,10 @@ public: if (RotTimer) { - Map* pMap = me->GetMap(); - if (pMap->IsDungeon()) + Map* map = me->GetMap(); + if (map->IsDungeon()) { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = map->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index da36f70a339..745aa162139 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -91,10 +91,10 @@ public: { boss_morogrim_tidewalkerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; Map::PlayerList const* PlayerList; @@ -123,16 +123,16 @@ public: Earthquake = false; Phase2 = false; - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); } void StartEvent() { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -144,8 +144,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); + if (instance) + instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } void EnterCombat(Unit* /*who*/) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 88350e4ea0b..7a8973c4f0a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -54,13 +54,13 @@ class go_bridge_console : public GameObjectScript bool OnGossipHello(Player* /*player*/, GameObject* go) { - InstanceScript* pInstance = go->GetInstanceScript(); + InstanceScript* instance = go->GetInstanceScript(); - if (!pInstance) + if (!instance) return false; - if (pInstance) - pInstance->SetData(DATA_CONTROL_CONSOLE, DONE); + if (instance) + instance->SetData(DATA_CONTROL_CONSOLE, DONE); return true; } @@ -73,7 +73,7 @@ class instance_serpent_shrine : public InstanceMapScript struct instance_serpentshrine_cavern_InstanceMapScript : public InstanceScript { - instance_serpentshrine_cavern_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_serpentshrine_cavern_InstanceMapScript(Map* map) : InstanceScript(map) { } @@ -434,9 +434,9 @@ class instance_serpent_shrine : public InstanceMapScript bool DoSpawnFrenzy; }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_serpentshrine_cavern_InstanceMapScript(pMap); + return new instance_serpentshrine_cavern_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 5ae358ba046..4ca3ef7891d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -60,10 +60,10 @@ public: { boss_thespiaAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 LightningCloud_Timer; uint32 LungBurst_Timer; @@ -75,16 +75,16 @@ public: LungBurst_Timer = 7000; EnvelopingWinds_Timer = 9000; - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); + if (instance) + instance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); } void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEAD, me); - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); + if (instance) + instance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); } void KilledUnit(Unit* /*victim*/) @@ -96,8 +96,8 @@ public: { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 602c9b33a24..5be2c99f362 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -62,10 +62,10 @@ public: { boss_mekgineer_steamriggerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Shrink_Timer; uint32 Saw_Blade_Timer; @@ -84,16 +84,16 @@ public: Summon50 = false; Summon25 = false; - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); + if (instance) + instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); } void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); + if (instance) + instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); } void KilledUnit(Unit* /*victim*/) @@ -105,8 +105,8 @@ public: { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); } //no known summon spells exist @@ -206,10 +206,10 @@ public: { mob_steamrigger_mechanicAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Repair_Timer; @@ -229,9 +229,9 @@ public: { if (Repair_Timer <= diff) { - if (pInstance && pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS) + if (instance && instance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && instance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS) { - if (Unit* pMekgineer = Unit::GetUnit((*me), pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER))) + if (Unit* pMekgineer = Unit::GetUnit((*me), instance->GetData64(DATA_MEKGINEERSTEAMRIGGER))) { if (me->IsWithinDistInMap(pMekgineer, MAX_REPAIR_RANGE)) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index f9a477e58c5..36161d05473 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -56,10 +56,10 @@ public: { mob_naga_distillerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -67,9 +67,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //hack, due to really weird spell behaviour :( - if (pInstance) + if (instance) { - if (pInstance->GetData(TYPE_DISTILLER) == IN_PROGRESS) + if (instance->GetData(TYPE_DISTILLER) == IN_PROGRESS) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -86,15 +86,15 @@ public: DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true); - if (pInstance) - pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_DISTILLER, IN_PROGRESS); } void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) - if (pInstance) - pInstance->SetData(TYPE_DISTILLER, DONE); + if (instance) + instance->SetData(TYPE_DISTILLER, DONE); } }; @@ -114,10 +114,10 @@ public: { boss_warlord_kalithreshAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Reflection_Timer; uint32 Impale_Timer; @@ -131,16 +131,16 @@ public: Rage_Timer = 45000; CanRage = false; - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); + if (instance) + instance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -152,8 +152,8 @@ public: { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) - if (pInstance) - if (pInstance->GetData(TYPE_DISTILLER) == DONE) + if (instance) + if (instance->GetData(TYPE_DISTILLER) == DONE) me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } @@ -161,8 +161,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, DONE); + if (instance) + instance->SetData(TYPE_WARLORD_KALITHRESH, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 32468cca606..9719a1e19db 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -45,16 +45,16 @@ public: bool OnGossipHello(Player* /*player*/, GameObject* go) { - InstanceScript* pInstance = go->GetInstanceScript(); + InstanceScript* instance = go->GetInstanceScript(); - if (!pInstance) + if (!instance) return false; - if (go->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL); + if (go->GetEntry() == ACCESS_PANEL_HYDRO && (instance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || instance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) + instance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL); - if (go->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL); + if (go->GetEntry() == ACCESS_PANEL_MEK && (instance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || instance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) + instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL); return true; } @@ -66,14 +66,14 @@ class instance_steam_vault : public InstanceMapScript public: instance_steam_vault() : InstanceMapScript("instance_steam_vault", 545) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_steam_vault_InstanceMapScript(pMap); + return new instance_steam_vault_InstanceMapScript(map); } struct instance_steam_vault_InstanceMapScript : public InstanceScript { - instance_steam_vault_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_steam_vault_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 789d33a7a1b..7cdfdc383bd 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -68,10 +68,10 @@ public: { boss_gruulAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 m_uiGrowth_Timer; uint32 m_uiCaveIn_Timer; @@ -92,16 +92,16 @@ public: m_uiHurtfulStrike_Timer= 8000; m_uiReverberation_Timer= 60000+45000; - if (pInstance) - pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_GRUULEVENT, NOT_STARTED); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_GRUULEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GRUULEVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -113,10 +113,10 @@ public: { DoScriptText(SAY_DEATH, me); - if (pInstance) + if (instance) { - pInstance->SetData(DATA_GRUULEVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GRUULDOOR), true); // Open the encounter door + instance->SetData(DATA_GRUULEVENT, DONE); + instance->HandleGameObject(instance->GetData64(DATA_GRUULDOOR), true); // Open the encounter door } } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 38c087889eb..de3b93d029d 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -67,9 +67,9 @@ EndScriptData */ #define SPELL_SPELLSHIELD 33054 #define SPELL_BLAST_WAVE 33061 -bool CheckAllBossDied(InstanceScript* pInstance, Creature* me) +bool CheckAllBossDied(InstanceScript* instance, Creature* me) { - if (!pInstance || !me) + if (!instance || !me) return false; uint64 MaulgarGUID = 0; @@ -84,11 +84,11 @@ bool CheckAllBossDied(InstanceScript* pInstance, Creature* me) Creature* Olm = NULL; Creature* Krosh = NULL; - MaulgarGUID = pInstance->GetData64(DATA_MAULGAR); - KigglerGUID = pInstance->GetData64(DATA_KIGGLERTHECRAZED); - BlindeyeGUID = pInstance->GetData64(DATA_BLINDEYETHESEER); - OlmGUID = pInstance->GetData64(DATA_OLMTHESUMMONER); - KroshGUID = pInstance->GetData64(DATA_KROSHFIREHAND); + MaulgarGUID = instance->GetData64(DATA_MAULGAR); + KigglerGUID = instance->GetData64(DATA_KIGGLERTHECRAZED); + BlindeyeGUID = instance->GetData64(DATA_BLINDEYETHESEER); + OlmGUID = instance->GetData64(DATA_OLMTHESUMMONER); + KroshGUID = instance->GetData64(DATA_KROSHFIREHAND); Maulgar = (Unit::GetCreature((*me), MaulgarGUID)); Kiggler = (Unit::GetCreature((*me), KigglerGUID)); @@ -120,12 +120,12 @@ public: { boss_high_king_maulgarAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); for (uint8 i = 0; i < 4; ++i) Council[i] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ArcingSmash_Timer; uint32 MightyBlow_Timer; @@ -164,8 +164,8 @@ public: } //reset encounter - if (pInstance) - pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } void KilledUnit(Unit* /*victim*/) @@ -177,8 +177,8 @@ public: { DoScriptText(SAY_DEATH, me); - if (CheckAllBossDied(pInstance, me)) - pInstance->SetData(DATA_MAULGAREVENT, DONE); + if (CheckAllBossDied(instance, me)) + instance->SetData(DATA_MAULGAREVENT, DONE); } void AddDeath() @@ -193,27 +193,27 @@ public: void GetCouncil() { - if (pInstance) + if (instance) { //get council member's guid to respawn them if needed - Council[0] = pInstance->GetData64(DATA_KIGGLERTHECRAZED); - Council[1] = pInstance->GetData64(DATA_BLINDEYETHESEER); - Council[2] = pInstance->GetData64(DATA_OLMTHESUMMONER); - Council[3] = pInstance->GetData64(DATA_KROSHFIREHAND); + Council[0] = instance->GetData64(DATA_KIGGLERTHECRAZED); + Council[1] = instance->GetData64(DATA_BLINDEYETHESEER); + Council[2] = instance->GetData64(DATA_OLMTHESUMMONER); + Council[3] = instance->GetData64(DATA_KROSHFIREHAND); } } void StartEvent(Unit* who) { - if (!pInstance) + if (!instance) return; GetCouncil(); DoScriptText(SAY_AGGRO, me); - pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); - pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); + instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); + instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); DoZoneInCombat(); } @@ -221,9 +221,9 @@ public: void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK)); if (target) { @@ -237,7 +237,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT)) + if (instance && !instance->GetData(DATA_MAULGAREVENT)) { EnterEvadeMode(); return; @@ -319,14 +319,14 @@ public: { boss_olm_the_summonerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 DarkDecay_Timer; uint32 Summon_Timer; uint32 DeathCoil_Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -335,8 +335,8 @@ public: DeathCoil_Timer = 20000; //reset encounter - if (pInstance) - pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } void AttackStart(Unit* who) @@ -356,34 +356,34 @@ public: void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); - pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); + instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); + instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); } } void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { Creature* Maulgar = NULL; - Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); + Maulgar = (Unit::GetCreature((*me), instance->GetData64(DATA_MAULGAR))); if (Maulgar) CAST_AI(boss_high_king_maulgar::boss_high_king_maulgarAI, Maulgar->AI())->AddDeath(); - if (CheckAllBossDied(pInstance, me)) - pInstance->SetData(DATA_MAULGAREVENT, DONE); + if (CheckAllBossDied(instance, me)) + instance->SetData(DATA_MAULGAREVENT, DONE); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK)); if (target) { @@ -396,7 +396,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT)) + if (instance && !instance->GetData(DATA_MAULGAREVENT)) { EnterEvadeMode(); return; @@ -447,7 +447,7 @@ public: { boss_kiggler_the_crazedAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 GreaterPolymorph_Timer; @@ -455,7 +455,7 @@ public: uint32 ArcaneShock_Timer; uint32 ArcaneExplosion_Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -465,40 +465,40 @@ public: ArcaneExplosion_Timer = 30000; //reset encounter - if (pInstance) - pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); - pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); + instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); + instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); } } void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { Creature* Maulgar = NULL; - Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); + Maulgar = (Unit::GetCreature((*me), instance->GetData64(DATA_MAULGAR))); if (Maulgar) CAST_AI(boss_high_king_maulgar::boss_high_king_maulgarAI, Maulgar->AI())->AddDeath(); - if (CheckAllBossDied(pInstance, me)) - pInstance->SetData(DATA_MAULGAREVENT, DONE); + if (CheckAllBossDied(instance, me)) + instance->SetData(DATA_MAULGAREVENT, DONE); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK)); if (target) { @@ -511,7 +511,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT)) + if (instance && !instance->GetData(DATA_MAULGAREVENT)) { EnterEvadeMode(); return; @@ -569,14 +569,14 @@ public: { boss_blindeye_the_seerAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 GreaterPowerWordShield_Timer; uint32 Heal_Timer; uint32 PrayerofHealing_Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -585,40 +585,40 @@ public: PrayerofHealing_Timer = 45000 + rand()%10000; //reset encounter - if (pInstance) - pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); - pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); + instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); + instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); } } void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { Creature* Maulgar = NULL; - Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); + Maulgar = (Unit::GetCreature((*me), instance->GetData64(DATA_MAULGAR))); if (Maulgar) CAST_AI(boss_high_king_maulgar::boss_high_king_maulgarAI, Maulgar->AI())->AddDeath(); - if (CheckAllBossDied(pInstance, me)) - pInstance->SetData(DATA_MAULGAREVENT, DONE); + if (CheckAllBossDied(instance, me)) + instance->SetData(DATA_MAULGAREVENT, DONE); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK)); if (target) { @@ -631,7 +631,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT)) + if (instance && !instance->GetData(DATA_MAULGAREVENT)) { EnterEvadeMode(); return; @@ -679,14 +679,14 @@ public: { boss_krosh_firehandAI(Creature* c) : ScriptedAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } uint32 GreaterFireball_Timer; uint32 SpellShield_Timer; uint32 BlastWave_Timer; - InstanceScript* pInstance; + InstanceScript* instance; void Reset() { @@ -695,40 +695,40 @@ public: BlastWave_Timer = 20000; //reset encounter - if (pInstance) - pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } void EnterCombat(Unit* who) { - if (pInstance) + if (instance) { - pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); - pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); + instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); + instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); } } void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { Creature* Maulgar = NULL; - Maulgar = (Unit::GetCreature((*me), pInstance->GetData64(DATA_MAULGAR))); + Maulgar = (Unit::GetCreature((*me), instance->GetData64(DATA_MAULGAR))); if (Maulgar) CAST_AI(boss_high_king_maulgar::boss_high_king_maulgarAI, Maulgar->AI())->AddDeath(); - if (CheckAllBossDied(pInstance, me)) - pInstance->SetData(DATA_MAULGAREVENT, DONE); + if (CheckAllBossDied(instance, me)) + instance->SetData(DATA_MAULGAREVENT, DONE); } } void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) + if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK)); if (target) { @@ -741,7 +741,7 @@ public: return; //someone evaded! - if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT)) + if (instance && !instance->GetData(DATA_MAULGAREVENT)) { EnterEvadeMode(); return; diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index b0dbdcb94da..1666e9adb9c 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -38,14 +38,14 @@ class instance_gruuls_lair : public InstanceMapScript public: instance_gruuls_lair() : InstanceMapScript("instance_gruuls_lair", 565) { } - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_gruuls_lair_InstanceMapScript(pMap); + return new instance_gruuls_lair_InstanceMapScript(map); } struct instance_gruuls_lair_InstanceMapScript : public InstanceScript { - instance_gruuls_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_gruuls_lair_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 832417fbeb2..75de303a3d8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -50,10 +50,10 @@ class boss_broggok : public CreatureScript { boss_broggokAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AcidSpray_Timer; uint32 PoisonSpawn_Timer; @@ -64,20 +64,20 @@ class boss_broggok : public CreatureScript AcidSpray_Timer = 10000; PoisonSpawn_Timer = 5000; PoisonBolt_Timer = 7000; - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); + instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); + instance->HandleGameObject(instance->GetData64(DATA_DOOR4), true); } } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), false); + instance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS); + instance->HandleGameObject(instance->GetData64(DATA_DOOR4), false); } } @@ -123,11 +123,11 @@ class boss_broggok : public CreatureScript void JustDied(Unit* /*who*/) { - if (pInstance) + if (instance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR5), true); - pInstance->SetData(TYPE_BROGGOK_EVENT, DONE); + instance->HandleGameObject(instance->GetData64(DATA_DOOR4), true); + instance->HandleGameObject(instance->GetData64(DATA_DOOR5), true); + instance->SetData(TYPE_BROGGOK_EVENT, DONE); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 23b2ed5ca2b..4bc273ece8f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -80,12 +80,12 @@ class boss_kelidan_the_breaker : public CreatureScript { boss_kelidan_the_breakerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); for (uint8 i=0; i<5; ++i) Channelers[i] = 0; } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ShadowVolley_Timer; uint32 BurningNova_Timer; @@ -105,8 +105,8 @@ class boss_kelidan_the_breaker : public CreatureScript Firenova = false; addYell = false; SummonChannelers(); - if (pInstance) - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); + if (instance) + instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } void EnterCombat(Unit* who) @@ -115,8 +115,8 @@ class boss_kelidan_the_breaker : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); DoStartMovement(who); - if (pInstance) - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) @@ -187,12 +187,12 @@ class boss_kelidan_the_breaker : public CreatureScript { DoScriptText(SAY_DIE, me); - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR1), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR6), true); + instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE); + instance->HandleGameObject(instance->GetData64(DATA_DOOR1), true); + instance->HandleGameObject(instance->GetData64(DATA_DOOR6), true); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 5820d789f12..49054f51241 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -54,10 +54,10 @@ class boss_the_maker : public CreatureScript { boss_the_makerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 AcidSpray_Timer; uint32 ExplodingBreaker_Timer; @@ -71,22 +71,22 @@ class boss_the_maker : public CreatureScript Domination_Timer = 120000; Knockdown_Timer = 10000; - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); + instance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED); + instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); } void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false); + instance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS); + instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false); } void KilledUnit(Unit* /*victim*/) @@ -98,12 +98,12 @@ class boss_the_maker : public CreatureScript { DoScriptText(SAY_DIE, me); - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true); + instance->SetData(TYPE_THE_MAKER_EVENT, DONE); + instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); + instance->HandleGameObject(instance->GetData64(DATA_DOOR3), true); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 3a10da0f454..7754cb1339d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -40,7 +40,7 @@ class instance_blood_furnace : public InstanceMapScript struct instance_blood_furnace_InstanceMapScript : public InstanceScript { - instance_blood_furnace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_blood_furnace_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 The_MakerGUID; uint64 BroggokGUID; @@ -226,9 +226,9 @@ class instance_blood_furnace : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_blood_furnace_InstanceMapScript(pMap); + return new instance_blood_furnace_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 1436c664e9f..b25b3806823 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -36,7 +36,7 @@ class instance_ramparts : public InstanceMapScript struct instance_ramparts_InstanceMapScript : public InstanceScript { - instance_ramparts_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; uint64 m_uiChestNGUID; @@ -90,9 +90,9 @@ class instance_ramparts : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_ramparts_InstanceMapScript(pMap); + return new instance_ramparts_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index cbcde257a1d..6918a076f6e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -217,14 +217,14 @@ class boss_magtheridon : public CreatureScript { boss_magtheridonAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); } CubeMap Cube; - InstanceScript* pInstance; + InstanceScript* instance; uint32 Berserk_Timer; uint32 Quake_Timer; @@ -259,10 +259,10 @@ class boss_magtheridon : public CreatureScript void JustReachedHome() { - if (pInstance) + if (instance) { - pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); - pInstance->SetData(DATA_COLLAPSE, false); + instance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); + instance->SetData(DATA_COLLAPSE, false); } } @@ -324,8 +324,8 @@ class boss_magtheridon : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (pInstance) - pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE); + if (instance) + instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); DoScriptText(SAY_DEATH, me); } @@ -340,8 +340,8 @@ class boss_magtheridon : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); DoZoneInCombat(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -438,8 +438,8 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_CAMERA_SHAKE, true); DoCast(me, SPELL_DEBRIS_KNOCKDOWN, true); - if (pInstance) - pInstance->SetData(DATA_COLLAPSE, true); + if (instance) + instance->SetData(DATA_COLLAPSE, true); } if (Phase3) @@ -483,10 +483,10 @@ class mob_hellfire_channeler : public CreatureScript { mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 ShadowBoltVolley_Timer; uint32 DarkMending_Timer; @@ -507,8 +507,8 @@ class mob_hellfire_channeler : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); me->InterruptNonMeleeSpells(false); DoZoneInCombat(); @@ -516,8 +516,8 @@ class mob_hellfire_channeler : public CreatureScript void JustReachedHome() { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); DoCast(me, SPELL_SHADOW_GRASP_C, false); } @@ -535,8 +535,8 @@ class mob_hellfire_channeler : public CreatureScript void JustDied(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, DONE); + if (instance) + instance->SetData(DATA_CHANNELER_EVENT, DONE); } void UpdateAI(const uint32 diff) @@ -599,14 +599,14 @@ public: bool OnGossipHello(Player* player, GameObject* pGO) { - InstanceScript* pInstance = pGO->GetInstanceScript(); + InstanceScript* instance = pGO->GetInstanceScript(); - if (!pInstance) + if (!instance) return true; - if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) + if (instance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; - Creature* Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON)); + Creature* Magtheridon =Unit::GetCreature(*pGO, instance->GetData64(DATA_MAGTHERIDON)); if (!Magtheridon || !Magtheridon->isAlive()) return true; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index cd463376ee9..7461bb5ceee 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -50,7 +50,7 @@ class instance_magtheridons_lair : public InstanceMapScript struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript { - instance_magtheridons_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) + instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map) { } @@ -250,9 +250,9 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_magtheridons_lair_InstanceMapScript(pMap); + return new instance_magtheridons_lair_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 2bf7485ea02..4c051f46945 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -91,10 +91,10 @@ class boss_grand_warlock_nethekurse : public CreatureScript { boss_grand_warlock_nethekurseAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool IntroOnce; bool IsIntroEvent; @@ -193,8 +193,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript IntroOnce = true; IsIntroEvent = true; - if (pInstance) - pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } if (IsIntroEvent || !IsMainEvent) @@ -228,21 +228,21 @@ class boss_grand_warlock_nethekurse : public CreatureScript { DoScriptText(SAY_DIE, me); - if (!pInstance) + if (!instance) return; - pInstance->SetData(TYPE_NETHEKURSE, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true); + instance->SetData(TYPE_NETHEKURSE, DONE); + instance->HandleGameObject(instance->GetData64(DATA_NETHEKURSE_DOOR), true); } void UpdateAI(const uint32 diff) { if (IsIntroEvent) { - if (!pInstance) + if (!instance) return; - if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) + if (instance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) { if (IntroEvent_Timer <= diff) DoTauntPeons(); @@ -320,10 +320,10 @@ class mob_fel_orc_convert : public CreatureScript { mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Hemorrhage_Timer; void Reset() @@ -338,19 +338,19 @@ class mob_fel_orc_convert : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData64(DATA_NETHEKURSE)) + if (instance->GetData64(DATA_NETHEKURSE)) { - Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)); + Creature* pKurse = Unit::GetCreature(*me, instance->GetData64(DATA_NETHEKURSE)); if (pKurse && me->IsWithinDist(pKurse, 45.0f)) { CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); - if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) + if (instance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) return; else - pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); + instance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } } } @@ -358,12 +358,12 @@ class mob_fel_orc_convert : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (pInstance) + if (instance) { - if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) + if (instance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) return; - if (pInstance->GetData64(DATA_NETHEKURSE)) - if (Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE))) + if (instance->GetData64(DATA_NETHEKURSE)) + if (Creature* pKurse = Unit::GetCreature(*me, instance->GetData64(DATA_NETHEKURSE))) CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index f4f6a6fb221..3f542ce76e4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -164,10 +164,10 @@ class boss_warbringer_omrogg : public CreatureScript { LeftHeadGUID = 0; RightHeadGUID = 0; - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint64 LeftHeadGUID; uint64 RightHeadGUID; @@ -215,8 +215,8 @@ class boss_warbringer_omrogg : public CreatureScript ThunderClap_Timer = 15000; ResetThreat_Timer = 30000; - if (pInstance) - pInstance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid. + if (instance) + instance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid. } void DoYellForThreat() @@ -252,8 +252,8 @@ class boss_warbringer_omrogg : public CreatureScript AggroYell = true; } - if (pInstance) - pInstance->SetData(TYPE_OMROGG, IN_PROGRESS); + if (instance) + instance->SetData(TYPE_OMROGG, IN_PROGRESS); } void JustSummoned(Creature* summoned) @@ -307,8 +307,8 @@ class boss_warbringer_omrogg : public CreatureScript CAST_AI(mob_omrogg_heads::mob_omrogg_headsAI, CAST_CRE(pRightHead)->AI())->DoDeathYell(); - if (pInstance) - pInstance->SetData(TYPE_OMROGG, DONE); + if (instance) + instance->SetData(TYPE_OMROGG, DONE); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index b70ad851536..e8f7844bfc5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -39,7 +39,7 @@ class instance_shattered_halls : public InstanceMapScript } struct instance_shattered_halls_InstanceMapScript : public InstanceScript { - instance_shattered_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; uint64 nethekurseGUID; @@ -111,9 +111,9 @@ class instance_shattered_halls : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_shattered_halls_InstanceMapScript(pMap); + return new instance_shattered_halls_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 9ca982a940c..19280bd71f5 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -82,11 +82,11 @@ class boss_alar : public CreatureScript { boss_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); DefaultMoveSpeedRate = creature->GetSpeedRate(MOVE_RUN); } - InstanceScript* pInstance; + InstanceScript* instance; WaitEventType WaitEvent; uint32 WaitTimer; @@ -110,8 +110,8 @@ class boss_alar : public CreatureScript void Reset() { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_ALAREVENT, NOT_STARTED); Berserk_Timer = 1200000; Platforms_Move_Timer = 0; @@ -137,8 +137,8 @@ class boss_alar : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_ALAREVENT, IN_PROGRESS); me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); // after enterevademode will be set walk movement DoZoneInCombat(); @@ -147,8 +147,8 @@ class boss_alar : public CreatureScript void JustDied(Unit* /*victim*/) { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, DONE); + if (instance) + instance->SetData(DATA_ALAREVENT, DONE); } void JustSummoned(Creature* summon) @@ -469,12 +469,12 @@ class mob_ember_of_alar : public CreatureScript { mob_ember_of_alarAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - InstanceScript* pInstance; + InstanceScript* instance; bool toDie; void Reset() @@ -498,9 +498,9 @@ class mob_ember_of_alar : public CreatureScript DoCast(me, SPELL_EMBER_BLAST, true); me->SetDisplayId(11686); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (pInstance && pInstance->GetData(DATA_ALAREVENT) == 2) + if (instance && instance->GetData(DATA_ALAREVENT) == 2) { - if (Unit* Alar = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALAR))) + if (Unit* Alar = Unit::GetUnit((*me), instance->GetData64(DATA_ALAR))) { int32 AlarHealth = int32(Alar->GetHealth()) - int32(Alar->CountPctFromMaxHealth(3)); if (AlarHealth > 0) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 51c336af375..f079f68d943 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -85,13 +85,13 @@ class boss_high_astromancer_solarian : public CreatureScript { boss_high_astromancer_solarianAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); defaultarmor = creature->GetArmor(); defaultsize = creature->GetFloatValue(OBJECT_FIELD_SCALE_X); } - InstanceScript* pInstance; + InstanceScript* instance; SummonList Summons; uint8 Phase; @@ -130,8 +130,8 @@ class boss_high_astromancer_solarian : public CreatureScript Wrath_Timer = 20000+rand()%5000;//twice in phase one Phase = 1; - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); me->SetArmor(defaultarmor); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -152,8 +152,8 @@ class boss_high_astromancer_solarian : public CreatureScript me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); me->SetDisplayId(MODEL_HUMAN); DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); + if (instance) + instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } void EnterCombat(Unit* /*who*/) @@ -161,8 +161,8 @@ class boss_high_astromancer_solarian : public CreatureScript DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); } void SummonMinion(uint32 entry, float x, float y, float z) @@ -418,10 +418,10 @@ class mob_solarium_priest : public CreatureScript { mob_solarium_priestAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 healTimer; uint32 holysmiteTimer; @@ -449,8 +449,8 @@ class mob_solarium_priest : public CreatureScript switch (urand(0, 1)) { case 0: - if (pInstance) - target = Unit::GetUnit((*me), pInstance->GetData64(DATA_ASTROMANCER)); + if (instance) + target = Unit::GetUnit((*me), instance->GetData64(DATA_ASTROMANCER)); break; case 1: target = me; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 12da67f94b5..52a23196ee0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -147,11 +147,11 @@ struct advisorbase_ai : public ScriptedAI { advisorbase_ai(Creature* creature) : ScriptedAI(creature) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); m_bDoubled_Health = false; } - InstanceScript* m_pInstance; + InstanceScript* m_instance; bool FakeDeath; bool m_bDoubled_Health; uint32 DelayRes_Timer; @@ -174,8 +174,8 @@ struct advisorbase_ai : public ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //reset encounter - if (m_pInstance && (m_pInstance->GetData(DATA_KAELTHASEVENT) == 1 || m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)) - if (Creature* Kaelthas = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_KAELTHAS))) + if (m_instance && (m_instance->GetData(DATA_KAELTHASEVENT) == 1 || m_instance->GetData(DATA_KAELTHASEVENT) == 3)) + if (Creature* Kaelthas = Unit::GetCreature((*me), m_instance->GetData64(DATA_KAELTHAS))) Kaelthas->AI()->EnterEvadeMode(); } @@ -214,14 +214,14 @@ struct advisorbase_ai : public ScriptedAI return; //Prevent glitch if in fake death - if (FakeDeath && m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) + if (FakeDeath && m_instance && m_instance->GetData(DATA_KAELTHASEVENT) != 0) { damage = 0; return; } //Don't really die in phase 1 & 3, only die after that - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) + if (m_instance && m_instance->GetData(DATA_KAELTHASEVENT) != 0) { //prevent death damage = 0; @@ -280,11 +280,11 @@ class boss_kaelthas : public CreatureScript { boss_kaelthasAI(Creature* creature) : ScriptedAI(creature), summons(me) { - m_pInstance = creature->GetInstanceScript(); + m_instance = creature->GetInstanceScript(); memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); } - InstanceScript* m_pInstance; + InstanceScript* m_instance; uint32 Fireball_Timer; uint32 ArcaneDisruption_Timer; @@ -335,8 +335,8 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 0); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 0); } void PrepareAdvisors() @@ -355,13 +355,13 @@ class boss_kaelthas : public CreatureScript void StartEvent() { - if (!m_pInstance) + if (!m_instance) return; - m_auiAdvisorGuid[0] = m_pInstance->GetData64(DATA_THALADREDTHEDARKENER); - m_auiAdvisorGuid[1] = m_pInstance->GetData64(DATA_LORDSANGUINAR); - m_auiAdvisorGuid[2] = m_pInstance->GetData64(DATA_GRANDASTROMANCERCAPERNIAN); - m_auiAdvisorGuid[3] = m_pInstance->GetData64(DATA_MASTERENGINEERTELONICUS); + m_auiAdvisorGuid[0] = m_instance->GetData64(DATA_THALADREDTHEDARKENER); + m_auiAdvisorGuid[1] = m_instance->GetData64(DATA_LORDSANGUINAR); + m_auiAdvisorGuid[2] = m_instance->GetData64(DATA_GRANDASTROMANCERCAPERNIAN); + m_auiAdvisorGuid[3] = m_instance->GetData64(DATA_MASTERENGINEERTELONICUS); if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3]) { @@ -371,7 +371,7 @@ class boss_kaelthas : public CreatureScript Phase = 4; - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + m_instance->SetData(DATA_KAELTHASEVENT, 4); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -386,7 +386,7 @@ class boss_kaelthas : public CreatureScript DoScriptText(SAY_INTRO, me); - m_pInstance->SetData(DATA_KAELTHASEVENT, 1); + m_instance->SetData(DATA_KAELTHASEVENT, 1); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); PhaseSubphase = 0; @@ -412,7 +412,7 @@ class boss_kaelthas : public CreatureScript } else if (me->GetMap()->IsDungeon()) { - if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) + if (m_instance && !m_instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); who->SetInCombatWith(me); @@ -424,7 +424,7 @@ class boss_kaelthas : public CreatureScript void EnterCombat(Unit* /*who*/) { - if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) + if (m_instance && !m_instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); } @@ -456,8 +456,8 @@ class boss_kaelthas : public CreatureScript summons.DespawnAll(); - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 0); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 0); for (uint8 i = 0; i < MAX_ADVISORS; ++i) { @@ -621,8 +621,8 @@ class boss_kaelthas : public CreatureScript if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) { Phase = 2; - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 2); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 2); DoScriptText(SAY_PHASE2_WEAPON, me); @@ -666,8 +666,8 @@ class boss_kaelthas : public CreatureScript if (Phase_Timer <= diff) { DoScriptText(SAY_PHASE3_ADVANCE, me); - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 3); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 3); Phase = 3; PhaseSubphase = 0; } @@ -704,8 +704,8 @@ class boss_kaelthas : public CreatureScript DoScriptText(SAY_PHASE4_INTRO2, me); Phase = 4; - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 4); // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael. DoResetThreat(); @@ -809,8 +809,8 @@ class boss_kaelthas : public CreatureScript { if (HealthBelowPct(50)) { - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + if (m_instance) + m_instance->SetData(DATA_KAELTHASEVENT, 4); Phase = 5; Phase_Timer = 10000; @@ -1044,7 +1044,7 @@ class boss_thaladred_the_darkener : public CreatureScript void JustDied(Unit* /*killer*/) { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + if (m_instance && m_instance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_THALADRED_DEATH, me); } @@ -1136,7 +1136,7 @@ class boss_lord_sanguinar : public CreatureScript void JustDied(Unit* /*Killer*/) { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + if (m_instance && m_instance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_SANGUINAR_DEATH, me); } @@ -1201,7 +1201,7 @@ class boss_grand_astromancer_capernian : public CreatureScript void JustDied(Unit* /*killer*/) { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + if (m_instance && m_instance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_CAPERNIAN_DEATH, me); } @@ -1340,7 +1340,7 @@ class boss_master_engineer_telonicus : public CreatureScript void JustDied(Unit* /*killer*/) { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + if (m_instance && m_instance->GetData(DATA_KAELTHASEVENT) == 3) DoScriptText(SAY_TELONICUS_DEATH, me); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index add35e75dad..e2a2176de5f 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -55,10 +55,10 @@ class boss_void_reaver : public CreatureScript { boss_void_reaverAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 Pounding_Timer; uint32 ArcaneOrb_Timer; @@ -76,8 +76,8 @@ class boss_void_reaver : public CreatureScript Enraged = false; - if (pInstance && me->isAlive()) - pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); + if (instance && me->isAlive()) + instance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } void KilledUnit(Unit* /*victim*/) @@ -90,16 +90,16 @@ class boss_void_reaver : public CreatureScript DoScriptText(SAY_DEATH, me); DoZoneInCombat(); - if (pInstance) - pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); + if (instance) + instance->SetData(DATA_VOIDREAVEREVENT, DONE); } void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 2ac4f49d995..f5a7bad0d8e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -45,7 +45,7 @@ class instance_the_eye : public InstanceMapScript struct instance_the_eye_InstanceMapScript : public InstanceScript { - instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) {} uint64 ThaladredTheDarkener; uint64 LordSanguinar; @@ -194,9 +194,9 @@ class instance_the_eye : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_the_eye_InstanceMapScript(pMap); + return new instance_the_eye_InstanceMapScript(map); } }; void AddSC_instance_the_eye() diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 5ad4eeb26a5..05bf711432d 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -63,10 +63,10 @@ class boss_nethermancer_sepethrea : public CreatureScript { boss_nethermancer_sepethreaAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 frost_attack_Timer; uint32 arcane_blast_Timer; @@ -82,14 +82,14 @@ class boss_nethermancer_sepethrea : public CreatureScript knockback_Timer = 22000 + rand()%6000; solarburn_Timer = 30000; - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); + if (instance) + instance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); } void EnterCombat(Unit* who) { - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, me); DoCast(who, SPELL_SUMMON_RAGIN_FLAMES); @@ -104,8 +104,8 @@ class boss_nethermancer_sepethrea : public CreatureScript void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, DONE); + if (instance) + instance->SetData(DATA_NETHERMANCER_EVENT, DONE); } void UpdateAI(const uint32 diff) @@ -185,10 +185,10 @@ class mob_ragin_flames : public CreatureScript { mob_ragin_flamesAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 inferno_Timer; uint32 flame_timer; @@ -216,9 +216,9 @@ class mob_ragin_flames : public CreatureScript //Check_Timer if (Check_Timer <= diff) { - if (pInstance) + if (instance) { - if (pInstance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS) + if (instance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS) { //remove me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 883585c0c2a..ef48ebbcf11 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -38,7 +38,7 @@ class instance_mechanar : public InstanceMapScript struct instance_mechanar_InstanceMapScript : public InstanceScript { - instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_mechanar_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; @@ -80,9 +80,9 @@ class instance_mechanar : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_mechanar_InstanceMapScript(pMap); + return new instance_mechanar_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index eeb2f069ed7..d811390e3d0 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -78,10 +78,10 @@ class npc_millhouse_manastorm : public CreatureScript { npc_millhouse_manastormAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; uint32 EventProgress_Timer; uint32 Phase; @@ -101,12 +101,12 @@ class npc_millhouse_manastorm : public CreatureScript Pyroblast_Timer = 1000; Fireball_Timer = 2500; - if (pInstance) + if (instance) { - if (pInstance->GetData(TYPE_WARDEN_2) == DONE) + if (instance->GetData(TYPE_WARDEN_2) == DONE) Init = true; - if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == DONE) + if (instance->GetData(TYPE_HARBINGERSKYRISS) == DONE) DoScriptText(SAY_COMPLETE, me); } } @@ -134,7 +134,7 @@ class npc_millhouse_manastorm : public CreatureScript DoScriptText(SAY_DEATH, me); /*for questId 10886 (heroic mode only) - if (pInstance && pInstance->GetData(TYPE_HARBINGERSKYRISS) != DONE) + if (instance && instance->GetData(TYPE_HARBINGERSKYRISS) != DONE) ->FailQuest();*/ } @@ -176,8 +176,8 @@ class npc_millhouse_manastorm : public CreatureScript EventProgress_Timer = 6000; break; case 7: - if (pInstance) - pInstance->SetData(TYPE_WARDEN_2, DONE); + if (instance) + instance->SetData(TYPE_WARDEN_2, DONE); Init = true; break; } @@ -282,10 +282,10 @@ class npc_warden_mellichar : public CreatureScript { npc_warden_mellicharAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; bool IsRunning; bool CanSpawn; @@ -304,8 +304,8 @@ class npc_warden_mellichar : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); DoCast(me, SPELL_TARGET_OMEGA); - if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); + if (instance) + instance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } void AttackStart(Unit* /*who*/) {} @@ -333,31 +333,31 @@ class npc_warden_mellichar : public CreatureScript DoScriptText(YELL_INTRO1, me); DoCast(me, SPELL_BUBBLE_VISUAL); - if (pInstance) + if (instance) { - pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); + instance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS); + instance->HandleGameObject(instance->GetData64(DATA_SPHERE_SHIELD), false); IsRunning = true; } } bool CanProgress() { - if (pInstance) + if (instance) { - if (Phase == 7 && pInstance->GetData(TYPE_WARDEN_4) == DONE) + if (Phase == 7 && instance->GetData(TYPE_WARDEN_4) == DONE) return true; - if (Phase == 6 && pInstance->GetData(TYPE_WARDEN_3) == DONE) + if (Phase == 6 && instance->GetData(TYPE_WARDEN_3) == DONE) return true; - if (Phase == 5 && pInstance->GetData(TYPE_WARDEN_2) == DONE) + if (Phase == 5 && instance->GetData(TYPE_WARDEN_2) == DONE) return true; if (Phase == 4) return true; - if (Phase == 3 && pInstance->GetData(TYPE_WARDEN_1) == DONE) + if (Phase == 3 && instance->GetData(TYPE_WARDEN_1) == DONE) return true; - if (Phase == 2 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS) + if (Phase == 2 && instance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS) return true; - if (Phase == 1 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS) + if (Phase == 1 && instance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS) return true; return false; } @@ -366,7 +366,7 @@ class npc_warden_mellichar : public CreatureScript void DoPrepareForPhase() { - if (pInstance) + if (instance) { me->InterruptNonMeleeSpells(true); me->RemoveAurasByType(SPELL_AURA_DUMMY); @@ -375,23 +375,23 @@ class npc_warden_mellichar : public CreatureScript { case 2: DoCast(me, SPELL_TARGET_ALPHA); - pInstance->SetData(TYPE_WARDEN_1, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); + instance->SetData(TYPE_WARDEN_1, IN_PROGRESS); + instance->HandleGameObject(instance->GetData64(DATA_SPHERE_SHIELD), false); break; case 3: DoCast(me, SPELL_TARGET_BETA); - pInstance->SetData(TYPE_WARDEN_2, IN_PROGRESS); + instance->SetData(TYPE_WARDEN_2, IN_PROGRESS); break; case 5: DoCast(me, SPELL_TARGET_DELTA); - pInstance->SetData(TYPE_WARDEN_3, IN_PROGRESS); + instance->SetData(TYPE_WARDEN_3, IN_PROGRESS); break; case 6: DoCast(me, SPELL_TARGET_GAMMA); - pInstance->SetData(TYPE_WARDEN_4, IN_PROGRESS); + instance->SetData(TYPE_WARDEN_4, IN_PROGRESS); break; case 7: - pInstance->SetData(TYPE_WARDEN_5, IN_PROGRESS); + instance->SetData(TYPE_WARDEN_5, IN_PROGRESS); break; } CanSpawn = true; @@ -405,9 +405,9 @@ class npc_warden_mellichar : public CreatureScript if (EventProgress_Timer <= diff) { - if (pInstance) + if (instance) { - if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == FAIL) + if (instance->GetData(TYPE_HARBINGERSKYRISS) == FAIL) { Reset(); return; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index cf81f7fb1ba..d2375f377c4 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -69,11 +69,11 @@ class boss_harbinger_skyriss : public CreatureScript { boss_harbinger_skyrissAI(Creature* creature) : ScriptedAI(creature) { - pInstance = creature->GetInstanceScript(); + instance = creature->GetInstanceScript(); Intro = false; } - InstanceScript* pInstance; + InstanceScript* instance; bool Intro; bool IsImage33; @@ -115,8 +115,8 @@ class boss_harbinger_skyriss : public CreatureScript void JustDied(Unit* /*Killer*/) { DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE); + if (instance) + instance->SetData(TYPE_HARBINGERSKYRISS, DONE); } void JustSummoned(Creature* summon) @@ -158,7 +158,7 @@ class boss_harbinger_skyriss : public CreatureScript { if (!Intro) { - if (!pInstance) + if (!instance) return; if (Intro_Timer <= diff) @@ -167,18 +167,18 @@ class boss_harbinger_skyriss : public CreatureScript { case 1: DoScriptText(SAY_INTRO, me); - pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), true); + instance->HandleGameObject(instance->GetData64(DATA_SPHERE_SHIELD), true); ++Intro_Phase; Intro_Timer = 25000; break; case 2: DoScriptText(SAY_AGGRO, me); - if (Unit* mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR))) + if (Unit* mellic = Unit::GetUnit(*me, instance->GetData64(DATA_MELLICHAR))) { //should have a better way to do this. possibly spell exist. mellic->setDeathState(JUST_DIED); mellic->SetHealth(0); - pInstance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS); + instance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS); } ++Intro_Phase; Intro_Timer = 3000; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 25956fde3d2..0988f6ffeb9 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -59,7 +59,7 @@ class instance_arcatraz : public InstanceMapScript } struct instance_arcatraz_InstanceMapScript : public InstanceScript { - instance_arcatraz_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {} + instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map) {} uint32 m_auiEncounter[MAX_ENCOUNTER]; @@ -227,9 +227,9 @@ class instance_arcatraz : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* pMap) const + InstanceScript* GetInstanceScript(InstanceMap* map) const { - return new instance_arcatraz_InstanceMapScript(pMap); + return new instance_arcatraz_InstanceMapScript(map); } }; diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index b73d2f81fb6..f94a7d2725c 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -385,11 +385,11 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { - switch (pGo->GetEntry()) + switch (go->GetEntry()) { case LEGION_OBELISK_ONE: obelisk_one = true; @@ -410,7 +410,7 @@ public: if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true) { - pGo->SummonCreature(19963, 2943.40f, 4778.20f, 284.49f, 0.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + go->SummonCreature(19963, 2943.40f, 4778.20f, 284.49f, 0.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); //reset global var obelisk_one = false; obelisk_two = false; diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 699a1ef49bc..e28e1c3c685 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -210,9 +210,9 @@ class go_haaleshi_altar : public GameObjectScript public: go_haaleshi_altar() : GameObjectScript("go_haaleshi_altar") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - pGo->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); + go->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; } diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 3a060cf107f..b639050320c 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -565,16 +565,16 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_TOTEM_KARDASH_H) + if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { if (npc_maghar_captiveAI* pEscortAI = dynamic_cast<npc_maghar_captiveAI*>(creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); creature->setFaction(232); - pEscortAI->Start(true, false, player->GetGUID(), pQuest); + pEscortAI->Start(true, false, player->GetGUID(), quest); DoScriptText(SAY_MAG_START, creature); @@ -618,8 +618,8 @@ public: case 7: DoScriptText(SAY_MAG_MORE, me); - if (Creature* pTemp = me->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushB[0], m_afAmbushB[1], m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000)) - DoScriptText(SAY_MAG_MORE_REPLY, pTemp); + if (Creature* temp = me->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushB[0], m_afAmbushB[1], m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000)) + DoScriptText(SAY_MAG_MORE_REPLY, temp); me->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushB[0]-2.5f, m_afAmbushB[1]-2.5f, m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -651,7 +651,7 @@ public: } - void SpellHitTarget(Unit* /*pTarget*/, const SpellInfo* pSpell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) { if (pSpell->Id == SPELL_CHAIN_LIGHTNING) { diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 2ae0cce2ba2..5f2626c0039 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -141,8 +141,8 @@ public: if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + if (GameObject* go = GameObject::GetGameObject((*me), goConsole)) + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } } @@ -277,8 +277,8 @@ public: } if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + if (GameObject* go = GameObject::GetGameObject((*me), goConsole)) + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } ++Phase; break; @@ -307,17 +307,17 @@ class go_manaforge_control_console : public GameObjectScript public: go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { - if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - player->PrepareQuestMenu(pGo->GetGUID()); - player->SendPreparedQuest(pGo->GetGUID()); + player->PrepareQuestMenu(go->GetGUID()); + player->SendPreparedQuest(go->GetGUID()); } Creature* manaforge = NULL; - switch (pGo->GetAreaId()) + switch (go->GetAreaId()) { case 3726: //b'naar if ((player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && @@ -344,8 +344,8 @@ public: if (manaforge) { CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = player->GetGUID(); - CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + CAST_AI(npc_manaforge_control_console::npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = go->GetGUID(); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } return true; } @@ -1032,9 +1032,9 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) + if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, creature->AI())) { diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 327964e7b1e..31aea5ea576 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -131,7 +131,7 @@ public: { if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = unit->FindNearestGameObject(GO_CARCASS, 10)) + if (GameObject* go = unit->FindNearestGameObject(GO_CARCASS, 10)) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); @@ -139,7 +139,7 @@ public: me->GetMotionMaster()->MoveIdle(); me->StopMoving(); - me->GetMotionMaster()->MovePoint(POINT_ID, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ()); + me->GetMotionMaster()->MovePoint(POINT_ID, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ()); } } bCanEat = false; @@ -153,8 +153,8 @@ public: { pPlr->KilledMonsterCredit(NPC_EVENT_PINGER, 0); - if (GameObject* pGo = pPlr->FindNearestGameObject(GO_CARCASS, 10)) - pGo->Delete(); + if (GameObject* go = pPlr->FindNearestGameObject(GO_CARCASS, 10)) + go->Delete(); } Reset(); @@ -914,15 +914,15 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) { - if (pQuest->GetQuestId() == QUEST_ESCAPE_COILSCAR) + if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { DoScriptText(SAY_WIL_START, creature, player); creature->setFaction(FACTION_EARTHEN); if (npc_earthmender_wildaAI* pEscortAI = CAST_AI(npc_earthmender_wilda::npc_earthmender_wildaAI, creature->AI())) - pEscortAI->Start(false, false, player->GetGUID(), pQuest); + pEscortAI->Start(false, false, player->GetGUID(), quest); } return true; } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 2dec7ab191d..91fae26ec74 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -548,17 +548,17 @@ class go_skull_pile : public GameObjectScript public: go_skull_pile() : GameObjectScript("go_skull_pile") { } - bool OnGossipSelect(Player* player, GameObject* pGo, uint32 uiSender, uint32 uiAction) + bool OnGossipSelect(Player* player, GameObject* go, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu(player, pGo, uiAction); break; + case GOSSIP_SENDER_MAIN: SendActionMenu(player, go, uiAction); break; } return true; } - bool OnGossipHello(Player* player, GameObject* pGo) + bool OnGossipHello(Player* player, GameObject* go) { if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { @@ -568,11 +568,11 @@ public: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); } - player->SEND_GOSSIP_MENU(pGo->GetGOInfo()->questgiver.gossipID, pGo->GetGUID()); + player->SEND_GOSSIP_MENU(go->GetGOInfo()->questgiver.gossipID, go->GetGUID()); return true; } - void SendActionMenu(Player* player, GameObject* /*pGo*/, uint32 uiAction) + void SendActionMenu(Player* player, GameObject* /*go*/, uint32 uiAction) { switch (uiAction) { @@ -645,9 +645,9 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) + if (quest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { if (npc_akunoAI* pEscortAI = CAST_AI(npc_akuno::npc_akunoAI, creature->AI())) pEscortAI->Start(false, false, player->GetGUID()); diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index ddffcb53e61..9aecbeb67be 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -356,9 +356,9 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM) + if (quest->GetQuestId() == QUEST_ESCAPE_FROM) { DoScriptText(SAY_START, creature, player); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 6c54d130e53..a9ed794ab45 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -99,9 +99,9 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { - if (GameObject* pGo = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) - if (pGo->getLootState() == GO_READY) - pGo->UseDoorOrButton(); + if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) + if (go->getLootState() == GO_READY) + go->UseDoorOrButton(); return false; } diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index aa272d8157b..cdeac03d76e 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1179,9 +1179,9 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* /*player*/, GameObject* pGo) + bool OnGossipHello(Player* /*player*/, GameObject* go) { - pGo->SetLootState(GO_JUST_DEACTIVATED); + go->SetLootState(GO_JUST_DEACTIVATED); return true; } }; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index c7dfd6355ef..4099c03384c 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -261,24 +261,24 @@ public: bool OnUse(Player* player, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { - GameObject* pGo = NULL; + GameObject* go = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) { - pGo = player->FindNearestGameObject(CaribouTraps[i], 5.0f); - if (pGo) + go = player->FindNearestGameObject(CaribouTraps[i], 5.0f); + if (go) break; } - if (!pGo) + if (!go) return false; - if (pGo->FindNearestCreature(NPC_NESINGWARY_TRAPPER, 10.0f, true) || pGo->FindNearestCreature(NPC_NESINGWARY_TRAPPER, 10.0f, false) || pGo->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 2.0f)) + if (go->FindNearestCreature(NPC_NESINGWARY_TRAPPER, 10.0f, true) || go->FindNearestCreature(NPC_NESINGWARY_TRAPPER, 10.0f, false) || go->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 2.0f)) return true; float x, y, z; - pGo->GetClosePoint(x, y, z, pGo->GetObjectSize() / 3, 7.0f); - pGo->SummonGameObject(GO_HIGH_QUALITY_FUR, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 0, 0, 0, 0, 1000); - if (TempSummon* summon = player->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, pGo->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000)) + go->GetClosePoint(x, y, z, go->GetObjectSize() / 3, 7.0f); + go->SummonGameObject(GO_HIGH_QUALITY_FUR, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 0, 0, 0, 0, 1000); + if (TempSummon* summon = player->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, go->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000)) { summon->SetVisible(false); summon->SetReactState(REACT_PASSIVE); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index c894bf8afb7..a8c0d91b2e6 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2770,4 +2770,18 @@ LevelReq.Auction = 1 LevelReq.Mail = 1 # +# PlayerDump.DisallowPaths +# Description: Disallow using paths in PlayerDump output files +# Default: 1 + +PlayerDump.DisallowPaths = 1 + +# +# PlayerDump.DisallowOverwrite +# Description: Disallow overwriting existing files with PlayerDump +# Default: 1 + +PlayerDump.DisallowOverwrite = 1 + +# ################################################################################################### |