diff options
610 files changed, 12482 insertions, 7456 deletions
diff --git a/sql/updates/world/2011_10_01_00_world_creature_template.sql b/sql/updates/world/2011_10_01_00_world_creature_template.sql new file mode 100644 index 00000000000..14fe26ba476 --- /dev/null +++ b/sql/updates/world/2011_10_01_00_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Fix quest 11162 Challenge to the Black Flight +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~768 WHERE `entry`=23789; -- Smolderwing diff --git a/sql/updates/world/2011_10_01_01_world_gameobject_template.sql b/sql/updates/world/2011_10_01_01_world_gameobject_template.sql new file mode 100644 index 00000000000..2df109e25e8 --- /dev/null +++ b/sql/updates/world/2011_10_01_01_world_gameobject_template.sql @@ -0,0 +1,9 @@ +UPDATE `gameobject_template` SET `faction`=1732 WHERE `entry`=195139; -- Portal to Stormwind +UPDATE `gameobject_template` SET `faction`=1735 WHERE `entry`=195140; -- Portal to Orgrimmar + +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128|2 WHERE `entry` IN (18967,18968,19230); -- Dark Assault - Alliance/Horde/Legion Portal - Invisible Stalker + +DELETE FROM `gameobject` WHERE `id` IN (195139, 195140); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(164, 195140, 530, 1, 1, -161.3178, 965.4099, 54.29044, 0, 0, 0, 0, 0, 200, 0, 1), -- Portal to Orgrimmar +(170, 195139, 530, 1, 1, -337.4917, 962.6188, 54.28853, 0, 0, 0, 0, 0, 200, 0, 1); -- Portal to Stormwind diff --git a/sql/updates/world/2011_10_01_02_world_game_event_creature.sql b/sql/updates/world/2011_10_01_02_world_game_event_creature.sql new file mode 100644 index 00000000000..9c332ccc3b2 --- /dev/null +++ b/sql/updates/world/2011_10_01_02_world_game_event_creature.sql @@ -0,0 +1,6 @@ +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128|2 WHERE `entry` IN (19871); -- World Trigger (World Trigger (Not Immune NPC)) + +DELETE FROM `game_event_creature` WHERE `guid` IN (62848,62849) AND `eventEntry`=11; +INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES +(11, 62848), +(11, 62849); diff --git a/sql/updates/world/2011_10_01_03_world_conditions.sql b/sql/updates/world/2011_10_01_03_world_conditions.sql new file mode 100644 index 00000000000..832a1d9bdf9 --- /dev/null +++ b/sql/updates/world/2011_10_01_03_world_conditions.sql @@ -0,0 +1,4 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=41058; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(18, 0, 41058, 0, 24, 1, 29625, 0, 0, '', 'Hyldnir Harpoon target Hyldsmeet Proto-Drake'), +(18, 0, 41058, 0, 24, 1, 29754, 0, 0, '', 'Hyldnir Harpoon target Column Ornament'); diff --git a/sql/updates/world/2011_10_01_04_world_sai.sql b/sql/updates/world/2011_10_01_04_world_sai.sql new file mode 100644 index 00000000000..f16e846d2c5 --- /dev/null +++ b/sql/updates/world/2011_10_01_04_world_sai.sql @@ -0,0 +1,9 @@ +-- Fix quest Strength of the Tempest +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=29079; +DELETE FROM `smart_scripts` WHERE `entryorguid`=29079 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(29079,0,0,0,9,0,100,0,0,70,2000,6000,11,53062,0,0,0,0,0,18,70,0,0,0,0,0,0,'Shrine of the Tempest - Range cast Lightning Strike'); -- GUESSING, 10% sure that this is the correct spell. Could 51213 Weather Shrine Active Aura + +DELETE FROM `spell_scripts` WHERE `id`=53062; +INSERT INTO `spell_scripts` (`id`, `effIndex`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(53062, 0, 0, 15, 53067, 2, 0, 0, 0, 0, 0); -- Cast create item spell diff --git a/sql/updates/world/2011_10_01_05_world_sai.sql b/sql/updates/world/2011_10_01_05_world_sai.sql new file mode 100644 index 00000000000..a6380f6c991 --- /dev/null +++ b/sql/updates/world/2011_10_01_05_world_sai.sql @@ -0,0 +1,51 @@ +UPDATE `creature_template` SET `unit_flags`=32768,`equipment_id`=53 WHERE `entry`=24062; -- Wildervar Miner +UPDATE `creature_template` SET `unit_flags`=33536 WHERE `entry`=24178; -- Shatterhorn + +UPDATE `creature_model_info` SET `bounding_radius`=1.25,`combat_reach`=4.375,`gender`=0 WHERE `modelid`=22486; -- Shatterhorn + +DELETE FROM `creature_template_addon` WHERE `entry` IN (24062,24178); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(24062,0,1,257,0, NULL), -- Wildervar Miner +(24178,0,3,1,0, '6606'); -- Shatterhorn, Self Visual - Sleep Until Cancelled (DND) +DELETE FROM `creature_addon` WHERE `guid` IN (120419,120422,106573); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(120419,0,0,0,0,1,''), -- Wildervar Miner, talk +(120422,0,0,0,0,1,''); -- Wildervar Miner, talk + +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; + +-- The ram meat spell may only be used if player is inside the mine +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=43209; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(17,0,43209,0,23,4534,0,0,64,'','Place Ram Meat can only be used in Wildervar Mine'); + +-- Insert missing spell_target_position for Place Ram Meat spell +DELETE FROM `spell_target_position` WHERE `id`=43209; +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(43209,571,2636.288086,-5050.891113,295.537445,5.374982); + +-- Shatterhorn SAI +SET @ENTRY := 24178; +SET @SPELL_GROUND_SMASH := 12734; -- Ground Smash +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Shatterhorn - On Aggro - Say Line 0'), +(@ENTRY,0,1,0,0,0,100,0,3000,5000,12000,13000,11,@SPELL_GROUND_SMASH,1,0,0,0,0,2,0,0,0,0,0,0,0,'Shatterhorn - In Combat - Cast Ground Smash'), +(@ENTRY,0,2,0,6,0,100,0,0,0,0,0,41,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Shatterhorn - Force Despawn 8 Seconds After Death'), +(@ENTRY,0,3,0,8,0,0,0,43209,0,0,0,19,0x300,1,0,0,0,0,1,0,0,0,0,0,0,0,'Shatterhorn - On Place Meat spellhit remove unit flags'), +(@ENTRY,0,4,0,8,0,0,0,43209,0,0,0,28,6606,1,0,0,0,0,1,0,0,0,0,0,0,0,'Shatterhorn - On Place Meat spellhit remove sleep aura'), +(@ENTRY,0,5,0,8,0,0,0,43209,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Shatterhorn - On Place Meat spellhit remove byte1 3'); + +-- Text +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'%s wakes up from the smell of fresh meat!',16,0,100,15,0,0,'Shatterhorn on aggro line and roar at same time'); + +/* Target is null, can't use event_scripts +-- Event send by Place Ram Meat spell +DELETE FROM `event_scripts` WHERE `id`=15739; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES +(15739, 2, 14, 6606, 0, 0, 0, 0, 0, 0), +(15739, 3, 5, 0x6+0x35, 0x300, 0, 0, 0, 0, 0); +*/ diff --git a/sql/updates/world/2011_10_01_06_world_misc.sql b/sql/updates/world/2011_10_01_06_world_misc.sql new file mode 100644 index 00000000000..8bc5e09605e --- /dev/null +++ b/sql/updates/world/2011_10_01_06_world_misc.sql @@ -0,0 +1,32 @@ +-- Fix quest What Illidan Wants, Illidan Gets... +-- Make the npc_text entries work properly +DELETE FROM `gossip_menu` WHERE `entry` IN (8336,8342,8341,8340,8339,8338) AND `text_id` IN (10401,10405,10406,10407,10408,10409); +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(8336,10401), +(8342,10405), +(8341,10406), +(8340,10407), +(8339,10408), +(8338,10409); + +-- Conditions for gossip menu of quest What Illidan Wants, Illidan Gets... +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8336; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,8336,0,0,9,10577,0,0,0,'','Only show first gossip if player is on quest What Illidan Wants, Illidan Gets...'); + +-- Insert options (for players) +DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (8336,8342,8341,8340,8339,8338); +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`) VALUES +(8336,0,0,'I bring word from Lord Illidan.',1,1,8342), +(8342,0,0,'The cipher fragment is to be moved. Have it delivered to Zuluhed.',1,1,8341), +(8341,0,0,'Perhaps you did not hear me, Ruusk. I am giving you an order from Illidan himself!',1,1,8340), +(8340,0,0,'Very well. I will return to the Black Temple and notify Lord Illidan of your unwillingness to carry out his wishes. I suggest you make arrangements with your subordinates and let them know that you will soon be leaving this world.',1,1,8339), +(8339,0,0,'Do I need to go into all the gory details? I think we are both well aware of what Lord Illidan does with those that would oppose his word. Now, I must be going! Farewell, Ruusk! Forever...',1,1,8338), +(8338,0,0,'Ah, good of you to come around, Ruusk. Thank you and farewell.',1,1,0); -- Here the quest credit is given + +-- Commander Ruusk SAI +UPDATE `creature_template` SET `gossip_menu_id`=8336,`AIName`='SmartAI' WHERE `entry`=20563; +DELETE FROM `smart_scripts` WHERE `entryorguid`=20563 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(20563,0,0,1,62,0,100,0,8338,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Commander Ruusk - On Gossip Select - Close Gossip'), +(20563,0,1,0,61,0,100,0,0,0,0,0,26,10577,0,0,0,0,0,7,0,0,0,0,0,0,0,'Commander Ruusk - On Gossip Select (link) - Quest Credit'); diff --git a/sql/updates/world/2011_10_01_07_world_sai.sql b/sql/updates/world/2011_10_01_07_world_sai.sql new file mode 100644 index 00000000000..59ab0e98d1b --- /dev/null +++ b/sql/updates/world/2011_10_01_07_world_sai.sql @@ -0,0 +1,34 @@ +SET @ENTRY_FIRJUS := 24213; +SET @ENTRY_JLARBORN := 24215; +SET @ENTRY_YORUS := 24214; +SET @ENTRY_OLUF := 23931; +SET @QUEST := 11300; + +-- Summon Firjus on quest accept - this starts the quest +UPDATE `quest_template` SET `StartScript`=@QUEST WHERE `entry`=@QUEST; +DELETE FROM `quest_start_scripts` WHERE `id`=@QUEST; +INSERT INTO `quest_start_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(@QUEST,3,10,@ENTRY_FIRJUS,300000,0,799.653931,-4718.678711,-96.236053,4.992353); + +-- Firjus, Jlarborn, Yorus and Oluf SAI +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_FIRJUS,@ENTRY_JLARBORN,@ENTRY_YORUS,@ENTRY_OLUF); +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (@ENTRY_FIRJUS,@ENTRY_JLARBORN,@ENTRY_YORUS,@ENTRY_OLUF); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_FIRJUS,@ENTRY_JLARBORN,@ENTRY_YORUS,@ENTRY_OLUF) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY_FIRJUS,0,0,0,0,0,100,0,3000,6000,12000,15000,11,15284,0,0,0,0,0,2,0,0,0,0,0,0,0,'Firjus - In Combat - Cleave'), +(@ENTRY_FIRJUS,0,1,0,0,0,100,0,10000,10000,10000,10000,11,43348,0,0,0,0,0,2,0,0,0,0,0,0,0,'Firjus - In Combat - Head Crush'), +(@ENTRY_FIRJUS,0,2,0,6,0,100,1,0,0,0,0,12,@ENTRY_JLARBORN,1,300000,0,0,0,8,0,0,0,799.653931,-4718.678711,-96.236053,4.992353,'Firjus - On Death - Summon Jlarborn'), +(@ENTRY_JLARBORN,0,0,0,0,0,100,1,1000,2000,0,0,11,19131,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jlarborn - In Combat - Shield Charge'), +(@ENTRY_JLARBORN,0,1,0,0,0,100,0,4000,5000,15000,16000,11,12169,0,0,0,0,0,1,0,0,0,0,0,0,0,'Jlarborn - In Combat - Shield Block'), +(@ENTRY_JLARBORN,0,2,0,0,0,100,0,7000,8000,18000,19000,11,38233,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jlarborn - In Combat - Shield Bash'), +(@ENTRY_JLARBORN,0,3,0,0,0,100,0,10000,10000,10000,10000,11,8374,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jlarborn - In Combat - Arcing Smash'), +(@ENTRY_JLARBORN,0,4,0,6,0,100,1,0,0,0,0,12,@ENTRY_YORUS,1,300000,0,0,0,8,0,0,0,799.653931,-4718.678711,-96.236053,4.992353,'Jlarborn - On Death - Summon Yorus'), +(@ENTRY_YORUS,0,0,0,0,0,100,0,3000,6000,12000,15000,11,15284,0,0,0,0,0,2,0,0,0,0,0,0,0,'Yorus - In Combat - Cleave'), +(@ENTRY_YORUS,0,1,0,0,0,100,0,8000,9000,18000,19000,11,41057,0,0,0,0,0,1,0,0,0,0,0,0,0,'Yorus - In Combat - Whirlwind'), +(@ENTRY_YORUS,0,2,0,6,0,100,1,0,0,0,0,12,@ENTRY_OLUF,1,300000,0,0,0,8,0,0,0,799.653931,-4718.678711,-96.236053,4.992353,'Yorus - On Death - Summon Oluf'), +(@ENTRY_OLUF,0,0,0,0,0,100,0,3000,6000,12000,15000,11,15284,0,0,0,0,0,2,0,0,0,0,0,0,0,'Oluf - In Combat - Cleave'), +(@ENTRY_OLUF,0,1,0,0,0,100,0,8000,9000,28000,29000,11,13730,0,0,0,0,0,1,0,0,0,0,0,0,0,'Oluf - In Combat - Demoralizing Shout'), +(@ENTRY_OLUF,0,2,0,0,0,100,0,7000,7000,21000,21000,11,6533,0,0,0,0,0,2,0,0,0,0,0,0,0,'Oluf - In Combat - Net'), +(@ENTRY_OLUF,0,3,0,0,0,100,1,1000,1000,0,0,11,42870,0,0,0,0,0,2,0,0,0,0,0,0,0,'Oluf - In Combat - Throw Harpoon'), +(@ENTRY_OLUF,0,4,0,0,0,100,0,10000,10000,10000,10000,11,41057,0,0,0,0,0,1,0,0,0,0,0,0,0,'Oluf - In Combat - Whirlwind'), +(@ENTRY_OLUF,0,5,0,6,0,100,1,0,0,0,0,50,186640,90000,0,0,0,0,8,0,0,0,799.653931,-4718.678711,-96.236053,4.992353,'Oluf - On Death - Summon Ancient Cipher'); diff --git a/sql/updates/world/2011_10_01_08_world_sai.sql b/sql/updates/world/2011_10_01_08_world_sai.sql new file mode 100644 index 00000000000..0f524b7b0c0 --- /dev/null +++ b/sql/updates/world/2011_10_01_08_world_sai.sql @@ -0,0 +1,18 @@ +-- Doctor Razorgrin SAI +SET @ENTRY := 25678; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `creature_ai_texts` WHERE `entry`=-767; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Doctor Razorgin - On Aggro - Say Line 0 (random)'); +-- Texts +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,'Ah, good... more parts!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,1,'Clear!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,2,'Fresh meat!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,3,'I recommened evisceration!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,4,'It''s no good... you need more work first.',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,5,'Live, damn you!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'), +(@ENTRY,0,6,'The doctor is in!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines'); diff --git a/sql/updates/world/2011_10_01_09_world_creatures.sql b/sql/updates/world/2011_10_01_09_world_creatures.sql new file mode 100644 index 00000000000..6c6c5eb577b --- /dev/null +++ b/sql/updates/world/2011_10_01_09_world_creatures.sql @@ -0,0 +1,11 @@ +UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16,`unit_flags`=0x8040,`speed_run`=2.85714,`InhabitType`=`InhabitType`|4 WHERE `entry`=32358; -- Fumblub Gearwind +UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885,`unit_flags`=0x8040,`speed_run`=1.28571 WHERE `entry`=32438; -- Syreian the Bonecarver + +UPDATE `creature_model_info` SET `bounding_radius`=1.25,`combat_reach`=3.919432,`gender`=1 WHERE `modelid`=27970; -- Syreian the Bonecarver + +UPDATE `creature_addon` SET `mount`=25587, `bytes1`=0x3000000 WHERE `guid`=151938; -- Fumblub Gearwind + +DELETE FROM `creature_template_addon` WHERE `entry` IN (32358,32438); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(32358,25587,0x3000000,1,0, NULL), -- Fumblub Gearwind +(32438,0,0,2,0, NULL); -- Syreian the Bonecarver diff --git a/sql/updates/world/2011_10_01_10_world_questrelation.sql b/sql/updates/world/2011_10_01_10_world_questrelation.sql new file mode 100644 index 00000000000..089471f193e --- /dev/null +++ b/sql/updates/world/2011_10_01_10_world_questrelation.sql @@ -0,0 +1,7 @@ +-- Removing obsolete quest 960, which was replaced by quest 961 +DELETE FROM `creature_questrelation` WHERE `quest`=960; +DELETE FROM `creature_involvedrelation` WHERE `quest`=960; + +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=960; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES +(1, 960, 0, '', '', 'Deprecated quest'); diff --git a/sql/updates/world/2011_10_01_11_world_loot.sql b/sql/updates/world/2011_10_01_11_world_loot.sql new file mode 100644 index 00000000000..533d6714cf8 --- /dev/null +++ b/sql/updates/world/2011_10_01_11_world_loot.sql @@ -0,0 +1,79 @@ +-- Skin loot entry +SET @LibraryLaborer := 29724; +SET @UldarBoss := 29725; +SET @AirStrip := 29726; +SET @ReavandDispo := 29727; +SET @HallsofStone := 29728; +SET @Dirkee := 29729; +SET @Recovery := 29730; +-- Ref Loot Entry +SET @UldarBossRef := 50013; +SET @AirStripRef := 50013+1; +SET @HallsofStoneRef := 50013+2; +SET @ReavandDispoRef := 50013+3; +SET @LibraryLaborerRef := 50013+4; +-- Add loot to the skinning table +DELETE FROM `skinning_loot_template` WHERE `entry` IN (@Recovery,@Dirkee,@LibraryLaborer,@ReavandDispo,@HallsofStone,@AirStrip,@UldarBoss); +INSERT INTO `skinning_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@Recovery, 41338, 42, 1, 0, 1, 3), -- Sprung Whirlygig +(@Recovery, 41337, 44, 1, 0, 1, 3), -- Whizzed out Gizmo +(@Recovery, 39690, 9, 1, 0, 1, 3), -- Volatile Blasting trigger +(@Recovery, 39681, 4, 1, 0, 2, 4), -- Handfull of copper bolts +(@Recovery, 49050, 0.5, 1, 0, 1, 1), -- jeeves +(@Recovery, 39682, 0.5, 1, 0, 1, 1), -- Overcharged Capacitor +(@Dirkee, 41338, 42, 1, 0, 1, 3), -- Sprung Whirlygig +(@Dirkee, 41337, 44.5, 1, 0, 1, 3), -- Whizzed out Gizmo +(@Dirkee, 39690, 10, 1, 0, 1, 3), -- Volatile Blasting trigger +(@Dirkee, 39681, 3, 1, 0, 2, 4), -- Handfull of copper bolts +(@Dirkee, 49050, 0.5, 1, 0, 1, 1), -- jeeves +(@LibraryLaborer , 1, 100, 1, 0, -@LibraryLaborerRef, 1), +(@ReavandDispo, 1, 100, 1, 0, -@ReavandDispoRef, 1), +(@HallsofStone, 1, 100, 1, 0, -@HallsofStoneRef, 1), +(@AirStrip, 1, 100, 1, 0, -@AirStripRef, 1), +(@UldarBoss, 1, 100, 1, 0, -@UldarBossRef, 1); +-- Add loot to the reference table +DELETE FROM `reference_loot_template` WHERE `entry` IN (@AirStripRef,@ReavandDispoRef,@LibraryLaborerRef,@HallsofStoneRef,@UldarBossRef); +INSERT INTO `reference_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(@AirStripRef, 41338, 33, 1, 0, 1, 1), -- Sprung Whirlygig +(@AirStripRef, 41337, 42, 1, 0, 1, 1), -- Whizzed out Gizmo +(@AirStripRef, 39690, 13, 1, 0, 1, 3), -- Volatile Blasting trigger +(@AirStripRef, 39681, 10, 1, 0, 1, 4), -- Handfull of copper bolts +(@AirStripRef, 39686, 1.2, 1, 0, 1, 1), -- Frost steel Tube +(@AirStripRef, 49050, 0.8, 1, 0, 1, 1), -- jeeves +(@ReavandDispoRef, 41338, 40, 1, 0, 1, 3), -- Sprung Whirlygig +(@ReavandDispoRef, 41337, 40, 1, 0, 1, 3), -- Whizzed out Gizmo +(@ReavandDispoRef, 39690, 9.5, 1, 0, 1, 3), -- Volatile Blasting trigger +(@ReavandDispoRef, 39681, 9.5, 1, 0, 2, 4), -- Handfull of copper bolts +(@ReavandDispoRef, 39686, 0.5, 1, 0, 1, 1), -- Frost steel Tube +(@ReavandDispoRef, 49050, 0.5, 1, 0, 1, 1), -- jeeves +(@LibraryLaborerRef, 41338, 43, 1, 0, 1, 3), -- Sprung Whirlygig +(@LibraryLaborerRef, 41337, 42, 1, 0, 1, 3), -- Whizzed out Gizmo +(@LibraryLaborerRef, 39690, 9, 1, 0, 1, 3), -- Volatile Blasting trigger +(@LibraryLaborerRef, 39681, 4, 1, 0, 2, 4), -- Handfull of copper bolts +(@LibraryLaborerRef, 49050, 1, 1, 0, 1, 1), -- jeeves +(@LibraryLaborerRef, 39686, 0.5, 1, 0, 1, 1), -- Frost steel Tube +(@LibraryLaborerRef, 39682, 0.5, 1, 0, 1, 1), -- Overcharged Capacitor +(@HallsofStoneRef, 41338, 43.5, 1, 0, 1, 3), -- Sprung Whirlygig +(@HallsofStoneRef, 41337, 42, 1, 0, 1, 3), -- Whizzed out Gizmo +(@HallsofStoneRef, 39690, 8, 1, 0, 1, 3), -- Volatile Blasting trigger +(@HallsofStoneRef, 39681, 5, 1, 0, 2, 4), -- Handfull of copper bolts +(@HallsofStoneRef, 49050, 0.5, 1, 0, 1, 1), -- jeeves +(@HallsofStoneRef, 39686, 0.5, 1, 0, 1, 1), -- Frost steel Tube +(@HallsofStoneRef, 39682, 0.5, 1, 0, 1, 1), -- Overcharged Capacitor +(@UldarBossRef, 35627, 43, 1, 0, 2, 10), -- Eternal Shadow +(@UldarBossRef, 35624, 42, 1, 0, 4, 10), -- Eternal Earth +(@UldarBossRef, 35623, 43, 1, 0, 2, 6), -- Eternal Air +(@UldarBossRef, 36860, 42, 1, 0, 2, 6), -- Eternal Fire +(@UldarBossRef, 39690, 30, 1, 0, 16, 19), -- Volatile Blasting trigger +(@UldarBossRef, 39686, 26, 1, 0, 2, 3), -- Frost steel Tube +(@UldarBossRef, 39682, 22, 1, 0, 5, 5), -- Overcharged Capacitor +(@UldarBossRef, 39681, 21, 1, 0, 8, 10), -- Handfull of copper bolts +(@UldarBossRef, 49050, 2, 1, 0, 1, 1); -- jeeves + +UPDATE `creature_template` SET `skinloot`=@LibraryLaborer WHERE `entry` IN (29389,29724); -- Library Guardian and Mechagnome Laborer +UPDATE `creature_template` SET `skinloot`=@ReavandDispo WHERE `entry` IN (34273,34274,29382); -- Stromforged Reaver and XB-488 Disposalbot +UPDATE `creature_template` SET `skinloot`=@Dirkee WHERE `entry`=32500; -- Dirkee +UPDATE `creature_template` SET `skinloot`=@Recovery WHERE `entry` IN (34267,34268); -- Parts Recovery Technician +UPDATE `creature_template` SET `skinloot`=@AirStrip WHERE `entry` IN (32358,25792,25758,25752,25753,25814,25793); -- Fumblub Gearwind, Scavenge-bot 005-B6, Defendo-tank 66D, Scavenge-bot 004-A8, Sentry-bot 57-K, Fizzcrank Mechagnome, 55-D Collect-a-tron +UPDATE `creature_template` SET `skinloot`=@HallsofStone WHERE `entry` IN (27972,31383,27971,31387); -- Lightning Construct, Unrelenting Construct +UPDATE `creature_template` SET `skinloot`=@UldarBoss WHERE `entry` IN (34332,34106,33113,34003,33293,33885); -- Leviathan Mk II, Flame Leviathan, XT-002 Deconstructor diff --git a/sql/updates/world/2011_10_01_12_world_creatures.sql b/sql/updates/world/2011_10_01_12_world_creatures.sql new file mode 100644 index 00000000000..c6e63c19595 --- /dev/null +++ b/sql/updates/world/2011_10_01_12_world_creatures.sql @@ -0,0 +1,35 @@ +-- Jormunger Control Orb +DELETE FROM `gameobject` WHERE `id`=192262; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(173, 192262, 571, 1, 0x8, 8497.219, -90.90104, 789.2875, 0.1396245, 0, 0, 0.06975555, 0.9975641, 0, 0, 0); + +DELETE FROM `creature` WHERE `id` IN (30301,30322,30300); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES +(4089, 30301, 571, 1, 0x8, 0, 0, 8497.78, -99.0251, 786.528, 3.01942, 120, 0, 0, 1, 0, 0, 0, 0, 0), -- Tamed Jormungar +(4090, 30322, 571, 1, 0x8, 0, 0, 8505.47, -86.2532, 787.339, 3.28122, 120, 0, 0, 1, 0, 0, 0, 0, 0), -- Earthen Jormungar Handler +(4765, 30322, 571, 1, 0x8, 0, 0, 8502.62, -111.308, 790.176, 3.05433, 120, 0, 0, 1, 0, 0, 0, 0, 0), +(6095, 30322, 571, 1, 0x8, 0, 0, 8498.78, -46.0375, 788.895, 2.53073, 120, 0, 0, 1, 0, 0, 0, 0, 0), +(6096, 30300, 571, 1, 0x8, 0, 0, 8015.63, -126.515, 865.719, 3.39914, 120, 0, 0, 1, 0, 0, 0, 0, 0); -- Iron Colossus + +-- Template updates +UPDATE `gameobject_template` SET `flags`=0x4 WHERE `entry`=192262; -- Jormungar Control Orb +UPDATE `creature_template` SET `faction_A`=1771,`faction_H`=1771,`unit_flags`=0x8040,`speed_walk`=2.8,`speed_run`=1.5873 WHERE `entry`=30300; -- Iron Colossus +UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`npcflag`=0x1,`unit_flags`=0x300,`equipment_id`=1003,`speed_run`=0.99206 WHERE `entry`=30322; -- Earthen Jormungar Handler +UPDATE `creature_template` SET `faction_A`=113,`faction_H`=113,`unit_flags`=0x300,`speed_walk`=6,`speed_run`=2.14286,`VehicleId`=227 WHERE `entry`=30301; -- Tamed Jormungar + +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=3.1,`combat_reach`=50,`gender`=0 WHERE `modelid`=27093; -- Iron Colossus +UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=0 WHERE `modelid`=26091; -- Earthen Jormungar Handler +UPDATE `creature_model_info` SET `bounding_radius`=1.55,`combat_reach`=5,`gender`=2 WHERE `modelid`=26935; -- Tamed Jormungar + +-- Addon data for creature 30300 (Iron Colossus) +DELETE FROM `creature_template_addon` WHERE `entry` IN (30300,30322,30301); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30300,0,0,1,0, NULL), -- Iron Colossus +(30322,0,0,1,0, NULL), -- Earthen Jormungar Handler +(30301,0,0,1,0, NULL); -- Tamed Jormungar + +DELETE FROM `spell_area` WHERE spell=56526; +INSERT INTO `spell_area`(`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(56526,4436,13007,1,13007,0,0,2,1), -- Snowdrift Plains +(56526,4435,13007,1,13007,0,0,2,1); -- Navirs Cradle diff --git a/sql/updates/world/2011_10_01_13_world_dbc.sql b/sql/updates/world/2011_10_01_13_world_dbc.sql new file mode 100644 index 00000000000..96c34eced1c --- /dev/null +++ b/sql/updates/world/2011_10_01_13_world_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_dbc` WHERE `Id`=31247; +INSERT INTO `spell_dbc`(`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(31247,0,0,256,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,-1,0,0,77,0/*122*/,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,'Silithyst Cap Reward'); diff --git a/sql/updates/world/2011_10_02_00_world_creature_template.sql b/sql/updates/world/2011_10_02_00_world_creature_template.sql new file mode 100644 index 00000000000..f9f20f3b593 --- /dev/null +++ b/sql/updates/world/2011_10_02_00_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82 WHERE `entry`=31674; -- Ingvar the Plunderer (1) diff --git a/sql/updates/world/2011_10_02_01_world_factionchange.sql b/sql/updates/world/2011_10_02_01_world_factionchange.sql new file mode 100644 index 00000000000..b25622e1441 --- /dev/null +++ b/sql/updates/world/2011_10_02_01_world_factionchange.sql @@ -0,0 +1,28 @@ +DELETE FROM `player_factionchange_items` WHERE `alliance_id`=48356; -- Wrong entry + +DELETE FROM `player_factionchange_spells` WHERE `alliance_id` IN (67093,67091,67095,67096,67092,67085,67080,67082,67087,67083,67084,67086,60867,67065,67064,67079,67066); +INSERT INTO `player_factionchange_spells` (`alliance_id`,`horde_id`) VALUES +(67093,67132), +(67091,67130), +(67095,67134), +(67096,67135), +(67092,67131), +(67085,67141), +(67080,67136), +(67082,67138), +(67087,67139), +(67083,67143), +(67084,67140), +(67086,67142), +(60867,60866), +(67065,67147), +(67064,67144), +(67079,67145), +(67066,67146); + +DELETE FROM `player_factionchange_items` WHERE `alliance_id` IN (47003,47626,44503,47654); +INSERT INTO `player_factionchange_items` (`race_A`,`alliance_id`,`commentA`,`race_H`,`horde_id`,`commentH`) VALUES +(0,47003,'Dawnbreaker Greaves',0,47430,'Dawnbreaker Sabatons'), +(0,47626,'Plans: Sunforged Breastplate',0,47643,'Plans: Sunforged Breastplate'), +(0,44503,'Schematic: Mekgineers Chopper',0,44502,'Schematic: Mechano-Hog'), +(0,47654,'Pattern: Bejeweled Wizards Bracers',0,47639,'Pattern: Bejeweled Wizards Bracers'); diff --git a/sql/updates/world/2011_10_02_03_world_sai.sql b/sql/updates/world/2011_10_02_03_world_sai.sql new file mode 100644 index 00000000000..9ccda8d5403 --- /dev/null +++ b/sql/updates/world/2011_10_02_03_world_sai.sql @@ -0,0 +1,35 @@ +SET @ENTRY := 33499; -- Skeletal Woodcutter +SET @QUEST_LOOT := 45080; -- Large Femur +SET @QUEST := 13654; -- There's Something About the Squire +SET @SPELL1 := 63124; -- Incapacitate Maloric +SET @SPELL2 := 63126; -- Search Maloric + +-- add quest item to Skeletal Woodcutter +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry`=@ENTRY; +DELETE FROM `creature_loot_template` WHERE `entry`=@ENTRY; +INSERT INTO `creature_loot_template` VALUES +(@ENTRY,@QUEST_LOOT,-100,1,0,1,1); -- 100% drop + +-- set visual effects on the skeletons +DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY; +INSERT INTO `creature_template_addon` (`entry`,`emote`) VALUES +(@ENTRY,234); -- chopping wood + +SET @ENTRY := 33498; -- Maloric +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,23,0,100,0,@SPELL1,1,0,0,81,16777216,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maloric - on Aura: Incapacitate Maloric - set npcflag: Spellclick'), +(@ENTRY,0,1,0,23,0,100,0,@SPELL1,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Maloric - on NoAura: Incapacitate Maloric - set npcflag: none'); + +-- conditions for Large Femur and Maloric +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=@QUEST_LOOT; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=@SPELL2; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(18,0,@QUEST_LOOT,0,24,1,@ENTRY,0,0,'','Item:Large Femur only target Maloric'), +(17,0,@SPELL2,0,9,@QUEST,0,0,0,'','Needs taken Quest 13654 to perform Spell: Search Maloric'); + +-- cast search Maloric, get quest item, quest completed +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY; +INSERT INTO `npc_spellclick_spells` VALUES +(@ENTRY,@SPELL2,@QUEST,1,@QUEST,2,0,0,0); diff --git a/sql/updates/world/2011_10_02_04_world_sai.sql b/sql/updates/world/2011_10_02_04_world_sai.sql new file mode 100644 index 00000000000..fbec8e12b55 --- /dev/null +++ b/sql/updates/world/2011_10_02_04_world_sai.sql @@ -0,0 +1,13 @@ +-- [Q] Scourgekabob +-- Despawn Mummy Bunny SAI +SET @ENTRY := 27931; +SET @SPELL_CREDIT := 50035; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,11,@SPELL_CREDIT,0,0,0,0,0,7,0,0,0,0,0,0,0,'Despawn Mummy Bunny - Just Summoned - Quest Credit'); + +-- Fix an older sql guid +DELETE FROM `gameobject` WHERE `id`=192262; -- Jormunger Control Orb +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(173, 192262, 571, 1, 0x8, 8497.219, -90.90104, 789.2875, 0.1396245, 0, 0, 0.06975555, 0.9975641, 0, 0, 0); diff --git a/sql/updates/world/2011_10_02_05_world_sai.sql b/sql/updates/world/2011_10_02_05_world_sai.sql new file mode 100644 index 00000000000..042b59626d0 --- /dev/null +++ b/sql/updates/world/2011_10_02_05_world_sai.sql @@ -0,0 +1,35 @@ +-- Saronite Mine Slave SAI +SET @ENTRY := 31397; +SET @QUEST := 13300; +SET @GOSSIP := 10137; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,"Saronite Mine Slave - On Gossip Select - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,1,0,0,0,0,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saronite Mine Slave - On Script - Close Gossip"), +(@ENTRY*100,9,1,0,0,0,100,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saronite Mine Slave - On Script - Yell Line (random)"), +(@ENTRY*100,9,2,0,0,0,100,1,0,0,0,0,33,31866,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saronite Mine Slave - On Script - Quest Credit"), +(@ENTRY*100,9,3,0,0,0,100,1,0,0,0,0,41,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,"Saronite Mine Slave - On Script - Force Despawn"); + +-- Texts +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"AHAHAHAHA... you'll join us soon enough!",14,0,100,0,0,0,"Saronite Mine Slave"), +(@ENTRY,0,1,"I don't want to leave! I want to stay here!",14,0,100,0,0,0,"Saronite Mine Slave"), +(@ENTRY,0,2,"NO! You're wrong! The voices in my head are beautiful!",14,0,100,0,0,0,"Saronite Mine Slave"), +(@ENTRY,0,3,"My life for you!",14,0,100,0,0,0,"Saronite Mine Slave"), +(@ENTRY,0,4,"I'm coming, master!",14,0,100,0,0,0,"Saronite Mine Slave"); + +-- Actual story menu +DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=14068; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,14068); + +-- Insert option menu +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP; +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`) VALUES +(@GOSSIP,0,0,"Go on, you're free. Get out of here!",1,1,0); + +-- Only show gossip if player is on quest Slaves to Saronite +DELETE FROM `conditions` WHERE `SourceGroup`=@GOSSIP AND `ConditionValue1`=@QUEST; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,@GOSSIP,0,0,9,@QUEST,0,0,0,'',"Only show first gossip if player is on quest Slaves to Saronite"); diff --git a/sql/updates/world/2011_10_02_06_world_misc.sql b/sql/updates/world/2011_10_02_06_world_misc.sql new file mode 100644 index 00000000000..03a2bf96b7d --- /dev/null +++ b/sql/updates/world/2011_10_02_06_world_misc.sql @@ -0,0 +1,6 @@ +-- Prisoners of the Grimtotems +UPDATE `gameobject_template` SET `ScriptName`='go_blackhoof_cage'/*,`data2`=30000*/ WHERE `entry`=186287; +UPDATE `quest_template` SET `ReqSpellCast1`=0 WHERE `entry`=11145; +DELETE FROM `creature_text` WHERE `entry`=23720; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(23720,0,0,"Thank you! There's no telling what those brutes would've done to me.",12,0,100,18,0,0,"Theramore Prisoner"); diff --git a/sql/updates/world/2011_10_02_07_world_sai.sql b/sql/updates/world/2011_10_02_07_world_sai.sql new file mode 100644 index 00000000000..bbbfb3f233a --- /dev/null +++ b/sql/updates/world/2011_10_02_07_world_sai.sql @@ -0,0 +1,19 @@ +-- Electromental SAI +SET @ENTRY := 21729; +SET @SPELL_LIGHTNING_BOLT := 37273; +SET @SPELL_MAGNETO_COLLECTOR := 37136; +SET @SPELL_ELECTROMENTAL_VISUAL := 37248; +SET @SPELL_SUMMON_ELECTROMENTAL := 37264; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,1,0,100,1,0,0,0,0,11,@SPELL_ELECTROMENTAL_VISUAL,1,0,0,0,0,1,0,0,0,0,0,0,0,"Electromental - Out Of Combat - Cast Power Converters: Electromental Visual"), +(@ENTRY,0,1,0,0,0,100,0,1000,2000,2400,3800,11,@SPELL_LIGHTNING_BOLT,1,0,0,0,0,2,0,0,0,0,0,0,0,"Electromental - In Combat - Cast Lightning Bolt"), +(@ENTRY,0,2,0,8,0,100,0,@SPELL_MAGNETO_COLLECTOR,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Electromental - on spellhit - increment event phase'), +(@ENTRY,0,3,0,6,1,100,0,0,0,0,0,33,21731,0,0,0,0,0,7,0,0,0,0,0,0,0,'Electromental - on death during phase 1 - give quest credit'); + +-- Insert spell +DELETE FROM `spell_dbc` WHERE `Id`=@SPELL_SUMMON_ELECTROMENTAL; +INSERT INTO `spell_dbc`(`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES +(@SPELL_SUMMON_ELECTROMENTAL,0,0,256,0,0,0,0,0,0,0,0,1,0,0,101,0,0,0,0,26,1,0,-1,0,0,28,0,0,1,0,0,0,0,0,0,0,0,0,0,0,18,38,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,@ENTRY,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,'Power Converters: Summon Electromental'); diff --git a/sql/updates/world/2011_10_02_08_world_sai.sql b/sql/updates/world/2011_10_02_08_world_sai.sql new file mode 100644 index 00000000000..fc49cd24425 --- /dev/null +++ b/sql/updates/world/2011_10_02_08_world_sai.sql @@ -0,0 +1,27 @@ +-- Fix quest 12166: The Liquid Fire Of Elune +SET @SPELL := 46770; +SET @VISUAL := 47972; +SET @ITEM := 36956; +SET @ELK := 26616; +SET @GRIZZLY := 26643; +SET @ELKDUMMY = 27111; +SET @GRIZZLYDUMMY = 27112; + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ELK, @GRIZZLY); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ELK,@GRIZZLY) AND `source_type`=0; +DELETE FROM `creature_ai_scripts` WHERE `id` IN (2661601,2661602,2661603,2664301,2664302,2664303); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@GRIZZLY,0,0,1,8,0,100,0x01,@SPELL,0,0,0,33,@GRIZZLYDUMMY,0,0,0,0,0,7,0,0,0,0,0,0,0,'Rabid Grizzly - On spell hit - Give kill credit for quest 12166'), +(@GRIZZLY,0,1,0,61,0,100,1,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rabid Grizzly - Despawn after 5 seconds'), +(@ELK,0,0,1,8,0,100,0x01,@SPELL,0,0,0,33,@ELKDUMMY,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Blighted Elk - On spell hit - Give kill credit for quest 12166'), +(@ELK,0,1,0,61,0,100,1,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blighted Elk - Despawn after 5 secondes'); + +-- Fix the quest item to allow it to only target the two quest NPCs +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=@ITEM; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(18,0,@ITEM,0,24,2,@GRIZZLY,0,0,'','Item Elune Liquid Fire target Rabid Grizzly (dead)'), +(18,0,@ITEM,0,24,2,@ELK,0,0,'','Item Elune Liquid Fire target Blighted Elk (dead)'); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=46770; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +(46770, 47972, 1, 'Liquid Fire of Elune'); diff --git a/sql/updates/world/2011_10_02_09_world_creatures.sql b/sql/updates/world/2011_10_02_09_world_creatures.sql new file mode 100644 index 00000000000..5287fc45ab3 --- /dev/null +++ b/sql/updates/world/2011_10_02_09_world_creatures.sql @@ -0,0 +1,21 @@ +UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|0x8040,`equipment_id`=1014 WHERE `entry` IN (35309,35310); -- Argent Lightwielder +UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|0x8040,`equipment_id`=279 WHERE `entry` IN (35307,35308); -- Argent Priestess +UPDATE `creature_template` SET `baseattacktime`=1500,`unit_flags`=`unit_flags`|0x140,`equipment_id`=1926 WHERE `entry` IN (35451,35490); -- The Black Knight + +UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29763; -- Argent Lightwielder +UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=29761; -- Argent Priestess +UPDATE `creature_model_info` SET `bounding_radius`=0.766,`combat_reach`=3,`gender`=0 WHERE `modelid`=29837; -- The Black Knight + +DELETE FROM `creature_template_addon` WHERE `entry` IN (35309,35307,35451); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(35309,0,0,1,0, NULL), -- Argent Lightwielder +(35307,0,0,1,0, NULL), -- Argent Priestess +(35451,0,0,1,0, NULL); -- The Black Knight + +-- Related to last commit: +UPDATE `creature_model_info` SET `bounding_radius`=1.222,`combat_reach`=3,`gender`=0 WHERE `modelid`=23966; -- Rabid Grizzly +UPDATE `creature_model_info` SET `bounding_radius`=0.98,`combat_reach`=0.98,`gender`=0 WHERE `modelid`=23952; -- Blighted Elk +DELETE FROM `creature_template_addon` WHERE `entry` IN (26616,26643); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(26616,0,0,1,0, NULL), -- Blighted Elk +(26643,0,0,1,0, NULL); -- Rabid Grizzly diff --git a/sql/updates/world/2011_10_02_10_world_sai.sql b/sql/updates/world/2011_10_02_10_world_sai.sql new file mode 100644 index 00000000000..3880699aa69 --- /dev/null +++ b/sql/updates/world/2011_10_02_10_world_sai.sql @@ -0,0 +1,58 @@ +-- [Q] In the Name of Loken +-- Gavrock SAI +SET @ENTRY := 26420; +SET @QUEST := 12204; +SET @GOSSIP := 9485; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Gossip Select - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gavrock - On Script - Close Gossip"), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Script - Remove Gossip & Quest Flags"), +(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Script - Say Text 0"), +(@ENTRY*100,9,3,0,0,0,100,0,10000,10000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Script - Say Text 1"), +(@ENTRY*100,9,4,0,0,0,100,0,15000,15000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Script - Say Text 2"), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gavrock - On Script - Quest Credit"), +(@ENTRY*100,9,6,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavrock - On Script - Add Gossip & Quest Flags"); + +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"Ah, yes. Loken is well known to me.",12,0,100,0,0,0,"Gavrock"), +(@ENTRY,1,0,"It is he who commands the sons of iron in their war against us.",12,0,100,0,0,0,"Gavrock"), +(@ENTRY,2,0,"From his hiding place, he oversees their preparations for war with the goal of exterminating the stone giants!",12,0,100,0,0,0,"Gavrock"); + +-- Add gossip_menu_option condition +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`) VALUES +(15,@GOSSIP,0,9,@QUEST); + +-- Hugh Glass SAI +SET @ENTRY := 26484; +SET @QUEST := 12204; +SET @GOSSIP := 9484; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hugh Glass - On Gossip Select - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Hugh Glass - On Script - Close Gossip"), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hugh Glass - On Script - Remove Gossip & Quest Flags"), +(@ENTRY*100,9,2,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hugh Glass - On Script - Say Text 0"), +(@ENTRY*100,9,3,0,0,0,100,0,10000,10000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hugh Glass - On Script - Say Text 1"), +(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Hugh Glass - On Script - Quest Credit"), +(@ENTRY*100,9,6,0,0,0,100,0,0,0,0,0,81,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hugh Glass - On Script - Add Gossip & Quest Flags"); + +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id`=0; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`) VALUES +(@GOSSIP, 0, 0, 'Calm down, I want to ask you about the Iron Dwarves and Loken.', 1, 1, 0, 0, 0, 0, NULL); + +-- NPC talk text insert from sniff +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`TEXT`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"He's out to get me, too! I'd be careful around here if I was you, traveler. You never know which tree he's hiding behind!",12,0,100,0,0,0,"Hugh Glass"), +(@ENTRY,1,0,"That's not something Limpy Joe would ask! But yeah, I know Loken.",12,0,100,0,0,0,"Hugh Glass"); + +-- Add gossip_menu_option condition +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`) VALUES +(15,@GOSSIP,0,9,@QUEST); diff --git a/sql/updates/world/2011_10_02_11_world_sai.sql b/sql/updates/world/2011_10_02_11_world_sai.sql new file mode 100644 index 00000000000..6ed9fcf83c6 --- /dev/null +++ b/sql/updates/world/2011_10_02_11_world_sai.sql @@ -0,0 +1,22 @@ +-- [Q] The Dreghood Elder +SET @ENTRY_AYLAAN := 20679; +SET @ENTRY_AKORU := 20678; +SET @ENTRY_MOROD := 20677; + +-- Aylaan the Waterwalker - Akoru the Firecaller - Morod the Windstirrer SAI +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@ENTRY_AKORU,@ENTRY_AYLAAN,@ENTRY_MOROD); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY_AKORU,@ENTRY_AYLAAN,@ENTRY_MOROD); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY_AYLAAN,0,0,0,62,0,100,0,8161,0,0,0,33,@ENTRY_AYLAAN,0,0,0,0,0,7,0,0,0,0,0,0,0,"Aylaan the Waterwalker - On Gossip Select - Quest Credit The Dreghood Elders"), +(@ENTRY_AYLAAN,0,1,0,62,0,100,0,8161,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Aylaan the Waterwalker - On gossip option select - Close gossip"), +(@ENTRY_AKORU,0,0,0,62,0,100,0,8163,0,0,0,33,@ENTRY_AKORU,0,0,0,0,0,7,0,0,0,0,0,0,0,"Akoru the Firecaller - On Gossip Select - Quest Credit The Dreghood Elders"), +(@ENTRY_AKORU,0,1,0,62,0,100,0,8163,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Akoru the Firecaller - On gossip option select - Close gossip"), +(@ENTRY_MOROD,0,0,0,62,0,100,0,8162,0,0,0,33,@ENTRY_MOROD,0,0,0,0,0,7,0,0,0,0,0,0,0,"Morod the Windstirrer - On Gossip Select - Quest Credit The Dreghood Elders"), +(@ENTRY_MOROD,0,1,0,62,0,100,0,8162,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Morod the Windstirrer - On gossip option select - Close gossip"); + +-- Only show first gossip if player is on quest The Dreghood Elders +DELETE FROM `conditions` WHERE `SourceGroup` IN (8161,8163,8162) AND `ConditionValue1` IN (10368); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,8161,0,0,9,10368,0,0,0,'',"Only show gossip if player is on quest The Dreghood Elders"), +(15,8163,0,0,9,10368,0,0,0,'',"Only show gossip if player is on quest The Dreghood Elders"), +(15,8162,0,0,9,10368,0,0,0,'',"Only show gossip if player is on quest The Dreghood Elders"); diff --git a/sql/updates/world/2011_10_02_12_world_sai.sql b/sql/updates/world/2011_10_02_12_world_sai.sql new file mode 100644 index 00000000000..93779a01172 --- /dev/null +++ b/sql/updates/world/2011_10_02_12_world_sai.sql @@ -0,0 +1,43 @@ +-- [Q] The Warm-Up +-- Kirgaraak SAI +SET @ENTRY := 29352; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; + + +DELETE FROM smart_scripts WHERE source_type=0 AND entryorguid=@ENTRY; +DELETE FROM smart_scripts WHERE source_type=9 AND entryorguid=@ENTRY*100; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`, `event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`, `target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,2,0,100,0,0,5,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0,'Kirgaraak - At 5% HP - Run Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,33,30221,0,0,0,0,0,7,0,0,0,0,0,0,0,'Kirgaraak - On Script - Quest Credit'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kirgaraak - On Script - Make Friendly'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kirgaraak - On Script - Evade'), +(@ENTRY*100,9,3,0,0,0,100,0,10000,10000,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Kirgaraak - On Script - Reset Faction'); + +UPDATE `creature_template` SET `exp`=0 WHERE `entry`=24921; -- Cosmetic Trigger - LAB + +UPDATE `creature_model_info` SET `bounding_radius`=2,`combat_reach`=7,`gender`=0 WHERE `modelid`=26202; -- Kirgaraak + +DELETE FROM `creature_template_addon` WHERE `entry` IN (@ENTRY,29918,24921); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(@ENTRY,0,0,1,0, NULL), -- Kirgaraak +(29918,0,0,1,0, NULL), -- Warbear Matriarch +(24921,0,0,1,0, NULL); -- Cosmetic Trigger - LAB + +-- Not working correctly. It will work when spells get fixed +-- 1) Can't have more than one 54324 in the same target. 2) That aura gets removed when target enters in combat and it shouldn't +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=24921; +DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN -104008 AND -103996 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-103996, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-103997, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-103998, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-103999, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104000, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104001, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104002, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104003, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104004, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104005, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104006, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104007, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'), +(-104008, 0, 0, 0, 1, 0, 0, 1, 500, 500, 0, 0, 11, 54324, 0, 0, 0, 0, 0, 11, @ENTRY, 60, 0, 0, 0, 0, 0, 'Cosmetic Trigger - LAB (Brunnhildar Village) - Cast Cosmetic Chains at Kirgaraak'); diff --git a/sql/updates/world/2011_10_02_13_world_sai.sql b/sql/updates/world/2011_10_02_13_world_sai.sql new file mode 100644 index 00000000000..c8736f5284a --- /dev/null +++ b/sql/updates/world/2011_10_02_13_world_sai.sql @@ -0,0 +1,74 @@ +-- Quest:The Armor's Secrets (12980) +DELETE FROM `creature` WHERE `id`=30190; +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES +(6337,30190,571,1,1,0,0,8256.75,-433.488,970.583,4.223697,300,0,0,1,0,0,0,0,0); + +-- Anvil and Metel bars +DELETE FROM `gameobject` WHERE `id` IN (192125,192128); +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(177,192125,571,1,1,8262.05,-430.288,968.272,0,0,0,-0.861628,0.507539,120,0,1), +(183,192125,571,1,1,8231.716,-451.452576,968.368835,-3.10665226,0,0,0,0,120,0,1), +(181,192128,571,1,1,8281.357,-432.069,970.723,-2.844883,0,0,-0.9890156,0.1478114,120,0,1), +(188,192128,571,1,1,8233.997,-434.379456,970.722961,-2.07693934,0,0,0,0,120,0,1), +(190,192128,571,1,1,8243.935,-429.880981,970.722961,-1.08210289,0,0,0,0,120,0,1), +(194,192128,571,1,1,8246.777,-424.707367,970.722961,-1.16936862,0,0,0,0,120,0,1), +(197,192128,571,1,1,8264.213,-432.40332,975.778564,1.134463,0,0,0,0,120,0,1); + +-- Template updates +UPDATE `creature_template` SET `npcflag`=`npcflag`|1,`speed_run`=0.99206 WHERE `entry`=30190; -- Attendant Tock +UPDATE `creature_template` SET `speed_run`=0.99206 WHERE `entry`=30170; -- Mechagnome Attendant + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (30190,30170); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(30190,0,0,1,0,NULL), -- Mechagnome Attendant +(30170,0,7,1,0, NULL); -- Attendant Tock + +SET @ENTRY=30190; +UPDATE `creature_template` SET `gossip_menu_id`=9880, `AIName`='SmartAI' WHERE entry=@ENTRY; +DELETE FROM `gossip_menu_option` WHERE `menu_id`=9880; +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES +(9880,0,0,'I found this strange armor plate. Can you tell me more about it?',1,1,0,0,0,0, ''); + +DELETE FROM `gossip_menu` WHERE `entry`=9880; +INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES +(9880,13703); + +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,9880,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Start Script'), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Remove Gossip Flag'), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Close Gossip'), +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,50,192132,77000,0,0,0,0,8,0,0,0,8262.029,-430.0284,974.1605,-2.757613, 'Attendant Tock - Summon Armor'), +(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 0'), +(@ENTRY*100,9,4,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 1'), +(@ENTRY*100,9,5,0,0,0,100,0,4000,4000,0,0,69,0,0,0,0,0,0,8,0,0,0,8262.029,-430.0284,976.1391,1.6, 'Attendant Tock - Move'), -- Move +(@ENTRY*100,9,6,0,0,0,100,0,15000,15000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 2'), +(@ENTRY*100,9,7,0,0,0,100,0,6000,6000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 3'), +(@ENTRY*100,9,8,0,0,0,100,0,7000,7000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 4'), +(@ENTRY*100,9,9,0,0,0,100,0,7000,7000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 5'), +(@ENTRY*100,9,10,0,0,0,100,0,6000,6000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 6'), +(@ENTRY*100,9,11,0,0,0,100,0,5000,5000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 7'), +(@ENTRY*100,9,12,0,0,0,100,0,6000,6000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 8'), +(@ENTRY*100,9,13,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,1,0,0,0,8256.75,-433.488,970.583,4.223697, 'Attendant Tock - Move Home'), +(@ENTRY*100,9,14,0,0,0,100,0,6000,6000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Speach 9'), +(@ENTRY*100,9,15,0,0,0,100,0,0,0,0,0,33,30190,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Attendant Tock - Quest Credit'), +(@ENTRY*100,9,16,0,0,0,100,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Attendant Tock - Add Gossip Flag'); + +DELETE FROM `creature_text` WHERE `entry`=30190; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(30190,0,0,'Metallic specimen of foreign origin detected.',12,0,100,0,5,0, 'Attendant Tock'), +(30190,1,0,'Beginning analysis...',12,0,100,0,0,0, 'Attendant Tock'), +(30190,2,0,'Specimen identified as an alloy of saronite and iron.',12,0,100,0,0,0, 'Attendant Tock'), +(30190,3,0,'The ore used in this sample originated deep wihin the crust of Azeroth and was recently unearthed.',12,0,100,275,0,0, 'Attendant Tock'), +(30190,4,0,'The saronite in this sample is nearly pure. Ores like this do not occur naturally on the surface of Azeroth.',12,0,100,0,0,0, 'Attendant Tock'), +(30190,5,0,'This ore can only have been created by a powerful, malevolent force. Attempting to access databanks for more information...',12,0,100,1,0,0, 'Attendant Tock'), +(30190,6,0,'Access denied?!',12,0,100,6,0,0, 'Attendant Tock'), +(30190,7,0,'Further information can only be accessed from the archives within Ulduar, by order of Keeper Loken.',12,0,100,1,0,0, 'Attendant Tock'), +(30190,8,0,'But one thing is for certain: this plate''s size, thickness, and bolt holes point to a use as armor for a colossal structure.',12,0,100,1,0,0, 'Attendant Tock'), +(30190,9,0,'Directive completed. Returning TO standby mode.',12,0,100,1,0,0, 'Attendant Tock'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9880; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(15,9880,0,0,9,12980,0,0,0, '', 'The Armor''s Secrets'); diff --git a/sql/updates/world/2011_10_02_14_world_sai.sql b/sql/updates/world/2011_10_02_14_world_sai.sql new file mode 100644 index 00000000000..d4c48dde3cc --- /dev/null +++ b/sql/updates/world/2011_10_02_14_world_sai.sql @@ -0,0 +1,46 @@ +-- Quest: No Where to Run (12261) +-- SAI for Destructive Ward +SET @ENTRY :=27430; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@ENTRY*100; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,80,@ENTRY*100,0,2,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - On spawn Start Script'), +(@ENTRY*100,9,0,0,0,0,100,0,2000,2000,0,0,11,48715,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Skeleton'), +(@ENTRY*100,9,1,0,0,0,100,0,15000,15000,0,0,11,48715,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Skeleton'), +(@ENTRY*100,9,2,0,0,0,100,0,1000,1000,0,0,11,48735,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Ward Powerup'), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Raid Emote'), +(@ENTRY*100,9,4,0,0,0,100,0,0,0,0,0,11,48733,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Pulse'), +(@ENTRY*100,9,5,0,0,0,100,0,15000,15000,0,0,11,48718,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Construct'), +(@ENTRY*100,9,6,0,0,0,100,0,15000,15000,0,0,11,48718,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Construct'), +(@ENTRY*100,9,7,0,0,0,100,0,1000,1000,0,0,11,48735,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Ward Powerup'), +(@ENTRY*100,9,8,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Raid Emote'), +(@ENTRY*100,9,9,0,0,0,100,0,0,0,0,0,11,48733,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Pulse'), +(@ENTRY*100,9,10,0,0,0,100,0,25000,25000,0,0,11,48715,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Skeleton'), +(@ENTRY*100,9,11,0,0,0,100,0,0,0,0,0,11,48715,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Skeleton'), +(@ENTRY*100,9,12,0,0,0,100,0,0,0,0,0,11,48718,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Summon Smoldering Construct'), +(@ENTRY*100,9,13,0,0,0,100,0,2000,2000,0,0,11,48735,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Ward Powerup'), +(@ENTRY*100,9,14,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Raid Emote'), +(@ENTRY*100,9,15,0,0,0,100,0,0,0,0,0,11,48734,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Barrage'), +(@ENTRY*100,9,16,0,0,0,100,0,1000,1000,0,0,11,48734,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Barrage'), +(@ENTRY*100,9,17,0,0,0,100,0,1000,1000,0,0,11,48734,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Barrage'), +(@ENTRY*100,9,18,0,0,0,100,0,0,0,0,0,11,52409,0,0,0,0,0,23,0,0,0,0,0,0,0, 'Destructive Ward - Destructive Ward Kill Credit'), +(@ENTRY*100,9,19,0,0,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Destructive Ward - Despawn'); + +DELETE FROM `creature_text` WHERE `entry`=27430; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(27430,0,0, 'The Destructive Ward gains in power.',41,0,100,0,0,0, 'Destructive Ward'), +(27430,1,0, 'The Destructive Ward is fully charged!',41,0,100,0,0,0, 'Destructive Ward'); + +-- Template update +UPDATE `creature_template` SET `exp`=2,`minlevel`=73,`maxlevel`=73,`unit_flags`=`unit_flags`|4|256,`speed_run`=1, RegenHealth=0 WHERE `entry`=27430; -- Destructive Ward + +-- Model data +UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=25167; -- Destructive Ward +UPDATE `creature_model_info` SET `bounding_radius`=0.945,`combat_reach`=0.945,`gender`=0 WHERE `modelid`=23951; -- Snowfall Elk + +-- Addon data +DELETE FROM `creature_template_addon` WHERE `entry` IN (27430,26615); +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(26615,0,0,1,0, NULL), -- Snowfall Elk +(27430,0,0,1,0, NULL); -- Destructive Ward diff --git a/sql/updates/world/2011_10_02_15_world_sai.sql b/sql/updates/world/2011_10_02_15_world_sai.sql new file mode 100644 index 00000000000..980874c8eea --- /dev/null +++ b/sql/updates/world/2011_10_02_15_world_sai.sql @@ -0,0 +1,23 @@ +-- [Q] Brother Against Brother +-- Lakka SAI +SET @ENTRY := 18956; +SET @QUEST := 10097; +SET @GOSSIP := 7868; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100) AND `source_type` IN (0,9); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lakka - On Gossip Select - Run Script"), +(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lakka - On Script - Close Gossip"), +(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lakka - On Script - Say Text 0"), -- Target_type_action_invoker because of <name> +(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lakka - On Script - Quest Credit"), +(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lakka - On Script - Despawn"); + +-- NPC talk text insert +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"Thank you for freeing me, $N! I'm going to make my way to Shattrath!",12,0,100,0,0,0,"Lakka"); + +-- Add gossip_menu_option condition +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`) VALUES +(15,@GOSSIP,0,9,@QUEST); diff --git a/sql/updates/world/2011_10_04_00_world_creature_loot_template.sql b/sql/updates/world/2011_10_04_00_world_creature_loot_template.sql new file mode 100644 index 00000000000..0a6cfc1073f --- /dev/null +++ b/sql/updates/world/2011_10_04_00_world_creature_loot_template.sql @@ -0,0 +1,13 @@ +-- Make Fjola drop two items from her loot table +-- 10 Normal +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=34497 AND `item`=2; +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=34497 AND `item`=1; +-- 25 Normal +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35350 AND `item`=2; +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35350 AND `item`=1; +-- 10 Heroic +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35351 AND `item`=2; +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35351 AND `item`=1; +-- 25 Herioc +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35352 AND `item`=2; +UPDATE `creature_loot_template` SET `maxcount`=2 WHERE `entry`=35352 AND `item`=1; diff --git a/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql b/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql new file mode 100644 index 00000000000..762a07620f9 --- /dev/null +++ b/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql @@ -0,0 +1 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = -58600; diff --git a/sql/updates/world/2011_10_05_01_world_instance_misc.sql b/sql/updates/world/2011_10_05_01_world_instance_misc.sql new file mode 100644 index 00000000000..656cdd575d2 --- /dev/null +++ b/sql/updates/world/2011_10_05_01_world_instance_misc.sql @@ -0,0 +1,201 @@ +DELETE FROM `creature_text` WHERE `entry` IN (36597,38995,38579,36823,39217); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(36597,0,0,'So the Light''s vaunted justice has finally arrived? Shall I lay down Frostmourne and throw myself at your mercy, Fordring?',14,0,0,0,0,17349,'The Lich King - SAY_LK_INTRO_1'), +(36597,1,0,'You''ll learn of that first hand. When my work is complete, you will beg for mercy -- and I will deny you. Your anguished cries will be testament to my unbridled power...',14,0,0,22,0,17350,'The Lich King - SAY_LK_INTRO_2'), +(36597,2,0,'I''ll keep you alive to witness the end, Fordring. I would not want the Light''s greatest champion to miss seeing this wretched world remade in my image.',14,0,0,0,0,17351,'The Lich King - SAY_LK_INTRO_3'), +(36597,3,0,'Come then champions, feed me your rage!',14,0,0,0,0,0,'The Lich King - SAY_LK_AGGRO'), +(36597,4,0,'I will freeze you from within until all that remains is an icy husk!',14,0,0,0,0,17369,'The Lich King - SAY_LK_REMORSELESS_WINTER'), +(36597,5,0,'Watch as the world around you collapses!',14,0,0,0,0,17370,'The Lich King - SAY_LK_QUAKE'), +(36597,6,0,'Val''kyr, your master calls!',14,0,0,0,0,17373,'The Lich King - SAY_LK_SUMMON_VALKYR'), +(36597,7,0,'Frostmourne hungers...',14,0,0,0,0,17366,'The Lich King - SAY_LK_HARVEST_SOUL'), +(36597,8,0,'Argh... Frostmourne, obey me!',14,0,0,0,0,17367,'The Lich King - SAY_LK_FROSTMOURNE_ESCAPE'), +(36597,9,0,'Frostmourne feeds on the soul of your fallen ally!',14,0,0,0,0,17368,'The Lich King - SAY_LK_FROSTMOURNE_KILL'), +(36597,10,0,'Hope wanes!',14,0,0,0,0,17363,'The Lich King - SAY_LK_KILL'), +(36597,10,1,'The end has come!',14,0,0,0,0,17364,'The Lich King - SAY_LK_KILL'), +(36597,11,0,'Face now your tragic end!',14,0,0,0,0,17365,'The Lich King - SAY_LK_BERSERK'), +(36597,12,0,'%s begins to cast Defile!',41,0,0,0,0,0,'The Lich King - EMOTE_DEFILE_WARNING'), +(36597,13,0,'|TInterface\\Icons\\ability_creature_disease_02.blp:16|tYou have been infected by |cFFCF00FFNecrotic Plague!|r',42,0,0,0,0,0,'The Lich King - EMOTE_NECROTIC_PLAGUE_WARNING'), +(36597,14,0,'No questions remain unanswered. No doubts linger. You ARE Azeroth''s greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...',14,0,0,0,0,17353,'The Lich King - SAY_LK_OUTRO_1'), +(36597,15,0,'Is it truly the righteousness that drives you? I wonder...',14,0,0,0,0,17354,'The Lich King - SAY_LK_OUTRO_2'), +(36597,16,0,'You trained them well, Fordring. You delivered the greatest fighting force this world has ever known... right into my hands -- exactly as I intended. You shall be rewarded for your unwitting sacrifice.',14,0,0,0,0,17355,'The Lich King - SAY_LK_OUTRO_3'), +(36597,17,0,'Watch now as I raise them from the dead to become masters of the Scourge. They will shroud this world in chaos and destruction. Azeroth''s fall will come at their hands -- and you will be the first to die.',14,0,0,0,0,17356,'The Lich King - SAY_LK_OUTRO_4'), +(36597,18,0,'I delight in the irony...',14,0,0,0,0,17357,'The Lich King - SAY_LK_OUTRO_5'), +(36597,19,0,'Impossible...',14,0,0,0,0,17358,'The Lich King - SAY_LK_OUTRO_6'), +(36597,20,0,'Now I stand, the lion before the lambs... and they do not fear.',14,0,0,0,0,17361,'The Lich King - SAY_LK_OUTRO_7'), +(36597,21,0,'They cannot fear.',14,0,0,0,0,17362,'The Lich King - SAY_LK_OUTRO_8'), +(38995,0,0,'We''ll grant you a swift death, Arthas. More than can be said for the thousands you''ve tortured and slain.',14,0,0,0,0,17390,'Highlord Tirion Fordring - SAY_TIRION_INTRO_1'), +(38995,1,0,'So be it. Champions, attack!',14,0,0,0,0,17391,'Highlord Tirion Fordring - SAY_TIRION_INTRO_2'), +(38995,2,0,'LIGHT, GRANT ME ONE FINAL BLESSING. GIVE ME THE STRENGTH... TO SHATTER THESE BONDS!',14,0,0,0,0,17392,'Highlord Tirion Fordring - SAY_TIRION_OUTRO_1'), +(38995,3,0,'No more, Arthas! No more lives will be consumed by your hatred!',14,0,0,0,0,17393,'Highlord Tirion Fordring - SAY_TIRION_OUTRO_2'), +(38579,0,0,'Free at last! It is over, my son. This is the moment of reckoning.',14,0,0,1,0,17397,'Terenas Menethil - SAY_TERENAS_OUTRO_1'), +(38579,1,0,'Rise up, champions of the Light!',14,0,0,0,0,17398,'Terenas Menethil - SAY_TERENAS_OUTRO_2'), +(36823,0,0,'You have come to bring Arthas to justice? To see the Lich King destroyed?',14,0,0,0,0,17394,'Terenas Menethil - SAY_TERENAS_INTRO_1'), +(36823,1,0,'First, you must escape Frostmourne''s hold, or be damned as I am; trapped within this cursed blade for all eternity.',14,0,0,0,0,17395,'Terenas Menethil - SAY_TERENAS_INTRO_2'), +(36823,2,0,'Aid me in destroying these tortured souls! Together we will loosen Frostmourne''s hold and weaken the Lich King from within!',14,0,0,0,0,17396,'Terenas Menethil - SAY_TERENAS_INTRO_3'), +(39217,0,0,'You have come to bring Arthas to justice? To see the Lich King destroyed?',14,0,0,0,0,17394,'Terenas Menethil - SAY_TERENAS_INTRO_1'), +(39217,1,0,'First, you must escape Frostmourne''s hold, or be damned as I am; trapped within this cursed blade for all eternity.',14,0,0,0,0,17395,'Terenas Menethil - SAY_TERENAS_INTRO_2'); + +-- Text corrections +DELETE FROM `creature_text` WHERE `entry`=36627 AND `groupid` IN (4,9); +DELETE FROM `creature_text` WHERE `entry`=36678 AND `groupid`=9; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(36627,4,0,'|TInterface\\Icons\\spell_shadow_unstableaffliction_2.blp:16|t%s begins to cast |cFFFF0000Unstable Ooze Explosion!|r',41,0,0,0,0,0,'Rotface - EMOTE_UNSTABLE_EXPLOSION'), +(36627,9,0,'|TInterface\\Icons\\ability_creature_disease_02.blp:16|tYou have |cFF00FF00Mutated Infection!|r',42,0,0,0,0,0,'Rotface - EMOTE_MUTATED_INFECTION'), +(36678,9,0,'|TInterface\\Icons\\inv_misc_herb_evergreenmoss.blp:16|t%s cast |cFF00FF00Malleable Goo!|r',41,0,0,0,0,0,'Professor Putricide - EMOTE_MALLEABLE_GOO'); + +UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.71429,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=974,`faction_H`=974,`unit_flags`=768,`dynamicflags`=0,`equipment_id`=2425,`baseattacktime`=1500 WHERE `entry` IN (36597,39166,39167,39168); -- The Lich King +UPDATE `creature_template` SET `exp`=2,`unit_class`=2 WHERE `entry`=38995; -- Highlord Tirion Fordring +UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=0.428571,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`dynamicflags`=0 WHERE `entry` IN (36633,39305,39306,39307); -- Ice Sphere +UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.42857,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=14,`faction_H`=14,`dynamicflags`=0 WHERE `entry`=36701; -- Raging Spirit +UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=0.428571,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`dynamicflags`=0,`unit_flags`=33554944 WHERE `entry`=38757; -- Defile +UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`faction_A`=14,`faction_H`=14,`speed_walk`=2,`speed_run`=1.71429,`unit_flags`=33554944,`dynamicflags`=0,`VehicleId`=532,`InhabitType`=1|4 WHERE `entry` IN (36609,39120,39121,39122); -- Val'kyr Shadowguard +UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.71429,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=35,`faction_H`=35,`unit_flags`=33554944,`dynamicflags`=0,`VehicleId`=531,`InhabitType`=1|4,`flags_extra`=0 WHERE `entry`=36598; -- Strangulate Vehicle +UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=0.428571,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`unit_flags`=33554944,`dynamicflags`=0,`flags_extra`=128 WHERE `entry`=38584; -- Frostmourne Trigger +UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`unit_flags`=32832,`dynamicflags`=0,`flags_extra`=256,`InhabitType`=1|4 WHERE `entry` IN (37799,39284,39285,39286); -- Vile Spirit +UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=1665,`faction_H`=1665,`unit_flags`=32832,`dynamicflags`=0,`flags_extra`=0,`equipment_id`=2475 WHERE `entry` IN (36823,38579,39217); -- Terenas Menethil +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=24648; -- Invisible Stalker (Scale x2) +UPDATE `creature_template` SET `difficulty_entry_1`=39287,`difficulty_entry_2`=39288,`difficulty_entry_3`=39289 WHERE `entry`=39190; -- Wicked Spirit +UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1,`exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`unit_flags`=32832,`dynamicflags`=0,`flags_extra`=256,`InhabitType`=1|4 WHERE `entry` IN (39190,39287,39288,39289); -- Wicked Spirit +UPDATE `creature_template` SET `exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=14,`faction_H`=14,`dynamicflags`=0,`flags_extra`=256 WHERE `entry`=36824; -- Spirit Warden +UPDATE `creature_template` SET `exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=14,`faction_H`=14,`dynamicflags`=0,`flags_extra`=128 WHERE `entry`=39137; -- Shadow Trap +UPDATE `creature_template` SET `exp`=2,`minlevel`=80,`maxlevel`=80,`faction_A`=14,`faction_H`=14,`InhabitType`=1|4,`flags_extra`=`flags_extra`|128 WHERE `entry`=39189; -- Spirit Bomb + +-- HACK, Unit::_IsValidAttackTarget returns false because of UNIT_FLAG_OOC_NOT_ATTACKABLE flag +UPDATE `creature_template` SET `unit_flags`=0x02000000 WHERE `entry`=36171; + +UPDATE `creature_model_info` SET `combat_reach`=5.5 WHERE `modelid`=30721; -- The Lich King +UPDATE `creature_model_info` SET `gender`=0 WHERE `modelid`=31286; -- Highlord Tirion Fordring + +DELETE FROM `creature` WHERE `guid`=202865; +DELETE FROM `creature_addon` WHERE `guid`=150211; +INSERT INTO `creature_addon` (`guid`,`bytes1`,`auras`) VALUES +(150211,1,'72846 73220 73878'); -- The Lich King + +DELETE FROM `creature_template_addon` WHERE `entry` IN (39137,36609,39120,39121,39122,36598,37799,39284,39285,39286,39190,39287,39288,39289,36823,38579,39217,39189); +INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`auras`) VALUES +(39137,0,'73530'), +(36609,50331648,''), -- Val'kyr Shadowguard +(39120,50331648,''), -- Val'kyr Shadowguard +(39121,50331648,''), -- Val'kyr Shadowguard +(39122,50331648,''), -- Val'kyr Shadowguard +(36598,50331648,''), -- Strangulate Vehicle +(37799,50331648,''), -- Vile Spirit +(39284,50331648,''), -- Vile Spirit +(39285,50331648,''), -- Vile Spirit +(39286,50331648,''), -- Vile Spirit +(39190,50331648,''), -- Wicked Spirit +(39287,50331648,''), -- Wicked Spirit +(39288,50331648,''), -- Wicked Spirit +(39289,50331648,''), -- Wicked Spirit +(36823,0,'72372'), -- Terenas Menethil +(38579,0,'72372'), -- Terenas Menethil +(39217,0,'72372'), -- Terenas Menethil +(39189,0,'73572'); -- Spirit Bomb + +UPDATE `gameobject` SET `rotation3`=1,`animprogress`=255,`spawntimesecs`=604800 WHERE `guid` IN (100056,100061,100064); +UPDATE `gameobject` SET `rotation2`=1,`animprogress`=255,`spawntimesecs`=604800 WHERE `guid` IN (100057,100058,100059,100060,100062); +UPDATE `gameobject` SET `rotation3`=1,`animprogress`=255,`spawntimesecs`=-604800 WHERE `guid`=100063; + +UPDATE `gameobject_template` SET `faction`=1375,`flags`=32 WHERE `entry`=202438; -- Lavaman Pillars (Unchained) +UPDATE `gameobject_template` SET `faction`=1375,`flags`=32 WHERE `entry`=202188; -- Doodad_Icecrown_ThroneFrostyWind01 +UPDATE `gameobject_template` SET `faction`=1375,`flags`=32 WHERE `entry`=202189; -- Doodad_Icecrown_ThroneFrostyEdge01 + +DELETE FROM `gameobject` WHERE `id`=202438; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`position_x`,`position_y`,`position_z`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(100488,202438,631,15,425.0885,-2123.311,858.6748,1,-604800,255,1); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (71614,70338,73785,73786,73787,68981,74270,74271,74272,72262,71440,76379,74086,72595,73650,72679,74318,74319,74320,73028,74321,74322,74323,73582,71809,71811,72431,72405,72429,73159); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,0,71614,0,18,1,38995,0,0, '', 'Ice Lock - target Highlord Tirion Fordring'), +(13,0,70338,0,18,1,0,0,0, '', 'Necrotic Plague - target player'), +(13,0,70338,0,18,1,37698,0,0, '', 'Necrotic Plague - target Shambling Horror'), +(13,0,70338,0,18,1,37695,0,0, '', 'Necrotic Plague - target Drudge Ghoul'), +(13,0,73785,0,18,1,0,0,0, '', 'Necrotic Plague - target player'), +(13,0,73785,0,18,1,37698,0,0, '', 'Necrotic Plague - target Shambling Horror'), +(13,0,73785,0,18,1,37695,0,0, '', 'Necrotic Plague - target Drudge Ghoul'), +(13,0,73786,0,18,1,0,0,0, '', 'Necrotic Plague - target player'), +(13,0,73786,0,18,1,37698,0,0, '', 'Necrotic Plague - target Shambling Horror'), +(13,0,73786,0,18,1,37695,0,0, '', 'Necrotic Plague - target Drudge Ghoul'), +(13,0,73787,0,18,1,0,0,0, '', 'Necrotic Plague - target player'), +(13,0,73787,0,18,1,37698,0,0, '', 'Necrotic Plague - target Shambling Horror'), +(13,0,73787,0,18,1,37695,0,0, '', 'Necrotic Plague - target Drudge Ghoul'), +(13,0,68981,0,18,0,202141,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing02'), +(13,0,68981,0,18,0,202142,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing01'), +(13,0,68981,0,18,0,202143,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing03'), +(13,0,68981,0,18,0,202144,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing04'), +(13,0,74270,0,18,0,202141,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing02'), +(13,0,74270,0,18,0,202142,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing01'), +(13,0,74270,0,18,0,202143,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing03'), +(13,0,74270,0,18,0,202144,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing04'), +(13,0,74271,0,18,0,202141,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing02'), +(13,0,74271,0,18,0,202142,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing01'), +(13,0,74271,0,18,0,202143,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing03'), +(13,0,74271,0,18,0,202144,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing04'), +(13,0,74272,0,18,0,202141,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing02'), +(13,0,74272,0,18,0,202142,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing01'), +(13,0,74272,0,18,0,202143,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing03'), +(13,0,74272,0,18,0,202144,0,0, '', 'Remorseless Winter - target Doodad_IceShard_standing04'), +(13,0,72262,0,18,1,22515,0,0, '', 'Quake - target World Trigger'), +(13,0,71440,0,18,1,36597,0,0, '', 'Harvest Soul - target The Lich King'), +(13,0,76379,0,18,1,36597,0,0, '', 'Harvest Soul - target The Lich King'), +(13,0,74086,0,18,1,0,0,0, '', 'Destroy Soul - target player'), +(13,0,72595,0,18,1,0,0,0, '', 'Restore Soul - target player'), +(13,0,73650,0,18,1,0,0,0, '', 'Restore Soul - target player'), +(13,0,72679,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,74318,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,74319,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,74320,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,73028,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,74321,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,73650,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,74323,0,18,1,36597,0,0, '', 'Harvested Soul - target The Lich King'), +(13,0,73582,0,18,1,39190,0,0, '', 'Trigger Vile Spirit (Inside, Heroic) - target Wicked Spirit'), +(13,0,71809,0,18,1,36597,0,0, '', 'Jump - target The Lich King'), +(13,0,71811,0,18,1,36597,0,0, '', 'Jump - target The Lich King'), +(13,0,72431,0,18,1,0,0,0, '', 'Jump - target player'), +(13,0,72405,0,18,1,38995,0,0, '', 'Broken Frostmourne - target Highlord Tirion Fordring'), +(13,0,72429,0,18,1,0,0,0, '', 'Mass Resurrection - target player'), +(13,0,73159,0,18,1,0,0,0, '', 'Play Movie - target player'); + +DELETE FROM `spell_target_position` WHERE `id` IN (70860,72546,73655); +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(70860,631,529.302,-2124.49, 840.857,3.1765), -- Frozen Throne Teleport +(72546,631,514.000,-2523.00,1050.990,3.1765), -- Harvest Soul (normal mode) +(73655,631,495.708,-2523.76,1050.990,3.1765); -- Harvest Soul (heroic mode) + +DELETE FROM `spell_area` WHERE `spell`=74276; +INSERT INTO `spell_area` (`spell`,`area`,`autocast`) VALUES +(74276,4910,1); -- In Frostmourne Room + +DELETE FROM `disables` WHERE `entry` IN (12825,13246,13247,13244,13245,13342,13309,13362,13311,12823,13163,13164,13243,12764,12909,12826,13103,13136,13137,13138,12818) AND `sourceType`=4; +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12825,13246,13247,13244,13245,13342,13309,13362,13311,12823,13163,13164,13243,12764,12909,12826,13103,13136,13137,13138,12818); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(12825,12,2,0,''), -- Bane of the Fallen King +(13246,11,0,0,'achievement_been_waiting_long_time'), -- Been Waiting a Long Time for This (10 player) +(13246,12,0,0,''), -- Been Waiting a Long Time for This (10 player) +(13247,11,0,0,'achievement_been_waiting_long_time'), -- Been Waiting a Long Time for This (10 player) Heroic +(13247,12,2,0,''), -- Been Waiting a Long Time for This (10 player) Heroic +(13244,11,0,0,'achievement_been_waiting_long_time'), -- Been Waiting a Long Time for This (25 player) +(13244,12,1,0,''), -- Been Waiting a Long Time for This (25 player) +(13245,11,0,0,'achievement_been_waiting_long_time'), -- Been Waiting a Long Time for This (25 player) Heroic +(13245,12,3,0,''), -- Been Waiting a Long Time for This (25 player) Heroic +(13342,12,0,0,''), -- Lich King 10-player bosses killed +(13309,12,0,0,''), -- Lich King 10-player raids completed (final boss killed) +(13362,12,1,0,''), -- Lich King 25-player bosses killed +(13311,12,1,0,''), -- Lich King 25-player raids completed (final boss killed) +(12823,11,0,0,'achievement_neck_deep_in_vile'), -- Neck-Deep in Vile (10 player) +(12823,12,0,0,''), -- Neck-Deep in Vile (10 player) +(13163,11,0,0,'achievement_neck_deep_in_vile'), -- Neck-Deep in Vile (10 player) Heroic +(13163,12,2,0,''), -- Neck-Deep in Vile (10 player) Heroic +(13164,11,0,0,'achievement_neck_deep_in_vile'), -- Neck-Deep in Vile (25 player) +(13164,12,1,0,''), -- Neck-Deep in Vile (25 player) +(13243,11,0,0,'achievement_neck_deep_in_vile'), -- Neck-Deep in Vile (25 player) Heroic +(13243,12,3,0,''), -- Neck-Deep in Vile (25 player) Heroic +(12764,12,0,0,''), -- The Frozen Throne (10 player) +(12909,12,1,0,''), -- The Frozen Throne (25 player) +(12826,12,3,0,''), -- The Light of Dawn +(13103,12,0,0,''), -- Victories over the Lich King (Icecrown 10 player) +(13136,12,1,0,''), -- Victories over the Lich King (Icecrown 25 player) +(13137,12,2,0,''), -- Victories over the Lich King (Heroic Icecrown 10 player) +(13138,12,3,0,''), -- Victories over the Lich King (Heroic Icecrown 25 player) +(12818,12,3,0,''); -- Realm First! Fall of the Lich King diff --git a/sql/updates/world/2011_10_05_01_world_scriptname.sql b/sql/updates/world/2011_10_05_01_world_scriptname.sql new file mode 100644 index 00000000000..742d74f4029 --- /dev/null +++ b/sql/updates/world/2011_10_05_01_world_scriptname.sql @@ -0,0 +1,10 @@ +UPDATE `creature_template` SET `ScriptName`='boss_the_lich_king' WHERE `entry`=36597; +UPDATE `creature_template` SET `ScriptName`='npc_tirion_fordring_tft' WHERE `entry`=38995; +UPDATE `creature_template` SET `ScriptName`='npc_shambling_horror_icc' WHERE `entry`=37698; +UPDATE `creature_template` SET `ScriptName`='npc_raging_spirit' WHERE `entry`=36701; +UPDATE `creature_template` SET `ScriptName`='npc_valkyr_shadowguard' WHERE `entry`=36609; +UPDATE `creature_template` SET `ScriptName`='npc_strangulate_vehicle' WHERE `entry`=36598; +UPDATE `creature_template` SET `ScriptName`='npc_terenas_menethil' WHERE `entry` IN (36823,38579,39217); -- not difficulty_entries +UPDATE `creature_template` SET `ScriptName`='npc_spirit_warden' WHERE `entry`=36824; +UPDATE `creature_template` SET `ScriptName`='npc_spirit_bomb' WHERE `entry`=39189; +UPDATE `creature_template` SET `ScriptName`='npc_broken_frostmourne' WHERE `entry`=38584; diff --git a/sql/updates/world/2011_10_05_01_world_spell_script_names.sql b/sql/updates/world/2011_10_05_01_world_spell_script_names.sql new file mode 100644 index 00000000000..03d4b649e78 --- /dev/null +++ b/sql/updates/world/2011_10_05_01_world_spell_script_names.sql @@ -0,0 +1,90 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_infest'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_necrotic_plague'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_necrotic_plague_jump'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_shadow_trap_visual'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_shadow_trap_periodic'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_quake'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_ice_burst_target_search'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_raging_spirit'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_defile'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_summon_into_air'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_soul_reaper'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_valkyr_target_search'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_eject_all_passengers'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_cast_back_to_caster'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_life_siphon'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_vile_spirits'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_vile_spirits_visual'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_vile_spirit_move_target_search'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_vile_spirit_damage_target_search'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_harvest_soul'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_lights_favor'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_soul_rip'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_restore_soul'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_in_frostmourne_room'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_summon_spirit_bomb'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_trigger_vile_spirit'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_jump'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_jump_remove_aura'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_mass_resurrection'; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_play_movie'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(70541,'spell_the_lich_king_infest'), +(73779,'spell_the_lich_king_infest'), +(73780,'spell_the_lich_king_infest'), +(73781,'spell_the_lich_king_infest'), +(70337,'spell_the_lich_king_necrotic_plague'), +(73912,'spell_the_lich_king_necrotic_plague'), +(73913,'spell_the_lich_king_necrotic_plague'), +(73914,'spell_the_lich_king_necrotic_plague'), +(70338,'spell_the_lich_king_necrotic_plague_jump'), +(73785,'spell_the_lich_king_necrotic_plague_jump'), +(73786,'spell_the_lich_king_necrotic_plague_jump'), +(73787,'spell_the_lich_king_necrotic_plague_jump'), +(73530,'spell_the_lich_king_shadow_trap_visual'), +(74282,'spell_the_lich_king_shadow_trap_periodic'), +(72262,'spell_the_lich_king_quake'), +(69110,'spell_the_lich_king_ice_burst_target_search'), +(69200,'spell_the_lich_king_raging_spirit'), +(72754,'spell_the_lich_king_defile'), +(73708,'spell_the_lich_king_defile'), +(73709,'spell_the_lich_king_defile'), +(73710,'spell_the_lich_king_defile'), +(69037,'spell_the_lich_king_summon_into_air'), +(70497,'spell_the_lich_king_summon_into_air'), +(73579,'spell_the_lich_king_summon_into_air'), +(74300,'spell_the_lich_king_summon_into_air'), +(69409,'spell_the_lich_king_soul_reaper'), +(73797,'spell_the_lich_king_soul_reaper'), +(73798,'spell_the_lich_king_soul_reaper'), +(73799,'spell_the_lich_king_soul_reaper'), +(69030,'spell_the_lich_king_valkyr_target_search'), +(68576,'spell_the_lich_king_eject_all_passengers'), +(74445,'spell_the_lich_king_cast_back_to_caster'), +(68984,'spell_the_lich_king_cast_back_to_caster'), +(73488,'spell_the_lich_king_life_siphon'), +(73782,'spell_the_lich_king_life_siphon'), +(73783,'spell_the_lich_king_life_siphon'), +(73784,'spell_the_lich_king_life_siphon'), +(70498,'spell_the_lich_king_vile_spirits'), +(70499,'spell_the_lich_king_vile_spirits_visual'), +(70501,'spell_the_lich_king_vile_spirit_move_target_search'), +(70534,'spell_the_lich_king_vile_spirit_damage_target_search'), +(68980,'spell_the_lich_king_harvest_soul'), +(74325,'spell_the_lich_king_harvest_soul'), +(74296,'spell_the_lich_king_harvest_soul'), +(74297,'spell_the_lich_king_harvest_soul'), +(69382,'spell_the_lich_king_lights_favor'), +(69397,'spell_the_lich_king_soul_rip'), +(72595,'spell_the_lich_king_restore_soul'), +(73650,'spell_the_lich_king_restore_soul'), +(74276,'spell_the_lich_king_in_frostmourne_room'), +(74302,'spell_the_lich_king_summon_spirit_bomb'), +(74341,'spell_the_lich_king_summon_spirit_bomb'), +(74342,'spell_the_lich_king_summon_spirit_bomb'), +(74343,'spell_the_lich_king_summon_spirit_bomb'), +(73582,'spell_the_lich_king_trigger_vile_spirit'), +(71811,'spell_the_lich_king_jump'), +(72431,'spell_the_lich_king_jump_remove_aura'), +(72429,'spell_the_lich_king_mass_resurrection'), +(73159,'spell_the_lich_king_play_movie'); diff --git a/sql/updates/world/2011_10_06_00_world_creature_template.sql b/sql/updates/world/2011_10_06_00_world_creature_template.sql new file mode 100644 index 00000000000..a17b7bc3c7c --- /dev/null +++ b/sql/updates/world/2011_10_06_00_world_creature_template.sql @@ -0,0 +1,42 @@ +/* +Approximate damage of NPCs before armor reduction +75k-90k - The Lich King +25k-30k - Shambling Horror +3.5-5k - Drudge Ghoul +30k-40k - Raging Spirit +10k-12k - Spirit Warden +10k-12k - Terenas Menethil + +Multipliers +1.2 = 10H/25N +1.5 = 25H +*/ + +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=150 WHERE `entry`=36597; -- The Lich King 10N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=180 WHERE `entry`=39167; -- The Lich King 25N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=180 WHERE `entry`=39168; -- The Lich King 10H +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=225 WHERE `entry`=39169; -- The Lich King 25H + +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=50 WHERE `entry`=37698; -- Shambling Horror 10N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=60 WHERE `entry`=39299; -- Shambling Horror 25N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=60 WHERE `entry`=39300; -- Shambling Horror 10H +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=75 WHERE `entry`=39301; -- Shambling Horror 25H + +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=7 WHERE `entry`=37695; -- Drudge Ghoul 10N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=8.4 WHERE `entry`=39309; -- Drudge Ghoul 25N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=8.4 WHERE `entry`=39310; -- Drudge Ghoul 10H +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=10.5 WHERE `entry`=39311; -- Drudge Ghoul 25H + +UPDATE `creature_template` SET `difficulty_entry_1`=39302,`difficulty_entry_2`=39303,`difficulty_entry_3`=39304 WHERE `entry`=36701; -- Raging Spirit +UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.42857,`exp`=2,`minlevel`=83,`maxlevel`=83,`faction_A`=14,`faction_H`=14,`dynamicflags`=0 WHERE `entry` IN (39302,39303,39304); -- Raging Spirit +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=60 WHERE `entry`=36701; -- Raging Spirit 10N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=72 WHERE `entry`=39302; -- Raging Spirit 25N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=72 WHERE `entry`=39303; -- Raging Spirit 10H +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=90 WHERE `entry`=39304; -- Raging Spirit 25H + +UPDATE `creature_template` SET `difficulty_entry_1`=39296 WHERE `entry`=36824; -- Spirit Warden +UPDATE `creature_template` SET `minlevel`=83,`maxlevel`=83,`exp`=2,`faction_A`=14,`faction_H`=14,`flags_extra`=256 WHERE `entry`=39296; -- Spirit Warden (1) +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=20 WHERE `entry`=36824; -- Spirit Warden 10N +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=20 WHERE `entry`=39296; -- Spirit Warden 25N + +UPDATE `creature_template` SET `mindmg`=509,`maxdmg`=683,`attackpower`=805,`dmg_multiplier`=20 WHERE `entry`=36823; -- Terenas Menethil diff --git a/sql/updates/world/2011_10_06_01_world_misc.sql b/sql/updates/world/2011_10_06_01_world_misc.sql new file mode 100644 index 00000000000..3fccce79f7b --- /dev/null +++ b/sql/updates/world/2011_10_06_01_world_misc.sql @@ -0,0 +1,196 @@ +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105857; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2721.081,`position_y`=-1832.136,`position_z`=4.838899 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2710.015,-1832.177,4.838899,0,0,0,100,0), +(@PATH,2,2700.421,-1833.964,4.838899,0,0,0,100,0), +(@PATH,3,2693.419,-1835.334,4.867931,0,0,0,100,0), +(@PATH,4,2700.177,-1834.009,4.838899,0,0,0,100,0), +(@PATH,5,2710.015,-1832.177,4.838899,0,0,0,100,0), +(@PATH,6,2721.081,-1832.136,4.838899,0,0,0,100,0), +(@PATH,7,2732.511,-1831.47,4.838899,0,0,0,100,0), +(@PATH,8,2737.419,-1830.768,4.838899,0,0,0,100,0), +(@PATH,9,2732.511,-1831.47,4.838899,0,0,0,100,0), +(@PATH,10,2721.081,-1832.136,4.838899,0,0,0,100,0); +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105821; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2738.191,`position_y`=-1784.905,`position_z`=5.87062 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2734.5,-1775.514,6.962903,0,0,0,100,0), +(@PATH,2,2738.191,-1784.905,5.87062,0,0,0,100,0), +(@PATH,3,2741.883,-1793.762,5.804742,0,0,0,100,0), +(@PATH,4,2746.422,-1807.012,5.22166,0,0,0,100,0), +(@PATH,5,2748.496,-1816.049,5.223536,0,0,0,100,0), +(@PATH,6,2750.136,-1823.419,5.425339,0,0,0,100,0), +(@PATH,7,2748.496,-1816.049,5.223536,0,0,0,100,0), +(@PATH,8,2746.422,-1807.012,5.22166,0,0,0,100,0), +(@PATH,9,2741.883,-1793.762,5.804742,0,0,0,100,0), +(@PATH,10,2738.191,-1784.905,5.87062,0,0,0,100,0); +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105859; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2753.638,`position_y`=-1895.846,`position_z`=5.03679 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2754.177,-1888.177,5.087607,0,0,0,100,0), +(@PATH,2,2754.56,-1879.827,5.126619,0,0,0,100,0), +(@PATH,3,2754.854,-1867.842,5.131936,0,0,0,100,0), +(@PATH,4,2754.627,-1856.456,5.450566,0,0,0,100,0), +(@PATH,5,2753.946,-1848.716,5.450566,0,0,0,100,0), +(@PATH,6,2751.545,-1837.476,5.39562,0,0,0,100,0), +(@PATH,7,2753.931,-1848.54,5.450566,0,0,0,100,0), +(@PATH,8,2754.627,-1856.456,5.450566,0,0,0,100,0), +(@PATH,9,2754.854,-1867.842,5.131936,0,0,0,100,0), +(@PATH,10,2754.56,-1879.827,5.126619,0,0,0,100,0), +(@PATH,11,2754.177,-1888.177,5.087607,0,0,0,100,0), +(@PATH,12,2753.638,-1895.846,5.03679,0,0,0,100,0); +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105810; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2805.754,`position_y`=-1824.487,`position_z`=10.76279 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2811.704,-1833.185,11.26279,0,0,0,100,0), +(@PATH,2,2825.015,-1839.888,11.25652,0,0,0,100,0), +(@PATH,3,2811.704,-1833.185,11.26279,0,0,0,100,0), +(@PATH,4,2805.754,-1824.487,10.76279,0,0,0,100,0), +(@PATH,5,2806.472,-1815.43,10.76279,0,0,0,100,0), +(@PATH,6,2806.509,-1806.167,10.63779,0,0,0,100,0), +(@PATH,7,2806.472,-1815.43,10.76279,0,0,0,100,0), +(@PATH,8,2805.754,-1824.487,10.76279,0,0,0,100,0); +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105750; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2691.886,`position_y`=-1764.669,`position_z`=9.601107 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2681.84,-1768.02,9.601107,0,0,0,100,0), +(@PATH,2,2691.886,-1764.669,9.601107,0,0,0,100,0), +(@PATH,3,2705.537,-1760.065,9.601107,0,0,0,100,0), +(@PATH,4,2714.329,-1758.981,9.601107,0,0,0,100,0), +(@PATH,5,2705.537,-1760.065,9.601107,0,0,0,100,0), +(@PATH,6,2691.886,-1764.669,9.601107,0,0,0,100,0); +-- Pathing for Conquest Hold Berserker Entry: 27500 +SET @NPC := 105854; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2683.998,`position_y`=-1873.36,`position_z`=14.20639 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2681.924,-1863.327,14.19665,0,0,0,100,0), +(@PATH,2,2691.357,-1860.246,13.94065,0,0,0,100,0), +(@PATH,3,2705.164,-1860.508,13.85815,0,0,0,100,0), +(@PATH,4,2706.999,-1867.629,13.94356,0,0,0,100,0), +(@PATH,5,2702.301,-1873.661,13.86975,0,0,0,100,0), +(@PATH,6,2690.931,-1875.133,13.94601,0,0,0,100,0), +(@PATH,7,2683.998,-1873.36,14.20639,0,0,0,100,0); + +-- Pathing for Westfall Brigade Marine Entry: 27501 +SET @NPC := 105933; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2670.551,`position_y`=-2010.984,`position_z`=18.17214 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2673.404,-2006.613,18.2068,0,0,0,100,0), +(@PATH,2,2670.639,-2010.848,18.17313,0,0,0,100,0), +(@PATH,3,2667.047,-2016.413,18.20223,0,0,0,100,0), +(@PATH,4,2670.551,-2010.984,18.17214,0,0,0,100,0); +-- Pathing for Westfall Brigade Marine Entry: 27501 +SET @NPC := 105932; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2633.481,`position_y`=-1987.501,`position_z`=8.764043 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,257,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2632.814,-1993.635,8.538836,0,0,0,100,0), +(@PATH,2,2638.163,-1998.093,8.282835,0,0,0,100,0), +(@PATH,3,2643.552,-2000.655,8.280496,0,0,0,100,0), +(@PATH,4,2646.837,-1997.753,8.30875,0,0,0,100,0), +(@PATH,5,2649.113,-1994.113,8.310638,0,0,0,100,0), +(@PATH,6,2649.836,-1989.002,8.284628,0,0,0,100,0), +(@PATH,7,2645.433,-1984.703,8.336969,0,0,0,100,0), +(@PATH,8,2638.931,-1981.989,8.592985,0,0,0,100,0), +(@PATH,9,2633.481,-1987.501,8.764043,0,0,0,100,0); + +-- Missing spawn for Purkom "Venture Coin Vendor" Horde +DELETE FROM `creature` WHERE `id`=27730; +DELETE FROM `creature` WHERE `guid`=107018 AND `id`=27511; +INSERT INTO creature (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(107018,27730,571,1,1,0,0,2492.467,-1839.655,11.72851,5.532694,120,0,0,1,0,0); + +-- Rogue Voidwalkers Shouldn't have weapons +UPDATE `creature_template` SET `equipment_id`=0 WHERE `entry`=16974; + +-- Add Missing Spawn +DELETE FROM `creature` WHERE `guid` IN (13425,13426,13427,13428,14241); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +-- Bubb Lazarr +(13425,27628,571,1,1,0,0,2404.771,-1823.437,1.99793,5.078908,300,0,0,1,0,0), +-- Rocket Propelled Warhead +(13426,27593,571,1,1,0,0,2394.92358,-1832.18921,-1.69907868,2.687807,300,0,0,1,0,0), +(13427,27593,571,1,1,0,0,2396.13013,-1829.49475,-1.6780616,2.75762,300,0,0,1,0,0), +(13428,27593,571,1,1,0,0,2397.40283,-1826.75,-1.65229559,2.72271371,300,0,0,1,0,0), +(14241,27593,571,1,1,0,0,2398.62329,-1824.14063,-1.66098964,2.740167,300,0,0,1,0,0); + +-- Template updates Rocket Propelled Warhead +UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216,`InhabitType`=4,`unit_flags`=`unit_flags`|16384,`speed_walk`=12,`speed_run`=4.28571 WHERE `entry`=27593; + +UPDATE `creature_model_info` SET `bounding_radius`=0.534723,`combat_reach`=3.5,`gender`=2 WHERE `modelid`=26611; -- Rocket Propelled Warhead + +DELETE FROM `creature_template_addon` WHERE `entry`=27593; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(27593,0,0,1,0, NULL); -- Rocket Propelled Warhead + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=27593; +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`, `aura_required`, `aura_forbidden`, `user_type`) VALUES +(27593, 49177, 0, 0, 0, 1, 0, 0, 0); -- Ride Rocket Propelled Warhead + +-- Fix requirements for Element 115 from Nayd +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceEntry`=37664; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(4, 24095, 37664, 0, 9, 12433, 0, 0, 0, '', 'Element 115 - Seeking Solvent'), +(4, 24095, 37664, 1, 9, 12434, 0, 0, 0, '', 'Element 115 - Always Seeking Solvent'), +(4, 24095, 37664, 2, 9, 12443, 0, 0, 0, '', 'Element 115 - Seeking Solvent'), +(4, 24095, 37664, 3, 9, 12446, 0, 0, 0, '', 'Element 115 - Always Seeking Solvent'), +(4, 24095, 37664, 4, 9, 12437, 0, 0, 0, '', 'Element 115 - Riding the Red Rocket A'), +(4, 24095, 37664, 5, 9, 12432, 0, 0, 0, '', 'Element 115 - Riding the Red Rocket H'); +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=100 WHERE `entry`=24095 AND `item`=37664; + +-- Add some missing Azure Scalebane Spawns to crystalsong Forest +DELETE FROM `creature` WHERE `guid` IN (6499,6627,7630,10504,12599,12954,13423,13424); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`unit_flags`,`dynamicflags`) VALUES +(6499,31402,571,1,1,0,0,5220.886,591.7798,187.861328,4.866286,180,10,0,1,0,1,0,0), +(6627,31402,571,1,1,0,0,5344.32,595.7,183.07399,4.99164152,180,10,0,1,0,1,0,0), +(7630,31402,571,1,1,0,0,5411.67773,623.1622,178.355133,0.87266463,180,10,0,1,0,1,0,0), +(10504,31402,571,1,1,0,0,5434.40332,783.9654,182.770508,0.5726554,180,10,0,1,0,1,0,0), +(12599,31402,571,1,1,0,0,5464.40771,716.290344,171.820313,2.65290046,180,10,0,1,0,1,0,0), +(12954,31402,571,1,1,0,0,5573.34326,862.8543,161.738586,1.48352981,180,10,0,1,0,1,0,0), +(13423,31402,571,1,1,0,0,5659.52734,987.839844,174.5677,0.314159274,180,0,0,1,0,0,570688256,32), +(13424,31402,571,1,1,0,0,5660.18652,1028.454,174.562653,2.79252672,180,0,0,1,0,0,570688256,32); +-- Addons for dead appearance +DELETE FROM `creature_addon` WHERE `guid` IN (13423,13424); +INSERT INTO `creature_addon` (`guid`,`bytes2`,`auras`) VALUES +(13423,1,29266), +(13424,1,29266); +UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=25195; -- Azure Scalebane +DELETE FROM `creature_template_addon` WHERE `entry`=31402; +INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(31402,0,0,1,0, NULL); -- Azure Scalebane diff --git a/sql/updates/world/2011_10_07_00_world_spell_script_names.sql b/sql/updates/world/2011_10_07_00_world_spell_script_names.sql new file mode 100644 index 00000000000..94d4f1fd8fc --- /dev/null +++ b/sql/updates/world/2011_10_07_00_world_spell_script_names.sql @@ -0,0 +1,2 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=40121; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (40121,'spell_dru_swift_flight_passive'); diff --git a/sql/updates/world/2011_10_07_01_world_command.sql b/sql/updates/world/2011_10_07_01_world_command.sql new file mode 100644 index 00000000000..c3767c7dc00 --- /dev/null +++ b/sql/updates/world/2011_10_07_01_world_command.sql @@ -0,0 +1,3 @@ +DELETE FROM `command` WHERE `name` = 'ticket reset'; +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('ticket reset', 3, 'Syntax: .ticket reset\nRemoves all closed tickets and resets the counter, if no pending open tickets are existing.');
\ No newline at end of file diff --git a/sql/updates/world/2011_10_07_02_world_trinity_string.sql b/sql/updates/world/2011_10_07_02_world_trinity_string.sql new file mode 100644 index 00000000000..2dff16050e4 --- /dev/null +++ b/sql/updates/world/2011_10_07_02_world_trinity_string.sql @@ -0,0 +1,4 @@ +DELETE FROM `trinity_string` WHERE `entry` IN(2027,2028); +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +('2027', 'There are pending open tickets, please close them first!'), +('2028', 'All closed tickets were deleted and counter is reseted to |cffff00ff 1|r');
\ No newline at end of file diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index dbc5f65c711..8226868fa7a 100755 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -75,7 +75,7 @@ extern int main(int argc, char **argv) // Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_REALM_CONFIG; int c = 1; - while(c < argc) + while (c < argc) { if (strcmp(argv[c], "-c") == 0) { diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 67cb2a9f637..1b0800e48ae 100755 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -147,7 +147,7 @@ typedef struct AuthHandler class PatcherRunnable: public ACE_Based::Runnable { public: - PatcherRunnable(class AuthSocket* ); + PatcherRunnable(class AuthSocket*); void run(); private: diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index f4636b38bac..0dc597e98bc 100755 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -86,7 +86,7 @@ class BIH template< class T, class BoundsFunc > void build(const std::vector<T> &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) { - if(primitives.empty()) + if (primitives.empty()) return; buildData dat; dat.maxPrims = leafSize; @@ -156,7 +156,7 @@ class BIH uint32 offsetBack3[3]; // compute custom offsets from direction sign bit - for(int i=0; i<3; ++i) + for (int i=0; i<3; ++i) { offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; offsetBack[i] = offsetFront[i] ^ 1; @@ -218,7 +218,7 @@ class BIH int n = tree[node + 1]; while (n > 0) { bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); - if(stopAtFirst && hit) return; + if (stopAtFirst && hit) return; --n; ++offset; } @@ -376,7 +376,7 @@ class BIH maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), maxDepth(0xFFFFFFFF), numBVH2(0) { - for(int i=0; i<6; ++i) numLeavesN[i] = 0; + for (int i=0; i<6; ++i) numLeavesN[i] = 0; } void updateInner() { numNodes++; } diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp index 21907fef263..438b854de16 100755 --- a/src/server/collision/Management/VMapFactory.cpp +++ b/src/server/collision/Management/VMapFactory.cpp @@ -27,10 +27,10 @@ namespace VMAP { void chompAndTrim(std::string& str) { - while(str.length() >0) + while (str.length() >0) { char lc = str[str.length()-1]; - if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') + if (lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') { str = str.substr(0, str.length()-1); } @@ -39,10 +39,10 @@ namespace VMAP break; } } - while(str.length() >0) + while (str.length() >0) { char lc = str[0]; - if(lc == ' ' || lc == '"' || lc == '\'') + if (lc == ' ' || lc == '"' || lc == '\'') { str = str.substr(1, str.length()-1); } @@ -54,7 +54,7 @@ namespace VMAP } IVMapManager* gVMapManager = 0; - Table<unsigned int , bool>* iIgnoreSpellIds=0; + Table<unsigned int, bool>* iIgnoreSpellIds=0; //=============================================== // result false, if no more id are found @@ -63,14 +63,14 @@ namespace VMAP { bool result = false; unsigned int i; - for(i=pStartPos;i<pString.size(); ++i) + for (i=pStartPos;i<pString.size(); ++i) { - if(pString[i] == ',') + if (pString[i] == ',') { break; } } - if(i>pStartPos) + if (i>pStartPos) { std::string idString = pString.substr(pStartPos, i-pStartPos); pStartPos = i+1; @@ -88,15 +88,15 @@ namespace VMAP void VMapFactory::preventSpellsFromBeingTestedForLoS(const char* pSpellIdString) { - if(!iIgnoreSpellIds) - iIgnoreSpellIds = new Table<unsigned int , bool>(); - if(pSpellIdString != NULL) + if (!iIgnoreSpellIds) + iIgnoreSpellIds = new Table<unsigned int, bool>(); + if (pSpellIdString != NULL) { unsigned int pos =0; unsigned int id; std::string confString(pSpellIdString); chompAndTrim(confString); - while(getNextId(confString, pos, id)) + while (getNextId(confString, pos, id)) { iIgnoreSpellIds->set(id, true); } @@ -114,7 +114,7 @@ namespace VMAP // just return the instance IVMapManager* VMapFactory::createOrGetVMapManager() { - if(gVMapManager == 0) + if (gVMapManager == 0) gVMapManager= new VMapManager2(); // should be taken from config ... Please change if you like :-) return gVMapManager; } diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 7c41a5bed41..9f32c749c5c 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -62,17 +62,6 @@ namespace VMAP return pos; } - Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const - { - Vector3 pos; - const float mid = 0.5f * 64.0f * 533.33333333f; - pos.x = mid - x; - pos.y = mid - y; - pos.z = z; - - return pos; - } - // move to MapTree too? std::string VMapManager2::getMapFileName(unsigned int mapId) { @@ -175,7 +164,7 @@ namespace VMAP Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); Vector3 resultPos; bool result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, modifyDist); - resultPos = convertPositionToMangosRep(resultPos.x, resultPos.y, resultPos.z); + resultPos = convertPositionToInternalRep(resultPos.x, resultPos.y, resultPos.z); rx = resultPos.x; ry = resultPos.y; rz = resultPos.z; @@ -222,7 +211,7 @@ namespace VMAP { Vector3 pos = convertPositionToInternalRep(x, y, z); bool result = instanceTree->second->getAreaInfo(pos, flags, adtId, rootId, groupId); - // z is not touched by convertPositionToMangosRep(), so just copy + // z is not touched by convertPositionToInternalRep(), so just copy z = pos.z; return result; } diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index dc1b4c84ade..ac293e2071b 100755 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -78,7 +78,6 @@ namespace VMAP public: // public for debug G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; - G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const; static std::string getMapFileName(unsigned int mapId); VMapManager2(); diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index bfbbef3d915..594e1a9382b 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -265,13 +265,13 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; // only use this for array deletes - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); @@ -377,11 +377,11 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp index a86f6cac45a..f0bff0cef73 100644 --- a/src/server/collision/Models/ModelInstance.cpp +++ b/src/server/collision/Models/ModelInstance.cpp @@ -57,7 +57,7 @@ namespace VMAP Ray modRay(p, iInvRot * pRay.direction()); float distance = pMaxDist * iInvScale; bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit); - if(hit) + if (hit) { distance *= iScale; pMaxDist = distance; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 3dad4a10174..55aad9bb029 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -161,7 +161,7 @@ namespace VMAP if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F) return false; - // (dx, dy) coordinates inside tile, in [0,1]^2 + // (dx, dy) coordinates inside tile, in [0, 1]^2 float dx = tx_f - (float)tx; float dy = ty_f - (float)ty; @@ -169,7 +169,7 @@ namespace VMAP ^ dy | - 1 x---------x (1,1) + 1 x---------x (1, 1) | (b) / | | / | | / | @@ -442,7 +442,7 @@ namespace VMAP { float group_Z; //float pVol = prims[entry].GetBound().volume(); - //if(pVol < minVol) + //if (pVol < minVol) //{ /* if (prims[entry].iBound.contains(point)) */ if (prims[entry].IsInsideObject(point, zVec, group_Z)) @@ -505,9 +505,8 @@ namespace VMAP if (!wf) return false; - bool result = true; uint32 chunkSize, count; - result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8; + bool result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8; if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false; chunkSize = sizeof(uint32) + sizeof(uint32); if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index e11be0612a2..8397ad7954e 100755 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -131,7 +131,7 @@ void UnitAI::DoCast(uint32 spellId) { Unit* target = NULL; //sLog->outError("aggre %u %u", spellId, (uint32)AISpellInfo[spellId].target); - switch(AISpellInfo[spellId].target) + switch (AISpellInfo[spellId].target) { default: case AITARGET_SELF: target = me; break; diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 8485559c7fa..3c16fe493b4 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -49,14 +49,14 @@ enum SelectAggroTarget }; // default predicate function to select target based on distance, player and/or aura criteria -struct DefaultTargetSelector : public std::unary_function<Unit* , bool> +struct DefaultTargetSelector : public std::unary_function<Unit*, bool> { const Unit* me; float m_dist; bool m_playerOnly; int32 m_aura; - // pUnit: the reference unit + // unit: the reference unit // dist: if 0: ignored, if > 0: maximum distance to the reference unit, if < 0: minimum distance to the reference unit // playerOnly: self explaining // aura: if 0: ignored, if > 0: the target shall have the aura, if < 0, the target shall NOT have the aura @@ -152,7 +152,7 @@ class UnitAI Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend std::unary_function<Unit* , bool> + // predicate shall extend std::unary_function<Unit*, bool> template <class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate) { const std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList(); @@ -202,7 +202,7 @@ class UnitAI void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); // Select the targets satifying the predicate. - // predicate shall extend std::unary_function<Unit* , bool> + // predicate shall extend std::unary_function<Unit*, bool> template <class PREDICATE> void SelectTargetList(std::list<Unit*>& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType) { std::list<HostileReference*> const& threatlist = me->getThreatManager().getThreatList(); diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index ea229169dda..329a2d004a5 100755 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -100,7 +100,7 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= NULL*/, float maxRangeToN } /* Causes certain things to never leave the threat list (Priest Lightwell, etc): - for (Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr) + for (Unit::ControlList::const_iterator itr = player->m_Controlled.begin(); itr != player->m_Controlled.end(); ++itr) { creature->SetInCombatWith(*itr); (*itr)->SetInCombatWith(creature); diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 2e4e00aa7c9..662ed3ab3dd 100755 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -142,7 +142,7 @@ class CreatureAI : public UnitAI // Called when creature attack expected (if creature can and no have current victim) // Note: for reaction at hostile action must be called AttackedBy function. - //virtual void AttackStart(Unit* ) {} + //virtual void AttackStart(Unit*) {} // Called at World update tick //virtual void UpdateAI(const uint32 /*diff*/) {} @@ -150,7 +150,7 @@ class CreatureAI : public UnitAI /// == State checks ================================= // Is unit visible for MoveInLineOfSight - //virtual bool IsVisible(Unit* ) const { return false; } + //virtual bool IsVisible(Unit*) const { return false; } // called when the corpse of this creature gets removed virtual void CorpseRemoved(uint32& /*respawnDelay*/) {} diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 46060445ee9..848c2561f3f 100755 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -329,7 +329,7 @@ class EventMap : private std::map<uint32, uint32> // Sets event phase, must be in range 1 - 8 void SetPhase(uint32 phase) { - if (phase && phase < 9) + if (phase && phase < 8) _phase = (1 << (phase + 24)); } @@ -340,7 +340,7 @@ class EventMap : private std::map<uint32, uint32> time += _time; if (groupId && groupId < 9) eventId |= (1 << (groupId + 16)); - if (phase && phase < 9) + if (phase && phase < 8) eventId |= (1 << (phase + 24)); const_iterator itr = find(time); while (itr != end()) diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 27807283edc..62d7a1f4f58 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -1272,7 +1272,7 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* source, Unit* t sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", textEntry, source->GetTypeId()); } - switch((*i).second.Type) + switch ((*i).second.Type) { case CHAT_TYPE_SAY: source->MonsterSay(textEntry, (*i).second.Language, target ? target->GetGUID() : 0); diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index 72828ad01d6..c27613f320f 100755 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -278,7 +278,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() sLog->outErrorDb("CreatureEventAI: Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i); break; case EVENT_T_SPAWNED: - switch(temp.spawned.condition) + switch (temp.spawned.condition) { case SPAWNED_EVENT_ALWAY: break; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index ecdae923a9d..2322e88d105 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -52,8 +52,7 @@ void SummonList::DespawnEntry(uint32 entry) else if (summon->GetEntry() == entry) { erase(i++); - summon->setDeathState(JUST_DIED); - summon->RemoveCorpse(); + summon->DespawnOrUnsummon(); } else ++i; @@ -70,13 +69,7 @@ void SummonList::DespawnAll() else { erase(begin()); - if (TempSummon* summ = summon->ToTempSummon()) - { - summon->DestroyForNearbyPlayers(); - summ->UnSummon(); - } - else - summon->DisappearAndDie(); + summon->DespawnOrUnsummon(); } } } @@ -436,7 +429,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff) float y = me->GetPositionY(); float z = me->GetPositionZ(); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_BROODLORD: // broodlord (not move down stairs) if (z > 448.60f) @@ -457,7 +450,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff) default: // For most of creatures that certain area is their home area. sLog->outDetail("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition. Using the default one.", me->GetEntry()); uint32 homeAreaId = me->GetMap()->GetAreaId(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY(), me->GetHomePosition().GetPositionZ()); - if(me->GetAreaId() == homeAreaId) + if (me->GetAreaId() == homeAreaId) return false; } 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/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h index 9bf602d499d..5d376be888e 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h @@ -82,7 +82,7 @@ enum eTradeskill #define ADD_GOSSIP_ITEM(a, b, c, d) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, "", 0) #define ADD_GOSSIP_ITEM_EXTENDED(a, b, c, d, e, f, g) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, e, f, g) -// This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32) , b - npc guid(uint64) +// This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32), b - npc guid(uint64) #define SEND_GOSSIP_MENU(a, b) PlayerTalkClass->SendGossipMenu(a, b) // Closes the Menu diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 2b3f3dd7305..0b77dd03e87 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -462,13 +462,19 @@ void SmartAI::EnterEvadeMode() void SmartAI::MoveInLineOfSight(Unit* who) { - if (!who) return; + if (!who) + return; + GetScript()->OnMoveInLineOfSight(who); + if (me->HasReactState(REACT_PASSIVE) || AssistPlayerInCombat(who)) return; if (!CanAIAttack(who)) return; + + if (!me->canStartAttack(who, false)) + return; if (me->IsHostileTo(who)) { @@ -487,9 +493,6 @@ void SmartAI::MoveInLineOfSight(Unit* who) } } } - - //if (me->canStartAttack(who, false)) - // AttackStart(who); } bool SmartAI::CanAIAttack(const Unit* /*who*/) const @@ -843,7 +846,7 @@ void SmartGameObjectAI::Reset() bool SmartGameObjectAI::GossipHello(Player* player) { sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello"); - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0 , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0, 0, false, NULL, go); return false; } @@ -863,14 +866,14 @@ bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, // Called when a player accepts a quest from the gameobject. bool SmartGameObjectAI::QuestAccept(Player* player, Quest const* quest) { - GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId() , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId(), 0, false, NULL, go); return false; } // Called when a player selects a quest reward. bool SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, uint32 opt) { - GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId() , opt , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId(), opt, false, NULL, go); return false; } @@ -880,7 +883,7 @@ uint32 SmartGameObjectAI::GetDialogStatus(Player* /*player*/) { return 100; } // Called when the gameobject is destroyed (destructible buildings only). void SmartGameObjectAI::Destroyed(Player* player, uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId , 0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId, 0, false, NULL, go); } void SmartGameObjectAI::SetData(uint32 id, uint32 value) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 854e155c148..54c69080c41 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -460,7 +460,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (IsPlayer(*itr)) { (*itr)->ToPlayer()->CastedCreatureOrGO(e.action.castedCreatureOrGO.creature, GetBaseObject()->GetGUID(), e.action.castedCreatureOrGO.spell); - sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_CASTCREATUREORGO: Player guidLow %u.org Creature: %u, BaseObject GUID: "UI64FMTD" , Spell: %u", + sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_CASTCREATUREORGO: Player guidLow %u.org Creature: %u, BaseObject GUID: "UI64FMTD", Spell: %u", (*itr)->GetGUIDLow(), e.action.castedCreatureOrGO.creature, GetBaseObject()->GetGUID(), e.action.castedCreatureOrGO.spell); } } @@ -1309,7 +1309,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u bool run = e.action.setRun.run ? true : false; CAST_AI(SmartAI, me->AI())->SetRun(run); - me->GetMotionMaster()->MovePoint(0, e.target.x, e.target.y , e.target.z); + me->GetMotionMaster()->MovePoint(0, e.target.x, e.target.y, e.target.z); break; } case SMART_ACTION_RESPAWN_TARGET: @@ -1323,7 +1323,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (IsCreature(*itr)) (*itr)->ToCreature()->Respawn(); else if (IsGameObject(*itr)) - (*itr)->ToGameObject()->Respawn(); + (*itr)->ToGameObject()->SetRespawnTime(e.action.RespawnTarget.GoRespawnTime); } delete targets; @@ -1781,7 +1781,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } case SMART_ACTION_JUMP_TO_POS: { - me->GetMotionMaster()->MoveJump(e.target.x, e.target.y , e.target.z, (float)e.action.jump.speedxy, (float)e.action.jump.speedz); + me->GetMotionMaster()->MoveJump(e.target.x, e.target.y, e.target.z, (float)e.action.jump.speedxy, (float)e.action.jump.speedz); break; } default: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index f03e278a133..fab2a6b7722 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -123,7 +123,7 @@ void SmartAIMgr::LoadSmartAIFromDB() } if (temp.entryOrGuid >= 0) { - switch(source_type) + switch (source_type) { case SMART_SCRIPT_TYPE_CREATURE: { diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index de60737f3b6..327d03d31ff 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -859,6 +859,11 @@ struct SmartAction struct { + uint32 GoRespawnTime; + } RespawnTarget; + + struct + { uint32 param1; uint32 param2; uint32 param3; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index b16c2223d25..fca4df12587 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -507,10 +507,8 @@ void AchievementMgr::SaveToDB(SQLTransaction& trans) } if (need_execute) - ssdel << ')'; - - if (need_execute) { + ssdel << ')'; trans->Append(ssdel.str().c_str()); trans->Append(ssins.str().c_str()); } @@ -1600,7 +1598,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui } } -static const uint32 achievIdByClass[MAX_CLASSES] = { 0, 459, 465 , 462, 458, 464, 461, 467, 460, 463, 0, 466 }; +static const uint32 achievIdByClass[MAX_CLASSES] = { 0, 459, 465, 462, 458, 464, 461, 467, 460, 463, 0, 466 }; static const uint32 achievIdByRace[MAX_RACES] = { 0, 1408, 1410, 1407, 1409, 1413, 1411, 1404, 1412, 0, 1405, 1406 }; bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement) @@ -2039,9 +2037,9 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) return; // titles - //! Currently there's only one achievement that deals with gender-specific titles. + //! Currently there's only one achievement that deals with gender-specific titles. //! Since no common attributes were found, (not even in titleRewardFlags field) - //! we explicitly check by ID. Maybe in the future we could move the achievement_reward + //! we explicitly check by ID. Maybe in the future we could move the achievement_reward //! condition fields to the condition system. if (uint32 titleId = reward->titleId[achievement->ID == 1793 ? GetPlayer()->getGender() : (GetPlayer()->GetTeam() == ALLIANCE ? 0 : 1)]) if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index a5feac09ea4..ce555b3c503 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -255,7 +255,7 @@ void Battleground::Update(uint32 diff) return; } - switch(GetStatus()) + switch (GetStatus()) { case STATUS_WAIT_JOIN: if (GetPlayersSize()) @@ -437,6 +437,13 @@ inline void Battleground::_ProcessJoin(uint32 diff) { m_Events |= BG_STARTING_EVENT_1; + if(!FindBgMap()) + { + sLog->outError("Battleground::_ProcessJoin: map (map id: %u, instance id: %u) is not created!", m_MapId, m_InstanceID); + EndNow(); + return; + } + // Setup here, only when at least one player has ported to the map if (!SetupBattleground()) { @@ -890,7 +897,7 @@ uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const uint32 Battleground::GetBattlemasterEntry() const { - switch(GetTypeID(true)) + switch (GetTypeID(true)) { case BATTLEGROUND_AV: return 15972; case BATTLEGROUND_WS: return 14623; @@ -1407,7 +1414,7 @@ bool Battleground::AddObject(uint32 type, uint32 entry, float x, float y, float // If the assert is called, means that m_BgObjects must be resized! ASSERT(type < m_BgObjects.size()); - Map* map = GetBgMap(); + Map* map = FindBgMap(); if (!map) return false; // Must be created this way, adding to godatamap would add it to the base map of the instance @@ -1504,7 +1511,7 @@ Creature* Battleground::GetBGCreature(uint32 type) void Battleground::SpawnBGObject(uint32 type, uint32 respawntime) { - if (Map* map = GetBgMap()) + if (Map* map = FindBgMap()) if (GameObject* obj = map->GetGameObject(m_BgObjects[type])) { if (respawntime) @@ -1523,40 +1530,40 @@ Creature* Battleground::AddCreature(uint32 entry, uint32 type, uint32 teamval, f // If the assert is called, means that m_BgCreatures must be resized! ASSERT(type < m_BgCreatures.size()); - Map* map = GetBgMap(); + Map* map = FindBgMap(); if (!map) return NULL; - Creature* pCreature = new Creature; - if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, teamval, x, y, z, o)) + Creature* creature = new Creature; + if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, teamval, x, y, z, o)) { sLog->outError("Battleground::AddCreature: cannot create creature (entry: %u) for BG (map: %u, instance id: %u)!", entry, m_MapId, m_InstanceID); - delete pCreature; + delete creature; return NULL; } - pCreature->SetHomePosition(x, y, z, o); + creature->SetHomePosition(x, y, z, o); CreatureTemplate const* cinfo = sObjectMgr->GetCreatureTemplate(entry); if (!cinfo) { sLog->outError("Battleground::AddCreature: creature template (entry: %u) does not exist for BG (map: %u, instance id: %u)!", entry, m_MapId, m_InstanceID); - delete pCreature; + delete creature; return NULL; } // Force using DB speeds - pCreature->SetSpeed(MOVE_WALK, cinfo->speed_walk); - pCreature->SetSpeed(MOVE_RUN, cinfo->speed_run); + creature->SetSpeed(MOVE_WALK, cinfo->speed_walk); + creature->SetSpeed(MOVE_RUN, cinfo->speed_run); - map->Add(pCreature); - m_BgCreatures[type] = pCreature->GetGUID(); + map->Add(creature); + m_BgCreatures[type] = creature->GetGUID(); if (respawntime) - pCreature->SetRespawnDelay(respawntime); + creature->SetRespawnDelay(respawntime); - return pCreature; + return creature; } bool Battleground::DelCreature(uint32 type) @@ -1601,18 +1608,18 @@ bool Battleground::AddSpiritGuide(uint32 type, float x, float y, float z, float BG_CREATURE_ENTRY_A_SPIRITGUIDE : BG_CREATURE_ENTRY_H_SPIRITGUIDE; - if (Creature* pCreature = AddCreature(entry, type, team, x, y, z, o)) + if (Creature* creature = AddCreature(entry, type, team, x, y, z, o)) { - pCreature->setDeathState(DEAD); - pCreature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pCreature->GetGUID()); + creature->setDeathState(DEAD); + creature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, creature->GetGUID()); // aura // TODO: Fix display here - // pCreature->SetVisibleAura(0, SPELL_SPIRIT_HEAL_CHANNEL); + // creature->SetVisibleAura(0, SPELL_SPIRIT_HEAL_CHANNEL); // casting visual effect - pCreature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SPIRIT_HEAL_CHANNEL); + creature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SPIRIT_HEAL_CHANNEL); // correct cast speed - pCreature->SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f); - //pCreature->CastSpell(pCreature, SPELL_SPIRIT_HEAL_CHANNEL, true); + creature->SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f); + //creature->CastSpell(creature, SPELL_SPIRIT_HEAL_CHANNEL, true); return true; } sLog->outError("Battleground::AddSpiritGuide: cannot create spirit guide (type: %u, entry: %u) for BG (map: %u, instance id: %u)!", @@ -1887,8 +1894,8 @@ bool Battleground::IsTeamScoreInRange(uint32 team, uint32 minScore, uint32 maxSc void Battleground::StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry) { for (BattlegroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr) - if (Player* pPlayer = ObjectAccessor::FindPlayer(itr->first)) - pPlayer->GetAchievementMgr().StartTimedAchievement(type, entry); + if (Player* player = ObjectAccessor::FindPlayer(itr->first)) + player->GetAchievementMgr().StartTimedAchievement(type, entry); } void Battleground::SetBracket(PvPDifficultyEntry const* bracketEntry) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 6e791127c33..d5921e4bf37 100755 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -431,11 +431,8 @@ class Battleground // Map pointers void SetBgMap(BattlegroundMap* map) { m_Map = map; } - BattlegroundMap* GetBgMap() - { - ASSERT(m_Map); - return m_Map; - } + BattlegroundMap* GetBgMap() const { ASSERT(m_Map); return m_Map; } + BattlegroundMap* FindBgMap() const { return m_Map; } void SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, float O); void GetTeamStartLoc(uint32 TeamID, float &X, float &Y, float &Z, float &O) const @@ -573,6 +570,8 @@ class Battleground void RewardXPAtKill(Player* killer, Player* victim); bool CanAwardArenaPoints() const { return m_LevelMin >= BG_AWARD_ARENA_POINTS_MIN_LEVEL; } + virtual uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const { return 0; } + protected: // this method is called, when BG cannot spawn its own spirit guide, or something is wrong, It correctly ends Battleground void EndNow(); diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 86a9511bcf8..e00abb03320 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -203,7 +203,7 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket* data, Battlegro *data << uint8(bg->isRated()); // 1 for rated match, 0 for bg or non rated match *data << uint32(StatusID); // status - switch(StatusID) + switch (StatusID) { case STATUS_WAIT_QUEUE: // status_in_queue *data << uint32(Time1); // average wait time, milliseconds @@ -296,14 +296,13 @@ 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 - switch(bg->GetTypeID(true)) // battleground specific things + switch (bg->GetTypeID(true)) // battleground specific things { case BATTLEGROUND_RB: - switch(bg->GetMapId()) + switch (bg->GetMapId()) { case 489: *data << uint32(0x00000002); // count of next fields @@ -554,7 +553,7 @@ Battleground* BattlegroundMgr::CreateNewBattleground(BattlegroundTypeId bgTypeId Battleground* bg = NULL; // create a copy of the BG template - switch(bgTypeId) + switch (bgTypeId) { case BATTLEGROUND_AV: bg = new BattlegroundAV(*(BattlegroundAV*)bg_template); @@ -863,7 +862,7 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, uint64 guid *data << uint32(*itr); ++count; } - data->put<uint32>(count_pos , count); + data->put<uint32>(count_pos, count); } } } @@ -907,13 +906,12 @@ bool BattlegroundMgr::IsArenaType(BattlegroundTypeId bgTypeId) bgTypeId == BATTLEGROUND_NA || bgTypeId == BATTLEGROUND_DS || bgTypeId == BATTLEGROUND_RV || - bgTypeId == BATTLEGROUND_RL || - bgTypeId == BATTLEGROUND_DS); + bgTypeId == BATTLEGROUND_RL); } BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgTypeId, uint8 arenaType) { - switch(bgTypeId) + switch (bgTypeId) { case BATTLEGROUND_WS: return BATTLEGROUND_QUEUE_WS; @@ -935,7 +933,7 @@ BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgType case BATTLEGROUND_BE: case BATTLEGROUND_DS: case BATTLEGROUND_RV: - switch(arenaType) + switch (arenaType) { case ARENA_TYPE_2v2: return BATTLEGROUND_QUEUE_2v2; @@ -953,7 +951,7 @@ BattlegroundQueueTypeId BattlegroundMgr::BGQueueTypeId(BattlegroundTypeId bgType BattlegroundTypeId BattlegroundMgr::BGTemplateId(BattlegroundQueueTypeId bgQueueTypeId) { - switch(bgQueueTypeId) + switch (bgQueueTypeId) { case BATTLEGROUND_QUEUE_WS: return BATTLEGROUND_WS; @@ -980,7 +978,7 @@ BattlegroundTypeId BattlegroundMgr::BGTemplateId(BattlegroundQueueTypeId bgQueue uint8 BattlegroundMgr::BGArenaType(BattlegroundQueueTypeId bgQueueTypeId) { - switch(bgQueueTypeId) + switch (bgQueueTypeId) { case BATTLEGROUND_QUEUE_2v2: return ARENA_TYPE_2v2; @@ -1091,7 +1089,6 @@ void BattlegroundMgr::LoadBattleMastersEntry() } mBattleMastersMap[entry] = BattlegroundTypeId(bgTypeId); - } while (result->NextRow()); @@ -1130,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/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 9cd87bf4725..67cea3e7be1 100755 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -805,7 +805,7 @@ void BattlegroundQueue::BattlegroundQueueUpdate(uint32 diff, BattlegroundTypeId //this switch can be much shorter MaxPlayersPerTeam = arenaType; MinPlayersPerTeam = arenaType; - /*switch(arenaType) + /*switch (arenaType) { case ARENA_TYPE_2v2: MaxPlayersPerTeam = 2; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index efe8075a03e..a647a3c6299 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -618,9 +618,9 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) //send a nice message to all :) char buf[256]; if (IsTower(node)) - sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN), GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); else - sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN), GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) @@ -1298,17 +1298,17 @@ bool BattlegroundAV::SetupBattleground() } } - if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N , BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3], 0, 0, sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N, BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3], 0, 0, sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!8"); return false; } for (uint8 i = 0; i < 4; i++) { - if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH, BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!9.%i", i); return false; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 08a34f71ba1..fdb81491771 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -48,7 +48,7 @@ enum BG_EY_WorldStates BLOOD_ELF_ALLIANCE_CONTROL = 2723, BLOOD_ELF_UNCONTROL = 2722, PROGRESS_BAR_PERCENT_GREY = 2720, //100 = empty (only grey), 0 = blue|red (no grey) - PROGRESS_BAR_STATUS = 2719, //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky , 100 = full alliance + PROGRESS_BAR_STATUS = 2719, //50 init!, 48 ... hordak bere .. 33 .. 0 = full 100% hordacky, 100 = full alliance PROGRESS_BAR_SHOW = 2718, //1 init, 0 druhy send - bez messagu, 1 = controlled aliance NETHERSTORM_FLAG = 2757, //set to 2 when flag is picked up, and to 1 if it is dropped @@ -341,7 +341,7 @@ class BattlegroundEY : public Battleground virtual void StartingEventOpenDoors(); /* BG Flags */ - uint64 GetFlagPickerGUID() const { return m_FlagKeeper; } + uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const { return m_FlagKeeper; } void SetFlagPicker(uint64 guid) { m_FlagKeeper = guid; } bool IsFlagPickedup() const { return m_FlagKeeper != 0; } uint8 GetFlagState() const { return m_FlagState; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 47c13d8f860..b00e8dac1d8 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -332,7 +332,7 @@ void BattlegroundIC::UpdatePlayerScore(Player* Source, uint32 type, uint32 value if (itr == m_PlayerScores.end()) // player not found... return; - switch(type) + switch (type) { case SCORE_BASES_ASSAULTED: ((BattlegroundICScore*)itr->second)->BasesAssaulted += value; @@ -642,7 +642,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) sLog->outError("Isle of Conquest: Failed to spawn spirit guide! point: %u, team: %u, ", nodePoint->nodeType, nodePoint->faction); } - switch(nodePoint->gameobject_type) + switch (nodePoint->gameobject_type) { case BG_IC_GO_HANGAR_BANNER: // all the players on the stopped transport should be teleported out @@ -833,7 +833,7 @@ void BattlegroundIC::DestroyGate(Player* player, GameObject* go) uint32 lang_entry = 0; - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_HORDE_GATE_1: lang_entry = LANG_BG_IC_NORTH_GATE_DESTROYED; @@ -940,7 +940,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry, uint32 period) t->SetMap(GetBgMap()); for (uint8 i = 0; i < 5; i++) - t->AddNPCPassenger(0, (goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); + t->AddNPCPassenger(0, (goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); return t; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index ed8a271921d..efa91559ca6 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -911,7 +911,7 @@ class BattlegroundIC : public Battleground uint32 GetGateIDFromEntry(uint32 id) { uint32 i = 0; - switch(id) + switch (id) { case GO_HORDE_GATE_1: i = BG_IC_H_FRONT ;break; case GO_HORDE_GATE_2: i = BG_IC_H_WEST ;break; @@ -927,7 +927,7 @@ class BattlegroundIC : public Battleground { uint32 uws = 0; - switch(id) + switch (id) { case GO_HORDE_GATE_1: uws = (open ? BG_IC_GATE_FRONT_H_WS_OPEN : BG_IC_GATE_FRONT_H_WS_CLOSED); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 775467fecde..c214ac21068 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -201,13 +201,13 @@ bool BattlegroundSA::ResetObjs() } //Player may enter BEFORE we set up bG - lets update his worldstates anyway... - UpdateWorldState(BG_SA_RIGHT_GY_HORDE , GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_LEFT_GY_HORDE , GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_CENTER_GY_HORDE , GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_RIGHT_GY_HORDE, GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_LEFT_GY_HORDE, GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_HORDE?1:0); + UpdateWorldState(BG_SA_CENTER_GY_HORDE, GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_HORDE?1:0); - UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE , GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); - UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE , GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); - UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE , GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_RIGHT_GY_ALLIANCE, GraveyardStatus[BG_SA_RIGHT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_LEFT_GY_ALLIANCE, GraveyardStatus[BG_SA_LEFT_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); + UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE, GraveyardStatus[BG_SA_CENTRAL_CAPTURABLE_GY] == TEAM_ALLIANCE?1:0); if (Attackers == TEAM_ALLIANCE) { @@ -612,7 +612,7 @@ void BattlegroundSA::DestroyGate(Player* player, GameObject* go) UpdateWorldState(uws, GateStatus[i]); bool rewardHonor = true; gateDestroyed = true; - switch(i) + switch (i) { case BG_SA_GREEN_GATE: if (GateStatus[BG_SA_BLUE_GATE] == BG_SA_GATE_DESTROYED) @@ -686,7 +686,7 @@ void BattlegroundSA::SendTime() void BattlegroundSA::EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) { - switch(target_obj->GetEntry()) + switch (target_obj->GetEntry()) { case 191307: case 191308: @@ -721,7 +721,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) uint32 npc = 0; uint32 flag = 0; - switch(i) + switch (i) { case BG_SA_LEFT_CAPTURABLE_GY: flag = BG_SA_LEFT_FLAG; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 9d8325f2c6f..5f01d0fac4d 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -168,7 +168,7 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] = { 1232.345f, -187.517f, 66.945f, 0.45f }, { 1249.634f, -224.189f, 66.72f, 0.635f }, { 1236.213f, 92.287f, 64.965f, 5.751f }, - { 1215.11f, 57.772f, 64.739f, 5.78f } , + { 1215.11f, 57.772f, 64.739f, 5.78f }, //Demolishers { 1611.597656f, -117.270073f, 8.719355f, 2.513274f}, { 1575.562500f, -158.421875f, 5.024450f, 2.129302f}, @@ -446,7 +446,7 @@ class BattlegroundSA : public Battleground uint32 GetGateIDFromDestroyEventID(uint32 id) { uint32 i = 0; - switch(id) + switch (id) { case 19046: i = BG_SA_GREEN_GATE; break; //Green gate destroyed case 19045: i = BG_SA_BLUE_GATE; break; //blue gate @@ -461,7 +461,7 @@ class BattlegroundSA : public Battleground uint32 GetWorldStateFromGateID(uint32 id) { uint32 uws = 0; - switch(id) + switch (id) { case BG_SA_GREEN_GATE: uws = BG_SA_GREEN_GATEWS; break; case BG_SA_YELLOW_GATE: uws = BG_SA_YELLOW_GATEWS; break; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index a567ecf7e33..951fe8f6b51 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -359,7 +359,7 @@ void BattlegroundWS::EventPlayerDroppedFlag(Player* Source) { if (!this->IsHordeFlagPickedup()) return; - if (GetHordeFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_HORDE) == Source->GetGUID()) { SetHordeFlagPicker(0); Source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG); @@ -369,7 +369,7 @@ void BattlegroundWS::EventPlayerDroppedFlag(Player* Source) { if (!this->IsAllianceFlagPickedup()) return; - if (GetAllianceFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_ALLIANCE) == Source->GetGUID()) { SetAllianceFlagPicker(0); Source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG); @@ -384,7 +384,7 @@ void BattlegroundWS::EventPlayerDroppedFlag(Player* Source) { if (!IsHordeFlagPickedup()) return; - if (GetHordeFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_HORDE) == Source->GetGUID()) { SetHordeFlagPicker(0); Source->RemoveAurasDueToSpell(BG_WS_SPELL_WARSONG_FLAG); @@ -401,7 +401,7 @@ void BattlegroundWS::EventPlayerDroppedFlag(Player* Source) { if (!IsAllianceFlagPickedup()) return; - if (GetAllianceFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_ALLIANCE) == Source->GetGUID()) { SetAllianceFlagPicker(0); Source->RemoveAurasDueToSpell(BG_WS_SPELL_SILVERWING_FLAG); @@ -607,7 +607,7 @@ void BattlegroundWS::HandleAreaTrigger(Player* Source, uint32 Trigger) //uint32 SpellId = 0; //uint64 buff_guid = 0; - switch(Trigger) + switch (Trigger) { case 3686: // Alliance elixir of speed spawn. Trigger not working, because located inside other areatrigger, can be replaced by IsWithinDist(object, dist) in Battleground::Update(). //buff_guid = m_BgObjects[BG_WS_OBJECT_SPEEDBUFF_1]; @@ -629,12 +629,12 @@ void BattlegroundWS::HandleAreaTrigger(Player* Source, uint32 Trigger) break; case 3646: // Alliance Flag spawn if (m_FlagState[BG_TEAM_HORDE] && !m_FlagState[BG_TEAM_ALLIANCE]) - if (GetHordeFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_HORDE) == Source->GetGUID()) EventPlayerCapturedFlag(Source); break; case 3647: // Horde Flag spawn if (m_FlagState[BG_TEAM_ALLIANCE] && !m_FlagState[BG_TEAM_HORDE]) - if (GetAllianceFlagPickerGUID() == Source->GetGUID()) + if (GetFlagPickerGUID(BG_TEAM_ALLIANCE) == Source->GetGUID()) EventPlayerCapturedFlag(Source); break; case 3649: // unk1 @@ -761,7 +761,7 @@ void BattlegroundWS::UpdatePlayerScore(Player* Source, uint32 type, uint32 value if (itr == m_PlayerScores.end()) // player not found return; - switch(type) + switch (type) { case SCORE_FLAG_CAPTURES: // flags captured ((BattlegroundWGScore*)itr->second)->FlagCaptures += value; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index 5360a04a873..386cc6945e8 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -168,8 +168,12 @@ class BattlegroundWS : public Battleground virtual void StartingEventOpenDoors(); /* BG Flags */ - uint64 GetAllianceFlagPickerGUID() const { return m_FlagKeepers[BG_TEAM_ALLIANCE]; } - uint64 GetHordeFlagPickerGUID() const { return m_FlagKeepers[BG_TEAM_HORDE]; } + uint64 GetFlagPickerGUID(int32 team) const + { + if (team == BG_TEAM_ALLIANCE || team == BG_TEAM_HORDE) + return m_FlagKeepers[team]; + return 0; + } void SetAllianceFlagPicker(uint64 guid) { m_FlagKeepers[BG_TEAM_ALLIANCE] = guid; } void SetHordeFlagPicker(uint64 guid) { m_FlagKeepers[BG_TEAM_HORDE] = guid; } bool IsAllianceFlagPickedup() const { return m_FlagKeepers[BG_TEAM_ALLIANCE] != 0; } @@ -177,10 +181,6 @@ class BattlegroundWS : public Battleground void RespawnFlag(uint32 Team, bool captured); void RespawnFlagAfterDrop(uint32 Team); uint8 GetFlagState(uint32 team) { return m_FlagState[GetTeamIndexByTeamId(team)]; } - void AddTimedAura(uint32 aura); - void RemoveTimedAura(uint32 aura); - bool IsBrutalTimerDone; - bool IsForceTimerDone; /* Battleground Events */ virtual void EventPlayerDroppedFlag(Player* Source); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 91a9382b2e3..8d03530c7f9 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -318,6 +318,7 @@ ChatCommand* ChatHandler::getCommandTable() { "closedlist", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGMTicketListClosedCommand>, "", NULL }, { "escalatedlist", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleGMTicketListEscalatedCommand>, "", NULL }, { "delete", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGMTicketDeleteByIdCommand>, "", NULL }, + { "reset", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleGMTicketResetCommand>, "", NULL }, { "assign", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleGMTicketAssignToCommand>, "", NULL }, { "unassign", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleGMTicketUnAssignCommand>, "", NULL }, { "comment", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGMTicketCommentCommand>, "", NULL }, @@ -986,7 +987,7 @@ void ChatHandler::FillMessageData(WorldPacket* data, WorldSession* session, uint else *data << uint32(LANG_UNIVERSAL); - switch(type) + switch (type) { case CHAT_MSG_SAY: case CHAT_MSG_PARTY: @@ -1287,7 +1288,7 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text) uint32 id = (uint32)atol(idS); - switch(type) + switch (type) { case SPELL_LINK_SPELL: return id; @@ -1367,7 +1368,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) if (!idS) return 0; - switch(type) + switch (type) { case SPELL_LINK_PLAYER: { diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index b33a4944e6b..6e34e39af5a 100755 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -317,6 +317,7 @@ class ChatHandler bool HandleGMTicketUnAssignCommand(const char* args); bool HandleGMTicketCommentCommand(const char* args); bool HandleGMTicketDeleteByIdCommand(const char* args); + bool HandleGMTicketResetCommand(const char* /* args */); bool HandleGMTicketReloadCommand(const char*); bool HandleToggleGMTicketSystem(const char* args); bool HandleGMTicketEscalateCommand(const char* args); 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/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 2055952a233..9e772e2cde7 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -373,7 +373,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) PSendSysMessage(LANG_PINFO_BAN, banTime > 0 ? secsToTimeString(banTime - time(NULL), true).c_str() : "permanently", bannedby.c_str(), banreason.c_str()); std::string race_s, Class_s; - switch(race) + switch (race) { case RACE_HUMAN: race_s = "Human"; break; case RACE_ORC: race_s = "Orc"; break; @@ -386,7 +386,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) case RACE_BLOODELF: race_s = "Blood Elf"; break; case RACE_DRAENEI: race_s = "Draenei"; break; } - switch(Class) + switch (Class) { case CLASS_WARRIOR: Class_s = "Warrior"; break; case CLASS_PALADIN: Class_s = "Paladin"; break; diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 9a5edda8700..e76cbfcc76b 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -1596,7 +1596,7 @@ bool ChatHandler::HandleLookupMapCommand(const char *args) if (MapInfo->IsContinent()) ss << GetTrinityString(LANG_CONTINENT); - switch(MapInfo->map_type) + switch (MapInfo->map_type) { case MAP_INSTANCE: ss << GetTrinityString(LANG_INSTANCE); break; case MAP_BATTLEGROUND: ss << GetTrinityString(LANG_BATTLEGROUND); break; @@ -2908,7 +2908,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) if (!reason) return false; - switch(mode) + switch (mode) { case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) @@ -2932,7 +2932,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) break; } - switch(sWorld->BanAccount(mode, nameOrIP, duration, reason, m_session ? m_session->GetPlayerName() : "")) + switch (sWorld->BanAccount(mode, nameOrIP, duration, reason, m_session ? m_session->GetPlayerName() : "")) { case BAN_SUCCESS: if (atoi(duration)>0) @@ -2943,7 +2943,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) case BAN_SYNTAX_ERROR: return false; case BAN_NOTFOUND: - switch(mode) + switch (mode) { default: PSendSysMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str()); @@ -3016,7 +3016,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) std::string nameOrIP = cnameOrIP; - switch(mode) + switch (mode) { case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) @@ -3569,7 +3569,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) } } - switch(PlayerDumpReader().LoadDump(file, account_id, name, guid)) + switch (PlayerDumpReader().LoadDump(file, account_id, name, guid)) { case DUMP_SUCCESS: PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS); @@ -3630,7 +3630,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) return false; } - switch(PlayerDumpWriter().WriteDump(file, uint32(guid))) + switch (PlayerDumpWriter().WriteDump(file, uint32(guid))) { case DUMP_SUCCESS: PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS); @@ -3673,7 +3673,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) SendSysMessage("Empty"); continue; } - switch(mg->GetMovementGeneratorType()) + switch (mg->GetMovementGeneratorType()) { case IDLE_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_IDLE); break; case RANDOM_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_RANDOM); break; @@ -3766,7 +3766,7 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) uint32 pLimit = sWorld->GetPlayerAmountLimit(); AccountTypes allowedAccountType = sWorld->GetPlayerSecurityLimit(); char const* secName = ""; - switch(allowedAccountType) + switch (allowedAccountType) { case SEC_PLAYER: secName = "Player"; break; case SEC_MODERATOR: secName = "Moderator"; break; @@ -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; } @@ -4689,32 +4689,32 @@ bool ChatHandler::HandleGroupRemoveCommand(const char *args) bool ChatHandler::HandlePossessCommand(const char * /*args*/) { - Unit* pUnit = getSelectedUnit(); - if (!pUnit) + Unit* unit = getSelectedUnit(); + if (!unit) return false; - m_session->GetPlayer()->CastSpell(pUnit, 530, true); + m_session->GetPlayer()->CastSpell(unit, 530, true); return true; } bool ChatHandler::HandleUnPossessCommand(const char * /*args*/) { - Unit* pUnit = getSelectedUnit(); - if (!pUnit) - pUnit = m_session->GetPlayer(); + Unit* unit = getSelectedUnit(); + if (!unit) + unit = m_session->GetPlayer(); - pUnit->RemoveCharmAuras(); + unit->RemoveCharmAuras(); return true; } bool ChatHandler::HandleBindSightCommand(const char * /*args*/) { - Unit* pUnit = getSelectedUnit(); - if (!pUnit) + Unit* unit = getSelectedUnit(); + if (!unit) return false; - m_session->GetPlayer()->CastSpell(pUnit, 6277, true); + m_session->GetPlayer()->CastSpell(unit, 6277, true); return true; } diff --git a/src/server/game/Chat/Commands/TicketCommands.cpp b/src/server/game/Chat/Commands/TicketCommands.cpp index 2ae4632d172..7caf63aac2b 100755 --- a/src/server/game/Chat/Commands/TicketCommands.cpp +++ b/src/server/game/Chat/Commands/TicketCommands.cpp @@ -320,6 +320,22 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args) return true; } +bool ChatHandler::HandleGMTicketResetCommand(const char* /* args */) +{ + if (sTicketMgr->GetOpenTicketCount() > 0) + { + SendSysMessage(LANG_COMMAND_TICKETPENDING); + return true; + } + else + { + sTicketMgr->ResetTickets(); + SendSysMessage(LANG_COMMAND_TICKETRESET); + } + + return true; +} + bool ChatHandler::HandleToggleGMTicketSystem(const char* /* args */) { bool status = !sTicketMgr->GetStatus(); diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index e5a2460b1a6..6303181a44d 100755 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -519,7 +519,7 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat HostileReference* hostilRef = threatRefStatusChangeEvent->getReference(); - switch(threatRefStatusChangeEvent->getType()) + switch (threatRefStatusChangeEvent->getType()) { case UEV_THREAT_REF_THREAT_CHANGE: if ((getCurrentVictim() == hostilRef && threatRefStatusChangeEvent->getFValue()<0.0f) || diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 7e3b19336ee..bfefb3e4e76 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1213,7 +1213,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) return false; } - switch(cond->mConditionValue1) + switch (cond->mConditionValue1) { case SPELL_TARGET_TYPE_GAMEOBJECT: { diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index e2506a36f63..faa73cefb11 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -739,7 +739,7 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId) if (!mapEntry) return CONTENT_1_60; - switch(mapEntry->Expansion()) + switch (mapEntry->Expansion()) { default: return CONTENT_1_60; case 1: return CONTENT_61_70; diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 2c7bfb3eb1d..e01acd2e03d 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1056,7 +1056,7 @@ struct HolidaysEntry //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) //char *textureFilename; // 51 m_textureFilename //uint32 priority; // 52 m_priority - //uint32 calendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk,1 = Darkmoon Festival, 2 = Yearly holiday) + //uint32 calendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk, 1 = Darkmoon Festival, 2 = Yearly holiday) //uint32 flags; // 54 m_flags (0 = Darkmoon Faire, Fishing Contest and Wotlk Launch, rest is 1) }; diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp index 0691c6e1b40..e81b8bd1774 100644 --- a/src/server/game/DungeonFinding/LFGGroupData.cpp +++ b/src/server/game/DungeonFinding/LFGGroupData.cpp @@ -30,7 +30,7 @@ LfgGroupData::~LfgGroupData() void LfgGroupData::SetState(LfgState state) { - switch(state) + switch (state) { case LFG_STATE_NONE: case LFG_STATE_DUNGEON: diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 7d2c02d6b23..52b41c0a0f7 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -271,7 +271,7 @@ void LFGMgr::Update(uint32 diff) role &= ~ROLE_LEADER; int32 waitTime = -1; - switch(role) + switch (role) { case ROLE_NONE: // Should not happen - just in case waitTime = -1; @@ -514,7 +514,7 @@ void LFGMgr::Join(Player* plr, uint8 roles, const LfgDungeonSet& selectedDungeon bool isDungeon = false; for (LfgDungeonSet::const_iterator it = dungeons.begin(); it != dungeons.end() && joinData.result == LFG_JOIN_OK; ++it) { - switch(GetDungeonType(*it)) + switch (GetDungeonType(*it)) { case LFG_TYPE_RANDOM: if (dungeons.size() > 1) // Only allow 1 random dungeon @@ -657,7 +657,7 @@ void LFGMgr::Leave(Player* plr, Group* grp /* = NULL*/) LfgState state = GetState(guid); sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::Leave: [" UI64FMTD "]", guid); - switch(state) + switch (state) { case LFG_STATE_QUEUED: { @@ -904,7 +904,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposal*& pProposal) { LfgQueueInfoMap::const_iterator itOther = itFirst; ++itOther; - while(itOther != pqInfoMap.end() && itOther->second->dungeons.find(*itDungeon) != itOther->second->dungeons.end()) + while (itOther != pqInfoMap.end() && itOther->second->dungeons.find(*itDungeon) != itOther->second->dungeons.end()) ++itOther; if (itOther == pqInfoMap.end()) @@ -1308,12 +1308,12 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint64 guid, bool accept) // Save wait times before redoing groups for (LfgPlayerList::const_iterator it = players.begin(); it != players.end(); ++it) { - LfgProposalPlayer* pPlayer = pProposal->players[(*it)->GetGUID()]; + LfgProposalPlayer* player = pProposal->players[(*it)->GetGUID()]; uint32 lowgroupguid = (*it)->GetGroup() ? (*it)->GetGroup()->GetLowGUID() : 0; - if (pPlayer->groupLowGuid != lowgroupguid) - sLog->outError("LFGMgr::UpdateProposal: [" UI64FMTD "] group mismatch: actual (%u) - queued (%u)", (*it)->GetGUID(), lowgroupguid, pPlayer->groupLowGuid); + if (player->groupLowGuid != lowgroupguid) + sLog->outError("LFGMgr::UpdateProposal: [" UI64FMTD "] group mismatch: actual (%u) - queued (%u)", (*it)->GetGUID(), lowgroupguid, player->groupLowGuid); - uint64 guid = pPlayer->groupLowGuid ? MAKE_NEW_GUID(pPlayer->groupLowGuid, 0, HIGHGUID_GROUP) : (*it)->GetGUID(); + uint64 guid = player->groupLowGuid ? MAKE_NEW_GUID(player->groupLowGuid, 0, HIGHGUID_GROUP) : (*it)->GetGUID(); LfgQueueInfoMap::iterator itQueue = m_QueueInfoMap.find(guid); if (itQueue == m_QueueInfoMap.end()) { @@ -1358,7 +1358,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint64 guid, bool accept) // Update timers uint8 role = GetRoles(pguid); role &= ~ROLE_LEADER; - switch(role) + switch (role) { case ROLE_DAMAGE: { diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index e3e84c6a8a0..e9400f85d3b 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -27,7 +27,7 @@ LfgPlayerData::~LfgPlayerData() void LfgPlayerData::SetState(LfgState state) { - switch(state) + switch (state) { case LFG_STATE_NONE: case LFG_STATE_DUNGEON: diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index bf0fd1ae214..a8e219f4f6b 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -434,7 +434,7 @@ void Creature::Update(uint32 diff) m_vehicleKit->Reset(); } - switch(m_deathState) + switch (m_deathState) { case JUST_ALIVED: // Must not be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting. @@ -657,14 +657,14 @@ void Creature::DoFleeToGetAssistance() float radius = sWorld->getFloatConfig(CONFIG_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS); if (radius >0) { - Creature* pCreature = NULL; + Creature* creature = NULL; CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); Trinity::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius); - Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck> searcher(this, pCreature, u_check); + Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck> searcher(this, creature, u_check); TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher); @@ -673,12 +673,12 @@ void Creature::DoFleeToGetAssistance() SetNoSearchAssistance(true); UpdateSpeed(MOVE_RUN, false); - if (!pCreature) - //SetFeared(true, getVictim()->GetGUID(), 0 , sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); + if (!creature) + //SetFeared(true, getVictim()->GetGUID(), 0, sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); //TODO: use 31365 SetControlled(true, UNIT_STAT_FLEEING); else - GetMotionMaster()->MoveSeekAssistance(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ()); + GetMotionMaster()->MoveSeekAssistance(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ()); } } @@ -805,7 +805,7 @@ bool Creature::Create(uint32 guidlow, Map* map, uint32 phaseMask, uint32 Entry, return true; } -bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const +bool Creature::isCanTrainingOf(Player* player, bool msg) const { if (!isTrainer()) return false; @@ -819,68 +819,68 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const return false; } - switch(GetCreatureInfo()->trainer_type) + switch (GetCreatureInfo()->trainer_type) { case TRAINER_TYPE_CLASS: - if (pPlayer->getClass() != GetCreatureInfo()->trainer_class) + if (player->getClass() != GetCreatureInfo()->trainer_class) { if (msg) { - pPlayer->PlayerTalkClass->ClearMenus(); - switch(GetCreatureInfo()->trainer_class) + player->PlayerTalkClass->ClearMenus(); + switch (GetCreatureInfo()->trainer_class) { - case CLASS_DRUID: pPlayer->PlayerTalkClass->SendGossipMenu(4913, GetGUID()); break; - case CLASS_HUNTER: pPlayer->PlayerTalkClass->SendGossipMenu(10090, GetGUID()); break; - case CLASS_MAGE: pPlayer->PlayerTalkClass->SendGossipMenu(328, GetGUID()); break; - case CLASS_PALADIN:pPlayer->PlayerTalkClass->SendGossipMenu(1635, GetGUID()); break; - case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu(4436, GetGUID()); break; - case CLASS_ROGUE: pPlayer->PlayerTalkClass->SendGossipMenu(4797, GetGUID()); break; - case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5003, GetGUID()); break; - case CLASS_WARLOCK:pPlayer->PlayerTalkClass->SendGossipMenu(5836, GetGUID()); break; - case CLASS_WARRIOR:pPlayer->PlayerTalkClass->SendGossipMenu(4985, GetGUID()); break; + case CLASS_DRUID: player->PlayerTalkClass->SendGossipMenu(4913, GetGUID()); break; + case CLASS_HUNTER: player->PlayerTalkClass->SendGossipMenu(10090, GetGUID()); break; + case CLASS_MAGE: player->PlayerTalkClass->SendGossipMenu(328, GetGUID()); break; + case CLASS_PALADIN:player->PlayerTalkClass->SendGossipMenu(1635, GetGUID()); break; + case CLASS_PRIEST: player->PlayerTalkClass->SendGossipMenu(4436, GetGUID()); break; + case CLASS_ROGUE: player->PlayerTalkClass->SendGossipMenu(4797, GetGUID()); break; + case CLASS_SHAMAN: player->PlayerTalkClass->SendGossipMenu(5003, GetGUID()); break; + case CLASS_WARLOCK:player->PlayerTalkClass->SendGossipMenu(5836, GetGUID()); break; + case CLASS_WARRIOR:player->PlayerTalkClass->SendGossipMenu(4985, GetGUID()); break; } } return false; } break; case TRAINER_TYPE_PETS: - if (pPlayer->getClass() != CLASS_HUNTER) + if (player->getClass() != CLASS_HUNTER) { - pPlayer->PlayerTalkClass->ClearMenus(); - pPlayer->PlayerTalkClass->SendGossipMenu(3620, GetGUID()); + player->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->SendGossipMenu(3620, GetGUID()); return false; } break; case TRAINER_TYPE_MOUNTS: - if (GetCreatureInfo()->trainer_race && pPlayer->getRace() != GetCreatureInfo()->trainer_race) + if (GetCreatureInfo()->trainer_race && player->getRace() != GetCreatureInfo()->trainer_race) { if (msg) { - pPlayer->PlayerTalkClass->ClearMenus(); - switch(GetCreatureInfo()->trainer_class) + player->PlayerTalkClass->ClearMenus(); + switch (GetCreatureInfo()->trainer_class) { - case RACE_DWARF: pPlayer->PlayerTalkClass->SendGossipMenu(5865, GetGUID()); break; - case RACE_GNOME: pPlayer->PlayerTalkClass->SendGossipMenu(4881, GetGUID()); break; - case RACE_HUMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5861, GetGUID()); break; - case RACE_NIGHTELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; - case RACE_ORC: pPlayer->PlayerTalkClass->SendGossipMenu(5863, GetGUID()); break; - case RACE_TAUREN: pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; - case RACE_TROLL: pPlayer->PlayerTalkClass->SendGossipMenu(5816, GetGUID()); break; - case RACE_UNDEAD_PLAYER:pPlayer->PlayerTalkClass->SendGossipMenu(624, GetGUID()); break; - case RACE_BLOODELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; - case RACE_DRAENEI: pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; + case RACE_DWARF: player->PlayerTalkClass->SendGossipMenu(5865, GetGUID()); break; + case RACE_GNOME: player->PlayerTalkClass->SendGossipMenu(4881, GetGUID()); break; + case RACE_HUMAN: player->PlayerTalkClass->SendGossipMenu(5861, GetGUID()); break; + case RACE_NIGHTELF: player->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; + case RACE_ORC: player->PlayerTalkClass->SendGossipMenu(5863, GetGUID()); break; + case RACE_TAUREN: player->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; + case RACE_TROLL: player->PlayerTalkClass->SendGossipMenu(5816, GetGUID()); break; + case RACE_UNDEAD_PLAYER:player->PlayerTalkClass->SendGossipMenu(624, GetGUID()); break; + case RACE_BLOODELF: player->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; + case RACE_DRAENEI: player->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; } } return false; } break; case TRAINER_TYPE_TRADESKILLS: - if (GetCreatureInfo()->trainer_spell && !pPlayer->HasSpell(GetCreatureInfo()->trainer_spell)) + if (GetCreatureInfo()->trainer_spell && !player->HasSpell(GetCreatureInfo()->trainer_spell)) { if (msg) { - pPlayer->PlayerTalkClass->ClearMenus(); - pPlayer->PlayerTalkClass->SendGossipMenu(11031, GetGUID()); + player->PlayerTalkClass->ClearMenus(); + player->PlayerTalkClass->SendGossipMenu(11031, GetGUID()); } return false; } @@ -891,23 +891,23 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const return true; } -bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const +bool Creature::isCanInteractWithBattleMaster(Player* player, bool msg) const { if (!isBattleMaster()) return false; BattlegroundTypeId bgTypeId = sBattlegroundMgr->GetBattleMasterBG(GetEntry()); if (!msg) - return pPlayer->GetBGAccessByLevel(bgTypeId); + return player->GetBGAccessByLevel(bgTypeId); - if (!pPlayer->GetBGAccessByLevel(bgTypeId)) + if (!player->GetBGAccessByLevel(bgTypeId)) { - pPlayer->PlayerTalkClass->ClearMenus(); - switch(bgTypeId) + player->PlayerTalkClass->ClearMenus(); + switch (bgTypeId) { - case BATTLEGROUND_AV: pPlayer->PlayerTalkClass->SendGossipMenu(7616, GetGUID()); break; - case BATTLEGROUND_WS: pPlayer->PlayerTalkClass->SendGossipMenu(7599, GetGUID()); break; - case BATTLEGROUND_AB: pPlayer->PlayerTalkClass->SendGossipMenu(7642, GetGUID()); break; + case BATTLEGROUND_AV: player->PlayerTalkClass->SendGossipMenu(7616, GetGUID()); break; + case BATTLEGROUND_WS: player->PlayerTalkClass->SendGossipMenu(7599, GetGUID()); break; + case BATTLEGROUND_AB: player->PlayerTalkClass->SendGossipMenu(7642, GetGUID()); break; case BATTLEGROUND_EY: case BATTLEGROUND_NA: case BATTLEGROUND_BE: @@ -915,7 +915,7 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const case BATTLEGROUND_RL: case BATTLEGROUND_SA: case BATTLEGROUND_DS: - case BATTLEGROUND_RV: pPlayer->PlayerTalkClass->SendGossipMenu(10024, GetGUID()); break; + case BATTLEGROUND_RV: player->PlayerTalkClass->SendGossipMenu(10024, GetGUID()); break; default: break; } return false; @@ -923,11 +923,11 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const return true; } -bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const +bool Creature::isCanTrainingAndResetTalentsOf(Player* player) const { - return pPlayer->getLevel() >= 10 + return player->getLevel() >= 10 && GetCreatureInfo()->trainer_type == TRAINER_TYPE_CLASS - && pPlayer->getClass() == GetCreatureInfo()->trainer_class; + && player->getClass() == GetCreatureInfo()->trainer_class; } void Creature::AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 /*MovementFlags*/, uint8 /*type*/) @@ -1411,6 +1411,10 @@ bool Creature::canStartAttack(Unit const* who, bool force) const if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE)) return false; + + // Do not attack non-combat pets + if (who->GetTypeId() == TYPEID_UNIT && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) + return false; if (!canFly() && (GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE + m_CombatDistance)) //|| who->IsControlledByPlayer() && who->IsFlying())) @@ -2113,31 +2117,31 @@ 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; for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* pPlayer = i->getSource()) + if (Player* player = i->getSource()) { - if (pPlayer->isGameMaster()) + if (player->isGameMaster()) continue; - if (pPlayer->isAlive()) + if (player->isAlive()) { - this->SetInCombatWith(pPlayer); - pPlayer->SetInCombatWith(this); - AddThreat(pPlayer, 0.0f); + this->SetInCombatWith(player); + player->SetInCombatWith(this); + AddThreat(player, 0.0f); } } } diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 19938b47bd6..3d5b86a106a 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -456,7 +456,7 @@ class Creature : public Unit, public GridObject<Creature> ///// TODO RENAME THIS!!!!! bool isCanTrainingOf(Player* player, bool msg) const; bool isCanInteractWithBattleMaster(Player* player, bool msg) const; - bool isCanTrainingAndResetTalentsOf(Player* pPlayer) const; + bool isCanTrainingAndResetTalentsOf(Player* player) const; bool canCreatureAttack(Unit const* pVictim, bool force = true) const; bool IsImmunedToSpell(SpellInfo const* spellInfo); // redefine Unit::IsImmunedToSpell 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/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 27b0ba53b3d..b17606b83cc 100755 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -44,7 +44,7 @@ void TempSummon::Update(uint32 diff) UnSummon(); return; } - switch(m_type) + switch (m_type) { case TEMPSUMMON_MANUAL_DESPAWN: break; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1af59592eea..03da98d5624 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -276,7 +276,7 @@ void GameObject::Update(uint32 diff) { case GO_NOT_READY: { - switch(GetGoType()) + switch (GetGoType()) { case GAMEOBJECT_TYPE_TRAP: { @@ -484,7 +484,7 @@ void GameObject::Update(uint32 diff) } case GO_ACTIVATED: { - switch(GetGoType()) + switch (GetGoType()) { case GAMEOBJECT_TYPE_DOOR: case GAMEOBJECT_TYPE_BUTTON: @@ -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; } @@ -1211,15 +1211,13 @@ void GameObject::Use(Unit* user) SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); SetLootState(GO_ACTIVATED); - uint32 time_to_restore = info->GetAutoCloseTime(); - // this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389) - if (time_to_restore && info->goober.customAnim) + if (info->goober.customAnim) SendCustomAnim(GetGoAnimProgress()); else SetGoState(GO_STATE_ACTIVE); - m_cooldownTime = time(NULL) + time_to_restore; + m_cooldownTime = time(NULL) + info->GetAutoCloseTime(); // cast this spell later if provided spellId = info->goober.spellId; @@ -1537,14 +1535,11 @@ void GameObject::Use(Unit* user) GameObjectTemplate const* info = GetGOInfo(); if (info) { - switch(info->entry) + switch (info->entry) { case 179785: // Silverwing Flag - // check if it's correct bg - if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS) - bg->EventPlayerClickedOnFlag(player, this); - break; case 179786: // Warsong Flag + // check if it's correct bg if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS) bg->EventPlayerClickedOnFlag(player, this); break; @@ -1660,7 +1655,7 @@ void GameObject::SendCustomAnim(uint32 anim) bool GameObject::IsInRange(float x, float y, float z, float radius) const { - GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID)); + GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(m_goInfo->displayId); if (!info) return IsWithinDist3d(x, y, z, radius); diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index ff0cf03c8b8..3402eaa64bc 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -409,7 +409,7 @@ struct GameObjectTemplate // helpers bool IsDespawnAtAction() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.consumable; case GAMEOBJECT_TYPE_GOOBER: return goober.consumable; @@ -419,7 +419,7 @@ struct GameObjectTemplate uint32 GetLockId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: return door.lockId; case GAMEOBJECT_TYPE_BUTTON: return button.lockId; @@ -438,7 +438,7 @@ struct GameObjectTemplate bool GetDespawnPossibility() const // despawn at targeting of cast? { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: return door.noDamageImmune; case GAMEOBJECT_TYPE_BUTTON: return button.noDamageImmune; @@ -452,7 +452,7 @@ struct GameObjectTemplate uint32 GetCharges() const // despawn at uses amount { - switch(type) + switch (type) { //case GAMEOBJECT_TYPE_TRAP: return trap.charges; case GAMEOBJECT_TYPE_GUARDPOST: return guardpost.charges; @@ -463,7 +463,7 @@ struct GameObjectTemplate uint32 GetLinkedGameObjectEntry() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.linkedTrapId; case GAMEOBJECT_TYPE_SPELL_FOCUS: return spellFocus.linkedTrapId; @@ -475,7 +475,7 @@ struct GameObjectTemplate uint32 GetAutoCloseTime() const { uint32 autoCloseTime = 0; - switch(type) + switch (type) { case GAMEOBJECT_TYPE_DOOR: autoCloseTime = door.autoCloseTime; break; case GAMEOBJECT_TYPE_BUTTON: autoCloseTime = button.autoCloseTime; break; @@ -490,7 +490,7 @@ struct GameObjectTemplate uint32 GetLootId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_CHEST: return chest.lootId; case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lootId; @@ -500,7 +500,7 @@ struct GameObjectTemplate uint32 GetGossipMenuId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.gossipID; case GAMEOBJECT_TYPE_GOOBER: return goober.gossipID; @@ -510,7 +510,7 @@ struct GameObjectTemplate uint32 GetEventScriptId() const { - switch(type) + switch (type) { case GAMEOBJECT_TYPE_GOOBER: return goober.eventId; case GAMEOBJECT_TYPE_CHEST: return chest.eventId; @@ -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/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index 92abc595e77..c6c00820463 100755 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -31,7 +31,7 @@ Bag::Bag(): Item() m_valuesCount = CONTAINER_END; - memset(m_bagslot, 0, sizeof(Item* ) * MAX_BAG_SIZE); + memset(m_bagslot, 0, sizeof(Item*) * MAX_BAG_SIZE); } Bag::~Bag() diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 1394b018df4..d3832ad9151 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -173,10 +173,10 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto) if (!pProto || !pBagProto) return false; - switch(pBagProto->Class) + switch (pBagProto->Class) { case ITEM_CLASS_CONTAINER: - switch(pBagProto->SubClass) + switch (pBagProto->SubClass) { case ITEM_SUBCLASS_CONTAINER: return true; @@ -216,7 +216,7 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto) return false; } case ITEM_CLASS_QUIVER: - switch(pBagProto->SubClass) + switch (pBagProto->SubClass) { case ITEM_SUBCLASS_QUIVER: if (!(pProto->BagFamily & BAG_FAMILY_MASK_ARROWS)) @@ -778,14 +778,14 @@ bool Item::CanBeTraded(bool mail, bool trade) const return true; } -bool Item::HasEnchantRequiredSkill(const Player* pPlayer) const +bool Item::HasEnchantRequiredSkill(const Player* player) const { // Check all enchants for required skill for (uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) if (uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot))) if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id)) - if (enchantEntry->requiredSkill && pPlayer->GetSkillValue(enchantEntry->requiredSkill) < enchantEntry->requiredSkillValue) + if (enchantEntry->requiredSkill && player->GetSkillValue(enchantEntry->requiredSkill) < enchantEntry->requiredSkillValue) return false; return true; @@ -1103,7 +1103,7 @@ bool ItemRequiredTarget::IsFitToRequirements(Unit* pUnitTarget) const if (pUnitTarget->GetEntry() != m_uiTargetEntry) return false; - switch(m_uiType) + switch (m_uiType) { case ITEM_TARGET_TYPE_CREATURE: return pUnitTarget->isAlive(); @@ -1145,7 +1145,7 @@ void Item::SetNotRefundable(Player* owner, bool changestate /*=true*/, SQLTransa // Following is not applicable in the trading procedure if (changestate) SetState(ITEM_CHANGED, owner); - + SetRefundRecipient(0); SetPaidMoney(0); SetPaidExtendedCost(0); diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 534f16042ea..b872b354ea7 100755 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -264,7 +264,7 @@ class Item : public Object void SetInTrade(bool b = true) { mb_in_trade = b; } bool IsInTrade() const { return mb_in_trade; } - bool HasEnchantRequiredSkill(const Player* pPlayer) const; + bool HasEnchantRequiredSkill(const Player* player) const; uint32 GetEnchantRequiredLevel() const; bool IsFitToSpellRequirements(SpellInfo const* spellInfo) const; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 7f7f1c4ae7f..4ed475e0545 100755 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -132,7 +132,7 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id) return 0; uint32 suffixFactor; - switch(itemProto->InventoryType) + switch (itemProto->InventoryType) { // Items of that type don`t have points case INVTYPE_NON_EQUIP: diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index 94c740de1f6..155673edbaa 100755 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -527,7 +527,7 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] = inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemSubClass) { - switch(ItemClass) + switch (ItemClass) { case ITEM_CLASS_WEAPON: return ItemSubClass; case ITEM_CLASS_ARMOR: return ItemSubClass + 21; @@ -656,7 +656,7 @@ struct ItemTemplate // helpers bool CanChangeEquipStateInCombat() const { - switch(InventoryType) + switch (InventoryType) { case INVTYPE_RELIC: case INVTYPE_SHIELD: @@ -664,7 +664,7 @@ struct ItemTemplate return true; } - switch(Class) + switch (Class) { case ITEM_CLASS_WEAPON: case ITEM_CLASS_PROJECTILE: diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 8bd464a4820..0b275f833e6 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -48,7 +48,7 @@ uint32 GuidHigh2TypeId(uint32 guid_hi) { - switch(guid_hi) + switch (guid_hi) { case HIGHGUID_ITEM: return TYPEID_ITEM; //case HIGHGUID_CONTAINER: return TYPEID_CONTAINER; HIGHGUID_CONTAINER == HIGHGUID_ITEM currently @@ -134,7 +134,7 @@ void Object::_Create(uint32 guidlow, uint32 entry, HighGuid guidhigh) uint64 guid = MAKE_NEW_GUID(guidlow, entry, guidhigh); SetUInt64Value(OBJECT_FIELD_GUID, guid); uint32 type = 0; - switch(m_objectType) + switch (m_objectType) { //case TYPEID_ITEM: type = 3; break; //case TYPEID_CONTAINER: type = 7; break; //+4 @@ -220,7 +220,7 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c // UPDATETYPE_CREATE_OBJECT2 for some gameobject types... if (isType(TYPEMASK_GAMEOBJECT)) { - switch(((GameObject*)this)->GetGoType()) + switch (((GameObject*)this)->GetGoType()) { case GAMEOBJECT_TYPE_TRAP: case GAMEOBJECT_TYPE_DUEL_ARBITER: @@ -414,14 +414,14 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const *data << (float)0; *data << (float)0; *data << (float)0; - *data << ((WorldObject* )this)->GetOrientation(); + *data << ((WorldObject*)this)->GetOrientation(); } else { - *data << ((WorldObject* )this)->GetPositionX(); - *data << ((WorldObject* )this)->GetPositionY(); - *data << ((WorldObject* )this)->GetPositionZ(); - *data << ((WorldObject* )this)->GetOrientation(); + *data << ((WorldObject*)this)->GetPositionX(); + *data << ((WorldObject*)this)->GetPositionY(); + *data << ((WorldObject*)this)->GetPositionZ(); + *data << ((WorldObject*)this)->GetOrientation(); } } } @@ -430,7 +430,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const // 0x8 if (flags & UPDATEFLAG_LOWGUID) { - switch(GetTypeId()) + switch (GetTypeId()) { case TYPEID_OBJECT: case TYPEID_ITEM: @@ -895,7 +895,7 @@ void Object::SetUInt64Value(uint16 index, uint64 value) bool Object::AddUInt64Value(uint16 index, uint64 value) { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , true)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); if (value && !*((uint64*)&(m_uint32Values[index]))) { m_uint32Values[index] = PAIR64_LOPART(value); @@ -917,7 +917,7 @@ bool Object::AddUInt64Value(uint16 index, uint64 value) bool Object::RemoveUInt64Value(uint16 index, uint64 value) { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , true)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); if (value && *((uint64*)&(m_uint32Values[index])) == value) { m_uint32Values[index] = 0; @@ -1488,7 +1488,7 @@ void Position::GetSinCos(const float x, const float y, float &vsin, float &vcos) float dx = GetPositionX() - x; float dy = GetPositionY() - y; - if (dx < 0.001f && dy < 0.001f) + if (fabs(dx) < 0.001f && fabs(dy) < 0.001f) { float angle = (float)rand_norm()*static_cast<float>(2*M_PI); vcos = cos(angle); @@ -2285,13 +2285,13 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction()); pet->setPowerType(POWER_MANA); - pet->SetUInt32Value(UNIT_NPC_FLAGS , 0); + pet->SetUInt32Value(UNIT_NPC_FLAGS, 0); pet->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pet->InitStatsForLevel(getLevel()); SetMinion(pet, true); - switch(petType) + switch (petType) { case SUMMON_PET: // this enables pet details window (Shift+P) @@ -2309,7 +2309,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy map->Add(pet->ToCreature()); - switch(petType) + switch (petType) { case SUMMON_PET: pet->InitPetCreateSpells(); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ec2ec8f6edc..d27ea23ba7e 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -151,38 +151,38 @@ class Object int32 GetInt32Value(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_int32Values[index]; } uint32 GetUInt32Value(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_uint32Values[index]; } uint64 GetUInt64Value(uint16 index) const { - ASSERT(index + 1 < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, false)); return *((uint64*)&(m_uint32Values[index])); } float GetFloatValue(uint16 index) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return m_floatValues[index]; } uint8 GetByteValue(uint16 index, uint8 offset) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 4); return *(((uint8*)&m_uint32Values[index])+offset); } uint16 GetUInt16Value(uint16 index, uint8 offset) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 2); return *(((uint16*)&m_uint32Values[index])+offset); } @@ -227,7 +227,7 @@ class Object bool HasFlag(uint16 index, uint32 flag) const { - if (index >= m_valuesCount && !PrintIndexError(index , false)) return false; + if (index >= m_valuesCount && !PrintIndexError(index, false)) return false; return (m_uint32Values[index] & flag) != 0; } @@ -244,7 +244,7 @@ class Object bool HasByteFlag(uint16 index, uint8 offset, uint8 flag) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); ASSERT(offset < 4); return (((uint8*)&m_uint32Values[index])[offset] & flag) != 0; } @@ -278,7 +278,7 @@ class Object bool HasFlag64(uint16 index, uint64 flag) const { - ASSERT(index < m_valuesCount || PrintIndexError(index , false)); + ASSERT(index < m_valuesCount || PrintIndexError(index, false)); return (GetUInt64Value(index) & flag) != 0; } @@ -294,7 +294,7 @@ class Object virtual bool hasQuest(uint32 /* quest_id */) const { return false; } virtual bool hasInvolvedQuest(uint32 /* quest_id */) const { return false; } virtual void BuildUpdate(UpdateDataMapType&) {} - void BuildFieldsUpdate(Player* , UpdateDataMapType &) const; + void BuildFieldsUpdate(Player*, UpdateDataMapType &) const; // FG: some hacky helpers void ForceValuesUpdateAtIndex(uint32); diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 6dd04e1dee4..4108063bfb3 100755 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -80,7 +80,7 @@ enum HighGuid inline bool IsGuidHaveEnPart(uint64 guid) { - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_ITEM: case HIGHGUID_PLAYER: @@ -104,7 +104,7 @@ inline bool IsGuidHaveEnPart(uint64 guid) inline char const* GetLogNameForGuid(uint64 guid) { - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_ITEM: return "item"; case HIGHGUID_PLAYER: return guid ? "player" : "none"; diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp index e90e21eb2df..c322c35ef81 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.cpp +++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp @@ -85,7 +85,7 @@ bool ObjectPosSelector::FirstAngle(float& angle) bool ObjectPosSelector::NextAngle(float& angle) { - while(m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || + while (m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end() || m_smallStepOk[USED_POS_PLUS] || m_smallStepOk[USED_POS_MINUS] ) { @@ -99,7 +99,7 @@ bool ObjectPosSelector::NextAngle(float& angle) bool ObjectPosSelector::NextUsedAngle(float& angle) { - while(m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || + while (m_nextUsedPos[USED_POS_PLUS]!=m_UsedPosLists[USED_POS_PLUS].end() || m_nextUsedPos[USED_POS_MINUS]!=m_UsedPosLists[USED_POS_MINUS].end() ) { // calculate next possible angle diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 2a151f50064..4150810a4ab 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -348,13 +348,13 @@ void Pet::SavePetToDB(PetSaveMode mode) if (!IS_PLAYER_GUID(GetOwnerGUID())) return; - Player* pOwner = (Player*)GetOwner(); - if (!pOwner) + Player* owner = (Player*)GetOwner(); + if (!owner) return; // not save pet as current if another pet temporary unsummoned - if (mode == PET_SAVE_AS_CURRENT && pOwner->GetTemporaryUnsummonedPetNumber() && - pOwner->GetTemporaryUnsummonedPetNumber() != m_charmInfo->GetPetNumber()) + if (mode == PET_SAVE_AS_CURRENT && owner->GetTemporaryUnsummonedPetNumber() && + owner->GetTemporaryUnsummonedPetNumber() != m_charmInfo->GetPetNumber()) { // pet will lost anyway at restore temporary unsummoned if (getPetType() == HUNTER_PET) @@ -483,7 +483,7 @@ void Pet::Update(uint32 diff) if (m_loading) return; - switch(m_deathState) + switch (m_deathState) { case CORPSE: { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9b4b8b8251e..4a8e2c9de0d 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -151,7 +151,7 @@ PlayerTaxi::PlayerTaxi() void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level) { // class specific initial known nodes - switch(chrClass) + switch (chrClass) { case CLASS_DEATH_KNIGHT: { @@ -162,7 +162,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level } // race specific initial known nodes: capital and taxi hub masks - switch(race) + switch (race) { case RACE_HUMAN: SetTaximaskNode(2); break; // Human case RACE_ORC: SetTaximaskNode(23); break; // Orc @@ -178,7 +178,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level } // new continent starting masks (It will be accessible only at new map) - switch(Player::TeamForRace(race)) + switch (Player::TeamForRace(race)) { case ALLIANCE: SetTaximaskNode(100); break; case HORDE: SetTaximaskNode(99); break; @@ -1035,7 +1035,7 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077), 42999); // Factions depending on team, like cities and some more stuff - switch(GetTeam()) + switch (GetTeam()) { case ALLIANCE: GetReputationMgr().SetReputation(sFactionStore.LookupEntry(72), 42999); @@ -1132,7 +1132,7 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) // special amount for food/drink if (iProto->Class == ITEM_CLASS_CONSUMABLE && iProto->SubClass == ITEM_SUBCLASS_FOOD) { - switch(iProto->Spells[0].SpellCategory) + switch (iProto->Spells[0].SpellCategory) { case SPELL_CATEGORY_FOOD: // food count = getClass() == CLASS_DEATH_KNIGHT ? 10 : 4; @@ -1220,7 +1220,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) } // item can't be added - sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u", titem_id, getRace(), getClass(), msg); + sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(), getClass(), msg); return false; } @@ -2384,13 +2384,13 @@ void Player::ProcessDelayedOperations() ContinueTaxiFlight(); } } - + if (m_DelayedOperations & DELAYED_BG_GROUP_RESTORE) { if (Group *g = GetGroup()) g->SendUpdateToPlayer(GetGUID()); } - + //we have executed ALL delayed ops, so clear the flag m_DelayedOperations = 0; } @@ -2876,7 +2876,7 @@ void Player::SetGMVisible(bool on) bool Player::IsGroupVisibleFor(Player const* p) const { - switch(sWorld->getIntConfig(CONFIG_GROUP_VISIBILITY)) + switch (sWorld->getIntConfig(CONFIG_GROUP_VISIBILITY)) { default: return IsInSameGroupWith(p); case 1: return IsInSameRaidWith(p); @@ -3627,7 +3627,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen disabled_case = true; } - else switch(itr->second->state) + else switch (itr->second->state) { case PLAYERSPELL_UNCHANGED: // known saved spell return false; @@ -3813,7 +3813,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL ((pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0)) { - switch(GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0)) + switch (GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0)) { case SKILL_RANGE_LANGUAGE: SetSkill(pSkill->id, GetSkillStep(pSkill->id), 300, 300); @@ -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) @@ -4774,8 +4771,8 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC sObjectAccessor->ConvertCorpseForPlayer(playerguid); if (uint32 guildId = GetGuildIdFromDB(playerguid)) - if (Guild* pGuild = sGuildMgr->GetGuildById(guildId)) - pGuild->DeleteMember(guid); + if (Guild* guild = sGuildMgr->GetGuildById(guildId)) + guild->DeleteMember(guid); // remove from arena teams LeaveAllArenaTeams(playerguid); @@ -4992,14 +4989,14 @@ void Player::DeleteOldCharacters(uint32 keepDays) { Field* charFields = resultChars->Fetch(); Player::DeleteFromDB(charFields[0].GetUInt64(), charFields[1].GetUInt32(), true, true); - } while(resultChars->NextRow()); + } while (resultChars->NextRow()); } } void Player::SetMovement(PlayerMovementType pType) { WorldPacket data; - switch(pType) + switch (pType) { case MOVE_ROOT: data.Initialize(SMSG_FORCE_MOVE_ROOT, GetPackGUID().size()+4); break; case MOVE_UNROOT: data.Initialize(SMSG_FORCE_MOVE_UNROOT, GetPackGUID().size()+4); break; @@ -5462,11 +5459,11 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g return TotalCost; } - Guild* pGuild = sGuildMgr->GetGuildById(GetGuildId()); - if (!pGuild) + Guild* guild = sGuildMgr->GetGuildById(GetGuildId()); + if (!guild) return TotalCost; - if (!pGuild->HandleMemberWithdrawMoney(GetSession(), costs, true)) + if (!guild->HandleMemberWithdrawMoney(GetSession(), costs, true)) return TotalCost; TotalCost = costs; @@ -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!"); } @@ -5699,7 +5695,7 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa if (!CanModifyStats()) return; - switch(modGroup) + switch (modGroup) { case CRIT_PERCENTAGE: UpdateCritPercentage(BASE_ATTACK); break; case RANGED_CRIT_PERCENTAGE: UpdateCritPercentage(RANGED_ATTACK); break; @@ -6250,7 +6246,7 @@ void Player::UpdateWeaponSkill (WeaponAttackType attType) uint32 weapon_skill_gain = sWorld->getIntConfig(CONFIG_SKILL_GAIN_WEAPON); - switch(attType) + switch (attType) { case BASE_ATTACK: { @@ -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); } } @@ -9057,11 +9053,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) case 3698: case 3702: case 3968: - NumberOfFields = 11; - break; case 4378: - NumberOfFields = 11; - break; case 3703: NumberOfFields = 11; break; @@ -9072,8 +9064,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) NumberOfFields = 28; break; case 4812: // Icecrown Citadel - NumberOfFields = 13; - break; case 4100: // The Culling of Stratholme NumberOfFields = 13; break; @@ -10166,7 +10156,7 @@ Item* Player::GetShield(bool useable) const uint8 Player::GetAttackBySlot(uint8 slot) { - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: return BASE_ATTACK; case EQUIPMENT_SLOT_OFFHAND: return OFF_ATTACK; @@ -12149,7 +12139,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update) else if (slot == EQUIPMENT_SLOT_OFFHAND) UpdateExpertise(OFF_ATTACK); - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: case EQUIPMENT_SLOT_OFFHAND: @@ -12307,7 +12297,7 @@ void Player::RemoveItem(uint8 bag, uint8 slot, bool update) else if (slot == EQUIPMENT_SLOT_OFFHAND) UpdateExpertise(OFF_ATTACK); // update armor penetration - passive auras may need it - switch(slot) + switch (slot) { case EQUIPMENT_SLOT_MAINHAND: case EQUIPMENT_SLOT_OFFHAND: @@ -13260,7 +13250,7 @@ void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint data << uint64(pItem2 ? pItem2->GetGUID() : 0); data << uint8(0); // bag type subclass, used with EQUIP_ERR_EVENT_AUTOEQUIP_BIND_CONFIRM and EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG2 - switch(msg) + switch (msg) { case EQUIP_ERR_CANT_EQUIP_LEVEL_I: case EQUIP_ERR_PURCHASE_LEVEL_TOO_LOW: @@ -13291,11 +13281,11 @@ void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint GetSession()->SendPacket(&data); } -void Player::SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint32 param) +void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 param) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_BUY_FAILED"); WorldPacket data(SMSG_BUY_FAILED, (8+4+4+1)); - data << uint64(pCreature ? pCreature->GetGUID() : 0); + data << uint64(creature ? creature->GetGUID() : 0); data << uint32(item); if (param > 0) data << uint32(param); @@ -13303,11 +13293,11 @@ void Player::SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint3 GetSession()->SendPacket(&data); } -void Player::SendSellError(SellResult msg, Creature* pCreature, uint64 guid, uint32 param) +void Player::SendSellError(SellResult msg, Creature* creature, uint64 guid, uint32 param) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SELL_ITEM"); WorldPacket data(SMSG_SELL_ITEM, (8+8+(param?4:0)+1)); // last check 2.0.10 - data << uint64(pCreature ? pCreature->GetGUID() : 0); + data << uint64(creature ? creature->GetGUID() : 0); data << uint64(guid); if (param > 0) data << uint32(param); @@ -13563,7 +13553,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool uint32 enchant_amount = pEnchant->amount[s]; uint32 enchant_spell_id = pEnchant->spellid[s]; - switch(enchant_display_type) + switch (enchant_display_type) { case ITEM_ENCHANTMENT_TYPE_NONE: break; @@ -13864,7 +13854,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool default: sLog->outError("Unknown item enchantment (id = %d) display type: %d", enchant_id, enchant_display_type); break; - } /*switch(enchant_display_type)*/ + } /*switch (enchant_display_type)*/ } /*for*/ } @@ -14348,11 +14338,11 @@ void Player::PrepareQuestMenu(uint64 guid) QuestRelationBounds pObjectQIR; // pets also can have quests - Creature* pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); - if (pCreature) + Creature* creature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); + if (creature) { - pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(pCreature->GetEntry()); - pObjectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(pCreature->GetEntry()); + pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry()); + pObjectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry()); } else { @@ -14388,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); @@ -14426,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); @@ -14459,10 +14449,10 @@ void Player::SendPreparedQuest(uint64 guid) std::string title = ""; // need pet case for some quests - Creature* pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); - if (pCreature) + Creature* creature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); + if (creature) { - uint32 textid = GetGossipTextId(pCreature); + uint32 textid = GetGossipTextId(creature); GossipText const* gossiptext = sObjectMgr->GetGossipText(textid); if (!gossiptext) { @@ -14503,13 +14493,13 @@ 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; - Creature* pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); - if (pCreature) - pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(pCreature->GetEntry()); + Creature* creature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); + if (creature) + pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry()); else { //we should obtain map pointer from GetMap() in 99% of cases. Special case @@ -14523,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) @@ -14533,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); @@ -14607,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++) @@ -14655,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; } } @@ -14750,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]; @@ -14764,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) @@ -14813,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); @@ -14864,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) @@ -14926,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); @@ -14937,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) { @@ -14952,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); @@ -15003,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; @@ -15049,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); @@ -15061,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]; @@ -15075,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); } } @@ -15284,7 +15273,7 @@ bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) SendCanTakeQuestResponse(INVALIDREASON_DONT_HAVE_REQ); return false; } - + // ReputationObjective2 does not seem to be an objective requirement but a requirement // to be able to accept the quest uint32 fIdObj = qInfo->GetRepObjectiveFaction2(); @@ -15464,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; @@ -15618,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; } } } @@ -15668,9 +15657,9 @@ void Player::AreaExploredOrEventHappens(uint32 questId) //not used in Trinityd, function for external script library void Player::GroupEventHappens(uint32 questId, WorldObject const* pEventObject) { - if (Group* pGroup = GetGroup()) + if (Group* group = GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); @@ -15863,7 +15852,7 @@ void Player::KilledPlayerCredit() { uint32 reqkill = qInfo->GetPlayersSlain(); uint16 curkill = q_status.m_playercount; - + if (curkill < reqkill) { q_status.m_playercount = curkill + addkillcount; @@ -16173,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)); @@ -16184,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) @@ -16232,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); @@ -16253,62 +16242,62 @@ void Player::SendQuestConfirmAccept(const Quest* pQuest, Player* pReceiver) } } -void Player::SendPushToPartyResponse(Player* pPlayer, uint32 msg) +void Player::SendPushToPartyResponse(Player* player, uint32 msg) { - if (pPlayer) + if (player) { WorldPacket data(MSG_QUEST_PUSH_RESULT, (8+1)); - data << uint64(pPlayer->GetGUID()); + data << uint64(player->GetGUID()); data << uint8(msg); // valid values: 0-8 GetSession()->SendPacket(&data); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent MSG_QUEST_PUSH_RESULT"); } } -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); } @@ -17122,7 +17111,7 @@ bool Player::isAllowedToLoot(const Creature* creature) { if (!creature->isDead() || !creature->IsDamageEnoughForLootingAndReward()) return false; - + if (HasPendingBind()) return false; @@ -17136,7 +17125,7 @@ bool Player::isAllowedToLoot(const Creature* creature) else if (thisGroup != creature->GetLootRecipientGroup()) return false; - switch(thisGroup->GetLootMethod()) + switch (thisGroup->GetLootMethod()) { case FREE_FOR_ALL: return true; @@ -17670,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]; @@ -17689,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); @@ -17754,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); @@ -17814,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); @@ -17838,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); @@ -18487,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 @@ -19295,7 +19283,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) if (returnreagent) { - switch(pet->GetEntry()) + switch (pet->GetEntry()) { //warlock pets except imp are removed(?) when logging out case 1860: @@ -19550,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)); @@ -19886,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) @@ -20336,7 +20322,7 @@ void Player::InitDisplayIds() } uint8 gender = getGender(); - switch(gender) + switch (gender) { case GENDER_FEMALE: SetDisplayId(info->displayId_f); @@ -20434,24 +20420,24 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 return false; } - Creature* pCreature = GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); - if (!pCreature) + Creature* creature = GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: BuyItemFromVendor - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(vendorguid))); SendBuyError(BUY_ERR_DISTANCE_TOO_FAR, NULL, item, 0); return false; } - VendorItemData const* vItems = pCreature->GetVendorItems(); + VendorItemData const* vItems = creature->GetVendorItems(); if (!vItems || vItems->Empty()) { - SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0); + SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, item, 0); return false; } if (vendorslot >= vItems->GetItemCount()) { - SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0); + SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, item, 0); return false; } @@ -20459,23 +20445,23 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 // store diff item (cheating) if (!crItem || crItem->item != item) { - SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0); + SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, item, 0); return false; } // check current item amount if it limited if (crItem->maxcount != 0) { - if (pCreature->GetVendorItemCurrentCount(crItem) < pProto->BuyCount * count) + if (creature->GetVendorItemCurrentCount(crItem) < pProto->BuyCount * count) { - SendBuyError(BUY_ERR_ITEM_ALREADY_SOLD, pCreature, item, 0); + SendBuyError(BUY_ERR_ITEM_ALREADY_SOLD, creature, item, 0); return false; } } if (pProto->RequiredReputationFaction && (uint32(GetReputationRank(pProto->RequiredReputationFaction)) < pProto->RequiredReputationRank)) { - SendBuyError(BUY_ERR_REPUTATION_REQUIRE, pCreature, item, 0); + SendBuyError(BUY_ERR_REPUTATION_REQUIRE, creature, item, 0); return false; } @@ -20521,21 +20507,30 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 } } - uint32 price = crItem->IsGoldRequired(pProto) ? pProto->BuyPrice * count : 0; + uint32 price = 0; + if(crItem->IsGoldRequired(pProto) && pProto->BuyPrice > 0) //Assume price cannot be negative (do not know why it is int32) + { + uint32 maxCount = MAX_MONEY_AMOUNT / pProto->BuyPrice; + if((uint32)count > maxCount) + { + sLog->outError("Player %s tried to buy %u item id %u, causing overflow", GetName(), (uint32)count, pProto->ItemId); + count = (uint8)maxCount; + } + price = pProto->BuyPrice * count; //it should not exceed MAX_MONEY_AMOUNT - // reputation discount - if (price) - price = uint32(floor(price * GetReputationPriceDiscount(pCreature))); + // reputation discount + price = uint32(floor(price * GetReputationPriceDiscount(creature))); - if (!HasEnoughMoney(price)) - { - SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, item, 0); - return false; + if (!HasEnoughMoney(price)) + { + SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, item, 0); + return false; + } } if ((bag == NULL_BAG && slot == NULL_SLOT) || IsInventoryPos(bag, slot)) { - if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, pCreature, crItem, true)) + if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, creature, crItem, true)) return false; } else if (IsEquipmentPos(bag, slot)) @@ -20545,7 +20540,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 SendEquipError(EQUIP_ERR_ITEM_CANT_BE_EQUIPPED, NULL, NULL); return false; } - if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, pCreature, crItem, false)) + if (!_StoreOrEquipNewItem(vendorslot, item, count, bag, slot, price, pProto, creature, crItem, false)) return false; } else @@ -20872,7 +20867,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot) // if have <CompareColor> use them as count, else use <value> from Condition uint32 _cmp_gem = Condition->CompareColor[i] ? curcount[Condition->CompareColor[i] - 1]: Condition->Value[i]; - switch(Condition->Comparator[i]) + switch (Condition->Comparator[i]) { case 2: // requires less <color> than (<value> || <comparecolor>) gems activate &= (_cur_gem < _cmp_gem) ? true : false; @@ -21514,7 +21509,6 @@ void Player::SendInitialPacketsBeforeAddToMap() // SMSG_PET_GUIDS // SMSG_UPDATE_WORLD_STATE // SMSG_POWER_UPDATE - } void Player::SendInitialPacketsAfterAddToMap() @@ -21594,7 +21588,7 @@ void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2); data << uint32(mapid); data << uint8(reason); // transfer abort reason - switch(reason) + switch (reason) { case TRANSFER_ABORT_INSUF_EXPAN_LVL: case TRANSFER_ABORT_DIFFICULTY: @@ -21888,7 +21882,6 @@ void Player::SetDailyQuestStatus(uint32 quest_id) break; } } - } else { m_DFQuests.insert(quest_id); @@ -21961,9 +21954,9 @@ bool Player::GetBGAccessByLevel(BattlegroundTypeId bgTypeId) const return true; } -float Player::GetReputationPriceDiscount(Creature const* pCreature) const +float Player::GetReputationPriceDiscount(Creature const* creature) const { - FactionTemplateEntry const* vendor_faction = pCreature->getFactionTemplateEntry(); + FactionTemplateEntry const* vendor_faction = creature->getFactionTemplateEntry(); if (!vendor_faction || !vendor_faction->faction) return 1.0f; @@ -22374,9 +22367,9 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar uint64 creature_guid = (pRewardSource->GetTypeId() == TYPEID_UNIT) ? pRewardSource->GetGUID() : uint64(0); // prepare data for near group iteration - if (Group* pGroup = GetGroup()) + if (Group* group = GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if (!pGroupGuy) @@ -22390,7 +22383,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar pGroupGuy->KilledMonsterCredit(creature_id, creature_guid); } } - else // if (!pGroup) + else // if (!group) KilledMonsterCredit(creature_id, creature_guid); } @@ -22509,7 +22502,7 @@ void Player::UpdateAreaDependentAuras(uint32 newArea) if (newArea == 4273 && GetVehicle() && GetPositionX() > 400) // Ulduar { - switch(GetVehicleBase()->GetEntry()) + switch (GetVehicleBase()->GetEntry()) { case 33062: case 33109: @@ -22609,14 +22602,14 @@ void Player::SendCorpseReclaimDelay(bool load) Player* Player::GetNextRandomRaidMember(float radius) { - Group* pGroup = GetGroup(); - if (!pGroup) + Group* group = GetGroup(); + if (!group) return NULL; std::vector<Player*> nearMembers; - nearMembers.reserve(pGroup->GetMembersCount()); + nearMembers.reserve(group->GetMembersCount()); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -23310,7 +23303,7 @@ void Player::_LoadSkills(PreparedQueryResult result) } // set fixed skill ranges - switch(GetSkillRangeType(pSkill, false)) + switch (GetSkillRangeType(pSkill, false)) { case SKILL_RANGE_LANGUAGE: // 300..300 value = max = 300; @@ -23513,7 +23506,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) } //Z given by moveinfo, LastZ, FallTime, WaterZ, MapZ, Damage, Safefall reduction - sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d" , movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall); + sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d", movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall); } } RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // No fly zone - Parachute @@ -24307,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 65746043894..862b271c464 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1317,8 +1317,8 @@ class Player : public Unit, public GridObject<Player> void RemoveItemFromBuyBackSlot(uint32 slot, bool del); uint32 GetMaxKeyringSize() const { return KEYRING_SLOT_END-KEYRING_SLOT_START; } void SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2 = NULL, uint32 itemid = 0); - void SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint32 param); - void SendSellError(SellResult msg, Creature* pCreature, uint64 guid, uint32 param); + void SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 param); + void SendSellError(SellResult msg, Creature* creature, uint64 guid, uint32 param); void AddWeaponProficiency(uint32 newflag) { m_WeaponProficiency |= newflag; } void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; } uint32 GetWeaponProficiency() const { return m_WeaponProficiency; } @@ -1337,7 +1337,7 @@ class Player : public Unit, public GridObject<Player> bool BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot); bool _StoreOrEquipNewItem(uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot, int32 price, ItemTemplate const* pProto, Creature* pVendor, VendorItem const* crItem, bool bStore); - float GetReputationPriceDiscount(Creature const* pCreature) const; + float GetReputationPriceDiscount(Creature const* creature) const; Player* GetTrader() const { return m_trade ? m_trade->GetTrader() : NULL; } TradeData* GetTradeData() const { return m_trade; } @@ -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 SendPushToPartyResponse(Player* pPlayer, 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 SendQuestConfirmAccept(Quest const* quest, Player* pReceiver); + void SendPushToPartyResponse(Player* player, uint32 msg); + 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; } @@ -1806,7 +1806,7 @@ class Player : public Unit, public GridObject<Player> bool IsInSameGroupWith(Player const* p) const; bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); } void UninviteFromGroup(); - static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0 , const char* reason = NULL); + static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0, const char* reason = NULL); void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(), GetGUID(), method); } void SendUpdateToOutOfRangeGroupMembers(); @@ -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/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index fe1abea0f1d..dbe9697bcaf 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -116,7 +116,7 @@ void MapManager::LoadTransports() uint32 guid = fields[0].GetUInt32(); uint32 entry = fields[1].GetUInt32(); std::string name = fields[2].GetString(); - sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports must not have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid); + sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports must not have any records in `gameobject` or its behavior will be unpredictable/bugged.", entry, name.c_str(), guid); } while (result->NextRow()); } @@ -642,39 +642,39 @@ void Transport::BuildStopMovePacket(Map const* targetMap) uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, float z, float o, uint32 anim) { Map* map = GetMap(); - Creature* pCreature = new Creature; + Creature* creature = new Creature; - if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, GetPhaseMask(), entry, 0, GetGOInfo()->faction, 0, 0, 0, 0)) + if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, GetPhaseMask(), entry, 0, GetGOInfo()->faction, 0, 0, 0, 0)) { - delete pCreature; + delete creature; return 0; } - pCreature->SetTransport(this); - pCreature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT); - pCreature->m_movementInfo.guid = GetGUID(); - pCreature->m_movementInfo.t_pos.Relocate(x, y, z, o); + creature->SetTransport(this); + creature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT); + creature->m_movementInfo.guid = GetGUID(); + creature->m_movementInfo.t_pos.Relocate(x, y, z, o); if (anim) - pCreature->SetUInt32Value(UNIT_NPC_EMOTESTATE, anim); + creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, anim); - pCreature->Relocate( + creature->Relocate( GetPositionX() + (x * cos(GetOrientation()) + y * sin(GetOrientation() + float(M_PI))), GetPositionY() + (y * cos(GetOrientation()) + x * sin(GetOrientation())), - z + GetPositionZ() , + z + GetPositionZ(), o + GetOrientation()); - pCreature->SetHomePosition(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ(), pCreature->GetOrientation()); + creature->SetHomePosition(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), creature->GetOrientation()); - if (!pCreature->IsPositionValid()) + if (!creature->IsPositionValid()) { - sLog->outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", pCreature->GetGUIDLow(), pCreature->GetEntry(), pCreature->GetPositionX(), pCreature->GetPositionY()); - delete pCreature; + sLog->outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", creature->GetGUIDLow(), creature->GetEntry(), creature->GetPositionX(), creature->GetPositionY()); + delete creature; return 0; } - map->Add(pCreature); - m_NPCPassengerSet.insert(pCreature); + map->Add(creature); + m_NPCPassengerSet.insert(creature); if (tguid == 0) { @@ -684,8 +684,8 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, else currenttguid = std::max(tguid, currenttguid); - pCreature->SetGUIDTransport(tguid); - sScriptMgr->OnAddCreaturePassenger(this, pCreature); + creature->SetGUIDTransport(tguid); + sScriptMgr->OnAddCreaturePassenger(this, creature); return tguid; } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 471a8324f90..594203e0c46 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -68,7 +68,7 @@ bool Player::UpdateStats(Stats stat) pet->UpdateStats(stat); } - switch(stat) + switch (stat) { case STAT_STRENGTH: UpdateShieldBlockValue(); @@ -472,7 +472,7 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo { UnitMods unitMod; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -584,7 +584,7 @@ void Player::UpdateCritPercentage(WeaponAttackType attType) uint16 index; CombatRating cr; - switch(attType) + switch (attType) { case OFF_ATTACK: modGroup = OFFHAND_CRIT_PERCENTAGE; @@ -814,7 +814,7 @@ void Player::UpdateExpertise(WeaponAttackType attack) if (expertise < 0) expertise = 0; - switch(attack) + switch (attack) { case BASE_ATTACK: SetUInt32Value(PLAYER_EXPERTISE, expertise); break; case OFF_ATTACK: SetUInt32Value(PLAYER_OFFHAND_EXPERTISE, expertise); break; @@ -998,7 +998,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged) void Creature::UpdateDamagePhysical(WeaponAttackType attType) { UnitMods unitMod; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -1034,7 +1034,7 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value) * total_pct; float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value) * total_pct; - switch(attType) + switch (attType) { case BASE_ATTACK: default: @@ -1221,7 +1221,7 @@ void Guardian::UpdateMaxHealth() float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA); float multiplicator; - switch(GetEntry()) + switch (GetEntry()) { case ENTRY_IMP: multiplicator = 8.4f; break; case ENTRY_VOIDWALKER: multiplicator = 11.0f; break; @@ -1246,7 +1246,7 @@ void Guardian::UpdateMaxPower(Powers power) float addValue = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f; float multiplicator = 15.0f; - switch(GetEntry()) + switch (GetEntry()) { case ENTRY_IMP: multiplicator = 4.95f; break; case ENTRY_VOIDWALKER: @@ -1386,7 +1386,7 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType) // Pet's base damage changes depending on happiness if (isHunterPet() && attType == BASE_ATTACK) { - switch(ToPet()->GetHappinessState()) + switch (ToPet()->GetHappinessState()) { case HAPPY: // 125% of normal damage diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9e74e3a8f5b..6d02d943f63 100644..100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -685,7 +685,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam uint32 weaponSpeedHitFactor; uint32 rage_damage = damage + cleanDamage->absorbed_damage; - switch(cleanDamage->attackType) + switch (cleanDamage->attackType) { case BASE_ATTACK: { @@ -1196,7 +1196,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam // Calculate armor reduction if (IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->damageSchoolMask))) { - damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL , damageInfo->attackType); + damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL, damageInfo->attackType); damageInfo->cleanDamage += damage - damageInfo->damage; } else @@ -1420,7 +1420,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) { SpellInfo const* i_spellProto = (*dmgShieldItr)->GetSpellInfo(); // Damage shield can be resisted... - if (SpellMissInfo missInfo = victim->SpellHitResult(this, i_spellProto , false)) + if (SpellMissInfo missInfo = victim->SpellHitResult(this, i_spellProto, false)) { victim->SendSpellMiss(this, i_spellProto->Id, missInfo); continue; @@ -2734,7 +2734,7 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit* victi if (GetTypeId() == TYPEID_PLAYER) { - switch(attackType) + switch (attackType) { case BASE_ATTACK: crit = GetFloatValue(PLAYER_CRIT_PERCENTAGE); @@ -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 @@ -3601,7 +3601,7 @@ void Unit::RemoveAuraFromStack(uint32 spellId, uint64 caster, AuraRemoveMode rem if ((aura->GetType() == UNIT_AURA_TYPE) && (!caster || aura->GetCasterGUID() == caster)) { - aura->ModStackAmount(-1,removeMode); + aura->ModStackAmount(-1, removeMode); return; } else @@ -4079,7 +4079,7 @@ void Unit::DelayOwnedAuras(uint32 spellId, uint64 caster, int32 delaytime) // update for out of range group members (on 1 slot use) aura->SetNeedClientUpdateForTargets(); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId() , GetGUIDLow(), aura->GetDuration()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId(), GetGUIDLow(), aura->GetDuration()); } } } @@ -4769,7 +4769,7 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo* pInfo) data << uint32(aura->GetId()); // spellId data << uint32(1); // count data << uint32(aura->GetAuraType()); // auraId - switch(aura->GetAuraType()) + switch (aura->GetAuraType()) { case SPELL_AURA_PERIODIC_DAMAGE: case SPELL_AURA_PERIODIC_DAMAGE_PERCENT: @@ -4928,11 +4928,11 @@ bool Unit::HandleHasteAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere Unit* target = victim; int32 basepoints0 = 0; - switch(hasteSpell->SpellFamilyName) + switch (hasteSpell->SpellFamilyName) { case SPELLFAMILY_ROGUE: { - switch(hasteSpell->Id) + switch (hasteSpell->Id) { // Blade Flurry case 13877: @@ -4987,11 +4987,11 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit* victim, uint32 /*damage*/, AuraEf Unit* target = victim; int32 basepoints0 = 0; - switch(triggeredByAuraSpell->SpellFamilyName) + switch (triggeredByAuraSpell->SpellFamilyName) { case SPELLFAMILY_MAGE: { - switch(triggeredByAuraSpell->Id) + switch (triggeredByAuraSpell->Id) { // Focus Magic case 54646: @@ -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(); @@ -5054,7 +5055,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere int32 basepoints0 = 0; uint64 originalCaster = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_GENERIC: { @@ -5118,7 +5119,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (!GetAuraEffect(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT, SPELLFAMILY_MAGE, 0x10000000, 0, 0)) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: case SPELL_SCHOOL_HOLY: @@ -5141,7 +5142,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -5701,11 +5702,13 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere triggered_spell_id = 37436; break; } - switch(dummySpell->Id) + switch (dummySpell->Id) { // 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())) { @@ -5795,7 +5800,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_WARRIOR: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Sweeping Strikes case 12328: @@ -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)) @@ -6206,7 +6214,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_DRUID: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Glyph of Innervate case 54832: @@ -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; } @@ -6957,7 +6970,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_SHAMAN: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Earthen Power (Rank 1, 2) case 51523: @@ -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())) { @@ -7271,6 +7286,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Frozen Power if (dummySpell->SpellIconID == 3780) { + if (!target) + return false; if (GetDistance(target) < 15.0f) return false; float chance = (float)triggerAmount; @@ -7776,7 +7793,7 @@ bool Unit::HandleObsModEnergyAuraProc(Unit* victim, uint32 /*damage*/, AuraEffec Unit* target = victim; int32 basepoints0 = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_HUNTER: { @@ -7829,7 +7846,7 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit* victim, uint32 /*damage*/, Aura Unit* target = victim; int32 basepoints0 = 0; - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_PALADIN: { @@ -7878,7 +7895,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp { SpellInfo const* dummySpell = triggeredByAura->GetSpellInfo(); - switch(dummySpell->SpellFamilyName) + switch (dummySpell->SpellFamilyName) { case SPELLFAMILY_GENERIC: switch (dummySpell->Id) @@ -7943,7 +7960,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp if (procSpell->SpellFamilyFlags[0] & 0x40000000 && procSpell->SpellIconID == 242) { *handled = true; - if (victim->HasAura(53601)) + if (victim && victim->HasAura(53601)) { int32 bp0 = CalculatePctN(int32(damage / 12), dummySpell->Effects[EFFECT_2]. CalcValue()); // Item - Paladin T9 Holy 4P Bonus @@ -8084,7 +8101,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp return false; } - switch(dummySpell->Id) + switch (dummySpell->Id) { // Bone Shield cooldown case 49222: @@ -8270,7 +8287,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -8456,7 +8473,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg // Holy Shock heal if (procSpell->SpellFamilyFlags[1] & 0x00010000) { - switch(procSpell->Id) + switch (procSpell->Id) { case 25914: originalSpellId = 20473; break; case 25913: originalSpellId = 20929; break; @@ -8562,7 +8579,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { if (!procSpell) return false; - switch(GetFirstSchoolInMask(procSpell->GetSchoolMask())) + switch (GetFirstSchoolInMask(procSpell->GetSchoolMask())) { case SPELL_SCHOOL_NORMAL: return false; // ignore @@ -8716,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) { @@ -9038,7 +9041,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au uint32 triggered_spell_id = 0; - switch(scriptId) + switch (scriptId) { case 836: // Improved Blizzard (Rank 1) { @@ -9089,7 +9092,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au { if (!roll_chance_i(triggeredByAura->GetAmount())) return false; - switch(victim->getPowerType()) + switch (victim->getPowerType()) { case POWER_MANA: triggered_spell_id = 48542; break; case POWER_RAGE: triggered_spell_id = 48541; break; @@ -9147,7 +9150,7 @@ void Unit::setPowerType(Powers new_powertype) } } - switch(new_powertype) + switch (new_powertype) { default: case POWER_MANA: @@ -10079,9 +10082,9 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) if (!player) return NULL; - Group* pGroup = player->GetGroup(); + Group* group = player->GetGroup(); // When there is no group check pet presence - if (!pGroup) + if (!group) { // We are pet now, return owner if (player != this) @@ -10096,9 +10099,9 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) std::vector<Unit*> nearMembers; // reserve place for players and pets because resizing vector every unit push is unefficient (vector is reallocated then) - nearMembers.reserve(pGroup->GetMembersCount() * 2); + nearMembers.reserve(group->GetMembersCount() * 2); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) if (Player* Target = itr->getSource()) { // IsHostileTo check duel and controlled by enemy @@ -10405,7 +10408,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 } // Custom scripted damage - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_MAGE: // Ice Lance @@ -10577,7 +10580,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 AuraEffectList const& mDummyAuras = victim->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) { - switch((*i)->GetSpellInfo()->SpellIconID) + switch ((*i)->GetSpellInfo()->SpellIconID) { // Cheat Death case 2109: @@ -10814,7 +10817,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas return false; float crit_chance = 0.0f; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_NONE: // We need more spells to find a general way (if there is any) @@ -10857,7 +10860,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas if (!((*i)->IsAffectedOnSpell(spellProto))) continue; int32 modChance = 0; - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { // Shatter case 911: modChance+= 16; @@ -10954,7 +10957,7 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas if (victim) { // Custom crit by class - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_DRUID: // Rend and Tear - bonus crit chance for Ferocious Bite on bleeding targets @@ -11008,7 +11011,7 @@ uint32 Unit::SpellCriticalDamageBonus(SpellInfo const* spellProto, uint32 damage int32 crit_bonus = damage; float crit_mod = 0.0f; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_MELEE: // for melee based spells is 100% case SPELL_DAMAGE_CLASS_RANGED: @@ -11043,7 +11046,7 @@ uint32 Unit::SpellCriticalHealingBonus(SpellInfo const* spellProto, uint32 damag { // Calculate critical bonus int32 crit_bonus; - switch(spellProto->DmgClass) + switch (spellProto->DmgClass) { case SPELL_DAMAGE_CLASS_MELEE: // for melee based spells is 100% case SPELL_DAMAGE_CLASS_RANGED: @@ -11099,7 +11102,7 @@ uint32 Unit::SpellHealingBonus(Unit* victim, SpellInfo const* spellProto, uint32 { if (!(*i)->IsAffectedOnSpell(spellProto)) continue; - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { case 4415: // Increased Rejuvenation Healing case 4953: @@ -11144,7 +11147,7 @@ uint32 Unit::SpellHealingBonus(Unit* victim, SpellInfo const* spellProto, uint32 } case 7871: // Glyph of Lesser Healing Wave { - if (victim->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, 0 , 0x00000400, 0, GetGUID())) + if (victim->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_SHAMAN, 0, 0x00000400, 0, GetGUID())) AddPctN(DoneTotalMod, (*i)->GetAmount()); break; } @@ -11680,7 +11683,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT // Custom scripted damage if (spellProto) - switch(spellProto->SpellFamilyName) + switch (spellProto->SpellFamilyName) { case SPELLFAMILY_DEATHKNIGHT: // Glacier Rot @@ -11723,7 +11726,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT AuraEffectList const& mDummyAuras = victim->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) { - switch((*i)->GetSpellInfo()->SpellIconID) + switch ((*i)->GetSpellInfo()->SpellIconID) { // Cheat Death case 2109: @@ -11759,7 +11762,7 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT /*AuraEffectList const& mclassScritAuras = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); for (AuraEffectList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i) { - switch((*i)->GetMiscValue()) + switch ((*i)->GetMiscValue()) { } }*/ @@ -12559,7 +12562,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) WorldPacket data; if (!forced) { - switch(mtype) + switch (mtype) { case MOVE_WALK: data.Initialize(MSG_MOVE_SET_WALK_SPEED, 8+4+2+4+4+4+4+4+4+4); @@ -12618,7 +12621,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) pet->SetSpeed(mtype, m_speed_rate[mtype], forced); } - switch(mtype) + switch (mtype) { case MOVE_WALK: data.Initialize(SMSG_FORCE_WALK_SPEED_CHANGE, 16); @@ -13202,7 +13205,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, if (GetTypeId() == TYPEID_UNIT && (ToCreature()->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TAUNT_DIMINISH)) { DiminishingLevels diminish = Level; - switch(diminish) + switch (diminish) { case DIMINISHING_LEVEL_1: break; case DIMINISHING_LEVEL_2: mod = 0.65f; break; @@ -13220,7 +13223,7 @@ float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL) { DiminishingLevels diminish = Level; - switch(diminish) + switch (diminish) { case DIMINISHING_LEVEL_1: break; case DIMINISHING_LEVEL_2: mod = 0.5f; break; @@ -13334,7 +13337,7 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f if (!CanModifyStats()) return false; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_STAT_STRENGTH: case UNIT_MOD_STAT_AGILITY: @@ -13427,7 +13430,7 @@ SpellSchools Unit::GetSpellSchoolByAuraGroup(UnitMods unitMod) const { SpellSchools school = SPELL_SCHOOL_NORMAL; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_RESISTANCE_HOLY: school = SPELL_SCHOOL_HOLY; break; case UNIT_MOD_RESISTANCE_FIRE: school = SPELL_SCHOOL_FIRE; break; @@ -13447,7 +13450,7 @@ Stats Unit::GetStatByAuraGroup(UnitMods unitMod) const { Stats stat = STAT_STRENGTH; - switch(unitMod) + switch (unitMod) { case UNIT_MOD_STAT_STRENGTH: stat = STAT_STRENGTH; break; case UNIT_MOD_STAT_AGILITY: stat = STAT_AGILITY; break; @@ -13495,7 +13498,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType) const } } -float Unit::GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const +float Unit::GetWeaponDamageRange(WeaponAttackType attType, WeaponDamageRange type) const { if (attType == OFF_ATTACK && !haveOffhandWeapon()) return 0.0f; @@ -13803,8 +13806,8 @@ CharmInfo::~CharmInfo() void CharmInfo::RestoreState() { if (m_unit->GetTypeId() == TYPEID_UNIT) - if (Creature* pCreature = m_unit->ToCreature()) - pCreature->SetReactState(m_oldReactState); + if (Creature* creature = m_unit->ToCreature()) + creature->SetReactState(m_oldReactState); } void CharmInfo::InitPetActionBar() @@ -14147,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) @@ -14161,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)) @@ -14211,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); } } @@ -14231,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 @@ -14291,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; @@ -14306,21 +14309,21 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag, AuraEffect* triggeredByAura = i->aura->GetEffect(effIndex); ASSERT(triggeredByAura); - switch(triggeredByAura->GetAuraType()) + switch (triggeredByAura->GetAuraType()) { case SPELL_AURA_PROC_TRIGGER_SPELL: { 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); + 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, 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); @@ -14332,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; } @@ -14382,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; } @@ -14416,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 @@ -15588,7 +15591,7 @@ void Unit::SetControlled(bool apply, UnitState state) return; AddUnitState(state); - switch(state) + switch (state) { case UNIT_STAT_STUNNED: SetStunned(true); @@ -15618,7 +15621,7 @@ void Unit::SetControlled(bool apply, UnitState state) } else { - switch(state) + switch (state) { case UNIT_STAT_STUNNED: if (HasAuraType(SPELL_AURA_MOD_STUN)) return; else SetStunned(false); break; @@ -15680,8 +15683,8 @@ void Unit::SetStunned(bool apply) SetTarget(getVictim()->GetGUID()); // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface) - Unit* pOwner = GetOwner(); - if (!pOwner || (pOwner->GetTypeId() == TYPEID_PLAYER && !pOwner->ToPlayer()->IsMounted())) + Unit* owner = GetOwner(); + if (!owner || (owner->GetTypeId() == TYPEID_PLAYER && !owner->ToPlayer()->IsMounted())) RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); if (!HasUnitState(UNIT_STAT_ROOT)) // prevent allow move if have also root effect @@ -15865,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); @@ -15901,7 +15904,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au if (charmer->GetTypeId() == TYPEID_PLAYER) { - switch(type) + switch (type) { case CHARM_TYPE_VEHICLE: SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); @@ -15971,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(); @@ -16008,7 +16011,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) if (charmer->GetTypeId() == TYPEID_PLAYER) { - switch(type) + switch (type) { case CHARM_TYPE_VEHICLE: charmer->ToPlayer()->SetClientControl(charmer, 1); @@ -16181,10 +16184,10 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius) if (!owner) return; - Group* pGroup = owner->GetGroup(); - if (pGroup) + Group* group = owner->GetGroup(); + if (group) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -16212,15 +16215,15 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius) void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius) { Unit* owner = GetCharmerOrOwnerOrSelf(); - Group* pGroup = NULL; + Group* group = NULL; if (owner->GetTypeId() == TYPEID_PLAYER) - pGroup = owner->ToPlayer()->GetGroup(); + group = owner->ToPlayer()->GetGroup(); - if (pGroup) + if (group) { uint8 subgroup = owner->ToPlayer()->GetSubGroup(); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -16249,15 +16252,15 @@ void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius) void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap) { Unit* owner = GetCharmerOrOwnerOrSelf(); - Group* pGroup = NULL; + Group* group = NULL; if (owner->GetTypeId() == TYPEID_PLAYER) - pGroup = owner->ToPlayer()->GetGroup(); + group = owner->ToPlayer()->GetGroup(); - if (pGroup) + if (group) { uint8 subgroup = owner->ToPlayer()->GetSubGroup(); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -16510,7 +16513,7 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ) WorldPacket data(SMSG_MOVE_KNOCK_BACK, (8+4+4+4+4+4)); data.append(GetPackGUID()); - data << uint32(0); // Sequence + data << uint32(0); // counter data << float(vcos); // x direction data << float(vsin); // y direction data << float(speedXY); // Horizontal speed @@ -16572,7 +16575,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) // Male if (getGender() == GENDER_MALE) { - switch(skinColor) + switch (skinColor) { case 12: // White case 13: diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 8f68cd3e9e6..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); @@ -1490,7 +1491,7 @@ class Unit : public WorldObject int32 GetMechanicResistChance(const SpellInfo* spell); bool CanUseAttackType(uint8 attacktype) const { - switch(attacktype) + switch (attacktype) { case BASE_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED); case OFF_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_OFFHAND); @@ -1783,7 +1784,7 @@ class Unit : public WorldObject AuraEffect* GetAuraEffect(uint32 spellId, uint8 effIndex, uint64 casterGUID = 0) const; AuraEffect* GetAuraEffectOfRankedSpell(uint32 spellId, uint8 effIndex, uint64 casterGUID = 0) const; AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 iconId, uint8 effIndex) const; // spell mustn't have familyflags - AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 familyFlag1 , uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID =0); + AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID =0); inline AuraEffect* GetDummyAuraEffect(SpellFamilyNames name, uint32 iconId, uint8 effIndex) const { return GetAuraEffect(SPELL_AURA_DUMMY, name, iconId, effIndex);} AuraApplication * GetAuraApplication(uint32 spellId, uint64 casterGUID = 0, uint64 itemCasterGUID = 0, uint8 reqEffMask = 0, AuraApplication * except = NULL) const; @@ -1926,8 +1927,8 @@ class Unit : public WorldObject virtual void UpdateAttackPowerAndDamage(bool ranged = false) = 0; virtual void UpdateDamagePhysical(WeaponAttackType attType) = 0; float GetTotalAttackPowerValue(WeaponAttackType attType) const; - float GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const; - void SetBaseWeaponDamage(WeaponAttackType attType , WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } + float GetWeaponDamageRange(WeaponAttackType attType, WeaponDamageRange type) const; + void SetBaseWeaponDamage(WeaponAttackType attType, WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } bool isInFrontInMap(Unit const* target, float distance, float arc = M_PI) const; void SetInFront(Unit const* target) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index bbba91b2658..effd43cd320 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -159,7 +159,7 @@ void Vehicle::ApplyAllImmunities() _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_UNATTACKABLE, true); _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_SCHOOL_ABSORB, true); _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_SHIELD, true); - _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_IMMUNE_SHIELD , true); + _me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_IMMUNE_SHIELD, true); // ... Resistance, Split damage, Change stats ... _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_DAMAGE_SHIELD, true); diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 84ad326e445..e81cd053003 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -30,7 +30,7 @@ bool GameEventMgr::CheckOneGameEvent(uint16 entry) const { - switch(mGameEvent[entry].state) + switch (mGameEvent[entry].state) { default: case GAMEEVENT_NORMAL: @@ -1079,7 +1079,7 @@ void GameEventMgr::UnApplyEvent(uint16 event_id) void GameEventMgr::ApplyNewEvent(uint16 event_id) { - switch(sWorld->getIntConfig(CONFIG_EVENT_ANNOUNCE)) + switch (sWorld->getIntConfig(CONFIG_EVENT_ANNOUNCE)) { case 0: // disable break; @@ -1174,12 +1174,12 @@ void GameEventMgr::GameEventSpawn(int16 event_id) // We use spawn coords to spawn if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) { - Creature* pCreature = new Creature; + Creature* creature = new Creature; //sLog->outDebug("Spawning creature %u", *itr); - if (!pCreature->LoadFromDB(*itr, map)) - delete pCreature; + if (!creature->LoadFromDB(*itr, map)) + delete creature; else - map->Add(pCreature); + map->Add(creature); } } } @@ -1248,8 +1248,8 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) { sObjectMgr->RemoveCreatureFromGrid(*itr, data); - if (Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL)) - pCreature->AddObjectToRemoveList(); + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + creature->AddObjectToRemoveList(); } } @@ -1296,38 +1296,38 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) continue; // Update if spawned - Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT), (Creature*)NULL); - if (pCreature) + Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT), (Creature*)NULL); + if (creature) { if (activate) { - itr->second.equipement_id_prev = pCreature->GetCurrentEquipmentId(); - itr->second.modelid_prev = pCreature->GetDisplayId(); - pCreature->LoadEquipment(itr->second.equipment_id, true); + itr->second.equipement_id_prev = creature->GetCurrentEquipmentId(); + itr->second.modelid_prev = creature->GetDisplayId(); + creature->LoadEquipment(itr->second.equipment_id, true); if (itr->second.modelid >0 && itr->second.modelid_prev != itr->second.modelid) { CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelInfo(itr->second.modelid); if (minfo) { - pCreature->SetDisplayId(itr->second.modelid); - pCreature->SetNativeDisplayId(itr->second.modelid); - pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); - pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); + creature->SetDisplayId(itr->second.modelid); + creature->SetNativeDisplayId(itr->second.modelid); + creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); + creature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); } } } else { - pCreature->LoadEquipment(itr->second.equipement_id_prev, true); + creature->LoadEquipment(itr->second.equipement_id_prev, true); if (itr->second.modelid_prev >0 && itr->second.modelid_prev != itr->second.modelid) { CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelInfo(itr->second.modelid_prev); if (minfo) { - pCreature->SetDisplayId(itr->second.modelid_prev); - pCreature->SetNativeDisplayId(itr->second.modelid_prev); - pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); - pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); + creature->SetDisplayId(itr->second.modelid_prev); + creature->SetNativeDisplayId(itr->second.modelid_prev); + creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); + creature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); } } } 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/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 8d0751ef9ab..3c3fc36da05 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -199,7 +199,7 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke if (questStart) { // not in expected required quest state - if (((!questStartCanActive || !playerClicker->IsActiveQuest(questStart)) && !playerClicker->GetQuestRewardStatus(questStart))) + if ((!questStartCanActive || !playerClicker->IsActiveQuest(questStart)) && !playerClicker->GetQuestRewardStatus(questStart)) return false; } @@ -2266,7 +2266,7 @@ void ObjectMgr::LoadItemTemplates() if (itemTemplate.Unk0 != dbcitem->Unk0) { - sLog->outErrorDb("Item (Entry: %u) does not have a correct Unk0 (%i) , must be %i .", entry, itemTemplate.Unk0, dbcitem->Unk0); + sLog->outErrorDb("Item (Entry: %u) does not have a correct Unk0 (%i), must be %i .", entry, itemTemplate.Unk0, dbcitem->Unk0); if (enforceDBCAttributes) itemTemplate.Unk0 = dbcitem->Unk0; } @@ -3612,7 +3612,7 @@ void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, Play // if conversion from uint32 to uint8 causes unexpected behaviour, change lvl to uint32 for (uint8 lvl = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)-1; lvl < level; ++lvl) { - switch(_class) + switch (_class) { case CLASS_WARRIOR: info->stats[STAT_STRENGTH] += (lvl > 23 ? 2: (lvl > 1 ? 1: 0)); @@ -4206,7 +4206,7 @@ void ObjectMgr::LoadQuests() } if (!sFactionStore.LookupEntry(qinfo->RewRepFaction[j])) { - sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(), j+1, qinfo->RewRepFaction[j] , qinfo->RewRepFaction[j]); + sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(), j+1, qinfo->RewRepFaction[j], qinfo->RewRepFaction[j]); qinfo->RewRepFaction[j] = 0; // quest will not reward this } } @@ -4298,7 +4298,7 @@ void ObjectMgr::LoadQuests() if (qNextItr == mQuestTemplates.end()) { sLog->outErrorDb("Quest %u has `NextQuestInChain` = %u but quest %u does not exist, quest chain will not work.", - qinfo->GetQuestId(), qinfo->NextQuestInChain , qinfo->NextQuestInChain); + qinfo->GetQuestId(), qinfo->NextQuestInChain, qinfo->NextQuestInChain); qinfo->NextQuestInChain = 0; } else @@ -4362,7 +4362,7 @@ void ObjectMgr::LoadQuests() if (!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) { - sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.", spellInfo->Id, quest_id); + sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.", spellInfo->Id, quest_id); // this will prevent quest completing without objective const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); @@ -4921,7 +4921,7 @@ void ObjectMgr::LoadSpellScriptNames() sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) is not first rank of spell.", scriptName, fields[0].GetInt32()); continue; } - while(spellInfo) + while (spellInfo) { mSpellScripts.insert(SpellScriptsMap::value_type(spellInfo->Id, GetScriptId(scriptName))); spellInfo = sSpellMgr->GetSpellInfo(spellInfo->Id)->GetNextRankSpell(); @@ -6255,7 +6255,7 @@ uint32 ObjectMgr::GenerateMailID() uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh) { - switch(guidhigh) + switch (guidhigh) { case HIGHGUID_ITEM: if (m_hiItemGuid >= 0xFFFFFFFE) @@ -6474,7 +6474,7 @@ void ObjectMgr::LoadGameObjectTemplate() // Checks - switch(got.type) + switch (got.type) { case GAMEOBJECT_TYPE_DOOR: //0 { @@ -7562,7 +7562,7 @@ enum LanguageType static LanguageType GetRealmLanguageType(bool create) { - switch(sWorld->getIntConfig(CONFIG_REALM_ZONE)) + switch (sWorld->getIntConfig(CONFIG_REALM_ZONE)) { case REALM_ZONE_UNKNOWN: // any language case REALM_ZONE_DEVELOPMENT: @@ -7701,7 +7701,7 @@ void ObjectMgr::LoadGameObjectForQuests() GameObjectTemplateContainer const* gotc = sObjectMgr->GetGameObjectTemplates(); for (GameObjectTemplateContainer::const_iterator itr = gotc->begin(); itr != gotc->end(); ++itr) { - switch(itr->second.type) + switch (itr->second.type) { // scan GO chest with loot including quest items case GAMEOBJECT_TYPE_CHEST: @@ -7933,7 +7933,7 @@ SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id) SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial) { - switch(pSkill->categoryId) + switch (pSkill->categoryId) { case SKILL_CATEGORY_LANGUAGES: return SKILL_RANGE_LANGUAGE; case SKILL_CATEGORY_WEAPON: @@ -8648,7 +8648,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids) { for (ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM) { - switch(itrM->second.command) + switch (itrM->second.command) { case SCRIPT_COMMAND_TALK: { diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index b9e734ab7ed..d36892ffcb0 100755 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -54,7 +54,7 @@ Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER> &v CellPair begin_cell = standing_cell; CellPair end_cell = standing_cell; - switch(district) + switch (district) { case ALL_DISTRICT: { diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 843dff0f8ff..0cd15143cee 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -1032,11 +1032,8 @@ namespace Trinity 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; @@ -1187,25 +1184,25 @@ namespace Trinity class AllFriendlyCreaturesInGrid { public: - AllFriendlyCreaturesInGrid(Unit const* obj) : pUnit(obj) {} + AllFriendlyCreaturesInGrid(Unit const* obj) : unit(obj) {} bool operator() (Unit* u) { - if (u->isAlive() && u->IsVisible() && u->IsFriendlyTo(pUnit)) + if (u->isAlive() && u->IsVisible() && u->IsFriendlyTo(unit)) return true; return false; } private: - Unit const* pUnit; + Unit const* unit; }; class AllGameObjectsWithEntryInRange { 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; @@ -1220,9 +1217,9 @@ namespace Trinity { public: AllCreaturesOfEntryInRange(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {} - bool operator() (Unit* pUnit) + bool operator() (Unit* unit) { - if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit, m_fRange, false)) + if (unit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(unit, m_fRange, false)) return true; return false; @@ -1237,18 +1234,18 @@ namespace Trinity class PlayerAtMinimumRangeAway { public: - PlayerAtMinimumRangeAway(Unit const* unit, float fMinRange) : pUnit(unit), fRange(fMinRange) {} - bool operator() (Player* pPlayer) + PlayerAtMinimumRangeAway(Unit const* unit, float fMinRange) : unit(unit), fRange(fMinRange) {} + bool operator() (Player* player) { //No threat list check, must be done explicit if expected to be in combat with creature - if (!pPlayer->isGameMaster() && pPlayer->isAlive() && !pUnit->IsWithinDist(pPlayer, fRange, false)) + if (!player->isGameMaster() && player->isAlive() && !unit->IsWithinDist(player, fRange, false)) return true; return false; } private: - Unit const* pUnit; + Unit const* unit; float fRange; }; @@ -1272,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/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index df9ed7a4145..44d7f62305f 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -172,7 +172,6 @@ void Group::LoadGroupFromDB(Field* fields) m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL; else m_raidDifficulty = Difficulty(r_diff); - } void Group::LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles) @@ -720,12 +719,12 @@ void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r) } // notify group members which player is the allowed looter for the given creature -void Group::SendLooter(Creature* pCreature, Player* pLooter) +void Group::SendLooter(Creature* creature, Player* pLooter) { - ASSERT(pCreature); + ASSERT(creature); WorldPacket data(SMSG_LOOT_LIST, (8+8)); - data << uint64(pCreature->GetGUID()); + data << uint64(creature->GetGUID()); data << uint8(0); // unk1 if (pLooter) @@ -770,7 +769,6 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject) { if (member->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { - r->totalPlayersRolling++; if (member->GetPassOnGroupLoot()) @@ -1207,7 +1205,7 @@ void Group::SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot) slot = &(*witr); } - + WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+1+4+8+4+4+(GetMembersCount()-1)*(13+8+1+1+1+1)+8+1+8+1+1+1+1)); data << uint8(m_groupType); // group type (flags in 3.3) data << uint8(slot->group); @@ -1255,19 +1253,18 @@ void Group::SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot) player->GetSession()->SendPacket(&data); } -void Group::UpdatePlayerOutOfRange(Player* pPlayer) +void Group::UpdatePlayerOutOfRange(Player* player) { - if (!pPlayer || !pPlayer->IsInWorld()) + if (!player || !player->IsInWorld()) return; - Player* player; WorldPacket data; - pPlayer->GetSession()->BuildPartyMemberStatsChangedPacket(pPlayer, &data); + player->GetSession()->BuildPartyMemberStatsChangedPacket(player, &data); for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { player = itr->getSource(); - if (player && !player->IsWithinDist(pPlayer, player->GetSightRange(), false)) + if (player && !player->IsWithinDist(player, player->GetSightRange(), false)) player->GetSession()->SendPacket(&data); } } @@ -1589,9 +1586,9 @@ bool Group::InCombatToInstance(uint32 instanceId) { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->getAttackers().empty() && pPlayer->GetInstanceId() == instanceId && (pPlayer->GetMap()->IsRaidOrHeroicDungeon())) - for (std::set<Unit*>::const_iterator i = pPlayer->getAttackers().begin(); i != pPlayer->getAttackers().end(); ++i) + Player* player = itr->getSource(); + if (player && !player->getAttackers().empty() && player->GetInstanceId() == instanceId && (player->GetMap()->IsRaidOrHeroicDungeon())) + for (std::set<Unit*>::const_iterator i = player->getAttackers().begin(); i != player->getAttackers().end(); ++i) if ((*i) && (*i)->GetTypeId() == TYPEID_UNIT && (*i)->ToCreature()->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) return true; } @@ -1755,7 +1752,6 @@ void Group::BroadcastGroupUpdate(void) // -- not very efficient but safe for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) { - Player* pp = ObjectAccessor::FindPlayer(citr->guid); if (pp && pp->IsInWorld()) { @@ -2069,4 +2065,4 @@ void Group::ToggleGroupMemberFlag(member_witerator slot, uint8 flag, bool apply) slot->flags |= flag; else slot->flags &= ~flag; -} +}
\ No newline at end of file diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 9fcc5f66f58..ed1fc80fd20 100755 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -261,7 +261,7 @@ class Group void SendTargetIconList(WorldSession* session); void SendUpdate(); void SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot = NULL); - void UpdatePlayerOutOfRange(Player* pPlayer); + void UpdatePlayerOutOfRange(Player* player); // ignore: GUID of player that will be ignored void BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group=-1, uint64 ignore=0); void BroadcastReadyCheck(WorldPacket* packet); @@ -276,7 +276,7 @@ class Group void SendLootRoll(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r); void SendLootRollWon(uint64 SourceGuid, uint64 TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r); void SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r); - void SendLooter(Creature* pCreature, Player* pLooter); + void SendLooter(Creature* creature, Player* pLooter); void GroupLoot(Loot* loot, WorldObject* pLootedObject); void NeedBeforeGreed(Loot* loot, WorldObject* pLootedObject); void MasterLoot(Loot* loot, WorldObject* pLootedObject); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index f3efde3afa1..0103b164f64 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -489,7 +489,7 @@ bool Guild::BankTab::SetItem(SQLTransaction& trans, uint8 slotId, Item* pItem) return true; } -void Guild::BankTab::SendText(const Guild* pGuild, WorldSession* session) const +void Guild::BankTab::SendText(const Guild* guild, WorldSession* session) const { WorldPacket data(MSG_QUERY_GUILD_BANK_TEXT, 1 + m_text.size() + 1); data << uint8(m_tabId); @@ -498,7 +498,7 @@ void Guild::BankTab::SendText(const Guild* pGuild, WorldSession* session) const if (session) session->SendPacket(&data); else - pGuild->BroadcastPacket(&data); + guild->BroadcastPacket(&data); } /////////////////////////////////////////////////////////////////////////////// @@ -671,7 +671,7 @@ void Guild::Member::DecreaseBankRemainingValue(SQLTransaction& trans, uint8 tabI // If (tabId == GUILD_BANK_MAX_TABS) return money amount. // Otherwise return remaining items amount for specified tab. // If reset time was more than 24 hours ago, renew reset time and reset amount to maximum value. -uint32 Guild::Member::GetBankRemainingValue(uint8 tabId, const Guild* pGuild) const +uint32 Guild::Member::GetBankRemainingValue(uint8 tabId, const Guild* guild) const { // Guild master has unlimited amount. if (IsRank(GR_GUILDMASTER)) @@ -679,7 +679,7 @@ uint32 Guild::Member::GetBankRemainingValue(uint8 tabId, const Guild* pGuild) co // Check rights for non-money tab. if (tabId != GUILD_BANK_MAX_TABS) - if ((pGuild->_GetRankBankTabRights(m_rankId, tabId) & GUILD_BANK_RIGHT_VIEW_TAB) != GUILD_BANK_RIGHT_VIEW_TAB) + if ((guild->_GetRankBankTabRights(m_rankId, tabId) & GUILD_BANK_RIGHT_VIEW_TAB) != GUILD_BANK_RIGHT_VIEW_TAB) return 0; uint32 curTime = uint32(::time(NULL) / MINUTE); // minutes @@ -688,8 +688,8 @@ uint32 Guild::Member::GetBankRemainingValue(uint8 tabId, const Guild* pGuild) co RemainingValue& rv = const_cast <RemainingValue&> (m_bankRemaining[tabId]); rv.resetTime = curTime; rv.value = tabId == GUILD_BANK_MAX_TABS ? - pGuild->_GetRankBankMoneyPerDay(m_rankId) : - pGuild->_GetRankBankTabSlotsPerDay(m_rankId, tabId); + guild->_GetRankBankMoneyPerDay(m_rankId) : + guild->_GetRankBankTabSlotsPerDay(m_rankId, tabId); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement( tabId == GUILD_BANK_MAX_TABS ? @@ -1293,7 +1293,7 @@ void Guild::HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo) { Player* player = session->GetPlayer(); if (!_IsLeader(player)) - // "Only pGuild leaders can create emblems." + // "Only guild leaders can create emblems." SendSaveEmblemResult(session, ERR_GUILDEMBLEM_NOTGUILDMASTER); else if (!player->HasEnoughMoney(EMBLEM_PRICE)) // "You can't afford to do that." @@ -1634,7 +1634,7 @@ void Guild::HandleMemberDepositMoney(WorldSession* session, uint32 amount) if (!AccountMgr::IsPlayerAccount(player->GetSession()->GetSecurity()) && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { sLog->outCommand(player->GetSession()->GetAccountId(), - "GM %s (Account: %u) deposit money (Amount: %u) to pGuild bank (Guild ID %u)", + "GM %s (Account: %u) deposit money (Amount: %u) to guild bank (Guild ID %u)", player->GetName(), player->GetSession()->GetAccountId(), amount, m_id); } // Log guild bank event diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 51636dc218e..2ea345f2ca1 100755 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -473,7 +473,7 @@ private: void SetInfo(const std::string& name, const std::string& icon); void SetText(const std::string& text); - void SendText(const Guild* pGuild, WorldSession* session) const; + void SendText(const Guild* guild, WorldSession* session) const; inline Item* GetItem(uint8 slotId) const { return slotId < GUILD_BANK_MAX_SLOTS ? m_items[slotId] : NULL; } bool SetItem(SQLTransaction& trans, uint8 slotId, Item* pItem); @@ -492,7 +492,7 @@ private: class MoveItemData { public: - MoveItemData(Guild* pGuild, Player* player, uint8 container, uint8 slotId) : m_pGuild(pGuild), m_pPlayer(player), + MoveItemData(Guild* guild, Player* player, uint8 container, uint8 slotId) : m_pGuild(guild), m_pPlayer(player), m_container(container), m_slotId(slotId), m_pItem(NULL), m_pClonedItem(NULL) { } virtual ~MoveItemData() { } @@ -538,8 +538,8 @@ private: class PlayerMoveItemData : public MoveItemData { public: - PlayerMoveItemData(Guild* pGuild, Player* player, uint8 container, uint8 slotId) : - MoveItemData(pGuild, player, container, slotId) { } + PlayerMoveItemData(Guild* guild, Player* player, uint8 container, uint8 slotId) : + MoveItemData(guild, player, container, slotId) { } bool IsBank() const { return false; } bool InitItem(); @@ -553,8 +553,8 @@ private: class BankMoveItemData : public MoveItemData { public: - BankMoveItemData(Guild* pGuild, Player* player, uint8 container, uint8 slotId) : - MoveItemData(pGuild, player, container, slotId) { } + BankMoveItemData(Guild* guild, Player* player, uint8 container, uint8 slotId) : + MoveItemData(guild, player, container, slotId) { } bool IsBank() const { return true; } bool InitItem(); 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 fe8bfa6b844..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); } } @@ -292,8 +292,8 @@ void InstanceScript::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData) if (!lPlayers.isEmpty()) { for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) - if (Player* pPlayer = itr->getSource()) - pPlayer->SendUpdateWorldState(uiStateId, uiStateData); + if (Player* player = itr->getSource()) + player->SendUpdateWorldState(uiStateId, uiStateData); } else sLog->outDebug(LOG_FILTER_TSCR, "TSCR: DoUpdateWorldState attempt send data but no players in map."); @@ -311,8 +311,8 @@ void InstanceScript::DoSendNotifyToInstance(const char *format, ...) va_start(ap, format); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* pPlayer = i->getSource()) - if (WorldSession* pSession = pPlayer->GetSession()) + if (Player* player = i->getSource()) + if (WorldSession* pSession = player->GetSession()) pSession->SendNotification(format, ap); } va_end(ap); @@ -326,8 +326,8 @@ void InstanceScript::DoUpdateAchievementCriteria(AchievementCriteriaTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* pPlayer = i->getSource()) - pPlayer->UpdateAchievementCriteria(type, miscValue1, miscValue2, unit); + if (Player* player = i->getSource()) + player->UpdateAchievementCriteria(type, miscValue1, miscValue2, unit); } // Start timed achievement for all players in instance @@ -337,8 +337,8 @@ void InstanceScript::DoStartTimedAchievement(AchievementCriteriaTimedTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* pPlayer = i->getSource()) - pPlayer->GetAchievementMgr().StartTimedAchievement(type, entry); + if (Player* player = i->getSource()) + player->GetAchievementMgr().StartTimedAchievement(type, entry); } // Stop timed achievement for all players in instance @@ -348,8 +348,8 @@ void InstanceScript::DoStopTimedAchievement(AchievementCriteriaTimedTypes type, if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* pPlayer = i->getSource()) - pPlayer->GetAchievementMgr().RemoveTimedAchievement(type, entry); + if (Player* player = i->getSource()) + player->GetAchievementMgr().RemoveTimedAchievement(type, entry); } // Remove Auras due to Spell on all players in instance diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index c8063ccb818..eff811b14eb 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -430,19 +430,19 @@ bool Loot::FillLoot(uint32 lootId, LootStore const& store, Player* lootOwner, bo tab->Process(*this, store.IsRatesAllowed(), lootMode); // Processing is done there, callback via Loot::AddItem() // Setting access rights for group loot case - Group* pGroup = lootOwner->GetGroup(); - if (!personal && pGroup) + Group* group = lootOwner->GetGroup(); + if (!personal && group) { roundRobinPlayer = lootOwner->GetGUID(); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) if (Player* pl = itr->getSource()) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter FillNotNormalLootFor(pl, pl->IsAtGroupRewardDistance(lootOwner)); for (uint8 i = 0; i < items.size(); ++i) { if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(items[i].itemid)) - if (proto->Quality < uint32(pGroup->GetLootThreshold())) + if (proto->Quality < uint32(group->GetLootThreshold())) items[i].is_underthreshold = true; } } diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index f421c135233..6d54aacb311 100755 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -29,7 +29,7 @@ MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { - switch(sender->GetTypeId()) + switch (sender->GetTypeId()) { case TYPEID_UNIT: m_messageType = MAIL_CREATURE; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index c81eb8b61b0..26e058a32f3 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]; @@ -119,7 +118,7 @@ void Map::LoadVMap(int gx, int gy) { // x and y are swapped !! int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy); - switch(vmapLoadResult) + switch (vmapLoadResult) { case VMAP::VMAP_LOAD_RESULT_OK: sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); @@ -305,8 +304,8 @@ void Map::SwitchGridContainers(T* obj, bool on) obj->m_isWorldObject = on; } -template void Map::SwitchGridContainers(Creature* , bool); -//template void Map::SwitchGridContainers(DynamicObject* , bool); +template void Map::SwitchGridContainers(Creature*, bool); +//template void Map::SwitchGridContainers(DynamicObject*, bool); template<class T> void Map::DeleteFromWorld(T* obj) @@ -1604,7 +1603,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) @@ -2028,7 +2026,7 @@ void Map::RemoveAllObjectsInRemoveList() bool on = itr->second; i_objectsToSwitch.erase(itr); - switch(obj->GetTypeId()) + switch (obj->GetTypeId()) { case TYPEID_UNIT: if (!obj->ToCreature()->isPet()) @@ -2045,7 +2043,7 @@ void Map::RemoveAllObjectsInRemoveList() std::set<WorldObject*>::iterator itr = i_objectsToRemove.begin(); WorldObject* obj = *itr; - switch(obj->GetTypeId()) + switch (obj->GetTypeId()) { case TYPEID_CORPSE: { @@ -2176,15 +2174,15 @@ void Map::RemoveFromActive(Creature* c) } } -template void Map::Add(Corpse* ); -template void Map::Add(Creature* ); -template void Map::Add(GameObject* ); -template void Map::Add(DynamicObject* ); +template void Map::Add(Corpse*); +template void Map::Add(Creature*); +template void Map::Add(GameObject*); +template void Map::Add(DynamicObject*); -template void Map::Remove(Corpse* , bool); -template void Map::Remove(Creature* , bool); -template void Map::Remove(GameObject* , bool); -template void Map::Remove(DynamicObject* , bool); +template void Map::Remove(Corpse*, bool); +template void Map::Remove(Creature*, bool); +template void Map::Remove(GameObject*, bool); +template void Map::Remove(DynamicObject*, bool); /* ******* Dungeon Instance Maps ******* */ @@ -2240,8 +2238,8 @@ bool InstanceMap::CanEnter(Player* player) } // cannot enter while an encounter is in progress on raids - /*Group* pGroup = player->GetGroup(); - if (!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ + /*Group* group = player->GetGroup(); + if (!player->isGameMaster() && group && group->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ if (IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress()) { player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); @@ -2593,7 +2591,7 @@ BattlegroundMap::BattlegroundMap(uint32 id, time_t expiry, uint32 InstanceId, Ma BattlegroundMap::~BattlegroundMap() { - if(m_bg) + if (m_bg) { //unlink to prevent crash, always unlink all pointer reference before destruction m_bg->SetBgMap(NULL); @@ -2656,7 +2654,6 @@ void BattlegroundMap::RemoveAllPlayers() if (Player* plr = itr->getSource()) if (!plr->IsBeingTeleportedFar()) plr->TeleportTo(plr->GetBattlegroundEntryPoint()); - } Creature* @@ -2681,4 +2678,4 @@ void Map::UpdateIteratorBack(Player* player) { if (m_mapRefIter == player->GetMapRef()) m_mapRefIter = m_mapRefIter->nocheck_prev(); -} +}
\ No newline at end of file diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 385f7abcaa5..bbd3b20ecfb 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -254,8 +254,8 @@ class Map : public GridRefManager<NGridType> return false; } - virtual bool Add(Player* ); - virtual void Remove(Player* , bool); + virtual bool Add(Player*); + virtual void Remove(Player*, bool); template<class T> void Add(T *); template<class T> void Remove(T *, bool); @@ -266,7 +266,7 @@ class Map : public GridRefManager<NGridType> //function for setting up visibility distance for maps on per-type/per-Id basis virtual void InitVisibilityDistance(); - void PlayerRelocation(Player* , float x, float y, float z, float orientation); + void PlayerRelocation(Player*, float x, float y, float z, float orientation); void CreatureRelocation(Creature* creature, float x, float y, float z, float ang, bool respawnRelocationOnFail = true); template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor); @@ -429,8 +429,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; } @@ -577,8 +577,8 @@ class InstanceMap : public Map public: InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent); ~InstanceMap(); - bool Add(Player* ); - void Remove(Player* , bool); + bool Add(Player*); + void Remove(Player*, bool); void Update(const uint32); void CreateInstanceData(bool load); bool Reset(uint8 method); @@ -607,8 +607,8 @@ class BattlegroundMap : public Map BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode); ~BattlegroundMap(); - bool Add(Player* ); - void Remove(Player* , bool); + bool Add(Player*); + void Remove(Player*, bool); bool CanEnter(Player* player); void SetUnload(); //void UnloadAll(bool pForce); 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 0b9528e5760..0b7abacad28 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -343,7 +343,7 @@ uint32 MapManager::GetNumInstances() Map* map = itr->second; if (!map->Instanceable()) continue; - MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps(); + MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps(); for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) if (mitr->second->IsDungeon()) ret++; } @@ -360,7 +360,7 @@ uint32 MapManager::GetNumPlayersInInstances() Map* map = itr->second; if (!map->Instanceable()) continue; - MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps(); + MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps(); for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) if (mitr->second->IsDungeon()) ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize(); @@ -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/Language.h b/src/server/game/Miscellaneous/Language.h index ce6d66c4026..ffdf0131143 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -911,6 +911,8 @@ enum TrinityStrings LANG_COMMAND_TICKETLISTADDCOMMENT = 2024, LANG_COMMAND_TICKETLISTAGECREATE = 2025, LANG_COMMAND_TICKETSHOWESCALATEDLIST = 2026, + LANG_COMMAND_TICKETPENDING = 2027, + LANG_COMMAND_TICKETRESET = 2028, // Trinity strings 5000-9999 LANG_COMMAND_FREEZE = 5000, diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 9d015a5284d..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, @@ -2402,7 +2403,7 @@ enum QuestSort inline uint8 ClassByQuestSort(int32 QuestSort) { - switch(QuestSort) + switch (QuestSort) { case QUEST_SORT_WARLOCK: return CLASS_WARLOCK; case QUEST_SORT_WARRIOR: return CLASS_WARRIOR; @@ -2578,7 +2579,7 @@ enum SkillType inline SkillType SkillByLockType(LockType locktype) { - switch(locktype) + switch (locktype) { case LOCKTYPE_PICKLOCK: return SKILL_LOCKPICKING; case LOCKTYPE_HERBALISM: return SKILL_HERBALISM; @@ -2592,7 +2593,7 @@ inline SkillType SkillByLockType(LockType locktype) inline uint32 SkillByQuestSort(int32 QuestSort) { - switch(QuestSort) + switch (QuestSort) { case QUEST_SORT_HERBALISM: return SKILL_HERBALISM; case QUEST_SORT_FISHING: return SKILL_FISHING; diff --git a/src/server/game/Movement/DestinationHolderImp.h b/src/server/game/Movement/DestinationHolderImp.h index f1e815c093e..84e7fbf4f08 100755 --- a/src/server/game/Movement/DestinationHolderImp.h +++ b/src/server/game/Movement/DestinationHolderImp.h @@ -113,7 +113,7 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, return true; if (traveller.GetTraveller().HasUnitState(UNIT_STAT_IN_FLIGHT)) - GetLocationNow(traveller.GetTraveller().GetBaseMap() , x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation + GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation else GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 00fc3dde11f..5f84d6bc7b0 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -85,7 +85,7 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) float distance = 5.0f; - switch(i) + switch (i) { case 0: angle = i_cur_angle; diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index a12c05e847a..cca986ffea7 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -37,7 +37,7 @@ class RandomMovementGenerator void Reset(T &); bool Update(T &, const uint32); bool GetDestination(float &x, float &y, float &z) const; - void UpdateMapPosition(uint32 mapid, float &x , float &y, float &z) + void UpdateMapPosition(uint32 mapid, float &x, float &y, float &z) { i_destinationHolder.GetLocationNow(mapid, x, y, z); } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index a4432d7ca19..b925150ef71 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -413,7 +413,7 @@ void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value) void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid) { uint32 team; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: team = 0; @@ -432,9 +432,9 @@ void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid) void OutdoorPvP::HandleKill(Player* killer, Unit* killed) { - if (Group* pGroup = killer->GetGroup()) + if (Group* group = killer->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 8924ce8acbb..1969d1f98e1 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -180,7 +180,7 @@ class OPvPCapturePoint OutdoorPvP* m_PvP; // map to store the various gameobjects and creatures spawned by the objective - // type , guid + // type, guid std::map<uint32, uint64> m_Objects; std::map<uint32, uint64> m_Creatures; std::map<uint64, uint32> m_ObjectTypes; @@ -221,7 +221,7 @@ class OutdoorPvP : public ZoneScript void OnGameObjectCreate(GameObject* go); void OnGameObjectRemove(GameObject* go); - void OnCreatureCreate(Creature* ) {} + void OnCreatureCreate(Creature*) {} // send world state update to all players present void SendUpdateWorldState(uint32 field, uint32 value); diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index c5d2deef376..03accce42ed 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -220,8 +220,8 @@ void PoolGroup<Creature>::Despawn1Object(uint32 guid) { sObjectMgr->RemoveCreatureFromGrid(guid, data); - if (Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) - pCreature->AddObjectToRemoveList(); + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + creature->AddObjectToRemoveList(); } } @@ -363,15 +363,15 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj) // We use spawn coords to spawn if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) { - Creature* pCreature = new Creature; + Creature* creature = new Creature; //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning creature %u", guid); - if (!pCreature->LoadFromDB(obj->guid, map)) + if (!creature->LoadFromDB(obj->guid, map)) { - delete pCreature; + delete creature; return; } else - map->Add(pCreature); + map->Add(creature); } } } @@ -506,8 +506,8 @@ template <> void PoolGroup<Creature>::ReSpawn1Object(PoolObject* obj) { if (CreatureData const* data = sObjectMgr->GetCreatureData(obj->guid)) - if (Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) - pCreature->GetMap()->Add(pCreature); + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + creature->GetMap()->Add(creature); } // Method that does the respawn job on the specified gameobject @@ -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/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 22251ac0bd8..a1a1f5d5cac 100755 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -166,16 +166,16 @@ Quest::Quest(Field* questRecord) ++m_rewchoiceitemscount; } -uint32 Quest::XPValue(Player* pPlayer) const +uint32 Quest::XPValue(Player* player) const { - if (pPlayer) + if (player) { - int32 quest_level = (QuestLevel == -1 ? pPlayer->getLevel() : QuestLevel); + int32 quest_level = (QuestLevel == -1 ? player->getLevel() : QuestLevel); const QuestXPEntry* xpentry = sQuestXPStore.LookupEntry(quest_level); if (!xpentry) return 0; - int32 diffFactor = 2 * (quest_level - pPlayer->getLevel()) + 20; + int32 diffFactor = 2 * (quest_level - player->getLevel()) + 20; if (diffFactor < 1) diffFactor = 1; else if (diffFactor > 10) diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 8c415749d6b..61d492ce88c 100755 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -183,7 +183,7 @@ class Quest friend class ObjectMgr; public: Quest(Field* questRecord); - uint32 XPValue(Player* pPlayer) const; + uint32 XPValue(Player* player) const; bool HasFlag(uint32 flag) const { return (QuestFlags & flag) != 0; } void SetFlag(uint32 flag) { QuestFlags |= flag; } diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index ec651439bc5..3ded63fe812 100755 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -100,29 +100,29 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou // Helpers for ScriptProcess method. inline Player* Map::_GetScriptPlayerSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo) const { - Player* pPlayer = NULL; + Player* player = NULL; if (!source && !target) sLog->outError("%s source and target objects are NULL.", scriptInfo->GetDebugInfo().c_str()); else { // Check target first, then source. if (target) - pPlayer = target->ToPlayer(); - if (!pPlayer && source) - pPlayer = source->ToPlayer(); + player = target->ToPlayer(); + if (!player && source) + player = source->ToPlayer(); - if (!pPlayer) + if (!player) sLog->outError("%s neither source nor target object is player (source: TypeId: %u, Entry: %u, GUID: %u; target: TypeId: %u, Entry: %u, GUID: %u), skipping.", scriptInfo->GetDebugInfo().c_str(), source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, source ? source->GetGUIDLow() : 0, target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, target ? target->GetGUIDLow() : 0); } - return pPlayer; + return player; } inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* target, const ScriptInfo* scriptInfo, bool bReverse) const { - Creature* pCreature = NULL; + Creature* creature = NULL; if (!source && !target) sLog->outError("%s source and target objects are NULL.", scriptInfo->GetDebugInfo().c_str()); else @@ -131,31 +131,31 @@ inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* t { // Check target first, then source. if (target) - pCreature = target->ToCreature(); - if (!pCreature && source) - pCreature = source->ToCreature(); + creature = target->ToCreature(); + if (!creature && source) + creature = source->ToCreature(); } else { // Check source first, then target. if (source) - pCreature = source->ToCreature(); - if (!pCreature && target) - pCreature = target->ToCreature(); + creature = source->ToCreature(); + if (!creature && target) + creature = target->ToCreature(); } - if (!pCreature) + if (!creature) sLog->outError("%s neither source nor target are creatures (source: TypeId: %u, Entry: %u, GUID: %u; target: TypeId: %u, Entry: %u, GUID: %u), skipping.", scriptInfo->GetDebugInfo().c_str(), source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, source ? source->GetGUIDLow() : 0, target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, target ? target->GetGUIDLow() : 0); } - return pCreature; + return creature; } inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const { - Unit* pUnit = NULL; + Unit* unit = NULL; if (!obj) sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else if (!obj->isType(TYPEMASK_UNIT)) @@ -163,42 +163,42 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target", obj->GetTypeId(), obj->GetEntry(), obj->GetGUIDLow()); else { - pUnit = obj->ToUnit(); - if (!pUnit) + unit = obj->ToUnit(); + if (!unit) sLog->outError("%s %s object could not be casted to unit.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); } - return pUnit; + return unit; } inline Player* Map::_GetScriptPlayer(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const { - Player* pPlayer = NULL; + Player* player = NULL; if (!obj) sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else { - pPlayer = obj->ToPlayer(); - if (!pPlayer) + player = obj->ToPlayer(); + if (!player) sLog->outError("%s %s object is not a player (TypeId: %u, Entry: %u, GUID: %u).", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target", obj->GetTypeId(), obj->GetEntry(), obj->GetGUIDLow()); } - return pPlayer; + return player; } inline Creature* Map::_GetScriptCreature(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const { - Creature* pCreature = NULL; + Creature* creature = NULL; if (!obj) sLog->outError("%s %s object is NULL.", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target"); else { - pCreature = obj->ToCreature(); - if (!pCreature) + creature = obj->ToCreature(); + if (!creature) sLog->outError("%s %s object is not a creature (TypeId: %u, Entry: %u, GUID: %u).", scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target", obj->GetTypeId(), obj->GetEntry(), obj->GetGUIDLow()); } - return pCreature; + return creature; } inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const ScriptInfo* scriptInfo) const @@ -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/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 64c92470fd7..26d703458ac 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -479,6 +479,7 @@ void AddSC_boss_blood_prince_council(); void AddSC_boss_blood_queen_lana_thel(); void AddSC_boss_valithria_dreamwalker(); void AddSC_boss_sindragosa(); +void AddSC_boss_the_lich_king(); void AddSC_icecrown_citadel_teleport(); void AddSC_instance_icecrown_citadel(); void AddSC_icecrown_citadel(); @@ -1181,6 +1182,7 @@ void AddNorthrendScripts() AddSC_boss_blood_queen_lana_thel(); AddSC_boss_valithria_dreamwalker(); AddSC_boss_sindragosa(); + AddSC_boss_the_lich_king(); AddSC_icecrown_citadel_teleport(); AddSC_instance_icecrown_citadel(); AddSC_icecrown_citadel(); 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/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp index 23aa4c7a55a..a67006382ff 100755 --- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp @@ -130,14 +130,14 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) if (!item || !bid || !etime) return; //check for cheaters - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); return; } - AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(pCreature->getFaction()); + AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(creature->getFaction()); if (!auctionHouseEntry) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) has wrong faction.", uint32(GUID_LOPART(auctioneer))); @@ -148,7 +148,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) etime *= MINUTE; // client understand only 3 auction time - switch(etime) + switch (etime) { case 1*MIN_AUCTION_TIME: case 2*MIN_AUCTION_TIME: @@ -195,7 +195,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) return; } - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); //we have to take deposit : uint32 deposit = sAuctionMgr->GetAuctionDeposit(auctionHouseEntry, etime, it, count); @@ -262,8 +262,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data) if (!auctionId || !price) return; //check for cheaters - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); return; @@ -273,7 +273,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); AuctionEntry* auction = auctionHouse->GetAuction(auctionId); Player* pl = GetPlayer(); @@ -380,8 +380,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data) recv_data >> auctionId; //sLog->outDebug("Cancel AUCTION AuctionID: %u", auctionId); - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); return; @@ -391,7 +391,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); AuctionEntry* auction = auctionHouse->GetAuction(auctionId); Player* pl = GetPlayer(); @@ -465,8 +465,8 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data) outbiddedCount = 0; } - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); return; @@ -476,7 +476,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); WorldPacket data(SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4)); Player* pl = GetPlayer(); @@ -512,8 +512,8 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data) recv_data >> guid; recv_data >> listfrom; // not used in fact (this list not have page control in client) - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); return; @@ -523,7 +523,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); WorldPacket data(SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4)); data << (uint32) 0; // amount place holder @@ -565,8 +565,8 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) recv_data.read_skip<uint8>(); } - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); return; @@ -576,9 +576,9 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); + AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction()); - //sLog->outDebug("Auctionhouse search (GUID: %u TypeId: %u)", , list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", + //sLog->outDebug("Auctionhouse search (GUID: %u TypeId: %u)",, list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", // GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4+4+4)); diff --git a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp index 1810016d22e..95327a71374 100755 --- a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp @@ -25,7 +25,6 @@ #include "ArenaTeam.h" #include "BattlegroundMgr.h" -#include "BattlegroundWS.h" #include "Battleground.h" #include "Chat.h" #include "Language.h" @@ -252,56 +251,42 @@ void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPacket & /*recv_ if (!bg) // can't be received if player not in battleground return; - switch(bg->GetTypeID(true)) - { - case BATTLEGROUND_WS: - { - uint32 count = 0; + uint32 count = 0; + Player* aplr = NULL; + Player* hplr = NULL; - Player* aplr = ObjectAccessor::FindPlayer(((BattlegroundWS*)bg)->GetAllianceFlagPickerGUID()); - if (aplr) - ++count; - - Player* hplr = ObjectAccessor::FindPlayer(((BattlegroundWS*)bg)->GetHordeFlagPickerGUID()); - if (hplr) - ++count; + if (uint64 guid = bg->GetFlagPickerGUID(BG_TEAM_ALLIANCE)) + { + aplr = ObjectAccessor::FindPlayer(guid); + if (aplr) + ++count; + } - WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, 4 + 4 + 16 * count); - data << 0; - data << count; - if (aplr) - { - data << uint64(aplr->GetGUID()); - data << float(aplr->GetPositionX()); - data << float(aplr->GetPositionY()); - } + if (uint64 guid = bg->GetFlagPickerGUID(BG_TEAM_HORDE)) + { + hplr = ObjectAccessor::FindPlayer(guid); + if (hplr) + ++count; + } - if (hplr) - { - data << uint64(hplr->GetGUID()); - data << float(hplr->GetPositionX()); - data << float(hplr->GetPositionY()); - } + WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, 4 + 4 + 16 * count); + data << 0; + data << count; + if (aplr) + { + data << uint64(aplr->GetGUID()); + data << float(aplr->GetPositionX()); + data << float(aplr->GetPositionY()); + } - SendPacket(&data); - break; - } - case BATTLEGROUND_EY: - //TODO : fix me! - break; - case BATTLEGROUND_AB: - case BATTLEGROUND_AV: - { - WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, (4+4)); - data << uint32(0); - data << uint32(0); - SendPacket(&data); - break; - } - default: - //maybe it is sent also in arena - do nothing - break; + if (hplr) + { + data << uint64(hplr->GetGUID()); + data << float(hplr->GetPositionX()); + data << float(hplr->GetPositionY()); } + + SendPacket(&data); } void WorldSession::HandlePVPLogDataOpcode(WorldPacket & /*recv_data*/) @@ -429,7 +414,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) } uint32 queueSlot = _player->GetBattlegroundQueueIndex(bgQueueTypeId); WorldPacket data; - switch(action) + switch (action) { case 1: // port to battleground if (!_player->IsInvitedForBattlegroundQueueType(bgQueueTypeId)) @@ -646,7 +631,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) uint32 arenaRating = 0; uint32 matchmakerRating = 0; - switch(arenaslot) + switch (arenaslot) { case 0: arenatype = ARENA_TYPE_2v2; diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 8cd2484bfa2..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 { @@ -883,8 +885,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) if (pCurrChar->GetGuildId() != 0) { - if (Guild* pGuild = sGuildMgr->GetGuildById(pCurrChar->GetGuildId())) - pGuild->SendLoginInfo(this); + if (Guild* guild = sGuildMgr->GetGuildById(pCurrChar->GetGuildId())) + guild->SendLoginInfo(this); else { // remove wrong guild data @@ -1006,7 +1008,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) std::string IP_str = GetRemoteAddress(); sLog->outChar("Account: %d (IP: %s) Login Character:[%s] (GUID: %u)", - GetAccountId(), IP_str.c_str(), pCurrChar->GetName() , pCurrChar->GetGUIDLow()); + GetAccountId(), IP_str.c_str(), pCurrChar->GetName(), pCurrChar->GetGUIDLow()); if (!pCurrChar->IsStandState() && !pCurrChar->HasUnitState(UNIT_STAT_STUNNED)) pCurrChar->SetStandState(UNIT_STAND_STATE_STAND); @@ -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/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp index cd80331069c..83d92df4f7a 100755 --- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp @@ -141,7 +141,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data) lang = LANG_UNIVERSAL; else { - switch(type) + switch (type) { case CHAT_MSG_PARTY: case CHAT_MSG_PARTY_LEADER: @@ -549,7 +549,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recv_data) uint32 emote_anim = em->textid; - switch(emote_anim) + switch (emote_anim) { case EMOTE_STATE_SLEEP: case EMOTE_STATE_SIT: diff --git a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp index e8f6f05ee67..7e964b4faf6 100755 --- a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp @@ -33,8 +33,8 @@ inline Guild* _GetPlayerGuild(WorldSession* session, bool sendError = false) { if (uint32 guildId = session->GetPlayer()->GetGuildId()) // If guild id = 0, player is not in guild - if (Guild* pGuild = sGuildMgr->GetGuildById(guildId)) // Find guild by id - return pGuild; + if (Guild* guild = sGuildMgr->GetGuildById(guildId)) // Find guild by id + return guild; if (sendError) Guild::SendCommandResult(session, GUILD_CREATE_S, ERR_GUILD_PLAYER_NOT_IN_GUILD); return NULL; @@ -47,8 +47,8 @@ void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket) uint32 guildId; recvPacket >> guildId; // Use received guild id to access guild method (not player's guild id) - if (Guild* pGuild = sGuildMgr->GetGuildById(guildId)) - pGuild->HandleQuery(this); + if (Guild* guild = sGuildMgr->GetGuildById(guildId)) + guild->HandleQuery(this); else Guild::SendCommandResult(this, GUILD_CREATE_S, ERR_GUILD_PLAYER_NOT_IN_GUILD); } @@ -62,11 +62,11 @@ void WorldSession::HandleGuildCreateOpcode(WorldPacket& recvPacket) if (!GetPlayer()->GetGuildId()) // Player cannot be in guild { - Guild* pGuild = new Guild(); - if (pGuild->Create(GetPlayer(), name)) - sGuildMgr->AddGuild(pGuild); + Guild* guild = new Guild(); + if (guild->Create(GetPlayer(), name)) + sGuildMgr->AddGuild(guild); else - delete pGuild; + delete guild; } } @@ -78,8 +78,8 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket) recvPacket >> invitedName; if (normalizePlayerName(invitedName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleInviteMember(this, invitedName); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleInviteMember(this, invitedName); } void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket) @@ -90,8 +90,8 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket) recvPacket >> playerName; if (normalizePlayerName(playerName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleRemoveMember(this, playerName); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleRemoveMember(this, playerName); } void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/) @@ -100,8 +100,8 @@ void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/) // Player cannot be in guild if (!GetPlayer()->GetGuildId()) // Guild where player was invited must exist - if (Guild* pGuild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildIdInvited())) - pGuild->HandleAcceptMember(this); + if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildIdInvited())) + guild->HandleAcceptMember(this); } void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/) @@ -116,16 +116,16 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_INFO"); - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->SendInfo(this); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->SendInfo(this); } void WorldSession::HandleGuildRosterOpcode(WorldPacket& /*recvPacket*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_ROSTER"); - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleRoster(this); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleRoster(this); } void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) @@ -136,8 +136,8 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) recvPacket >> playerName; if (normalizePlayerName(playerName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleUpdateMemberRank(this, playerName, false); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleUpdateMemberRank(this, playerName, false); } void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket) @@ -148,24 +148,24 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket) recvPacket >> playerName; if (normalizePlayerName(playerName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleUpdateMemberRank(this, playerName, true); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleUpdateMemberRank(this, playerName, true); } void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_LEAVE"); - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleLeaveMember(this); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleLeaveMember(this); } void WorldSession::HandleGuildDisbandOpcode(WorldPacket& /*recvPacket*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_DISBAND"); - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleDisband(this); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleDisband(this); } void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket) @@ -176,8 +176,8 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket) recvPacket >> name; if (normalizePlayerName(name)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleSetLeader(this, name); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleSetLeader(this, name); } void WorldSession::HandleGuildMOTDOpcode(WorldPacket& recvPacket) @@ -188,8 +188,8 @@ void WorldSession::HandleGuildMOTDOpcode(WorldPacket& recvPacket) if (!recvPacket.empty()) recvPacket >> motd; - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleSetMOTD(this, motd); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleSetMOTD(this, motd); } void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket) @@ -203,8 +203,8 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket) recvPacket >> publicNote; if (normalizePlayerName(playerName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleSetMemberNote(this, playerName, publicNote, false); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleSetMemberNote(this, playerName, publicNote, false); } void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket) @@ -218,16 +218,16 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket) recvPacket >> officerNote; if (normalizePlayerName(playerName)) - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleSetMemberNote(this, playerName, officerNote, true); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleSetMemberNote(this, playerName, officerNote, true); } void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_RANK"); - Guild* pGuild = _GetPlayerGuild(this, true); - if (!pGuild) + Guild* guild = _GetPlayerGuild(this, true); + if (!guild) { recvPacket.rpos(recvPacket.wpos()); return; @@ -257,7 +257,7 @@ void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket) rightsAndSlots[tabId] = GuildBankRightsAndSlots(uint8(bankRights), slots); } - pGuild->HandleSetRankInfo(this, rankId, rankName, rights, money, rightsAndSlots); + guild->HandleSetRankInfo(this, rankId, rankName, rights, money, rightsAndSlots); } void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket) @@ -267,16 +267,16 @@ void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket) std::string rankName; recvPacket >> rankName; - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleAddNewRank(this, rankName); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleAddNewRank(this, rankName); } void WorldSession::HandleGuildDelRankOpcode(WorldPacket& /*recvPacket*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_DEL_RANK"); - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleRemoveLowestRank(this); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleRemoveLowestRank(this); } void WorldSession::HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket) @@ -286,8 +286,8 @@ void WorldSession::HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket) std::string info; recvPacket >> info; - if (Guild* pGuild = _GetPlayerGuild(this, true)) - pGuild->HandleSetInfo(this, info); + if (Guild* guild = _GetPlayerGuild(this, true)) + guild->HandleSetInfo(this, info); } void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket) @@ -306,10 +306,10 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleSetEmblem(this, emblemInfo); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleSetEmblem(this, emblemInfo); else - // "You are not part of a pGuild!"; + // "You are not part of a guild!"; Guild::SendSaveEmblemResult(this, ERR_GUILDEMBLEM_NOGUILD); } else @@ -324,24 +324,24 @@ void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received (MSG_GUILD_EVENT_LOG_QUERY)"); - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendEventLog(this); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendEventLog(this); } void WorldSession::HandleGuildBankMoneyWithdrawn(WorldPacket & /* recv_data */) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received (MSG_GUILD_BANK_MONEY_WITHDRAWN)"); - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendMoneyInfo(this); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendMoneyInfo(this); } void WorldSession::HandleGuildPermissions(WorldPacket& /* recv_data */) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received (MSG_GUILD_PERMISSIONS)"); - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendPermissions(this); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendPermissions(this); } // Called when clicking on Guild bank gameobject @@ -357,14 +357,14 @@ void WorldSession::HandleGuildBankerActivate(WorldPacket & recv_data) if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) { - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendBankTabsInfo(this); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendBankTabsInfo(this); else Guild::SendCommandResult(this, GUILD_UNK1, ERR_GUILD_PLAYER_NOT_IN_GUILD); } } -// Called when opening pGuild bank tab only (first one) +// Called when opening guild bank tab only (first one) void WorldSession::HandleGuildBankQueryTab(WorldPacket & recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received (CMSG_GUILD_BANK_QUERY_TAB)"); @@ -379,8 +379,8 @@ void WorldSession::HandleGuildBankQueryTab(WorldPacket & recv_data) recv_data >> unk1; if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendBankTabData(this, tabId); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendBankTabData(this, tabId); } void WorldSession::HandleGuildBankDepositMoney(WorldPacket & recv_data) @@ -395,8 +395,8 @@ void WorldSession::HandleGuildBankDepositMoney(WorldPacket & recv_data) if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) if (money && GetPlayer()->HasEnoughMoney(money)) - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleMemberDepositMoney(this, money); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleMemberDepositMoney(this, money); } void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket & recv_data) @@ -411,8 +411,8 @@ void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket & recv_data) if (money) if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleMemberWithdrawMoney(this, money); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleMemberWithdrawMoney(this, money); } void WorldSession::HandleGuildBankSwapItems(WorldPacket & recv_data) @@ -428,8 +428,8 @@ void WorldSession::HandleGuildBankSwapItems(WorldPacket & recv_data) return; } - Guild* pGuild = _GetPlayerGuild(this); - if (!pGuild) + Guild* guild = _GetPlayerGuild(this); + if (!guild) { recv_data.rfinish(); // Prevent additional spam at rejected packet return; @@ -459,7 +459,7 @@ void WorldSession::HandleGuildBankSwapItems(WorldPacket & recv_data) recv_data >> splitedAmount; - pGuild->SwapItems(GetPlayer(), tabId, slotId, destTabId, destSlotId, splitedAmount); + guild->SwapItems(GetPlayer(), tabId, slotId, destTabId, destSlotId, splitedAmount); } else { @@ -492,7 +492,7 @@ void WorldSession::HandleGuildBankSwapItems(WorldPacket & recv_data) if (!Player::IsInventoryPos(playerBag, playerSlotId) && !(playerBag == NULL_BAG && playerSlotId == NULL_SLOT)) GetPlayer()->SendEquipError(EQUIP_ERR_NONE, NULL); else - pGuild->SwapItemsWithInventory(GetPlayer(), toChar, tabId, slotId, playerBag, playerSlotId, splitedAmount); + guild->SwapItemsWithInventory(GetPlayer(), toChar, tabId, slotId, playerBag, playerSlotId, splitedAmount); } } @@ -507,8 +507,8 @@ void WorldSession::HandleGuildBankBuyTab(WorldPacket & recv_data) recv_data >> tabId; if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleBuyBankTab(this, tabId); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleBuyBankTab(this, tabId); } void WorldSession::HandleGuildBankUpdateTab(WorldPacket & recv_data) @@ -529,8 +529,8 @@ void WorldSession::HandleGuildBankUpdateTab(WorldPacket & recv_data) if (!name.empty() && !icon.empty()) if (GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK)) - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->HandleSetBankTabInfo(this, tabId, name, icon); + if (Guild* guild = _GetPlayerGuild(this)) + guild->HandleSetBankTabInfo(this, tabId, name, icon); } void WorldSession::HandleGuildBankLogQuery(WorldPacket & recv_data) @@ -540,8 +540,8 @@ void WorldSession::HandleGuildBankLogQuery(WorldPacket & recv_data) uint8 tabId; recv_data >> tabId; - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendBankLog(this, tabId); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendBankLog(this, tabId); } void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data) @@ -551,8 +551,8 @@ void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data) uint8 tabId; recv_data >> tabId; - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SendBankTabText(this, tabId); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SendBankTabText(this, tabId); } void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data) @@ -565,6 +565,6 @@ void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data) std::string text; recv_data >> text; - if (Guild* pGuild = _GetPlayerGuild(this)) - pGuild->SetBankTabText(tabId, text); + if (Guild* guild = _GetPlayerGuild(this)) + guild->SetBankTabText(tabId, text); } diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp index 9e18e25f8f7..eca466436be 100755 --- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp @@ -494,8 +494,8 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) if (!itemguid) return; - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSellItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, itemguid, 0); @@ -512,21 +512,21 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) // prevent sell not owner item if (_player->GetGUID() != pItem->GetOwnerGUID()) { - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } // prevent sell non empty bag by drag-and-drop at vendor's item list if (pItem->IsNotEmptyBag()) { - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } // prevent sell currently looted item if (_player->GetLootGUID() == pItem->GetGUID()) { - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } @@ -546,7 +546,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) // prevent sell more items that exist in stack (possible only not from client) if (count > pItem->GetCount()) { - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } } @@ -562,7 +562,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) if (!pNewItem) { sLog->outError("WORLD: HandleSellItemOpcode - could not create clone of item %u; count = %u", pItem->GetEntry(), count); - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } @@ -589,11 +589,11 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_VENDORS, money); } else - _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, itemguid, 0); return; } } - _player->SendSellError(SELL_ERR_CANT_FIND_ITEM, pCreature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_FIND_ITEM, creature, itemguid, 0); return; } @@ -605,8 +605,8 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data) recv_data >> vendorguid >> slot; - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBuybackItem - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0); @@ -623,7 +623,7 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data) uint32 price = _player->GetUInt32Value(PLAYER_FIELD_BUYBACK_PRICE_1 + slot - BUYBACK_SLOT_START); if (!_player->HasEnoughMoney(price)) { - _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, pItem->GetEntry(), 0); + _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, pItem->GetEntry(), 0); return; } @@ -642,7 +642,7 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data) return; } else - _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, pCreature, 0, 0); + _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, 0, 0); } void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recv_data) @@ -867,8 +867,8 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket) // cheating protection /* not critical if "cheated", and check skip allow by slots in bank windows open by .bank command. - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER); + if (!creature) { sLog->outDebug("WORLD: HandleBuyBankSlotOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); return; diff --git a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp index a3edcd3f827..83d3fad3b21 100755 --- a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp @@ -78,17 +78,17 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recv_data) } else { - Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid); + Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); + bool ok_loot = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); - if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) + if (!ok_loot || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) { player->SendLootRelease(lguid); return; } - loot = &pCreature->loot; + loot = &creature->loot; } player->StoreLootItem(lootSlot, loot); @@ -106,7 +106,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) Loot* loot = NULL; bool shareMoney = true; - switch(GUID_HIPART(guid)) + switch (GUID_HIPART(guid)) { case HIGHGUID_GAMEOBJECT: { @@ -329,9 +329,9 @@ void WorldSession::DoLootRelease(uint64 lguid) // if the round robin player release, reset it. if (player->GetGUID() == loot->roundRobinPlayer) { - if (Group* pGroup = player->GetGroup()) + if (Group* group = player->GetGroup()) { - if (pGroup->GetLootMethod() != MASTER_LOOT) + if (group->GetLootMethod() != MASTER_LOOT) { loot->roundRobinPlayer = 0; } @@ -384,20 +384,20 @@ void WorldSession::DoLootRelease(uint64 lguid) } else { - Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid); + Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid); - bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); - if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) + bool ok_loot = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed); + if (!ok_loot || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; - loot = &pCreature->loot; + loot = &creature->loot; if (loot->isLooted()) { // skip pickpocketing loot for speed, skinning timer reduction is no-op in fact - if (!pCreature->isAlive()) - pCreature->AllLootRemovedFromCorpse(); + if (!creature->isAlive()) + creature->AllLootRemovedFromCorpse(); - pCreature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); + creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); loot->clear(); } else @@ -405,15 +405,15 @@ void WorldSession::DoLootRelease(uint64 lguid) // if the round robin player release, reset it. if (player->GetGUID() == loot->roundRobinPlayer) { - if (Group* pGroup = player->GetGroup()) + if (Group* group = player->GetGroup()) { - if (pGroup->GetLootMethod() != MASTER_LOOT) + if (group->GetLootMethod() != MASTER_LOOT) { loot->roundRobinPlayer = 0; - pGroup->SendLooter(pCreature, NULL); + group->SendLooter(creature, NULL); // force update of dynamic flags, otherwise other group's players still not able to loot. - pCreature->ForceValuesUpdateAtIndex(UNIT_DYNAMIC_FLAGS); + creature->ForceValuesUpdateAtIndex(UNIT_DYNAMIC_FLAGS); } } else @@ -452,11 +452,11 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket & recv_data) if (IS_CRE_OR_VEH_GUID(GetPlayer()->GetLootGUID())) { - Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lootguid); - if (!pCreature) + Creature* creature = GetPlayer()->GetMap()->GetCreature(lootguid); + if (!creature) return; - pLoot = &pCreature->loot; + pLoot = &creature->loot; } else if (IS_GAMEOBJECT_GUID(GetPlayer()->GetLootGUID())) { diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp index 564478e75b9..432a8bf3f6a 100755 --- a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp @@ -577,7 +577,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data) data << uint32((*itr)->messageID); // Message ID data << uint8((*itr)->messageType); // Message Type - switch((*itr)->messageType) + switch ((*itr)->messageType) { case MAIL_NORMAL: // sender guid data << uint64(MAKE_NEW_GUID((*itr)->sender, 0, HIGHGUID_PLAYER)); @@ -743,7 +743,7 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/) else data << uint32(m->sender); // creature entry - switch(m->messageType) + switch (m->messageType) { case MAIL_AUCTION: data << uint32(2); diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index 125fba6db91..1b0cef69c04 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -820,7 +820,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data) if (player->GetMapId() != atEntry->mapid) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", player->GetName(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId); return; } @@ -1036,7 +1036,7 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data) } else { - switch(type) + switch (type) { case ACTION_BUTTON_MACRO: case ACTION_BUTTON_CMACRO: @@ -1347,7 +1347,7 @@ void WorldSession::HandleComplainOpcode(WorldPacket & recv_data) std::string description = ""; recv_data >> spam_type; // unk 0x01 const, may be spam type (mail/chat) recv_data >> spammer_guid; // player guid - switch(spam_type) + switch (spam_type) { case 0: recv_data >> unk1; // const 0 @@ -1401,7 +1401,7 @@ void WorldSession::HandleFarSightOpcode(WorldPacket & recv_data) uint8 apply; recv_data >> apply; - switch(apply) + switch (apply) { case 0: sLog->outDebug(LOG_FILTER_NETWORKIO, "Player %u set vision to self", _player->GetGUIDLow()); @@ -1464,13 +1464,13 @@ void WorldSession::HandleTimeSyncResp(WorldPacket & recv_data) void WorldSession::HandleResetInstancesOpcode(WorldPacket & /*recv_data*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_RESET_INSTANCES"); - Group* pGroup = _player->GetGroup(); - if (pGroup) + Group* group = _player->GetGroup(); + if (group) { - if (pGroup->IsLeader(_player->GetGUID())) + if (group->IsLeader(_player->GetGUID())) { - pGroup->ResetInstances(INSTANCE_RESET_ALL, false, _player); - pGroup->ResetInstances(INSTANCE_RESET_ALL, true, _player); + group->ResetInstances(INSTANCE_RESET_ALL, false, _player); + group->ResetInstances(INSTANCE_RESET_ALL, true, _player); } } else @@ -1504,12 +1504,12 @@ void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket & recv_data) return; } - Group* pGroup = _player->GetGroup(); - if (pGroup) + Group* group = _player->GetGroup(); + if (group) { - if (pGroup->IsLeader(_player->GetGUID())) + if (group->IsLeader(_player->GetGUID())) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if (!pGroupGuy) @@ -1527,8 +1527,8 @@ void WorldSession::HandleSetDungeonDifficultyOpcode(WorldPacket & recv_data) } // the difficulty is set even if the instances can't be reset //_player->SendDungeonDifficulty(true); - pGroup->ResetInstances(INSTANCE_RESET_CHANGE_DIFFICULTY, false, _player); - pGroup->SetDungeonDifficulty(Difficulty(mode)); + group->ResetInstances(INSTANCE_RESET_CHANGE_DIFFICULTY, false, _player); + group->SetDungeonDifficulty(Difficulty(mode)); } } else @@ -1562,12 +1562,12 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) if (Difficulty(mode) == _player->GetRaidDifficulty()) return; - Group* pGroup = _player->GetGroup(); - if (pGroup) + Group* group = _player->GetGroup(); + if (group) { - if (pGroup->IsLeader(_player->GetGUID())) + if (group->IsLeader(_player->GetGUID())) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupGuy = itr->getSource(); if (!pGroupGuy) @@ -1585,8 +1585,8 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) } // the difficulty is set even if the instances can't be reset //_player->SendDungeonDifficulty(true); - pGroup->ResetInstances(INSTANCE_RESET_CHANGE_DIFFICULTY, true, _player); - pGroup->SetRaidDifficulty(Difficulty(mode)); + group->ResetInstances(INSTANCE_RESET_CHANGE_DIFFICULTY, true, _player); + group->SetRaidDifficulty(Difficulty(mode)); } } else diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index c8c7e882046..bf971cae32f 100755 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -374,17 +374,11 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data) { plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth()); // pl can be alive if GM/etc + // change the death state to CORPSE to prevent the death timer from + // starting in the next player update if (!plMover->isAlive()) - { - // change the death state to CORPSE to prevent the death timer from - // starting in the next player update plMover->KillPlayer(); - plMover->BuildPlayerRepop(); - } } - - // cancel the death timer here if started - plMover->RepopAtGraveyard(); } } } @@ -427,7 +421,7 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data) static char const* move_type_name[MAX_MOVE_TYPE] = { "Walk", "Run", "RunBack", "Swim", "SwimBack", "TurnRate", "Flight", "FlightBack", "PitchRate" }; - switch(opcode) + switch (opcode) { case CMSG_FORCE_WALK_SPEED_CHANGE_ACK: move_type = MOVE_WALK; force_move_type = MOVE_WALK; break; case CMSG_FORCE_RUN_SPEED_CHANGE_ACK: move_type = MOVE_RUN; force_move_type = MOVE_RUN; break; @@ -523,13 +517,29 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket & recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_KNOCK_BACK_ACK"); - uint64 guid; // guid - unused + uint64 guid; recv_data.readPackGUID(guid); + if (_player->m_mover->GetGUID() != guid) + return; + recv_data.read_skip<uint32>(); // unk MovementInfo movementInfo; ReadMovementInfo(recv_data, &movementInfo); + _player->m_movementInfo = movementInfo; + + WorldPacket data(MSG_MOVE_KNOCK_BACK, 66); + data.appendPackGUID(guid); + _player->BuildMovementPacket(&data); + + // knockback specific info + data << movementInfo.j_sinAngle; + data << movementInfo.j_cosAngle; + data << movementInfo.j_xyspeed; + data << movementInfo.j_zspeed; + + _player->SendMessageToSet(&data, false); } void WorldSession::HandleMoveHoverAck(WorldPacket& recv_data) diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 3976517152d..5a8781d3925 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -147,10 +147,10 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid return; } - switch(flag) + switch (flag) { case ACT_COMMAND: //0x07 - switch(spellid) + switch (spellid) { case COMMAND_STAY: //flat=1792 //STAY pet->AttackStop(); @@ -267,7 +267,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid } break; case ACT_REACTION: // 0x6 - switch(spellid) + switch (spellid) { case REACT_PASSIVE: //passive pet->AttackStop(); @@ -677,7 +677,7 @@ void WorldSession::HandlePetAbandon(WorldPacket & recv_data) if (pet->GetGUID() == _player->GetPetGUID()) { uint32 feelty = pet->GetPower(POWER_HAPPINESS); - pet->SetPower(POWER_HAPPINESS , feelty > 50000 ? (feelty-50000) : 0); + pet->SetPower(POWER_HAPPINESS, feelty > 50000 ? (feelty-50000) : 0); } _player->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); diff --git a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp index 80cb3eda484..a931d8a5b3d 100755 --- a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp @@ -90,8 +90,8 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "Petitioner with GUID %u tried sell petition: name %s", GUID_LOPART(guidNPC), name.c_str()); // prevent cheating - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC, UNIT_NPC_FLAG_PETITIONER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC, UNIT_NPC_FLAG_PETITIONER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionBuyOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guidNPC)); return; @@ -104,7 +104,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) uint32 charterid = 0; uint32 cost = 0; uint32 type = 0; - if (pCreature->isTabardDesigner()) + if (creature->isTabardDesigner()) { // if tabard designer, then trying to buy a guild charter. // do not let if already in guild. @@ -124,7 +124,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) return; } - switch(clientIndex) // arenaSlot+1 as received from client (1 from 3 case) + switch (clientIndex) // arenaSlot+1 as received from client (1 from 3 case) { case 1: charterid = ARENA_TEAM_CHARTER_2v2; @@ -189,7 +189,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) if (!_player->HasEnoughMoney(cost)) { //player hasn't got enough money - _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, charterid, 0); + _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, creature, charterid, 0); return; } @@ -224,7 +224,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) do { Field* fields = result->Fetch(); - ssInvalidPetitionGUIDs << '\'' << fields[0].GetUInt32() << "' , "; + ssInvalidPetitionGUIDs << '\'' << fields[0].GetUInt32() << "', "; } while (result->NextRow()); } @@ -881,8 +881,8 @@ void WorldSession::HandlePetitionShowListOpcode(WorldPacket & recv_data) void WorldSession::SendPetitionShowList(uint64 guid) { - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_PETITIONER); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_PETITIONER); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionShowListOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); return; @@ -891,7 +891,7 @@ void WorldSession::SendPetitionShowList(uint64 guid) WorldPacket data(SMSG_PETITION_SHOWLIST, 8+1+4*6); data << guid; // npc guid - if (pCreature->isTabardDesigner()) + if (creature->isTabardDesigner()) { data << uint8(1); // count data << uint32(1); // index diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp index 34dc612cc78..bdb4b93a238 100755 --- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp @@ -56,80 +56,41 @@ void WorldSession::SendNameQueryOpcode(Player* p) 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(); - } - // 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() != "") - { - data << uint8(1); // is declined - for (int i = 5; i < MAX_DECLINED_NAME_CASES+5; ++i) - data << fields[i].GetString(); - } - else - data << uint8(0); // is not declined - - SendPacket(&data); -} - void WorldSession::HandleNameQueryOpcode(WorldPacket& recv_data) { uint64 guid; recv_data >> guid; + // This is disable by default to prevent lots of console spam + // sLog->outString("HandleNameQueryOpcode %u", guid); + if (Player* pChar = ObjectAccessor::FindPlayer(guid)) SendNameQueryOpcode(pChar); else - SendNameQueryOpcodeFromDB(guid); + { + if (const CharacterNameData* cname = sWorld->GetCharacterNameData(GUID_LOPART(guid))) + { + WorldPacket data(SMSG_NAME_QUERY_RESPONSE, 8+1+1+1+1+1+1+10); + data.appendPackGUID(guid); + data << uint8(0); + if (cname->m_name == "") + { + data << std::string(GetTrinityString(LANG_NON_EXIST_CHARACTER)); + data << uint32(0); + } + else + { + data << cname->m_name; + data << uint8(0); + data << uint8(cname->m_race); + data << uint8(cname->m_gender); + data << uint8(cname->m_class); + } + data << uint8(0); + SendPacket(&data); + } + } } void WorldSession::HandleQueryTimeOpcode(WorldPacket & /*recv_data*/) diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp index 97f65865508..fbd6c23d20f 100755 --- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp @@ -47,7 +47,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data) return; } - switch(questgiver->GetTypeId()) + switch (questgiver->GetTypeId()) { case TYPEID_UNIT: { @@ -86,8 +86,8 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid)); - Creature* pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); - if (!pCreature) + Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); + if (!creature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guid)); @@ -98,15 +98,15 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); // Stop the npc if moving - pCreature->StopMoving(); + creature->StopMoving(); - if (sScriptMgr->OnGossipHello(_player, pCreature)) + if (sScriptMgr->OnGossipHello(_player, creature)) return; - _player->PrepareGossipMenu(pCreature, pCreature->GetCreatureInfo()->GossipMenuId, true); - _player->SendPreparedGossip(pCreature); + _player->PrepareGossipMenu(creature, creature->GetCreatureInfo()->GossipMenuId, true); + _player->SendPreparedGossip(creature); - pCreature->AI()->sGossipHello(_player); + creature->AI()->sGossipHello(_player); } void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) @@ -146,10 +146,10 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) if (_player->GetDivider() != 0) { - Player* pPlayer = ObjectAccessor::FindPlayer(_player->GetDivider()); - if (pPlayer) + Player* player = ObjectAccessor::FindPlayer(_player->GetDivider()); + if (player) { - pPlayer->SendPushToPartyResponse(_player, QUEST_PARTY_MSG_ACCEPT_QUEST); + player->SendPushToPartyResponse(_player, QUEST_PARTY_MSG_ACCEPT_QUEST); _player->SetDivider(0); } } @@ -160,23 +160,23 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) if (qInfo->HasFlag(QUEST_FLAGS_PARTY_ACCEPT)) { - if (Group* pGroup = _player->GetGroup()) + if (Group* group = _player->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* pPlayer = itr->getSource(); + Player* player = itr->getSource(); - if (!pPlayer || pPlayer == _player) // not self + if (!player || player == _player) // not self continue; - if (pPlayer->CanTakeQuest(qInfo, true)) + if (player->CanTakeQuest(qInfo, true)) { - pPlayer->SetDivider(_player->GetGUID()); + player->SetDivider(_player->GetGUID()); //need confirmation that any gossip window will close - pPlayer->PlayerTalkClass->SendCloseGossip(); + player->PlayerTalkClass->SendCloseGossip(); - _player->SendQuestConfirmAccept(qInfo, pPlayer); + _player->SendQuestConfirmAccept(qInfo, player); } } } @@ -185,7 +185,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) if (_player->CanCompleteQuest(quest)) _player->CompleteQuest(quest); - switch(pObject->GetTypeId()) + switch (pObject->GetTypeId()) { case TYPEID_UNIT: sScriptMgr->OnQuestAccept(_player, (pObject->ToCreature()), qInfo); @@ -327,7 +327,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!(sScriptMgr->OnQuestReward(_player, (object->ToCreature()), quest, reward))) { // Send next quest - if (Quest const* nextQuest = _player->GetNextQuest(guid , quest)) + if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(quest, true)) { @@ -346,7 +346,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!sScriptMgr->OnQuestReward(_player, ((GameObject*)object), quest, reward)) { // Send next quest - if (Quest const* nextQuest = _player->GetNextQuest(guid , quest)) + if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(quest, true)) { @@ -546,49 +546,49 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket) if (Quest const* pQuest = sObjectMgr->GetQuestTemplate(questId)) { - if (Group* pGroup = _player->GetGroup()) + if (Group* group = _player->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { - Player* pPlayer = itr->getSource(); + Player* player = itr->getSource(); - if (!pPlayer || pPlayer == _player) // skip self + if (!player || player == _player) // skip self continue; - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_SHARING_QUEST); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_SHARING_QUEST); - if (!pPlayer->SatisfyQuestStatus(pQuest, false)) + if (!player->SatisfyQuestStatus(pQuest, false)) { - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_HAVE_QUEST); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_HAVE_QUEST); continue; } - if (pPlayer->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE) + if (player->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE) { - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_FINISH_QUEST); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_FINISH_QUEST); continue; } - if (!pPlayer->CanTakeQuest(pQuest, false)) + if (!player->CanTakeQuest(pQuest, false)) { - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_CANT_TAKE_QUEST); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_CANT_TAKE_QUEST); continue; } - if (!pPlayer->SatisfyQuestLog(false)) + if (!player->SatisfyQuestLog(false)) { - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_LOG_FULL); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_LOG_FULL); continue; } - if (pPlayer->GetDivider() != 0) + if (player->GetDivider() != 0) { - _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_BUSY); + _player->SendPushToPartyResponse(player, QUEST_PARTY_MSG_BUSY); continue; } - pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetGUID(), true); - pPlayer->SetDivider(_player->GetGUID()); + player->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetGUID(), true); + player->SetDivider(_player->GetGUID()); } } } @@ -604,26 +604,26 @@ void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket) if (_player->GetDivider() != 0) { - Player* pPlayer = ObjectAccessor::FindPlayer(_player->GetDivider()); - if (pPlayer) + Player* player = ObjectAccessor::FindPlayer(_player->GetDivider()); + if (player) { WorldPacket data(MSG_QUEST_PUSH_RESULT, (8+1)); data << uint64(guid); data << uint8(msg); // valid values: 0-8 - pPlayer->GetSession()->SendPacket(&data); + player->GetSession()->SendPacket(&data); _player->SetDivider(0); } } } -uint32 WorldSession::getDialogStatus(Player* pPlayer, Object* questgiver, uint32 defstatus) +uint32 WorldSession::getDialogStatus(Player* player, Object* questgiver, uint32 defstatus) { uint32 result = defstatus; QuestRelationBounds qr; QuestRelationBounds qir; - switch(questgiver->GetTypeId()) + switch (questgiver->GetTypeId()) { case TYPEID_GAMEOBJECT: { @@ -651,12 +651,12 @@ uint32 WorldSession::getDialogStatus(Player* pPlayer, Object* questgiver, uint32 if (!pQuest) continue; ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, pQuest->GetQuestId()); - if (!sConditionMgr->IsPlayerMeetToConditions(pPlayer, conditions)) + if (!sConditionMgr->IsPlayerMeetToConditions(player, conditions)) continue; - QuestStatus status = pPlayer->GetQuestStatus(quest_id); - if ((status == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(quest_id)) || - (pQuest->IsAutoComplete() && pPlayer->CanTakeQuest(pQuest, false))) + QuestStatus status = player->GetQuestStatus(quest_id); + if ((status == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(quest_id)) || + (pQuest->IsAutoComplete() && player->CanTakeQuest(pQuest, false))) { if (pQuest->IsAutoComplete() && pQuest->IsRepeatable()) result2 = DIALOG_STATUS_REWARD_REP; @@ -679,19 +679,19 @@ uint32 WorldSession::getDialogStatus(Player* pPlayer, Object* questgiver, uint32 continue; ConditionList conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK, pQuest->GetQuestId()); - if (!sConditionMgr->IsPlayerMeetToConditions(pPlayer, conditions)) + if (!sConditionMgr->IsPlayerMeetToConditions(player, conditions)) continue; - QuestStatus status = pPlayer->GetQuestStatus(quest_id); + QuestStatus status = player->GetQuestStatus(quest_id); if (status == QUEST_STATUS_NONE) { - if (pPlayer->CanSeeStartQuest(pQuest)) + if (player->CanSeeStartQuest(pQuest)) { - if (pPlayer->SatisfyQuestLevel(pQuest, false)) + if (player->SatisfyQuestLevel(pQuest, false)) { - if (pQuest->IsAutoComplete() || (pQuest->IsRepeatable() && pPlayer->IsQuestRewarded(quest_id))) + if (pQuest->IsAutoComplete() || (pQuest->IsRepeatable() && player->IsQuestRewarded(quest_id))) result2 = DIALOG_STATUS_REWARD_REP; - else if (pPlayer->getLevel() <= ((pPlayer->GetQuestLevel(pQuest) == -1) ? pPlayer->getLevel() : pPlayer->GetQuestLevel(pQuest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) + else if (player->getLevel() <= ((player->GetQuestLevel(pQuest) == -1) ? player->getLevel() : player->GetQuestLevel(pQuest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) { if (pQuest->HasFlag(QUEST_FLAGS_DAILY) || pQuest->HasFlag(QUEST_FLAGS_WEEKLY)) result2 = DIALOG_STATUS_AVAILABLE_REP; diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp index 08b2d181cd4..fe6d3f02ffa 100755 --- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp @@ -191,7 +191,7 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recv_data) if (nodes.empty()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" , nodes.front(), nodes.back()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d", nodes.front(), nodes.back()); GetPlayer()->ActivateTaxiPathTo(nodes, npc); } @@ -283,7 +283,7 @@ void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recv_data) nodes.resize(2); recv_data >> guid >> nodes[0] >> nodes[1]; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d" , nodes[0], nodes[1]); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d", nodes[0], nodes[1]); Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); if (!npc) { diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp index b8289bfada3..865158e7860 100755 --- a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp @@ -34,7 +34,7 @@ void WorldSession::SendTradeStatus(TradeStatus status) { WorldPacket data; - switch(status) + switch (status) { case TRADE_STATUS_BEGIN_TRADE: data.Initialize(SMSG_TRADE_STATUS, 4+8); diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index cbaf789faf6..df7816f7cb9 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -856,9 +856,9 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x33B*/ { "SMSG_INSTANCE_DIFFICULTY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x33C*/ { "MSG_GM_RESETINSTANCELIMIT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x33D*/ { "SMSG_MOTD", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x33E*/ { "SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x33F*/ { "SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x340*/ { "CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x33E*/ { "SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x33F*/ { "SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x340*/ { "CMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY_ACK", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x341*/ { "MSG_MOVE_START_SWIM_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x342*/ { "MSG_MOVE_STOP_SWIM_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x343*/ { "SMSG_MOVE_SET_CAN_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, @@ -868,7 +868,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x347*/ { "CMSG_SOCKET_GEMS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSocketOpcode }, /*0x348*/ { "CMSG_ARENA_TEAM_CREATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x349*/ { "SMSG_ARENA_TEAM_COMMAND_RESULT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x34A*/ { "MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x34A*/ { "MSG_MOVE_UPDATE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x34B*/ { "CMSG_ARENA_TEAM_QUERY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamQueryOpcode }, /*0x34C*/ { "SMSG_ARENA_TEAM_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x34D*/ { "CMSG_ARENA_TEAM_ROSTER", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamRosterOpcode }, @@ -1284,7 +1284,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x4E7*/ { "CMSG_BATTLEFIELD_MGR_EXIT_REQUEST", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4E8*/ { "SMSG_BATTLEFIELD_MGR_STATE_CHANGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x4E9*/ { "CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, - /*0x4EA*/ { "CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x4EA*/ { "CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4EB*/ { "MSG_SET_RAID_DIFFICULTY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetRaidDifficultyOpcode }, /*0x4EC*/ { "CMSG_TOGGLE_XP_GAIN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x4ED*/ { "SMSG_TOGGLE_XP_GAIN", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index c02b52bfb5a..ef51d1be918 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1282,7 +1282,7 @@ enum Opcodes CMSG_SET_PAID_SERVICE_CHEAT = 0x4DD, SMSG_BATTLEFIELD_MGR_ENTRY_INVITE = 0x4DE, // uint32 CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE = 0x4DF, - SMSG_BATTLEFIELD_MGR_ENTERED = 0x4E0, // uint32, uint8, uint8 + SMSG_BATTLEFIELD_MGR_ENTERED = 0x4E0, // uint32, uint8, uint8 SMSG_BATTLEFIELD_MGR_QUEUE_INVITE = 0x4E1, // uint32 CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE = 0x4E2, CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST = 0x4E3, @@ -1300,7 +1300,7 @@ enum Opcodes SMSG_GMRESPONSE_RECEIVED = 0x4EF, // uint32, uint32, string[2000], string[4000][4] CMSG_GMRESPONSE_RESOLVE = 0x4F0, SMSG_GMRESPONSE_STATUS_UPDATE = 0x4F1, // uint8 (1 - EVENT_GMSURVEY_DISPLAY, 0 - EVENT_UPDATE_TICKET) - SMSG_GMRESPONSE_CREATE_TICKET = 0x4F2, + SMSG_GMRESPONSE_CREATE_TICKET = 0x4F2, CMSG_GMRESPONSE_CREATE_TICKET = 0x4F3, CMSG_SERVERINFO = 0x4F4, SMSG_SERVERINFO = 0x4F5, diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 80af3961caf..cc57b72d9b4 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -441,8 +441,8 @@ void WorldSession::LogoutPlayer(bool Save) HandleMoveWorldportAckOpcode(); ///- If the player is in a guild, update the guild roster and broadcast a logout message to other guild members - if (Guild* pGuild = sGuildMgr->GetGuildById(_player->GetGuildId())) - pGuild->HandleMemberLogout(this); + if (Guild* guild = sGuildMgr->GetGuildById(_player->GetGuildId())) + guild->HandleMemberLogout(this); ///- Remove pet _player->RemovePet(NULL, PET_SAVE_AS_CURRENT, true); @@ -492,7 +492,7 @@ void WorldSession::LogoutPlayer(bool Save) // e.g if he got disconnected during a transfer to another map // calls to GetMap in this case may cause crashes _player->CleanupsBeforeDelete(); - sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName() , _player->GetGUIDLow()); + sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName(), _player->GetGUIDLow()); Map* _map = _player->GetMap(); _map->Remove(_player, true); SetPlayer(NULL); // deleted in Remove call @@ -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 8e489b7ea50..8b8b3b96b85 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -145,7 +145,7 @@ public: explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {} virtual ~PacketFilter() {} - virtual bool Process(WorldPacket* /*packet*/) { return true; } + virtual bool Process(WorldPacket* /*packet*/) { return true; } virtual bool ProcessLogout() const { return true; } protected: @@ -279,8 +279,6 @@ class WorldSession //void SendTestCreatureQueryOpcode(uint32 entry, uint64 guid, uint32 testvalue); void SendNameQueryOpcode(Player* p); - void SendNameQueryOpcodeFromDB(uint64 guid); - void SendNameQueryOpcodeFromDBCallBack(QueryResult result); void SendTrainerList(uint64 guid); void SendTrainerList(uint64 guid, const std::string& strTitle); @@ -367,7 +365,7 @@ class WorldSession uint32 GetLatency() const { return m_latency; } void SetLatency(uint32 latency) { m_latency = latency; } - uint32 getDialogStatus(Player* pPlayer, Object* questgiver, uint32 defstatus); + uint32 getDialogStatus(Player* player, Object* questgiver, uint32 defstatus); time_t m_timeOutTime; void UpdateTimeOutTime(uint32 diff) diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index c5daa540632..3875156289e 100755 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -310,7 +310,7 @@ int WorldSocket::handle_input (ACE_HANDLE) if ((errno == EWOULDBLOCK) || (errno == EAGAIN)) { - return Update(); // interesting line , isn't it ? + return Update(); // interesting line, isn't it ? } sLog->outStaticDebug("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno)); @@ -496,7 +496,7 @@ int WorldSocket::handle_input_header (void) if ((header.size < 4) || (header.size > 10240) || (header.cmd > 10240)) { Player* _player = m_Session ? m_Session->GetPlayer() : NULL; - sLog->outError ("WorldSocket::handle_input_header(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %d , cmd: %d)", + sLog->outError ("WorldSocket::handle_input_header(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %d, cmd: %d)", m_Session ? m_Session->GetAccountId() : 0, _player ? _player->GetGUIDLow() : 0, _player ? _player->GetName() : "<none>", @@ -599,7 +599,7 @@ int WorldSocket::handle_input_missing_data (void) // Its possible on some error situations that this happens // for example on closing when epoll receives more chunked data and stuff - // hope this is not hack , as proper m_RecvWPct is asserted around + // hope this is not hack, as proper m_RecvWPct is asserted around if (!m_RecvWPct) { sLog->outError ("Forcing close on input m_RecvWPct = NULL"); @@ -708,7 +708,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) try { - switch(opcode) + switch (opcode) { case CMSG_PING: return HandlePing (*new_pct); @@ -722,7 +722,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return HandleAuthSession (*new_pct); case CMSG_KEEP_ALIVE: - sLog->outStaticDebug ("CMSG_KEEP_ALIVE , size: " UI64FMTD, uint64(new_pct->size())); + sLog->outStaticDebug ("CMSG_KEEP_ALIVE, size: " UI64FMTD, uint64(new_pct->size())); sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return 0; default: @@ -735,7 +735,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) // Catches people idling on the login screen and any lingering ingame connections. m_Session->ResetTimeOutTime(); - // OK , give the packet to WorldSession + // OK, give the packet to WorldSession aptr.release(); // WARNINIG here we call it with locks held. // Its possible to cause deadlock if QueuePacket calls back diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index d10b0a11301..aa7424085f8 100755 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -118,7 +118,7 @@ class WorldSocket : public WorldHandler /// things called by ACE framework. - /// Called on open , the void* is the acceptor. + /// Called on open, the void* is the acceptor. virtual int open (void *); /// Called on failures inside of the acceptor, don't call from your code. @@ -152,7 +152,7 @@ class WorldSocket : public WorldHandler int handle_output_queue (GuardType& g); /// process one incoming packet. - /// @param new_pct received packet , note that you need to delete it. + /// @param new_pct received packet, note that you need to delete it. int ProcessIncoming (WorldPacket* new_pct); /// Called by ProcessIncoming() on CMSG_AUTH_SESSION. @@ -165,7 +165,7 @@ class WorldSocket : public WorldHandler /// Time in which the last ping was received ACE_Time_Value m_LastPingTime; - /// Keep track of over-speed pings , to prevent ping flood. + /// Keep track of over-speed pings, to prevent ping flood. uint32 m_OverSpeedPings; /// Address of the remote peer diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 95db31fd5df..ec29273d6b0 100755 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -47,7 +47,7 @@ #include "ScriptMgr.h" /** -* This is a helper class to WorldSocketMgr , that manages +* This is a helper class to WorldSocketMgr, that manages * network threads, and assigning connections from acceptor thread * to other network threads */ @@ -263,7 +263,7 @@ WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) if (m_Acceptor->open(listen_addr, m_NetThreads[0].GetReactor(), ACE_NONBLOCK) == -1) { - sLog->outError ("Failed to open acceptor , check if the port is free"); + sLog->outError ("Failed to open acceptor, check if the port is free"); return -1; } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index ccd7b8da79f..4876f435f55 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -449,7 +449,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) float DoneActualBenefit = 0.0f; // custom amount calculations go here - switch(GetAuraType()) + switch (GetAuraType()) { // crowd control auras case SPELL_AURA_MOD_CONFUSE: @@ -483,7 +483,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) m_canBeRecalculated = false; if (!caster) break; - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_MAGE: // Ice Barrier @@ -864,7 +864,7 @@ void AuraEffect::CalculateSpellMod() switch (GetAuraType()) { case SPELL_AURA_DUMMY: - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_PRIEST: // Pain and Suffering @@ -904,7 +904,7 @@ void AuraEffect::CalculateSpellMod() break; } case SPELL_AURA_MOD_SPELL_CRIT_CHANCE: - switch(GetId()) + switch (GetId()) { case 51466: // Elemental oath case 51470: // Elemental oath @@ -1112,21 +1112,21 @@ void AuraEffect::Update(uint32 diff, Unit* caster) void AuraEffect::UpdatePeriodic(Unit* caster) { - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_DUMMY: // Haunting Spirits if (GetId() == 7057) { - m_amplitude = irand (0 , 60) + 30; + m_amplitude = irand (0, 60) + 30; m_amplitude *= IN_MILLISECONDS; } break; case SPELL_AURA_PERIODIC_DUMMY: - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { // Drink case 430: @@ -1287,7 +1287,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const Unit* target = aurApp->GetTarget(); - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_PERIODIC_DUMMY: HandlePeriodicDummyAuraTick(target, caster); @@ -1327,7 +1327,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const case SPELL_AURA_DUMMY: // Haunting Spirits if (GetId() == 7057) - target->CastSpell((Unit*)NULL , GetAmount(), true); + target->CastSpell((Unit*)NULL, GetAmount(), true); break; default: break; @@ -1337,7 +1337,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit* caster) const void AuraEffect::HandleProc(AuraApplication* aurApp, ProcEventInfo& eventInfo) { // TODO: effect script handlers here - switch(GetAuraType()) + switch (GetAuraType()) { case SPELL_AURA_PROC_TRIGGER_SPELL: HandleProcTriggerSpellAuraProc(aurApp, eventInfo); @@ -1388,7 +1388,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const //uint32 spellId3 = 0; uint32 HotWSpellId = 0; - switch(GetMiscValue()) + switch (GetMiscValue()) { case FORM_CAT: spellId = 3025; @@ -1518,11 +1518,11 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const } } } - switch(GetMiscValue()) + switch (GetMiscValue()) { case FORM_CAT: // Savage Roar - if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0 , 0x10000000, 0)) + if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0, 0x10000000, 0)) target->CastSpell(target, 62071, true); // Nurturing Instinct if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0)) @@ -3469,7 +3469,7 @@ void AuraEffect::HandleAuraModStateImmunity(AuraApplication const* aurApp, uint8 target->ApplySpellImmune(GetId(), IMMUNITY_STATE, GetMiscValue(), apply); if (apply && GetSpellInfo()->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY) - target->RemoveAurasByType(AuraType(GetMiscValue()), 0 , GetBase()); + target->RemoveAurasByType(AuraType(GetMiscValue()), 0, GetBase()); } void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -4488,8 +4488,8 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8 if (target->GetTypeId() == TYPEID_PLAYER) { - for(int i = 0; i < MAX_ATTACK; ++i) - if(Item* item = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i),false)) + for (int i = 0; i < MAX_ATTACK; ++i) + if (Item* item = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), false)) target->ToPlayer()->_ApplyWeaponDependentAuraDamageMod(item, WeaponAttackType(i), this, apply); } @@ -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()) { @@ -4669,7 +4669,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool break; } } - switch(GetId()) + switch (GetId()) { case 1515: // Tame beast // FIX_ME: this is 2.0.12 threat effect replaced in 2.1.x by dummy aura, must be checked for correctness @@ -4707,7 +4707,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (caster) { - switch(caster->getGender()) + switch (caster->getGender()) { case GENDER_FEMALE: caster->CastSpell(target, 37095, true, NULL, this); // Blood Elf Disguise @@ -4747,7 +4747,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 46354: // Blood Elf Illusion if (caster) { - switch(caster->getGender()) + switch (caster->getGender()) { case GENDER_FEMALE: caster->CastSpell(target, 46356, true, NULL, this); @@ -4787,7 +4787,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (caster) // actually we can also use cast(this, originalcasterguid) { int32 damage; - switch(GetBase()->GetStackAmount()) + switch (GetBase()->GetStackAmount()) { case 1: damage = 0; break; case 2: damage = 500; break; @@ -4820,7 +4820,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if ((GetSpellInfo()->IsQuestTame()) && caster && caster->isAlive() && target->isAlive()) { uint32 finalSpelId = 0; - switch(GetId()) + switch (GetId()) { case 19548: finalSpelId = 19597; break; case 19674: finalSpelId = 19677; break; @@ -4846,10 +4846,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool caster->CastSpell(target, finalSpelId, true, NULL, this); } - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 2584: // Waiting to Resurrect // Waiting to resurrect spell cancel, we must remove player from resurrect queue @@ -4967,13 +4967,13 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool // AT APPLY & REMOVE - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: { if (!(mode & AURA_EFFECT_HANDLE_REAL)) break; - switch(GetId()) + switch (GetId()) { // Recently Bandaged case 11196: @@ -5050,7 +5050,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 57723: // Exhaustion case 57724: // Sated { - switch(GetId()) + switch (GetId()) { case 57723: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 32182, apply); break; // Heroism case 57724: target->ApplySpellImmune(GetId(), IMMUNITY_ID, 2825, apply); break; // Bloodlust @@ -5069,7 +5069,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool if (apply) { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 57819: FactionID = 1106; break; // Argent Crusade case 57820: FactionID = 1098; break; // Knights of the Ebon Blade @@ -5151,7 +5151,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) break; - switch(GetId()) + switch (GetId()) { case 52610: // Savage Roar { @@ -5608,8 +5608,8 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const case 66149: // Bullet Controller Periodic - 10 Man case 68396: // Bullet Controller Periodic - 25 Man { - caster->CastCustomSpell(66152, SPELLVALUE_MAX_TARGETS, urand(1,6), target, true); - caster->CastCustomSpell(66153, SPELLVALUE_MAX_TARGETS, urand(1,6), target, true); + caster->CastCustomSpell(66152, SPELLVALUE_MAX_TARGETS, urand(1, 6), target, true); + caster->CastCustomSpell(66153, SPELLVALUE_MAX_TARGETS, urand(1, 6), target, true); break; } case 54798: // FLAMING Arrow Triggered Effect @@ -5653,7 +5653,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const // Mirror Image if (GetId() == 55342) // Set name of summons to name of caster - target->CastSpell((Unit* )NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true); + target->CastSpell((Unit*)NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true); break; } case SPELLFAMILY_WARLOCK: @@ -5979,7 +5979,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) } case SPELLFAMILY_SHAMAN: { - switch(auraId) + switch (auraId) { // Lightning Shield (The Earthshatterer set trigger after cast Lighting Shield) case 28820: @@ -6541,7 +6541,7 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con } // spell-specific code - switch(GetId()) + switch (GetId()) { case 31447: // Mark of Kaz'rogal if (target->GetPower(powerType) == 0) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8bb46ed6144..df6ac44f2cc 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -57,7 +57,7 @@ m_effectsToApply(effMask), m_removeMode(AURA_REMOVE_NONE), m_needClientUpdate(fa Unit::VisibleAuraMap const* visibleAuras = GetTarget()->GetVisibleAuras(); // lookup for free slots in units visibleAuras Unit::VisibleAuraMap::const_iterator itr = visibleAuras->find(0); - for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr , ++freeSlot) + for (uint32 freeSlot = 0; freeSlot < MAX_AURAS; ++itr, ++freeSlot) { if (itr == visibleAuras->end() || itr->first != freeSlot) { @@ -224,7 +224,7 @@ uint8 Aura::BuildEffectMaskForOwner(SpellInfo const* spellProto, uint8 avalibleE ASSERT(spellProto); ASSERT(owner); uint8 effMask = 0; - switch(owner->GetTypeId()) + switch (owner->GetTypeId()) { case TYPEID_UNIT: case TYPEID_PLAYER: @@ -362,7 +362,7 @@ void Aura::_InitEffects(uint8 effMask, Unit* caster, int32 *baseAmount) Aura::~Aura() { // unload scripts - while(!m_loadedScripts.empty()) + while (!m_loadedScripts.empty()) { std::list<AuraScript*>::iterator itr = m_loadedScripts.begin(); (*itr)->_Unload(); @@ -469,7 +469,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) // fill up to date target list // target, effMask - std::map<Unit* , uint8> targets; + std::map<Unit*, uint8> targets; FillTargetMap(targets, caster); @@ -478,7 +478,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) // mark all auras as ready to remove for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end();++appIter) { - std::map<Unit* , uint8>::iterator existing = targets.find(appIter->second->GetTarget()); + std::map<Unit*, uint8>::iterator existing = targets.find(appIter->second->GetTarget()); // not found in current area - remove the aura if (existing == targets.end()) targetsToRemove.push_back(appIter->second->GetTarget()); @@ -495,7 +495,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) } // register auras for units - for (std::map<Unit* , uint8>::iterator itr = targets.begin(); itr!= targets.end();) + for (std::map<Unit*, uint8>::iterator itr = targets.begin(); itr!= targets.end();) { // aura mustn't be already applied on target if (AuraApplication * aurApp = GetApplicationOfTarget(itr->first->GetGUID())) @@ -572,7 +572,7 @@ void Aura::UpdateTargetMap(Unit* caster, bool apply) return; // apply aura effects for units - for (std::map<Unit* , uint8>::iterator itr = targets.begin(); itr!= targets.end();++itr) + for (std::map<Unit*, uint8>::iterator itr = targets.begin(); itr!= targets.end();++itr) { if (AuraApplication * aurApp = GetApplicationOfTarget(itr->first->GetGUID())) { @@ -1091,7 +1091,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 32474: // Buffeting Winds of Susurrus if (target->GetTypeId() == TYPEID_PLAYER) @@ -1153,7 +1153,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastSpell(target, 61634, true); } } - switch(GetId()) + switch (GetId()) { case 12536: // Clearcasting case 12043: // Presence of Mind @@ -1190,7 +1190,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_WARLOCK: - switch(GetId()) + switch (GetId()) { case 48020: // Demonic Circle if (target->GetTypeId() == TYPEID_PLAYER) @@ -1294,10 +1294,10 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b // mods at aura remove else { - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { case SPELLFAMILY_GENERIC: - switch(GetId()) + switch (GetId()) { case 61987: // Avenging Wrath // Remove the immunity shield marker on Avenging Wrath removal if Forbearance is not present @@ -1319,7 +1319,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_MAGE: - switch(GetId()) + switch (GetId()) { case 66: // Invisibility if (removeMode != AURA_REMOVE_BY_EXPIRE) @@ -1347,8 +1347,9 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (removeMode == AURA_REMOVE_BY_ENEMY_SPELL && GetSpellInfo()->SpellFamilyFlags[1] & 0x1) { // Shattered Barrier - if (caster->GetDummyAuraEffect(SPELLFAMILY_MAGE, 2945, 0)) - caster->CastSpell(target, 55080, true, NULL, GetEffect(0)); + if (AuraEffect * dummy = caster->GetDummyAuraEffect(SPELLFAMILY_MAGE, 2945, 0)) + if (roll_chance_i(dummy->GetSpellInfo()->ProcChance)) + caster->CastSpell(target, 55080, true, NULL, GetEffect(0)); } break; case SPELLFAMILY_WARRIOR: @@ -1403,7 +1404,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b caster->CastSpell(target, spellId, true); } } - switch(GetId()) + switch (GetId()) { case 48018: // Demonic Circle // Do not remove GO when aura is removed by stack @@ -1461,7 +1462,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; int32 triggeredSpellId = 0; - switch(target->getPowerType()) + switch (target->getPowerType()) { case POWER_MANA: { @@ -1480,7 +1481,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } } } - switch(GetId()) + switch (GetId()) { case 47788: // Guardian Spirit if (removeMode != AURA_REMOVE_BY_EXPIRE) @@ -1570,7 +1571,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b else { int32 basepoints0 = aurEff->GetAmount(); - target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL , true); + target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL, true); } } // Overkill @@ -1585,7 +1586,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_HUNTER: - switch(GetId()) + switch (GetId()) { case 19574: // Bestial Wrath // The Beast Within cast on owner if talent present @@ -1604,7 +1605,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; case SPELLFAMILY_PALADIN: - switch(GetId()) + switch (GetId()) { case 19746: case 31821: @@ -1646,7 +1647,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b Unit::AuraEffectList const& vDummyAuras = target->GetAuraEffectsByType(SPELL_AURA_DUMMY); for (Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr) { - switch((*itr)->GetId()) + switch ((*itr)->GetId()) { // Improved Blood Presence case 50365: @@ -1698,7 +1699,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { // Not listed as any effect, only base points set int32 basePoints0 = unholyPresenceAura->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, 63622, &basePoints0 , &basePoints0, &basePoints0, true, 0, unholyPresenceAura); + target->CastCustomSpell(target, 63622, &basePoints0, &basePoints0, &basePoints0, true, 0, unholyPresenceAura); } target->CastSpell(target, 49772, true); } @@ -2297,7 +2298,7 @@ void UnitAura::Remove(AuraRemoveMode removeMode) GetUnitOwner()->RemoveOwnedAura(this, removeMode); } -void UnitAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) +void UnitAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster) { for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS ; ++effIndex) { @@ -2355,7 +2356,7 @@ void UnitAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) for (UnitList::iterator itr = targetList.begin(); itr!= targetList.end();++itr) { - std::map<Unit* , uint8>::iterator existing = targets.find(*itr); + std::map<Unit*, uint8>::iterator existing = targets.find(*itr); if (existing != targets.end()) existing->second |= 1<<effIndex; else @@ -2382,7 +2383,7 @@ void DynObjAura::Remove(AuraRemoveMode removeMode) _Remove(removeMode); } -void DynObjAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* /*caster*/) +void DynObjAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* /*caster*/) { Unit* dynObjOwnerCaster = GetDynobjOwner()->GetCaster(); float radius = GetDynobjOwner()->GetRadius(); @@ -2408,7 +2409,7 @@ void DynObjAura::FillTargetMap(std::map<Unit* , uint8> & targets, Unit* /*caster for (UnitList::iterator itr = targetList.begin(); itr!= targetList.end();++itr) { - std::map<Unit* , uint8>::iterator existing = targets.find(*itr); + std::map<Unit*, uint8>::iterator existing = targets.find(*itr); if (existing != targets.end()) existing->second |= 1<<effIndex; else diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 6c641ef7d9b..bcf40fe69d7 100755 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -112,7 +112,7 @@ class Aura void _Remove(AuraRemoveMode removeMode); virtual void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT) = 0; - virtual void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster) = 0; + virtual void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster) = 0; void UpdateTargetMap(Unit* caster, bool apply = true); void _RegisterForTargets() {Unit* caster = GetCaster(); UpdateTargetMap(caster, false);} @@ -252,7 +252,7 @@ class UnitAura : public Aura void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster); + void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster); // Allow Apply Aura Handler to modify and access m_AuraDRGroup void SetDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; } @@ -270,6 +270,6 @@ class DynObjAura : public Aura public: void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - void FillTargetMap(std::map<Unit* , uint8> & targets, Unit* caster); + void FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster); }; #endif diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 255c6307d58..fd782519410 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -569,7 +569,7 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme Spell::~Spell() { // unload scripts - while(!m_loadedScripts.empty()) + while (!m_loadedScripts.empty()) { std::list<SpellScript*>::iterator itr = m_loadedScripts.begin(); (*itr)->_Unload(); @@ -1820,11 +1820,12 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin break; // Check if (*next) is a valid chain target. If not, don't add to TagUnitMap, and repeat loop. - // If you want to add any conditions to exclude a target from TagUnitMap, add condition in this while() loop. + // If you want to add any conditions to exclude a target from TagUnitMap, add condition in this while () loop. while ((m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE && !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; @@ -2665,10 +2666,10 @@ uint32 Spell::SelectEffectTargets(uint32 i, SpellImplicitTargetInfo const& cur) Player* targetPlayer = m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->GetTypeId() == TYPEID_PLAYER ? (Player*)m_targets.GetUnitTarget() : NULL; - Group* pGroup = targetPlayer ? targetPlayer->GetGroup() : NULL; - if (pGroup) + Group* group = targetPlayer ? targetPlayer->GetGroup() : NULL; + if (group) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -3407,7 +3408,7 @@ void Spell::_handle_immediate_phase() } } // Proc damage for spells which have only dest targets (2484 should proc 51486 for example) - m_originalCaster->ProcDamageAndSpell(0, procAttacker, 0, m_procEx | PROC_EX_NORMAL_HIT, 0, BASE_ATTACK, m_spellInfo, m_triggeredByAuraSpell); + m_originalCaster->ProcDamageAndSpell(NULL, procAttacker, 0, m_procEx | PROC_EX_NORMAL_HIT, 0, BASE_ATTACK, m_spellInfo, m_triggeredByAuraSpell); } } @@ -4577,7 +4578,10 @@ SpellCastResult Spell::CheckCast(bool strict) } if (m_spellInfo->AttributesEx7 & SPELL_ATTR7_IS_CHEAT_SPELL && !m_caster->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS)) - return SPELL_FAILED_SPELL_UNAVAILABLE; + { + m_customError = SPELL_CUSTOM_ERROR_GM_ONLY; + return SPELL_FAILED_CUSTOM_ERROR; + } // Check global cooldown if (strict && !(_triggeredCastFlags & TRIGGERED_IGNORE_GCD) && HasGlobalCooldown()) @@ -4626,7 +4630,12 @@ SpellCastResult Spell::CheckCast(bool strict) } } - bool reqCombat=true; + Unit::AuraEffectList const& blockSpells = m_caster->GetAuraEffectsByType(SPELL_AURA_BLOCK_SPELL_FAMILY); + for (Unit::AuraEffectList::const_iterator blockItr = blockSpells.begin(); blockItr != blockSpells.end(); ++blockItr) + if ((*blockItr)->GetMiscValue() == m_spellInfo->SpellFamilyName) + return SPELL_FAILED_SPELL_UNAVAILABLE; + + bool reqCombat = true; Unit::AuraEffectList const& stateAuras = m_caster->GetAuraEffectsByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE); for (Unit::AuraEffectList::const_iterator j = stateAuras.begin(); j != stateAuras.end(); ++j) { @@ -5162,12 +5171,12 @@ SpellCastResult Spell::CheckCast(bool strict) // RETURN HERE case SPELL_EFFECT_SUMMON_RAF_FRIEND: { - if(m_caster->GetTypeId() != TYPEID_PLAYER) + if (m_caster->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; Player* playerCaster = m_caster->ToPlayer(); // - if(!(playerCaster->GetSelection())) + if (!(playerCaster->GetSelection())) return SPELL_FAILED_BAD_TARGETS; Player* target = ObjectAccessor::FindPlayer(playerCaster->GetSelection()); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 6070df7e0aa..27b0844f32e 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -723,7 +723,7 @@ namespace Trinity break; } - switch(i_push_type) + switch (i_push_type) { case PUSH_SRC_CENTER: case PUSH_DST_CENTER: diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 741648ce70f..926a2280d18 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -62,6 +62,7 @@ #include "ScriptMgr.h" #include "GameObjectAI.h" #include "AccountMgr.h" +#include "InstanceScript.h" pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= { @@ -256,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*/) @@ -308,7 +309,7 @@ void Spell::EffectEnvironmentalDMG(SpellEffIndex /*effIndex*/) void Spell::EffectSchoolDMG(SpellEffIndex effIndex) { - if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET) + if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET) return; bool apply_direct_bonus = true; @@ -330,7 +331,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) damage /= count; // divide to all targets } - switch(m_spellInfo->Id) // better way to check unknown + switch (m_spellInfo->Id) // better way to check unknown { // Positive/Negative Charge case 28062: @@ -945,7 +946,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) case 35745: // Socrethar's Stone { uint32 spell_id; - switch(m_caster->GetAreaId()) + switch (m_caster->GetAreaId()) { case 3900: spell_id = 35743; break; // Socrethar Portal case 3742: spell_id = 35744; break; // Socrethar Portal @@ -1281,7 +1282,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) m_damage += CalculatePctF(damage, m_caster->GetTotalAttackPowerValue(BASE_ATTACK)); return; } - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Bloodthirst case 23881: @@ -1363,7 +1364,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) return; } - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 31789: // Righteous Defense (step 1) { @@ -1564,7 +1565,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) && effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET) { // special cases - switch(triggered_spell_id) + switch (triggered_spell_id) { // Mirror Image case 58832: @@ -1921,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); @@ -2141,7 +2142,7 @@ void Spell::EffectSendEvent(SpellEffIndex effIndex) && effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - Object* target = NULL; + WorldObject* target = NULL; // call events for target if present if (effectHandleMode == SPELL_EFFECT_HANDLE_HIT_TARGET) @@ -2162,7 +2163,9 @@ void Spell::EffectSendEvent(SpellEffIndex effIndex) sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->Effects[effIndex].MiscValue, m_spellInfo->Id); if (ZoneScript* zoneScript = m_caster->GetZoneScript()) - zoneScript->ProcessEvent(unitTarget, m_spellInfo->Effects[effIndex].MiscValue); + zoneScript->ProcessEvent(target, m_spellInfo->Effects[effIndex].MiscValue); + else if (InstanceScript* instanceScript = m_caster->GetInstanceScript()) // needed in case Player is the caster + instanceScript->ProcessEvent(target, m_spellInfo->Effects[effIndex].MiscValue); m_caster->GetMap()->ScriptsStart(sEventScripts, m_spellInfo->Effects[effIndex].MiscValue, m_caster, target); } @@ -2399,7 +2402,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) // bg reward have some special in code work uint32 bgType = 0; - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case SPELL_AV_MARK_WINNER: case SPELL_AV_MARK_LOSER: @@ -3189,7 +3192,7 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex) } typedef std::list< std::pair<uint32, uint64> > DispelList; -typedef std::list< std::pair<Aura* , uint8> > DispelChargesList; +typedef std::list< std::pair<Aura*, uint8> > DispelChargesList; void Spell::EffectDispel(SpellEffIndex effIndex) { if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) @@ -3325,9 +3328,9 @@ void Spell::EffectDispel(SpellEffIndex effIndex) int32 heal_amount = m_spellInfo->Effects[EFFECT_1].CalcValue(); m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true); // Glyph of Felhunter - if (Unit* pOwner = m_caster->GetOwner()) - if (pOwner->GetAura(56249)) - pOwner->CastCustomSpell(pOwner, 19658, &heal_amount, NULL, NULL, true); + if (Unit* owner = m_caster->GetOwner()) + if (owner->GetAura(56249)) + owner->CastCustomSpell(owner, 19658, &heal_amount, NULL, NULL, true); } } @@ -3659,7 +3662,7 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) // enchanting spell selected by calculated damage-per-sec stored in Effect[1] base value // Note: damage calculated (correctly) with rounding int32(float(v)) but // RW enchantments applied damage int32(float(v)+0.5), this create 0..1 difference sometime - switch(damage) + switch (damage) { // Rank 1 case 2: spell_id = 36744; break; // 0% [ 7% == 2, 14% == 2, 20% == 2] @@ -4236,7 +4239,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) { // We assume that a spell have at most one fixed_bonus // and at most one weaponDamagePercentMod - switch(m_spellInfo->Effects[j].Effect) + switch (m_spellInfo->Effects[j].Effect) { case SPELL_EFFECT_WEAPON_DAMAGE: case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL: @@ -4382,7 +4385,7 @@ void Spell::EffectSummonObjectWild(SpellEffIndex effIndex) Player* pl = m_caster->ToPlayer(); Battleground* bg = pl->GetBattleground(); - switch(pGameObj->GetMapId()) + switch (pGameObj->GetMapId()) { case 489: //WS { @@ -4438,11 +4441,11 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // TODO: we must implement hunter pet summon at login there (spell 6962) - switch(m_spellInfo->SpellFamilyName) + switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Glyph of Backstab case 63975: @@ -4525,7 +4528,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) return; uint32 spell_id = 0; - switch(urand(1, 5)) + switch (urand(1, 5)) { case 1: spell_id = 8854; break; default: spell_id = 8855; break; @@ -4660,7 +4663,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; @@ -4705,7 +4708,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 42680, true); break; case 150: unitTarget->CastSpell(unitTarget, 42683, true); break; @@ -4775,7 +4778,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) return; uint32 spellId = 0; - switch(rand() % 4) + switch (rand() % 4) { case 0: spellId = 46740; break; case 1: spellId = 46739; break; @@ -5021,7 +5024,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 0: unitTarget->CastSpell(unitTarget, 71343, true); break; case 75: unitTarget->CastSpell(unitTarget, 71344, true); break; @@ -5067,7 +5070,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 72281, true); break; case 150: unitTarget->CastSpell(unitTarget, 72282, true); break; @@ -5130,7 +5133,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (!pArea || (canFly && (pArea->flags & AREA_FLAG_NO_FLY_ZONE))) canFly = false; - switch(unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) + switch (unitTarget->ToPlayer()->GetBaseSkillValue(SKILL_RIDING)) { case 75: unitTarget->CastSpell(unitTarget, 75619, true); break; case 150: unitTarget->CastSpell(unitTarget, 75620, true); break; @@ -5229,7 +5232,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) uint32 spell_heal; - switch(m_caster->GetEntry()) + switch (m_caster->GetEntry()) { case 31897: spell_heal = 7001; break; case 31896: spell_heal = 27873; break; @@ -5396,7 +5399,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case SPELLFAMILY_POTION: { - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { // Netherbloom case 28702: @@ -5562,8 +5565,8 @@ void Spell::EffectDuel(SpellEffIndex effIndex) Map* map = m_caster->GetMap(); if (!pGameObj->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id, map, m_caster->GetPhaseMask(), - m_caster->GetPositionX()+(unitTarget->GetPositionX()-m_caster->GetPositionX())/2 , - m_caster->GetPositionY()+(unitTarget->GetPositionY()-m_caster->GetPositionY())/2 , + m_caster->GetPositionX()+(unitTarget->GetPositionX()-m_caster->GetPositionX())/2, + m_caster->GetPositionY()+(unitTarget->GetPositionY()-m_caster->GetPositionY())/2, m_caster->GetPositionZ(), m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) { @@ -5622,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(); } @@ -5879,7 +5882,7 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) uint32 go_id = m_spellInfo->Effects[effIndex].MiscValue; uint8 slot = 0; - switch(m_spellInfo->Effects[effIndex].Effect) + switch (m_spellInfo->Effects[effIndex].Effect) { case SPELL_EFFECT_SUMMON_OBJECT_SLOT1: slot = 0; break; case SPELL_EFFECT_SUMMON_OBJECT_SLOT2: slot = 1; break; @@ -5980,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) @@ -6241,11 +6244,7 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex) if (unitTarget->IsNonMeleeSpellCasted(true)) unitTarget->InterruptNonMeleeSpells(true); - float ratio = m_caster->GetCombatReach() / std::max(unitTarget->GetCombatReach(), 1.0f); - if (ratio < 1.0f) - ratio = ratio * ratio * ratio * 0.1f; // volume = length^3 - else - ratio = 0.1f; // dbc value ratio + float ratio = 0.1f; float speedxy = float(m_spellInfo->Effects[effIndex].MiscValue) * ratio; float speedz = float(damage) * ratio; if (speedxy < 0.1f && speedz < 0.1f) @@ -6288,34 +6287,34 @@ void Spell::EffectQuestClear(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - Player* pPlayer = unitTarget->ToPlayer(); + Player* player = unitTarget->ToPlayer(); 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 - if (pPlayer->GetQuestStatus(quest_id) == QUEST_STATUS_NONE) + if (player->GetQuestStatus(quest_id) == QUEST_STATUS_NONE) return; // remove all quest entries for 'entry' from quest log for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot) { - uint32 quest = pPlayer->GetQuestSlotQuestId(slot); + uint32 quest = player->GetQuestSlotQuestId(slot); if (quest == quest_id) { - pPlayer->SetQuestSlot(slot, 0); + player->SetQuestSlot(slot, 0); // we ignore unequippable quest items in this case, its' still be equipped - pPlayer->TakeQuestSourceItem(quest, false); + player->TakeQuestSourceItem(quest, false); } } - pPlayer->RemoveActiveQuest(quest_id); - pPlayer->RemoveRewardedQuest(quest_id); + player->RemoveActiveQuest(quest_id); + player->RemoveRewardedQuest(quest_id); } void Spell::EffectSendTaxi(SpellEffIndex effIndex) @@ -6579,7 +6578,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) int32 duration = m_spellInfo->GetDuration(); - switch(goinfo->type) + switch (goinfo->type) { case GAMEOBJECT_TYPE_FISHINGNODE: { @@ -6589,7 +6588,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) // end time of range when possible catch fish (FISHING_BOBBER_READY_TIME..GetDuration(m_spellInfo)) // start time == fish-FISHING_BOBBER_READY_TIME (0..GetDuration(m_spellInfo)-FISHING_BOBBER_READY_TIME) int32 lastSec = 0; - switch(urand(0, 3)) + switch (urand(0, 3)) { case 0: lastSec = 3; break; case 1: lastSec = 7; break; @@ -7229,7 +7228,7 @@ void Spell::EffectPlayerNotification(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - switch(m_spellInfo->Id) + switch (m_spellInfo->Id) { case 58730: // Restricted Flight Area case 58600: // Restricted Flight Area diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index b7bcf02f86c..543baa82789 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -370,7 +370,7 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_ {TARGET_OBJECT_TYPE_GOBJ, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 23 TARGET_GAMEOBJECT_TARGET {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_CONE, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_FRONT}, // 24 TARGET_UNIT_CONE_ENEMY_24 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 25 TARGET_UNIT_TARGET_ANY - {TARGET_OBJECT_TYPE_GOBJ_ITEM,TARGET_REFERENCE_TYPE_TARGET,TARGET_SELECT_CATEGORY_DEFAULT,TARGET_SELECT_CHECK_DEFAULT,TARGET_DIR_NONE}, // 26 TARGET_GAMEOBJECT_ITEM_TARGET + {TARGET_OBJECT_TYPE_GOBJ_ITEM, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 26 TARGET_GAMEOBJECT_ITEM_TARGET {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 27 TARGET_UNIT_MASTER {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 28 TARGET_DEST_DYNOBJ_ENEMY {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_ALLY, TARGET_DIR_NONE}, // 29 TARGET_DEST_DYNOBJ_ALLY @@ -437,9 +437,9 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_ {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 90 TARGET_UNIT_TARGET_MINIPET {TARGET_OBJECT_TYPE_DEST, TARGET_REFERENCE_TYPE_DEST, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_RANDOM}, // 91 TARGET_DEST_DEST_RADIUS {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 92 TARGET_UNIT_SUMMONER - {TARGET_OBJECT_TYPE_CORPSE,TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_NYI, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 93 TARGET_CORPSE_SRC_AREA_ENEMY + {TARGET_OBJECT_TYPE_CORPSE, TARGET_REFERENCE_TYPE_SRC, TARGET_SELECT_CATEGORY_NYI, TARGET_SELECT_CHECK_ENEMY, TARGET_DIR_NONE}, // 93 TARGET_CORPSE_SRC_AREA_ENEMY {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 94 TARGET_UNIT_VEHICLE - {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_PASSENGER,TARGET_DIR_NONE}, // 95 TARGET_UNIT_TARGET_PASSENGER + {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_TARGET, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_PASSENGER, TARGET_DIR_NONE}, // 95 TARGET_UNIT_TARGET_PASSENGER {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 96 TARGET_UNIT_PASSENGER_0 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 97 TARGET_UNIT_PASSENGER_1 {TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_SELECT_CHECK_DEFAULT, TARGET_DIR_NONE}, // 98 TARGET_UNIT_PASSENGER_2 @@ -522,7 +522,7 @@ bool SpellEffectInfo::IsAreaAuraEffect() const bool SpellEffectInfo::IsFarUnitTargetEffect() const { - return (Effect == SPELL_EFFECT_SUMMON_PLAYER) + return (Effect == SPELL_EFFECT_SUMMON_PLAYER) || (Effect == SPELL_EFFECT_SUMMON_RAF_FRIEND) || (Effect == SPELL_EFFECT_RESURRECT) || (Effect == SPELL_EFFECT_RESURRECT_NEW) @@ -689,7 +689,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 2 SPELL_EFFECT_SCHOOL_DAMAGE {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 3 SPELL_EFFECT_DUMMY {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 4 SPELL_EFFECT_PORTAL_TELEPORT - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 5 SPELL_EFFECT_TELEPORT_UNITS + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 5 SPELL_EFFECT_TELEPORT_UNITS {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 6 SPELL_EFFECT_APPLY_AURA {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 7 SPELL_EFFECT_ENVIRONMENTAL_DAMAGE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 8 SPELL_EFFECT_POWER_DRAIN @@ -713,7 +713,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 26 SPELL_EFFECT_DEFENSE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 27 SPELL_EFFECT_PERSISTENT_AREA_AURA {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 28 SPELL_EFFECT_SUMMON - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 29 SPELL_EFFECT_LEAP + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 29 SPELL_EFFECT_LEAP {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 30 SPELL_EFFECT_ENERGIZE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 31 SPELL_EFFECT_WEAPON_PERCENT_DAMAGE {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 32 SPELL_EFFECT_TRIGGER_MISSILE @@ -727,7 +727,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 40 SPELL_EFFECT_DUAL_WIELD {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 41 SPELL_EFFECT_JUMP {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_DEST}, // 42 SPELL_EFFECT_JUMP_DEST - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 44 SPELL_EFFECT_SKILL_STEP {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 45 SPELL_EFFECT_ADD_HONOR {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 46 SPELL_EFFECT_SPAWN @@ -767,7 +767,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 80 SPELL_EFFECT_ADD_COMBO_POINTS {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_DEST}, // 81 SPELL_EFFECT_CREATE_HOUSE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 82 SPELL_EFFECT_BIND_SIGHT - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 83 SPELL_EFFECT_DUEL + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 83 SPELL_EFFECT_DUEL {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 84 SPELL_EFFECT_STUCK {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 85 SPELL_EFFECT_SUMMON_PLAYER {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_GOBJ}, // 86 SPELL_EFFECT_ACTIVATE_OBJECT @@ -828,8 +828,8 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] = {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 141 SPELL_EFFECT_FORCE_CAST_WITH_VALUE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 143 SPELL_EFFECT_APPLY_AREA_AURA_OWNER - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 144 SPELL_EFFECT_KNOCK_BACK_DEST - {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST},// 145 SPELL_EFFECT_PULL_TOWARDS_DEST + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 144 SPELL_EFFECT_KNOCK_BACK_DEST + {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT_AND_DEST}, // 145 SPELL_EFFECT_PULL_TOWARDS_DEST {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 146 SPELL_EFFECT_ACTIVATE_RUNE {EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 147 SPELL_EFFECT_QUEST_FAIL {EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 148 SPELL_EFFECT_TRIGGER_MISSILE_SPELL_WITH_VALUE @@ -1597,10 +1597,10 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, Unit const* target, b if (target != caster && (caster->IsControlledByPlayer() || !IsPositive()) && target->GetTypeId() == TYPEID_PLAYER) { if (!target->ToPlayer()->IsVisible()) - return SPELL_FAILED_BAD_TARGETS; + return SPELL_FAILED_BM_OR_INVISGOD; if (target->ToPlayer()->isGameMaster()) - return SPELL_FAILED_BAD_TARGETS; + return SPELL_FAILED_BM_OR_INVISGOD; } // not allow casting on flying player diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 9b29120ef1c..b4f4ca8c11e 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -62,7 +62,7 @@ enum SpellCastTargetFlags TARGET_FLAG_UNUSED20 = 0x00080000, // uint32 counter, loop { vec3 - screen position (?), guid }, not used so far TARGET_FLAG_UNIT_PASSENGER = 0x00100000, // guessed, used to validate target (if vehicle passenger) - TARGET_FLAG_UNIT_MASK = TARGET_FLAG_UNIT | TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY + TARGET_FLAG_UNIT_MASK = TARGET_FLAG_UNIT | TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY | TARGET_FLAG_UNIT_ENEMY | TARGET_FLAG_UNIT_ALLY | TARGET_FLAG_UNIT_DEAD | TARGET_FLAG_UNIT_MINIPET | TARGET_FLAG_UNIT_PASSENGER, TARGET_FLAG_GAMEOBJECT_MASK = TARGET_FLAG_GAMEOBJECT | TARGET_FLAG_GAMEOBJECT_ITEM, TARGET_FLAG_CORPSE_MASK = TARGET_FLAG_CORPSE_ALLY | TARGET_FLAG_CORPSE_ENEMY, diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 57fa113dec8..cfa28080b2b 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1135,7 +1135,7 @@ void SpellMgr::LoadSpellRanks() } mSpellChains.clear(); - QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, rank from spell_ranks ORDER BY first_spell_id , rank"); + QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, rank from spell_ranks ORDER BY first_spell_id, rank"); if (!result) { @@ -1820,7 +1820,7 @@ void SpellMgr::LoadSpellProcs() baseProcEntry.cooldown = uint32(cooldown); baseProcEntry.charges = fields[14].GetUInt32(); - while(true) + while (true) { if (mSpellProcMap.find(spellId) != mSpellProcMap.end()) { @@ -2803,6 +2803,10 @@ void SpellMgr::LoadSpellCustomAttr() case 43140: // Flame Breath case 43215: // Flame Breath case 70461: // Coldflame Trap + case 72133: // Pain and Suffering + case 73788: // Pain and Suffering + case 73789: // Pain and Suffering + case 73790: // Pain and Suffering spellInfo->AttributesCu |= SPELL_ATTR0_CU_CONE_LINE; break; case 24340: // Meteor @@ -2986,7 +2990,6 @@ void SpellMgr::LoadDbcDataCorrections() case 25425: // Shoot case 45761: // Shoot case 42611: // Shoot - case 62374: // Pursued case 61588: // Blazing Harpoon case 52479: // Gift of the Harvester spellInfo->MaxAffectedTargets = 1; @@ -3173,6 +3176,9 @@ void SpellMgr::LoadDbcDataCorrections() break; // ULDUAR SPELLS // + case 62374: // Pursued (Flame Leviathan) + spellInfo->EffectRadiusIndex[0] = 28; // 50000yd + break; case 63342: // Focused Eyebeam Summon Trigger (Kologarn) spellInfo->MaxAffectedTargets = 1; break; @@ -3327,6 +3333,95 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_TARGET_ANY; spellInfo->Effect[1] = 0; break; + case 71614: // Ice Lock + spellInfo->Mechanic = MECHANIC_STUN; + break; + case 72762: // Defile + spellInfo->DurationIndex = 559; // 53 seconds + break; + case 72743: // Defile + spellInfo->DurationIndex = 22; // 45 seconds + break; + case 72754: // Defile + case 73708: // Defile + case 73709: // Defile + case 73710: // Defile + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + spellInfo->EffectRadiusIndex[1] = 22; // 200yd + break; + case 69030: // Val'kyr Target Search + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + spellInfo->EffectRadiusIndex[1] = 22; // 200yd + break; + case 69198: // Raging Spirit Visual + spellInfo->rangeIndex = 13; // 50000yd + break; + case 73654: // Harvest Souls + case 74295: // Harvest Souls + case 74296: // Harvest Souls + case 74297: // Harvest Souls + spellInfo->EffectRadiusIndex[0] = 28; // 50000yd + spellInfo->EffectRadiusIndex[1] = 28; // 50000yd + spellInfo->EffectRadiusIndex[2] = 28; // 50000yd + break; + case 73655: // Harvest Soul + spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_DONE_BONUS; + break; + case 73540: // Summon Shadow Trap + spellInfo->DurationIndex = 23; // 90 seconds + break; + case 73530: // Shadow Trap (visual) + spellInfo->DurationIndex = 28; // 5 seconds + break; + case 73529: // Shadow Trap + spellInfo->EffectRadiusIndex[1] = 13; // 10yd + break; + case 74282: // Shadow Trap (searcher) + spellInfo->EffectRadiusIndex[0] = 15; // 3yd + break; + case 72595: // Restore Soul + case 73650: // Restore Soul + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + break; + case 74086: // Destroy Soul + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + break; + case 74302: // Summon Spirit Bomb + case 74342: // Summon Spirit Bomb + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + spellInfo->MaxAffectedTargets = 1; + break; + case 74341: // Summon Spirit Bomb + case 74343: // Summon Spirit Bomb + spellInfo->EffectRadiusIndex[0] = 22; // 200yd + spellInfo->MaxAffectedTargets = 3; + break; + case 73579: // Summon Spirit Bomb + spellInfo->EffectRadiusIndex[0] = 20; // 25yd + break; + case 72350: // Fury of Frostmourne + spellInfo->EffectRadiusIndex[0] = 28; // 50000yd + spellInfo->EffectRadiusIndex[1] = 28; // 50000yd + break; + case 75127: // Kill Frostmourne Players + case 72351: // Fury of Frostmourne + case 72431: // Jump (removes Fury of Frostmourne debuff) + case 72429: // Mass Resurrection + case 73159: // Play Movie + case 73582: // Trigger Vile Spirit (Inside, Heroic) + spellInfo->EffectRadiusIndex[0] = 28; // 50000yd + break; + case 72376: // Raise Dead + spellInfo->MaxAffectedTargets = 3; + spellInfo->EffectRadiusIndex[0] = 28; // 50000yd + break; + case 71809: // Jump + spellInfo->rangeIndex = 3; // 20yd + spellInfo->EffectRadiusIndex[0] = 20; // 25yd + break; + case 72405: // Broken Frostmourne + spellInfo->EffectRadiusIndex[1] = 22; // 200yd + break; default: break; } diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 64d21b7c3a5..d701ab2882c 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -144,10 +144,10 @@ enum ProcFlags PROC_FLAG_DEATH = 0x01000000, // 24 Died in any way // flag masks - AUTO_ATTACK_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK + AUTO_ATTACK_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_RANGED_AUTO_ATTACK | PROC_FLAG_TAKEN_RANGED_AUTO_ATTACK, - MELEE_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK + MELEE_PROC_FLAG_MASK = PROC_FLAG_DONE_MELEE_AUTO_ATTACK | PROC_FLAG_TAKEN_MELEE_AUTO_ATTACK | PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS | PROC_FLAG_TAKEN_SPELL_MELEE_DMG_CLASS | PROC_FLAG_DONE_MAINHAND_ATTACK | PROC_FLAG_DONE_OFFHAND_ATTACK, diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 2d83b2e8f1a..53ec7822623 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -87,7 +87,7 @@ bool _SpellScript::EffectHook::IsEffectAffected(SpellInfo const* spellEntry, uin std::string _SpellScript::EffectHook::EffIndexToString() { - switch(effIndex) + switch (effIndex) { case EFFECT_ALL: return "EFFECT_ALL"; @@ -114,7 +114,7 @@ bool _SpellScript::EffectNameCheck::Check(SpellInfo const* spellEntry, uint8 eff std::string _SpellScript::EffectNameCheck::ToString() { - switch(effName) + switch (effName) { case SPELL_EFFECT_ANY: return "SPELL_EFFECT_ANY"; @@ -136,7 +136,7 @@ bool _SpellScript::EffectAuraNameCheck::Check(SpellInfo const* spellEntry, uint8 std::string _SpellScript::EffectAuraNameCheck::ToString() { - switch(effAurName) + switch (effAurName) { case SPELL_AURA_ANY: return "SPELL_AURA_ANY"; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index af814798a3a..dab77f6533d 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -374,13 +374,13 @@ class AuraScript : public _SpellScript #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ - typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const* , AuraEffectHandleModes); \ - typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const* ); \ - typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect* ); \ - typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const* , int32 &, bool &); \ - typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const* , bool &, int32 &); \ - typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const* , SpellModifier* &); \ - typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect* , DamageInfo &, uint32 &); \ + typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const*, AuraEffectHandleModes); \ + typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const*); \ + typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect*); \ + typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const*, int32 &, bool &); \ + typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const*, bool &, int32 &); \ + typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const*, SpellModifier* &); \ + typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect*, DamageInfo &, uint32 &); \ AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript) diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index cbfea3b81bd..10c1f4a1dfd 100755 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -200,6 +200,16 @@ TicketMgr::TicketMgr() : _status(true), _lastTicketId(0), _lastSurveyId(0), _ope void TicketMgr::Initialize() { SetStatus(sWorld->getBoolConfig(CONFIG_ALLOW_TICKETS)); } +void TicketMgr::ResetTickets() +{ + for (GmTicketList::const_iterator itr = _ticketList.begin(); itr != _ticketList.end(); ++itr) + if (itr->second->IsClosed()) + sTicketMgr->RemoveTicket(itr->second->GetId()); + + _lastTicketId = 0; + CharacterDatabase.PExecute("TRUNCATE TABLE gm_tickets"); +} + void TicketMgr::LoadTickets() { uint32 oldMSTime = getMSTime(); diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h index 73ff869c0d6..04fb7101ff7 100755 --- a/src/server/game/Tickets/TicketMgr.h +++ b/src/server/game/Tickets/TicketMgr.h @@ -213,6 +213,7 @@ public: uint32 GetNextSurveyID() { return ++_lastSurveyId; } void Initialize(); + void ResetTickets(); void ShowList(ChatHandler& handler, bool onlineOnly) const; void ShowClosedList(ChatHandler& handler) const; diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 24955737b46..e5865cc4f90 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -97,7 +97,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table ss << id; } } - while(result->NextRow()); + while (result->NextRow()); if (found) { diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index fff06661e10..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; @@ -493,7 +502,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s } // change the data to server values - switch(type) + switch (type) { case DTT_CHARACTER: { diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 0e98ebc7b17..590e6912cc5 100755 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -218,7 +218,7 @@ bool Weather::UpdateWeather() ///- Log the event char const* wthstr; - switch(state) + switch (state) { case WEATHER_STATE_LIGHT_RAIN: wthstr = "light rain"; @@ -281,7 +281,7 @@ WeatherState Weather::GetWeatherState() const if (m_grade<0.27f) return WEATHER_STATE_FINE; - switch(m_type) + switch (m_type) { case WEATHER_TYPE_RAIN: if (m_grade<0.40f) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d72f09f3279..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()) { @@ -2216,7 +2222,7 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string dura PreparedStatement* stmt = NULL; ///- Update the database with ban information - switch(mode) + switch (mode) { case BAN_IP: // No SQL injection with prepared statements @@ -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 6db414555da..1b3454e5ae6 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -104,7 +104,7 @@ public: std::string password = szPassword; AccountOpResult result = AccountMgr::CreateAccount(account_name, password); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); @@ -165,7 +165,7 @@ public: return false; AccountOpResult result = AccountMgr::DeleteAccount(account_id); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); @@ -299,7 +299,7 @@ public: } AccountOpResult result = AccountMgr::ChangePassword(handler->GetSession()->GetAccountId(), std::string(new_pass)); - switch(result) + switch (result) { case AOR_OK: handler->SendSysMessage(LANG_COMMAND_PASSWORD); diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 1848e22121c..dca2f1e4f0e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -291,7 +291,7 @@ public: else if (commentToken[1] == '/') { std::string str; - getline(ifs,str); + getline(ifs, str); continue; } // regular data @@ -558,7 +558,7 @@ public: uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); std::string st; - switch(item->GetState()) + switch (item->GetState()) { case ITEM_UNCHANGED: st = "unchanged"; break; case ITEM_CHANGED: st = "changed"; break; @@ -1061,13 +1061,13 @@ public: if (isint32) { uint32 iValue = (uint32)atoi(py); - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { float fValue = (float)atof(py); - target->SetFloatValue(Opcode , fValue); + target->SetFloatValue(Opcode, fValue); handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } @@ -1143,7 +1143,7 @@ public: int CurrentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(Opcode); CurrentValue += Value; - handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode , (uint32)CurrentValue); + handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode, (uint32)CurrentValue); handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); @@ -1225,7 +1225,7 @@ public: return false; uint32 iValue = Value ? 1 << (Value - 1) : 0; - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue); return true; diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 9ffd366544e..118ab9eb13a 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -498,18 +498,18 @@ public: float z; float ort; uint32 mapid; - + if (pmapid) mapid = (uint32)atoi(pmapid); else mapid = _player->GetMapId(); - - if( port ) + + if ( port ) ort = (float)atof(port); else ort = _player->GetOrientation(); - - if( pz ) + + if ( pz ) { z = (float)atof(pz); if (!MapManager::IsValidMapCoord(mapid, x, y, z)) @@ -530,7 +530,7 @@ public: 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()) { diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp index 57b11630a85..2a270527fb8 100644 --- a/src/server/scripts/Commands/cs_gps.cpp +++ b/src/server/scripts/Commands/cs_gps.cpp @@ -129,7 +129,7 @@ public: { Player* player = handler->GetSession()->GetPlayer(); - sLog->outSQLDev("(@PATH,XX,%.3f,%.3f,%.5f,0,0,0,100,0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + sLog->outSQLDev("(@PATH, XX, %.3f, %.3f, %.5f, 0,0, 0,100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index fe4dc2af1e2..7c08fe4d297 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -27,7 +27,7 @@ public: {
static ChatCommand commandTable[] =
{
- { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
+ { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 1951b6cd361..28bc17a7450 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -441,12 +441,12 @@ public: else if (target->ToCreature()->isPet()) { Unit* owner = target->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet* )target)->IsPermanentPetFor(owner->ToPlayer())) + if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer())) { // check online security if (handler->HasLowerSecurity(owner->ToPlayer(), 0)) return false; - ((Pet* )target)->SetFreeTalentPoints(tp); + ((Pet*)target)->SetFreeTalentPoints(tp); owner->ToPlayer()->SendTalentsInfoData(true); return true; } @@ -725,7 +725,7 @@ public: uint32 num = 0; num = atoi((char*)args); - switch(num) + switch (num) { case 1: mId=14340; @@ -1282,7 +1282,7 @@ public: return false; uint32 anim_id = atoi((char*)args); - handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE , anim_id); + handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE, anim_id); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index b91f85ec1b6..cdb87fde354 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -952,7 +952,7 @@ public: // make some emotes char lastchar = args[strlen(args) - 1]; - switch(lastchar) + switch (lastchar) { case '?': creature->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION); break; case '!': creature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; @@ -1272,7 +1272,7 @@ public: bool added = false; if (tmpItem) { - switch(SlotID) + switch (SlotID) { case 1: creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY, ItemID); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5e08a1b0611..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); @@ -77,7 +77,7 @@ public: // check item starting quest (it can work incorrectly if added without item in inventory) ItemTemplateContainer const* itc = sObjectMgr->GetItemTemplateStore(); - ItemTemplateContainer::const_iterator result = find_if(itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); + ItemTemplateContainer::const_iterator result = find_if (itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); if (result != itc->end()) { @@ -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/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 4e7a2794f58..7784d495f80 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -226,7 +226,7 @@ public: static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) { - if(*args != 'a') // will be reloaded from all_gossips + if (*args != 'a') // will be reloaded from all_gossips HandleReloadNpcTrainerCommand(handler, "a"); HandleReloadNpcVendorCommand(handler, "a"); HandleReloadPointsOfInterestCommand(handler, "a"); @@ -298,7 +298,7 @@ public: { HandleReloadGossipMenuCommand(handler, "a"); HandleReloadGossipMenuOptionCommand(handler, "a"); - if(*args != 'a') // already reload from all_scripts + if (*args != 'a') // already reload from all_scripts HandleReloadPointsOfInterestCommand(handler, "a"); return true; } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index dea747b97b8..e3295a6c45e 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -92,7 +92,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript { if (!bHasAura) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_NORTH_MARSHAL: DoCast(me, SPELL_NORTH_MARSHAL); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index d9d8627403a..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; } @@ -106,14 +106,14 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + 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; @@ -211,7 +211,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0: DoScriptText(SCRIPT_TEXT1, me);//2 @@ -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) @@ -297,7 +297,7 @@ public: { if (Event_Timer <= diff) { - switch(EventPhase) + switch (EventPhase) { case 0: DoScriptText(SCRIPT_TEXT5, me);//1 @@ -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()); @@ -662,15 +662,15 @@ public: void WaypointReached(uint32 i) { - switch(i) + 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,12 +780,12 @@ public: { npc_marshal_windsorAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 1: me->Say(SAY_WINDSOR_1, LANG_UNIVERSAL, PlayerGUID); @@ -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); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); + 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); @@ -959,7 +959,7 @@ public: void WaypointReached(uint32 i) { wp=i; - switch(i) + switch (i) { case 0: me->setFaction(11); @@ -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,30 +1160,30 @@ 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); } } void WaypointReached(uint32 i) { - switch(i) + switch (i) { 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,16 +1284,16 @@ 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) + switch (i) { case 1: me->HandleEmoteCommand(EMOTE_ONESHOT_KICK); @@ -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 f6fa3ca18d9..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; @@ -162,7 +162,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; @@ -184,7 +184,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; @@ -220,7 +220,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data); - switch(type) + switch (type) { case DATA_EVENSTARTER: TombEventStarterGUID = data; @@ -236,7 +236,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); - switch(type) + switch (type) { case TYPE_RING_OF_LAW: m_auiEncounter[0] = data; @@ -281,7 +281,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_RING_OF_LAW: return m_auiEncounter[0]; @@ -306,7 +306,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_EMPEROR: return EmperorGUID; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index 72f4fb707c8..b330e80a294 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -27,7 +27,7 @@ enum Data DATA_UROK_DOOMHOWL, // not scripted DATA_QUARTERMASTER_ZIGRIS, DATA_GIZRUL_THE_SLAVENER, // not scripted - DATA_HALYCON , + DATA_HALYCON, DATA_OVERLORD_WYRMTHALAK, DATA_PYROGAURD_EMBERSEER, DATA_WARCHIEF_REND_BLACKHAND, diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index 415f3796d52..d65c1c68090 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -81,7 +81,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_OMOKK: HighlordOmokk = creature->GetGUID(); @@ -130,7 +130,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_WHELP_SPAWNER: go->CastSpell(NULL, SPELL_SUMMON_ROOKERY_WHELP); @@ -169,7 +169,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_OMOKK: return HighlordOmokk; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index d74c075b05a..85d80bee062 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -244,24 +244,24 @@ public: std::list<HostileReference*> threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) { - Unit* pUnit; + Unit* unit; if ((*i) && (*i)->getSource()) { - pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit) + unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit) { //Cast affliction - DoCast(pUnit, RAND(SPELL_BROODAF_BLUE, SPELL_BROODAF_BLACK, + DoCast(unit, RAND(SPELL_BROODAF_BLUE, SPELL_BROODAF_BLACK, SPELL_BROODAF_RED, SPELL_BROODAF_BRONZE, SPELL_BROODAF_GREEN), true); //Chromatic mutation if target is effected by all afflictions - if (pUnit->HasAura(SPELL_BROODAF_BLUE) - && pUnit->HasAura(SPELL_BROODAF_BLACK) - && pUnit->HasAura(SPELL_BROODAF_RED) - && pUnit->HasAura(SPELL_BROODAF_BRONZE) - && pUnit->HasAura(SPELL_BROODAF_GREEN)) + if (unit->HasAura(SPELL_BROODAF_BLUE) + && unit->HasAura(SPELL_BROODAF_BLACK) + && unit->HasAura(SPELL_BROODAF_RED) + && 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 @@ -269,8 +269,8 @@ public: //So instead we instant kill our target //WORKAROUND - if (pUnit->GetTypeId() == TYPEID_PLAYER) - pUnit->CastSpell(pUnit, 5, false); + if (unit->GetTypeId() == TYPEID_PLAYER) + unit->CastSpell(unit, 5, false); } } } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 53985ce9e58..13574a71b8b 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -98,7 +98,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(7134, creature->GetGUID()); return true; } @@ -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 cbb4917de2e..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()); } } @@ -138,7 +138,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->HandleEmoteCommand(EMOTE_STATE_KNEEL); //dosen't work? 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 370bcfe13b9..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; @@ -186,7 +186,7 @@ class instance_deadmines : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FACTORY_DOOR: FactoryDoorGUID = go->GetGUID(); break; case GO_IRONCLAD_DOOR: IronCladDoorGUID = go->GetGUID(); break; @@ -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 f18fc5ee243..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); } } } @@ -273,7 +273,7 @@ public: if (me->getFaction() != GetPlayerForEscort()->getFaction()) me->setFaction(GetPlayerForEscort()->getFaction()); - switch(uiPoint) + switch (uiPoint) { case 3: SetEscortPaused(true); @@ -312,7 +312,7 @@ public: void SetData(uint32 uiI, uint32 uiValue) { - switch(uiI) + switch (uiI) { case 1: SetEscortPaused(true); @@ -320,16 +320,16 @@ public: NextStep(1500, true); break; case 2: - if (!pInstance) + if (!instance) return; - switch(uiValue) + 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; } @@ -339,7 +339,7 @@ public: void Summon(uint8 uiCase) { - switch(uiCase) + switch (uiCase) { case 1: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); @@ -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: @@ -417,7 +417,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_BLASTMASTER_1, me); @@ -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 8b42c7135e5..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) { } @@ -77,7 +77,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BLASTMASTER_EMI_SHORTFUSE: uiBastmasterEmiShortfuseGUID = creature->GetGUID(); break; } @@ -85,7 +85,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_CAVE_IN_LEFT: uiCaveInLeftGUID = go->GetGUID(); @@ -102,7 +102,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: return m_auiEncounter[0]; } @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GO_CAVE_IN_LEFT: return uiCaveInLeftGUID; case DATA_GO_CAVE_IN_RIGHT: return uiCaveInRightGUID; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 92c2d417cda..e804d2b2b61 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -43,7 +43,7 @@ EndScriptData */ #define MOUNTED_DISPLAYID 16040 -//Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us) +//Attumen (TODO: Use the summoning spell instead of Creature id. It works, but is not convenient for us) #define SUMMON_ATTUMEN 15550 class boss_attumen : public CreatureScript @@ -141,8 +141,8 @@ public: { if (Phase == 2) { - if (Unit* pUnit = Unit::GetUnit(*me, Attumen)) - DoScriptText(SAY_MIDNIGHT_KILL, pUnit); + if (Unit* unit = Unit::GetUnit(*me, Attumen)) + DoScriptText(SAY_MIDNIGHT_KILL, unit); } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 04981669681..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) { @@ -359,9 +359,9 @@ struct boss_moroes_guestAI : public ScriptedAI uint64 TempGUID = GuestGUID[rand()%4]; if (TempGUID) { - Unit* pUnit = Unit::GetUnit((*me), TempGUID); - if (pUnit && pUnit->isAlive()) - return pUnit; + Unit* unit = Unit::GetUnit((*me), TempGUID); + if (unit && unit->isAlive()) + return unit; } return me; @@ -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 d25d3518b9e..5f8a9ad6f1c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -108,7 +108,7 @@ public: struct netherspite_infernalAI : public ScriptedAI { - netherspite_infernalAI(Creature* c) : ScriptedAI(c) , + netherspite_infernalAI(Creature* c) : ScriptedAI(c), HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {} uint32 HellfireTimer; @@ -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 51085504f99..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; @@ -424,10 +424,10 @@ public: for (uint32 i = 0; i < 4; ++i) { - if (Creature* pUnit = me->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000)) + if (Creature* unit = me->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000)) { - pUnit->Attack(me->getVictim(), true); - pUnit->setFaction(me->getFaction()); + unit->Attack(me->getVictim(), true); + unit->setFaction(me->getFaction()); } } @@ -438,10 +438,10 @@ public: { for (uint32 i = 0; i < 5; ++i) { - if (Creature* pUnit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) + if (Creature* unit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { - pUnit->Attack(me->getVictim(), true); - pUnit->setFaction(me->getFaction()); + unit->Attack(me->getVictim(), true); + unit->setFaction(me->getFaction()); } } @@ -464,11 +464,11 @@ public: if (!FlameWreathTarget[i]) continue; - Unit* pUnit = Unit::GetUnit(*me, FlameWreathTarget[i]); - if (pUnit && !pUnit->IsWithinDist2d(FWTargPosX[i], FWTargPosY[i], 3)) + Unit* unit = Unit::GetUnit(*me, FlameWreathTarget[i]); + if (unit && !unit->IsWithinDist2d(FWTargPosX[i], FWTargPosY[i], 3)) { - pUnit->CastSpell(pUnit, 20476, true, 0, 0, me->GetGUID()); - pUnit->CastSpell(pUnit, 11027, true); + unit->CastSpell(unit, 20476, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, 11027, true); FlameWreathTarget[i] = 0; } } 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 05ad283a428..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; @@ -183,7 +183,7 @@ public: void SetData64(uint32 identifier, uint64 data) { - switch(identifier) + switch (identifier) { case DATA_IMAGE_OF_MEDIVH: ImageGUID = data; } @@ -191,7 +191,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 183932: m_uiCurtainGUID = go->GetGUID(); break; case 184278: @@ -221,7 +221,7 @@ public: case 185119: DustCoveredChest = go->GetGUID(); break; } - switch(m_uiOperaEvent) + switch (m_uiOperaEvent) { //TODO: Set Object visibilities for Opera based on performance case EVENT_OZ: diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index e22bdb1e9ef..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) + 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; } } @@ -197,7 +197,7 @@ public: { int32 text = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: if (OzDialogue[count].textid) @@ -231,7 +231,7 @@ public: uint8 index = 0; uint8 count = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: index = 0; @@ -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; @@ -329,7 +329,7 @@ public: player->PlayerTalkClass->ClearMenus(); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -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,8 +537,8 @@ public: uint32 NextStep(uint32 Step) { Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); - Map* pMap = me->GetMap(); - switch(Step) + Map* map = me->GetMap(); + switch (Step) { case 0: return 9999999; case 1: @@ -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 9f758edbba7..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 } @@ -193,11 +193,11 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && unit->isAlive()) { - float threat = me->getThreatManager().getThreat(pUnit); - SummonedUnit->AddThreat(pUnit, threat); + float threat = me->getThreatManager().getThreat(unit); + SummonedUnit->AddThreat(unit, threat); } } } @@ -211,9 +211,9 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) - pUnit->CastSpell(pUnit, SPELL_TELEPORT_CENTER, true); + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) + unit->CastSpell(unit, SPELL_TELEPORT_CENTER, true); } DoCast(me, SPELL_TELEPORT_CENTER, true); } @@ -223,10 +223,10 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) // Knockback into the air - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID()); } } @@ -235,17 +235,17 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { // Also needs an exception in spell system. - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID()); // Use packet hack WorldPacket data(12); data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } } @@ -255,17 +255,17 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { - pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY); - pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT); + unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY); + unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT); WorldPacket data(12); data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } } @@ -276,7 +276,7 @@ public: if (!UpdateVictim()) return; - switch(Phase) + switch (Phase) { case 0: { @@ -353,7 +353,7 @@ public: { if (GravityLapseTimer <= diff) { - switch(GravityLapsePhase) + switch (GravityLapsePhase) { case 0: if (FirstGravityLapse) // Different yells at 50%, and at every following Gravity Lapse @@ -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 f54883daf56..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]; @@ -527,12 +527,12 @@ public: { DoCast(me, SPELL_VANISH); - Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0); DoResetThreat(); - if (pUnit) - me->AddThreat(pUnit, 1000.0f); + if (unit) + me->AddThreat(unit, 1000.0f); InVanish = true; Vanish_Timer = 30000; @@ -644,24 +644,24 @@ public: if (Seed_of_Corruption_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_SEED_OF_CORRUPTION); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_SEED_OF_CORRUPTION); Seed_of_Corruption_Timer = 10000; } else Seed_of_Corruption_Timer -= diff; if (Curse_of_Agony_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_CURSE_OF_AGONY); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_CURSE_OF_AGONY); Curse_of_Agony_Timer = 13000; } else Curse_of_Agony_Timer -= diff; if (Fear_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_FEAR); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_FEAR); Fear_Timer = 10000; } else Fear_Timer -= diff; @@ -806,8 +806,8 @@ public: if (Blizzard_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_BLIZZARD); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_BLIZZARD); Blizzard_Timer = 8000; } else Blizzard_Timer -= diff; @@ -937,8 +937,8 @@ public: //if nobody is in melee range than try to use Intercept if (!InMeleeRange) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_INTERCEPT_STUN); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_INTERCEPT_STUN); } Intercept_Stun_Timer = 10000; @@ -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; } @@ -1168,8 +1168,8 @@ public: if (Purge_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_PURGE); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_PURGE); Purge_Timer = 15000; } else Purge_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 8b68330717f..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,28 +98,28 @@ 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) { - //Unit* pUnit = Unit::GetUnit(*me, FelCrystals[i]); - Unit* pUnit = Unit::GetUnit(*me, *itr); - if (pUnit) + //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]); + Unit* unit = Unit::GetUnit(*me, *itr); + if (unit) { - if (!pUnit->isAlive()) - CAST_CRE(pUnit)->Respawn(); // Let the core handle setting death state, etc. + if (!unit->isAlive()) + CAST_CRE(unit)->Respawn(); // Let the core handle setting death state, etc. // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here. - pUnit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + unit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } - 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 6e1574fe1c2..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; @@ -97,7 +97,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: return m_auiEncounter[0]; case DATA_VEXALLUS_EVENT: return m_auiEncounter[1]; @@ -111,7 +111,7 @@ public: void SetData(uint32 identifier, uint32 data) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: m_auiEncounter[0] = data; break; case DATA_VEXALLUS_EVENT: @@ -139,7 +139,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24723: SelinGUID = creature->GetGUID(); break; case 24560: DelrissaGUID = creature->GetGUID(); break; @@ -149,7 +149,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 187896: VexallusDoorGUID = go->GetGUID(); break; //SunwellRaid Gate 02 @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN: return SelinGUID; case DATA_DELRISSA: return DelrissaGUID; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index d39f8e455ff..b47e9cd1666 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -59,7 +59,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -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 d2982900be1..395f4f3ace4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -173,7 +173,7 @@ public: void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case PHASE_CHAINED: if (!anchorGUID) @@ -247,7 +247,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ICY_TOUCH: DoCast(me->getVictim(), SPELL_ICY_TOUCH); @@ -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); @@ -478,8 +478,8 @@ public: { me->setFaction(FACTION_HOSTILE); - if (Unit* pUnit = Unit::GetUnit(*me, m_uiDuelerGUID)) - AttackStart(pUnit); + if (Unit* unit = Unit::GetUnit(*me, m_uiDuelerGUID)) + AttackStart(unit); } else m_uiDuelTimer -= uiDiff; @@ -553,7 +553,7 @@ public: if (PhaseTimer <= diff) { - switch(Phase) + switch (Phase) { case 0: me->MonsterSay(SAY_DARK_RIDER, LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 532ede1d3c6..ebd30aa2f5d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -109,7 +109,7 @@ public: return; } - switch(uiSpeech_counter) + switch (uiSpeech_counter) { case 1: DoScriptText(SAY_PERSUADED1, me); uiSpeech_timer = 8000; break; case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break; @@ -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); @@ -220,7 +220,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_BREAKOUT1, me); @@ -281,7 +281,7 @@ public: { if (m_uiWave_Timer <= uiDiff) { - switch(m_uiWave) + switch (m_uiWave) { case 0: DoScriptText(SAY_BREAKOUT3, me); @@ -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; @@ -397,7 +397,7 @@ public: { if (uiStage_timer <= diff) { - switch(uiStage) + switch (uiStage) { case 1: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -610,7 +610,7 @@ public: bool MeetQuestCondition(Unit* player) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case 29061: // Ellen Stanbridge if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE) @@ -682,10 +682,10 @@ public: //TODO: simplify text's selection - switch(player->getRace()) + switch (player->getRace()) { case RACE_HUMAN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -713,7 +713,7 @@ public: } break; case RACE_ORC: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -741,7 +741,7 @@ public: } break; case RACE_DWARF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_2, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -769,7 +769,7 @@ public: } break; case RACE_NIGHTELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -797,7 +797,7 @@ public: } break; case RACE_UNDEAD_PLAYER: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -825,7 +825,7 @@ public: } break; case RACE_TAUREN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -853,7 +853,7 @@ public: } break; case RACE_GNOME: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -881,7 +881,7 @@ public: } break; case RACE_TROLL: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_3, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -909,7 +909,7 @@ public: } break; case RACE_BLOODELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -937,7 +937,7 @@ public: } break; case RACE_DRAENEI: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 2f7fde7ec60..aea25af87bf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -23,7 +23,7 @@ enum mograine { #ifdef LESS_MOB - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 10, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 1, // how many of earthshatter @@ -32,7 +32,7 @@ enum mograine ENCOUNTER_GHOUL_NUMBER = 5, // how many of ghoul ENCOUNTER_WARRIOR_NUMBER = 1, // how many of warrior #else - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 20, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 20, // how many of earthshatter @@ -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/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index a948ffa53cd..e6610294071 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -69,7 +69,7 @@ public: if (!player) phase = 3; - switch(phase) + switch (phase) { case 0: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 80cbcedda7c..667e1cd279e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -153,7 +153,7 @@ public: void EnterCombat(Unit* /*who*/){} void SetType(uint32 _type) { - switch(Creaturetype = _type) + switch (Creaturetype = _type) { case 1: spell = SPELL_PUMPKIN_AURA_GREEN; @@ -257,7 +257,7 @@ public: if (withbody) return; - switch(Phase) + switch (Phase) { case 1: if (me->HealthBelowPctDamaged(67, damage)) @@ -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) @@ -569,9 +569,9 @@ public: std::list<HostileReference*>::const_iterator itr; for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive() && pUnit != caster) - me->AddThreat(pUnit, caster->getThreatManager().getThreat(pUnit)); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive() && unit != caster) + me->AddThreat(unit, caster->getThreatManager().getThreat(unit)); } } } @@ -608,7 +608,7 @@ public: { if (withhead) { - switch(Phase) + switch (Phase) { case 0: { @@ -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 f9856673f5c..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; @@ -76,7 +76,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_PUMPKIN_SHRINE: PumpkinShrineGUID = go->GetGUID();break; case 104600: DoorHighInquisitorGUID = go->GetGUID(); break; @@ -85,7 +85,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_HORSEMAN: HorsemanGUID = creature->GetGUID(); break; case ENTRY_HEAD: HeadGUID = creature->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MOGRAINE_AND_WHITE_EVENT: if (data == IN_PROGRESS) @@ -130,7 +130,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { //case GAMEOBJECT_PUMPKIN_SHRINE: return PumpkinShrineGUID; //case DATA_HORSEMAN: return HorsemanGUID; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 52d8b2b926d..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) @@ -132,7 +132,7 @@ public: DoModifyThreatPercent(target, -100); Creature* Summoned = NULL; - switch(rand()%6) + switch (rand()%6) { case 0: DoTeleportPlayer(target, 250.0696f, 0.3921f, 84.8408f, 3.149f); 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 8945728e45d..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]; @@ -83,7 +83,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GATE_KIRTONOS: GateKirtonosGUID = go->GetGUID(); break; case GO_GATE_GANDLING: GateGandlingGUID = go->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_LORDALEXEIBAROV_DEATH: IsBossDied[0] = true; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b08a73c320b..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; @@ -100,7 +100,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ASH: uiAshGUID = creature->GetGUID(); break; case NPC_ADA: uiAdaGUID = creature->GetGUID(); break; @@ -110,7 +110,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_COURTYARD_DOOR: DoorCourtyardGUID = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_FREE_NPC: if (data == DONE) @@ -157,7 +157,7 @@ public: m_auiEncounter[1] = data; break; case TYPE_FENRUS: - switch(data) + switch (data) { case DONE: uiTimer = 1000; @@ -192,7 +192,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_FREE_NPC: return m_auiEncounter[0]; @@ -248,7 +248,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: summon = pArchmage->SummonCreature(pArchmage->GetEntry(), SpawnLocation[4], TEMPSUMMON_TIMED_DESPAWN, 10000); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 25ff8c9d9ec..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,16 +92,16 @@ 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) { - switch(uiPoint) + switch (uiPoint) { case 0: if (uiNpcEntry == NPC_ASH) @@ -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 af71960763d..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()) + 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()) + 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 82c83948c27..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,19 +43,19 @@ 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* pGroup = player->GetGroup()) + if (Group* group = player->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupie = itr->getSource(); if (!pGroupie) @@ -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; @@ -260,7 +260,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_DANCE: EnterEvadeMode(); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 08ac34c938c..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) { } @@ -94,7 +94,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ATALAI_STATUE1: GOAtalaiStatue1 = go->GetGUID(); break; case GO_ATALAI_STATUE2: GOAtalaiStatue2 = go->GetGUID(); break; @@ -108,7 +108,7 @@ public: virtual void Update(uint32 /*diff*/) // correct order goes form 1-6 { - switch(State) + switch (State) { case GO_ATALAI_STATUE1: if (!s1 && !s2 && !s3 && !s4 && !s5 && !s6) diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 86ed6690751..50eb34e6ffb 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -39,7 +39,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); @@ -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 644c0eacde5..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); @@ -183,7 +183,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_BLADES: case SPELL_SHADOW_NOVA: @@ -199,7 +199,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -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); @@ -477,7 +477,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_BLAZE: @@ -494,7 +494,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -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); @@ -702,7 +702,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_FURY: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 584ce3856a4..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) @@ -239,7 +239,7 @@ public: void EnterPhase(PhaseFelmyst NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_GROUND: me->CastStop(SPELL_FOG_BREATH); @@ -267,7 +267,7 @@ public: void HandleFlightSequence() { - switch(uiFlightCount) + switch (uiFlightCount) { case 0: //me->AttackStop(); @@ -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) { @@ -416,7 +416,7 @@ public: if (phase == PHASE_GROUND) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); @@ -451,7 +451,7 @@ public: if (phase == PHASE_FLIGHT) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 39aa4f6f6f3..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*/) @@ -389,7 +389,7 @@ public: void GoodEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: me->setFaction(35); @@ -411,7 +411,7 @@ public: void BadEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: DoScriptText(SAY_EVIL_ENRAGE, me); @@ -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; @@ -491,7 +491,7 @@ public: if (YellTimer <= diff) { - switch(YellSequence) + switch (YellSequence) { case 0: DoScriptText(SAY_GOOD_AGGRO, me); @@ -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) @@ -760,11 +760,11 @@ public: { for (std::list<HostileReference*>::const_iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() > me->GetPositionZ()+5) + if (unit->GetPositionZ() > me->GetPositionZ()+5) { - me->getThreatManager().modifyThreatPercent(pUnit, -100); + me->getThreatManager().modifyThreatPercent(unit, -100); } } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 674f3ab19ca..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) + 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; @@ -334,7 +334,7 @@ public: OrbsEmpowered = (OrbsEmpowered+1)%4; ++EmpowerCount; - switch(EmpowerCount) + switch (EmpowerCount) { case 1: DoScriptText(SAY_KALEC_ORB_READY1, me); break; case 2: DoScriptText(SAY_KALEC_ORB_READY2, me); break; @@ -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; @@ -445,7 +445,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_HAND_OF_THE_DECEIVER: summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, 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(); } } @@ -697,13 +697,13 @@ public: { if (Timer[t] < diff && !TimerIsDeactivated[t]) { - switch(t) + switch (t) { case TIMER_SPEECH: if (SpeechBegins) { SpeechBegins=false; - switch(Phase) + switch (Phase) { case PHASE_NORMAL: speechPhaseEnd=1; @@ -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); } @@ -994,9 +994,9 @@ public: std::list<HostileReference*>::iterator itr; for (itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { - Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pUnit) - pPortal->AddThreat(pUnit, 1.0f); + Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (unit) + pPortal->AddThreat(unit, 1.0f); } } FelfirePortalTimer = 20000; @@ -1139,7 +1139,7 @@ public: { if (uiTimer <= diff) { - switch(spell) + switch (spell) { case 0: DoCast(me, SPELL_ARMAGEDDON_VISUAL, true); @@ -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; @@ -1314,7 +1314,7 @@ public: } } - switch(victimClass) { + switch (victimClass) { case CLASS_DRUID: if (uiTimer[1] <= diff) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index c713c053222..fd11b4a4985 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -85,8 +85,8 @@ float DarkFiends[8][4] = {1801.98f, 633.62f, 69.74f, 5.71f}, {1830.88f, 629.99f, 69.73f, 3.52f}, {1800.38f, 621.41f, 69.74f, 0.22f}, - {1808.3f , 612.45f, 69.73f, 1.02f}, - {1823.9f , 639.69f, 69.74f, 4.12f}, + {1808.3f, 612.45f, 69.73f, 1.02f}, + {1823.9f, 639.69f, 69.74f, 4.12f}, {1811.85f, 640.46f, 69.73f, 4.97f} }; @@ -95,7 +95,7 @@ float Humanoides[6][5] = {CREATURE_FURY_MAGE, 1780.16f, 666.83f, 71.19f, 5.21f}, {CREATURE_FURY_MAGE, 1847.93f, 600.30f, 71.30f, 2.57f}, {CREATURE_BERSERKER, 1779.97f, 660.64f, 71.19f, 5.28f}, - {CREATURE_BERSERKER, 1786.2f , 661.01f, 71.19f, 4.51f}, + {CREATURE_BERSERKER, 1786.2f, 661.01f, 71.19f, 4.51f}, {CREATURE_BERSERKER, 1845.17f, 602.63f, 71.28f, 2.43f}, {CREATURE_BERSERKER, 1842.91f, 599.93f, 71.23f, 2.44f} }; @@ -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,13 +139,13 @@ 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) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_DARK_FIENDS: summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); @@ -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) @@ -270,7 +270,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case BOSS_ENTROPIUS: me->SetVisible(false); @@ -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(); @@ -318,7 +318,7 @@ public: { if (Timer[i] <= diff) { - switch(i) + switch (i) { case TIMER_DARKNESS: if (!DarkFiend) @@ -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); @@ -419,7 +419,7 @@ public: me->GetHomePosition(x, y, z, o); DoTeleportTo(x, y, z); InAction = true; - switch(Spell->Id) + switch (Spell->Id) { case SPELL_OPEN_ALL_PORTALS: DoCastAOE(SPELL_OPEN_PORTAL, false); @@ -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 fb412b018f2..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]; @@ -140,7 +140,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24850: Kalecgos_Dragon = creature->GetGUID(); break; case 24891: Kalecgos_Human = creature->GetGUID(); break; @@ -160,7 +160,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 188421: ForceField = go->GetGUID(); break; case 188523: KalecgosWall[0] = go->GetGUID(); break; @@ -181,7 +181,7 @@ public: uint32 GetData(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: return m_auiEncounter[0]; case DATA_BRUTALLUS_EVENT: return m_auiEncounter[1]; @@ -195,7 +195,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_DRAGON: return Kalecgos_Dragon; case DATA_KALECGOS_HUMAN: return Kalecgos_Human; @@ -220,7 +220,7 @@ public: void SetData(uint32 id, uint32 data) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: { @@ -246,7 +246,7 @@ public: m_auiEncounter[2] = data; break; case DATA_EREDAR_TWINS_EVENT: m_auiEncounter[3] = data; break; case DATA_MURU_EVENT: - switch(data) + switch (data) { case DONE: HandleGameObject(MurusGate[0], true); 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 ea1a260b3af..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) { } @@ -105,14 +105,14 @@ class instance_uldaman : public InstanceMapScript case GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR: // lock the door uiAltarOfTheKeeperTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; case GO_ARCHAEDAS_TEMPLE_DOOR: uiArchaedasTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; @@ -121,7 +121,7 @@ class instance_uldaman : public InstanceMapScript go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); uiAncientVaultDoor = go->GetGUID(); - if(m_auiEncounter[1] == DONE) + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -165,7 +165,7 @@ class instance_uldaman : public InstanceMapScript void BlockGO(uint64 guid) { GameObject* go = instance->GetGameObject(guid); - if(!go) + if (!go) return; go->SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); @@ -255,7 +255,7 @@ class instance_uldaman : public InstanceMapScript void ActivateIronaya() { Creature* ironaya = instance->GetCreature(uiIronayaGUID); - if(!ironaya) + if (!ironaya) return; ironaya->setFaction(415); @@ -306,7 +306,7 @@ class instance_uldaman : public InstanceMapScript if (!bKeystoneCheck) return; - if(uiIronayaSealDoorTimer <= diff) + if (uiIronayaSealDoorTimer <= diff) { ActivateIronaya(); @@ -322,17 +322,17 @@ class instance_uldaman : public InstanceMapScript void SetData (uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALTAR_DOORS: m_auiEncounter[0] = data; - if(data == DONE) + if (data == DONE) SetDoor(uiAltarOfTheKeeperTempleDoor, true); break; case DATA_ANCIENT_DOOR: m_auiEncounter[1] = data; - if(data == DONE) //archeadas defeat + if (data == DONE) //archeadas defeat { SetDoor(uiArchaedasTempleDoor, true); //re open enter door SetDoor(uiAncientVaultDoor, true); @@ -348,7 +348,7 @@ class instance_uldaman : public InstanceMapScript break; case DATA_MINIONS: - switch(data) + switch (data) { case NOT_STARTED: if (m_auiEncounter[0] == DONE) //if players opened the doors @@ -446,7 +446,7 @@ class instance_uldaman : public InstanceMapScript case 7228: // Ironaya uiIronayaGUID = creature->GetGUID(); - if(m_auiEncounter[2] != DONE) + if (m_auiEncounter[2] != DONE) SetFrozenState (creature); break; @@ -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 9933529e59a..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); @@ -155,7 +155,7 @@ class boss_halazzi : public CreatureScript void EnterPhase(PhaseHalazzi NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_LYNX: case PHASE_ENRAGE: @@ -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 f19652f912d..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; @@ -439,7 +439,7 @@ class boss_hexlord_malacrass : public CreatureScript { uint8 random = urand(0, 2); Unit* target = NULL; - switch(PlayerAbility[PlayerClass][random].target) + switch (PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: target = me; 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 ff4fe3f8a06..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; @@ -206,7 +206,7 @@ class boss_nalorakk : public CreatureScript { if (!inMove) { - switch(MovePhase) + switch (MovePhase) { case 0: if (me->IsWithinDistInMap(who, 50)) @@ -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); @@ -314,7 +314,7 @@ class boss_nalorakk : public CreatureScript if (MovePhase != id) return; - switch(MovePhase) + switch (MovePhase) { case 2: me->SetOrientation(3.1415f*2); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 83feaad071e..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); @@ -340,7 +340,7 @@ class boss_zuljin : public CreatureScript void EnterPhase(uint32 NextPhase) { - switch(NextPhase) + switch (NextPhase) { case 0: break; @@ -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 35d103f2bb7..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; @@ -116,7 +116,7 @@ class instance_zulaman : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23578://janalai case 23863://zuljin @@ -129,7 +129,7 @@ class instance_zulaman : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 186303: HalazziDoorGUID = go->GetGUID(); break; case 186304: ZulJinGateGUID = go->GetGUID(); break; @@ -205,7 +205,7 @@ class instance_zulaman : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: m_auiEncounter[0] = data; @@ -279,7 +279,7 @@ class instance_zulaman : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: return m_auiEncounter[0]; case DATA_AKILZONEVENT: return m_auiEncounter[1]; @@ -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 12811742f26..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,10 +62,10 @@ class npc_forest_frog : public CreatureScript void DoSpawnRandom() { - if (pInstance) + if (instance) { uint32 cEntry = 0; - switch(rand()%10) + switch (rand()%10) { case 0: cEntry = 24397; break; //Mannuth case 1: cEntry = 24403; break; //Deez @@ -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 7f7a85b881f..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)) @@ -160,23 +160,23 @@ class boss_mandokir : public CreatureScript { if (WatchTarget) //If someone is watched and If the Position of the watched target is different from the one stored, or are attacking, mandokir will charge him { - Unit* pUnit = Unit::GetUnit(*me, WatchTarget); + Unit* unit = Unit::GetUnit(*me, WatchTarget); - if (pUnit && ( - targetX != pUnit->GetPositionX() || - targetY != pUnit->GetPositionY() || - targetZ != pUnit->GetPositionZ() || - pUnit->isInCombat())) + if (unit && ( + targetX != unit->GetPositionX() || + targetY != unit->GetPositionY() || + targetZ != unit->GetPositionZ() || + unit->isInCombat())) { - if (me->IsWithinMeleeRange(pUnit)) + if (me->IsWithinMeleeRange(unit)) { - DoCast(pUnit, 24316); + DoCast(unit, 24316); } else { - DoCast(pUnit, SPELL_CHARGE); - //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true, 1); - AttackStart(pUnit); + DoCast(unit, SPELL_CHARGE); + //me->SendMonsterMove(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), 0, true, 1); + AttackStart(unit); } } } @@ -198,12 +198,12 @@ class boss_mandokir : public CreatureScript if ((Watch_Timer < 1000) && endWatch) //1 sec before the debuf expire, store the target position { - Unit* pUnit = Unit::GetUnit(*me, WatchTarget); - if (pUnit) + Unit* unit = Unit::GetUnit(*me, WatchTarget); + if (unit) { - targetX = pUnit->GetPositionX(); - targetY = pUnit->GetPositionY(); - targetZ = pUnit->GetPositionZ(); + targetX = unit->GetPositionX(); + targetY = unit->GetPositionY(); + targetZ = unit->GetPositionZ(); } endWatch = false; } @@ -232,8 +232,8 @@ class boss_mandokir : public CreatureScript std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit(*me, (*i)->getUnitGuid()); - if (pUnit && me->IsWithinMeleeRange(pUnit)) + Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()); + if (unit && me->IsWithinMeleeRange(unit)) ++TargetInRange; } @@ -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_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index d8ed6394e4c..bbff6a55ffb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -137,10 +137,7 @@ class boss_renataki : public CreatureScript Aggro_Timer = 7000 + rand()%13000; } else Aggro_Timer -= diff; - } - if (!Invisible) - { if (ThousandBlades_Timer <= diff) { DoCast(me->getVictim(), SPELL_THOUSANDBLADES); 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/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index fddaf459d18..b0bbc0c6c79 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -178,22 +178,22 @@ class boss_venoxis : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { // thrash is available in all phases case EVENT_THRASH: DoCast(me, SPELL_THRASH, true); - events.ScheduleEvent(EVENT_THRASH, urand(10000,20000)); + events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000)); break; // troll form spells and actions (first part) case EVENT_DISPEL_MAGIC: DoCast(me, SPELL_DISPEL_MAGIC); - events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000,20000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000), 0, PHASE_ONE); break; case EVENT_RENEW: DoCast(me, SPELL_RENEW); - events.ScheduleEvent(EVENT_RENEW, urand(25000,30000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_RENEW, urand(25000, 30000), 0, PHASE_ONE); break; case EVENT_HOLY_NOVA: _inMeleeRange = 0; @@ -210,17 +210,17 @@ class boss_venoxis : public CreatureScript if (_inMeleeRange >= 3) DoCast(me->getVictim(), SPELL_HOLY_NOVA); - events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000,75000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000, 75000), 0, PHASE_ONE); break; case EVENT_HOLY_FIRE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_FIRE); - events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000, 60000), 0, PHASE_ONE); break; case EVENT_HOLY_WRATH: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_WRATH); - events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000, 60000), 0, PHASE_ONE); break; // @@ -230,12 +230,12 @@ class boss_venoxis : public CreatureScript case EVENT_VENOM_SPIT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_VENOM_SPIT); - events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000,15000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000, 15000), 0, PHASE_TWO); break; case EVENT_POISON_CLOUD: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_POISON_CLOUD); - events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000,20000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000, 20000), 0, PHASE_TWO); break; case EVENT_PARASITIC_SERPENT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 0da63d38f83..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]; @@ -65,7 +65,7 @@ class instance_zulgurub : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11347: m_uiLorKhanGUID = creature->GetGUID(); break; case 11348: m_uiZathGUID = creature->GetGUID(); break; @@ -76,7 +76,7 @@ class instance_zulgurub : public InstanceMapScript void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ class instance_zulgurub : public InstanceMapScript uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: return m_auiEncounter[0]; @@ -138,7 +138,7 @@ class instance_zulgurub : public InstanceMapScript uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_LORKHAN: return m_uiLorKhanGUID; @@ -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/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index c5d47b60dfd..0ce940723cb 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -71,7 +71,7 @@ class npc_professor_phizzlethorpe : public CreatureScript if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 4:DoScriptText(SAY_PROGRESS_2, me, player);break; case 5:DoScriptText(SAY_PROGRESS_3, me, player);break; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 145e560c946..7487ddbc548 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -34,7 +34,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->HasQuestForItem(21149)) { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 6960fed819e..10b7066068b 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -56,7 +56,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -222,7 +222,7 @@ public: spellJudLight = false; spellCommand = false; - switch(me->GetEntry()) + switch (me->GetEntry()) { case CHAMPION_BLOODWRATH: spellFlashLight = true; @@ -417,7 +417,7 @@ public: { CAST_AI(npc_second_trial_paladin::npc_secondTrialAI, paladinSpawn->AI())->Activate(me->GetGUID()); - switch(paladinPhase) + switch (paladinPhase) { case 0: DoScriptText(TEXT_SECOND_TRIAL_1, me); diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 9efe8301e10..655ad4514fe 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index df8b909976d..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; } @@ -89,7 +89,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 26: DoScriptText(SAY_OOX_AMBUSH, me); @@ -107,7 +107,7 @@ public: void WaypointStart(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 27: for (uint8 i = 0; i < 3; ++i) @@ -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; } @@ -284,7 +284,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 1: DoScriptText(SAY_RIN_FREE, me, player); @@ -317,7 +317,7 @@ public: if (Unit* player = GetPlayerForEscort()) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 1: DoScriptText(SAY_RIN_PROGRESS_1, me, player); diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 7e376b65020..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); } @@ -86,7 +86,7 @@ public: if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING) me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - switch(uiI) + switch (uiI) { case 39: SetEscortPaused(true); @@ -115,7 +115,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->SetStandState(UNIT_STAND_STATE_SIT); diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index cfcef442c93..68ab0432bb3 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -141,7 +141,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: DoScriptText(SAY_START, me, player);break; case 13: @@ -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 88f76d47c53..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); @@ -346,7 +346,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 14: SetEscortPaused(true); @@ -387,7 +387,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* pGuard = me->FindNearestCreature(NPC_STORMWIND_ROYAL, 8.0f, true)) @@ -577,7 +577,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 1: SetEscortPaused(true); @@ -605,7 +605,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_QUEST_ACCEPT_ATTACK, me); @@ -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 c1f543fff65..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); @@ -123,7 +123,7 @@ public: return; } - switch(m_uiPhase) + switch (m_uiPhase) { case 1: DoScriptText(SAY_COMPLETE, me); @@ -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/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 2a2becb906f..06c64b76242 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -52,7 +52,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -191,7 +191,7 @@ public: if (who->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetAreaId()) + switch (me->GetAreaId()) { case 199: //felstone if (CAST_PLR(who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE || @@ -358,7 +358,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f , 81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index da1f666fbab..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); @@ -83,7 +83,7 @@ public: { if (HasEscortState(STATE_ESCORT_ESCORTING)) { - switch(uiWPHolder) + switch (uiWPHolder) { case 7: DoScriptText(SAY_DS_DOWN_1, me); break; case 8: DoScriptText(SAY_DS_DOWN_2, me); break; @@ -105,7 +105,7 @@ public: uiWPHolder = uiPoint; - switch(uiPoint) + switch (uiPoint) { case 4: SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index 89effa01b98..cb5fa6782ac 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -69,7 +69,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 2: if (me->HasStealthAura()) @@ -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/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index d1ac2045e61..1a030728218 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -148,7 +148,7 @@ class example_creature : public CreatureScript { me->HandleEmoteCommand(uiTextEmote); - switch(uiTextEmote) + switch (uiTextEmote) { case TEXT_EMOTE_DANCE: DoScriptText(SAY_DANCE, me); diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index fa62563e25d..dfac4321a23 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -202,7 +202,7 @@ class example_escort : public CreatureScript player->PlayerTalkClass->ClearMenus(); npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index adafc78f33f..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); } }; @@ -204,7 +204,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); @@ -238,7 +238,7 @@ public: void WaypointReached(uint32 uiPoint) { - switch(uiPoint) + switch (uiPoint) { case 4: SetEscortPaused(true); 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 07c7fcf6f27..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; @@ -109,7 +109,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FIRE_OF_AKU_MAI_1: m_uiShrine1GUID = go->GetGUID(); @@ -143,7 +143,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: m_auiEncounter[0] = uiData; @@ -213,7 +213,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: return m_auiEncounter[0]; @@ -234,7 +234,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_TWILIGHT_LORD_KELRIS: return m_uiTwilightLordKelrisGUID; 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 5a28f3af333..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) @@ -311,7 +311,7 @@ public: void GainSoulCharge(Player* victim) { - switch(victim->getClass()) + switch (victim->getClass()) { case CLASS_PRIEST: case CLASS_PALADIN: @@ -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() @@ -358,9 +358,9 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive()) + targets.push_back(unit); } if (targets.empty()) @@ -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/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index ef3b2b77406..f681b245a42 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -54,7 +54,7 @@ public: { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); @@ -131,7 +131,7 @@ public: player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); ai->DeSpawnVeins();//despawn the alliance veins - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1d1b1902188..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) @@ -361,7 +361,7 @@ void hyjalAI::Reset() EnemyCount = 0; // Set faction properly based on Creature entry - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA: Faction = 0; @@ -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); @@ -450,7 +450,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) SpawnLoc[i] = Base[random][i]; } Creature* creature = NULL; - switch(entry) + switch (entry) { case 17906: //GARGOYLE @@ -463,7 +463,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; - case 17907: //FROST_WYRM , + case 17907: //FROST_WYRM, if (FirstBossDead && WaveCount == 1) //summon at gate creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); else @@ -492,7 +492,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); creature->setActive(true); - switch(entry) + switch (entry) { case NECROMANCER: case ABOMINATION: @@ -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* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + 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* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + 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(); } } @@ -751,10 +751,10 @@ void hyjalAI::UpdateAI(const uint32 diff) if (DoHide) { DoHide = false; - switch(me->GetEntry()) + 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()); @@ -810,7 +810,7 @@ void hyjalAI::UpdateAI(const uint32 diff) IsDummy = true; bRetreat = false; HideNearPos(me->GetPositionX(), me->GetPositionY()); - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA://jaina HideNearPos(5037.76f, -1889.71f); @@ -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; } @@ -853,8 +853,8 @@ void hyjalAI::UpdateAI(const uint32 diff) { if (BossGUID[i]) { - Unit* pUnit = Unit::GetUnit((*me), BossGUID[i]); - if (pUnit && (!pUnit->isAlive())) + Unit* unit = Unit::GetUnit((*me), BossGUID[i]); + if (unit && (!unit->isAlive())) { if (BossGUID[i] == BossGUID[0]) { @@ -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 } } } @@ -892,7 +892,7 @@ void hyjalAI::UpdateAI(const uint32 diff) Unit* target = NULL; - switch(Spells[i].TargetType) + switch (Spells[i].TargetType) { case TARGETTYPE_SELF: target = me; break; case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break; @@ -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) @@ -1071,7 +1071,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) if (!Teleported) return; Overrun = false;//execute once - switch(faction) + switch (faction) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires @@ -1080,37 +1080,37 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 3; ++i)//summon 3 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 5; ++i)//summon 5 gargoyles { - Creature* pUnit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - pUnit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + unit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } break; @@ -1120,38 +1120,38 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 26; ++i)//summon infernals { - Creature* pUnit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - pUnit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + unit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 5; ++i)//summon 5 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } break; 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 6a7e6f71003..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 } } @@ -197,7 +197,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); @@ -257,7 +257,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); @@ -332,7 +332,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 6; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); @@ -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 282b0192f57..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; @@ -117,7 +117,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 182060: HordeGate = go->GetGUID(); @@ -141,7 +141,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17767: RageWinterchill = creature->GetGUID(); break; case 17808: Anetheron = creature->GetGUID(); break; @@ -156,7 +156,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_RAGEWINTERCHILL: return RageWinterchill; case DATA_ANETHERON: return Anetheron; @@ -173,7 +173,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; case DATA_ANETHERONEVENT: @@ -191,13 +191,13 @@ public: Creature* creature = instance->GetCreature(Azgalor); if (creature) { - Creature* pUnit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); + Creature* unit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); - Map* pMap = creature->GetMap(); - if (pMap->IsDungeon() && pUnit) + Map* map = creature->GetMap(); + if (map->IsDungeon() && unit) { - pUnit->SetVisible(false); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + unit->SetVisible(false); + Map::PlayerList const &PlayerList = map->GetPlayers(); if (PlayerList.isEmpty()) return; @@ -206,7 +206,7 @@ public: if (i->getSource()) { WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); + unit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); i->getSource()->GetSession()->SendPacket(&data); WorldPacket data2(SMSG_PLAY_SOUND, 4); @@ -282,7 +282,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0]; case DATA_ANETHERONEVENT: return m_auiEncounter[1]; 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 f557354192a..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) @@ -126,7 +126,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case COMBAT: //Return since we have no target @@ -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) @@ -195,7 +195,7 @@ public: case OUTRO: if (uiOutroTimer < diff) { - switch(uiOutroStep) + switch (uiOutroStep) { case 1: DoScriptText(SAY_ESCAPE_SPEECH_1, me); @@ -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 678a38ffeca..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(); } } } @@ -448,7 +448,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: case 1: @@ -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: @@ -575,7 +575,7 @@ public: { if (uiPhaseTimer <= diff) { - switch(uiStep) + switch (uiStep) { //After reset case 0: @@ -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 1837dd33949..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) { } @@ -149,7 +149,7 @@ public: uint8 GetRiftWaveId() { - switch(mRiftPortalCount) + switch (mRiftPortalCount) { case 6: mRiftWaveId = 2; @@ -166,7 +166,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MEDIVH: if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS) @@ -237,7 +237,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_MEDIVH: return m_auiEncounter[0]; @@ -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 28f5477fe80..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; @@ -103,7 +103,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case THRALL_ENTRY: ThrallGUID = creature->GetGUID(); @@ -127,7 +127,7 @@ public: return; } - switch(type) + switch (type) { case TYPE_BARREL_DIVERSION: { @@ -202,7 +202,7 @@ public: uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_BARREL_DIVERSION: return m_auiEncounter[0]; @@ -222,7 +222,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THRALL: return ThrallGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 485c52d0423..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(); - switch(uiAction) + 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,10 +298,10 @@ public: void WaypointReached(uint32 i) { - if (!pInstance) + if (!instance) return; - switch(i) + switch (i) { case 8: SetRun(false); @@ -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) { @@ -513,7 +513,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { //TODO: make Scarloc start into event instead, and not start attack directly case MOB_ENTRY_BARN_GUARDSMAN: @@ -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,14 +626,14 @@ public: { npc_tarethaAI(Creature* c) : npc_escortAI(c) { - pInstance = c->GetInstanceScript(); + instance = c->GetInstanceScript(); } - InstanceScript* pInstance; + InstanceScript* instance; void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 6: DoScriptText(SAY_TA_FREE, me); 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 84923d3def5..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 @@ -85,14 +85,14 @@ public: return; } - switch(go->GetEntry()) + switch (go->GetEntry()) { 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; @@ -141,7 +141,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: m_auiEncounter[0] = uiData; @@ -174,7 +174,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_FLOOR_ERUPTION_GUID: FloorEruptionGUID[1] = FloorEruptionGUID[0]; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: return m_auiEncounter[0]; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ONYXIA_GUID: return m_uiOnyxiasGUID; @@ -238,7 +238,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: // Criteria for achievement 4403: Many Whelps! Handle It! (10 player) Hatch 50 eggs in 10s case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER: // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 19287d656a8..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) { } @@ -100,7 +100,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GONG: uiGongGUID = go->GetGUID(); @@ -118,7 +118,7 @@ public: { uiGongWaves = uiData; - switch(uiGongWaves) + switch (uiGongWaves) { case 9: case 14: @@ -139,7 +139,7 @@ public: uint32 uiCreature = 0; uint8 uiSummonTimes = 0; - switch(uiGongWaves) + switch (uiGongWaves) { case 1: uiCreature = CREATURE_TOMB_FIEND; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG_WAVES: return uiGongWaves; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG: return uiGongGUID; } 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 a251e6dfdf3..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; @@ -69,7 +69,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 21099: DoorWardGUID = go->GetGUID(); break; } @@ -78,16 +78,16 @@ 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); } } void SetData(uint32 type, uint32 /*data*/) { - switch(type) + switch (type) { case EVENT_WARD_KEEPER: WardKeeperDeath++; break; } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 697083aa4e7..7b084a3b5fc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -54,7 +54,7 @@ class boss_kurinnaxx : public CreatureScript _Reset(); _enraged = false; events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); events.ScheduleEvent(EVENT_TRASH, 1000); events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } @@ -91,7 +91,7 @@ class boss_kurinnaxx : public CreatureScript target->CastSpell(target, SPELL_SANDTRAP, true); else if (Unit* victim = me->getVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); break; case EVENT_WIDE_SLASH: DoCast(me, SPELL_WIDE_SLASH); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 8afdc29b76e..030da10e515 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -152,7 +152,7 @@ class boss_moam : public CreatureScript for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); - events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000,15000)); + events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000)); break; }/* case EVENT_WIDE_SLASH: 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 1a939123779..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*/) @@ -576,11 +576,11 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only units out of stomach - if (pUnit && i->second == false) - temp.push_back(pUnit); + if (unit && i->second == false) + temp.push_back(unit); ++i; } @@ -592,7 +592,7 @@ public: //Get random but only if we have more than one unit on threat list if (temp.size() > 1) - advance (j , rand() % (temp.size() - 1)); + advance (j, rand() % (temp.size() - 1)); return (*j); } @@ -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; @@ -724,19 +724,19 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only move units in stomach - if (pUnit && i->second == true) + if (unit && i->second == true) { //Teleport each player out - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); //Cast knockback on them - DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true); + DoCast(unit, SPELL_EXIT_STOMACH_KNOCKBACK, true); //Remove the acid debuff - pUnit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); + unit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); i->second = false; } @@ -755,25 +755,25 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only apply to units in stomach - if (pUnit && i->second == true) + if (unit && i->second == true) { //Cast digestive acid on them - DoCast(pUnit, SPELL_DIGESTIVE_ACID, true); + DoCast(unit, SPELL_DIGESTIVE_ACID, true); //Check if player should be kicked from stomach - if (pUnit->IsWithinDist3d(&KickPos, 15.0f)) + if (unit->IsWithinDist3d(&KickPos, 15.0f)) { //Teleport each player out - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); //Cast knockback on them - DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true); + DoCast(unit, SPELL_EXIT_STOMACH_KNOCKBACK, true); //Remove the acid debuff - pUnit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); + unit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); i->second = false; } @@ -805,11 +805,11 @@ public: if (StomachEnterVisTimer <= diff) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, StomachEnterTarget); + Unit* unit = Unit::GetUnit(*me, StomachEnterTarget); - if (pUnit) + if (unit) { - DoTeleportPlayer(pUnit, STOMACH_X, STOMACH_Y, STOMACH_Z, STOMACH_O); + DoTeleportPlayer(unit, STOMACH_X, STOMACH_Y, STOMACH_Z, STOMACH_O); } StomachEnterTarget = 0; @@ -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% @@ -916,7 +916,7 @@ public: void DoAction(const int32 param) { - switch(param) + switch (param) { case ACTION_FLESH_TENTACLE_KILLED: ++FleshTentaclesKilled; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 8a40096bc33..9d83bfea866 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -145,7 +145,7 @@ public: if (DoGetThreat(target)) DoModifyThreatPercent(target, -100); - switch(urand(0, 2)) + switch (urand(0, 2)) { case 0: DoTeleportPlayer(target, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); 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 a4d204014da..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]; @@ -91,7 +91,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_VEMISDEAD: if (IsBossDied[0]) @@ -119,7 +119,7 @@ public: uint64 GetData64 (uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SKERAM: return SkeramGUID; @@ -137,7 +137,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_VEM_DEATH: IsBossDied[0] = true; 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 22973967052..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; @@ -158,7 +158,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_END_DOOR: EndDoorGUID = go->GetGUID(); @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case EVENT_PYRAMID: return PyramidPhase; @@ -178,7 +178,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case ENTRY_ZUMRAH: return ZumrahGUID; @@ -200,7 +200,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case EVENT_PYRAMID: PyramidPhase=data; @@ -322,7 +322,7 @@ public: } bool IsWaveAllDead(){ - for(std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) + for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) { if (Creature* add = instance->GetCreature((*itr))) { @@ -330,7 +330,7 @@ public: return false; } } - for(std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) + for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) { if (Creature* add = instance->GetCreature(((*itr)))) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index e6a4bca2f91..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; } @@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 375e586f13b..f634d593f44 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -24,7 +24,7 @@ enum zfPyramidPhases { PYRAMID_NOT_STARTED, //default PYRAMID_CAGES_OPEN, //happens in GO hello for cages - PYRAMID_ARRIVED_AT_STAIR , //happens in Weegli's movementinform + PYRAMID_ARRIVED_AT_STAIR, //happens in Weegli's movementinform PYRAMID_WAVE_1, PYRAMID_PRE_WAVE_2, PYRAMID_WAVE_2, diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 527d6b3d3e4..a33ed68879f 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -186,7 +186,7 @@ class npc_ruul_snowhoof : public CreatureScript if (!player) return; - switch(i) + switch (i) { case 0: { me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -319,7 +319,7 @@ class npc_muglash : public CreatureScript { Player* player = GetPlayerForEscort(); - switch(i) + switch (i) { case 0: if (player) @@ -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; @@ -382,7 +382,7 @@ class npc_muglash : public CreatureScript void DoWaveSummon() { - switch(m_uiWaveId) + switch (m_uiWaveId) { case 1: me->SummonCreature(NPC_WRATH_RIDER, m_afFirstNagaCoord[0][0], m_afFirstNagaCoord[0][1], m_afFirstNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); 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 e043f9e05b4..57ff1448a7e 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -376,7 +376,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_START, me, player); @@ -479,7 +479,7 @@ public: { Creature* Spark = Unit::GetCreature(*me, SparkGUID); - switch(Step) + switch (Step) { case 0: if (Spark) @@ -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/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 8bfefade07e..6bbc29dcc56 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -87,10 +87,10 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, pUnit->GetOrientation()); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, unit->GetOrientation()); } } diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 3242797d3e7..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()); @@ -238,7 +238,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_REM_START, me, player); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index f0f27db8095..5b1c285d7b3 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -299,7 +299,7 @@ public: if (bYellTimer && uiYellTimer <= uiDiff) { - switch(uiStep) + switch (uiStep) { case 0: DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); @@ -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; @@ -535,8 +535,8 @@ public: SetCombatMovement(true); if (me->isInCombat()) - if (Unit* pUnit = me->getVictim()) - me->GetMotionMaster()->MoveChase(pUnit); + if (Unit* unit = me->getVictim()) + me->GetMotionMaster()->MoveChase(unit); } void MoveToDock() @@ -590,7 +590,7 @@ public: bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || QUEST_STINKYS_ESCAPE_A) + if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { if (npc_stinkyAI* pEscortAI = CAST_AI(npc_stinky::npc_stinkyAI, creature->AI())) { @@ -823,6 +823,36 @@ class spell_energize_aoe : public SpellScriptLoader } }; +/*###### +## go_blackhoof_cage +######*/ + +enum PrisonersOfTheGrimTotems +{ + NPC_THERAMORE_PRISONER = 23720, + SAY_FREE = 0, +}; + +class go_blackhoof_cage : public GameObjectScript +{ +public: + go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } + + bool OnGossipHello(Player* player, GameObject* go) + { + if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) + { + go->UseDoorOrButton(); + if (player) + player->KilledMonsterCredit(NPC_THERAMORE_PRISONER, 0); + + prisoner->AI()->Talk(SAY_FREE); // We also emote cry here (handled in creature_text.emote) + prisoner->ForcedDespawn(6000); + } + return true; + } +}; + void AddSC_dustwallow_marsh() { new mobs_risen_husk_spirit(); @@ -836,4 +866,5 @@ void AddSC_dustwallow_marsh() new spell_ooze_zap(); new spell_ooze_zap_channel_end(); new spell_energize_aoe(); + new go_blackhoof_cage(); } diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 822ac41f1c9..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 @@ -146,9 +146,9 @@ public: case 30: DoScriptText(SAY_OOX_AMBUSH, me); me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: DoScriptText(SAY_OOX_END, me); diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index a714f8716ae..b8b8b31ba2c 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -57,7 +57,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -172,7 +172,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -348,7 +348,7 @@ public: void EnterCombat(Unit* who) { uint32 rnd = rand()%2; - switch(rnd) + switch (rnd) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1, me, who); break; case 1: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2, me, who); break; @@ -402,10 +402,10 @@ public: return; } - switch(CurrWP) + switch (CurrWP) { case 0: - switch(Step) + switch (Step) { case 0: me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); @@ -418,7 +418,7 @@ public: } break; case 6: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -433,7 +433,7 @@ public: } break; case 15: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -447,7 +447,7 @@ public: } break; case 16: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player); @@ -460,7 +460,7 @@ public: } break; case 20: - switch(Step) + switch (Step) { case 0: { @@ -480,7 +480,7 @@ public: } break; case 24: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -494,7 +494,7 @@ public: } break; case 25: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player); @@ -507,7 +507,7 @@ public: } break; case 40: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index d0131068c3f..4cea827e5e7 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -157,15 +157,15 @@ public: uiEventTimer = 5000; ++uiEventPhase; - switch(uiEventPhase) + switch (uiEventPhase) { case 1: - if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) + if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = pUnit->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; @@ -174,8 +174,8 @@ public: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); break; case 3: - if (Player* pUnit = Unit::GetPlayer(*me, uiPlayerGUID)) - pUnit->TalkedToCreature(me->GetEntry(), me->GetGUID()); + if (Player* unit = Unit::GetPlayer(*me, uiPlayerGUID)) + unit->TalkedToCreature(me->GetEntry(), me->GetGUID()); me->UpdateEntry(NPC_KYLE_FRIENDLY); break; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 000717e1c56..4fbcef167cc 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -37,7 +37,7 @@ EndContentData */ ###*/ #define GOSSIP_DEMITRIAN1 "What do you know of it?" -#define GOSSIP_DEMITRIAN2 "I am listening , Demitrian." +#define GOSSIP_DEMITRIAN2 "I am listening, Demitrian." #define GOSSIP_DEMITRIAN3 "Continue, please." #define GOSSIP_DEMITRIAN4 "A battle?" #define GOSSIP_DEMITRIAN5 "<Nod>" @@ -541,7 +541,7 @@ public: switch (AnimationCount) { case 0: - DoScriptText(ANACHRONOS_SAY_1, me , Fandral); + DoScriptText(ANACHRONOS_SAY_1, me, Fandral); break; case 1: Fandral->SetTarget(me->GetGUID()); @@ -762,7 +762,7 @@ public: case 61: me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); if (player->IsInRange(me, 0, 15)) - player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); + player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, me); break; case 62: me->SetDisplayId(15500); @@ -1181,12 +1181,12 @@ enum WSCreatures NPC_TEMPLAR_WATER = 15211, NPC_TEMPLAR_AIR = 15212, NPC_TEMPLAR_EARTH = 15307, - + NPC_DUKE_FIRE = 15206, NPC_DUKE_WATER = 15207, NPC_DUKE_EARTH = 15208, NPC_DUKE_AIR = 15220, - + NPC_ROYAL_FIRE = 15203, NPC_ROYAL_AIR = 15204, NPC_ROYAL_EARTH = 15205, diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 132144fce0e..ff6127f336e 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -121,7 +121,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 16: DoScriptText(SAY_AMBUSH, me); diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 0c4b73b8658..fa5f6850689 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break; case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break; @@ -435,7 +435,7 @@ public: if (!player) return; - switch(i) { + switch (i) { case 23: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -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; @@ -591,7 +591,7 @@ public: return; } - switch(m_uiPhasePostEvent) + switch (m_uiPhasePostEvent) { case 1: DoScriptText(SAY_TOOG_POST_1, me); 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 21b0a5c6ee1..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; } @@ -134,7 +134,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 16: DoScriptText(SAY_GIL_AT_LAST, me, player); @@ -597,7 +597,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_STARTUP1, me); @@ -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; @@ -625,7 +625,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 9: DoScriptText(SAY_STARTUP2, me, player); @@ -654,7 +654,7 @@ public: { if (m_uiPostEventTimer <= uiDiff) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 0: DoScriptText(SAY_PROGRESS_2, me); diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index fdff6309be3..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; } @@ -77,7 +77,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_KAN_START, me); @@ -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; } @@ -168,7 +168,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 8: DoScriptText(SAY_LAKO_LOOK_OUT, me); @@ -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; } @@ -253,7 +253,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 15: DoScriptText(SAY_WYVERN, me); @@ -302,7 +302,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -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 05ba6b2234e..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); } } @@ -283,7 +283,7 @@ public: return; } - switch(m_uiEndEventProgress) + switch (m_uiEndEventProgress) { case 1: DoScriptText(SAY_RIN_END_1, me); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 71f810a6020..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); } } @@ -179,7 +179,7 @@ public: case PHASE_UNDERGROUND: if (uiImpaleTimer <= diff) { - switch(uiImpalePhase) + switch (uiImpalePhase) { case IMPALE_PHASE_TARGET: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -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 7d35814a8a0..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; @@ -71,7 +71,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 28684: uiKrikthir = creature->GetGUID(); break; case 28921: uiHadronox = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_KRIKTHIR_THE_GATEWATCHER: return uiKrikthir; case DATA_HADRONOX: return uiHadronox; @@ -120,7 +120,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; @@ -149,7 +149,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: return auiEncounter[0]; case DATA_HADRONOX_EVENT: return auiEncounter[1]; 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 2e0e0661cf7..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) + 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 347283a891b..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,19 +388,19 @@ 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 :( pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); pGO->SetGoState(GO_STATE_ACTIVE); - switch(pGO->GetEntry()) + 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 352ac2d09e5..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; @@ -94,7 +94,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 29309: Elder_Nadox = creature->GetGUID(); break; case 29308: Prince_Taldaram = creature->GetGUID(); break; @@ -107,7 +107,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -134,7 +134,7 @@ public: void SetData64(uint32 idx, uint64 guid) { - switch(idx) + switch (idx) { case DATA_ADD_JEDOGA_OPFER: JedogaSacrifices = guid; break; case DATA_PL_JEDOGA_TARGET: JedogaTarget = guid; break; @@ -143,7 +143,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_ELDER_NADOX: return Elder_Nadox; case DATA_PRINCE_TALDARAM: return Prince_Taldaram; @@ -176,7 +176,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: @@ -223,7 +223,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: return m_auiEncounter[0]; case DATA_PRINCE_TALDARAM_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 3e1f500ebce..63e714d17aa 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -173,6 +173,7 @@ set(scripts_STAT_SRCS Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp Northrend/IcecrownCitadel/boss_sindragosa.cpp + Northrend/IcecrownCitadel/boss_the_lich_king.cpp Northrend/zuldrak.cpp Northrend/icecrown.cpp Northrend/Gundrak/boss_slad_ran.cpp diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index d29a05b3b5d..187d82887e7 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -188,21 +188,21 @@ static Location AcolyteofVesperon = { 3145.68f, 520.71f, 89.7f }; static Location AcolyteofVesperon2 = { 3246.57f, 551.263f, 58.6164f }; Locations TwilightEggs[] = { - {3219.28f, 669.121f , 88.5549f}, - {3221.55f, 682.852f , 90.5361f}, - {3239.77f, 685.94f , 90.3168f}, - {3250.33f, 669.749f , 88.7637f}, - {3246.6f, 642.365f , 84.8752f}, - {3233.68f, 653.117f , 85.7051f} + {3219.28f, 669.121f, 88.5549f}, + {3221.55f, 682.852f, 90.5361f}, + {3239.77f, 685.94f, 90.3168f}, + {3250.33f, 669.749f, 88.7637f}, + {3246.6f, 642.365f, 84.8752f}, + {3233.68f, 653.117f, 85.7051f} }; Locations TwilightEggsSarth[] = { - {3252.73f, 515.762f , 58.5501f}, - {3256.56f, 521.119f , 58.6061f}, - {3255.63f, 527.513f , 58.7568f}, - {3264.90f, 525.865f , 58.6436f}, - {3264.26f, 516.364f , 58.8011f}, - {3257.54f, 502.285f , 58.2077f} + {3252.73f, 515.762f, 58.5501f}, + {3256.56f, 521.119f, 58.6061f}, + {3255.63f, 527.513f, 58.7568f}, + {3264.90f, 525.865f, 58.6436f}, + {3264.26f, 516.364f, 58.8011f}, + {3257.54f, 502.285f, 58.2077f} }; #define TWILIGHT_ACHIEVEMENTS 1 @@ -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,22 +282,22 @@ 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); - if(pTenebron->isAlive()) + if (pTenebron->isAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTenebron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) + if (instance->GetData(TYPE_TENEBRON_PREKILLED) == false) { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); @@ -308,14 +308,14 @@ public: if (pShadron) { pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); - if(pShadron->isAlive()) + if (pShadron->isAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pShadron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) + if (instance->GetData(TYPE_SHADRON_PREKILLED) == false) { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); @@ -326,14 +326,14 @@ public: if (pVesperon) { pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); - if(pVesperon->isAlive()) + if (pVesperon->isAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); 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) @@ -532,13 +532,13 @@ public: Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, pFireCyclonesList, checker); me->VisitNearbyObject(200.0f, searcher); - if(pFireCyclonesList.empty()) + if (pFireCyclonesList.empty()) return; std::list<Creature*>::iterator itr = pFireCyclonesList.begin(); uint32 rnd = rand()%pFireCyclonesList.size(); - for(uint32 i = 0; i < rnd; ++i) + for (uint32 i = 0; i < rnd; ++i) ++itr; (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); @@ -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) @@ -586,13 +586,13 @@ public: if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); - switch(urand(0, 1)) + switch (urand(0, 1)) { case 0: { - Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y, FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y, FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y, FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -600,8 +600,8 @@ public: } case 1: { - Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y, FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y, FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; @@ -648,7 +648,7 @@ public: { CastLavaStrikeOnTarget(target); - if(urand(0, 5) == 0) + if (urand(0, 5) == 0) DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); } m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); @@ -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; @@ -780,7 +780,7 @@ struct dummy_dragonAI : public ScriptedAI { me->GetMotionMaster()->Clear(); me->SetInCombatWithZone(); - if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { me->AddThreat(target, 1.0f); me->Attack(target, true); @@ -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()) { @@ -837,19 +837,19 @@ struct dummy_dragonAI : public ScriptedAI //in instance script and calculate range to each. GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { 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) + 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); } else { - for(uint32 i = 0; i < 6; ++i) + for (uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; @@ -857,19 +857,19 @@ struct dummy_dragonAI : public ScriptedAI case NPC_SHADRON: { iTextId = WHISPER_OPEN_PORTAL; - if(pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) - me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y , AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); + 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); + me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y, AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); break; } 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)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y, AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -878,7 +878,7 @@ struct dummy_dragonAI : public ScriptedAI } else { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y, AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -909,20 +909,20 @@ struct dummy_dragonAI : public ScriptedAI int32 iTextId = 0; uint32 uiSpellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { 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(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) + 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,9 +930,9 @@ 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(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) + 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); @@ -967,7 +967,7 @@ struct dummy_dragonAI : public ScriptedAI { if (m_uiMoveNextTimer <= uiDiff) { - if(m_uiWaypointId < MAX_WAYPOINT) + if (m_uiWaypointId < MAX_WAYPOINT) me->GetMotionMaster()->MovePoint(m_uiWaypointId, m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ); @@ -1144,7 +1144,7 @@ public: // Portal Event if (m_uiAcolyteShadronTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteShadronTimer = 10000; else { @@ -1243,7 +1243,7 @@ public: // Portal Event if (m_uiAcolyteVesperonTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteVesperonTimer = 10000; else { @@ -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,10 +1321,10 @@ public: void JustDied(Unit* /*killer*/) { - if (pInstance) + if (instance) { - Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); - if(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); } @@ -1364,7 +1364,7 @@ public: void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -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,15 +1451,15 @@ 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 } } void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -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,8 +1532,8 @@ public: { if (m_uiHatchEggTimer <= uiDiff) { - Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); - if(Tenebron) + Creature* Tenebron = instance->instance->GetCreature(instance->GetData64(DATA_TENEBRON)); + if (Tenebron) (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } @@ -1590,7 +1590,7 @@ public: Tsunami_Timer = 500; }else Tsunami_Timer -= diff; - if(TsunamiBuff_timer <= diff) + if (TsunamiBuff_timer <= diff) { if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); @@ -1625,8 +1625,8 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->AddAura( 46265 , me ); // Wrong, can't find proper visual - me->AddAura( 69422 , me ); + me->AddAura( 46265, me ); // Wrong, can't find proper visual + me->AddAura( 69422, me ); VoidBlast_Timer = 5000; } 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 4c973482784..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; @@ -73,7 +73,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SARTHARION: m_uiSartharionGUID = creature->GetGUID(); @@ -99,11 +99,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) m_auiEncounter[0] = uiData; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) m_bTenebronKilled = true; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) m_bShadronKilled = true; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) m_bVesperonKilled = true; } @@ -111,11 +111,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) return m_bTenebronKilled; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) return m_bShadronKilled; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) return m_bVesperonKilled; return 0; @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_SARTHARION: return m_uiSartharionGUID; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 2558b03beb6..f602f41ce11 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -89,7 +89,7 @@ class boss_baltharus_the_warborn : public CreatureScript void DoAction(int32 const action) { - switch(action) + switch (action) { case ACTION_INTRO_BALTHARUS: if (_introDone) @@ -160,7 +160,7 @@ class boss_baltharus_the_warborn : public CreatureScript DoAction(ACTION_CLONE); } - if (me->GetHealth() - damage > 0) + if (me->GetHealth() > damage) instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } @@ -246,7 +246,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript void DamageTaken(Unit* /*attacker*/, uint32& damage) { // Setting DATA_BALTHARUS_SHARED_HEALTH to 0 when killed would bug the boss. - if (_instance && me->GetHealth() - damage > 0) + if (_instance && me->GetHealth() > damage) _instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 3a50838fff9..733af8553e0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -203,7 +203,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(ConflagrationTargetSelector()); + unitList.remove_if (ConflagrationTargetSelector()); uint8 maxSize = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 3); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); 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 139e74ab67e..e46dc3d741a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -78,7 +78,7 @@ class spell_eadric_radiance : public SpellScriptLoader PrepareSpellScript(spell_eadric_radiance_SpellScript); void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(OrientationCheck(GetCaster())); + unitList.remove_if (OrientationCheck(GetCaster())); } void Register() @@ -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(); } @@ -317,7 +317,7 @@ public: { me->InterruptNonMeleeSpells(true); uint8 uiTarget = urand(0, 1); - switch(uiTarget) + switch (uiTarget) { case 0: DoCast(me, SPELL_RENEW); @@ -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; @@ -451,7 +451,7 @@ public: { if (uiPoint == 0) { - switch(uiWaypoint) + switch (uiWaypoint) { case 0: me->SetOrientation(5.81f); @@ -470,10 +470,10 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_ARGENT_LIGHWIELDER: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 712.14f, 628.42f, 411.88f); @@ -487,7 +487,7 @@ public: } break; case NPC_ARGENT_MONK: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 713.12f, 632.97f, 411.90f); @@ -501,7 +501,7 @@ public: } break; case NPC_PRIESTESS: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 715.06f, 637.07f, 411.91f); @@ -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 426b41c3f02..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(); } @@ -169,7 +169,7 @@ public: } else uiResurrectTimer -= uiDiff; } - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: case PHASE_SKELETON: @@ -189,7 +189,7 @@ public: DoCastVictim(SPELL_OBLITERATE); uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: { @@ -273,7 +273,7 @@ public: me->SetHealth(0); me->AddUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); RemoveSummons(); - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: me->SetDisplayId(MODEL_SKELETON); @@ -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 0c52039ea5d..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; @@ -176,7 +176,7 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(uiType) + switch (uiType) { case 1: AddWaypoint(0, 747.36f, 634.07f, 411.572f); @@ -205,15 +205,15 @@ public: void WaypointReached(uint32 i) { - switch(i) + 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 884da9fc119..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]; @@ -109,7 +109,7 @@ public: TeamInInstance = player->GetTeam(); } - switch(creature->GetEntry()) + switch (creature->GetEntry()) { // Champions case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: @@ -151,7 +151,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_MAIN_GATE: uiMainGateGUID = go->GetGUID(); @@ -165,7 +165,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_MOVEMENT_DONE: uiMovementDone = uiData; @@ -234,7 +234,7 @@ public: uint32 GetData(uint32 uiData) { - switch(uiData) + switch (uiData) { case BOSS_GRAND_CHAMPIONS: return m_auiEncounter[0]; case BOSS_ARGENT_CHALLENGE_E: return m_auiEncounter[1]; @@ -250,7 +250,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ANNOUNCER: return uiAnnouncerGUID; case DATA_MAIN_GATE: return uiMainGateGUID; @@ -265,7 +265,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_GRAND_CHAMPION_1: uiGrandChampion1GUID = uiData; 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 d7c486096bd..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: @@ -135,7 +135,7 @@ public: std::list<uint64> TempList; if (uiLesserChampions == 3 || uiLesserChampions == 6) { - switch(uiLesserChampions) + switch (uiLesserChampions) { case 3: TempList = Champion2List; @@ -187,7 +187,7 @@ public: ++uiSummonTimes; uint32 VEHICLE_TO_SUMMON1 = 0; uint32 VEHICLE_TO_SUMMON2 = 0; - switch(uiBoss) + switch (uiBoss) { case 0: VEHICLE_TO_SUMMON1 = VEHICLE_MOKRA_SKILLCRUSHER_MOUNT; @@ -215,7 +215,7 @@ public: if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: { @@ -223,12 +223,12 @@ public: uint64 uiGrandChampionBoss1 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle1GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss1 = pUnit->GetGUID(); - if (pInstance) + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss1 = unit->GetGUID(); + 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; @@ -239,12 +239,12 @@ public: uint64 uiGrandChampionBoss2 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle2GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss2 = pUnit->GetGUID(); - if (pInstance) + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss2 = unit->GetGUID(); + 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; @@ -255,12 +255,12 @@ public: uint64 uiGrandChampionBoss3 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle3GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss3 = pUnit->GetGUID(); - if (pInstance) + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss3 = unit->GetGUID(); + 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; @@ -273,7 +273,7 @@ public: { if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: Champion1List.push_back(pAdd->GetGUID()); @@ -286,7 +286,7 @@ public: break; } - switch(i) + switch (i) { case 0: pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); @@ -337,7 +337,7 @@ public: { uint8 uiTempBoss = urand(0, 1); - switch(uiTempBoss) + switch (uiTempBoss) { case 0: uiArgentChampion = NPC_EADRIC; @@ -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); } } } @@ -406,7 +406,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoSummonGrandChampion(uiSecondBoss); @@ -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); @@ -443,7 +443,7 @@ public: void SummonedCreatureDespawn(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case VEHICLE_DARNASSIA_NIGHTSABER: case VEHICLE_EXODAR_ELEKK: @@ -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 f0c2ca635b2..1ca1c69831c 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -104,7 +104,7 @@ enum BossSpells SPELL_SPIKE_TELE = 66170, }; -#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193,67856,67855,67857) +#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193, 67856, 67855, 67857) enum SummonActions { @@ -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 cf7b6868946..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(); } @@ -292,14 +292,14 @@ struct boss_faction_championsAI : public ScriptedAI std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = tList.begin(); itr != tList.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && me->getThreatManager().getThreat(pUnit)) + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && me->getThreatManager().getThreat(unit)) { - if (pUnit->GetTypeId()==TYPEID_PLAYER) + if (unit->GetTypeId()==TYPEID_PLAYER) { - float threat = CalculateThreat(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth()); - me->getThreatManager().modifyThreatPercent(pUnit, -100); - me->AddThreat(pUnit, 1000000.0f * threat); + float threat = CalculateThreat(me->GetDistance2d(unit), (float)unit->GetArmor(), unit->GetHealth()); + me->getThreatManager().modifyThreatPercent(unit, -100); + me->AddThreat(unit, 1000000.0f * threat); } } } @@ -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 7d741cc3226..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); } @@ -226,7 +226,7 @@ public: if (m_uiNetherPowerTimer <= uiDiff) { - me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5,10,5,10), me, true); + me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5, 10, 5,10), me, true); m_uiNetherPowerTimer = 40*IN_MILLISECONDS; } else m_uiNetherPowerTimer -= uiDiff; @@ -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 51a125d8c79..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,18 +151,18 @@ 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 MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + 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); @@ -661,11 +661,11 @@ public: submergeTimer = 45 * IN_MILLISECONDS; stage = 0; } - + void MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + switch (uiId) { case 0: @@ -689,7 +689,7 @@ public: instanceScript->DoUseDoorOrButton(instanceScript->GetData64(GO_MAIN_GATE_DOOR)); boss_jormungarAI::EnterEvadeMode(); } - + void JustReachedHome() { if (instanceScript) @@ -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 b9348e572ca..495faf6f855 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -81,8 +81,8 @@ enum BossSpells SPELL_DARK_ESSENCE = 65684, SPELL_EMPOWERED_DARK = 65724, SPELL_TWIN_EMPATHY_DARK = 66132, - SPELL_UNLEASHED_DARK = 65808, - + SPELL_UNLEASHED_DARK = 65808, + SPELL_CONTROLLER_PERIODIC = 66149, SPELL_POWER_TWINS = 65879, SPELL_BERSERK = 64238, @@ -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,33 +429,33 @@ 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); boss_twin_baseAI::EnterCombat(who); } - + 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() @@ -727,10 +727,10 @@ class spell_powering_up : public SpellScriptLoader { if (pAura->GetStackAmount() == 100) { - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_DARK, true); - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_LIGHT, true); target->RemoveAurasDueToSpell(GetId()); @@ -757,7 +757,7 @@ class spell_powering_up : public SpellScriptLoader uint32 spellId; - bool Validate(SpellEntry const* /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -803,7 +803,7 @@ class spell_valkyr_essences : public SpellScriptLoader return true; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/) { if (urand(0, 99) < 5) GetTarget()->CastSpell(GetTarget(), spellId, true); 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 dd772a14b5d..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)); - - if (Creature* pTemp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS)) + m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR)); + + 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_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 3dcc620c87a..48616d8e6e4 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -100,7 +100,7 @@ class boss_dred : public CreatureScript if (uiGrievousBiteTimer <= diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE , false); + DoCastVictim(SPELL_GRIEVOUS_BITE, false); uiGrievousBiteTimer = 20000; } else 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 6c4920f7744..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; @@ -90,7 +90,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_NOVOS_CRYSTAL_1: uiNovosCrystal1 = go->GetGUID(); @@ -109,7 +109,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TROLLGORE: uiTrollgore = creature->GetGUID(); @@ -128,7 +128,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_TROLLGORE: return uiTrollgore; case DATA_NOVOS: return uiNovos; @@ -145,7 +145,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_TROLLGORE_EVENT: m_auiEncounter[0] = data; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 5c3249949b8..eacb800f15a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -143,7 +143,7 @@ class boss_bronjahm : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MAGIC_BANE: DoCastVictim(SPELL_MAGIC_S_BANE); @@ -377,7 +377,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { - unitList.remove_if(DistanceCheck(GetCaster())); + unitList.remove_if (DistanceCheck(GetCaster())); sharedUnitList = unitList; } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 51b240976c9..adbe59555b6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -261,7 +261,7 @@ class boss_devourer_of_souls : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_PHANTOM_BLAST: DoCastVictim(SPELL_PHANTOM_BLAST); 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 e337050a5a2..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; @@ -173,7 +173,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -189,11 +189,11 @@ public: { if (phase == PHASE_INTRO) { - if (!pInstance) + if (!instance) return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_SYLVANAS_INTRO_1, me); @@ -254,7 +254,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -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; @@ -299,7 +299,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -315,11 +315,11 @@ public: { if (phase == PHASE_INTRO) { - if (!pInstance) + if (!instance) return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_JAINA_INTRO_1, me); @@ -391,7 +391,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -446,7 +446,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPITE: DoCastVictim(SPELL_SPITE); @@ -502,7 +502,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_VEIL_OF_SHADOWS: DoCastVictim(SPELL_VEIL_OF_SHADOWS); @@ -560,7 +560,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHROUD_OF_RUNES: DoCast(me, SPELL_SHROUD_OF_RUNES); @@ -617,7 +617,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FROST_NOVA: DoCast(me, SPELL_FROST_NOVA); @@ -677,7 +677,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BONE_VOLLEY: DoCastAOE(SPELL_BONE_VOLLEY); @@ -743,7 +743,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -816,7 +816,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -883,7 +883,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SOUL_STRIKE: DoCast(me->getVictim(), SPELL_SOUL_STRIKE); 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 f4bb4a9f72c..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; @@ -230,7 +230,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_START_INTRO, 0); @@ -244,12 +244,12 @@ public: void UpdateAI(const uint32 diff) { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { 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); @@ -664,7 +664,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_WORD_PAIN: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -747,7 +747,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FIREBALL: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -847,7 +847,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_STEP: DoCast(SPELL_SHADOW_STEP); @@ -917,7 +917,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPECTRAL_STRIKE: DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); @@ -983,7 +983,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHOOT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) 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 c34f64df816..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; @@ -104,7 +104,7 @@ struct boss_horAI : ScriptedAI void DoAction(const int32 actionID) { - switch(actionID) + switch (actionID) { case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat. // Just in case. Should have been done by InstanceScript @@ -114,8 +114,8 @@ struct boss_horAI : ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); - if (Unit* pUnit = me->SelectNearestTarget()) - AttackStart(pUnit); + if (Unit* unit = me->SelectNearestTarget()) + AttackStart(unit); DoZoneInCombat(); break; @@ -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 f86acaf623a..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; @@ -157,7 +157,7 @@ public: if (Player* player = players.begin()->getSource()) uiTeamInInstance = player->GetTeam(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_FALRIC: uiFalric = creature->GetGUID(); @@ -180,7 +180,7 @@ public: void OnGameObjectCreate(GameObject* go) { // TODO: init state depending on encounters - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); @@ -221,7 +221,7 @@ public: if (uiWaveCount && data == NOT_STARTED) DoWipe(); - switch(type) + switch (type) { case DATA_FALRIC_EVENT: uiEncounter[0] = data; @@ -244,7 +244,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_FALRIC_EVENT: return uiEncounter[0]; case DATA_MARWYN_EVENT: return uiEncounter[1]; @@ -258,7 +258,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_FALRIC: return uiFalric; case DATA_MARWYN: return uiMarwyn; @@ -320,7 +320,7 @@ public: DoUpdateWorldState(WORLD_STATE_HOR, 1); DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 1: case 2: @@ -407,7 +407,7 @@ public: events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_NEXT_WAVE: uiWaveCount++; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 2bf8876572f..29a89328336 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -162,7 +162,7 @@ class instance_pit_of_saron : public InstanceMapScript switch (type) { case DATA_GARFROST: - if(state == DONE) + if (state == DONE) { if (Creature* summoner = instance->GetCreature(_garfrostGUID)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index fa573408d3c..034bfafe8b0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -192,7 +192,7 @@ class mob_wrathbone_laborer : public CreatureScript while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BLINDING_DIRT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true)) 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 945239cc594..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; @@ -138,7 +138,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_SLAD_RAN: uiSladRan = creature->GetGUID(); break; case CREATURE_MOORABI: uiMoorabi = creature->GetGUID(); break; @@ -154,7 +154,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 192518: uiSladRanAltar = go->GetGUID(); @@ -253,7 +253,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: m_auiEncounter[0] = data; @@ -317,7 +317,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: return m_auiEncounter[0]; @@ -338,7 +338,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_ALTAR: return uiSladRanAltar; @@ -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_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 332c52f55b6..559c9ae6aa9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -657,7 +657,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { uint32 targetCount = (targets.size() + 2) / 3; - targets.remove_if(BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); + targets.remove_if (BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); Trinity::RandomResizeList(targets, targetCount); // mark targets now, effect hook has missile travel time delay (might cast next in that time) for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -694,7 +694,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); bool remove = true; std::list<Unit*>::const_iterator itrEnd = unitList.end(), itr, itr2; @@ -780,7 +780,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); unitList.push_back(GetCaster()); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index cb7c25e152b..4703e827522 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -719,7 +719,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript float x, y, z; deathbringer->GetClosePoint(x, y, z, deathbringer->GetObjectSize()); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(POINT_CORPSE , x, y, z); + me->GetMotionMaster()->MovePoint(POINT_CORPSE, x, y, z); } break; case EVENT_OUTRO_HORDE_5: // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index b19042b3669..a52965f925f 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -193,9 +193,9 @@ class boss_lord_marrowgar : public CreatureScript case EVENT_BONE_STORM_MOVE: { events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)); if (!unit) - unit = SelectTarget(SELECT_TARGET_RANDOM, 0); + unit = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); if (unit) me->GetMotionMaster()->MovePoint(POINT_TARGET_BONESTORM_PLAYER, unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ()); break; @@ -564,14 +564,14 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_storm_SpellScript); - void RecalculateDamage(SpellEffIndex /*effIndex*/) + void RecalculateDamage() { - SetHitDamage(int32(GetHitDamage() / sqrtf(logf(GetHitUnit()->GetExactDist2d(GetCaster()))))); + SetHitDamage(int32(GetHitDamage() / std::max(sqrtf(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); } void Register() { - OnEffectHitTarget += SpellEffectFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnHit += SpellHitFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 72b5f8f918c..a6e3e78c96a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -525,7 +525,7 @@ class boss_professor_putricide : public CreatureScript EnterEvadeMode(); break; case EVENT_FESTERGUT_GOO: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_MALLABLE_GOO_H, true); // triggered, to skip LoS check events.ScheduleEvent(EVENT_FESTERGUT_GOO, urand(15000, 20000), 0, PHASE_FESTERGUT); break; @@ -534,7 +534,7 @@ class boss_professor_putricide : public CreatureScript EnterEvadeMode(); break; case EVENT_ROTFACE_VILE_GAS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_VILE_GAS_H, true); // triggered, to skip LoS check events.ScheduleEvent(EVENT_ROTFACE_VILE_GAS, urand(15000, 20000), 0, PHASE_ROTFACE); break; @@ -601,7 +601,7 @@ class boss_professor_putricide : public CreatureScript events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, urand(35000, 40000)); break; case EVENT_UNBOUND_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) { me->CastCustomSpell(SPELL_UNBOUND_PLAGUE, SPELLVALUE_BASE_POINT0, 775, target); DoCast(target, SPELL_UNBOUND_PLAGUE_SEARCHER); @@ -1341,18 +1341,18 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader if (!summon || !summon->IsVehicle()) return; - caster->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_NAME, true); summon->CastSpell(summon, SPELL_ABOMINATION_VEHICLE_POWER_DRAIN, true); summon->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_DAMAGE, true); + caster->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_NAME, true); - caster->EnterVehicle(summon, 0); + caster->EnterVehicle(summon, 0); // VEHICLE_SPELL_RIDE_HARDCODED is used according to sniff, this is ok summon->SetCreatorGUID(caster->GetGUID()); putricide->AI()->JustSummoned(summon); } void Register() { - OnEffectHitTarget += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 24738fe0155..58ae5f48797 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -490,7 +490,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { // remove targets with this aura already // tank is not on this list - targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + targets.remove_if (Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 65edd4cca37..dca53f1a5e7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1020,7 +1020,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(UnchainedMagicTargetSelector()); + unitList.remove_if (UnchainedMagicTargetSelector()); uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 5 : 2); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); @@ -1214,7 +1214,7 @@ class spell_sindragosa_collision_filter : public SpellScriptLoader { std::list<Creature*> tombs; GetCreatureListWithEntryInGrid(tombs, GetCaster(), NPC_ICE_TOMB, 200.0f); - unitList.remove_if(FrostBombTargetSelector(GetCaster(), tombs)); + unitList.remove_if (FrostBombTargetSelector(GetCaster(), tombs)); } void Register() @@ -1353,7 +1353,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader std::list<Creature*> unitList; GetCreatureListWithEntryInGrid(unitList, GetCaster(), NPC_FROSTWING_WHELP, 150.0f); if (Creature* creature = GetCaster()->ToCreature()) - unitList.remove_if(OrderWhelpTargetSelector(creature)); + unitList.remove_if (OrderWhelpTargetSelector(creature)); SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp new file mode 100644 index 00000000000..1688624be91 --- /dev/null +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -0,0 +1,3242 @@ +/* + * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "ObjectMgr.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" +#include "Spell.h" +#include "Vehicle.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "icecrown_citadel.h" + +enum Texts +{ + // The Lich King + SAY_LK_INTRO_1 = 0, + SAY_LK_INTRO_2 = 1, + SAY_LK_INTRO_3 = 2, + SAY_LK_REMORSELESS_WINTER = 4, + SAY_LK_QUAKE = 5, + SAY_LK_SUMMON_VALKYR = 6, + SAY_LK_HARVEST_SOUL = 7, + SAY_LK_FROSTMOURNE_ESCAPE = 8, // not said on heroic + SAY_LK_FROSTMOURNE_KILL = 9, // not said on heroic + SAY_LK_KILL = 10, + SAY_LK_BERSERK = 11, + EMOTE_DEFILE_WARNING = 12, + EMOTE_NECROTIC_PLAGUE_WARNING = 13, + SAY_LK_OUTRO_1 = 14, + SAY_LK_OUTRO_2 = 15, + SAY_LK_OUTRO_3 = 16, + SAY_LK_OUTRO_4 = 17, + SAY_LK_OUTRO_5 = 18, + SAY_LK_OUTRO_6 = 19, + SAY_LK_OUTRO_7 = 20, + SAY_LK_OUTRO_8 = 21, + + // Highlord Tirion Fordring + SAY_TIRION_INTRO_1 = 0, + SAY_TIRION_INTRO_2 = 1, + SAY_TIRION_OUTRO_1 = 2, + SAY_TIRION_OUTRO_2 = 3, + + // Terenas Menethil (outro) + SAY_TERENAS_OUTRO_1 = 0, + SAY_TERENAS_OUTRO_2 = 1, + + // Terenas Menethil (Frostmourne) + SAY_TERENAS_INTRO_1 = 0, + SAY_TERENAS_INTRO_2 = 1, + SAY_TERENAS_INTRO_3 = 2, +}; + +enum Spells +{ + // The Lich King + SPELL_PLAGUE_AVOIDANCE = 72846, // raging spirits also get it + SPELL_EMOTE_SIT_NO_SHEATH = 73220, + SPELL_BOSS_HITTIN_YA = 73878, + SPELL_EMOTE_SHOUT_NO_SHEATH = 73213, + SPELL_ICE_LOCK = 71614, + + // Phase 1 + SPELL_SUMMON_SHAMBLING_HORROR = 70372, + SPELL_RISEN_WITCH_DOCTOR_SPAWN = 69639, + SPELL_SUMMON_DRUDGE_GHOULS = 70358, + SPELL_INFEST = 70541, + SPELL_NECROTIC_PLAGUE = 70337, + SPELL_NECROTIC_PLAGUE_JUMP = 70338, + SPELL_PLAGUE_SIPHON = 74074, + SPELL_SHADOW_TRAP = 73539, + SPELL_SHADOW_TRAP_AURA = 73525, + SPELL_SHADOW_TRAP_KNOCKBACK = 73529, + + // Phase Transition + SPELL_REMORSELESS_WINTER_1 = 68981, + SPELL_REMORSELESS_WINTER_2 = 72259, + SPELL_PAIN_AND_SUFFERING = 72133, + SPELL_SUMMON_ICE_SPHERE = 69104, + SPELL_ICE_SPHERE = 69090, + SPELL_ICE_BURST_TARGET_SEARCH = 69109, + SPELL_ICE_PULSE = 69091, + SPELL_ICE_BURST = 69108, + SPELL_RAGING_SPIRIT = 69200, + SPELL_RAGING_SPIRIT_VISUAL = 69197, + SPELL_RAGING_SPIRIT_VISUAL_CLONE = 69198, + SPELL_SOUL_SHRIEK = 69242, + SPELL_QUAKE = 72262, + + // Phase 2 + SPELL_DEFILE = 72762, + SPELL_DEFILE_AURA = 72743, + SPELL_DEFILE_GROW = 72756, + SPELL_SUMMON_VALKYR = 69037, + SPELL_SUMMON_VALKYR_PERIODIC = 74361, + SPELL_HARVEST_SOUL_VALKYR = 68985, // Val'kyr Shadowguard vehicle aura + SPELL_SOUL_REAPER = 69409, + SPELL_SOUL_REAPER_BUFF = 69410, + SPELL_WINGS_OF_THE_DAMNED = 74352, + SPELL_VALKYR_TARGET_SEARCH = 69030, + SPELL_CHARGE = 74399, // cast on selected target + SPELL_VALKYR_CARRY = 74445, // removes unselectable flag + SPELL_LIFE_SIPHON = 73488, + SPELL_LIFE_SIPHON_HEAL = 73489, + SPELL_EJECT_ALL_PASSENGERS = 68576, + + // Phase 3 + SPELL_VILE_SPIRITS = 70498, + SPELL_VILE_SPIRIT_MOVE_SEARCH = 70501, + SPELL_VILE_SPIRIT_DAMAGE_SEARCH = 70502, + SPELL_SPIRIT_BURST = 70503, + SPELL_HARVEST_SOUL = 68980, + SPELL_HARVEST_SOULS = 73654, // Heroic version, weird because it has all 4 difficulties just like above spell + SPELL_HARVEST_SOUL_VEHICLE = 68984, + SPELL_HARVEST_SOUL_VISUAL = 71372, + SPELL_HARVEST_SOUL_TELEPORT = 72546, + SPELL_HARVEST_SOULS_TELEPORT = 73655, + SPELL_HARVEST_SOUL_TELEPORT_BACK = 72597, + SPELL_IN_FROSTMOURNE_ROOM = 74276, + SPELL_KILL_FROSTMOURNE_PLAYERS = 75127, + SPELL_HARVESTED_SOUL = 72679, + SPELL_TRIGGER_VILE_SPIRIT_HEROIC = 73582, + + // Frostmourne + SPELL_LIGHTS_FAVOR = 69382, + SPELL_RESTORE_SOUL = 72595, + SPELL_RESTORE_SOULS = 73650, // Heroic + SPELL_DARK_HUNGER = 69383, // Passive proc healing + SPELL_DESTROY_SOUL = 74086, // Used when Terenas Menethil dies + SPELL_SOUL_RIP = 69397, // Deals increasing damage + SPELL_SOUL_RIP_DAMAGE = 69398, + SPELL_TERENAS_LOSES_INSIDE = 72572, + SPELL_SUMMON_SPIRIT_BOMB_1 = 73581, // (Heroic) + SPELL_SUMMON_SPIRIT_BOMB_2 = 74299, // (Heroic) + SPELL_EXPLOSION = 73576, // Spirit Bomb (Heroic) + + // Outro + SPELL_FURY_OF_FROSTMOURNE = 72350, + SPELL_FURY_OF_FROSTMOURNE_NO_REZ = 72351, + SPELL_EMOTE_QUESTION_NO_SHEATH = 73330, + SPELL_RAISE_DEAD = 71769, + SPELL_LIGHTS_BLESSING = 71797, + SPELL_JUMP = 71809, + SPELL_JUMP_TRIGGERED = 71811, + SPELL_JUMP_2 = 72431, + SPELL_SUMMON_BROKEN_FROSTMOURNE = 74081, // visual + SPELL_SUMMON_BROKEN_FROSTMOURNE_2 = 72406, // animation + SPELL_SUMMON_BROKEN_FROSTMOURNE_3 = 73017, // real summon + SPELL_BROKEN_FROSTMOURNE = 72398, + SPELL_BROKEN_FROSTMOURNE_KNOCK = 72405, + SPELL_SOUL_BARRAGE = 72305, + SPELL_SUMMON_TERENAS = 72420, + SPELL_MASS_RESURRECTION = 72429, + SPELL_MASS_RESURRECTION_REAL = 72423, + SPELL_PLAY_MOVIE = 73159, + + // Shambling Horror + SPELL_SHOCKWAVE = 72149, + SPELL_ENRAGE = 72143, + SPELL_FRENZY = 28747, +}; + +#define NECROTIC_PLAGUE_LK RAID_MODE<uint32>(70337, 73912, 73913, 73914) +#define NECROTIC_PLAGUE_PLR RAID_MODE<uint32>(70338, 73785, 73786, 73787) +#define REMORSELESS_WINTER_1 RAID_MODE<uint32>(68981, 74270, 74271, 74272) +#define REMORSELESS_WINTER_2 RAID_MODE<uint32>(72259, 74273, 74274, 74275) +#define SUMMON_VALKYR RAID_MODE<uint32>(69037, 74361, 69037, 74361) +#define HARVEST_SOUL RAID_MODE<uint32>(68980, 74325, 74296, 74297) + +enum Events +{ + // The Lich King + // intro events + EVENT_INTRO_MOVE_1 = 1, + EVENT_INTRO_MOVE_2 = 2, + EVENT_INTRO_MOVE_3 = 3, + EVENT_INTRO_TALK_1 = 4, + EVENT_EMOTE_CAST_SHOUT = 5, + EVENT_INTRO_EMOTE_1 = 6, + EVENT_INTRO_CHARGE = 7, + EVENT_INTRO_CAST_FREEZE = 8, + EVENT_FINISH_INTRO = 9, + + // combat events + EVENT_SUMMON_SHAMBLING_HORROR = 10, + EVENT_SUMMON_DRUDGE_GHOUL = 11, + EVENT_INFEST = 12, + EVENT_NECROTIC_PLAGUE = 13, + EVENT_SHADOW_TRAP = 14, // heroic only + EVENT_SOUL_REAPER = 15, + EVENT_DEFILE = 16, + EVENT_HARVEST_SOUL = 17, // normal mode only + EVENT_PAIN_AND_SUFFERING = 18, + EVENT_SUMMON_ICE_SPHERE = 19, + EVENT_SUMMON_RAGING_SPIRIT = 20, + EVENT_QUAKE = 21, + EVENT_SUMMON_VALKYR = 22, + EVENT_GRAB_PLAYER = 23, + EVENT_MOVE_TO_DROP_POS = 24, + EVENT_LIFE_SIPHON = 25, // heroic only + EVENT_START_ATTACK = 26, + EVENT_QUAKE_2 = 27, + EVENT_VILE_SPIRITS = 28, + EVENT_HARVEST_SOULS = 29, // heroic only + EVENT_WICKED_SPIRITS = 30, + EVENT_SOUL_RIP = 31, + EVENT_DESTROY_SOUL = 32, + EVENT_FROSTMOURNE_TALK_1 = 33, + EVENT_FROSTMOURNE_TALK_2 = 34, + EVENT_FROSTMOURNE_TALK_3 = 35, + EVENT_TELEPORT_BACK = 36, + EVENT_FROSTMOURNE_HEROIC = 37, + EVENT_OUTRO_TALK_1 = 38, + EVENT_OUTRO_TALK_2 = 39, + EVENT_OUTRO_EMOTE_TALK = 40, + EVENT_OUTRO_TALK_3 = 41, + EVENT_OUTRO_MOVE_CENTER = 42, + EVENT_OUTRO_TALK_4 = 43, + EVENT_OUTRO_RAISE_DEAD = 44, + EVENT_OUTRO_TALK_5 = 45, + EVENT_OUTRO_BLESS = 46, + EVENT_OUTRO_REMOVE_ICE = 47, + EVENT_OUTRO_MOVE_1 = 48, + EVENT_OUTRO_JUMP = 49, + EVENT_OUTRO_TALK_6 = 50, + EVENT_OUTRO_KNOCK_BACK = 51, + EVENT_OUTRO_SOUL_BARRAGE = 52, + EVENT_OUTRO_SUMMON_TERENAS = 53, + EVENT_OUTRO_TERENAS_TALK_1 = 54, + EVENT_OUTRO_TERENAS_TALK_2 = 55, + EVENT_OUTRO_TALK_7 = 56, + EVENT_OUTRO_TALK_8 = 57, + EVENT_BERSERK = 58, + + // Shambling Horror + EVENT_SHOCKWAVE = 59, + EVENT_ENRAGE = 60, + + // Raging Spirit + EVENT_SOUL_SHRIEK = 61, + + // Strangulate Vehicle (Harvest Soul) + EVENT_TELEPORT = 62, + EVENT_MOVE_TO_LICH_KING = 63, + EVENT_DESPAWN_SELF = 64, +}; + +enum EventGroups +{ + EVENT_GROUP_BERSERK = 1, + EVENT_GROUP_VILE_SPIRITS = 2, +}; + +enum Phases +{ + PHASE_INTRO = 1, + PHASE_ONE = 2, + PHASE_TWO = 3, + PHASE_THREE = 4, + PHASE_TRANSITION = 5, + PHASE_FROSTMOURNE = 6, // only set on heroic mode when all players are sent into frostmourne + PHASE_OUTRO = 7, + + PHASE_MASK_INTRO = 1 << PHASE_INTRO, + PHASE_MASK_ONE = 1 << PHASE_ONE, + PHASE_MASK_TWO = 1 << PHASE_TWO, + PHASE_MASK_THREE = 1 << PHASE_THREE, + PHASE_MASK_TRANSITION = 1 << PHASE_TRANSITION, + PHASE_MASK_NO_CAST_CHECK = (1 << PHASE_TRANSITION) | (1 << PHASE_FROSTMOURNE) | (1 << PHASE_OUTRO), + PHASE_MASK_FROSTMOURNE = 1 << PHASE_FROSTMOURNE, + PHASE_MASK_OUTRO = 1 << PHASE_OUTRO, + PHASE_MASK_NO_VICTIM = (1 << PHASE_INTRO) | (1 << PHASE_OUTRO) | (1 << PHASE_FROSTMOURNE), +}; + +#define PHASE_TWO_THREE (events.GetPhaseMask() & PHASE_MASK_TWO ? PHASE_TWO : PHASE_THREE) + +Position const CenterPosition = {503.6282f, -2124.655f, 840.8569f, 0.0f}; +Position const TirionIntro = {489.2970f, -2124.840f, 840.8569f, 0.0f}; +Position const TirionCharge = {482.9019f, -2124.479f, 840.8570f, 0.0f}; +Position const LichKingIntro[3] = +{ + {432.0851f, -2123.673f, 864.6582f, 0.0f}, + {457.8351f, -2123.423f, 841.1582f, 0.0f}, + {465.0730f, -2123.470f, 840.8569f, 0.0f}, +}; +Position const OutroPosition1 = {493.6286f, -2124.569f, 840.8569f, 0.0f}; +Position const OutroFlying = {508.9897f, -2124.561f, 845.3565f, 0.0f}; +Position const TerenasSpawn = {495.5542f, -2517.012f, 1050.000f, 4.6993f}; +Position const TerenasSpawnHeroic = {495.7080f, -2523.760f, 1050.000f, 0.0f}; +Position const SpiritWardenSpawn = {495.3406f, -2529.983f, 1050.000f, 1.5592f}; + +enum MovePoints +{ + POINT_CENTER_1 = 1, + POINT_CENTER_2 = 2, + POINT_TIRION_INTRO = 3, + POINT_LK_INTRO_1 = 4, + POINT_LK_INTRO_2 = 5, + POINT_LK_INTRO_3 = 6, + POINT_TIRION_CHARGE = 7, + POINT_DROP_PLAYER = 8, + POINT_LK_OUTRO_1 = 9, + POINT_TIRION_OUTRO_1 = 10, + POINT_OUTRO_JUMP = 11, + POINT_LK_OUTRO_2 = 12, + POINT_GROUND = 13, + POINT_CHARGE = 1003, // globally used number for charge spell effects +}; + +enum EncounterActions +{ + ACTION_START_ENCOUNTER = 0, + ACTION_CONTINUE_INTRO = 1, + ACTION_START_ATTACK = 2, + ACTION_OUTRO = 3, + ACTION_PLAY_MUSIC = 4, + ACTION_BREAK_FROSTMOURNE = 5, + ACTION_SUMMON_TERENAS = 6, + ACTION_FINISH_OUTRO = 7, + ACTION_TELEPORT_BACK = 8, +}; + +enum MiscData +{ + LIGHT_SNOWSTORM = 2490, + LIGHT_SOULSTORM = 2508, + + MUSIC_FROZEN_THRONE = 17457, + MUSIC_SPECIAL = 17458, // Summon Shambling Horror, Remorseless Winter, Quake, Summon Val'kyr Periodic, Harvest Soul, Vile Spirits + MUSIC_FURY_OF_FROSTMOURNE = 17459, + MUSIC_FINAL = 17460, // Raise Dead, Light's Blessing + + SOUND_PAIN = 17360, // separate sound, not attached to any text + + EQUIP_ASHBRINGER_GLOWING = 50442, + EQUIP_BROKEN_FROSTMOURNE = 50840, + + MOVIE_FALL_OF_THE_LICH_KING = 16, +}; + +#define DATA_PLAGUE_STACK 70337 +#define DATA_VILE 45814622 + +class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> +{ + public: + NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1 = 0, uint32 notAura2 = 0) + : _sourceObj(obj), _notAura1(notAura1), _notAura2(notAura2) + { + } + + bool operator()(Unit* unit) const + { + if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->isTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) + return false; + if ((_notAura1 && unit->HasAura(_notAura1)) || (_notAura2 && unit->HasAura(_notAura2))) + return false; + return true; + } + + private: + Unit const* _sourceObj; + uint32 _notAura1; + uint32 _notAura2; +}; + +class HeightDifferenceCheck +{ + public: + HeightDifferenceCheck(GameObject* go, float diff, bool reverse) + : _baseObject(go), _difference(diff), _reverse(reverse) + { + } + + bool operator()(Unit* unit) const + { + return (unit->GetPositionZ() - _baseObject->GetPositionZ() > _difference) != _reverse; + } + + private: + GameObject* _baseObject; + float _difference; + bool _reverse; +}; + +class FrozenThroneResetWorker +{ + public: + FrozenThroneResetWorker() { } + + bool operator()(GameObject* go) + { + switch (go->GetEntry()) + { + case GO_ARTHAS_PLATFORM: + go->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01: + go->SetGoState(GO_STATE_ACTIVE); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01: + go->SetGoState(GO_STATE_READY); + break; + case GO_DOODAD_ICESHARD_STANDING02: + case GO_DOODAD_ICESHARD_STANDING01: + case GO_DOODAD_ICESHARD_STANDING03: + case GO_DOODAD_ICESHARD_STANDING04: + go->ResetDoorOrButton(); + break; + default: + break; + } + + return false; + } +}; + +class StartMovementEvent : public BasicEvent +{ + public: + StartMovementEvent(Creature* summoner, Creature* owner) + : _summoner(summoner), _owner(owner) + { + } + + bool Execute(uint64 /*time*/, uint32 /*diff*/) + { + _owner->SetReactState(REACT_AGGRESSIVE); + if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(_summoner))) + _owner->AI()->AttackStart(target); + return true; + } + + private: + Creature* _summoner; + Creature* _owner; +}; + +class VileSpiritActivateEvent : public BasicEvent +{ + public: + explicit VileSpiritActivateEvent(Creature* owner) + : _owner(owner) + { + } + + bool Execute(uint64 /*time*/, uint32 /*diff*/) + { + _owner->SetReactState(REACT_AGGRESSIVE); + _owner->CastSpell(_owner, SPELL_VILE_SPIRIT_MOVE_SEARCH, true); + _owner->CastSpell((Unit*)NULL, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true); + return true; + } + + private: + Creature* _owner; +}; + +class boss_the_lich_king : public CreatureScript +{ + public: + boss_the_lich_king() : CreatureScript("boss_the_lich_king") { } + + struct boss_the_lich_kingAI : public BossAI + { + boss_the_lich_kingAI(Creature* creature) : BossAI(creature, DATA_THE_LICH_KING) + { + } + + void Reset() + { + _Reset(); + me->SetReactState(REACT_PASSIVE); + events.SetPhase(PHASE_INTRO); + _necroticPlagueStack = 0; + _vileSpiritExplosions = 0; + SetEquipmentSlots(true); + } + + void JustDied(Unit* /*killer*/) + { + _JustDied(); + DoCastAOE(SPELL_PLAY_MOVIE, false); + me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + float x, y, z; + me->GetPosition(x, y, z); + // use larger distance for vmap height search than in most other cases + float ground_Z = me->GetMap()->GetHeight(x, y, z, true, MAX_FALL_DISTANCE); + if (fabs(ground_Z - z) < 0.1f) + return; + + me->GetMotionMaster()->MoveFall(ground_Z); + } + + void EnterCombat(Unit* target) + { + if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer())) + { + EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); + return; + } + + me->setActive(true); + DoZoneInCombat(); + + events.SetPhase(PHASE_ONE); + events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 20000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 10000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_INFEST, 5000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_BERSERK, 900000, EVENT_GROUP_BERSERK); + if (IsHeroic()) + events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); + } + + void JustReachedHome() + { + _JustReachedHome(); + instance->SetBossState(DATA_THE_LICH_KING, NOT_STARTED); + + // Reset The Frozen Throne gameobjects + FrozenThroneResetWorker reset; + Trinity::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset); + me->VisitNearbyGridObject(333.0f, worker); + + // Reset any light override + SendLightOverride(0, 5000); + } + + bool CanAIAttack(Unit const* target) const + { + // The Lich King must not select targets in frostmourne room if he killed everyone outside + return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM); + } + + void EnterEvadeMode() + { + instance->SetBossState(DATA_THE_LICH_KING, FAIL); + BossAI::EnterEvadeMode(); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->EnterEvadeMode(); + DoCastAOE(SPELL_KILL_FROSTMOURNE_PLAYERS); + summons.DoAction(NPC_STRANGULATE_VEHICLE, ACTION_TELEPORT_BACK); + } + + void KilledUnit(Unit* victim) + { + if (victim->GetTypeId() == TYPEID_PLAYER && !me->IsInEvadeMode() && !(events.GetPhaseMask() & PHASE_MASK_OUTRO)) + Talk(SAY_LK_KILL); + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_START_ENCOUNTER: + instance->SetBossState(DATA_THE_LICH_KING, IN_PROGRESS); + Talk(SAY_LK_INTRO_1); + SendMusicToPlayers(MUSIC_FROZEN_THRONE); + // schedule talks + me->SetStandState(UNIT_STAND_STATE_STAND); + events.ScheduleEvent(EVENT_INTRO_MOVE_1, 4000); + break; + case ACTION_START_ATTACK: + events.ScheduleEvent(EVENT_START_ATTACK, 5000); + break; + case ACTION_PLAY_MUSIC: + SendMusicToPlayers(MUSIC_FINAL); + break; + case ACTION_RESTORE_LIGHT: + SendLightOverride(0, 5000); + break; + case ACTION_BREAK_FROSTMOURNE: + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE); + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_2); + SetEquipmentSlots(false, EQUIP_BROKEN_FROSTMOURNE); + events.ScheduleEvent(EVENT_OUTRO_TALK_6, 2500, 0, PHASE_OUTRO); + break; + case ACTION_FINISH_OUTRO: + events.ScheduleEvent(EVENT_OUTRO_TALK_7, 7000, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_8, 17000, 0, PHASE_OUTRO); + break; + case ACTION_TELEPORT_BACK: + summons.DoAction(NPC_STRANGULATE_VEHICLE, ACTION_TELEPORT_BACK); + if (!IsHeroic()) + Talk(SAY_LK_FROSTMOURNE_ESCAPE); + else + DoCastAOE(SPELL_TRIGGER_VILE_SPIRIT_HEROIC); + break; + default: + break; + } + } + + uint32 GetData(uint32 type) + { + switch (type) + { + case DATA_PLAGUE_STACK: + return _necroticPlagueStack; + case DATA_VILE: + return _vileSpiritExplosions; + default: + break; + } + + return 0; + } + + void SetData(uint32 type, uint32 value) + { + switch (type) + { + case DATA_PLAGUE_STACK: + _necroticPlagueStack = std::max(value, _necroticPlagueStack); + break; + case DATA_VILE: + _vileSpiritExplosions += value; + break; + default: + break; + } + } + + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + { + if (events.GetPhaseMask() & PHASE_MASK_ONE && !HealthAbovePct(70)) + { + events.SetPhase(PHASE_TRANSITION); + me->GetMotionMaster()->MovePoint(POINT_CENTER_1, CenterPosition); + return; + } + + if (events.GetPhaseMask() & PHASE_MASK_TWO && !HealthAbovePct(40)) + { + events.SetPhase(PHASE_TRANSITION); + me->GetMotionMaster()->MovePoint(POINT_CENTER_2, CenterPosition); + return; + } + + if (events.GetPhaseMask() & PHASE_MASK_THREE && !HealthAbovePct(10)) + { + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + events.Reset(); + events.SetPhase(PHASE_OUTRO); + summons.DespawnAll(); + SendMusicToPlayers(MUSIC_FURY_OF_FROSTMOURNE); + DoCastAOE(SPELL_FURY_OF_FROSTMOURNE); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + events.ScheduleEvent(EVENT_OUTRO_TALK_1, 2600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 6600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 17600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 27600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_2, 34600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_3, 43600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 54600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 58600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_MOVE_CENTER, 69600, 0, PHASE_OUTRO); + // stop here. rest will get scheduled from MovementInform + return; + } + } + + void JustSummoned(Creature* summon) + { + switch (summon->GetEntry()) + { + case NPC_SHAMBLING_HORROR: + case NPC_DRUDGE_GHOUL: + summon->CastSpell(summon, SPELL_RISEN_WITCH_DOCTOR_SPAWN, true); + summon->SetReactState(REACT_PASSIVE); + summon->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE); + summon->m_Events.AddEvent(new StartMovementEvent(me, summon), summon->m_Events.CalculateTime(5000)); + break; + case NPC_ICE_SPHERE: + { + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + { + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell(summon, SPELL_ICE_SPHERE, false); + summon->CastSpell(summon, SPELL_ICE_BURST_TARGET_SEARCH, false); + summon->CastSpell(target, SPELL_ICE_PULSE, false); + summon->ClearUnitState(UNIT_STAT_CASTING); + summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); + } + else + summon->DespawnOrUnsummon(); + break; + } + case NPC_DEFILE: + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell(summon, SPELL_DEFILE_AURA, false); + break; + case NPC_FROSTMOURNE_TRIGGER: + { + summons.Summon(summon); + summon->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE, true); + + SendLightOverride(LIGHT_SOULSTORM, 10000); + SendWeather(WEATHER_STATE_BLACKSNOW); + + events.ScheduleEvent(EVENT_OUTRO_SOUL_BARRAGE, 5000, 0, PHASE_OUTRO); + return; + } + case NPC_VILE_SPIRIT: + { + summons.Summon(summon); + if (events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE) + { + TeleportSpirit(summon); + return; + } + + summon->SetReactState(REACT_PASSIVE); + summon->SetSpeed(MOVE_FLIGHT, 0.5f); + summon->GetMotionMaster()->MoveRandom(10.0f); + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(15000)); + return; + } + case NPC_STRANGULATE_VEHICLE: + summons.Summon(summon); + return; + default: + break; + } + + BossAI::JustSummoned(summon); + } + + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + { + switch (summon->GetEntry()) + { + case NPC_SHAMBLING_HORROR: + case NPC_DRUDGE_GHOUL: + case NPC_ICE_SPHERE: + case NPC_VALKYR_SHADOWGUARD: + case NPC_RAGING_SPIRIT: + case NPC_VILE_SPIRIT: + case NPC_WICKED_SPIRIT: + summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); + break; + default: + break; + } + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_HARVESTED_SOUL && me->isInCombat() && !IsHeroic()) + Talk(SAY_LK_FROSTMOURNE_KILL); + } + + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + { + if (spell->Id == REMORSELESS_WINTER_1 || spell->Id == REMORSELESS_WINTER_2) + { + SendLightOverride(LIGHT_SNOWSTORM, 5000); + SendWeather(WEATHER_STATE_LIGHT_SNOW); + } + } + + void MovementInform(uint32 type, uint32 pointId) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (pointId) + { + case POINT_LK_INTRO_1: + // schedule for next update cycle, current update must finalize movement + events.ScheduleEvent(EVENT_INTRO_MOVE_2, 1, 0, PHASE_INTRO); + break; + case POINT_LK_INTRO_2: + events.ScheduleEvent(EVENT_INTRO_MOVE_3, 1, 0, PHASE_INTRO); + break; + case POINT_LK_INTRO_3: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->DoAction(ACTION_CONTINUE_INTRO); + events.ScheduleEvent(EVENT_INTRO_TALK_1, 9000, 0, PHASE_INTRO); + break; + case POINT_CENTER_1: + me->SetFacing(0.0f); + Talk(SAY_LK_REMORSELESS_WINTER); + SendMusicToPlayers(MUSIC_SPECIAL); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + DoCast(me, SPELL_REMORSELESS_WINTER_1); + events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions + events.ScheduleEvent(EVENT_QUAKE, 62500, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 4000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 3000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_VALKYR, 78000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_INFEST, 70000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_DEFILE, 97000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_SOUL_REAPER, 94000, 0, PHASE_TWO); + break; + case POINT_CENTER_2: + me->SetFacing(0.0f); + Talk(SAY_LK_REMORSELESS_WINTER); + SendMusicToPlayers(MUSIC_SPECIAL); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + DoCast(me, SPELL_REMORSELESS_WINTER_2); + summons.DespawnEntry(NPC_VALKYR_SHADOWGUARD); + events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions + events.ScheduleEvent(EVENT_QUAKE_2, 62500, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 6000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 5000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_DEFILE, 95500, 0, PHASE_THREE); + events.ScheduleEvent(EVENT_SOUL_REAPER, 99500, 0, PHASE_THREE); + events.ScheduleEvent(EVENT_VILE_SPIRITS, 79500, EVENT_GROUP_VILE_SPIRITS, PHASE_THREE); + events.ScheduleEvent(IsHeroic() ? EVENT_HARVEST_SOULS : EVENT_HARVEST_SOUL, 73500, 0, PHASE_THREE); + break; + case POINT_LK_OUTRO_1: + events.ScheduleEvent(EVENT_OUTRO_TALK_4, 1, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_RAISE_DEAD, 1000, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_5, 29000, 0, PHASE_OUTRO); + break; + case POINT_LK_OUTRO_2: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->Talk(SAY_TIRION_OUTRO_2); + if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) + frostmourne->AI()->DoAction(ACTION_SUMMON_TERENAS); + break; + default: + break; + } + } + + void UpdateAI(uint32 const diff) + { + // check phase first to prevent updating victim and entering evade mode when not wanted + if (!(events.GetPhaseMask() & PHASE_MASK_NO_VICTIM)) + if (!UpdateVictim()) + return; + + events.Update(diff); + + // during Remorseless Winter phases The Lich King is channeling a spell, but we must continue casting other spells + if (me->HasUnitState(UNIT_STAT_CASTING) && !(events.GetPhaseMask() & PHASE_MASK_NO_CAST_CHECK)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_INTRO_MOVE_1: + me->SetSheath(SHEATH_STATE_MELEE); + me->RemoveAurasDueToSpell(SPELL_EMOTE_SIT_NO_SHEATH); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_1, LichKingIntro[0]); + break; + case EVENT_INTRO_MOVE_2: + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_2, LichKingIntro[1]); + break; + case EVENT_INTRO_MOVE_3: + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_3, LichKingIntro[2]); + break; + case EVENT_INTRO_TALK_1: + Talk(SAY_LK_INTRO_2); + // for some reason blizz sends 2 emotes in row here so (we handle one in Talk) + me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 13000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_INTRO_CAST_FREEZE, 31000, 0, PHASE_INTRO); + break; + case EVENT_EMOTE_CAST_SHOUT: + DoCast(me, SPELL_EMOTE_SHOUT_NO_SHEATH, false); + break; + case EVENT_INTRO_EMOTE_1: + me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); + break; + case EVENT_INTRO_CAST_FREEZE: + Talk(SAY_LK_INTRO_3); + DoCastAOE(SPELL_ICE_LOCK, false); + events.ScheduleEvent(EVENT_FINISH_INTRO, 1000, 0, PHASE_INTRO); + break; + case EVENT_FINISH_INTRO: + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetReactState(REACT_AGGRESSIVE); + events.SetPhase(PHASE_ONE); + break; + case EVENT_SUMMON_SHAMBLING_HORROR: + DoCast(me, SPELL_SUMMON_SHAMBLING_HORROR); + SendMusicToPlayers(MUSIC_SPECIAL); + events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 60000, 0, PHASE_ONE); + break; + case EVENT_SUMMON_DRUDGE_GHOUL: + DoCast(me, SPELL_SUMMON_DRUDGE_GHOULS); + events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 30000, 0, PHASE_ONE); + break; + case EVENT_INFEST: + DoCast(me, SPELL_INFEST); + events.ScheduleEvent(EVENT_INFEST, urand(21000, 24000), 0, (events.GetPhaseMask() & PHASE_MASK_ONE) ? PHASE_ONE : PHASE_TWO); + break; + case EVENT_NECROTIC_PLAGUE: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) + { + Talk(EMOTE_NECROTIC_PLAGUE_WARNING, target->GetGUID()); + DoCast(target, SPELL_NECROTIC_PLAGUE); + } + events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE); + break; + case EVENT_SHADOW_TRAP: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + DoCast(target, SPELL_SHADOW_TRAP); + events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); + break; + case EVENT_SOUL_REAPER: + DoCastVictim(SPELL_SOUL_REAPER); + events.ScheduleEvent(EVENT_SOUL_REAPER, urand(33000, 35000), 0, PHASE_TWO_THREE); + break; + case EVENT_DEFILE: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_HARVEST_SOUL_VALKYR)) + { + Talk(EMOTE_DEFILE_WARNING); + DoCast(target, SPELL_DEFILE); + } + events.ScheduleEvent(EVENT_DEFILE, urand(32000, 35000), 0, PHASE_TWO_THREE); + break; + case EVENT_HARVEST_SOUL: + Talk(SAY_LK_HARVEST_SOUL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SpellTargetSelector(me, SPELL_HARVEST_SOUL))) + DoCast(target, SPELL_HARVEST_SOUL); + events.ScheduleEvent(EVENT_HARVEST_SOUL, 75000, 0, PHASE_THREE); + break; + case EVENT_PAIN_AND_SUFFERING: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + me->CastSpell(target, SPELL_PAIN_AND_SUFFERING, TRIGGERED_NONE); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, urand(1500, 4000), 0, PHASE_TRANSITION); + break; + case EVENT_SUMMON_ICE_SPHERE: + DoCastAOE(SPELL_SUMMON_ICE_SPHERE); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, urand(7500, 8500), 0, PHASE_TRANSITION); + break; + case EVENT_SUMMON_RAGING_SPIRIT: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + me->CastSpell(target, SPELL_RAGING_SPIRIT, TRIGGERED_NONE); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, urand(22000, 23000), 0, PHASE_TRANSITION); + break; + case EVENT_QUAKE: + events.SetPhase(PHASE_TWO); + me->ClearUnitState(UNIT_STAT_CASTING); // clear state to ensure check in DoCastAOE passes + DoCastAOE(SPELL_QUAKE); + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_QUAKE); + break; + case EVENT_QUAKE_2: + events.SetPhase(PHASE_THREE); + me->ClearUnitState(UNIT_STAT_CASTING); // clear state to ensure check in DoCastAOE passes + DoCastAOE(SPELL_QUAKE); + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_QUAKE); + break; + case EVENT_SUMMON_VALKYR: + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_SUMMON_VALKYR); + DoCastAOE(SUMMON_VALKYR); + events.ScheduleEvent(EVENT_SUMMON_VALKYR, urand(45000, 50000), 0, PHASE_TWO); + break; + case EVENT_START_ATTACK: + me->SetReactState(REACT_AGGRESSIVE); + if (events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE) + events.SetPhase(PHASE_THREE); + break; + case EVENT_VILE_SPIRITS: + SendMusicToPlayers(MUSIC_SPECIAL); + DoCastAOE(SPELL_VILE_SPIRITS); + events.ScheduleEvent(EVENT_VILE_SPIRITS, urand(35000, 40000), EVENT_GROUP_VILE_SPIRITS, PHASE_THREE); + break; + case EVENT_WICKED_SPIRITS: + DoCastAOE(SPELL_VILE_SPIRITS); + events.ScheduleEvent(EVENT_WICKED_SPIRITS, urand(35000, 40000), 0, PHASE_FROSTMOURNE); + break; + case EVENT_HARVEST_SOULS: + Talk(SAY_LK_HARVEST_SOUL); + DoCastAOE(SPELL_HARVEST_SOULS); + events.ScheduleEvent(EVENT_HARVEST_SOULS, urand(100000, 110000), 0, PHASE_THREE); + events.SetPhase(PHASE_FROSTMOURNE); // will stop running UpdateVictim (no evading) + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + events.ScheduleEvent(EVENT_WICKED_SPIRITS, events.GetNextEventTime(EVENT_VILE_SPIRITS) - events.GetTimer(), 0, PHASE_FROSTMOURNE); + events.DelayEvents(50000, EVENT_GROUP_VILE_SPIRITS); + events.RescheduleEvent(EVENT_DEFILE, 50000, 0, PHASE_THREE); + events.RescheduleEvent(EVENT_SOUL_REAPER, urand(57000, 62000), 0, PHASE_THREE); + events.ScheduleEvent(EVENT_START_ATTACK, 49000); + events.ScheduleEvent(EVENT_FROSTMOURNE_HEROIC, 6500); + break; + case EVENT_FROSTMOURNE_HEROIC: + if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, NULL, 50000)) + { + terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f); + if (!triggers.empty()) + { + triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, true)); + Unit* spawner = triggers.front(); + spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_1, true); // summons bombs randomly + spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_2, true); // summons bombs on players + } + + for (SummonList::iterator i = summons.begin(); i != summons.end(); ++i) + { + Creature* summon = ObjectAccessor::GetCreature(*me, *i); + if (summon && summon->GetEntry() == NPC_VILE_SPIRIT) + TeleportSpirit(summon); + } + } + break; + case EVENT_OUTRO_TALK_1: + Talk(SAY_LK_OUTRO_1); + DoCastAOE(SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true); + break; + case EVENT_OUTRO_TALK_2: + Talk(SAY_LK_OUTRO_2); + DoCastAOE(SPELL_EMOTE_QUESTION_NO_SHEATH); + break; + case EVENT_OUTRO_EMOTE_TALK: + me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); + break; + case EVENT_OUTRO_TALK_3: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + me->SetFacing(0.0f, tirion); + Talk(SAY_LK_OUTRO_3); + break; + case EVENT_OUTRO_MOVE_CENTER: + me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_1, CenterPosition); + break; + case EVENT_OUTRO_TALK_4: + me->SetFacing(0.01745329f); + Talk(SAY_LK_OUTRO_4); + break; + case EVENT_OUTRO_RAISE_DEAD: + DoCastAOE(SPELL_RAISE_DEAD); + me->ClearUnitState(UNIT_STAT_CASTING); + SendMusicToPlayers(MUSIC_FINAL); + break; + case EVENT_OUTRO_TALK_5: + Talk(SAY_LK_OUTRO_5); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->DoAction(ACTION_OUTRO); + break; + case EVENT_OUTRO_TALK_6: + Talk(SAY_LK_OUTRO_6); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->SetFacing(0.0f, me); + me->ClearUnitState(UNIT_STAT_CASTING); + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_3); + SetEquipmentSlots(false, EQUIP_UNEQUIP); + break; + case EVENT_OUTRO_SOUL_BARRAGE: + DoCastAOE(SPELL_SOUL_BARRAGE); + sCreatureTextMgr->SendSound(me, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false); + // set flight + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_2, OutroFlying); + break; + case EVENT_OUTRO_TALK_7: + Talk(SAY_LK_OUTRO_7); + break; + case EVENT_OUTRO_TALK_8: + Talk(SAY_LK_OUTRO_8); + break; + case EVENT_BERSERK: + Talk(SAY_LK_BERSERK); + DoCast(me, SPELL_BERSERK2); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + + void TeleportSpirit(Creature* summon) + { + float dist = me->GetObjectSize() + (15.0f - me->GetObjectSize()) * float(rand_norm()); + float angle = float(rand_norm()) * float(2.0f * M_PI); + Position dest = TerenasSpawnHeroic; + me->MovePosition(dest, dist, angle); + dest.m_positionZ += 15.0f; + summon->UpdateEntry(NPC_WICKED_SPIRIT); + summon->SetReactState(REACT_PASSIVE); + summon->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); + summon->SetSpeed(MOVE_FLIGHT, 0.5f); + summon->m_Events.KillAllEvents(true); + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(1000)); + } + + void SendMusicToPlayers(uint32 musicId) const + { + WorldPacket data(SMSG_PLAY_MUSIC, 4); + data << uint32(musicId); + SendPacketToPlayers(&data); + } + + void SendLightOverride(uint32 overrideId, uint32 fadeInTime) const + { + WorldPacket data(SMSG_OVERRIDE_LIGHT, 12); + data << uint32(2488); // Light.dbc entry (map default) + data << uint32(overrideId); // Light.dbc entry (override) + data << uint32(fadeInTime); + SendPacketToPlayers(&data); + } + + void SendWeather(WeatherState weather) const + { + WorldPacket data(SMSG_WEATHER, 9); + data << uint32(weather); + data << float(0.5f); + data << uint8(0); + SendPacketToPlayers(&data); + } + + // Send packet to all players in The Frozen Throne + void SendPacketToPlayers(WorldPacket const* data) const + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (!players.isEmpty()) + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if (Player* player = itr->getSource()) + if (player->GetAreaId() == AREA_THE_FROZEN_THRONE) + player->GetSession()->SendPacket(data); + } + + uint32 _necroticPlagueStack; + uint32 _vileSpiritExplosions; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<boss_the_lich_kingAI>(creature); + } +}; + +class npc_tirion_fordring_tft : public CreatureScript +{ + public: + npc_tirion_fordring_tft() : CreatureScript("npc_tirion_fordring_tft") { } + + struct npc_tirion_fordringAI : public ScriptedAI + { + npc_tirion_fordringAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (id) + { + case POINT_TIRION_INTRO: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); + if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + theLichKing->AI()->DoAction(ACTION_START_ENCOUNTER); + break; + case POINT_TIRION_OUTRO_1: + _events.ScheduleEvent(EVENT_OUTRO_JUMP, 1, 0, PHASE_OUTRO); + break; + } + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_CONTINUE_INTRO: + Talk(SAY_TIRION_INTRO_1); + _events.ScheduleEvent(EVENT_INTRO_TALK_1, 34000, 0, PHASE_INTRO); + break; + case ACTION_OUTRO: + _events.SetPhase(PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_TALK_1, 7000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_BLESS, 18000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_REMOVE_ICE, 23000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_MOVE_1, 25000, 0, PHASE_OUTRO); + break; + } + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_ICE_LOCK) + me->SetFacing(3.085098f); + else if (spell->Id == SPELL_BROKEN_FROSTMOURNE_KNOCK) + SetEquipmentSlots(true); // remove glow on ashbringer + } + + void sGossipSelect(Player* player, uint32 sender, uint32 action) + { + if (me->GetCreatureInfo()->GossipMenuId == sender && !action) + { + _events.SetPhase(PHASE_INTRO); + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_TIRION_INTRO, TirionIntro); + } + } + + void JustReachedHome() + { + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) + return; + + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim() && !(_events.GetPhaseMask() & (PHASE_MASK_INTRO | PHASE_MASK_OUTRO))) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_INTRO_TALK_1: + Talk(SAY_TIRION_INTRO_2); + _events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 2000, 0, PHASE_INTRO); + _events.ScheduleEvent(EVENT_INTRO_CHARGE, 5000, 0, PHASE_INTRO); + break; + case EVENT_INTRO_EMOTE_1: + me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); + break; + case EVENT_INTRO_CHARGE: + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_TIRION_CHARGE, TirionCharge); + break; + case EVENT_OUTRO_TALK_1: + Talk(SAY_TIRION_OUTRO_1); + break; + case EVENT_OUTRO_BLESS: + DoCast(me, SPELL_LIGHTS_BLESSING); + break; + case EVENT_OUTRO_REMOVE_ICE: + me->RemoveAurasDueToSpell(SPELL_ICE_LOCK); + SetEquipmentSlots(false, EQUIP_ASHBRINGER_GLOWING); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + me->SetFacing(0.0f, lichKing); + lichKing->AI()->DoAction(ACTION_PLAY_MUSIC); + } + break; + case EVENT_OUTRO_MOVE_1: + me->GetMotionMaster()->MovePoint(POINT_TIRION_OUTRO_1, OutroPosition1); + break; + case EVENT_OUTRO_JUMP: + DoCastAOE(SPELL_JUMP); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_tirion_fordringAI>(creature); + } +}; + +class npc_shambling_horror_icc : public CreatureScript +{ + public: + npc_shambling_horror_icc() : CreatureScript("npc_shambling_horror_icc") { } + + struct npc_shambling_horror_iccAI : public ScriptedAI + { + npc_shambling_horror_iccAI(Creature* creature) : ScriptedAI(creature) + { + _frenzied = false; + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); + _events.ScheduleEvent(EVENT_ENRAGE, urand(11000, 14000)); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (IsHeroic() && me->HealthBelowPctDamaged(20, damage)) + { + _frenzied = true; + DoCast(me, SPELL_FRENZY, true); + } + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SHOCKWAVE: + DoCast(me, SPELL_SHOCKWAVE); + _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); + break; + case EVENT_ENRAGE: + DoCast(me, SPELL_ENRAGE); + _events.ScheduleEvent(EVENT_ENRAGE, urand(20000, 25000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + bool _frenzied; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_shambling_horror_iccAI>(creature); + } +}; + +class npc_raging_spirit : public CreatureScript +{ + public: + npc_raging_spirit() : CreatureScript("npc_raging_spirit") { } + + struct npc_raging_spiritAI : public ScriptedAI + { + npc_raging_spiritAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); + DoCast(me, SPELL_PLAGUE_AVOIDANCE, true); + DoCast(me, SPELL_RAGING_SPIRIT_VISUAL, true); + if (TempSummon* summon = me->ToTempSummon()) + if (Unit* summoner = summon->GetSummoner()) + summoner->CastSpell(me, SPELL_RAGING_SPIRIT_VISUAL_CLONE, true); + DoCast(me, SPELL_BOSS_HITTIN_YA, true); + } + + void IsSummonedBy(Unit* summoner) + { + // player is the spellcaster so register summon manually + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->JustSummoned(me); + } + + void JustDied(Unit* killer) + { + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + if (TempSummon* summon = me->ToTempSummon()) + summon->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SOUL_SHRIEK: + DoCastAOE(SPELL_SOUL_SHRIEK); + _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_raging_spiritAI>(creature); + } +}; + +class npc_valkyr_shadowguard : public CreatureScript +{ + public: + npc_valkyr_shadowguard() : CreatureScript("npc_valkyr_shadowguard") { } + + struct npc_valkyr_shadowguardAI : public ScriptedAI + { + npc_valkyr_shadowguardAI(Creature* creature) : ScriptedAI(creature), + _grabbedPlayer(0), _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + me->SetReactState(REACT_PASSIVE); + DoCast(me, SPELL_WINGS_OF_THE_DAMNED, false); + me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); + } + + void IsSummonedBy(Unit* /*summoner*/) + { + _events.Reset(); + _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (!IsHeroic()) + return; + + if (!me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) + return; + + if (me->HealthBelowPctDamaged(50, damage)) + { + _events.Reset(); + DoCastAOE(SPELL_EJECT_ALL_PASSENGERS); + me->GetMotionMaster()->MoveTargetedHome(); + me->ClearUnitState(UNIT_STAT_EVADE); + } + } + + void JustReachedHome() + { + // schedule siphon life event (heroic only) + DoZoneInCombat(); + _events.Reset(); + _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2000); + } + + void AttackStart(Unit* /*target*/) + { + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (id) + { + case POINT_DROP_PLAYER: + DoCastAOE(SPELL_EJECT_ALL_PASSENGERS); + me->DespawnOrUnsummon(1000); + break; + case POINT_CHARGE: + if (Player* target = ObjectAccessor::GetPlayer(*me, _grabbedPlayer)) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + if (GameObject* platform = ObjectAccessor::GetGameObject(*me, _instance->GetData64(DATA_ARTHAS_PLATFORM))) + { + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, me, NPC_WORLD_TRIGGER, 150.0f); + triggers.remove_if(HeightDifferenceCheck(platform, 5.0f, true)); + if (triggers.empty()) + return; + + triggers.sort(Trinity::ObjectDistanceOrderPred(me)); + DoCast(target, SPELL_VALKYR_CARRY); + _dropPoint.Relocate(triggers.front()); + _events.ScheduleEvent(EVENT_MOVE_TO_DROP_POS, 1500); + + } + } + else + me->DespawnOrUnsummon(); + break; + default: + break; + } + } + + void SetGUID(uint64 guid, int32 /* = 0*/) + { + _grabbedPlayer = guid; + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_GRAB_PLAYER: + 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); + break; + case EVENT_LIFE_SIPHON: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_LIFE_SIPHON); + _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500); + break; + default: + break; + } + } + + // no melee attacks + } + + private: + EventMap _events; + Position _dropPoint; + uint64 _grabbedPlayer; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_valkyr_shadowguardAI>(creature); + } +}; + +class npc_strangulate_vehicle : public CreatureScript +{ + public: + npc_strangulate_vehicle() : CreatureScript("npc_strangulate_vehicle") { } + + struct npc_strangulate_vehicleAI : public ScriptedAI + { + npc_strangulate_vehicleAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void IsSummonedBy(Unit* summoner) + { + me->SetFacing(0.0f, summoner); + DoCast(summoner, SPELL_HARVEST_SOUL_VEHICLE); + _events.Reset(); + _events.ScheduleEvent(EVENT_MOVE_TO_LICH_KING, 2000); + _events.ScheduleEvent(EVENT_TELEPORT, 6000); + + // this will let us easily access all creatures of this entry on heroic mode when its time to teleport back + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->JustSummoned(me); + } + + void DoAction(int32 const action) + { + if (action != ACTION_TELEPORT_BACK) + return; + + if (TempSummon* summ = me->ToTempSummon()) + if (Unit* summoner = summ->GetSummoner()) + DoCast(summoner, SPELL_HARVEST_SOUL_TELEPORT_BACK); + + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_TELEPORT: + me->GetMotionMaster()->MoveIdle(MOTION_SLOT_ACTIVE); + if (TempSummon* summ = me->ToTempSummon()) + { + if (Unit* summoner = summ->GetSummoner()) + { + summoner->CastSpell((Unit*)NULL, SPELL_HARVEST_SOUL_VISUAL, true); + summoner->ExitVehicle(summoner); + if (!IsHeroic()) + summoner->CastSpell(summoner, SPELL_HARVEST_SOUL_TELEPORT, true); + else + { + summoner->CastSpell(summoner, SPELL_HARVEST_SOULS_TELEPORT, true); + summoner->RemoveAurasDueToSpell(HARVEST_SOUL, 0, 0, AURA_REMOVE_BY_EXPIRE); + } + } + } + + _events.ScheduleEvent(EVENT_DESPAWN_SELF, 65000); + break; + case EVENT_MOVE_TO_LICH_KING: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + if (me->GetExactDist(lichKing) > 10.0f) + { + Position pos; + lichKing->GetNearPosition(pos, float(rand_norm()) * 5.0f + 7.5f, lichKing->GetAngle(me)); + me->GetMotionMaster()->MovePoint(0, pos); + } + } + break; + case EVENT_DESPAWN_SELF: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + me->DespawnOrUnsummon(1); + break; + default: + break; + } + } + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_strangulate_vehicleAI>(creature); + } +}; + +class npc_terenas_menethil : public CreatureScript +{ + public: + npc_terenas_menethil() : CreatureScript("npc_terenas_menethil") { } + + struct npc_terenas_menethilAI : public ScriptedAI + { + npc_terenas_menethilAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + bool CanAIAttack(Unit const* target) const + { + return target->GetEntry() != NPC_THE_LICH_KING; + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_FROSTMOURNE_INTRO: + me->setActive(true); + if (!IsHeroic()) + me->SetHealth(me->GetMaxHealth() / 2); + DoCast(me, SPELL_LIGHTS_FAVOR); + _events.Reset(); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_1, 2000, PHASE_FROSTMOURNE); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_2, 11000, PHASE_FROSTMOURNE); + if (!IsHeroic()) + { + _events.ScheduleEvent(EVENT_DESTROY_SOUL, 60000, PHASE_FROSTMOURNE); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_3, 25000); + } + break; + case ACTION_TELEPORT_BACK: + me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOUL, TRIGGERED_NONE); + me->DespawnOrUnsummon(3000); + break; + default: + break; + } + } + + void EnterEvadeMode() + { + // no running back home + if (!me->isAlive()) + return; + + me->DeleteThreatList(); + me->CombatStop(false); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (damage >= me->GetHealth()) + { + damage = me->GetHealth() - 1; + if (!me->HasAura(SPELL_TERENAS_LOSES_INSIDE) && !IsHeroic()) + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + DoCast(SPELL_TERENAS_LOSES_INSIDE); + _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000); + if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) + { + warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, TRIGGERED_NONE); + warden->DespawnOrUnsummon(2000); + } + + me->DespawnOrUnsummon(2000); + } + } + } + + void IsSummonedBy(Unit* /*summoner*/) + { + _events.Reset(); + _events.SetPhase(PHASE_OUTRO); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + me->SetFacing(0.0f, lichKing); + + _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_1, 2000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_2, 14000, 0, PHASE_OUTRO); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_FROSTMOURNE_TALK_1: + Talk(SAY_TERENAS_INTRO_1); + if (IsHeroic()) + DoCastAOE(SPELL_RESTORE_SOULS); + break; + case EVENT_FROSTMOURNE_TALK_2: + Talk(SAY_TERENAS_INTRO_2); + break; + case EVENT_FROSTMOURNE_TALK_3: + Talk(SAY_TERENAS_INTRO_3); + break; + case EVENT_OUTRO_TERENAS_TALK_1: + Talk(SAY_TERENAS_OUTRO_1); + break; + case EVENT_OUTRO_TERENAS_TALK_2: + Talk(SAY_TERENAS_OUTRO_2); + DoCastAOE(SPELL_MASS_RESURRECTION); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + lichKing->AI()->DoAction(ACTION_FINISH_OUTRO); + lichKing->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->AttackStart(lichKing); + } + break; + case EVENT_DESTROY_SOUL: + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) + warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, TRIGGERED_NONE); + DoCast(SPELL_TERENAS_LOSES_INSIDE); + _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000); + break; + case EVENT_TELEPORT_BACK: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->DoAction(ACTION_TELEPORT_BACK); + break; + default: + break; + } + } + + // fighting Spirit Warden + if (me->isInCombat()) + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_terenas_menethilAI>(creature); + } +}; + +class npc_spirit_warden : public CreatureScript +{ + public: + npc_spirit_warden() : CreatureScript("npc_spirit_warden") { } + + struct npc_spirit_wardenAI : public ScriptedAI + { + npc_spirit_wardenAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SOUL_RIP, urand(12000, 15000)); + DoCast(SPELL_DARK_HUNGER); + } + + void JustDied(Unit* /*killer*/) + { + if (Creature* terenas = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TERENAS_MENETHIL))) + terenas->AI()->DoAction(ACTION_TELEPORT_BACK); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SOUL_RIP: + DoCastVictim(SPELL_SOUL_RIP); + _events.ScheduleEvent(EVENT_SOUL_RIP, urand(23000, 27000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_spirit_wardenAI>(creature); + } +}; + +class npc_spirit_bomb : public CreatureScript +{ + public: + npc_spirit_bomb() : CreatureScript("npc_spirit_bomb") { } + + struct npc_spirit_bombAI : public CreatureAI + { + npc_spirit_bombAI(Creature* creature) : CreatureAI(creature) + { + } + + void IsSummonedBy(Unit* summoner) + { + float destX, destY, destZ; + me->GetPosition(destX, destY); + destZ = 1055.0f; // approximation, gets more precise later + me->UpdateGroundPositionZ(destX, destY, destZ); + me->GetMotionMaster()->MovePoint(POINT_GROUND, destX, destY, destZ); + } + + void MovementInform(uint32 type, uint32 point) + { + if (type != POINT_MOTION_TYPE || point != POINT_GROUND) + return; + + me->RemoveAllAuras(); + DoCastAOE(SPELL_EXPLOSION); + me->DespawnOrUnsummon(1000); + } + + void AttackStart(Unit* /*victim*/) + { + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + // no melee attacks + } + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_spirit_bombAI>(creature); + } +}; + +class npc_broken_frostmourne : public CreatureScript +{ + public: + npc_broken_frostmourne() : CreatureScript("npc_broken_frostmourne") { } + + struct npc_broken_frostmourneAI : public CreatureAI + { + npc_broken_frostmourneAI(Creature* creature) : CreatureAI(creature) + { + } + + void Reset() + { + _events.Reset(); + } + + void IsSummonedBy(Unit* summoner) + { + _events.SetPhase(PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO); + } + + void DoAction(int32 const action) + { + if (action == ACTION_SUMMON_TERENAS) + _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_OUTRO_KNOCK_BACK: + DoCastAOE(SPELL_BROKEN_FROSTMOURNE_KNOCK); + break; + case EVENT_OUTRO_SUMMON_TERENAS: + DoCastAOE(SPELL_SUMMON_TERENAS); + break; + default: + break; + } + } + + // no melee attacks + } + + private: + EventMap _events; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_broken_frostmourneAI>(creature); + } +}; + +class spell_the_lich_king_infest : public SpellScriptLoader +{ + public: + spell_the_lich_king_infest() : SpellScriptLoader("spell_the_lich_king_infest") { } + + class spell_the_lich_king_infest_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_infest_AuraScript); + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (GetUnitOwner()->HealthAbovePct(90)) + { + PreventDefaultAction(); + Remove(AURA_REMOVE_BY_ENEMY_SPELL); + } + } + + void OnUpdate(AuraEffect* aurEff) + { + // multiply, starting from 2nd tick + if (aurEff->GetTickNumber() == 1) + return; + + aurEff->SetAmount(int32(aurEff->GetAmount() * 1.15f)); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_infest_AuraScript(); + } +}; + +class spell_the_lich_king_necrotic_plague : public SpellScriptLoader +{ + public: + spell_the_lich_king_necrotic_plague() : SpellScriptLoader("spell_the_lich_king_necrotic_plague") { } + + class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_NECROTIC_PLAGUE_JUMP)) + return false; + return true; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + Unit* newCaster = GetTarget(); + switch (GetTargetApplication()->GetRemoveMode()) + { + case AURA_REMOVE_BY_ENEMY_SPELL: + case AURA_REMOVE_BY_EXPIRE: + case AURA_REMOVE_BY_DEATH: + break; + default: + return; + } + + CustomSpellValues values; + //values.AddSpellMod(SPELLVALUE_AURA_STACK, 2); + values.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_necrotic_plague_AuraScript(); + } +}; + +class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader +{ + public: + spell_the_lich_king_necrotic_plague_jump() : SpellScriptLoader("spell_the_lich_king_necrotic_plague_jump") { } + + class spell_the_lich_king_necrotic_plague_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript); + + bool Load() + { + _hadAura = false; + return true; + } + + void SelectTarget(std::list<Unit*>& targets) + { + targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + if (targets.size() < 2) + return; + + targets.resize(1); + } + + void CheckAura() + { + if (GetHitUnit()->HasAura(GetSpellInfo()->Id)) + _hadAura = true; + } + + void AddMissingStack() + { + if (GetHitAura() && !_hadAura && GetSpellValue()->EffectBasePoints[EFFECT_1] != AURA_REMOVE_BY_ENEMY_SPELL) + GetHitAura()->ModStackAmount(1); + } + + void Register() + { + BeforeHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); + OnHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); + } + + bool _hadAura; + }; + + class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); + + bool Load() + { + _lastAmount = 0; + return true; + } + + void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + caster->GetAI()->SetData(DATA_PLAGUE_STACK, GetStackAmount()); + } + + void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + _lastAmount = aurEff->GetAmount(); + switch (GetTargetApplication()->GetRemoveMode()) + { + case AURA_REMOVE_BY_EXPIRE: + case AURA_REMOVE_BY_DEATH: + break; + default: + return; + } + + CustomSpellValues values; + values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + } + + void OnDispel(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + _lastAmount = aurEff->GetAmount(); + } + + void AfterDispel(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + // this means the stack increased so don't process as if dispelled + if (aurEff->GetAmount() > _lastAmount) + return; + + CustomSpellValues values; + values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + + Remove(AURA_REMOVE_BY_ENEMY_SPELL); + } + + void Register() + { + OnEffectApply += AuraEffectApplyFn(spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::AfterDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + } + + int32 _lastAmount; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_necrotic_plague_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_necrotic_plague_AuraScript(); + } +}; + +class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader +{ + public: + spell_the_lich_king_shadow_trap_visual() : SpellScriptLoader("spell_the_lich_king_shadow_trap_visual") { } + + class spell_the_lich_king_shadow_trap_visual_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_shadow_trap_visual_AuraScript); + + void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes mode) + { + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) + GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_TRAP_AURA, TRIGGERED_NONE); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_shadow_trap_visual_AuraScript(); + } +}; + +class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader +{ + public: + spell_the_lich_king_shadow_trap_periodic() : SpellScriptLoader("spell_the_lich_king_shadow_trap_periodic") { } + + class spell_the_lich_king_shadow_trap_periodic_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic_SpellScript); + + void CheckTargetCount(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_shadow_trap_periodic_SpellScript(); + } +}; + +class spell_the_lich_king_quake : public SpellScriptLoader +{ + public: + spell_the_lich_king_quake() : SpellScriptLoader("spell_the_lich_king_quake") { } + + class spell_the_lich_king_quake_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_quake_SpellScript); + + bool Load() + { + return GetCaster()->GetInstanceScript() != NULL; + } + + void FilterTargets(std::list<Unit*>& unitList) + { + if (GameObject* platform = ObjectAccessor::GetGameObject(*GetCaster(), GetCaster()->GetInstanceScript()->GetData64(DATA_ARTHAS_PLATFORM))) + unitList.remove_if(HeightDifferenceCheck(platform, 5.0f, false)); + } + + void HandleSendEvent(SpellEffIndex /*effIndex*/) + { + if (GetCaster()->IsAIEnabled) + GetCaster()->GetAI()->DoAction(ACTION_START_ATTACK); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHit += SpellEffectFn(spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_quake_SpellScript(); + } +}; + +class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_ice_burst_target_search() : SpellScriptLoader("spell_the_lich_king_ice_burst_target_search") { } + + class spell_the_lich_king_ice_burst_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) + return false; + return true; + } + + void CheckTargetCount(std::list<Unit*>& unitList) + { + if (unitList.empty()) + return; + + // if there is at least one affected target cast the explosion + GetCaster()->CastSpell(GetCaster(), SPELL_ICE_BURST, true); + if (GetCaster()->GetTypeId() == TYPEID_UNIT) + GetCaster()->ToCreature()->DespawnOrUnsummon(500); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_ice_burst_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_raging_spirit : public SpellScriptLoader +{ + public: + spell_the_lich_king_raging_spirit() : SpellScriptLoader("spell_the_lich_king_raging_spirit") { } + + class spell_the_lich_king_raging_spirit_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) + return false; + return true; + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_raging_spirit_SpellScript(); + } +}; + +class ExactDistanceCheck +{ + public: + ExactDistanceCheck(Unit* source, float dist) : _source(source), _dist(dist) {} + + bool operator()(Unit* unit) + { + return _source->GetExactDist2d(unit) > _dist; + } + + private: + Unit* _source; + float _dist; +}; + +class spell_the_lich_king_defile : public SpellScriptLoader +{ + public: + spell_the_lich_king_defile() : SpellScriptLoader("spell_the_lich_king_defile") { } + + class spell_the_lich_king_defile_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_defile_SpellScript); + + void CorrectRange(std::list<Unit*>& targets) + { + targets.remove_if(ExactDistanceCheck(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X))); + } + + void ChangeDamageAndGrow() + { + SetHitDamage(int32(GetHitDamage() * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X))); + // HACK: target player should cast this spell on defile + // however with current aura handling auras cast by different units + // cannot stack on the same aura object increasing the stack count + GetCaster()->CastSpell(GetCaster(), SPELL_DEFILE_GROW, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit += SpellHitFn(spell_the_lich_king_defile_SpellScript::ChangeDamageAndGrow); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_defile_SpellScript(); + } +}; + +class spell_the_lich_king_summon_into_air : public SpellScriptLoader +{ + public: + spell_the_lich_king_summon_into_air() : SpellScriptLoader("spell_the_lich_king_summon_into_air") { } + + class spell_the_lich_king_summon_into_air_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_summon_into_air_SpellScript); + + void ModDestHeight(SpellEffIndex effIndex) + { + static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f}; + WorldLocation* dest = const_cast<WorldLocation*>(GetTargetDest()); + dest->RelocateOffset(offset); + // spirit bombs get higher + if (GetSpellInfo()->Effects[effIndex].MiscValue == NPC_SPIRIT_BOMB) + dest->RelocateOffset(offset); + } + + void Register() + { + OnEffectLaunch += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_summon_into_air_SpellScript(); + } +}; + +class spell_the_lich_king_soul_reaper : public SpellScriptLoader +{ + public: + spell_the_lich_king_soul_reaper() : SpellScriptLoader("spell_the_lich_king_soul_reaper") { } + + class spell_the_lich_king_soul_reaper_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_SOUL_REAPER_BUFF)) + return false; + return true; + } + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (Unit* caster = GetCaster()) + GetTarget()->CastSpell(caster, SPELL_SOUL_REAPER_BUFF, true); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_soul_reaper_AuraScript(); + } +}; + +class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_valkyr_target_search() : SpellScriptLoader("spell_the_lich_king_valkyr_target_search") { } + + class spell_the_lich_king_valkyr_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) + return false; + return true; + } + + bool Load() + { + _target = NULL; + return true; + } + + void SelectTarget(std::list<Unit*>& unitList) + { + if (unitList.empty()) + return; + + unitList.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + if (unitList.empty()) + return; + + _target = SelectRandomContainerElement(unitList); + unitList.clear(); + unitList.push_back(_target); + GetCaster()->GetAI()->SetGUID(_target->GetGUID()); + } + + void ReplaceTarget(std::list<Unit*>& unitList) + { + unitList.clear(); + if (_target) + unitList.push_back(_target); + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetCaster()->CastSpell(GetHitUnit(), SPELL_CHARGE, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_valkyr_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_valkyr_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader +{ + public: + spell_the_lich_king_eject_all_passengers() : SpellScriptLoader("spell_the_lich_king_eject_all_passengers") { } + + class spell_the_lich_king_eject_all_passengers_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_eject_all_passengers_SpellScript); + + bool Load() + { + return GetCaster()->IsVehicle(); + } + + void HandleDummy(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetCaster()->GetVehicleKit()->RemoveAllPassengers(); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_eject_all_passengers_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_eject_all_passengers_SpellScript(); + } +}; + +class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader +{ + public: + spell_the_lich_king_cast_back_to_caster() : SpellScriptLoader("spell_the_lich_king_cast_back_to_caster") { } + + class spell_the_lich_king_cast_back_to_caster_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_cast_back_to_caster_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_cast_back_to_caster_SpellScript(); + } +}; + +class spell_the_lich_king_life_siphon : public SpellScriptLoader +{ + public: + spell_the_lich_king_life_siphon() : SpellScriptLoader("spell_the_lich_king_life_siphon") { } + + class spell_the_lich_king_life_siphon_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) + return false; + return true; + } + + void TriggerHeal() + { + GetHitUnit()->CastCustomSpell(SPELL_LIFE_SIPHON_HEAL, SPELLVALUE_BASE_POINT0, GetHitDamage() * 10, GetCaster(), true); + } + + void Register() + { + AfterHit += SpellHitFn(spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_life_siphon_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirits : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirits() : SpellScriptLoader("spell_the_lich_king_vile_spirits") { } + + class spell_the_lich_king_vile_spirits_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript); + + bool Load() + { + _is25Man = GetUnitOwner()->GetMap()->Is25ManRaid(); + return true; + } + + void OnPeriodic(AuraEffect const* aurEff) + { + if (_is25Man || ((aurEff->GetTickNumber() - 1) % 5)) + GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + + bool _is25Man; + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_vile_spirits_AuraScript(); + } +}; + +class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirits_visual() : SpellScriptLoader("spell_the_lich_king_vile_spirits_visual") { } + + class spell_the_lich_king_vile_spirits_visual_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirits_visual_SpellScript); + + void ModDestHeight(SpellEffIndex /*effIndex*/) + { + Position offset = {0.0f, 0.0f, 15.0f, 0.0f}; + const_cast<WorldLocation*>(GetTargetDest())->RelocateOffset(offset); + } + + void Register() + { + OnEffectLaunch += SpellEffectFn(spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirits_visual_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirit_move_target_search() : SpellScriptLoader("spell_the_lich_king_vile_spirit_move_target_search") { } + + class spell_the_lich_king_vile_spirit_move_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript); + + bool Load() + { + _target = NULL; + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + + void SelectTarget(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + _target = SelectRandomContainerElement(targets); + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + // for this spell, all units are in target map, however it should select one to attack + if (GetHitUnit() != _target) + return; + + GetCaster()->ToCreature()->AI()->AttackStart(GetHitUnit()); + GetCaster()->AddThreat(GetHitUnit(), 100000.0f); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirit_move_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirit_damage_target_search() : SpellScriptLoader("spell_the_lich_king_vile_spirit_damage_target_search") { } + + class spell_the_lich_king_vile_spirit_damage_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript); + + bool Load() + { + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + + void CheckTargetCount(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + // this spell has SPELL_AURA_BLOCK_SPELL_FAMILY so every next cast of this + // searcher spell will be blocked + if (TempSummon* summon = GetCaster()->ToTempSummon()) + if (Unit* summoner = summon->GetSummoner()) + summoner->GetAI()->SetData(DATA_VILE, 1); + GetCaster()->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, true); + GetCaster()->ToCreature()->DespawnOrUnsummon(3000); + GetCaster()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirit_damage_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_harvest_soul : public SpellScriptLoader +{ + public: + spell_the_lich_king_harvest_soul() : SpellScriptLoader("spell_the_lich_king_harvest_soul") { } + + class spell_the_lich_king_harvest_soul_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript); + + bool Load() + { + return GetOwner()->GetInstanceScript() != NULL; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + // m_originalCaster to allow stacking from different casters, meh + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH) + GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_harvest_soul_AuraScript(); + } +}; + +class spell_the_lich_king_lights_favor : public SpellScriptLoader +{ + public: + spell_the_lich_king_lights_favor() : SpellScriptLoader("spell_the_lich_king_lights_favor") { } + + class spell_the_lich_king_lights_favor_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_lights_favor_AuraScript); + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (Unit* caster = GetCaster()) + if (AuraEffect* effect = GetAura()->GetEffect(EFFECT_1)) + effect->RecalculateAmount(caster); + } + + void CalculateBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) + { + canBeRecalculated = true; + amount = 0; + if (Unit* caster = GetCaster()) + amount = int32(caster->GetHealthPct()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_lights_favor_AuraScript(); + } +}; + +class spell_the_lich_king_soul_rip : public SpellScriptLoader +{ + public: + spell_the_lich_king_soul_rip() : SpellScriptLoader("spell_the_lich_king_soul_rip") { } + + class spell_the_lich_king_soul_rip_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_soul_rip_AuraScript); + + void OnPeriodic(AuraEffect const* aurEff) + { + PreventDefaultAction(); + // shouldn't be needed, this is channeled + if (Unit* caster = GetCaster()) + caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_soul_rip_AuraScript(); + } +}; + +class spell_the_lich_king_restore_soul : public SpellScriptLoader +{ + public: + spell_the_lich_king_restore_soul() : SpellScriptLoader("spell_the_lich_king_restore_soul") { } + + class spell_the_lich_king_restore_soul_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript); + + bool Load() + { + _instance = GetCaster()->GetInstanceScript(); + return _instance != NULL; + } + + void HandleScript(SpellEffIndex /*effIndex*/) + { + if (Creature* lichKing = ObjectAccessor::GetCreature(*GetCaster(), _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->DoAction(ACTION_TELEPORT_BACK); + if (Creature* spawner = GetCaster()->FindNearestCreature(NPC_WORLD_TRIGGER_INFINITE_AOI, 50.0f)) + spawner->RemoveAllAuras(); + } + + void RemoveAura() + { + if (Unit* target = GetHitUnit()) + target->RemoveAurasDueToSpell(target->GetMap()->IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT); + } + + void Register() + { + OnEffectHit += SpellEffectFn(spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + BeforeHit += SpellHitFn(spell_the_lich_king_restore_soul_SpellScript::RemoveAura); + } + + InstanceScript* _instance; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_restore_soul_SpellScript(); + } +}; + +class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader +{ + public: + spell_the_lich_king_in_frostmourne_room() : SpellScriptLoader("spell_the_lich_king_in_frostmourne_room") { } + + class spell_the_lich_king_in_frostmourne_room_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript); + + bool Load() + { + return GetOwner()->GetInstanceScript() != NULL; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + // m_originalCaster to allow stacking from different casters, meh + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH) + GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_in_frostmourne_room_AuraScript(); + } +}; + +class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader +{ + public: + spell_the_lich_king_summon_spirit_bomb() : SpellScriptLoader("spell_the_lich_king_summon_spirit_bomb") { } + + class spell_the_lich_king_summon_spirit_bomb_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_summon_spirit_bomb_SpellScript(); + } +}; + +class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader +{ + public: + spell_the_lich_king_trigger_vile_spirit() : SpellScriptLoader("spell_the_lich_king_trigger_vile_spirit") { } + + class spell_the_lich_king_trigger_vile_spirit_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript); + + void TeleportOutside() + { + Creature* target = GetHitCreature(); + if (!target) + return; + + Position dest; + Position offset; + TerenasSpawnHeroic.GetPositionOffsetTo(*target, offset); + GetCaster()->GetPosition(&dest); + dest.RelocateOffset(offset); + target->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); + } + + void Register() + { + OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::TeleportOutside); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_trigger_vile_spirit_SpellScript(); + } +}; + +class spell_the_lich_king_jump : public SpellScriptLoader +{ + public: + spell_the_lich_king_jump() : SpellScriptLoader("spell_the_lich_king_jump") { } + + class spell_the_lich_king_jump_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_jump_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->RemoveAurasDueToSpell(SPELL_RAISE_DEAD); + GetHitUnit()->CastSpell((Unit*)NULL, SPELL_JUMP_2, true); + if (Creature* creature = GetHitCreature()) + creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_jump_SpellScript(); + } +}; + +class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader +{ + public: + spell_the_lich_king_jump_remove_aura() : SpellScriptLoader("spell_the_lich_king_jump_remove_aura") { } + + class spell_the_lich_king_jump_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_jump_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_jump_SpellScript(); + } +}; + +class spell_the_lich_king_play_movie : public SpellScriptLoader +{ + public: + spell_the_lich_king_play_movie() : SpellScriptLoader("spell_the_lich_king_play_movie") { } + + class spell_the_lich_king_play_movie_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_play_movie_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sMovieStore.LookupEntry(MOVIE_FALL_OF_THE_LICH_KING)) + return false; + return true; + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + if (Player* player = GetHitPlayer()) + player->SendMovieStart(MOVIE_FALL_OF_THE_LICH_KING); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_play_movie_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_play_movie_SpellScript(); + } +}; + +class achievement_been_waiting_long_time : public AchievementCriteriaScript +{ + public: + achievement_been_waiting_long_time() : AchievementCriteriaScript("achievement_been_waiting_long_time") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + if (!target) + return false; + + return target->GetAI()->GetData(DATA_PLAGUE_STACK) >= 30; + } +}; + +class achievement_neck_deep_in_vile : public AchievementCriteriaScript +{ + public: + achievement_neck_deep_in_vile() : AchievementCriteriaScript("achievement_neck_deep_in_vile") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + if (!target) + return false; + + return !target->GetAI()->GetData(DATA_VILE); + } +}; + +void AddSC_boss_the_lich_king() +{ + new boss_the_lich_king(); + new npc_tirion_fordring_tft(); + new npc_shambling_horror_icc(); + new npc_raging_spirit(); + new npc_valkyr_shadowguard(); + new npc_strangulate_vehicle(); + new npc_terenas_menethil(); + new npc_spirit_warden(); + new npc_spirit_bomb(); + new npc_broken_frostmourne(); + new spell_the_lich_king_infest(); + new spell_the_lich_king_necrotic_plague(); + new spell_the_lich_king_necrotic_plague_jump(); + new spell_the_lich_king_shadow_trap_visual(); + new spell_the_lich_king_shadow_trap_periodic(); + new spell_the_lich_king_quake(); + new spell_the_lich_king_ice_burst_target_search(); + new spell_the_lich_king_raging_spirit(); + new spell_the_lich_king_defile(); + new spell_the_lich_king_summon_into_air(); + new spell_the_lich_king_soul_reaper(); + new spell_the_lich_king_valkyr_target_search(); + new spell_the_lich_king_eject_all_passengers(); + new spell_the_lich_king_cast_back_to_caster(); + new spell_the_lich_king_life_siphon(); + new spell_the_lich_king_vile_spirits(); + new spell_the_lich_king_vile_spirits_visual(); + new spell_the_lich_king_vile_spirit_move_target_search(); + new spell_the_lich_king_vile_spirit_damage_target_search(); + new spell_the_lich_king_harvest_soul(); + new spell_the_lich_king_lights_favor(); + new spell_the_lich_king_soul_rip(); + new spell_the_lich_king_restore_soul(); + new spell_the_lich_king_in_frostmourne_room(); + new spell_the_lich_king_summon_spirit_bomb(); + new spell_the_lich_king_trigger_vile_spirit(); + new spell_the_lich_king_jump(); + new spell_the_lich_king_jump_remove_aura(); + new spell_trigger_spell_from_caster("spell_the_lich_king_mass_resurrection", SPELL_MASS_RESURRECTION_REAL); + new spell_the_lich_king_play_movie(); + new achievement_been_waiting_long_time(); + new achievement_neck_deep_in_vile(); +} diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 8b2153b2006..5f62c2b5424 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1187,7 +1187,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); if (targets.empty()) return; @@ -1236,7 +1236,7 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader std::list<Creature*> summoners; GetCreatureListWithEntryInGrid(summoners, caster, NPC_WORLD_TRIGGER, 100.0f); - summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + summoners.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); Trinity::RandomResizeList(summoners, 2); if (summoners.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 25e77fb4506..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: @@ -1824,7 +1819,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { // Select valid targets for jump - unitList.remove_if(DeathPlagueTargetSelector(GetCaster())); + unitList.remove_if (DeathPlagueTargetSelector(GetCaster())); if (!unitList.empty()) { Unit* target = SelectRandomContainerElement(unitList); @@ -1917,9 +1912,25 @@ class spell_svalna_revive_champion : public SpellScriptLoader 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.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 26b2546fc50..ece966fcda5 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -28,22 +28,30 @@ uint32 const EncounterCount = 13; uint32 const WeeklyNPCs = 9; uint32 const MaxHeroicAttempts = 50; +// Defined in boss_valithria_dreamwalker.cpp extern Position const ValithriaSpawnPos; // Defined in boss_sindragosa.cpp extern Position const SindragosaSpawnPos; +// Defined in boss_the_lich_king.cpp +extern Position const TerenasSpawn; +extern Position const TerenasSpawnHeroic; +extern Position const SpiritWardenSpawn; // Shared spells used by more than one script enum SharedSpells { - SPELL_BERSERK = 26662, - SPELL_BERSERK2 = 47008, + SPELL_BERSERK = 26662, + SPELL_BERSERK2 = 47008, // Deathbound Ward - SPELL_STONEFORM = 70733, + SPELL_STONEFORM = 70733, // Residue Rendezvous - SPELL_ORANGE_BLIGHT_RESIDUE = 72144, - SPELL_GREEN_BLIGHT_RESIDUE = 72145, + SPELL_ORANGE_BLIGHT_RESIDUE = 72144, + SPELL_GREEN_BLIGHT_RESIDUE = 72145, + + // The Lich King + SPELL_FROSTMOURNE_TELEPORT_VISUAL = 73078, }; enum TeleporterSpells @@ -99,6 +107,9 @@ enum DataTypes DATA_CAPTAIN_RUPERT = 34, DATA_VALITHRIA_TRIGGER = 35, DATA_VALITHRIA_LICH_KING = 36, + DATA_HIGHLORD_TIRION_FORDRING = 37, + DATA_ARTHAS_PLATFORM = 38, + DATA_TERENAS_MENETHIL = 39, }; enum CreaturesIds @@ -247,7 +258,23 @@ enum CreaturesIds // The Lich King NPC_THE_LICH_KING = 36597, + NPC_HIGHLORD_TIRION_FORDRING_LK = 38995, + NPC_TERENAS_MENETHIL_FROSTMOURNE = 36823, + NPC_SPIRIT_WARDEN = 36824, + NPC_TERENAS_MENETHIL_FROSTMOURNE_H = 39217, + NPC_SHAMBLING_HORROR = 37698, + NPC_DRUDGE_GHOUL = 37695, + NPC_ICE_SPHERE = 36633, + NPC_RAGING_SPIRIT = 36701, + NPC_DEFILE = 38757, + NPC_VALKYR_SHADOWGUARD = 36609, + NPC_VILE_SPIRIT = 37799, + NPC_WICKED_SPIRIT = 39190, + NPC_STRANGULATE_VEHICLE = 36598, NPC_WORLD_TRIGGER = 22515, + NPC_WORLD_TRIGGER_INFINITE_AOI = 36171, + NPC_SPIRIT_BOMB = 39189, + NPC_FROSTMOURNE_TRIGGER = 38584, }; enum GameObjectsIds @@ -312,6 +339,20 @@ enum GameObjectsIds GO_ICE_WALL = 202396, GO_ICE_BLOCK = 201722, GO_SIGIL_OF_THE_FROSTWING = 202181, + + // The Lich King + GO_ARTHAS_PLATFORM = 202161, + GO_ARTHAS_PRECIPICE = 202078, + GO_DOODAD_ICECROWN_THRONEFROSTYWIND01 = 202188, + GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01 = 202189, + GO_DOODAD_ICESHARD_STANDING02 = 202141, + GO_DOODAD_ICESHARD_STANDING01 = 202142, + GO_DOODAD_ICESHARD_STANDING03 = 202143, + GO_DOODAD_ICESHARD_STANDING04 = 202144, + GO_DOODAD_ICECROWN_SNOWEDGEWARNING01 = 202190, + GO_FROZEN_LAVAMAN = 202436, + GO_LAVAMAN_PILLARS_CHAINED = 202437, + GO_LAVAMAN_PILLARS_UNCHAINED = 202438, }; enum AchievementCriteriaIds @@ -351,9 +392,6 @@ enum AchievementCriteriaIds enum SharedActions { - // Coldflame Traps - ACTION_STOP_TRAPS = -377440, - // Festergut ACTION_FESTERGUT_COMBAT = -366260, ACTION_FESTERGUT_GAS = -366261, @@ -374,6 +412,10 @@ enum SharedActions // Sindragosa ACTION_START_FROSTWYRM = -368530, ACTION_TRIGGER_ASPHYXIATION = -368531, + + // The Lich King + ACTION_RESTORE_LIGHT = -72262, + ACTION_FROSTMOURNE_INTRO = -36823, }; enum WeekliesICC @@ -399,6 +441,11 @@ enum WorldStatesICC WORLDSTATE_ATTEMPTS_MAX = 4942, }; +enum AreaIds +{ + AREA_THE_FROZEN_THRONE = 4859, +}; + class spell_trigger_spell_from_caster : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 41705ca0e78..a7235e34f3a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -21,8 +21,23 @@ #include "ScriptedCreature.h" #include "Map.h" #include "PoolMgr.h" +#include "AccountMgr.h" #include "icecrown_citadel.h" +enum EventIds +{ + EVENT_QUAKE = 23437, + EVENT_SECOND_REMORSELESS_WINTER = 23507, + EVENT_TELEPORT_TO_FROSMOURNE = 23617, +}; + +enum TimedEvents +{ + EVENT_UPDATE_EXECUTION_TIME = 1, + EVENT_QUAKE_SHATTER = 2, + EVENT_REBUILD_PLATFORM = 3, +}; + DoorData const doorData[] = { {GO_LORD_MARROWGAR_S_ENTRANCE, DATA_LORD_MARROWGAR, DOOR_TYPE_ROOM, BOUNDARY_N }, @@ -50,7 +65,7 @@ DoorData const doorData[] = {GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SE }, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SW }, - {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE},// END + {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // END }; // this doesnt have to only store questgivers, also can be used for related quest spawns @@ -116,6 +131,13 @@ class instance_icecrown_citadel : public InstanceMapScript SpinestalkerGUID = 0; RimefangGUID = 0; TheLichKingGUID = 0; + HighlordTirionFordringGUID = 0; + TerenasMenethilGUID = 0; + ArthasPlatformGUID = 0; + ArthasPrecipiceGUID = 0; + FrozenThroneEdgeGUID = 0; + FrozenThroneWindGUID = 0; + FrozenThroneWarningGUID = 0; FrostwyrmCount = 0; SpinestalkerTrashCount = 0; RimefangTrashCount = 0; @@ -125,7 +147,6 @@ class instance_icecrown_citadel : public InstanceMapScript IsOrbWhispererEligible = true; ColdflameJetsState = NOT_STARTED; BloodQuickeningState = NOT_STARTED; - BloodQuickeningTimer = 0; BloodQuickeningMinutes = 0; } @@ -269,6 +290,13 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_THE_LICH_KING: TheLichKingGUID = creature->GetGUID(); break; + case NPC_HIGHLORD_TIRION_FORDRING_LK: + HighlordTirionFordringGUID = creature->GetGUID(); + break; + case NPC_TERENAS_MENETHIL_FROSTMOURNE: + case NPC_TERENAS_MENETHIL_FROSTMOURNE_H: + TerenasMenethilGUID = creature->GetGUID(); + break; default: break; } @@ -424,6 +452,40 @@ class instance_icecrown_citadel : public InstanceMapScript case GO_DRINK_ME: PutricideTableGUID = go->GetGUID(); break; + case GO_ARTHAS_PLATFORM: + // this enables movement at The Frozen Throne, when printed this value is 0.000000f + // however, when represented as integer client will accept only this value + go->SetUInt32Value(GAMEOBJECT_PARENTROTATION, 5535469); + ArthasPlatformGUID = go->GetGUID(); + break; + case GO_ARTHAS_PRECIPICE: + go->SetUInt32Value(GAMEOBJECT_PARENTROTATION, 4178312); + ArthasPrecipiceGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01: + FrozenThroneEdgeGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01: + FrozenThroneWindGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_SNOWEDGEWARNING01: + FrozenThroneWarningGUID = go->GetGUID(); + break; + case GO_FROZEN_LAVAMAN: + FrozenBolvarGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; + case GO_LAVAMAN_PILLARS_CHAINED: + PillarsChainedGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; + case GO_LAVAMAN_PILLARS_UNCHAINED: + PillarsUnchainedGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; default: break; } @@ -541,6 +603,12 @@ class instance_icecrown_citadel : public InstanceMapScript return RimefangGUID; case DATA_THE_LICH_KING: return TheLichKingGUID; + case DATA_HIGHLORD_TIRION_FORDRING: + return HighlordTirionFordringGUID; + case DATA_ARTHAS_PLATFORM: + return ArthasPlatformGUID; + case DATA_TERENAS_MENETHIL: + return TerenasMenethilGUID; default: break; } @@ -661,6 +729,14 @@ class instance_icecrown_citadel : public InstanceMapScript } break; case DATA_THE_LICH_KING: + { + // set the platform as active object to dramatically increase visibility range + // note: "active" gameobjects do not block grid unloading + if (GameObject* precipice = instance->GetGameObject(ArthasPrecipiceGUID)) + precipice->setActive(state == IN_PROGRESS); + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->setActive(state == IN_PROGRESS); + if (instance->IsHeroic()) { if (state == FAIL && HeroicAttempts) @@ -672,7 +748,18 @@ class instance_icecrown_citadel : public InstanceMapScript theLichKing->DespawnOrUnsummon(); } } + + if (state == DONE) + { + if (GameObject* bolvar = instance->GetGameObject(FrozenBolvarGUID)) + bolvar->SetRespawnTime(7 * DAY); + if (GameObject* pillars = instance->GetGameObject(PillarsChainedGUID)) + pillars->SetRespawnTime(7 * DAY); + if (GameObject* pillars = instance->GetGameObject(PillarsUnchainedGUID)) + pillars->SetRespawnTime(7 * DAY); + } break; + } default: break; } @@ -798,13 +885,13 @@ class instance_icecrown_citadel : public InstanceMapScript switch (data) { case IN_PROGRESS: - BloodQuickeningTimer = 60000; + Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000); BloodQuickeningMinutes = 30; DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); break; case DONE: - BloodQuickeningTimer = 0; + Events.CancelEvent(EVENT_UPDATE_EXECUTION_TIME); BloodQuickeningMinutes = 0; DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); break; @@ -863,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) @@ -1050,32 +1137,103 @@ class instance_icecrown_citadel : public InstanceMapScript void Update(uint32 diff) { - if (BloodQuickeningState == IN_PROGRESS) + if (BloodQuickeningState != IN_PROGRESS && GetBossState(DATA_THE_LICH_KING) != IN_PROGRESS) + return; + + Events.Update(diff); + + while (uint32 eventId = Events.ExecuteEvent()) { - if (BloodQuickeningTimer <= diff) + switch (eventId) { - --BloodQuickeningMinutes; - BloodQuickeningTimer = 60000; - if (BloodQuickeningMinutes) + case EVENT_UPDATE_EXECUTION_TIME: { - DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); - DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); + --BloodQuickeningMinutes; + if (BloodQuickeningMinutes) + { + Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000); + DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); + DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); + } + else + { + BloodQuickeningState = DONE; + DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); + if (Creature* bq = instance->GetCreature(BloodQueenLanaThelGUID)) + bq->AI()->DoAction(ACTION_KILL_MINCHAR); + } + SaveToDB(); + break; } - else + case EVENT_QUAKE_SHATTER: { - BloodQuickeningState = DONE; - DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); - if (Creature* bq = instance->GetCreature(BloodQueenLanaThelGUID)) - bq->AI()->DoAction(ACTION_KILL_MINCHAR); + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED); + if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID)) + edge->SetGoState(GO_STATE_ACTIVE); + if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID)) + wind->SetGoState(GO_STATE_READY); + if (GameObject* warning = instance->GetGameObject(FrozenThroneWarningGUID)) + warning->SetGoState(GO_STATE_READY); + if (Creature* theLichKing = instance->GetCreature(TheLichKingGUID)) + theLichKing->AI()->DoAction(ACTION_RESTORE_LIGHT); + break; } - SaveToDB(); + case EVENT_REBUILD_PLATFORM: + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING); + if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID)) + edge->SetGoState(GO_STATE_READY); + if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID)) + wind->SetGoState(GO_STATE_ACTIVE); + break; + default: + break; } - else - BloodQuickeningTimer -= diff; + } + } + + void ProcessEvent(WorldObject* /*source*/, uint32 eventId) + { + switch (eventId) + { + case EVENT_QUAKE: + if (GameObject* warning = instance->GetGameObject(FrozenThroneWarningGUID)) + warning->SetGoState(GO_STATE_ACTIVE); + Events.ScheduleEvent(EVENT_QUAKE_SHATTER, 5000); + break; + case EVENT_SECOND_REMORSELESS_WINTER: + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + { + platform->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); + Events.ScheduleEvent(EVENT_REBUILD_PLATFORM, 1500); + } + break; + case EVENT_TELEPORT_TO_FROSMOURNE: // Harvest Soul (normal mode) + if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, NULL, 63000)) + { + terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f); + if (!triggers.empty()) + { + triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, false)); + Unit* visual = triggers.front(); + visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true); + } + + if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, NULL, 63000)) + { + terenas->AI()->AttackStart(warden); + warden->AddThreat(terenas, 300000.0f); + } + } + break; } } protected: + EventMap Events; uint64 LadyDeathwisperElevatorGUID; uint64 DeathbringerSaurfangGUID; uint64 DeathbringerSaurfangDoorGUID; @@ -1105,8 +1263,17 @@ class instance_icecrown_citadel : public InstanceMapScript uint64 SpinestalkerGUID; uint64 RimefangGUID; uint64 TheLichKingGUID; + uint64 HighlordTirionFordringGUID; + uint64 TerenasMenethilGUID; + uint64 ArthasPlatformGUID; + uint64 ArthasPrecipiceGUID; + uint64 FrozenThroneEdgeGUID; + uint64 FrozenThroneWindGUID; + uint64 FrozenThroneWarningGUID; + uint64 FrozenBolvarGUID; + uint64 PillarsChainedGUID; + uint64 PillarsUnchainedGUID; uint32 TeamInInstance; - uint32 BloodQuickeningTimer; uint32 ColdflameJetsState; uint32 FrostwyrmCount; uint32 SpinestalkerTrashCount; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index acd47c2e606..c2107e88b2e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -99,7 +99,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustDied(Unit* ) + void JustDied(Unit*) { _JustDied(); @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_IMPALE: //Cast Impale on a random target diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 5bd675ea0ba..0462f669d88 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -197,7 +197,7 @@ public: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->SetSpeed(MOVE_RUN, me->GetSpeedRate(MOVE_RUN), true); - switch(id) + switch (id) { case HORSEMEN_THANE: me->GetMotionMaster()->MovePoint(0, WaypointPositions[0]); @@ -347,7 +347,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MARK: if (!(rand()%5)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index e340e1d213b..1849849d907 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -101,7 +101,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WOUND: DoCast(me->getVictim(), SPELL_MORTAL_WOUND); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 2a93d170318..bbf5b669494 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -278,7 +278,7 @@ class boss_gothik : public CreatureScript } else { - switch(entry) + switch (entry) { case MOB_LIVE_TRAINEE: { @@ -346,7 +346,7 @@ class boss_gothik : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { uint32 spellId = 0; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_LIVE_TRAINEE: spellId = SPELL_INFORM_DEAD_TRAINEE; break; case SPELL_INFORM_LIVE_KNIGHT: spellId = SPELL_INFORM_DEAD_KNIGHT; break; @@ -360,7 +360,7 @@ class boss_gothik : public CreatureScript } } - void DamageTaken(Unit* /*who*/ , uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) { if (!phaseTwo) damage = 0; @@ -371,7 +371,7 @@ class boss_gothik : public CreatureScript if (!me->isInCombat()) return; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_DEAD_TRAINEE: DoSummon(MOB_DEAD_TRAINEE, target, 0); @@ -405,7 +405,7 @@ class boss_gothik : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SUMMON: if (waves[waveCount].entry) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 6bb0675b7fc..3badccd3a80 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -77,7 +77,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CLOUD: DoCastAOE(SPELL_POISON_CLOUD); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index c214141cd32..bb8a0909df4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -132,7 +132,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_DISRUPT: DoCastAOE(SPELL_SPELL_DISRUPTION); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 33122567bad..9c3c9156d63 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -396,7 +396,7 @@ public: { while (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WASTE: DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); @@ -491,7 +491,7 @@ public: if (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BOLT: DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); @@ -540,7 +540,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { - switch(player->getClass()) + switch (player->getClass()) { case CLASS_DRUID: if (urand(0, 1)) @@ -658,16 +658,16 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { 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_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8159765d9e9..6db29be8fbd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -67,7 +67,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_AURA: DoCastAOE(SPELL_NECROTIC_AURA); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 9384eb04bc8..e98b004f9e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -98,7 +98,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WRAP: // TODO : Add missing text diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index ca85034d36f..04627981ef3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CURSE: DoCastAOE(SPELL_CURSE_PLAGUEBRINGER); @@ -178,7 +178,7 @@ public: return; case EVENT_WAVE: DoScriptText(SAY_SUMMON, me); - switch(balconyCount) + switch (balconyCount) { case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 9e87ed06069..10f1b809694 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_HATEFUL: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 0d8c993ffa6..7adc17cc852 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_STRIKE: DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index c39072ae2d1..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(); } @@ -244,7 +244,7 @@ public: { while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(EMOTE_ENRAGE, me); @@ -288,7 +288,7 @@ public: { if (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_LIFTOFF: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); @@ -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 9859cd758df..c2099b1346b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -151,7 +151,7 @@ public: void DoAction(const int32 action) { - switch(action) + switch (action) { case ACTION_FEUGEN_RESET: checkFeugenAlive = true; @@ -229,7 +229,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIFT: DoCastAOE(SPELL_POLARITY_SHIFT); @@ -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 f08e0ccb5cf..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); @@ -169,7 +169,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 15989: SapphironGUID = creature->GetGUID(); return; case 15953: uiFaerlina = creature->GetGUID(); return; @@ -265,7 +265,7 @@ public: void SetData(uint32 id, uint32 value) { - switch(id) + switch (id) { case DATA_HEIGAN_ERUPT: HeiganErupt(value); @@ -316,7 +316,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_FAERLINA: return uiFaerlina; @@ -386,7 +386,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) { - switch(criteria_id) + switch (criteria_id) { case 7600: // Criteria for achievement 2176: And They Would All Go Down Together 15sec of each other 10-man if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 46bf017eb42..282e6b3eb98 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -149,7 +149,7 @@ enum MalygosSays #define MAX_HOVER_DISK_WAYPOINTS 18 -// Sniffed data (x,y,z) +// Sniffed data (x, y,z) const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { {782.9821f, 1296.652f, 282.1114f, 0.0f}, @@ -174,7 +174,7 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define GROUND_Z 268 -// Source: Sniffs (x,y,z) +// Source: Sniffs (x, y,z) #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { @@ -1049,7 +1049,7 @@ public: { MakePlayerEnter(); _entered = true; - } else + } else _timer -= diff; } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 88fe98e8370..0568bb13a8e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -162,7 +162,7 @@ class boss_anomalus : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT , me); + DoScriptText(SAY_RIFT, me); } } 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 30fd0695a9f..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]; @@ -151,7 +151,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAGUS_TELESTRA_EVENT: return m_auiEncounter[0]; case DATA_ANOMALUS_EVENT: return m_auiEncounter[1]; @@ -218,7 +218,7 @@ public: uint64 GetData64(uint32 uiIdentifier) { - switch(uiIdentifier) + switch (uiIdentifier) { case DATA_ANOMALUS: return Anomalus; case DATA_KERISTRASZA: return Keristrasza; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index da8a6552ed3..df606f61d57 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -65,7 +65,7 @@ enum Actions ACTION_SET_NORMAL_EVENTS = 1 }; -/*Ruby Drake , +/*Ruby Drake, (npc 27756) (item 37860) (summoned by spell Ruby Essence = 37860 ---> Call Amber Drake == 49462 ---> Summon 27756) */ diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 88eda112e52..16c258af756 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -175,7 +175,7 @@ public: void SetPosition(uint8 i) { - switch(i) + switch (i) { case 0: x = me->GetPositionX() + 4; @@ -276,8 +276,8 @@ public: if (timeBombTimer <= uiDiff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit, SPELL_TIME_BOMB); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(unit, SPELL_TIME_BOMB); timeBombTimer = urand(20000, 25000); } else timeBombTimer -= uiDiff; @@ -300,7 +300,7 @@ public: void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) { - switch(pSpell->Id) + switch (pSpell->Id) { case SPELL_SUMMON_MENAGERIE: me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 14acfbec03d..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() { @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_DRAKOS: drakosGUID = creature->GetGUID(); @@ -170,7 +170,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: platformUrom = data; @@ -180,7 +180,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: return platformUrom; // used by condition system @@ -192,7 +192,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_DRAKOS: return drakosGUID; case DATA_VAROS: return varosGUID; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 765a7674823..f8839aa0028 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -58,10 +58,10 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_VERDISA: //Verdisa - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -91,7 +91,7 @@ public: } break; case NPC_BELGARISTRASZ: //Belgaristrasz - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -121,7 +121,7 @@ public: } break; case NPC_ETERNOS: //Eternos - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index b44ab3820fc..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,14 +187,14 @@ 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 void DoRemoveStanceAura(uint8 uiStance) { - switch(uiStance) + switch (uiStance) { case STANCE_DEFENSIVE: me->RemoveAurasDueToSpell(SPELL_DEFENSIVE_STANCE); @@ -230,7 +230,7 @@ public: m_uiStance = uiTempStance; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: DoScriptText(SAY_DEFENSIVE_STANCE, me); @@ -258,7 +258,7 @@ public: else m_uiChangeStance_Timer -= uiDiff; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: { @@ -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 04b09da1ca2..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; @@ -204,7 +204,7 @@ public: // Health check if (HealthBelowPct(100 - 25 * m_uiHealthAmountModifier)) { - switch(m_uiHealthAmountModifier) + switch (m_uiHealthAmountModifier) { case 1: DoScriptText(SAY_75HEALTH, me); break; case 2: DoScriptText(SAY_50HEALTH, me); break; 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 0fefb28e9ab..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]; @@ -78,7 +78,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BJARNGRIM: m_uiGeneralBjarngrimGUID = creature->GetGUID(); @@ -97,7 +97,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_BJARNGRIM_DOOR: m_uiBjarngrimDoorGUID = go->GetGUID(); @@ -135,7 +135,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: if (uiData == DONE) @@ -175,7 +175,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: return m_auiEncounter[0]; @@ -191,7 +191,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_BJARNGRIM: return m_uiGeneralBjarngrimGUID; 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 044c01b6687..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,16 +339,16 @@ 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(); } void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 7: if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) @@ -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); @@ -380,7 +380,7 @@ public: void SpawnDwarf(uint32 uiType) { - switch(uiType) + switch (uiType) { case 1: { @@ -439,14 +439,14 @@ public: { if (uiPhaseTimer <= uiDiff) { - switch(uiStep) + 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 9285d852404..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; @@ -91,7 +91,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_MAIDEN: uiMaidenOfGrief = creature->GetGUID(); break; case CREATURE_KRYSTALLUS: uiKrystallus = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ABEDNEUM: uiAbedneumGo = go->GetGUID(); @@ -154,7 +154,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; @@ -187,7 +187,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRYSTALLUS_EVENT: return m_auiEncounter[0]; case DATA_MAIDEN_OF_GRIEF_EVENT: return m_auiEncounter[1]; @@ -200,7 +200,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAIDEN_OF_GRIEF: return uiMaidenOfGrief; case DATA_KRYSTALLUS: return uiKrystallus; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 244c6a579a2..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; } @@ -229,7 +229,7 @@ public: { if (uiPhase_timer <= diff) { - switch(uiStep) + switch (uiStep) { case 1: DoScriptText(SAY_SUMMON_1, me); @@ -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_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 828cf65beec..2e2ca25385c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -653,7 +653,7 @@ class boss_stormcaller_brundir : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(SAY_BRUNDIR_BERSERK, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 685870d6d44..bcc417c50cd 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -121,7 +121,7 @@ class boss_auriaya : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); events.ScheduleEvent(EVENT_BLAST, urand(20000, 25000)); @@ -332,8 +332,8 @@ class npc_sanctum_sentry : public CreatureScript void Reset() { - events.ScheduleEvent(EVENT_RIP, urand(4000,8000)); - events.ScheduleEvent(EVENT_POUNCE, urand(12000,15000)); + events.ScheduleEvent(EVENT_RIP, urand(4000, 8000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000)); } void EnterCombat(Unit* /*who*/) @@ -366,7 +366,7 @@ class npc_sanctum_sentry : public CreatureScript me->AI()->AttackStart(target); DoCast(target, SPELL_SAVAGE_POUNCE); } - events.ScheduleEvent(EVENT_POUNCE, urand(12000,17000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 17000)); break; default: break; @@ -492,7 +492,7 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(SanctumSentryCheck()); + unitList.remove_if (SanctumSentryCheck()); } void Register() @@ -518,7 +518,7 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() 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 aa9516d479f..ec336d3402c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -541,9 +541,6 @@ class boss_flame_leviathan : public CreatureScript //! I also removed the spellInfo check void DoBatteringRamIfReady() { - if (me->HasUnitState(UNIT_STAT_CASTING)) - return; - if (me->isAttackReady()) { Unit* target = ObjectAccessor::GetUnit(*me, _pursueTarget); @@ -655,7 +652,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if(CanAIAttack(target)) + if (CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); NapalmTimer = 5000; @@ -1658,12 +1655,32 @@ 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())); if (targets.empty()) + { if (Creature* caster = GetCaster()->ToCreature()) caster->AI()->EnterEvadeMode(); + } + else + { + //! In the end, only one target should be selected + _target = SelectRandomContainerElement(targets); + FilterTargetsSubsequently(targets); + } + } + + void FilterTargetsSubsequently(std::list<Unit*>& targets) + { + targets.clear(); + targets.push_back(_target); } void HandleScript(SpellEffIndex /*eff*/) @@ -1673,7 +1690,7 @@ class spell_pursue : public SpellScriptLoader return; caster->AI()->AttackStart(GetHitUnit()); // Chase target - + for (SeatMap::const_iterator itr = caster->GetVehicleKit()->Seats.begin(); itr != caster->GetVehicleKit()->Seats.end(); ++itr) { if (IS_PLAYER_GUID(itr->second.Passenger)) @@ -1687,8 +1704,11 @@ class spell_pursue : public SpellScriptLoader void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_pursue_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } + + Unit* _target; }; SpellScript* GetSpellScript() const diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 761eed86382..86ea898e6ee 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -373,7 +373,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); @@ -381,17 +381,19 @@ class boss_freya : public CreatureScript } } - if (Elder[0]->isAlive()) + if (Elder[0] && Elder[0]->isAlive()) { Elder[0]->CastSpell(me, SPELL_BRIGHTLEAF_ESSENCE, true); events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(10000, 20000)); } - if (Elder[1]->isAlive()) + + if (Elder[1] && Elder[1]->isAlive()) { Elder[1]->CastSpell(me, SPELL_STONEBARK_ESSENCE, true); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(10000, 20000)); } - if (Elder[2]->isAlive()) + + if (Elder[2] && Elder[2]->isAlive()) { Elder[2]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(10000, 20000)); @@ -625,6 +627,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()) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 2331cc9a68c..b8876ae577a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -398,9 +398,9 @@ class npc_scorch_ground : public CreatureScript { if (_heat) { - if(_heatTimer <= uiDiff) + if (_heatTimer <= uiDiff) { - Creature* construct = me->GetCreature(*me , _constructGUID); + Creature* construct = me->GetCreature(*me, _constructGUID); if (construct && !construct->HasAura(SPELL_MOLTEN)) { me->AddAura(SPELL_HEAT, construct); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index bdabaddfcf9..5da1c485986 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -270,7 +270,7 @@ class boss_kologarn : public CreatureScript break; case EVENT_STONE_SHOUT: DoCast(SPELL_STONE_SHOUT); - events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); break; case EVENT_ENRAGE: DoCast(SPELL_BERSERK); @@ -352,7 +352,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit* , bool> +class StoneGripTargetSelector : public std::unary_function<Unit*, bool> { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} @@ -391,7 +391,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { // Remove "main tank" and non-player targets - unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + unitList.remove_if (StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); // Maximum affected targets per difficulty mode uint32 maxTargets = 1; if (GetSpellInfo()->Id == 63981) @@ -601,7 +601,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index c58f2a24b9c..ae803b24642 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -947,7 +947,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 251a18e98f2..3c5697a7995 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -23,7 +23,7 @@ static DoorData const doorData[] = { { GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, - { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, + { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, }; @@ -69,7 +69,6 @@ class instance_ulduar : public InstanceMapScript uint64 ThorimChestGUID; uint64 HodirRareCacheGUID; uint64 HodirChestGUID; - uint64 FreyaChestGUID; uint64 HodirDoorGUID; uint64 HodirIceDoorGUID; uint64 ArchivumDoorGUID; @@ -104,11 +103,9 @@ class instance_ulduar : public InstanceMapScript AlgalonGUID = 0; KologarnChestGUID = 0; KologarnBridgeGUID = 0; - KologarnChestGUID = 0; ThorimChestGUID = 0; HodirRareCacheGUID = 0; HodirChestGUID = 0; - FreyaChestGUID = 0; LeviathanGateGUID = 0; VezaxDoorGUID = 0; HodirDoorGUID = 0; @@ -303,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; @@ -424,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) @@ -467,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 cff57563843..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, @@ -169,7 +167,7 @@ enum UlduarData { // Collosus (Leviathan) DATA_COLOSSUS = 20, - + // Razorscale DATA_EXPEDITION_COMMANDER, DATA_RAZORSCALE_CONTROL, 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 4e6a6fb72c5..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,26 +298,26 @@ 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; void Reset() { me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); - me->SetSpeed(MOVE_SWIM , 1.0f); - me->SetSpeed(MOVE_RUN , 1.0f); - me->SetSpeed(MOVE_WALK , 1.0f); - //me->SetSpeed(MOVE_FLIGHT , 1.0f); + me->SetSpeed(MOVE_SWIM, 1.0f); + me->SetSpeed(MOVE_RUN, 1.0f); + me->SetSpeed(MOVE_WALK, 1.0f); + //me->SetSpeed(MOVE_FLIGHT, 1.0f); 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 639ff4e07d3..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) @@ -219,11 +219,11 @@ public: DoScriptText(SAY_SKELETONS, me); for (uint8 i = 0; i < 5; ++i) { - Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1], SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (Skeleton) { Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); + Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); Skeleton->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Skeleton); } @@ -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 b8e595a3452..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; @@ -124,7 +124,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23953: Keleseth = creature->GetGUID(); break; case 24201: Dalronn = creature->GetGUID(); break; @@ -135,7 +135,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_PRINCEKELESETH: return Keleseth; case DATA_DALRONN: return Dalronn; @@ -178,7 +178,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: m_auiEncounter[0] = data; @@ -246,7 +246,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: return m_auiEncounter[0]; case DATA_SKARVALD_DALRONN_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index cbdb1743e3e..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) + 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) + 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,22 +94,22 @@ public: void EnterCombat(Unit* /*who*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); - if (pInstance) + if (instance) { - switch(fm_Type) + 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; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index c93b9c7bda6..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; @@ -780,13 +780,13 @@ public: if (currentPhase<5&¤tPhase >= 0) { Creature* pNext = NULL; - switch(currentPhase) + 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; } @@ -811,13 +811,13 @@ public: if (id > 4) return; Creature* pNext = NULL; - switch(id) + 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 325dd67443f..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; @@ -286,7 +286,7 @@ public: Phase = SKADI; me->SetFlying(false); me->Unmount(); - if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(0); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -304,7 +304,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case FLYING: if (!UpdateVictim()) @@ -340,7 +340,7 @@ public: if (m_uiMovementTimer <= diff) { - switch(m_uiWaypointId) + switch (m_uiWaypointId) { case 0: me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); @@ -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 e021936fcc4..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,13 +213,13 @@ 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); - switch(m_uiActiveOrder[m_uiActivedNumber]) + 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; case 1: m_bIsActiveWithHALDOR = 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 2eff50c1f8e..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; @@ -104,7 +104,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = creature->GetGUID(); break; case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = creature->GetGUID(); break; @@ -121,7 +121,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_SKADI_THE_RUTHLESS_DOOR: uiSkadiTheRuthlessDoor = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: m_auiEncounter[0] = data; @@ -176,7 +176,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0]; case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1]; @@ -188,7 +188,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave; case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 1e17103d23d..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) @@ -168,6 +168,9 @@ class achievement_defenseless : public AchievementCriteriaScript bool OnCheck(Player* /*player*/, Unit* target) { + if(!target) + return false; + InstanceScript* instance = target->GetInstanceScript(); if (!instance) return false; 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 562a5930535..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); } } @@ -157,7 +157,7 @@ public: if (!me->isAlive()) return; - switch(param) + switch (param) { case ACTION_WATER_ELEMENT_HIT: me->ModifyHealth(int32(me->CountPctFromMaxHealth(1))); @@ -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,11 +367,11 @@ 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)) + if (me->IsWithinDist(pIchoron, 2.0f, false)) { if (pIchoron->AI()) pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_HIT); @@ -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 1af9063a71b..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); @@ -99,7 +99,7 @@ public: void DespawnSphere() { std::list<Creature*> assistList; - GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE , 150.0f); + GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE, 150.0f); if (assistList.empty()) return; @@ -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 318876d79e7..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); } } @@ -137,8 +137,8 @@ public: if (SpellVoidShiftTimer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_VOID_SHIFT); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_VOID_SHIFT); SpellVoidShiftTimer = 20000; } else SpellVoidShiftTimer -=diff; @@ -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 b6e40f21c6e..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; @@ -228,7 +228,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_XEVOZZ: uiXevozz = creature->GetGUID(); @@ -273,7 +273,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_EREKEM_GUARD_1_DOOR: uiErekemLeftGuardCell = go->GetGUID(); @@ -311,7 +311,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, CREATURE_EREKEM, NULL); @@ -354,13 +354,13 @@ public: NpcAtDoorCastingList.push_back(data); break; case DATA_NPC_PRESENCE_AT_DOOR_REMOVE: - if(!NpcAtDoorCastingList.empty()) + if (!NpcAtDoorCastingList.empty()) NpcAtDoorCastingList.pop_back(); break; case DATA_MAIN_DOOR: if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor)) { - switch(data) + switch (data) { case GO_STATE_ACTIVE: pMainDoor->SetGoState(GO_STATE_ACTIVE); @@ -375,7 +375,7 @@ public: } break; case DATA_START_BOSS_ENCOUNTER: - switch(uiWaveCount) + switch (uiWaveCount) { case 6: StartBossEncounter(uiFirstBoss); @@ -404,7 +404,7 @@ public: void SetData64(uint32 type, uint64 data) { - switch(type) + switch (type) { case DATA_ADD_TRASH_MOB: trashMobs.insert(data); @@ -417,7 +417,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: return m_auiEncounter[0]; case DATA_2ND_BOSS_EVENT: return m_auiEncounter[1]; @@ -438,7 +438,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MORAGG: return uiMoragg; case DATA_EREKEM: return uiErekem; @@ -470,7 +470,7 @@ public: { SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1, 5))%6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) - if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -478,7 +478,7 @@ public: { Creature* pBoss = NULL; - switch(uiBoss) + switch (uiBoss) { case BOSS_MORAGG: HandleGameObject(uiMoraggCell, bForceRespawn); @@ -565,14 +565,14 @@ public: DoUpdateWorldState(WORLD_STATE_VH, 1); DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 6: if (uiFirstBoss == 0) uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -586,7 +586,7 @@ public: } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -733,7 +733,7 @@ public: { if (uiCyanigosaEventTimer <= diff) { - switch(uiCyanigosaEventPhase) + switch (uiCyanigosaEventPhase) { case 1: pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false); @@ -766,9 +766,9 @@ public: if (GetData(DATA_NPC_PRESENCE_AT_DOOR) && uiMainEventPhase == IN_PROGRESS) { // if door integrity is > 0 then decrase it's integrity state - if(GetData(DATA_DOOR_INTEGRITY)) + if (GetData(DATA_DOOR_INTEGRITY)) { - if(uiDoorSpellTimer < diff) + if (uiDoorSpellTimer < diff) { SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 819681e1ef2..801ab408685 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -256,13 +256,13 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { 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; @@ -347,7 +347,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_SINCLARI_1, me); @@ -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); @@ -449,30 +449,30 @@ public: void WaypointReached(uint32 uiWPointId) { - switch(uiBoss) + switch (uiBoss) { case 1: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 2: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 3: - if(uiWPointId == 1) + if (uiWPointId == 1) FinishPointReached(); break; case 4: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 5: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 6: - if(uiWPointId == 4) + if (uiWPointId == 4) FinishPointReached(); break; } @@ -480,28 +480,28 @@ 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); - if(!bHasGotMovingPoints) + if (!bHasGotMovingPoints) { bHasGotMovingPoints = true; - switch(uiBoss) + switch (uiBoss) { case 1: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos1[i][0], SaboteurFinalPos1[i][1], SaboteurFinalPos1[i][2], 0); me->SetHomePosition(SaboteurFinalPos1[2][0], SaboteurFinalPos1[2][1], SaboteurFinalPos1[2][2], 4.762346f); break; case 2: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos2[i][0], SaboteurFinalPos2[i][1], SaboteurFinalPos2[i][2], 0); me->SetHomePosition(SaboteurFinalPos2[2][0], SaboteurFinalPos2[2][1], SaboteurFinalPos2[2][2], 1.862674f); break; case 3: - for(int i=0;i<2;i++) + for (int i=0;i<2;i++) AddWaypoint(i, SaboteurFinalPos3[i][0], SaboteurFinalPos3[i][1], SaboteurFinalPos3[i][2], 0); me->SetHomePosition(SaboteurFinalPos3[1][0], SaboteurFinalPos3[1][1], SaboteurFinalPos3[1][2], 5.500638f); break; @@ -514,7 +514,7 @@ public: me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: - for(int i=0;i<5;i++) + for (int i=0;i<5;i++) AddWaypoint(i, SaboteurFinalPos6[i][0], SaboteurFinalPos6[i][1], SaboteurFinalPos6[i][2], 0); me->SetHomePosition(SaboteurFinalPos6[4][0], SaboteurFinalPos6[4][1], SaboteurFinalPos6[4][2], 0.983031f); break; @@ -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,20 +577,20 @@ 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; - switch(uiTypeOfMobsPortal) + switch (uiTypeOfMobsPortal) { // spawn elite mobs and then set portals visibility to make it look like it dissapeard case 0: @@ -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,22 +677,22 @@ 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; void WaypointReached(uint32 uiPointId) { - switch(portalLocationID) + switch (portalLocationID) { case 0: if (uiPointId == 5) @@ -723,52 +723,52 @@ 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) { bHasGotMovingPoints = true; - switch(portalLocationID) + switch (portalLocationID) { case 0: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FirstPortalWPs[i][0]+irand(-1, 1), FirstPortalWPs[i][1]+irand(-1, 1), FirstPortalWPs[i][2]+irand(-1, 1), 0); me->SetHomePosition(FirstPortalWPs[5][0], FirstPortalWPs[5][1], FirstPortalWPs[5][2], 3.149439f); break; case 1: secondPortalRouteID = urand(0, 1); - switch(secondPortalRouteID) + switch (secondPortalRouteID) { case 0: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, SecondPortalFirstWPs[i][0]+irand(-1, 1), SecondPortalFirstWPs[i][1]+irand(-1, 1), SecondPortalFirstWPs[i][2], 0); me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1, 1), SecondPortalFirstWPs[8][1]+irand(-1, 1), SecondPortalFirstWPs[8][2]+irand(-1, 1), 3.149439f); break; case 1: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, SecondPortalSecondWPs[i][0]+irand(-1, 1), SecondPortalSecondWPs[i][1]+irand(-1, 1), SecondPortalSecondWPs[i][2], 0); me->SetHomePosition(SecondPortalSecondWPs[7][0], SecondPortalSecondWPs[7][1], SecondPortalSecondWPs[7][2], 3.149439f); break; } break; case 2: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, ThirdPortalWPs[i][0]+irand(-1, 1), ThirdPortalWPs[i][1]+irand(-1, 1), ThirdPortalWPs[i][2], 0); me->SetHomePosition(ThirdPortalWPs[7][0], ThirdPortalWPs[7][1], ThirdPortalWPs[7][2], 3.149439f); break; case 3: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, FourthPortalWPs[i][0]+irand(-1, 1), FourthPortalWPs[i][1]+irand(-1, 1), FourthPortalWPs[i][2], 0); me->SetHomePosition(FourthPortalWPs[8][0], FourthPortalWPs[8][1], FourthPortalWPs[8][2], 3.149439f); break; case 4: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FifthPortalWPs[i][0]+irand(-1, 1), FifthPortalWPs[i][1]+irand(-1, 1), FifthPortalWPs[i][2], 0); me->SetHomePosition(FifthPortalWPs[5][0], FifthPortalWPs[5][1], FifthPortalWPs[5][2], 3.149439f); break; case 5: - for(int i=0;i<4;i++) + for (int i=0;i<4;i++) AddWaypoint(i, SixthPoralWPs[i][0]+irand(-1, 1), SixthPoralWPs[i][1]+irand(-1, 1), SixthPoralWPs[i][2], 0); me->SetHomePosition(SixthPoralWPs[3][0], SixthPoralWPs[3][1], SixthPoralWPs[3][2], 3.149439f); break; @@ -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 5c7dc9abfda..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); @@ -739,7 +739,7 @@ public: { if (IntroTimer <= diff) { - switch(IntroPhase) + switch (IntroPhase) { case 1: //DoScriptText(SAY_WP_1_LUR_START, me); @@ -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())) @@ -1021,7 +1021,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 3: SetEscortPaused(true); @@ -1706,12 +1706,12 @@ public: { } - void SpellHit(Unit* pUnit, const SpellInfo* pSpell) + void SpellHit(Unit* unit, const SpellInfo* pSpell) { - if (pSpell->Id == SPELL_NEURAL_NEEDLE && pUnit->GetTypeId() == TYPEID_PLAYER) + if (pSpell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) { ++uiPhase; - CasterGUID = pUnit->GetGUID(); + CasterGUID = unit->GetGUID(); } } @@ -1861,7 +1861,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 10: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); @@ -1962,7 +1962,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 29: if (player) @@ -2282,7 +2282,7 @@ public: std::list<Creature*> orbList; GetCreatureListWithEntryInGrid(orbList, me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_WARMAGE_HOLLISTER: { @@ -2440,10 +2440,10 @@ public: { if (uiEventTimer && uiEventTimer <= uiDiff) { - switch(uiEventPhase) + switch (uiEventPhase) { case 1: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); @@ -2464,7 +2464,7 @@ public: } break; case 2: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: DoScriptText(SAY_HIDDEN_CULTIST_4, me); @@ -2510,7 +2510,7 @@ public: uint32 uiGossipText = 0; const char* charGossipItem; - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TOM_HEGGER: uiGossipText = GOSSIP_TEXT_TOM_HEGGER; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index d7b90fc4a44..6ed452857aa 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -68,7 +68,7 @@ public: if (player->GetQuestStatus(QUEST_CHILDREN_OF_URSOC) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_BEAR_GODS_OFFSPRING) == QUEST_STATUS_INCOMPLETE) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ORSONN: if (!player->GetReqKillOrCastCurrentCount(QUEST_CHILDREN_OF_URSOC, NPC_ORSONN_CREDIT) || !player->GetReqKillOrCastCurrentCount(QUEST_THE_BEAR_GODS_OFFSPRING, NPC_ORSONN_CREDIT)) @@ -96,7 +96,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -351,7 +351,7 @@ public: { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { - switch(Who->GetEntry()) + switch (Who->GetEntry()) { case NPC_HUNGRY_WORG: DoScriptText(SAY_WORGHAGGRO2, Emily); @@ -481,6 +481,7 @@ public: } m_uiPhase = 0; } + DoMeleeAttackIfReady(); } }; @@ -527,7 +528,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_LOOT); @@ -601,7 +602,7 @@ public: { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); - if(me->IsStandState()) + if (me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else { diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1fceeb0303d..f76ac69ab7a 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -102,7 +102,7 @@ public: Player* player = GetPlayerForEscort(); if (!player) return; - switch(i) + switch (i) { case 1: me->SetReactState(REACT_AGGRESSIVE); @@ -306,7 +306,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -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/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 9ca2a2a5349..27054b5755a 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -78,7 +78,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -311,7 +311,7 @@ public: uiCast = true; Creature* target = NULL; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_PRIESTESS_ALORAH: target = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); @@ -399,7 +399,7 @@ public: struct npc_vereth_the_cunningAI : public ScriptedAI { - npc_vereth_the_cunningAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_vereth_the_cunningAI(Creature* creature) : ScriptedAI(creature) {} void MoveInLineOfSight(Unit* who) { @@ -413,7 +413,7 @@ public: { owner->ToPlayer()->KilledMonsterCredit(NPC_GEIST_RETURN_BUNNY_KC, 0); who->ToCreature()->DisappearAndDie(); - + } } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 54d54d5a493..269ff05090e 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -36,7 +36,7 @@ class npc_four_car_garage : public CreatureScript { uint32 spellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_DEMOLISHER: spellId = SPELL_DRIVING_CREDIT_DEMOLISHER; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index dc0b3c0e032..b3f1fb1b8b0 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -77,7 +77,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: SetRun(); break; case 10: @@ -210,7 +210,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VEKJIK_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -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/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index fdd9c626ac1..687f7945e4c 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -507,12 +507,12 @@ public: player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if( creature->isTrainer() ) + if ( creature->isTrainer() ) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if( creature->isVendor() ) - if(player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) + if ( creature->isVendor() ) + if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -522,7 +522,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRAIN: player->GetSession()->SendTrainerList(creature->GetGUID()); @@ -769,7 +769,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript else _accessoryRespawnTimer -= diff; } - + private: uint32 _accessoryRespawnTimer; Vehicle* _vehicleKit; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 6667a7751e1..5dab265617e 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -371,10 +371,10 @@ public: bRemoveFlag = true; me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - switch(uiId) + switch (uiId) { case 1: - switch(uiValue) + switch (uiValue) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: DoScriptText(SAY_QUEST_ACCEPT_TUSKARRMAGEDON, me); @@ -425,7 +425,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* summon = me->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) @@ -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; } @@ -656,7 +656,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP , me); + DoScriptText(SAY_CALL_FOR_HELP, me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) @@ -669,7 +669,7 @@ public: void JustSummoned(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case NPC_WHISKER: summon->AI()->AttackStart(me->getVictim()); @@ -743,7 +743,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 6: me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); @@ -839,12 +839,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -937,7 +937,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 7: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -961,12 +961,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -1083,15 +1083,15 @@ public: } - void EnterCombat(Unit* pUnit) + void EnterCombat(Unit* unit) { 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(pUnit); + temp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :( + temp->AI()->AttackStart(unit); } } } @@ -1106,12 +1106,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -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); @@ -1316,7 +1316,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: // say random text diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 2cfedc14b14..b78811ce6a0 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -120,11 +120,11 @@ void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_EWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_EWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_EWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_EWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_EWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_EWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_EWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* player) @@ -269,11 +269,11 @@ void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_NPT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_NPT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_NPT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_NPT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_NPT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_NPT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_NPT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* player) @@ -319,7 +319,7 @@ OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP* pvp) void OPvPCapturePointEP_CGT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) + if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, 0); @@ -401,11 +401,11 @@ void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_CGT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_CGT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_CGT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_CGT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_CGT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_CGT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_CGT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* player) @@ -540,11 +540,11 @@ void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_PWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_PWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_PWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_PWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_PWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_PWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_PWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* player) @@ -579,7 +579,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); - if(c) + if (c) { GossipOption gso; gso.Action = GOSSIP_OPTION_OUTDOORPVP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 343027a02c8..a868e46b890 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -166,7 +166,7 @@ void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointHP::ChangeState() { uint32 field = 0; - switch(m_OldState) + switch (m_OldState) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -205,7 +205,7 @@ void OPvPCapturePointHP::ChangeState() } uint32 artkit = 21; uint32 artkit2 = HP_TowerArtKit_N[m_TowerType]; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -282,7 +282,7 @@ void OPvPCapturePointHP::SendChangePhase() void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data) { - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: case OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 17a5e9940be..c081f0970f2 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -46,7 +46,7 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() uint32 cnt = 0; for (std::map<uint32, uint64>::iterator itr = m_Creatures.begin(); itr != m_Creatures.end(); ++itr) { - switch(itr->first) + switch (itr->first) { case NA_NPC_GUARD_01: case NA_NPC_GUARD_02: @@ -335,7 +335,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO std::vector<uint32> nodes; nodes.resize(2); bool retval = false; - switch(spellId) + switch (spellId) { case NA_SPELL_FLY_NORTH: nodes[0] = FlightPathStartNodes[NA_ROOST_N]; @@ -423,7 +423,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, uint64 guid) int32 add = -1; int32 add2 = -1; - switch(retval) + switch (retval) { case NA_DESTROYED_ROOST_S: del = NA_DESTROYED_ROOST_S; @@ -569,7 +569,7 @@ bool OPvPCapturePointNA::Update(uint32 diff) void OPvPCapturePointNA::ChangeState() { uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: m_HalaaState = HALAA_N; @@ -621,16 +621,16 @@ void OPvPCapturePointNA::SendChangePhase() void OPvPCapturePointNA::UpdateHalaaWorldState() { - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL , uint32(bool(m_HalaaState & HALAA_N))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A , uint32(bool(m_HalaaState & HALAA_N_A))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H , uint32(bool(m_HalaaState & HALAA_N_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE , uint32(bool(m_HalaaState & HALAA_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE , uint32(bool(m_HalaaState & HALAA_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, uint32(bool(m_HalaaState & HALAA_N))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, uint32(bool(m_HalaaState & HALAA_N_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, uint32(bool(m_HalaaState & HALAA_N_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE, uint32(bool(m_HalaaState & HALAA_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, uint32(bool(m_HalaaState & HALAA_A))); } void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) { - switch(roost) + switch (roost) { case NA_ROOST_S: m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 88a820f4492..7727f761588 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -83,7 +83,7 @@ void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, uint32 zone) bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) { - switch(trigger) + switch (trigger) { case SI_AREATRIGGER_A: if (player->GetTeam() == ALLIANCE && player->HasAura(SI_SILITHYST_FLAG)) @@ -144,7 +144,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) if (spellId == SI_SILITHYST_FLAG) { // if it was dropped away from the player's turn-in point, then create a silithyst mound, if it was dropped near the areatrigger, then it was dispelled by the outdoorpvp, so do nothing - switch(player->GetTeam()) + switch (player->GetTeam()) { case ALLIANCE: { @@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) delete go; return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask() , player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 6b9c0500fc4..56895951665 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -287,7 +287,7 @@ void OPvPCapturePointTF::ChangeState() uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 2866a341903..7d15f1edc40 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -88,7 +88,7 @@ void OPvPCapturePointZM_Beacon::ChangeState() sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { @@ -294,7 +294,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) return; m_BothControllingFaction = controlling_faction; - switch(controlling_faction) + switch (controlling_faction) { case ALLIANCE: // if ally already controls the gy and taken back both beacons, return, nothing to do for us @@ -376,7 +376,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, uint64 gui bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spellId) { - switch(spellId) + switch (spellId) { case ZM_BATTLE_STANDARD_A: m_FlagCarrierGUID = 0; 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 55aca9695cd..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; @@ -74,7 +74,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_IKISSDOOREVENT: if (data == DONE) 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 3288c1336e9..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; @@ -82,7 +82,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case REFECTORY_DOOR: m_uiRefectoryDoorGUID = go->GetGUID(); @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18732: m_uiGrandmasterVorpil = creature->GetGUID(); @@ -116,7 +116,7 @@ public: void SetData(uint32 type, uint32 uiData) { - switch(type) + switch (type) { case TYPE_HELLMAW: m_auiEncounter[0] = uiData; @@ -179,7 +179,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HELLMAW: return m_auiEncounter[0]; case TYPE_OVERSEER: return m_auiEncounter[1]; 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 66ef35f7400..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); } @@ -185,14 +185,14 @@ public: void RevertThreatOnTarget(uint64 guid) { - Unit* pUnit = NULL; - pUnit = Unit::GetUnit((*me), guid); - if (pUnit) + Unit* unit = NULL; + unit = Unit::GetUnit((*me), guid); + if (unit) { - if (DoGetThreat(pUnit)) - DoModifyThreatPercent(pUnit, -100); + if (DoGetThreat(unit)) + DoModifyThreatPercent(unit, -100); if (TargetThreat) - me->AddThreat(pUnit, TargetThreat); + me->AddThreat(unit, TargetThreat); } } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 308a6de4f0c..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; @@ -545,19 +545,19 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* ) {} + void MoveInLineOfSight(Unit*) {} void JustDied(Unit* /*killer*/) { 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) @@ -635,7 +635,7 @@ public: void EnterPhase(PhaseIllidan NextPhase) { DoZoneInCombat(); - switch(NextPhase) + switch (NextPhase) { case PHASE_NORMAL: case PHASE_NORMAL_2: @@ -790,7 +790,7 @@ public: void HandleFlightSequence() { - switch(FlightCount) + switch (FlightCount) { case 1://lift off me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); @@ -915,7 +915,7 @@ public: SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - switch(TransformCount) + switch (TransformCount) { case 2: DoResetThreat(); @@ -959,7 +959,7 @@ public: } } - switch(Phase) + switch (Phase) { case PHASE_NORMAL: if (HealthBelowPct(65)) @@ -999,7 +999,7 @@ public: if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || (Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED))) { - switch(Event) + switch (Event) { //PHASE_NORMAL case EVENT_BERSERK: @@ -1073,7 +1073,7 @@ public: if (Phase == PHASE_FLIGHT) { - switch(Event) + switch (Event) { case EVENT_FIREBALL: DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL); @@ -1106,7 +1106,7 @@ public: if (Phase == PHASE_DEMON) { - switch(Event) + switch (Event) { case EVENT_SHADOW_BLAST: me->GetMotionMaster()->Clear(false); @@ -1219,7 +1219,7 @@ public: void EnterPhase(PhaseIllidan NextPhase)//This is in fact Illidan's phase. { - switch(NextPhase) + switch (NextPhase) { case PHASE_TALK_SEQUENCE: if (Timer[EVENT_MAIEV_STEALTH]) @@ -1298,7 +1298,7 @@ public: else Timer[i] -= diff; } - switch(Event) + switch (Event) { case EVENT_MAIEV_STEALTH: { @@ -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 @@ -1474,9 +1474,9 @@ public: std::vector<Unit*> eliteList; for (std::list<HostileReference*>::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->GetEntry() == ILLIDARI_ELITE) - eliteList.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->GetEntry() == ILLIDARI_ELITE) + eliteList.push_back(unit); } for (std::vector<Unit*>::const_iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr) (*itr)->setDeathState(JUST_DIED); @@ -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,9 +1539,9 @@ public: void EnterPhase(PhaseAkama NextPhase) { - if (!pInstance) + if (!instance) return; - switch(NextPhase) + switch (NextPhase) { case PHASE_CHANNEL: BeginChannel(); @@ -1603,7 +1603,7 @@ public: void HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: if (GETCRE(Illidan, IllidanGUID)) @@ -1638,7 +1638,7 @@ public: return; } - switch(ChannelCount) + switch (ChannelCount) { case 0: // channel failed me->InterruptNonMeleeSpells(true); @@ -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: @@ -1686,12 +1686,12 @@ public: void HandleWalkSequence() { - switch(WalkCount) + switch (WalkCount) { 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; @@ -1734,7 +1734,7 @@ public: if (Event) { - switch(Phase) + switch (Phase) { case PHASE_CHANNEL: if (JustCreated) @@ -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) { @@ -1872,7 +1872,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* summon) { Summons.Summon(summon); - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case PARASITIC_SHADOWFIEND: { @@ -1918,7 +1918,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -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 9311e1e6744..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); } @@ -165,12 +165,12 @@ public: float Z = TeleportPoint[random].z; for (uint8 i = 0; i < 3; ++i) { - Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) { - TargetGUID[i] = pUnit->GetGUID(); - pUnit->CastSpell(pUnit, SPELL_TELEPORT_VISUAL, true); - DoTeleportPlayer(pUnit, X, Y, Z, pUnit->GetOrientation()); + TargetGUID[i] = unit->GetGUID(); + unit->CastSpell(unit, SPELL_TELEPORT_VISUAL, true); + DoTeleportPlayer(unit, X, Y, Z, unit->GetOrientation()); } } } @@ -196,7 +196,7 @@ public: BeamTimer = 9000; - switch(CurrentBeam) + switch (CurrentBeam) { case 0: DoCast(target, SPELL_BEAM_SINISTER); @@ -247,12 +247,12 @@ public: { for (uint8 i = 0; i < 3; ++i) { - Unit* pUnit = NULL; + Unit* unit = NULL; if (TargetGUID[i]) { - pUnit = Unit::GetUnit((*me), TargetGUID[i]); - if (pUnit) - pUnit->CastSpell(pUnit, SPELL_ATTRACTION, true); + unit = Unit::GetUnit((*me), TargetGUID[i]); + if (unit) + unit->CastSpell(unit, SPELL_ATTRACTION, true); TargetGUID[i] = 0; } } 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 813deacf7a2..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; @@ -216,20 +216,20 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit) + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit) { - DoModifyThreatPercent(pUnit, -100); - float threat = target->getThreatManager().getThreat(pUnit); - me->AddThreat(pUnit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). + DoModifyThreatPercent(unit, -100); + float threat = target->getThreatManager().getThreat(unit); + me->AddThreat(unit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). } } } void JustDied(Unit* /*killer*/) { - if (pInstance) - pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); + if (instance) + instance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); } void UpdateAI(const uint32 diff) @@ -256,7 +256,7 @@ public: if (Timer <= diff) { - switch(Counter) + switch (Counter) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); // I R ANNNGRRRY! @@ -438,9 +438,9 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) // Only alive players - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) // Only alive players + targets.push_back(unit); } if (targets.empty()) return; // No targets added for some reason. No point continuing. 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 852f69597b9..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()); @@ -673,7 +673,7 @@ public: if (type != POINT_MOTION_TYPE) return; - switch(id) + switch (id) { case 0: ++WayPointId; break; @@ -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; } @@ -803,7 +803,7 @@ public: { if (SoulRetrieveTimer <= diff) { - switch(EndingTalkCount) + switch (EndingTalkCount) { case 0: me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); @@ -821,14 +821,14 @@ public: { bool Yelled = false; for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature(*me, *itr)) + if (Creature* unit = Unit::GetCreature(*me, *itr)) { if (!Yelled) { - DoScriptText(SAY_BROKEN_FREE_01, pUnit); + DoScriptText(SAY_BROKEN_FREE_01, unit); Yelled = true; } - pUnit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); + unit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); } } ++EndingTalkCount; @@ -838,9 +838,9 @@ public: if (!BrokenList.empty()) { for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature(*me, *itr)) + if (Creature* unit = Unit::GetCreature(*me, *itr)) // This is the incorrect spell, but can't seem to find the right one. - pUnit->CastSpell(pUnit, 39656, true); + unit->CastSpell(unit, 39656, true); } ++EndingTalkCount; SoulRetrieveTimer = 5000; @@ -849,8 +849,8 @@ public: if (!BrokenList.empty()) { for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature((*me), *itr)) - pUnit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); + if (Creature* unit = Unit::GetCreature((*me), *itr)) + unit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); } SoulRetrieveTimer = 0; break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index ce4d7745a68..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(); } @@ -177,13 +177,13 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && me->IsWithinMeleeRange(pUnit)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && me->IsWithinMeleeRange(unit)) { - if (pUnit->GetHealth() > health) + if (unit->GetHealth() > health) { - health = pUnit->GetHealth(); - target = pUnit; + health = unit->GetHealth(); + target = unit; } } } @@ -200,7 +200,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 0d3301ec29b..074bb16e7a0 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -173,9 +173,9 @@ public: std::list<Unit*> targets; for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive()) + targets.push_back(unit); } targets.sort(Trinity::ObjectDistanceOrderPred(me)); Unit* target = targets.front(); @@ -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); } @@ -322,11 +322,11 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && unit->isAlive()) { - float threat = DoGetThreat(pUnit); - Blossom->AddThreat(pUnit, threat); + float threat = DoGetThreat(unit); + Blossom->AddThreat(unit, threat); } } } @@ -389,9 +389,9 @@ public: Done = true; if (AggroTargetGUID) { - Unit* pUnit = Unit::GetUnit((*me), AggroTargetGUID); - if (pUnit) - AttackStart(pUnit); + Unit* unit = Unit::GetUnit((*me), AggroTargetGUID); + if (unit) + AttackStart(unit); DoZoneInCombat(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 080d26b7c49..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(); @@ -154,7 +154,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIELD: DoCast(me, SPELL_TIDAL_SHIELD, true); @@ -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 7d698559197..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); } @@ -419,10 +419,10 @@ struct boss_illidari_councilAI : public ScriptedAI { for (uint8 i = 0; i < 4; ++i) { - if (Unit* pUnit = Unit::GetUnit(*me, Council[i])) - if (pUnit != me && pUnit->getVictim()) + if (Unit* unit = Unit::GetUnit(*me, Council[i])) + if (unit != me && unit->getVictim()) { - AttackStart(pUnit->getVictim()); + AttackStart(unit->getVictim()); return; } } @@ -437,27 +437,27 @@ struct boss_illidari_councilAI : public ScriptedAI damage /= 4; for (uint8 i = 0; i < 4; ++i) { - if (Creature* pUnit = Unit::GetCreature(*me, Council[i])) - if (pUnit != me && damage < pUnit->GetHealth()) + if (Creature* unit = Unit::GetCreature(*me, Council[i])) + if (unit != me && damage < unit->GetHealth()) { - pUnit->ModifyHealth(-int32(damage)); - pUnit->LowerPlayerDamageReq(damage); + unit->ModifyHealth(-int32(damage)); + unit->LowerPlayerDamageReq(damage); } } } 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; } @@ -504,15 +504,15 @@ public: Unit* SelectCouncilMember() { - Unit* pUnit = me; + Unit* unit = me; uint32 member = 0; // He chooses Lady Malande most often if (rand()%10 == 0) // But there is a chance he picks someone else. member = urand(1, 3); if (member != 2) // No need to create another pointer to us using Unit::GetUnit - pUnit = Unit::GetUnit((*me), Council[member]); - return pUnit; + unit = Unit::GetUnit((*me), Council[member]); + return unit; } void CastAuraOnCouncil() @@ -525,9 +525,9 @@ public: } for (uint8 i = 0; i < 4; ++i) { - Unit* pUnit = Unit::GetUnit((*me), Council[i]); - if (pUnit) - pUnit->CastSpell(pUnit, spellid, true, 0, 0, me->GetGUID()); + Unit* unit = Unit::GetUnit((*me), Council[i]); + if (unit) + unit->CastSpell(unit, spellid, true, 0, 0, me->GetGUID()); } } @@ -538,12 +538,12 @@ public: if (BlessingTimer <= diff) { - if (Unit* pUnit = SelectCouncilMember()) + if (Unit* unit = SelectCouncilMember()) { switch (urand(0, 1)) { - case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD); break; - case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break; + case 0: DoCast(unit, SPELL_BLESS_SPELLWARD); break; + case 1: DoCast(unit, SPELL_BLESS_PROTECTION); break; } } BlessingTimer = 60000; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 4feca05c111..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; @@ -142,7 +142,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 22887: Najentus = creature->GetGUID(); break; case 23089: Akama = creature->GetGUID(); break; @@ -161,7 +161,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; @@ -190,7 +190,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_HIGHWARLORDNAJENTUS: return Najentus; case DATA_AKAMA: return Akama; @@ -216,7 +216,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: if (data == DONE) @@ -298,7 +298,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: return m_auiEncounter[0]; case DATA_SUPREMUSEVENT: return m_auiEncounter[1]; 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 1433859dfe1..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; @@ -707,15 +707,15 @@ public: if (Heal_Timer <= diff) { // It can be cast on any of the mobs - Unit* pUnit = NULL; + Unit* unit = NULL; - while (pUnit == NULL || !pUnit->isAlive()) + while (unit == NULL || !unit->isAlive()) { - pUnit = selectAdvisorUnit(); + unit = selectAdvisorUnit(); } - if (pUnit && pUnit->isAlive()) - DoCast(pUnit, SPELL_HEAL); + if (unit && unit->isAlive()) + DoCast(unit, SPELL_HEAL); Heal_Timer = 60000; } else Heal_Timer -= diff; @@ -724,26 +724,26 @@ public: Unit* selectAdvisorUnit() { - Unit* pUnit = NULL; - if (pInstance) + Unit* unit = NULL; + if (instance) { - switch(rand()%4) + switch (rand()%4) { case 0: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESS)); break; case 1: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_SHARKKIS)); break; case 2: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); + unit = Unit::GetUnit((*me), instance->GetData64(DATA_TIDALVESS)); break; case 3: - pUnit = me; + unit = me; break; } - } else pUnit = me; - return pUnit; + } else unit = me; + return unit; } }; }; 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 0f27d5e7a9d..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(); } @@ -307,7 +307,7 @@ public: { uint32 mark_spell = 0; - switch(MarkOfHydross_Count) + switch (MarkOfHydross_Count) { case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; 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 817c38fef2e..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 @@ -884,7 +884,7 @@ public: }; //Coilfang Strider -//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. +//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds, for 5 seconds and increasing their movement speed by 150% during the fear. class mob_coilfang_strider : public CreatureScript { public: @@ -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,23 +976,23 @@ 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()) { uint32 identifier; uint8 channel_identifier; - switch(gObj->GetEntry()) + switch (gObj->GetEntry()) { case 185052: identifier = DATA_SHIELDGENERATOR1; @@ -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 f3da63af38b..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 @@ -96,9 +96,9 @@ public: } void JustDied(Unit* /*victim*/) { - Unit* pUnit = Unit::GetUnit((*me), victimGUID); - if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) - pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); + Unit* unit = Unit::GetUnit((*me), victimGUID); + if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER)) + unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } void DamageTaken(Unit* done_by, uint32 &damage) @@ -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(); @@ -353,13 +353,13 @@ public: { if (InnderDemon[i] > 0) { - Creature* pUnit = Unit::GetCreature((*me), InnderDemon[i]); - if (pUnit && pUnit->isAlive()) + Creature* unit = Unit::GetCreature((*me), InnderDemon[i]); + if (unit && unit->isAlive()) { - Unit* unit_target = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demon::mob_inner_demonAI, pUnit->AI())->victimGUID); + Unit* unit_target = Unit::GetUnit(*unit, CAST_AI(mob_inner_demon::mob_inner_demonAI, unit->AI())->victimGUID); if (unit_target && unit_target->isAlive()) { - pUnit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); + unit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); DoModifyThreatPercent(unit_target, -100); } } @@ -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 a30b46c2346..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*/) @@ -157,7 +157,7 @@ public: void ApplyWateryGrave(Unit* player, uint8 i) { - switch(i) + switch (i) { case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break; case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break; 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 88496899bb1..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]; @@ -108,7 +108,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17797: ThespiaGUID = creature->GetGUID(); break; case 17796: MekgineerGUID = creature->GetGUID(); break; @@ -118,7 +118,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case MAIN_CHAMBERS_DOOR: MainChambersDoor = go->GetGUID(); break; case ACCESS_PANEL_HYDRO: AccessPanelHydro = go->GetGUID(); break; @@ -128,7 +128,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: if (data == SPECIAL) @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: return m_auiEncounter[0]; @@ -184,7 +184,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THESPIA: return ThespiaGUID; 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 79b6be51d5c..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]; @@ -84,7 +84,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18835: KigglerTheCrazed = creature->GetGUID(); break; case 18836: BlindeyeTheSeer = creature->GetGUID(); break; @@ -96,7 +96,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 184468: MaulgarDoor = go->GetGUID(); @@ -117,7 +117,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAULGAREVENT_TANK: return MaulgarEvent_Tank; case DATA_KIGGLERTHECRAZED: return KigglerTheCrazed; @@ -133,7 +133,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: if (data == DONE) HandleGameObject(MaulgarDoor, true); @@ -150,7 +150,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: return m_auiEncounter[0]; case DATA_GRUULEVENT: return m_auiEncounter[1]; 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 8c15bbace2d..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; @@ -92,7 +92,7 @@ class instance_blood_furnace : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17381: The_MakerGUID = creature->GetGUID(); @@ -141,7 +141,7 @@ class instance_blood_furnace : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THE_MAKER: return The_MakerGUID; case DATA_BROGGOK: return BroggokGUID; @@ -167,7 +167,7 @@ class instance_blood_furnace : public InstanceMapScript void SetData(uint32 /*type*/, uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: m_auiEncounter[0] = data; break; case TYPE_BROGGOK_EVENT: m_auiEncounter[1] = data; break; @@ -190,7 +190,7 @@ class instance_blood_furnace : public InstanceMapScript uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: return m_auiEncounter[0]; case TYPE_BROGGOK_EVENT: return m_auiEncounter[1]; @@ -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/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 6661bf2ee15..1fd1094494d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -397,7 +397,7 @@ class boss_vazruden_the_herald : public CreatureScript void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case 0: // circle around the platform return; 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 ba6969acc2c..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; @@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185168: m_uiChestNGUID = go->GetGUID(); @@ -68,7 +68,7 @@ class instance_ramparts : public InstanceMapScript { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData); - switch(uiType) + switch (uiType) { case TYPE_VAZRUDEN: if (uiData == DONE && m_auiEncounter[1] == DONE && !spawned) @@ -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 0c346f68422..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) { } @@ -86,7 +86,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17257: MagtheridonGUID = creature->GetGUID(); @@ -99,7 +99,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 181713: go->SetUInt32Value(GAMEOBJECT_FLAGS, 0); @@ -121,7 +121,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_MAGTHERIDON: return MagtheridonGUID; @@ -131,7 +131,7 @@ class instance_magtheridons_lair : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAGTHERIDON_EVENT: m_auiEncounter[0] = data; @@ -141,7 +141,7 @@ class instance_magtheridons_lair : public InstanceMapScript HandleGameObject(DoorGUID, true); break; case DATA_CHANNELER_EVENT: - switch(data) + switch (data) { case NOT_STARTED: // Reset all channelers once one is reset. if (m_auiEncounter[1] != NOT_STARTED) @@ -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 5d7d7883ce0..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) @@ -281,7 +281,7 @@ class boss_warbringer_omrogg : public CreatureScript Unit* source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); - switch(ikilling) + switch (ikilling) { case 0: DoScriptText(Killing[ikilling].id, source); @@ -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/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 5b91bb8e9e6..4f837870612 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -115,7 +115,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case MOB_HEARTHEN_GUARD: case MOB_SHARPSHOOTER_GUARD: 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 3fb98f8b17e..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; @@ -55,7 +55,7 @@ class instance_shattered_halls : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case DOOR_NETHEKURSE: nethekurseDoorGUID = go->GetGUID(); @@ -65,7 +65,7 @@ class instance_shattered_halls : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 16807: nethekurseGUID = creature->GetGUID(); @@ -75,7 +75,7 @@ class instance_shattered_halls : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: m_auiEncounter[0] = data; @@ -88,7 +88,7 @@ class instance_shattered_halls : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: return m_auiEncounter[0]; @@ -100,7 +100,7 @@ class instance_shattered_halls : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_NETHEKURSE: return 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 37404b348db..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) @@ -246,7 +246,7 @@ class boss_alar : public CreatureScript AfterMoving = false; } - switch(WaitEvent) + switch (WaitEvent) { case WE_PLATFORM: Platforms_Move_Timer = 30000+rand()%5000; @@ -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 7b7c8c5e478..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; @@ -129,10 +129,9 @@ class boss_high_astromancer_solarian : public CreatureScript AppearDelay = false; Wrath_Timer = 20000+rand()%5000;//twice in phase one Phase = 1; - Wrath_Timer = 20000+rand()%5000;//twice in phase one - 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); @@ -153,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*/) @@ -162,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) @@ -419,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; @@ -450,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 592c2a1190d..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) { @@ -477,7 +477,7 @@ class boss_kaelthas : public CreatureScript Creature* Advisor = NULL; //Subphase switch - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 - Start case 0: @@ -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(); @@ -770,8 +770,8 @@ class boss_kaelthas : public CreatureScript if (FlameStrike_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_FLAME_STRIKE); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_FLAME_STRIKE); FlameStrike_Timer = 30000; } @@ -784,7 +784,7 @@ class boss_kaelthas : public CreatureScript for (uint32 i = 0; i < 3; ++i) { sLog->outDebug(LOG_FILTER_TSCR, "SD2: Kael'Thas mind control not supported."); - //DoCast(pUnit, SPELL_MIND_CONTROL); + //DoCast(unit, SPELL_MIND_CONTROL); } MindControl_Timer = 60000; @@ -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; @@ -892,11 +892,11 @@ class boss_kaelthas : public CreatureScript // 1) Kael'thas will portal the whole raid right into his body for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { //Use work around packet to prevent player from being dropped from combat - DoTeleportPlayer(pUnit, afGravityPos[0], afGravityPos[1], afGravityPos[2], pUnit->GetOrientation()); + DoTeleportPlayer(unit, afGravityPos[0], afGravityPos[1], afGravityPos[2], unit->GetOrientation()); } } @@ -913,20 +913,20 @@ class boss_kaelthas : public CreatureScript // 2) At that point he will put a Gravity Lapse debuff on everyone for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid())) { - DoCast(pUnit, SPELL_KNOCKBACK, true); + DoCast(unit, SPELL_KNOCKBACK, true); //Gravity lapse - needs an exception in Spell system to work - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); //Using packet workaround WorldPacket data(12); data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } GravityLapse_Timer = 10000; @@ -946,14 +946,14 @@ class boss_kaelthas : public CreatureScript //Remove flight for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid())) { //Using packet workaround WorldPacket data(12); data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } @@ -982,8 +982,8 @@ class boss_kaelthas : public CreatureScript //NetherBeam_Timer if (NetherBeam_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_NETHER_BEAM); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_NETHER_BEAM); NetherBeam_Timer = 4000; } @@ -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); } @@ -1286,12 +1286,12 @@ class boss_grand_astromancer_capernian : public CreatureScript std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); //if in melee range - if (pUnit && pUnit->IsWithinDistInMap(me, 5)) + if (unit && unit->IsWithinDistInMap(me, 5)) { InMeleeRange = true; - target = pUnit; + target = unit; break; } } @@ -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 8af59582a18..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; @@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 20064: ThaladredTheDarkener = creature->GetGUID(); @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; case DATA_LORDSANGUINAR: return LordSanguinar; @@ -128,7 +128,7 @@ class instance_the_eye : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALAREVENT: AlarEventPhase = data; @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ALAREVENT: return AlarEventPhase; case DATA_HIGHASTROMANCERSOLARIANEVENT: return m_auiEncounter[1]; @@ -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 e2a12c350b6..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]; @@ -58,7 +58,7 @@ class instance_mechanar : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: return m_auiEncounter[0]; } @@ -73,16 +73,16 @@ class instance_mechanar : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: m_auiEncounter[0] = data; break; } } }; - 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 adf71c8a25b..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();*/ } @@ -146,7 +146,7 @@ class npc_millhouse_manastorm : public CreatureScript { if (Phase < 8) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(SAY_INTRO_1, me); @@ -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,32 +366,32 @@ class npc_warden_mellichar : public CreatureScript void DoPrepareForPhase() { - if (pInstance) + if (instance) { me->InterruptNonMeleeSpells(true); me->RemoveAurasByType(SPELL_AURA_DUMMY); - switch(Phase) + switch (Phase) { 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; @@ -420,7 +420,7 @@ class npc_warden_mellichar : public CreatureScript if (Phase != 7) DoCast(me, SPELL_TARGET_OMEGA); - switch(Phase) + switch (Phase) { case 2: switch (urand(0, 1)) @@ -471,7 +471,7 @@ class npc_warden_mellichar : public CreatureScript } if (CanProgress()) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(YELL_INTRO2, me); 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 f3310035f8d..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,27 +158,27 @@ class boss_harbinger_skyriss : public CreatureScript { if (!Intro) { - if (!pInstance) + if (!instance) return; if (Intro_Timer <= diff) { - switch(Intro_Phase) + switch (Intro_Phase) { 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 eef84ad093e..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]; @@ -100,7 +100,7 @@ class instance_arcatraz : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_AlphaGUID = go->GetGUID(); break; case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_BetaGUID = go->GetGUID(); break; @@ -122,7 +122,7 @@ class instance_arcatraz : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_ZEREKETH: m_auiEncounter[0] = data; @@ -204,7 +204,7 @@ class instance_arcatraz : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HARBINGERSKYRISS: return m_auiEncounter[3]; case TYPE_WARDEN_1: return m_auiEncounter[4]; @@ -218,7 +218,7 @@ class instance_arcatraz : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_MELLICHAR: return MellicharGUID; case DATA_SPHERE_SHIELD: return GoSphereGUID; @@ -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/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index e130512f08c..64fea1c41e5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -93,7 +93,7 @@ class boss_high_botanist_freywinn : public CreatureScript void DoSummonSeedling() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_PLANT_WHITE); break; case 1: DoCast(me, SPELL_PLANT_GREEN); break; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 872421f7561..43078c48537 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -86,7 +86,7 @@ class boss_laj : public CreatureScript void DoTransform() { - switch(rand()%5) + switch (rand()%5) { case 0: me->SetDisplayId(MODEL_DEFAULT); @@ -133,7 +133,7 @@ class boss_laj : public CreatureScript void DoSummons() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_SUMMON_LASHER_1, true); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 1acc75981e0..2bf4abbcb96 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -101,7 +101,7 @@ class mob_warp_splinter_treant : public CreatureScript if (me->IsWithinMeleeRange(Warp, 2.5f)) { int32 CurrentHP_Treant = (int32)me->GetHealth(); - Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID()); + Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0, 0, me->GetGUID()); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; } diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 8ea12b48a07..f94a7d2725c 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -194,7 +194,7 @@ public: { if (NihilSpeech_Timer <= diff) { - switch(NihilSpeech_Phase) + switch (NihilSpeech_Phase) { case 0: DoScriptText(SAY_NIHIL_1, me); @@ -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; @@ -452,7 +452,7 @@ public: { npc_bloodmaul_brutebaneAI(Creature* creature) : ScriptedAI(creature) { - if(Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) + if (Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) { Ogre->SetReactState(REACT_DEFENSIVE); Ogre->GetMotionMaster()->MovePoint(1, me->GetPositionX()-1, me->GetPositionY()+1, me->GetPositionZ()); @@ -503,7 +503,8 @@ public: if (me->IsWithinDistInMap(who, 50.0f)) { if (who->GetTypeId() == TYPEID_PLAYER) - if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED || QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) + if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED) == QUEST_STATUS_INCOMPLETE + || who->ToPlayer()->GetQuestStatus(QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) PlayerGUID = who->GetGUID(); } } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index defc3cf90f6..2f725e78666 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -113,9 +113,9 @@ class boss_doomlord_kazzak : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_VOLLEY: DoCastVictim(SPELL_SHADOWVOLLEY); diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 8143ac528b5..5cb84eb1303 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -106,9 +106,9 @@ class boss_doomwalker : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ENRAGE: if (!HealthAbovePct(20)) diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 430754c10d6..e28e1c3c685 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -183,7 +183,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(EMOTE_WOLF_LIFT_HEAD, me); @@ -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; } @@ -277,7 +277,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -334,7 +334,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index ad30ab32e92..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); @@ -613,13 +613,13 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { 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 5843787b1be..5f2626c0039 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -117,7 +117,7 @@ public: Unit* p = Unit::GetUnit((*me), someplayer); if (p && p->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: CAST_PLR(p)->FailQuest(10299); @@ -141,14 +141,14 @@ 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); } } void DoWaveSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) @@ -202,7 +202,7 @@ public: } void DoFinalSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); @@ -237,7 +237,7 @@ public: { if (Event_Timer <= diff) { - switch(Phase) + switch (Phase) { case 1: if (someplayer) @@ -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; } @@ -565,7 +565,7 @@ public: break; //Phase 6 case 6: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1: Turn Dawnforge and Ardonis case 0: @@ -584,7 +584,7 @@ public: break; //Phase 7 Pathaleons say 3 Sentence, every sentence need a subphase case 7: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 case 0: @@ -640,7 +640,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -782,7 +782,7 @@ public: PlayerGUID = who->GetGUID(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) { DoCast(me, SPELL_DE_MATERIALIZE); } @@ -809,10 +809,10 @@ public: for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetCreateMana() > 0) - UnitsWithMana.push_back(pUnit); + if (unit->GetCreateMana() > 0) + UnitsWithMana.push_back(unit); } } if (!UnitsWithMana.empty()) @@ -903,7 +903,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: //first spawn me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -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 1666cfa78e2..31aea5ea576 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -129,9 +129,9 @@ public: { if (bCanEat && !bIsEating) { - if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) + if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = pUnit->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(); @@ -771,7 +771,7 @@ public: return 0; } - switch(Step) + switch (Step) { case 0: return 0; break; case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break; @@ -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; } @@ -950,7 +950,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 13: DoScriptText(SAY_WIL_PROGRESS1, me, player); @@ -1215,7 +1215,7 @@ public: AnimationTimer = TorlothAnim[AnimationCount].Timer; - switch(AnimationCount) + switch (AnimationCount) { case 0: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); @@ -1295,7 +1295,7 @@ public: void JustDied(Unit* slayer) { if (slayer) - switch(slayer->GetTypeId()) + switch (slayer->GetTypeId()) { case TYPEID_UNIT: if (Unit* owner = slayer->GetOwner()) @@ -1749,7 +1749,7 @@ public: uint32 entry = 0; uint32 credit = 0; - switch(me->GetEntry()) { + switch (me->GetEntry()) { case ENTRY_ENRAGED_FIRE_SPIRIT: entry = ENTRY_FIERY_SOUL; //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 35ef9ae820b..f2aa9fe5786 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -330,7 +330,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY1, me, player); break; case 4: DoScriptText(WHISP1, me, player); break; @@ -449,7 +449,7 @@ public: { Player* player = Unit::GetPlayer(*me, PlayerGUID); - switch(Step) + switch (Step) { case 0:{ me->SetInFront(player); Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20); @@ -632,7 +632,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 785f476b9ab..91fae26ec74 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -95,9 +95,9 @@ public: if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(30, damage)) { - if (Group* pGroup = CAST_PLR(done_by)->GetGroup()) + if (Group* group = CAST_PLR(done_by)->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupie = itr->getSource(); if (pGroupie && @@ -210,7 +210,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 8: player->AreaExploredOrEventHappens(10898); @@ -474,7 +474,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { @@ -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) + 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,13 +568,13 @@ 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) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CastSpell(player, 40642, false); @@ -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()); @@ -676,7 +676,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 62d0893f014..9aecbeb67be 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -328,7 +328,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 4: DoScriptText(SAY_AMBUSH1, me, player); @@ -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); @@ -407,7 +407,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index b30841e19cc..86b92eebfe3 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -65,7 +65,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct); } @@ -112,7 +112,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct)); } @@ -168,13 +168,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader SpellInfo const* talentSpell = sSpellMgr->GetSpellInfo(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = talentSpell->Effects[EFFECT_0].CalcValue(GetCaster()); Unit* caster = GetCaster(); - if(!caster) + if (!caster) return; - if(Player* player = caster->ToPlayer()) + if (Player* player = caster->ToPlayer()) amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK)); } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct); } @@ -429,7 +429,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // You have a chance equal to your Parry chance if ((dmgInfo.GetDamageType() == SPELL_DIRECT_DAMAGE) && roll_chance_f(GetTarget()->GetUnitParryChance())) @@ -532,7 +532,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // min pct of hp is stored in effect 0 of talent spell uint32 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id); @@ -607,7 +607,7 @@ public: } }; -// 50391,50392 Improved Unholy Presence +// 50391, 50392 Improved Unholy Presence class spell_dk_improved_unholy_presence : public SpellScriptLoader { public: @@ -632,7 +632,7 @@ public: { // Not listed as any effect, only base points set in dbc int32 basePoints0 = aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0 , &basePoints0, &basePoints0, true, 0, aurEff); + target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0, &basePoints0, &basePoints0, true, 0, aurEff); } } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 6a8a942f7ae..17849027dd4 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -108,7 +108,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while Stunned in Moonkin Form if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)) @@ -152,7 +152,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while Stunned in Cat Form if (GetTarget()->GetShapeshiftForm() == FORM_CAT && GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)) @@ -295,6 +295,38 @@ class spell_dru_starfall_aoe : public SpellScriptLoader } }; +// 40121 - Swift Flight Form (Passive) +class spell_dru_swift_flight_passive : public SpellScriptLoader +{ + public: + spell_dru_swift_flight_passive() : SpellScriptLoader("spell_dru_swift_flight_passive") { } + + class spell_dru_swift_flight_passive_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript); + + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + { + Unit* caster = GetCaster(); + if (!caster || !caster->ToPlayer()) + return; + + if (caster->ToPlayer()->Has310Flyer(false)) + amount = 310; + } + + void Register() + { + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_dru_swift_flight_passive_AuraScript(); + } +}; + void AddSC_druid_spell_scripts() { new spell_dru_glyph_of_starfire(); @@ -303,4 +335,5 @@ void AddSC_druid_spell_scripts() new spell_dru_savage_defense(); new spell_dru_t10_restoration_4p_bonus(); new spell_dru_starfall_aoe(); + new spell_dru_swift_flight_passive(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f90fe53a9e2..f0b48a5ad90 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -102,7 +102,7 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader bool CheckAreaTarget(Unit* target) { - switch(target->GetEntry()) + switch (target->GetEntry()) { // alliance case 14762: // Dun Baldar North Marshal @@ -1226,7 +1226,7 @@ class spell_gen_launch : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) - player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE,player); // prevents falling damage + player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE, player); // prevents falling damage } void Launch() @@ -1241,10 +1241,10 @@ class spell_gen_launch : public SpellScriptLoader // There is no spell for this, the following calculation was based on void Spell::CalculateJumpSpeeds float speedZ = 10.0f; - float dist = position->GetExactDist2d(player->GetPositionX(),player->GetPositionY()); + float dist = position->GetExactDist2d(player->GetPositionX(), player->GetPositionY()); float speedXY = dist; - player->GetMotionMaster()->MoveJump(position->GetPositionX(),position->GetPositionY(),position->GetPositionZ(),speedXY,speedZ); + player->GetMotionMaster()->MoveJump(position->GetPositionX(), position->GetPositionY(), position->GetPositionZ(), speedXY, speedZ); } } @@ -1324,8 +1324,8 @@ public: PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript) void HandleDummy(SpellEffIndex effIndex) - { - + { + if (Player* player = GetCaster()->ToPlayer()) { @@ -1344,7 +1344,7 @@ public: // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - + } void Register() diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index baa998f9487..2346a30640c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1108,7 +1108,7 @@ class spell_magic_eater_food : public SpellScriptLoader target->CastSpell(target, SPELL_WELL_FED_3, true); break; case 4: - target->CastSpell(target, SPELL_WELL_FED_4, true); + target->CastSpell(target, SPELL_WELL_FED_4, true); break; case 5: target->CastSpell(target, SPELL_WELL_FED_5, true); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index f07a13bf7db..84df4418078 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -141,7 +141,7 @@ public: if (Unit* unitTarget = GetHitUnit()) { uint32 spell_id = 0; - switch(unitTarget->getClass()) + switch (unitTarget->getClass()) { case CLASS_DRUID: spell_id = SPELL_BLESSING_OF_LOWER_CITY_DRUID; break; case CLASS_PALADIN: spell_id = SPELL_BLESSING_OF_LOWER_CITY_PALADIN; break; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 3bcbc322e06..07b8a79691a 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -64,7 +64,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) @@ -131,7 +131,7 @@ class spell_pri_mind_sear : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); + unitList.remove_if (Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } void Register() diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 6fbd33fe81b..6ae9577070e 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -648,7 +648,7 @@ public: Unit* target = GetTarget(); if (Player* player = caster->GetCharmerOrOwnerPlayerOrPlayerItself()) { - switch(target->GetEntry()) + switch (target->GetEntry()) { case NPC_FROSTWORG: target->CastSpell(player, SPELL_FROSTWORG_CREDIT, true); @@ -707,7 +707,7 @@ public: Unit* pCaster = GetCaster(); if (Player* player = pCaster->ToPlayer()) { - if(Creature* target = GetHitCreature()) + if (Creature* target = GetHitCreature()) { player->CastSpell(player, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, NULL); player->KilledMonsterCredit(NPC_FALLEN_EARTHEN_DEFENDER, 0); @@ -948,7 +948,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader */ enum eBattleStandard { - NPC_KING_OF_THE_MOUNTAINT_KC = 31766, + NPC_KING_OF_THE_MOUNTAINT_KC = 31766, }; class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader { @@ -959,11 +959,11 @@ public: { PrepareSpellScript(spell_q13280_13283_plant_battle_standard_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) - { + { Unit* caster = GetCaster(); if (caster->IsVehicle()) if (Unit* player = caster->GetVehicleKit()->GetPassenger(0)) - player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC,0); + player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } void Register() diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 3dc1ed10f29..e9caa40255e 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -65,7 +65,7 @@ public: amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) @@ -125,7 +125,7 @@ public: amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while stun or fear if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index fcb026e0232..76dac9b59f1 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -62,7 +62,7 @@ class spell_sha_astral_shift : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while stun, fear or silence if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING | UNIT_FLAG_SILENCED) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))) @@ -250,7 +250,7 @@ class spell_sha_bloodlust : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); } void ApplyDebuff() @@ -291,7 +291,7 @@ class spell_sha_heroism : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); } void ApplyDebuff() diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 49fe2f2870c..a9ed794ab45 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -68,7 +68,7 @@ class AreaTrigger_at_aldurthar_gate : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - switch(trigger->id) + switch (trigger->id) { case TRIGGER_SOUTH: player->KilledMonsterCredit(NPC_SOUTH_GATE, 0); break; case TRIGGER_CENTRAL: player->KilledMonsterCredit(NPC_CENTRAL_GATE, 0); break; @@ -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; } @@ -205,7 +205,7 @@ class AreaTrigger_at_warsong_farms : public AreaTriggerScript { if (!player->isDead() && player->GetQuestStatus(QUEST_THE_WARSONG_FARMS) == QUEST_STATUS_INCOMPLETE) { - switch(trigger->id) + switch (trigger->id) { case AT_SLAUGHTERHOUSE: player->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE, 0); break; case AT_GRAINERY: player->KilledMonsterCredit(NPC_CREDIT_GRAINERY, 0); break; @@ -305,7 +305,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript WorldLocation pPosition; - switch(trigger->id) + switch (trigger->id) { case 5332: case 5338: @@ -357,7 +357,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript if (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && !player->isDead() && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED) { - switch(trigger->id) + switch (trigger->id) { case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false); break; case AT_UNGORO: player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false); break; diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index b6030c62df4..e5c584df6e1 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -122,7 +122,7 @@ struct emerald_dragonAI : public WorldBossAI // Despawntime is 2 minutes, so reschedule it for new cast after 2 minutes + a minor "random time" (30 seconds at max) DoCast(me, SPELL_SEEPING_FOG_LEFT, true); DoCast(me, SPELL_SEEPING_FOG_RIGHT, true); - events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000,150000)); + events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000, 150000)); break; case EVENT_NOXIOUS_BREATH: // Noxious Breath is cast on random intervals, no less than 7.5 seconds between @@ -241,7 +241,7 @@ class spell_dream_fog_sleep : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(DreamFogTargetSelector()); + unitList.remove_if (DreamFogTargetSelector()); } void Register() @@ -292,7 +292,7 @@ class spell_mark_of_nature : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(MarkOfNatureTargetSelector()); + unitList.remove_if (MarkOfNatureTargetSelector()); } void HandleEffect(SpellEffIndex effIndex) diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 07b6840b6c6..0592a452211 100755 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -68,7 +68,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group) { //! NOTE: - //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" + //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" switch (type) { case CHAT_MSG_PARTY: @@ -126,7 +126,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild) { - switch(type) + switch (type) { case CHAT_MSG_GUILD: if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_GUILD)) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 0bda63b4177..cdeac03d76e 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -317,7 +317,7 @@ public: { uint32 Spell = 0; - switch(pFaction->faction) + switch (pFaction->faction) { case 1011: Spell = SPELL_REP_LC; break; case 935: Spell = SPELL_REP_SHAT; break; @@ -434,7 +434,7 @@ public: float fX, fY, fZ; pGO->GetClosePoint(fX, fY, fZ, pGO->GetObjectSize(), INTERACTION_DISTANCE); - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case GO_SHRINE_HAWK: BirdEntry = NPC_HAWK_GUARD; @@ -566,7 +566,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_BEAST, false); @@ -625,7 +625,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_SORCERER, false); @@ -675,7 +675,7 @@ public: bool OnGossipHello(Player* player, GameObject* pGO) { - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case MATRIX_PUNCHOGRAPH_3005_A: if (player->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) @@ -853,7 +853,7 @@ public: pPrisoner->DisappearAndDie(); player->KilledMonsterCredit(NPC_EBON_BLADE_PRISONER_HUMAN, 0); - switch(pPrisoner->GetEntry()) + switch (pPrisoner->GetEntry()) { case NPC_EBON_BLADE_PRISONER_HUMAN: player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_H, true); @@ -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/guards.cpp b/src/server/scripts/World/guards.cpp index a40405d3021..f869138d58f 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -194,7 +194,7 @@ public: void DoReplyToTextEmote(uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; @@ -207,7 +207,7 @@ public: void ReceiveEmote(Player* player, uint32 textEmote) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_STORMWIND_CITY_GUARD: case NPC_STORMWIND_CITY_PATROLLER: diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index f8095ba9c1e..4099c03384c 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -54,7 +54,7 @@ public: bool disabled = false; //for special scripts - switch(itemId) + switch (itemId) { case 24538: if (player->GetAreaId() != 3628) @@ -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); @@ -418,7 +418,7 @@ public: } else player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); } else - player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL); + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index af3544d2bd3..149e1e455aa 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -426,7 +426,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -510,7 +510,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; @@ -601,7 +601,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -669,7 +669,7 @@ public: { if (uiAction) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11191: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction); @@ -1103,7 +1103,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 3bf33066189..ff83b0c1ec5 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -68,7 +68,7 @@ public: if (creature->isQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus if (player->HasItemCount(23843, 1, true)) @@ -189,7 +189,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 392e20734a8..a5e5b467fc7 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -193,7 +193,7 @@ public: if (!lastSpawnedGuard) SpawnedGUID = 0; - switch(SpawnAssoc->spawnType) + switch (SpawnAssoc->spawnType) { case SPAWNTYPE_ALARMBOT: { @@ -348,7 +348,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_CHICKEN: if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand() % 30 == 1) @@ -455,7 +455,7 @@ public: WorldPacket data; me->BuildHeartBeatMsg(&data); me->SendMessageToSet(&data, true); - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); @@ -598,7 +598,7 @@ public: PatientDiedCount = 0; PatientSavedCount = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: for (uint8 i = 0; i < ALLIANCE_COORDS; ++i) @@ -826,7 +826,7 @@ void npc_doctor::npc_doctorAI::UpdateAI(uint32 const diff) std::vector<Location*>::iterator itr = Coordinates.begin() + rand() % Coordinates.size(); uint32 patientEntry = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand() % 3]; @@ -944,7 +944,7 @@ public: if (Player* player = caster->ToPlayer()) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: if (player->GetQuestStatus(QUEST_MOON) == QUEST_STATUS_INCOMPLETE) @@ -1052,7 +1052,7 @@ public: { if (Unit* unit = Unit::GetUnit(*me, CasterGUID)) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, unit); @@ -1313,7 +1313,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -1417,7 +1417,7 @@ public: void SendAction(Player* player, Creature* creature, uint32 action) { - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1464,7 +1464,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(sender) + switch (sender) { case GOSSIP_SENDER_MAIN: SendAction(player, creature, action); @@ -1706,7 +1706,7 @@ public: //Add delta to make them not all hit the same time uint32 delta = (rand() % 7) * 100; me->SetStatFloatValue(UNIT_FIELD_BASEATTACKTIME, float(Info->baseattacktime + delta)); - me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER , float(Info->attackpower)); + me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER, float(Info->attackpower)); // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) @@ -2211,7 +2211,7 @@ public: player->PlayerTalkClass->ClearMenus(); bool roll = urand(0, 1); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra player->CLOSE_GOSSIP_MENU(); @@ -2283,7 +2283,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->PlayerTalkClass->SendGossipMenu(TEXT_PETINFO, creature->GetGUID()); @@ -2383,7 +2383,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -2542,7 +2542,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -2608,7 +2608,7 @@ public: bool noXPGain = player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN); bool doSwitch = false; - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1://xp off { diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp index 3cd76181b3b..68b5a62b963 100755 --- a/src/server/shared/Common.cpp +++ b/src/server/shared/Common.cpp @@ -33,7 +33,7 @@ char const* localeNames[TOTAL_LOCALES] = { LocaleConstant GetLocaleByName(const std::string& name) { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) - if(name==localeNames[i]) + if (name==localeNames[i]) return LocaleConstant(i); return LOCALE_enUS; // including enGB case diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 004a013da96..ffecf020d24 100755 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -20,7 +20,7 @@ #define TRINITYCORE_COMMON_H // config.h needs to be included 1st -// TODO this thingy looks like hack , but its not, need to +// TODO this thingy looks like hack, but its not, need to // make separate header however, because It makes mess here. #ifdef HAVE_CONFIG_H // Remove Some things that we will define diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp index 82ca9146c75..6149a680594 100755 --- a/src/server/shared/Cryptography/BigNumber.cpp +++ b/src/server/shared/Cryptography/BigNumber.cpp @@ -42,7 +42,7 @@ BigNumber::BigNumber(uint32 val) BigNumber::~BigNumber() { BN_free(_bn); - if(_array) delete[] _array; + if (_array) delete[] _array; } void BigNumber::SetDword(uint32 val) diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp index 6f2c985ddfb..c60b8bfb70a 100755 --- a/src/server/shared/Cryptography/SHA1.cpp +++ b/src/server/shared/Cryptography/SHA1.cpp @@ -50,7 +50,7 @@ void SHA1Hash::UpdateBigNumbers(BigNumber* bn0, ...) while (bn) { UpdateData(bn->AsByteArray(), bn->GetNumBytes()); - bn = va_arg(v, BigNumber* ); + bn = va_arg(v, BigNumber*); } va_end(v); } diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index fbf31bb092e..b580048ed45 100755 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -143,7 +143,7 @@ class DBCStorage if (!fields) fields = result->Fetch(); - if(sql->indexPos >= 0) + if (sql->indexPos >= 0) { uint32 id = fields[sql->sqlIndexPos].GetUInt32(); if (indexTable.asT[id]) @@ -162,7 +162,7 @@ class DBCStorage { if ((*sql->formatString)[columnNumber] == FT_SQL_ABSENT) { - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))= 0.0f; @@ -187,7 +187,7 @@ class DBCStorage else if ((*sql->formatString)[columnNumber] == FT_SQL_PRESENT) { bool validSqlColumn = true; - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))=fields[sqlColumnNumber].GetFloat(); @@ -243,7 +243,7 @@ class DBCStorage DBCFileLoader dbc; // Check if load was successful, only then continue - if(!dbc.Load(fn, fmt)) + if (!dbc.Load(fn, fmt)) return false; stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)dataTable)); @@ -261,7 +261,7 @@ class DBCStorage delete[] ((char*)dataTable); dataTable = NULL; - while(!stringPoolList.empty()) + while (!stringPoolList.empty()) { delete[] stringPoolList.front(); stringPoolList.pop_front(); diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h index f360128d367..5e8ddfe4cde 100755 --- a/src/server/shared/Database/DatabaseEnv.h +++ b/src/server/shared/Database/DatabaseEnv.h @@ -31,7 +31,7 @@ #define _LIKE_ "LIKE" #define _TABLE_SIM_ "`" -#define _CONCAT3_(A, B, C) "CONCAT( " A " , " B " , " C " )" +#define _CONCAT3_(A, B, C) "CONCAT( " A ", " B ", " C " )" #define _OFFSET_ "LIMIT %d, 1" #include "Implementation/LoginDatabase.h" diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index 5e24608715a..adf5902a591 100755 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -63,7 +63,6 @@ class DatabaseWorkerPool ~DatabaseWorkerPool() { - sLog->outSQLDriver("~DatabaseWorkerPool for '%s'.", m_connectionInfo.database.c_str()); } bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads) diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 68fc7ba9c0a..816dc25f1b3 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -29,7 +29,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_GET_GUID_BY_NAME, "SELECT guid FROM characters WHERE name = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_GET_CHECK_NAME, "SELECT 1 FROM characters WHERE name = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_GET_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_ASYNC); - PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0,?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0, ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_ADD_BAN, "INSERT INTO character_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SET_NOT_BANNED, "UPDATE character_banned SET active = 0 WHERE guid = ? AND active != 0", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_GET_BANINFO, "SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate, banreason, bannedby FROM character_banned WHERE guid = ? ORDER BY bandate ASC", CONNECTION_SYNCH) @@ -227,7 +227,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Game event saves PREPARE_STATEMENT(CHAR_DEL_GAME_EVENT_SAVE, "DELETE FROM game_event_save WHERE eventEntry = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ? , ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ?, ?)", CONNECTION_ASYNC) // Game event condition saves PREPARE_STATEMENT(CHAR_DEL_ALL_GAME_EVENT_CONDITION_SAVE, "DELETE FROM game_event_condition_save WHERE eventEntry = ?", CONNECTION_ASYNC) diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index bee4b556f2e..cfa1452864f 100755 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -24,9 +24,9 @@ #include <ace/Stack_Trace.h> #define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; sLog->outError( "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } -#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } -#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } -#define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } +#define WPError( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } +#define WPWarning( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } +#define WPFatal( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } #define ASSERT WPAssert #endif diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index c2c3ec95e93..63648f66e29 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -399,7 +399,7 @@ void WheatyExceptionReport::printTracesForAllThreads() } CloseHandle(threadHandle); } - } while(Thread32Next(hThreadSnap, &te32)); + } while (Thread32Next(hThreadSnap, &te32)); // Don't forget to clean up the snapshot object. CloseHandle(hThreadSnap); @@ -470,7 +470,7 @@ PEXCEPTION_POINTERS pExceptionInfo) _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n") _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n") , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx, - pCtx->Rsi, pCtx->Rdi , pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); + pCtx->Rsi, pCtx->Rdi, pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip); _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"), pCtx->SegSs, pCtx->Rsp, pCtx->Rbp); diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h index cc77a598e67..8ade80ca47b 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.h +++ b/src/server/shared/Debugging/WheatyExceptionReport.h @@ -100,7 +100,7 @@ class WheatyExceptionReport static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME *, char * pszBuffer, unsigned cbBuffer); - static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool & , char*); + static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool &, char*); static char * FormatOutputValue(char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress); diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 95e7261405d..19a2bb1c8cf 100755 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -51,7 +51,7 @@ class LinkedListElement void delink() { - if(isInList()) + if (isInList()) { iNext->iPrev = iPrev; iPrev->iNext = iNext; iNext = NULL; iPrev = NULL; } @@ -112,11 +112,11 @@ class LinkedListHead uint32 getSize() const { - if(!iSize) + if (!iSize) { uint32 result = 0; LinkedListElement const* e = getFirst(); - while(e) + while (e) { ++result; e = e->next(); diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h index da8cf518de5..ab56de9bc24 100755 --- a/src/server/shared/Dynamic/LinkedReference/RefManager.h +++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h @@ -43,7 +43,7 @@ template <class TO, class FROM> class RefManager : public LinkedListHead void clearReferences() { LinkedListElement* ref; - while((ref = getFirst()) != NULL) + while ((ref = getFirst()) != NULL) { ((Reference<TO, FROM>*) ref)->invalidate(); ref->delink(); // the delink might be already done by invalidate(), but doing it here again does not hurt and insures an empty list diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 707f4e7cfa8..fd5ce8fc25b 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -45,9 +45,9 @@ template <class TO, class FROM> class Reference : public LinkedListElement void link(TO* toObj, FROM* fromObj) { assert(fromObj); // fromObj MUST not be NULL - if(isValid()) + if (isValid()) unlink(); - if(toObj != NULL) + if (toObj != NULL) { iRefTo = toObj; iRefFrom = fromObj; @@ -72,14 +72,14 @@ template <class TO, class FROM> class Reference : public LinkedListElement } Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); } - Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const* ) LinkedListElement::next()); } + Reference<TO, FROM> const* next() const { return((Reference<TO, FROM> const*) LinkedListElement::next()); } Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); } - Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::prev()); } + Reference<TO, FROM> const* prev() const { return((Reference<TO, FROM> const*) LinkedListElement::prev()); } Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); } - Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> const* nocheck_next() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_next()); } Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); } - Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const* ) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> const* nocheck_prev() const { return((Reference<TO, FROM> const*) LinkedListElement::nocheck_prev()); } TO* operator ->() const { return iRefTo; } TO* getTarget() const { return iRefTo; } diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index da255d40e86..db5e28eff8f 100755 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -46,9 +46,9 @@ class ObjectRegistry bool InsertItem(T *obj, Key key, bool override = false) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( !override ) + if ( !override ) return false; delete iter->second; i_registeredObjects.erase(iter); @@ -62,9 +62,9 @@ class ObjectRegistry void RemoveItem(Key key, bool delete_object = true) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( delete_object ) + if ( delete_object ) delete iter->second; i_registeredObjects.erase(iter); } diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h index 9b43e325806..7b03f8503b5 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h @@ -101,7 +101,7 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); - if(!t) + if (!t) t = Find(elements._TailElement, hdl, fake); return t; @@ -136,7 +136,7 @@ namespace Trinity template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE> &elements, CountedPtr<SPECIFIC_TYPE> &obj, OBJECT_HANDLE hdl) { typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE> >::iterator iter = elements._element.find(hdl); - if( iter != elements._element.end() ) + if ( iter != elements._element.end() ) { elements._element.erase(iter); return true; diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 04139db4456..56c02a8e77b 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -38,11 +38,11 @@ Log::Log() : Log::~Log() { - if( logfile != NULL ) + if ( logfile != NULL ) fclose(logfile); logfile = NULL; - if( gmLogfile != NULL ) + if ( gmLogfile != NULL ) fclose(gmLogfile); gmLogfile = NULL; @@ -50,7 +50,7 @@ Log::~Log() fclose(charLogfile); charLogfile = NULL; - if( dberLogfile != NULL ) + if ( dberLogfile != NULL ) fclose(dberLogfile); dberLogfile = NULL; @@ -129,20 +129,20 @@ void Log::Initialize() InitColors(ConfigMgr::GetStringDefault("LogColors", "")); m_gmlog_per_account = ConfigMgr::GetBoolDefault("GmLogPerAccount", false); - if(!m_gmlog_per_account) + if (!m_gmlog_per_account) gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); else { // GM log settings for per account case m_gmlog_filename_format = ConfigMgr::GetStringDefault("GMLogFile", ""); - if(!m_gmlog_filename_format.empty()) + if (!m_gmlog_filename_format.empty()) { bool m_gmlog_timestamp = ConfigMgr::GetBoolDefault("GmLogTimestamp", false); size_t dot_pos = m_gmlog_filename_format.find_last_of("."); - if(dot_pos!=m_gmlog_filename_format.npos) + if (dot_pos!=m_gmlog_filename_format.npos) { - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format.insert(dot_pos, m_logsTimestamp); m_gmlog_filename_format.insert(dot_pos, "_#%u"); @@ -151,7 +151,7 @@ void Log::Initialize() { m_gmlog_filename_format += "_#%u"; - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format += m_logsTimestamp; } @@ -199,13 +199,13 @@ void Log::ReloadConfig() FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode) { std::string logfn=ConfigMgr::GetStringDefault(configFileName, ""); - if(logfn.empty()) + if (logfn.empty()) return NULL; - if(configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) + if (configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) { size_t dot_pos = logfn.find_last_of("."); - if(dot_pos!=logfn.npos) + if (dot_pos!=logfn.npos) logfn.insert(dot_pos, m_logsTimestamp); else logfn += m_logsTimestamp; @@ -216,7 +216,7 @@ FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFl FILE* Log::openGmlogPerAccount(uint32 account) { - if(m_gmlog_filename_format.empty()) + if (m_gmlog_filename_format.empty()) return NULL; char namebuf[TRINITY_PATH_MAX]; @@ -239,7 +239,7 @@ void Log::outTimestamp(FILE* file) void Log::InitColors(const std::string& str) { - if(str.empty()) + if (str.empty()) { m_colored = false; return; @@ -253,10 +253,10 @@ void Log::InitColors(const std::string& str) { ss >> color[i]; - if(!ss) + if (!ss) return; - if(color[i] < 0 || color[i] >= Colors) + if (color[i] < 0 || color[i] >= Colors) return; } @@ -412,7 +412,7 @@ void Log::outString(const char * str, ...) ResetColor(true); printf("\n"); - if(logfile) + if (logfile) { outTimestamp(logfile); va_start(ap, str); @@ -715,7 +715,7 @@ void Log::outDebugInLine(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - //if(m_colored) + //if (m_colored) // ResetColor(true); if (logfile) @@ -772,7 +772,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -782,7 +782,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); @@ -817,7 +817,7 @@ void Log::outStaticDebug(const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -827,7 +827,7 @@ void Log::outStaticDebug(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 8ad5af56d1a..08318aa7a5b 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -147,14 +147,14 @@ class ByteBuffer ByteBuffer &operator<<(const std::string &value) { - append((uint8 const* )value.c_str(), value.length()); + append((uint8 const*)value.c_str(), value.length()); append((uint8)0); return *this; } ByteBuffer &operator<<(const char *str) { - append((uint8 const* )str, str ? strlen(str) : 0); + append((uint8 const*)str, str ? strlen(str) : 0); append((uint8)0); return *this; } @@ -270,7 +270,7 @@ class ByteBuffer void read_skip(size_t skip) { - if(_rpos + skip > size()) + if (_rpos + skip > size()) throw ByteBufferException(false, _rpos, skip, size()); _rpos += skip; } @@ -284,7 +284,7 @@ class ByteBuffer template <typename T> T read(size_t pos) const { - if(pos + sizeof(T) > size()) + if (pos + sizeof(T) > size()) throw ByteBufferException(false, pos, sizeof(T), size()); T val = *((T const*)&_storage[pos]); EndianConvert(val); @@ -293,7 +293,7 @@ class ByteBuffer void read(uint8 *dest, size_t len) { - if(_rpos + len > size()) + if (_rpos + len > size()) throw ByteBufferException(false, _rpos, len, size()); memcpy(dest, &_storage[_rpos], len); _rpos += len; @@ -301,7 +301,7 @@ class ByteBuffer void readPackGUID(uint64& guid) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); guid = 0; @@ -311,9 +311,9 @@ class ByteBuffer for (int i = 0; i < 8; ++i) { - if(guidmark & (uint8(1) << i)) + if (guidmark & (uint8(1) << i)) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); uint8 bit; @@ -371,7 +371,7 @@ class ByteBuffer void append(const ByteBuffer& buffer) { - if(buffer.wpos()) + if (buffer.wpos()) append(buffer.contents(), buffer.wpos()); } @@ -390,9 +390,9 @@ class ByteBuffer uint8 packGUID[8+1]; packGUID[0] = 0; size_t size = 1; - for(uint8 i = 0;guid != 0;++i) + for (uint8 i = 0;guid != 0;++i) { - if(guid & 0xFF) + if (guid & 0xFF) { packGUID[0] |= uint8(1 << i); packGUID[size] = uint8(guid & 0xFF); @@ -406,14 +406,14 @@ class ByteBuffer void put(size_t pos, const uint8 *src, size_t cnt) { - if(pos + cnt > size()) + if (pos + cnt > size()) throw ByteBufferException(true, pos, cnt, size()); memcpy(&_storage[pos], src, cnt); } void print_storage() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -424,7 +424,7 @@ class ByteBuffer void textlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -435,7 +435,7 @@ class ByteBuffer void hexlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; uint32 j = 1, k = 1; @@ -510,7 +510,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::vector<T> &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -536,7 +536,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::list<T> &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -562,7 +562,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::map<K, V> &m) uint32 msize; b >> msize; m.clear(); - while(msize--) + while (msize--) { K k; V v; diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h index 72a916eb295..92eab440684 100755 --- a/src/server/shared/Threading/LockedQueue.h +++ b/src/server/shared/Threading/LockedQueue.h @@ -91,7 +91,7 @@ namespace ACE_Based return false; result = _queue.front(); - if(!check.Process(result)) + if (!check.Process(result)) return false; _queue.pop_front(); diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp index 9b72d0f1499..7e22f1afdae 100755 --- a/src/server/shared/Threading/Threading.cpp +++ b/src/server/shared/Threading/Threading.cpp @@ -45,14 +45,14 @@ ThreadPriority::ThreadPriority() ASSERT (!_tmp.empty()); - if(_tmp.size() >= MAXPRIORITYNUM) + if (_tmp.size() >= MAXPRIORITYNUM) { const size_t max_pos = _tmp.size(); size_t min_pos = 1; size_t norm_pos = 0; for (size_t i = 0; i < max_pos; ++i) { - if(_tmp[i] == ACE_THR_PRI_OTHER_DEF) + if (_tmp[i] == ACE_THR_PRI_OTHER_DEF) { norm_pos = i + 1; break; @@ -65,7 +65,7 @@ ThreadPriority::ThreadPriority() //into ¹ piesces const size_t _divider = 4; size_t _div = (norm_pos - min_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = (norm_pos - 1); @@ -74,7 +74,7 @@ ThreadPriority::ThreadPriority() m_priority[Lowest] = _tmp[min_pos -= _div ]; _div = (max_pos - norm_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = norm_pos - 1; @@ -86,10 +86,10 @@ ThreadPriority::ThreadPriority() int ThreadPriority::getPriority(Priority p) const { - if(p < Idle) + if (p < Idle) p = Idle; - if(p > Realtime) + if (p > Realtime) p = Realtime; return m_priority[p]; @@ -204,14 +204,14 @@ ACE_hthread_t Thread::currentHandle() Thread * Thread::current() { Thread * _thread = m_ThreadStorage.ts_object(); - if(!_thread) + if (!_thread) { _thread = new Thread(); _thread->m_iThreadId = Thread::currentId(); _thread->m_hThreadHandle = Thread::currentHandle(); Thread * _oldValue = m_ThreadStorage.ts_object(_thread); - if(_oldValue) + if (_oldValue) delete _oldValue; } diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index 0d327d5abaa..89550ec996f 100755 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -36,7 +36,7 @@ namespace ACE_Based void incReference() { ++m_refs; } void decReference() { - if(!--m_refs) + if (!--m_refs) delete this; } private: diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp index 3f9123b3e46..56dcad2516b 100755 --- a/src/server/shared/Utilities/EventProcessor.cpp +++ b/src/server/shared/Utilities/EventProcessor.cpp @@ -71,17 +71,17 @@ void EventProcessor::KillAllEvents(bool force) i_old->second->to_Abort = true; i_old->second->Abort(m_time); - if(force || i_old->second->IsDeletable()) + if (force || i_old->second->IsDeletable()) { delete i_old->second; - if(!force) // need per-element cleanup + if (!force) // need per-element cleanup m_events.erase (i_old); } } // fast clear event list (in force case) - if(force) + if (force) m_events.clear(); } diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f768a3ab68c..cd623c62132 100755 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -80,7 +80,7 @@ bool WinServiceInstall() if (service) { advapi32 = GetModuleHandle("ADVAPI32.DLL"); - if(!advapi32) + if (!advapi32) { CloseServiceHandle(service); CloseServiceHandle(serviceControlManager); @@ -232,7 +232,7 @@ void WINAPI ServiceMain(DWORD argc, char *argv[]) m_ServiceStatus = 1; argc = 1; - main(argc , argv); + main(argc, argv); // service was stopped serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 7d3a6f7ed58..187258e41b3 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -128,9 +128,9 @@ void stripLineInvisibleChars(std::string &str) bool space = false; for (size_t pos = 0; pos < str.size(); ++pos) { - if(invChars.find(str[pos])!=std::string::npos) + if (invChars.find(str[pos])!=std::string::npos) { - if(!space) + if (!space) { str[wpos++] = ' '; space = true; @@ -138,7 +138,7 @@ void stripLineInvisibleChars(std::string &str) } else { - if(wpos!=pos) + if (wpos!=pos) str[wpos++] = str[pos]; else ++wpos; @@ -146,9 +146,9 @@ void stripLineInvisibleChars(std::string &str) } } - if(wpos < str.size()) + if (wpos < str.size()) str.erase(wpos, str.size()); - if(str.find("|TInterface")!=std::string::npos) + if (str.find("|TInterface")!=std::string::npos) str.clear(); } @@ -161,15 +161,15 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly) uint64 days = timeInSecs / DAY; std::ostringstream ss; - if(days) + if (days) ss << days << (shortText ? "d " : " Day(s) "); - if(hours || hoursOnly) + if (hours || hoursOnly) ss << hours << (shortText ? "h " : " Hour(s) "); - if(!hoursOnly) + if (!hoursOnly) { - if(minutes) + if (minutes) ss << minutes << (shortText ? "m " : " Minute(s) "); - if(secs || (!days && !hours && !minutes) ) + if (secs || (!days && !hours && !minutes) ) ss << secs << (shortText ? "s" : " Second(s)."); } @@ -184,14 +184,14 @@ uint32 TimeStringToSecs(const std::string& timestring) for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr) { - if(isdigit(*itr)) + if (isdigit(*itr)) { buffer*=10; buffer+= (*itr)-'0'; } else { - switch(*itr) + switch (*itr) { case 'd': multiplier = DAY; break; case 'h': multiplier = HOUR; break; @@ -225,7 +225,7 @@ std::string TimeToTimestampStr(time_t t) /// Check if the string is a valid ip address representation bool IsIPAddress(char const* ipaddress) { - if(!ipaddress) + if (!ipaddress) return false; // Let the big boys do it. @@ -270,7 +270,7 @@ void utf8truncate(std::string& utf8str, size_t len) try { size_t wlen = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); - if(wlen <= len) + if (wlen <= len) return; std::wstring wstr; @@ -291,9 +291,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) try { size_t len = utf8::distance(utf8str, utf8str+csize); - if(len > wsize) + if (len > wsize) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -305,7 +305,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) } catch(std::exception) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -384,7 +384,7 @@ typedef wchar_t const* const* wstrlist; std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { // supported only Cyrillic cases - if(wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) + if (wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) return wname; // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently) @@ -419,7 +419,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { size_t len = size_t((*itr)[-1]); // get length from string size field - if(wname.substr(wname.size()-len, len)==*itr) + if (wname.substr(wname.size()-len, len)==*itr) return wname.substr(0, wname.size()-len); } @@ -430,7 +430,7 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr) { #if PLATFORM == PLATFORM_WINDOWS std::wstring wstr; - if(!Utf8toWStr(utf8str, wstr)) + if (!Utf8toWStr(utf8str, wstr)) return false; conStr.resize(wstr.size()); @@ -462,13 +462,13 @@ bool Utf8FitTo(const std::string& str, std::wstring search) { std::wstring temp; - if(!Utf8toWStr(str, temp)) + if (!Utf8toWStr(str, temp)) return false; // converting to lower case wstrToLower( temp ); - if(temp.find(search) == std::wstring::npos) + if (temp.find(search) == std::wstring::npos) return false; return true; @@ -509,7 +509,7 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result) { unsigned char nibble = 0x0F & (bytes[i]>>((1-j)*4)); char encodedNibble; - if(nibble < 0x0A) + if (nibble < 0x0A) encodedNibble = '0'+nibble; else encodedNibble = 'A'+nibble-0x0A; diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index a91bfe3faa5..8ded45a7bb6 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -188,60 +188,60 @@ void utf8truncate(std::string& utf8str, size_t len); inline bool isBasicLatinCharacter(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return true; - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return true; return false; } inline bool isExtendedLatinCharacter(wchar_t wchar) { - if(isBasicLatinCharacter(wchar)) + if (isBasicLatinCharacter(wchar)) return true; - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return true; - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return true; - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return true; - if(wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK + if (wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK return true; - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return true; return false; } inline bool isCyrillicCharacter(wchar_t wchar) { - if(wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA return true; - if(wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO + if (wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO return true; return false; } inline bool isEastAsianCharacter(wchar_t wchar) { - if(wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo + if (wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo return true; - if(wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana + if (wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana return true; - if(wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo + if (wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo return true; - if(wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. + if (wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. return true; - if(wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A + if (wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A return true; - if(wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs + if (wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs return true; - if(wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables + if (wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables return true; - if(wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms + if (wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms return true; return false; } @@ -273,7 +273,7 @@ inline bool isNumericOrSpace(wchar_t wchar) inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -281,7 +281,7 @@ inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -289,7 +289,7 @@ inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -297,29 +297,29 @@ inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } inline wchar_t wcharToUpper(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return wchar_t(0x1E9E); - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) + if (wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) { - if(wchar % 2 == 1) + if (wchar % 2 == 1) return wchar_t(uint16(wchar)-0x0001); } - if(wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x0451) // CYRILLIC SMALL LETTER IO + if (wchar == 0x0451) // CYRILLIC SMALL LETTER IO return wchar_t(0x0401); return wchar; @@ -332,22 +332,22 @@ inline wchar_t wcharToUpperOnlyLatin(wchar_t wchar) inline wchar_t wcharToLower(wchar_t wchar) { - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) + if (wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) { - if(wchar % 2 == 0) + if (wchar % 2 == 0) return wchar_t(uint16(wchar)+0x0001); } - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return wchar_t(0x00DF); - if(wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO + if (wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO return wchar_t(0x0451); - if(wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA return wchar_t(uint16(wchar)+0x0020); return wchar; diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 794f79f536d..cf5ad79f878 100755 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -532,7 +532,7 @@ bool ChatHandler::HandleServerSetDiffTimeCommand(const char *args) bool ChatHandler::HandleServerToggleQueryLogging(const char* /* args */) { sLog->SetSQLDriverQueryLogging(!sLog->GetSQLDriverQueryLogging()); - if(sLog->GetSQLDriverQueryLogging()) + if (sLog->GetSQLDriverQueryLogging()) PSendSysMessage(LANG_SQLDRIVER_QUERY_LOGGING_ENABLED); else PSendSysMessage(LANG_SQLDRIVER_QUERY_LOGGING_DISABLED); diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 85f10e0cf9b..1ce247d9249 100755 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -75,7 +75,7 @@ extern int main(int argc, char **argv) ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_CORE_CONFIG; int c = 1; - while( c < argc ) + while ( c < argc ) { if (strcmp(argv[c], "-c") == 0) { diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index e16494bdeac..5260140fef0 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -128,7 +128,7 @@ int Master::Run() sLog->outString(" ______ __"); sLog->outString("/\\__ _\\ __ __/\\ \\__"); - sLog->outString("\\/_/\\ \\/ _ __ /\\_\\ ___ /\\_\\ \\ ,_\\ __ __"); + sLog->outString("\\/_/\\ \\/ _ __ /\\_\\ ___ /\\_\\ \\, _\\ __ __"); sLog->outString(" \\ \\ \\/\\`'__\\/\\ \\ /' _ `\\/\\ \\ \\ \\/ /\\ \\/\\ \\"); sLog->outString(" \\ \\ \\ \\ \\/ \\ \\ \\/\\ \\/\\ \\ \\ \\ \\ \\_\\ \\ \\_\\ \\"); sLog->outString(" \\ \\_\\ \\_\\ \\ \\_\\ \\_\\ \\_\\ \\_\\ \\__\\\\/`____ \\"); diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 9c31c189822..71d4d1df035 100755 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -349,7 +349,7 @@ int RASocket::svc(void) if (send(std::string(sWorld->GetMotd()) + "\r\n") == -1) return -1; - for(;;) + for (;;) { // show prompt const char* tc_prompt = "TC> "; diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp index 67c54e7e011..fa7c34cffbf 100755 --- a/src/server/worldserver/TCSoap/TCSoap.cpp +++ b/src/server/worldserver/TCSoap/TCSoap.cpp @@ -83,25 +83,25 @@ int ns1__executeCommand(soap* soap, char* command, char** result) } uint32 accountId = AccountMgr::GetId(soap->userid); - if(!accountId) + if (!accountId) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: Client used invalid username '%s'", soap->userid); return 401; } - if(!AccountMgr::CheckPassword(accountId, soap->passwd)) + if (!AccountMgr::CheckPassword(accountId, soap->passwd)) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: invalid password for account '%s'", soap->userid); return 401; } - if(AccountMgr::GetSecurity(accountId) < SEC_ADMINISTRATOR) + if (AccountMgr::GetSecurity(accountId) < SEC_ADMINISTRATOR) { sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: %s's gmlevel is too low", soap->userid); return 403; } - if(!command || !*command) + if (!command || !*command) return soap_sender_fault(soap, "Command mustn't be empty", "The supplied command was an empty string"); sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: got command '%s'", command); @@ -117,7 +117,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result) // wait for callback to complete command int acc = connection.pendingCommands.acquire(); - if(acc) + if (acc) { sLog->outError("TCSoap: Error while acquiring lock, acc = %i, errno = %u", acc, errno); } @@ -125,7 +125,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result) // alright, command finished char* printBuffer = soap_strdup(soap, connection.m_printBuffer.c_str()); - if(connection.hasCommandSucceeded()) + if (connection.hasCommandSucceeded()) { *result = printBuffer; return SOAP_OK; diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 75020b7e7bd..a8c0d91b2e6 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2044,7 +2044,7 @@ Rate.Drop.Item.ReferencedAmount = 1 # Description: Experience rates. # Default: 1 - (Rate.XP.Kill) # 1 - (Rate.XP.Quest) -# 1 - ( Rate.XP.Explore) +# 1 - (Rate.XP.Explore) Rate.XP.Kill = 1 Rate.XP.Quest = 1 @@ -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 + +# ################################################################################################### |