diff options
Diffstat (limited to 'src')
795 files changed, 2747 insertions, 280 deletions
diff --git a/src/bindings/interface/ScriptMgr.cpp b/src/bindings/interface/ScriptMgr.cpp index abbde65c51a..81e017685d6 100644 --- a/src/bindings/interface/ScriptMgr.cpp +++ b/src/bindings/interface/ScriptMgr.cpp @@ -320,3 +320,4 @@ void ScriptedAI::DoGoHome() m_creature->GetMotionMaster()->MoveTargetedHome(); } */ + diff --git a/src/bindings/interface/ScriptMgr.h b/src/bindings/interface/ScriptMgr.h index 2296d2247de..3954616d382 100644 --- a/src/bindings/interface/ScriptMgr.h +++ b/src/bindings/interface/ScriptMgr.h @@ -159,3 +159,4 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI }; #endif + diff --git a/src/bindings/interface/Scripts/sc_default.cpp b/src/bindings/interface/Scripts/sc_default.cpp index f6c8386579f..56ec01c4205 100644 --- a/src/bindings/interface/Scripts/sc_default.cpp +++ b/src/bindings/interface/Scripts/sc_default.cpp @@ -119,3 +119,4 @@ void AddSC_default() m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/interface/Scripts/sc_defines.cpp b/src/bindings/interface/Scripts/sc_defines.cpp index 45456a1d5e2..922beebfc46 100644 --- a/src/bindings/interface/Scripts/sc_defines.cpp +++ b/src/bindings/interface/Scripts/sc_defines.cpp @@ -152,3 +152,4 @@ uint32 GetSkillLevel(Player *player,uint32 trskill) return TRADESKILL_LEVEL_NONE; } + diff --git a/src/bindings/interface/Scripts/sc_defines.h b/src/bindings/interface/Scripts/sc_defines.h index ecd55aa7282..f9bac67683c 100644 --- a/src/bindings/interface/Scripts/sc_defines.h +++ b/src/bindings/interface/Scripts/sc_defines.h @@ -96,3 +96,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill); // ----------------------------------- #endif + diff --git a/src/bindings/interface/config.h b/src/bindings/interface/config.h index ab312d7d3f4..3899d7892a1 100644 --- a/src/bindings/interface/config.h +++ b/src/bindings/interface/config.h @@ -31,3 +31,4 @@ #else #define TRINITY_DLL_EXPORT extern "C" export #endif + diff --git a/src/bindings/interface/system.cpp b/src/bindings/interface/system.cpp index 20eaf9ce64c..05e932ca3ae 100644 --- a/src/bindings/interface/system.cpp +++ b/src/bindings/interface/system.cpp @@ -25,3 +25,4 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD /*ul_reason_for_call*/, LPVOID return true; } #endif + diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index b59f07f8846..2ab7c3c29a3 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -2136,3 +2136,4 @@ InstanceData* CreateInstanceData(Map *map) return tmpscript->GetInstanceData(map); } + diff --git a/src/bindings/scripts/ScriptMgr.h b/src/bindings/scripts/ScriptMgr.h index ebc102f32d9..5f9ab9b8ae1 100644 --- a/src/bindings/scripts/ScriptMgr.h +++ b/src/bindings/scripts/ScriptMgr.h @@ -82,3 +82,4 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL); #endif #endif + diff --git a/src/bindings/scripts/include/precompiled.cpp b/src/bindings/scripts/include/precompiled.cpp index faeca72cd2b..75bfae9e1c4 100644 --- a/src/bindings/scripts/include/precompiled.cpp +++ b/src/bindings/scripts/include/precompiled.cpp @@ -3,3 +3,4 @@ * Please see the included DOCS/LICENSE.TXT for more information */ #include "precompiled.h" + diff --git a/src/bindings/scripts/include/precompiled.h b/src/bindings/scripts/include/precompiled.h index ea771653483..28b37a98349 100644 --- a/src/bindings/scripts/include/precompiled.h +++ b/src/bindings/scripts/include/precompiled.h @@ -28,3 +28,4 @@ LPVOID lpReserved #endif #endif + diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 2d767815dad..04ea6271d9d 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -843,7 +843,7 @@ void LoadOverridenSQLData() // Sunwell Plateau : Kalecgos : Spectral Rift goInfo = const_cast<GameObjectInfo*>(GetGameObjectInfo(187055)); if(goInfo && goInfo->type == GAMEOBJECT_TYPE_GOOBER) - goInfo->type = GAMEOBJECT_TYPE_SPELLCASTER; + goInfo->goober.lockId = 57; // need LOCKTYPE_QUICK_OPEN } void LoadOverridenDBCData() @@ -855,3 +855,4 @@ void LoadOverridenDBCData() if(spellInfo) spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends } + diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 30769927501..5639ad0f1ff 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -205,3 +205,4 @@ struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI }; #endif + diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 1bb984f8962..4f3188104eb 100644 --- a/src/bindings/scripts/include/sc_gossip.h +++ b/src/bindings/scripts/include/sc_gossip.h @@ -189,3 +189,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill); #define QUEST_DIALOG_STATUS(a,b,c) GetSession()->getDialogStatus(a,b,c) #endif + diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index 25be77f876c..2f1cd3a16a6 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData }; #endif + diff --git a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp index 9208672c01f..1c1b7312cb3 100644 --- a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp +++ b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp @@ -64,3 +64,4 @@ void AddSC_areatrigger_scripts() newscript->pAreaTrigger = &AreaTrigger_at_legion_teleporter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp index 5f857730d9a..15a813cd455 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp @@ -154,3 +154,4 @@ void AddSC_boss_emeriss() newscript->GetAI = &GetAI_boss_emeriss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_lethon.cpp b/src/bindings/scripts/scripts/boss/boss_lethon.cpp index 612fcf596f7..e387891efed 100644 --- a/src/bindings/scripts/scripts/boss/boss_lethon.cpp +++ b/src/bindings/scripts/scripts/boss/boss_lethon.cpp @@ -22,3 +22,4 @@ SDCategory: Bosses EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp index cbe1cffa6b7..0de457f4094 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp @@ -304,3 +304,4 @@ void AddSC_boss_taerar() newscript->GetAI = &GetAI_boss_shadeoftaerar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp index c04076bc716..44795b41750 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp @@ -244,3 +244,4 @@ void AddSC_boss_ysondre() newscript->GetAI = &GetAI_mob_dementeddruids; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp index e23a262ed4f..45545c8c6aa 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -1398,3 +1398,4 @@ void AddSC_mob_event() newscript->GetAI = &GetAI_Mob_EventAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.h b/src/bindings/scripts/scripts/creature/mob_event_ai.h index 930905158ba..a04c97e9885 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.h +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.h @@ -218,3 +218,4 @@ extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPrevent #define EVENTAI_EMPTY_EVENTLIST "SD2: Eventlist for Creature %i is empty but creature is using Mob_EventAI. Preventing EventAI on this creature." */ #endif + diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index b28f38516ce..79ffef4ad54 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -170,3 +170,4 @@ void AddSC_generic_creature() newscript->GetAI = &GetAI_generic_creature; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/simple_ai.cpp b/src/bindings/scripts/scripts/creature/simple_ai.cpp index 59d59818ef3..54ef8a6a705 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.cpp +++ b/src/bindings/scripts/scripts/creature/simple_ai.cpp @@ -292,3 +292,4 @@ void SimpleAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } + diff --git a/src/bindings/scripts/scripts/creature/simple_ai.h b/src/bindings/scripts/scripts/creature/simple_ai.h index 7cfdb8979d1..733dcca6e22 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.h +++ b/src/bindings/scripts/scripts/creature/simple_ai.h @@ -72,3 +72,4 @@ protected: }; #endif + diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp new file mode 100644 index 00000000000..aae7fccbd57 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/custom_example.cpp @@ -0,0 +1,278 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Custom_Example +SD%Complete: 100 +SDComment: Short custom scripting example +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" + +// **** This script is designed as an example for others to build on **** +// **** Please modify whatever you'd like to as this script is only for developement **** + +// **** Script Info **** +// This script is written in a way that it can be used for both friendly and hostile monsters +// Its primary purpose is to show just how much you can really do with scripts +// I recommend trying it out on both an agressive NPC and on friendly npc + +// **** Quick Info **** +// Functions with Handled Function marked above them are functions that are called automatically by the core +// Functions that are marked Custom Function are functions I've created to simplify code + +#define SPELL_BUFF 25661 +#define SPELL_ONE 12555 +#define SPELL_ONE_ALT 24099 +#define SPELL_TWO 10017 +#define SPELL_THREE 26027 +#define SPELL_ENRAGE 23537 +#define SPELL_BESERK 32309 + +#define SAY_AGGRO "Let the games begin." +#define SAY_RANDOM_0 "I see endless suffering. I see torment. I see rage. I see everything." +#define SAY_RANDOM_1 "Muahahahaha" +#define SAY_RANDOM_2 "These mortal infedels my lord, they have invaded your sanctum and seek to steal your secrets." +#define SAY_RANDOM_3 "You are already dead." +#define SAY_RANDOM_4 "Where to go? What to do? So many choices that all end in pain, end in death." +#define SAY_BESERK "$N, I sentance you to death!" +#define SAY_PHASE "The suffering has just begun!" + +#define GOSSIP_ITEM "I'm looking for a fight" +#define SAY_DANCE "I always thought I was a good dancer" +#define SAY_SALUTE "Move out Soldier!" + +struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI +{ + //*** HANDLED FUNCTION *** + //This is the constructor, called only once when the creature is first created + custom_exampleAI(Creature *c) : ScriptedAI(c) {Reset();} + + //*** CUSTOM VARIABLES **** + //These variables are for use only by this individual script. + //Nothing else will ever call them but us. + + uint32 Say_Timer; //Timer for random chat + uint32 Rebuff_Timer; //Timer for rebuffing + uint32 Spell_1_Timer; //Timer for spell 1 when in combat + uint32 Spell_2_Timer; //Timer for spell 1 when in combat + uint32 Spell_3_Timer; //Timer for spell 1 when in combat + uint32 Beserk_Timer; //Timer until we go into Beserk (enraged) mode + uint32 Phase; //The current battle phase we are in + uint32 Phase_Timer; //Timer until phase transition + + //*** HANDLED FUNCTION *** + //This is called whenever the core decides we need to evade + void Reset() + { + Phase = 1; //Start in phase 1 + Phase_Timer = 60000; //60 seconds + Spell_1_Timer = 5000; //5 seconds + Spell_2_Timer = 37000; //37 seconds + Spell_3_Timer = 19000; //19 seconds + Beserk_Timer = 120000; //2 minutes + } + + //*** HANDLED FUNCTION *** + //Attack Start is called whenever someone hits us. + void Aggro(Unit *who) + { + //Say some stuff + DoSay(SAY_AGGRO,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8280); + } + + //*** HANDLED FUNCTION *** + //Update AI is called Every single map update (roughly once every 100ms if a player is within the grid) + void UpdateAI(const uint32 diff) + { + //Out of combat timers + if (!m_creature->getVictim()) + { + //Random Say timer + if (Say_Timer < diff) + { + //Random switch between 5 outcomes + switch (rand()%5) + { + case 0: + DoYell(SAY_RANDOM_0,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8831); //8831 is the index of the sound we are playing. You find these numbers in SoundEntries.dbc + break; + + case 1: + DoYell(SAY_RANDOM_1,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8818); + break; + + case 2: + DoYell(SAY_RANDOM_2,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8041); + break; + + case 3: + DoYell(SAY_RANDOM_3,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8581); + break; + + case 4: + DoYell(SAY_RANDOM_4,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8791); + break; + } + + Say_Timer = 45000; //Say something agian in 45 seconds + }else Say_Timer -= diff; + + //Rebuff timer + if (Rebuff_Timer < diff) + { + DoCast(m_creature,SPELL_BUFF); + Rebuff_Timer = 900000; //Rebuff agian in 15 minutes + }else Rebuff_Timer -= diff; + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Spell 1 timer + if (Spell_1_Timer < diff) + { + //Cast spell one on our current target. + if (rand()%50 > 10) + DoCast(m_creature->getVictim(),SPELL_ONE_ALT); + else if (m_creature->GetDistance(m_creature->getVictim()) < 25) + DoCast(m_creature->getVictim(),SPELL_ONE); + + Spell_1_Timer = 5000; + }else Spell_1_Timer -= diff; + + //Spell 2 timer + if (Spell_2_Timer < diff) + { + //Cast spell one on our current target. + DoCast(m_creature->getVictim(),SPELL_TWO); + + Spell_2_Timer = 37000; + }else Spell_2_Timer -= diff; + + //Spell 3 timer + if (Phase > 1) + if (Spell_3_Timer < diff) + { + //Cast spell one on our current target. + DoCast(m_creature->getVictim(),SPELL_THREE); + + Spell_3_Timer = 19000; + }else Spell_3_Timer -= diff; + + //Beserk timer + if (Phase > 1) + if (Beserk_Timer < diff) + { + //Say our line then cast uber death spell + DoPlaySoundToSet(m_creature,8588); + DoYell(SAY_BESERK,LANG_UNIVERSAL,m_creature->getVictim()); + DoCast(m_creature->getVictim(),SPELL_BESERK); + + //Cast our beserk spell agian in 12 seconds if we didn't kill everyone + Beserk_Timer = 12000; + }else Beserk_Timer -= diff; + + //Phase timer + if (Phase == 1) + if (Phase_Timer < diff) + { + //Go to next phase + Phase++; + DoYell(SAY_PHASE,LANG_UNIVERSAL,NULL); + DoCast(m_creature,SPELL_ENRAGE); + }else Phase_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//This is the GetAI method used by all scripts that involve AI +//It is called every time a new creature using this script is created +CreatureAI* GetAI_custom_example(Creature *_Creature) +{ + return new custom_exampleAI (_Creature); +} + +//This function is called when the player clicks an option on the gossip menu +void SendDefaultMenu_custom_example(Player *player, Creature *_Creature, uint32 action) +{ + if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + { + //Set our faction to hostile twoards all + _Creature->setFaction(24); + _Creature->Attack(player, true); + player->PlayerTalkClass->CloseGossip(); + } +} + +//This function is called when the player clicks an option on the gossip menu +bool GossipSelect_custom_example(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if (sender == GOSSIP_SENDER_MAIN) + SendDefaultMenu_custom_example(player, _Creature, action); + + return true; +} + +//This function is called when the player opens the gossip menu +bool GossipHello_custom_example(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM( 0, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + + return true; +} + +//Our Recive emote function +bool ReceiveEmote_custom_example(Player *player, Creature *_Creature, uint32 emote) +{ + _Creature->HandleEmoteCommand(emote); + + if (emote == TEXTEMOTE_DANCE) + ((custom_exampleAI*)_Creature->AI())->DoSay(SAY_DANCE,LANG_UNIVERSAL,NULL); + + if (emote == TEXTEMOTE_SALUTE) + ((custom_exampleAI*)_Creature->AI())->DoSay(SAY_SALUTE,LANG_UNIVERSAL,NULL); + + return true; +} + +//This is the actual function called only once durring InitScripts() +//It must define all handled functions that are to be run in this script +//For example if you want this Script to handle Emotes you must include +//newscript->ReciveEmote = My_Emote_Function; +void AddSC_custom_example() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="custom_example"; + newscript->GetAI = &GetAI_custom_example; + newscript->pGossipHello = &GossipHello_custom_example; + newscript->pGossipSelect = &GossipSelect_custom_example; + newscript->pReceiveEmote = &ReceiveEmote_custom_example; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp new file mode 100644 index 00000000000..699f5377ee9 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp @@ -0,0 +1,82 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Custom_Gossip_Codebox +SD%Complete: 100 +SDComment: Show a codebox in gossip option +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" +#include <cstring> + +//This function is called when the player opens the gossip menubool +bool GossipHello_custom_gossip_codebox(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); + player->ADD_GOSSIP_ITEM(0, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + + player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + return true; +} + +//This function is called when the player clicks an option on the gossip menubool +bool GossipSelect_custom_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if(action == GOSSIP_ACTION_INFO_DEF+2) + { + _Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); + player->CLOSE_GOSSIP_MENU(); + } + return true; +} + +bool GossipSelectWithCode_custom_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) +{ + if(sender == GOSSIP_SENDER_MAIN) + { + if(action == GOSSIP_ACTION_INFO_DEF+1) + { + if(std::strcmp(sCode, player->GetName())!=0) + { + _Creature->Say("Wrong!", LANG_UNIVERSAL, 0); + _Creature->CastSpell(player, 12826, true); + } + else + { + _Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0); + _Creature->CastSpell(player, 26990, true); + } + player->CLOSE_GOSSIP_MENU(); + return true; + } + } + return false; +} + +void AddSC_custom_gossip_codebox() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="custom_gossip_codebox"; + newscript->pGossipHello = &GossipHello_custom_gossip_codebox; + newscript->pGossipSelect = &GossipSelect_custom_gossip_codebox; + newscript->pGossipSelectWithCode = &GossipSelectWithCode_custom_gossip_codebox; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp new file mode 100644 index 00000000000..b4e2780c4f1 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/test.cpp @@ -0,0 +1,201 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Test +SD%Complete: 100 +SDComment: Script used for testing escortAI +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" +#include "../npc/npc_escortAI.h" + +struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI +{ + public: + + // CreatureAI functions + npc_testAI(Creature *c) : npc_escortAI(c) {Reset();} + + uint32 DeathCoilTimer; + uint32 ChatTimer; + + // Pure Virtual Functions + void WaypointReached(uint32 i) + { + switch (i) + { + case 1: + m_creature->Say("Hmm a nice day for a walk alright", LANG_UNIVERSAL, 0); + break; + + case 3: + { + m_creature->Say("Wild Felboar attack!", LANG_UNIVERSAL, 0); + Creature* temp = m_creature->SummonCreature(21878, m_creature->GetPositionX()+5, m_creature->GetPositionY()+7, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000); + + temp->AI()->AttackStart(m_creature); + } + break; + + case 4: + { + m_creature->Say("Time for me to go! See ya around $N!", LANG_UNIVERSAL, PlayerGUID); + m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + + Unit* temp = Unit::GetUnit(*m_creature, PlayerGUID); + if (temp) + { + temp->MonsterSay("Bye Bye!", LANG_UNIVERSAL, 0); + temp->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + } + } + break; + } + } + + void Aggro(Unit*) + { + if (IsBeingEscorted) + m_creature->Say("Help $N! I'm under attack!", LANG_UNIVERSAL, PlayerGUID); + else m_creature->Say("Die scum!", LANG_UNIVERSAL, 0); + } + + void Reset() + { + DeathCoilTimer = 4000; + ChatTimer = 4000; + } + + void JustDied(Unit* killer) + { + if (IsBeingEscorted) + { + //killer = m_creature when player got to far from creature + if (killer == m_creature) + { + Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID); + if( pTemp ) + DoWhisper("How dare you leave me like that! I hate you! =*(", pTemp); + } + else m_creature->Say("...no...how could you let me die $N", LANG_UNIVERSAL, PlayerGUID); + } + else m_creature->Say("ugh...", LANG_UNIVERSAL, 0); + } + + void UpdateAI(const uint32 diff) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + + //Combat check + if (InCombat && m_creature->getVictim()) + { + if (DeathCoilTimer < diff) + { + m_creature->Say("Taste death!", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature->getVictim(), 33130, false); + + DeathCoilTimer = 4000; + }else DeathCoilTimer -= diff; + }else + { + //Out of combat but being escorted + if (IsBeingEscorted) + if (ChatTimer < diff) + { + if (m_creature->HasAura(3593, 0)) + { + m_creature->Say("Fireworks!", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature, 11540, false); + }else + { + m_creature->Say("Hmm, I think I could use a buff", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature, 3593, false); + } + + ChatTimer = 12000; + }else ChatTimer -= diff; + } + } +}; + +CreatureAI* GetAI_test(Creature *_Creature) +{ + npc_testAI* testAI = new npc_testAI(_Creature); + + testAI->AddWaypoint(0, 1231, -4419, 23); + testAI->AddWaypoint(1, 1198, -4440, 23, 0); + testAI->AddWaypoint(2, 1208, -4392, 23); + testAI->AddWaypoint(3, 1231, -4419, 23, 5000); + testAI->AddWaypoint(4, 1208, -4392, 23, 5000); + + return (CreatureAI*)testAI; +} + +bool GossipHello_npc_test(Player *player, Creature *_Creature) +{ + player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); + _Creature->prepareGossipMenu(player,0); + + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + + _Creature->sendPreparedGossip( player ); + return true; +} + +bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if (action == GOSSIP_ACTION_INFO_DEF+1) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(true, true, true, player->GetGUID()); + + return true; // prevent Trinity core handling + } + + if (action == GOSSIP_ACTION_INFO_DEF+2) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(false, false, false, player->GetGUID()); + + return true; // prevent Trinity core handling + } + + if (action == GOSSIP_ACTION_INFO_DEF+3) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(false, true, false, player->GetGUID()); + + return true; // prevent Trinity core handling + } + return false; +} + +void AddSC_test() +{ + Script *newscript; + newscript = new Script; + newscript->Name="test"; + newscript->GetAI = &GetAI_test; + newscript->pGossipHello = &GossipHello_npc_test; + newscript->pGossipSelect = &GossipSelect_npc_test; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp index de4666ce43d..07eb4656563 100644 --- a/src/bindings/scripts/scripts/go/go_scripts.cpp +++ b/src/bindings/scripts/scripts/go/go_scripts.cpp @@ -191,3 +191,4 @@ void AddSC_go_scripts() newscript->pGOHello = &GOHello_go_tablet_of_the_seven; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/guard/guard_ai.cpp b/src/bindings/scripts/scripts/guard/guard_ai.cpp index d7d56b29bd5..b635ae74b2d 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.cpp +++ b/src/bindings/scripts/scripts/guard/guard_ai.cpp @@ -169,3 +169,4 @@ void guardAI::UpdateAI(const uint32 diff) } } } + diff --git a/src/bindings/scripts/scripts/guard/guard_ai.h b/src/bindings/scripts/scripts/guard/guard_ai.h index d6fa9bb4168..6b346aefbb3 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.h +++ b/src/bindings/scripts/scripts/guard/guard_ai.h @@ -23,3 +23,4 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI void UpdateAI(const uint32 diff); }; #endif + diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 7cb0e3376cb..b825c75b6ab 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -4071,3 +4071,4 @@ void AddSC_guards() newscript->GetAI = &GetAI_guard_undercity; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp index 53f00ae5e85..b749b5f087f 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/item/item_scripts.cpp @@ -593,3 +593,4 @@ void AddSC_item_scripts() newscript->pItemUse = &ItemUse_item_zezzak_shard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/item/item_test.cpp b/src/bindings/scripts/scripts/item/item_test.cpp new file mode 100644 index 00000000000..4fc8ea221db --- /dev/null +++ b/src/bindings/scripts/scripts/item/item_test.cpp @@ -0,0 +1,43 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Item_Test +SD%Complete: 100 +SDComment: Used for Testing Item Scripts +SDCategory: Items +EndScriptData */ + +#include "precompiled.h" + +extern void LoadDatabase(); + +bool ItemUse_item_test(Player *player, Item* _Item, SpellCastTargets const& targets) +{ + LoadDatabase(); + return true; +} + +void AddSC_item_test() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="item_test"; + newscript->pItemUse = &ItemUse_item_test; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index ba321886496..d9089fe0ccc 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -300,3 +300,4 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) //Disable questgiver flag m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } + diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.h b/src/bindings/scripts/scripts/npc/npc_escortAI.h index e617a1cef4e..af0d3f64aa5 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.h +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.h @@ -85,3 +85,4 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI bool Run; }; #endif + diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp index f3be85c5c2d..7e01a85719d 100644 --- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp @@ -142,3 +142,4 @@ void AddSC_npc_innkeeper() newscript->pGossipSelect = &GossipSelect_npc_innkeeper; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp index 21e0c55aec8..e121e598528 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp @@ -1201,3 +1201,4 @@ void AddSC_npc_professions() //newscript->pGossipSelect = &GossipSelect_go_soothsaying_for_dummies; newscript->RegisterSelf();*/ } + diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 7b4111b2280..82edfa96e40 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -1213,3 +1213,4 @@ void AddSC_npcs_special() newscript->GetAI = &GetAI_npc_snake_trap_serpents; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp index f1dfcf13859..10736c84acd 100644 --- a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp @@ -60,3 +60,4 @@ void AddSC_alterac_mountains() newscript->GetAI = &GetAI_npc_ravenholdt; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index fbde7783b67..b3f92e93408 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -162,3 +162,4 @@ void AddSC_arathi_highlands() newscript->pQuestAccept = &QuestAccept_npc_professor_phizzlethorpe; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index e98fb43cdb6..0192ac01a4a 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -317,3 +317,4 @@ void AddSC_ashenvale() newscript->pQuestAccept = &QuestAccept_npc_ruul_snowhoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index 1a9c3b49e76..de1cc812df8 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -356,3 +356,4 @@ void AddSC_boss_exarch_maladaar() newscript->GetAI = &GetAI_mob_stolen_soul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 4d9879151ce..4df3bc3c356 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -208,4 +208,5 @@ void AddSC_boss_shirrak_the_dead_watcher() newscript->Name="mob_focus_fire"; newscript->GetAI = &GetAI_mob_focus_fire; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index e5cd5ecbe07..02e34437474 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -287,3 +287,4 @@ void AddSC_boss_nexusprince_shaffar() newscript->GetAI = &GetAI_mob_ethereal_beacon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp index 6434ca5ce3b..067ca215169 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp @@ -136,3 +136,4 @@ void AddSC_boss_pandemonius() newscript->GetAI = &GetAI_boss_pandemonius; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp index dd534ed9c9e..046ce673b3f 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -440,3 +440,4 @@ void AddSC_boss_darkweaver_syth() newscript->GetAI = &GetAI_mob_syth_shadow; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 572497a482f..53953e04d51 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -219,3 +219,4 @@ void AddSC_boss_talon_king_ikiss() newscript->GetAI = &GetAI_boss_talon_king_ikiss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h index 8c4bc572541..698571faecc 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h @@ -7,3 +7,4 @@ #define DATA_IKISSDOOREVENT 1 #endif + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp index 718edc2cfc9..3d53f7b29e8 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp @@ -72,3 +72,4 @@ void AddSC_instance_sethekk_halls() newscript->GetInstanceData = &GetInstanceData_instance_sethekk_halls; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 730546cc4c7..b77a2ec7702 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -203,3 +203,4 @@ void AddSC_boss_ambassador_hellmaw() newscript->GetAI = &GetAI_boss_ambassador_hellmaw; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index d586955c3a8..49b5524d51a 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -175,3 +175,4 @@ void AddSC_boss_blackheart_the_inciter() newscript->GetAI = &GetAI_boss_blackheart_the_inciter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index e6c8783d50c..9e2b88dfd83 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -321,3 +321,4 @@ void AddSC_boss_grandmaster_vorpil() newscript->GetAI = &GetAI_mob_voidtraveler; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 79747210c5e..e5ed8173431 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -201,3 +201,4 @@ void AddSC_boss_murmur() newscript->GetAI = &GetAI_boss_murmur; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h index f2284e3bdb3..a78955368bf 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h @@ -12,3 +12,4 @@ #define DATA_MURMUREVENT 5 #define DATA_GRANDMASTERVORPIL 6 #endif + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index 6c0f768a924..03605ab4eb7 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -244,3 +244,4 @@ void AddSC_instance_shadow_labyrinth() newscript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index e1a95a6c68e..4428f17ea21 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -515,3 +515,4 @@ void AddSC_azshara() newscript->GetAI = &GetAI_mob_depth_charge; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index 9ee612e6f3f..adc985aaef9 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -152,3 +152,4 @@ void AddSC_boss_azuregos() newscript->GetAI = &GetAI_boss_azuregos; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index 109268bd0e7..610590169d7 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -698,3 +698,4 @@ void AddSC_azuremyst_isle() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 8567da0859e..708b199d817 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -556,3 +556,4 @@ void AddSC_the_barrens() newscript->pQuestAccept = &QuestAccept_npc_wizzlecrank_shredder; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp index 54eebea4144..738c58eab2e 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp @@ -66,3 +66,4 @@ void AddSC_black_temple() newscript->pGossipSelect = &GossipSelect_npc_spirit_of_olum; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp index 48dcbc9bd35..aab2e8f79c5 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -345,3 +345,4 @@ void AddSC_boss_gurtogg_bloodboil() newscript->GetAI = &GetAI_boss_gurtogg_bloodboil; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index f49929c431b..755cf9a4ae3 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -2221,3 +2221,4 @@ void AddSC_boss_illidan() newscript->GetAI = &GetAI_parasitic_shadowfiend; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp index e8434ca7c99..3e6598ae374 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp @@ -313,3 +313,4 @@ void AddSC_boss_mother_shahraz() newscript->GetAI = &GetAI_boss_shahraz; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp index 561dd72dee2..a5fcea2923a 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp @@ -685,3 +685,4 @@ void AddSC_boss_reliquary_of_souls() newscript->GetAI = &GetAI_npc_enslaved_soul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index a99121588f3..d68b51e461f 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -836,3 +836,4 @@ void AddSC_boss_shade_of_akama() newscript->pGossipSelect = &GossipSelect_npc_akama; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index e82c35fad36..ac6d1091c60 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -311,3 +311,4 @@ void AddSC_boss_supremus() newscript->GetAI = &GetAI_npc_volcano; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index c776d9e7ba4..778874c9078 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -534,3 +534,4 @@ void AddSC_boss_teron_gorefiend() newscript->GetAI = &GetAI_boss_teron_gorefiend; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index ea2a7523b5a..55d2b5c8459 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -223,3 +223,4 @@ void AddSC_boss_najentus() newscript->pGOHello = &GOHello_go_najentus_spine; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h index b2ba677bd2e..4779f92fa4d 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h +++ b/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h @@ -32,3 +32,4 @@ #define DATA_GAMEOBJECT_SUPREMUS_DOORS 25 #define DATA_BLOOD_ELF_COUNCIL_VOICE 26 #endif + diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index 3b3701ba4da..21104389edf 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -865,3 +865,4 @@ void AddSC_boss_illidari_council() newscript->GetAI = &GetAI_boss_high_nethermancer_zerevor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp index 6f20c1394b4..56bef01ae14 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp @@ -349,3 +349,4 @@ void AddSC_instance_black_temple() newscript->GetInstanceData = &GetInstanceData_instance_black_temple; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index 23c40eb59cb..7941a93840d 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -1322,3 +1322,4 @@ void AddSC_blackrock_depths() newscript->pChooseReward = &ChooseReward_npc_rocknot; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp index df25607cdad..8ac58521395 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp @@ -104,3 +104,4 @@ void AddSC_boss_ambassador_flamelash() newscript->GetAI = &GetAI_boss_ambassador_flamelash; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp index 50cba319326..9df9b7039e6 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp @@ -113,3 +113,4 @@ void AddSC_boss_anubshiah() newscript->GetAI = &GetAI_boss_anubshiah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index a901465b9a2..4d7130dc3d0 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -102,3 +102,4 @@ void AddSC_boss_draganthaurissan() newscript->GetAI = &GetAI_boss_draganthaurissan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp index 62a9f26b635..192cd18fbfa 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp @@ -165,3 +165,4 @@ void AddSC_boss_general_angerforge() newscript->GetAI = &GetAI_boss_general_angerforge; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp index ca1a418be3d..b2241df6e9d 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -79,3 +79,4 @@ void AddSC_boss_gorosh_the_dervish() newscript->GetAI = &GetAI_boss_gorosh_the_dervish; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp index 85d79c0aaba..bd9b200ea69 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp @@ -86,3 +86,4 @@ void AddSC_boss_grizzle() newscript->GetAI = &GetAI_boss_grizzle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 6156ae84de7..65e4f6a0cf7 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -103,3 +103,4 @@ void AddSC_boss_high_interrogator_gerstahn() newscript->GetAI = &GetAI_boss_high_interrogator_gerstahn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp index 0913f18ee73..722f3f02e04 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp @@ -82,3 +82,4 @@ void AddSC_boss_magmus() newscript->GetAI = &GetAI_boss_magmus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp index 99bccbd1fb0..2f562123068 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp @@ -97,3 +97,4 @@ void AddSC_boss_moira_bronzebeard() newscript->GetAI = &GetAI_boss_moira_bronzebeard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp index d74b883917a..21fb384db57 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -641,3 +641,4 @@ void AddSC_boss_tomb_of_seven() newscript->pGossipSelect = &GossipSelect_boss_doomrel; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h index 355c557053a..58d963437bd 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h @@ -23,4 +23,5 @@ #define DATA_GO_BAR_KEG 16 #define DATA_GO_BAR_KEG_TRAP 17 #define DATA_GO_BAR_DOOR 18 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp index 62267fc63dd..e056f732158 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp @@ -304,4 +304,5 @@ InstanceData* GetInstanceData_instance_blackrock_depths(Map* map) newscript->Name = "instance_blackrock_depths"; newscript->GetInstanceData = &GetInstanceData_instance_blackrock_depths; newscript->RegisterSelf(); - }
\ No newline at end of file + } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp index c358973f9b1..9a909141eec 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp @@ -99,3 +99,4 @@ void AddSC_boss_drakkisath() newscript->GetAI = &GetAI_boss_drakkisath; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp index 4374295a84a..77725fb81d2 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp @@ -203,3 +203,4 @@ void AddSC_boss_gyth() newscript->GetAI = &GetAI_boss_gyth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp index 6562a3a55ef..437d85d6405 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp @@ -93,3 +93,4 @@ void AddSC_boss_halycon() newscript->GetAI = &GetAI_boss_halycon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp index eba93f971b4..20a37278863 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp @@ -129,3 +129,4 @@ void AddSC_boss_highlordomokk() newscript->GetAI = &GetAI_boss_highlordomokk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp index ccefc6a4de6..db30e876ec3 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp @@ -84,3 +84,4 @@ void AddSC_boss_mothersmolderweb() newscript->GetAI = &GetAI_boss_mothersmolderweb; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp index 88156799b72..c8ba7a91e8e 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -125,3 +125,4 @@ void AddSC_boss_overlordwyrmthalak() newscript->GetAI = &GetAI_boss_overlordwyrmthalak; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp index b85b08cf06f..f54494d80d1 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -91,3 +91,4 @@ void AddSC_boss_pyroguard_emberseer() newscript->GetAI = &GetAI_boss_pyroguard_emberseer; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp index 3202efe3746..b0977de9696 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp @@ -83,3 +83,4 @@ void AddSC_boss_quatermasterzigris() newscript->GetAI = &GetAI_boss_quatermasterzigris; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp index d11105e1b73..46ed8545fad 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp @@ -89,3 +89,4 @@ void AddSC_boss_rend_blackhand() newscript->GetAI = &GetAI_boss_rend_blackhand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index bb9c8f4805c..0d41ca5227f 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -93,3 +93,4 @@ void AddSC_boss_shadowvosh() newscript->GetAI = &GetAI_boss_shadowvosh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp index df3f42ce9e9..855b3539dd2 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp @@ -91,3 +91,4 @@ void AddSC_boss_thebeast() newscript->GetAI = &GetAI_boss_thebeast; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp index 7ca629a0ec9..e59cecea060 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp @@ -119,3 +119,4 @@ void AddSC_boss_warmastervoone() newscript->GetAI = &GetAI_boss_warmastervoone; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp index e8261e65720..71fb5e9a022 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -126,3 +126,4 @@ void AddSC_boss_broodlord() newscript->GetAI = &GetAI_boss_broodlord; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp index d6bf9ba5429..6d73fdf93e9 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp @@ -312,3 +312,4 @@ void AddSC_boss_chromaggus() newscript->GetAI = &GetAI_boss_chromaggus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp index bfc108e63e6..981bd74d02c 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp @@ -101,3 +101,4 @@ void AddSC_boss_ebonroc() newscript->GetAI = &GetAI_boss_ebonroc; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp index 77e74c3666b..a2613feff20 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp @@ -92,3 +92,4 @@ void AddSC_boss_firemaw() newscript->GetAI = &GetAI_boss_firemaw; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp index bf40552d656..9c2b5f28387 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp @@ -95,3 +95,4 @@ void AddSC_boss_flamegor() newscript->GetAI = &GetAI_boss_flamegor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp index c7f06dd78c9..548baf49ca3 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp @@ -225,3 +225,4 @@ void AddSC_boss_nefarian() newscript->GetAI = &GetAI_boss_nefarian; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp index 764e3bac587..479e81d1d87 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp @@ -129,3 +129,4 @@ void AddSC_boss_razorgore() newscript->GetAI = &GetAI_boss_razorgore; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp index 7ba48f84029..46ee49fb1be 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -259,3 +259,4 @@ void AddSC_boss_vael() newscript->pGossipSelect = &GossipSelect_boss_vael; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index 83303fa49d1..ad437f24275 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -392,3 +392,4 @@ void AddSC_boss_victor_nefarius() newscript->pGossipSelect = &GossipSelect_boss_victor_nefarius; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp index 78eb73673aa..97bf717589a 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp @@ -22,3 +22,4 @@ SDCategory: Blackwing Lair EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index 4c215eb4ad0..d3803705ce4 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -489,3 +489,4 @@ void AddSC_blades_edge_mountains() newscript->pGossipSelect = &GossipSelect_npc_skyguard_handler_irena; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp index 9d6be6e6471..432633e90fe 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp @@ -159,3 +159,4 @@ void AddSC_blasted_lands() newscript->pGossipSelect = &GossipSelect_npc_fallen_hero_of_horde; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp index 8c77b4f314c..ae21c17b526 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp @@ -180,3 +180,4 @@ void AddSC_boss_kruul() newscript->GetAI = &GetAI_boss_kruul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp index 3c3a622b49d..2d13e3168a8 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -139,3 +139,4 @@ void AddSC_bloodmyst_isle() newscript->pGossipSelect = &GossipSelect_npc_captured_sunhawk_agent; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp index 2f5e4b98e81..59fbfae60d8 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -151,3 +151,4 @@ void AddSC_burning_steppes() newscript->pGossipSelect = &GossipSelect_npc_ragged_john; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp index cf698736945..6599eab6a4e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -146,3 +146,4 @@ void AddSC_boss_aeonus() newscript->GetAI = &GetAI_boss_aeonus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index e99ba2284c3..636c4a5270e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -134,3 +134,4 @@ void AddSC_boss_chrono_lord_deja() newscript->GetAI = &GetAI_boss_chrono_lord_deja; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp index ddb8ac093f3..ed84d5548c7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp @@ -136,3 +136,4 @@ void AddSC_boss_temporus() newscript->GetAI = &GetAI_boss_temporus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 6da6dd631e7..e453d83beef 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -403,3 +403,4 @@ void AddSC_dark_portal() newscript->pGossipSelect = &GossipSelect_npc_saat; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h index 21d999cb554..7bfd8c917d7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h @@ -31,4 +31,5 @@ #define C_EXECU 18994 #define C_VANQU 18995 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index 9be48dd8e53..bfb4e4daf41 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -376,3 +376,4 @@ void AddSC_instance_dark_portal() newscript->GetInstanceData = &GetInstanceData_instance_dark_portal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index d822a3a43e1..ec6776daa63 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -745,3 +745,4 @@ void AddSC_boss_archimonde() newscript->GetAI = &GetAI_mob_ancient_wisp; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h index 66245ce0845..f33f9a95da3 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h @@ -27,3 +27,4 @@ #define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy" #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index 5d033206dfa..98d5c352d3f 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -247,3 +247,4 @@ void AddSC_hyjal() newscript->GetAI = &GetAI_npc_tyrande_whisperwind; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index c605bc78540..960cea141c9 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -476,3 +476,4 @@ void hyjalAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h index 34895aedae2..135afede0b7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h @@ -212,3 +212,4 @@ struct TRINITY_DLL_DECL hyjalAI : public ScriptedAI std::list<uint64> CreatureList; }; #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp index 51fd3c5be2c..63256988e27 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp @@ -208,3 +208,4 @@ void AddSC_instance_mount_hyjal() newscript->GetInstanceData = &GetInstanceData_instance_mount_hyjal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index 8c8a8e1eef0..e21cc826978 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -154,3 +154,4 @@ void AddSC_boss_captain_skarloc() newscript->GetAI = &GetAI_boss_captain_skarloc; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index b0ddea1e1bd..863a3d9d5d1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -148,3 +148,4 @@ void AddSC_boss_epoch_hunter() newscript->GetAI = &GetAI_boss_epoch_hunter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 6a0214a7505..9b938d4d18b 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -193,3 +193,4 @@ void AddSC_boss_lieutenant_drake() newscript->GetAI = &GetAI_boss_lieutenant_drake; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h index 91f4ee1e3bb..95934718599 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h @@ -15,3 +15,4 @@ #define DATA_TARETHA 8 #define WORLD_STATE_OH 2436 #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 92e0d0bc161..92d9c7c10a6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -233,3 +233,4 @@ void AddSC_instance_old_hillsbrad() newscript->GetInstanceData = &GetInstanceData_instance_old_hillsbrad; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index e69699d46f8..bc18f91e795 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -859,3 +859,4 @@ void AddSC_old_hillsbrad() newscript->GetAI = &GetAI_npc_taretha; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index e20c3f3429c..22d539db2ab 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -761,3 +761,4 @@ void AddSC_boss_fathomlord_karathress() newscript->GetAI = &GetAI_boss_fathomguard_caribdis; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index f4c1979bb13..665af987a6d 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -384,3 +384,4 @@ void AddSC_boss_hydross_the_unstable() newscript->GetAI = &GetAI_boss_hydross_the_unstable; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 7631a2efe97..962d05e6c87 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -1075,3 +1075,4 @@ void AddSC_boss_lady_vashj() newscript->pItemUse = &ItemUse_item_tainted_core; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 47e3a97621a..ae12d1fe47f 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -815,3 +815,4 @@ void AddSC_boss_leotheras_the_blind() newscript->GetAI = &GetAI_mob_inner_demon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 04a4d6d6316..6d1fc0a9d51 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -487,3 +487,4 @@ void AddSC_boss_the_lurker_below() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 71c1b8a388e..f243126e0d3 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -368,3 +368,4 @@ void AddSC_boss_morogrim_tidewalker() newscript->GetAI = &GetAI_mob_water_globule; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h index ddcde2ffed2..13144bc93c0 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h @@ -29,3 +29,4 @@ #define DATA_CONTROL_CONSOLE 22 #define DATA_STRANGE_POOL 23 #endif + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index c0b14b639ae..cb09a10cd51 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -289,3 +289,4 @@ void AddSC_instance_serpentshrine_cavern() newscript->pGOHello = &GOHello_go_bridge_console; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp index 5c8ee98efa7..aab4fbd1a85 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp @@ -63,3 +63,4 @@ void AddSC_boss_rokmar_the_crackler() newscript->GetAI = GetAI_boss_rokmar_the_crackler; m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 6f75a8fd96e..5fd7837d911 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -195,3 +195,4 @@ void AddSC_boss_hydromancer_thespia() newscript->GetAI = &GetAI_mob_coilfang_waterelementalAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 890c589555d..3424850686a 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -278,3 +278,4 @@ void AddSC_boss_mekgineer_steamrigger() newscript->GetAI = &GetAI_mob_steamrigger_mechanic; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index e38cfa26bc7..e525461de71 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -233,3 +233,4 @@ void AddSC_boss_warlord_kalithresh() newscript->GetAI = &GetAI_boss_warlord_kalithresh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h index 48127523f21..4b407ac4816 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h @@ -14,3 +14,4 @@ #define DATA_KALITRESH 6 #define DATA_THESPIA 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index 57cddb74a56..92df1fffbe1 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -260,3 +260,4 @@ void AddSC_instance_steam_vault() newscript->GetInstanceData = &GetInstanceData_instance_steam_vault; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp index b6da72e84dc..914e6b3f2aa 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp @@ -77,3 +77,4 @@ void AddSC_boss_ghazan() newscript->GetAI = GetAI_boss_ghazan; m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp index cd54681e65b..1d6584b9523 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -154,3 +154,4 @@ void AddSC_boss_hungarfen() newscript->GetAI = &GetAI_mob_underbog_mushroom; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 0f773ac9754..9e27f2bc063 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -189,3 +189,4 @@ void AddSC_boss_the_black_stalker() newscript->GetAI = &GetAI_boss_the_black_stalker; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp index 449f772e0d6..fcb13e9f479 100644 --- a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp +++ b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp @@ -22,3 +22,4 @@ SDCategory: Darkshore EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp index beb7c1800f0..db5f5bb4c8e 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp @@ -228,3 +228,4 @@ void AddSC_instance_deadmines() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h b/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h index 73b95a30bd3..9b535a9fd80 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h +++ b/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h @@ -11,3 +11,4 @@ #define EVENT_STATE 1 #endif + diff --git a/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp index ed74c6f8cbc..35bd4cb34b5 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp @@ -20,3 +20,4 @@ SD%Complete: 0 SDComment: Placeholder SDCategory: Deadmines EndScriptData */ + diff --git a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp index 14d5170b35e..0a6942b1611 100644 --- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp @@ -96,3 +96,4 @@ void AddSC_dun_morogh() newscript->GetAI = &GetAI_npc_narm_faulk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp index d247878d4ac..ed8a50f9d94 100644 --- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp @@ -229,3 +229,4 @@ void AddSC_dustwallow_marsh() newscript->pGossipSelect = &GossipSelect_npc_nat_pagle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp index 2e1fc4082f2..0c8c47a4c52 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -177,3 +177,4 @@ void AddSC_eastern_plaguelands() newscript->pGossipSelect = &GossipSelect_npc_tirion_fordring; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp index fa14ab3ac20..95661556bad 100644 --- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp @@ -96,3 +96,4 @@ void AddSC_elwynn_forest() newscript->GetAI = &GetAI_npc_henze_faulk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index 8cd8d4c76ff..47d0c4cf8ff 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -793,3 +793,4 @@ void AddSC_eversong_woods() newscript->GetAI = &GetAI_npc_infused_crystalAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp index ca27106e20e..4103283be43 100644 --- a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp +++ b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp @@ -87,3 +87,4 @@ void AddSC_felwood() newscript->pGossipSelect = &GossipSelect_npcs_riverbreeze_and_silversky; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp index 666b08934a2..ff30fc3f90c 100644 --- a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp +++ b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp @@ -85,3 +85,4 @@ void AddSC_feralas() newscript->pGossipHello = &GossipHello_npc_screecher_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 7a518bb8a23..b7b462a85a7 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -321,3 +321,4 @@ void AddSC_ghostlands() newscript->pQuestAccept = &QuestAccept_npc_ranger_lilatha; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index 6af7883fa94..f2da55becc8 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -324,3 +324,4 @@ void AddSC_boss_gruul() newscript->GetAI = &GetAI_boss_gruul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp index 461c2a941a0..68d89bccc2b 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp @@ -738,3 +738,4 @@ void AddSC_boss_high_king_maulgar() newscript->GetAI = &GetAI_boss_krosh_firehand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h b/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h index b0da8cc8f90..7003dcb1e26 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h @@ -18,3 +18,4 @@ #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Gruul's Lair instance (map 565). Encounters will be buggy." #endif + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp index c9fcd11b3e1..9ecd95176f0 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp @@ -186,3 +186,4 @@ void AddSC_instance_gruuls_lair() newscript->GetInstanceData = &GetInstanceData_instance_gruuls_lair; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp index c7bec8c1cc8..901e4dd4264 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -92,3 +92,4 @@ void AddSC_boss_broggok() newscript->GetAI = &GetAI_boss_broggokAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 4c05abbd108..2f8e2738fee 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -360,4 +360,5 @@ void AddSC_boss_kelidan_the_breaker() newscript->Name="mob_shadowmoon_channeler"; newscript->GetAI = &GetAI_mob_shadowmoon_channeler; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 7e343f9085c..5606719dc65 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -129,3 +129,4 @@ void AddSC_boss_the_maker() newscript->GetAI = &GetAI_boss_the_makerAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h index 6462b401d3d..e6a49847a5c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h @@ -6,4 +6,5 @@ #define DEF_BLOOD_FURNACE_H #define DATA_KELIDANEVENT 1 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index aae064d77c6..caf29b1f213 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -109,4 +109,5 @@ void AddSC_instance_blood_furnace() newscript->Name = "instance_blood_furnace"; newscript->GetInstanceData = &GetInstanceData_instance_blood_furnace; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index c640624d88e..be9ae2525d8 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -211,3 +211,4 @@ void AddSC_boss_omor_the_unscarred() newscript->GetAI = &GetAI_boss_omor_the_unscarredAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 97d2878bc1d..4a4647e7c61 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -487,4 +487,5 @@ void AddSC_boss_vazruden_the_herald() newscript->Name="mob_hellfire_sentry"; newscript->GetAI = &GetAI_mob_hellfire_sentry; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index f80ca1c627d..608042cc43c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -166,3 +166,4 @@ void AddSC_boss_watchkeeper_gargolmar() newscript->GetAI = &GetAI_boss_watchkeeper_gargolmarAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index f114cd005f7..195cc824650 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -562,4 +562,5 @@ void AddSC_boss_magtheridon() newscript->GetAI = &GetAI_mob_abyssalAI; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h index d6cc6708288..c5469acaea0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h @@ -11,3 +11,4 @@ #define DATA_COLLAPSE 6 #define DATA_CHANNELER 9 #endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 4ec80e7d346..cd26bc3bcaa 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -255,3 +255,4 @@ void AddSC_instance_magtheridons_lair() newscript->GetInstanceData = &GetInstanceData_instance_magtheridons_lair; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index 05c6b0a51e0..a5d84d7997b 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -450,3 +450,4 @@ void AddSC_boss_grand_warlock_nethekurse() newscript->GetAI = &GetAI_mob_lesser_shadow_fissure; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index c8a42cb53aa..9f241774cbe 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -402,3 +402,4 @@ void AddSC_boss_warbringer_omrogg() newscript->GetAI = &GetAI_mob_omrogg_heads; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 5bd58a53f0c..391ec9f4b93 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -301,3 +301,4 @@ void AddSC_boss_warchief_kargath_bladefist() newscript->GetAI = GetAI_boss_warchief_kargath_bladefist; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h index 7a9bb23454b..cbfa23ec4e0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h @@ -11,3 +11,4 @@ #define TYPE_OMROGG 4 #endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp index 467600bc827..b606ff0f97e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp @@ -112,3 +112,4 @@ void AddSC_instance_shattered_halls() newscript->GetInstanceData = &GetInstanceData_instance_shattered_halls; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index 67ec8a642ae..0cb6b7a849e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -180,3 +180,4 @@ void AddSC_boss_doomlordkazzak() newscript->GetAI = &GetAI_boss_doomlordkazzak; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index 9f71fab3e46..93a5be1e19d 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -436,4 +436,5 @@ void AddSC_hellfire_peninsula() newscript->GetAI = &GetAI_npc_wounded_blood_elf; newscript->pQuestAccept = &QuestAccept_npc_wounded_blood_elf; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp index 7e367dd9960..b17a280391a 100644 --- a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp +++ b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp @@ -91,3 +91,4 @@ void AddSC_ironforge() newscript->pGossipSelect = &GossipSelect_npc_royal_historian_archesonus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index 0b9131883ab..c9ea67ac824 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -220,3 +220,4 @@ void AddSC_isle_of_queldanas() newscript->GetAI = &GetAI_npc_greengill_slaveAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 95f1cf56155..7d534cdeffc 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -169,3 +169,4 @@ void AddSC_boss_curator() newscript->GetAI = &GetAI_boss_curator; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp index f1c55f91629..b58dfa4922c 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp @@ -150,3 +150,4 @@ void AddSC_boss_maiden_of_virtue() newscript->GetAI = &GetAI_boss_maiden_of_virtue; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index d9519357f17..440e4bdfec1 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -325,3 +325,4 @@ void AddSC_boss_attumen() newscript->GetAI = &GetAI_boss_midnight; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index baf31ca2eda..52303a2abc8 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -855,3 +855,4 @@ void AddSC_boss_moroes() newscript->GetAI = &GetAI_lord_crispin_ference; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp index 47820d87a4e..6db1b193234 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp @@ -38,3 +38,4 @@ EndScriptData */ #define SPELL_PERSEVERANCE_SELF 30466 #define SPELL_SERENITY_ENEMY 30422 #define SPELL_SERENITY_SELF 30467 + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index 1f4b26ee1e5..aae8b56cdf7 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -420,3 +420,4 @@ void AddSC_boss_nightbane() newscript->GetAI = &GetAI_boss_nightbane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp index 5fb7b897eec..fe5c08ae45d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -660,3 +660,4 @@ void AddSC_boss_malchezaar() newscript->GetAI = &GetAI_netherspite_infernal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index dbd99df0a08..e226a28bcd2 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -600,3 +600,4 @@ void AddSC_boss_shade_of_aran() newscript->GetAI = &GetAI_water_elemental; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp index e2796529ebc..1bad8750736 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp @@ -434,3 +434,4 @@ void AddSC_boss_terestian_illhoof() newscript->GetAI = &GetAI_mob_demon_chain; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index 965fe32d370..0db07e8aa70 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -1418,3 +1418,4 @@ void AddSC_bosses_opera() newscript->Name = "boss_romulo"; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h index 71017baeb97..4304477de2a 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h +++ b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h @@ -41,3 +41,4 @@ #define ERROR_INST_DATA(a) error_log("SD2: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); #endif + diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp index ddae685e82b..72a839cc5bd 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp @@ -289,3 +289,4 @@ void AddSC_instance_karazhan() newscript->GetInstanceData = &GetInstanceData_instance_karazhan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index 17547d043a3..76dcd062b92 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -658,3 +658,4 @@ void AddSC_karazhan() newscript->GetAI = &GetAI_npc_image_of_medivh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp index 9e7e61f1f7e..b838fc97aab 100644 --- a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp +++ b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp @@ -98,3 +98,4 @@ void AddSC_loch_modan() newscript->pGossipSelect = &GossipSelect_npc_mountaineer_pebblebitty; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp index 9c73f5fc7d1..f8304b409b3 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp @@ -688,3 +688,4 @@ void AddSC_boss_felblood_kaelthas() newscript->GetAI = &GetAI_mob_felkael_flamestrike; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index aeeebdeec89..1a0c7743933 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -1364,3 +1364,4 @@ void AddSC_boss_priestess_delrissa() newscript->GetAI = &GetAI_mob_sliver; newscript->RegisterSelf();*/ } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index 0b03f115058..90533797d5e 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -382,3 +382,4 @@ void AddSC_boss_selin_fireheart() newscript->GetAI = &GetAI_mob_fel_crystal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp index d634164e4fd..073ecef879b 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp @@ -235,3 +235,4 @@ void AddSC_boss_vexallus() newscript->GetAI = &GetAI_mob_pure_energy; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h b/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h index e35e8236be1..d6419ea409c 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h @@ -28,3 +28,4 @@ #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Magister's Terrace instance (map 585). Encounters will be buggy." #endif + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp index 0b8ec081f11..7e16b37c353 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp @@ -190,3 +190,4 @@ void AddSC_instance_magisters_terrace() newscript->GetInstanceData = &GetInstanceData_instance_magisters_terrace; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp index b0e370727f8..767246b876c 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp @@ -95,3 +95,4 @@ void AddSC_boss_celebras_the_cursed() newscript->GetAI = &GetAI_celebras_the_cursed; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp index 5272b4adbb8..49d50b43a59 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp @@ -92,3 +92,4 @@ void AddSC_boss_landslide() newscript->GetAI = &GetAI_boss_landslide; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp index 8db16848bf7..a987fd6399a 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp @@ -147,3 +147,4 @@ void AddSC_boss_noxxion() newscript->GetAI = &GetAI_boss_noxxion; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp index e6e5538c7a2..c78d28e0aa8 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp @@ -106,3 +106,4 @@ void AddSC_boss_ptheradras() newscript->GetAI = &GetAI_boss_ptheradras; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp index ef606f341ee..da8b47d6a7c 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp @@ -104,3 +104,4 @@ void AddSC_boss_baron_geddon() newscript->GetAI = &GetAI_boss_baron_geddon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp index 41786ce48a0..ac1ff61c2ba 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp @@ -140,3 +140,4 @@ void AddSC_boss_garr() newscript->GetAI = &GetAI_mob_firesworn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp index eb7e3659798..c65782c3e4d 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp @@ -89,3 +89,4 @@ void AddSC_boss_gehennas() newscript->GetAI = &GetAI_boss_gehennas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp index defac135e18..b5ebfbe4c73 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -198,3 +198,4 @@ void AddSC_boss_golemagg() newscript->GetAI = &GetAI_mob_core_rager; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp index cce048d3efa..c87d77ab73b 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp @@ -88,3 +88,4 @@ void AddSC_boss_lucifron() newscript->GetAI = &GetAI_boss_lucifron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp index 8281cffcec3..de26001d185 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp @@ -97,3 +97,4 @@ void AddSC_boss_magmadar() newscript->GetAI = &GetAI_boss_magmadar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp index 5879cf0380b..9f5f815631a 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp @@ -137,3 +137,4 @@ void AddSC_boss_majordomo() newscript->GetAI = &GetAI_boss_majordomo; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp index 677d74c96af..852fcd3873b 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp @@ -294,3 +294,4 @@ void AddSC_boss_ragnaros() newscript->GetAI = &GetAI_boss_ragnaros; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp index 68ae19bcbdc..32612e158f5 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp @@ -119,3 +119,4 @@ void AddSC_boss_shazzrah() newscript->GetAI = &GetAI_boss_shazzrah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp index 5d99bbcc17f..cc0cb5c9f12 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp @@ -213,3 +213,4 @@ void AddSC_boss_sulfuron() newscript->GetAI = &GetAI_mob_flamewaker_priest; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h b/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h index b3906616c95..5874d8b9408 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h +++ b/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h @@ -19,3 +19,4 @@ #define DATA_SULFURONISDEAD 12 #define DATA_GOLEMAGG 13 #endif + diff --git a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp index 066bf7d0158..bfaa583e033 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp @@ -263,3 +263,4 @@ void AddSC_instance_molten_core() newscript->GetInstanceData = &GetInstance_instance_molten_core; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp index b9799d29d1c..d25ddc7631c 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp @@ -86,3 +86,4 @@ void AddSC_molten_core() newscript->GetAI = &GetAI_mob_ancient_core_hound; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index 1ecaf826816..0431f348f83 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -573,3 +573,4 @@ void AddSC_moonglade() newscript->GetAI = &GetAI_npc_clintar_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index 68aee9b122d..d6d905eaa86 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -17,16 +17,18 @@ /* ScriptData SDName: Mulgore SD%Complete: 100 -SDComment: Support for quest: 11129 +SDComment: Support for quest: 11129, 772 SDCategory: Mulgore EndScriptData */ /* ContentData npc_skorn_whitecloud npc_kyle_frenzied +npc_plains_vision EndContentData */ #include "precompiled.h" +#include "../../npc/npc_escortAI.h" /*###### # npc_skorn_whitecloud @@ -158,6 +160,117 @@ CreatureAI* GetAI_npc_kyle_frenzied(Creature *_Creature) return new npc_kyle_frenziedAI (_Creature); } +/*##### +# npc_plains_vision +######*/ + +float wp_plain_vision[50][3] = +{ + {-2226.32, -408.095, -9.36235}, + {-2203.04, -437.212, -5.72498}, + {-2163.91, -457.851, -7.09049}, + {-2123.87, -448.137, -9.29591}, + {-2104.66, -427.166, -6.49513}, + {-2101.48, -422.826, -5.3567}, + {-2097.56, -417.083, -7.16716}, + {-2084.87, -398.626, -9.88973}, + {-2072.71, -382.324, -10.2488}, + {-2054.05, -356.728, -6.22468}, + {-2051.8, -353.645, -5.35791}, + {-2049.08, -349.912, -6.15723}, + {-2030.6, -310.724, -9.59302}, + {-2002.15, -249.308, -10.8124}, + {-1972.85, -195.811, -10.6316}, + {-1940.93, -147.652, -11.7055}, + {-1888.06, -81.943, -11.4404}, + {-1837.05, -34.0109, -12.258}, + {-1796.12, -14.6462, -10.3581}, + {-1732.61, -4.27746, -10.0213}, + {-1688.94, -0.829945, -11.7103}, + {-1681.32, 13.0313, -9.48056}, + {-1677.04, 36.8349, -7.10318}, + {-1675.2, 68.559, -8.95384}, + {-1676.57, 89.023, -9.65104}, + {-1678.16, 110.939, -10.1782}, + {-1677.86, 128.681, -5.73869}, + {-1675.27, 144.324, -3.47916}, + {-1671.7, 163.169, -1.23098}, + {-1666.61, 181.584, 5.26145}, + {-1661.51, 196.154, 8.95252}, + {-1655.47, 210.811, 8.38727}, + {-1647.07, 226.947, 5.27755}, + {-1621.65, 232.91, 2.69579}, + {-1600.23, 237.641, 2.98539}, + {-1576.07, 242.546, 4.66541}, + {-1554.57, 248.494, 6.60377}, + {-1547.53, 259.302, 10.6741}, + {-1541.7, 269.847, 16.4418}, + {-1539.83, 278.989, 21.0597}, + {-1540.16, 290.219, 27.8247}, + {-1538.99, 298.983, 34.0032}, + {-1540.38, 307.337, 41.3557}, + {-1536.61, 314.884, 48.0179}, + {-1532.42, 323.277, 55.6667}, + {-1528.77, 329.774, 61.1525}, + {-1525.65, 333.18, 63.2161}, + {-1517.01, 350.713, 62.4286}, + {-1511.39, 362.537, 62.4539}, + {-1508.68, 366.822, 62.733} +}; + +struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI +{ + npc_plains_visionAI(Creature *c) : ScriptedAI(c) {Reset();} + + bool newWaypoint; + uint8 WayPointId; + uint8 amountWP; + + void Reset() + { + WayPointId = 0; + newWaypoint = true; + amountWP = 49; + } + + void Aggro(Unit* who){} + + void MovementInform(uint32 type, uint32 id) + { + if(type != POINT_MOTION_TYPE) + return; + + if (id < amountWP) + { + ++WayPointId; + newWaypoint = true; + } + else + { + m_creature->setDeathState(JUST_DIED); + m_creature->RemoveCorpse(); + } + } + + void UpdateAI(const uint32 diff) + { + if (newWaypoint) + { + m_creature->GetMotionMaster()->MovePoint(WayPointId, wp_plain_vision[WayPointId][0], wp_plain_vision[WayPointId][1], wp_plain_vision[WayPointId][2]); + newWaypoint = false; + } + } +}; + +CreatureAI* GetAI_npc_plains_vision(Creature *_Creature) +{ + return new npc_plains_visionAI (_Creature); +} + +/*##### +# +######*/ + void AddSC_mulgore() { Script *newscript; @@ -172,4 +285,10 @@ void AddSC_mulgore() newscript->Name="npc_kyle_frenzied"; newscript->GetAI = &GetAI_npc_kyle_frenzied; newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_plains_vision"; + newscript->GetAI = &GetAI_npc_plains_vision; + newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index 5c6b7eedaaf..c059fe42911 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -710,3 +710,4 @@ void AddSC_nagrand() newscript->GetAI = &GetAI_mob_sparrowhawk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp index 41f95a37bb9..6e8fb71f155 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp @@ -148,3 +148,4 @@ void AddSC_boss_anubrekhan() newscript->GetAI = &GetAI_boss_anubrekhan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 8e8ed407823..19ec0ed8487 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -136,3 +136,4 @@ void AddSC_boss_faerlina() newscript->GetAI = &GetAI_boss_faerlina; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp index 7bbda22c917..26c9eb09f14 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -398,4 +398,5 @@ newscript->Name = "boss_sir_zeliek"; newscript->GetAI = &GetAI_boss_sir_zeliek; newscript->RegisterSelf(); - }
\ No newline at end of file + } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp index ca665e7b4b0..f9e739c5be9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp @@ -172,3 +172,4 @@ void AddSC_boss_gluth() newscript->GetAI = &GetAI_boss_gluth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp index 8e657cbd1ae..bccfe2362e9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp @@ -59,3 +59,4 @@ EndScriptData */ //Spectral Horse #define SPELL_STOMP 27993 + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp index 8f103b499b4..e0bf157dc43 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp @@ -28,3 +28,4 @@ Mutating Injection 28169 Enrages 26527*/ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp index a970039fb70..d5f1e594d0c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp @@ -43,3 +43,4 @@ EndScriptData */ //Spell by eye stalks #define SPELL_MIND_FLAY 26143 + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp index ce2804a7e52..61bf556c561 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp @@ -176,3 +176,4 @@ void AddSC_boss_highlord_mograine() newscript->GetAI = &GetAI_boss_highlord_mograine; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index c3574a1c294..bb285c3de4f 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -441,3 +441,4 @@ void AddSC_boss_kelthuzad() newscript->GetAI = &GetAI_boss_kelthuzadAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp index b95bfa25f6e..9b2458630e3 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp @@ -144,3 +144,4 @@ void AddSC_boss_loatheb() newscript->GetAI = &GetAI_boss_loatheb; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp index 0af576492c2..4885079646d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp @@ -249,3 +249,4 @@ void AddSC_boss_maexxna() newscript->GetAI = &GetAI_mob_webwrap; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 9a94e095940..857ec33e3fa 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -142,3 +142,4 @@ void AddSC_boss_noth() newscript->GetAI = &GetAI_boss_noth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp index 76d873fb7b9..9d96e35d572 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp @@ -150,3 +150,4 @@ void AddSC_boss_patchwerk() newscript->GetAI = &GetAI_boss_patchwerk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp index b0df4050023..77e1303f8b6 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp @@ -165,3 +165,4 @@ void AddSC_boss_razuvious() newscript->GetAI = &GetAI_boss_razuvious; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index 160a2f8f0c4..bf600c29eef 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); m_creature->GetMotionMaster()->Clear(false); - m_creature->GetMotionMaster()->MoveIdle(); + m_creature->GetMotionMaster()->MoveIdle(); m_creature->SetHover(true); Icebolt_Timer = 4000; Icebolt_Count = 0; @@ -132,16 +132,16 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI }else Icebolt_Timer -= diff; if(Icebolt_Count == 5 && IsInFly && FrostBreath_Timer < diff ) - { + { DoScriptText(EMOTE_BREATH, m_creature); DoCast(m_creature->getVictim(),SPELL_FROST_BREATH); land_Timer = 2000; IsInFly = false; FrostBreath_Timer = 6000; - }else FrostBreath_Timer -= diff; + }else FrostBreath_Timer -= diff; if(!IsInFly && land_Timer < diff) - { + { phase = 1; m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND); m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); @@ -181,3 +181,4 @@ void AddSC_boss_sapphiron() newscript->GetAI = &GetAI_boss_sapphiron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp index 28a35562c6b..259c1589791 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp @@ -67,4 +67,5 @@ EndScriptData */ #define SPELL_BESERK 26662 //generic -#define C_TESLA_COIL 16218 //the coils (emotes "Tesla Coil overloads!")
\ No newline at end of file +#define C_TESLA_COIL 16218 //the coils (emotes "Tesla Coil overloads!") + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp index 24abbc6b8a4..2ed8399f57a 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp @@ -22,3 +22,4 @@ SDCategory: Naxxramas EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 32390d1b029..70add388c60 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -1067,3 +1067,4 @@ void AddSC_netherstorm() newscript->pQuestAccept = &QuestAccept_npc_bessy; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index 45a2accdabc..eff383f872b 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -306,3 +306,4 @@ void AddSC_boss_onyxia() newscript->GetAI = &GetAI_boss_onyxiaAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index fd00a527362..68b2d6d3dd9 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -273,3 +273,4 @@ void AddSC_orgrimmar() newscript->pGossipSelect = &GossipSelect_npc_thrall_warchief; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp index b8fdaea2ffb..ff03a97481f 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -127,3 +127,4 @@ void AddSC_boss_amnennar_the_coldbringer() newscript->GetAI = &GetAI_boss_amnennar_the_coldbringer; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 57ff43c05a5..540c8e77c0b 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -202,3 +202,4 @@ void AddSC_razorfen_kraul() newscript->pQuestAccept = &QuestAccept_npc_willix; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp index 54ca9ee3278..4ed8e3cb73f 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -105,3 +105,4 @@ void AddSC_boss_ayamiss() newscript->GetAI = &GetAI_boss_ayamiss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp index 9b6b73aee53..58c48540362 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp @@ -23,4 +23,5 @@ EndScriptData */ #include "precompiled.h" - #define EMOTE_TARGET -1509002
\ No newline at end of file + #define EMOTE_TARGET -1509002 + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index 83955e32f3e..e1505496516 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -91,3 +91,4 @@ void AddSC_boss_kurinnaxx() newscript->GetAI = &GetAI_boss_kurinnaxx; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp index bd66b5fe2be..6c293b4a1c1 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp @@ -117,3 +117,4 @@ void AddSC_boss_moam() newscript->GetAI = &GetAI_boss_moam; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp index 7d51377b2f6..5652b706917 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -34,4 +34,5 @@ EndScriptData */ #define SAY_AGGRO -1509025 #define SAY_SLAY -1509026 -#define SAY_DEATH -1509027
\ No newline at end of file +#define SAY_DEATH -1509027 + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp index a3c3b9bd669..fb2c92ff59f 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -41,4 +41,5 @@ EndScriptData */ #define SAY_DEAGGRO -1509015 #define SAY_KILLS_ANDOROV -1509016 -#define SAY_COMPLETE_QUEST -1509017 //Yell when realm complete quest 8743 for world event
\ No newline at end of file +#define SAY_COMPLETE_QUEST -1509017 //Yell when realm complete quest 8743 for world event + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp index 291b53b275f..b94e6f16a80 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp @@ -22,3 +22,4 @@ SDCategory: Ruins of Ahn'Qiraj EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp index 29209d4e579..51355f90198 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp @@ -157,3 +157,4 @@ void AddSC_boss_arcanist_doan() newscript->GetAI = &GetAI_boss_arcanist_doan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp index bdeceeb710a..a7e1785eb4f 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -95,3 +95,4 @@ void AddSC_boss_azshir_the_sleepless() newscript->GetAI = &GetAI_boss_azshir_the_sleepless; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp index cf8c6d57019..8688d6a8292 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -127,3 +127,4 @@ void AddSC_boss_bloodmage_thalnos() newscript->GetAI = &GetAI_boss_bloodmage_thalnos; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index d2ba85bca1e..013bebb860d 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -849,3 +849,4 @@ void AddSC_boss_headless_horseman() newscript->pGOHello = &GOHello_go_loosely_turned_soil; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp index 543a0f9c545..d8486fa211d 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp @@ -184,3 +184,4 @@ void AddSC_boss_herod() newscript->GetAI = &GetAI_mob_scarlet_trainee; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 0231a672e83..63d167fb4c4 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -130,3 +130,4 @@ void AddSC_boss_high_inquisitor_fairbanks() newscript->GetAI = &GetAI_boss_high_inquisitor_fairbanks; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp index fc7d067bd2b..1d193ba43eb 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -73,3 +73,4 @@ void AddSC_boss_houndmaster_loksey() newscript->GetAI = &GetAI_boss_houndmaster_loksey; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp index 00729ca53b5..83f115470e6 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp @@ -113,3 +113,4 @@ void AddSC_boss_interrogator_vishas() newscript->GetAI = &GetAI_boss_interrogator_vishas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp index 5f3194b4b71..23e1e50ab75 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -321,3 +321,4 @@ void AddSC_boss_mograine_and_whitemane() newscript->GetAI = &GetAI_boss_high_inquisitor_whitemane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp index 84f44a55927..7542b4e4801 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp @@ -98,3 +98,4 @@ void AddSC_boss_scorn() newscript->GetAI = &GetAI_boss_scorn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h index 29d3b729fcf..2b6399ae3e4 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h @@ -15,3 +15,4 @@ #define DATA_VORREL 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp index 841c7f81a1a..4a2239f3b36 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp @@ -152,3 +152,4 @@ void AddSC_instance_scarlet_monastery() newscript->GetInstanceData = &GetInstanceData_instance_scarlet_monastery; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp index d60067dd70c..4c84da5114e 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp @@ -190,3 +190,4 @@ void AddSC_boss_darkmaster_gandling() newscript->GetAI = &GetAI_boss_darkmaster_gandling; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp index 2556ba37b23..6d18d2ba1bf 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp @@ -57,3 +57,4 @@ void AddSC_boss_death_knight_darkreaver() newscript->GetAI = &GetAI_boss_death_knight_darkreaver; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp index 0849079fc5c..1fc58987578 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp @@ -108,3 +108,4 @@ void AddSC_boss_theolenkrastinov() newscript->GetAI = &GetAI_boss_theolenkrastinov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp index 829920a4fda..a1fa023be67 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp @@ -114,3 +114,4 @@ void AddSC_boss_illuciabarov() newscript->GetAI = &GetAI_boss_illuciabarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp index 45dbf04cb1e..bf693caaadb 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp @@ -150,3 +150,4 @@ void AddSC_boss_instructormalicia() newscript->GetAI = &GetAI_boss_instructormalicia; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp index f509afb4400..972fb9d1cfa 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -219,3 +219,4 @@ void AddSC_boss_jandicebarov() newscript->GetAI = &GetAI_mob_illusionofjandicebarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp index 415d9e52451..0a630ad0cd9 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp @@ -153,3 +153,4 @@ void AddSC_boss_kormok() newscript->GetAI = &GetAI_boss_kormok; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp index 9b87188b988..bdddaf2cded 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp @@ -96,3 +96,4 @@ void AddSC_boss_lordalexeibarov() newscript->GetAI = &GetAI_boss_lordalexeibarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp index 67f68108769..f93b9ac41fc 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp @@ -111,3 +111,4 @@ void AddSC_boss_lorekeeperpolkelt() newscript->GetAI = &GetAI_boss_lorekeeperpolkelt; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp index e44eaae4cac..3ca8b414673 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp @@ -123,3 +123,4 @@ void AddSC_boss_rasfrost() newscript->GetAI = &GetAI_boss_rasfrost; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp index 1cad89ea2b9..ad25ee5e4b0 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp @@ -114,3 +114,4 @@ void AddSC_boss_theravenian() newscript->GetAI = &GetAI_boss_theravenian; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp index 165d465557c..c85ac0158b2 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp @@ -95,3 +95,4 @@ void AddSC_boss_vectus() newscript->GetAI = &GetAI_boss_vectus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h b/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h index cf85ce2037e..1593214fc09 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h +++ b/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h @@ -13,3 +13,4 @@ #define DATA_LOREKEEPERPOLKELT_DEATH 6 #define DATA_THERAVENIAN_DEATH 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp index ca50da7526a..6274747fe30 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp @@ -100,3 +100,4 @@ void AddSC_instance_scholomance() newscript->GetInstanceData = &GetInstanceData_instance_scholomance; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp index cd1cc041847..4d55b5d91fd 100644 --- a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp +++ b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp @@ -157,3 +157,4 @@ void AddSC_searing_gorge() newscript->pGossipSelect = &GossipSelect_npc_zamael_lunthistle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h b/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h index 16b096b7d86..8383a5c3950 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h @@ -10,3 +10,4 @@ #define TYPE_FENRUS 3 #define TYPE_NANDOS 4 #endif + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index 04ccd98ede3..0364c132447 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -180,3 +180,4 @@ void AddSC_instance_shadowfang_keep() newscript->GetInstanceData = &GetInstanceData_instance_shadowfang_keep; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp index 1a42e97377a..9759f55a939 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp @@ -120,3 +120,4 @@ void AddSC_shadowfang_keep() newscript->GetAI = &GetAI_npc_shadowfang_prisoner; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index 8ca29502d5a..87698fe7658 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -176,3 +176,4 @@ void AddSC_boss_doomwalker() newscript->GetAI = &GetAI_boss_doomwalker; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index c172abcefc3..e00cb397223 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -1848,3 +1848,4 @@ void AddSC_shadowmoon_valley() newscript->GetAI = &GetAI_npc_enraged_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index e0186ab5955..460a19aeb59 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -737,3 +737,4 @@ void AddSC_shattrath_city() newscript->pGossipSelect = &GossipSelect_npc_khadgar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp index ebb48655dfd..bd1ecf748a0 100644 --- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp +++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp @@ -220,3 +220,4 @@ void AddSC_silithus() newscript->pGossipSelect = &GossipSelect_npcs_rutgar_and_frankal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index 9dfa5868612..937a8c2e553 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -101,3 +101,4 @@ void AddSC_silvermoon_city() newscript->GetAI = &GetAI_npc_blood_knight_stillblade; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 64dbcfb9005..8dfda004d55 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -231,3 +231,4 @@ void AddSC_silverpine_forest() newscript->pQuestAccept = &QuestAccept_npc_deathstalker_erland; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index a04f5c3ea40..5678c27e276 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -205,3 +205,4 @@ void AddSC_stonetalon_mountains() newscript->pQuestAccept = &QuestAccept_npc_kaya_flathoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index f3c0d004e52..16468a04b41 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -300,3 +300,4 @@ void AddSC_stormwind_city() newscript->pGossipSelect = &GossipSelect_npc_stormwind_harbor_taxi; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp index d4ae62ccf2f..d9da6ee786b 100644 --- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp @@ -120,3 +120,4 @@ void AddSC_stranglethorn_vale() newscript->GetAI = &GetAI_mob_yenniku; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp index 137d317fe17..0b612bbf3b9 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -187,3 +187,4 @@ void AddSC_boss_baron_rivendare() newscript->GetAI = &GetAI_boss_baron_rivendare; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp index f7369165a83..3c9a343c84f 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -126,3 +126,4 @@ void AddSC_boss_baroness_anastari() newscript->GetAI = &GetAI_boss_baroness_anastari; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index 838456b0627..7a4e71a5413 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -219,3 +219,4 @@ void AddSC_boss_cannon_master_willey() newscript->GetAI = &GetAI_boss_cannon_master_willey; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp index 67444b19b8d..bac6d4bcb7d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -314,3 +314,4 @@ void AddSC_boss_dathrohan_balnazzar() newscript->GetAI = &GetAI_boss_dathrohan_balnazzar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp index 71b98e9548a..e4f7903d897 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -132,3 +132,4 @@ void AddSC_boss_magistrate_barthilas() newscript->GetAI = &GetAI_boss_magistrate_barthilas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp index 6e70bc91f06..b9bd3349d7d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp @@ -107,3 +107,4 @@ void AddSC_boss_maleki_the_pallid() newscript->GetAI = &GetAI_boss_maleki_the_pallid; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index 48dd8f49bf3..b1376ef7cd6 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -141,3 +141,4 @@ void AddSC_boss_nerubenkan() newscript->GetAI = &GetAI_boss_nerubenkan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp index 2bc3cdddeed..71ec3d59fed 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp @@ -159,3 +159,4 @@ void AddSC_boss_order_of_silver_hand() newscript->GetAI = &GetAI_boss_silver_hand_bossesAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp index e5b7c1abd0c..5edf47787fd 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -142,3 +142,4 @@ void AddSC_boss_postmaster_malown() newscript->GetAI = &GetAI_boss_postmaster_malown; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp index fb219f4d4ec..f729e2e34ce 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp @@ -98,3 +98,4 @@ void AddSC_boss_ramstein_the_gorger() newscript->GetAI = &GetAI_boss_ramstein_the_gorger; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp index c9ee6d1636f..9458964712b 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp @@ -81,3 +81,4 @@ void AddSC_boss_timmy_the_cruel() newscript->GetAI = &GetAI_boss_timmy_the_cruel; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h index 3684ab9c9aa..b9246091a7c 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h +++ b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h @@ -25,3 +25,4 @@ #define QUEST_DEAD_MAN_PLEA 8945 #define SPELL_BARON_ULTIMATUM 27861 #endif + diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index 249f2881ba4..62b210313a1 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -393,3 +393,4 @@ void AddSC_instance_stratholme() newscript->GetInstanceData = &GetInstanceData_instance_stratholme; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index 88de858adbb..3a5e9c0daa7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -287,3 +287,4 @@ void AddSC_stratholme() newscript->pReceiveEmote = &ReciveEmote_mobs_spectral_ghostly_citizen; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp index 30782b7da6a..e1235155f71 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -172,3 +172,4 @@ void AddSC_boss_brutallus() newscript->GetAI = &GetAI_boss_brutallus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp index bc1eae34788..e29f6b06fe2 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp @@ -786,3 +786,4 @@ void AddSC_boss_eredar_twins() newscript->GetAI = &GetAI_mob_shadow_image; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index 8afba94fa44..adea2dab4e2 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -586,3 +586,4 @@ void AddSC_boss_felmyst() newscript->GetAI = &GetAI_mob_felmyst_trail; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index 9339901e8e3..ec0ba0037ff 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI TalkSequence = 0; isFriendly = false; isEnraged = false; - isBanished = false; + isBanished = false; } void DamageTaken(Unit *done_by, uint32 &damage) @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI switch(TalkSequence) { case 1: - m_creature->setFaction(35); + m_creature->setFaction(35); TalkTimer = 1000; break; case 2: @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI CheckTimer = 1000; ResetThreat = 1000; isEnraged = false; - isBanished = false; + isBanished = false; } void Aggro(Unit* who) @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI if(Player* i_pl = i->getSource()) if(i_pl->HasAura(AURA_SPECTRAL_REALM,0)) i_pl->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM); - } + } void UpdateAI(const uint32 diff) { @@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (!UpdateVictim()) - return; + return; if(YellTimer < diff) { @@ -559,7 +559,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff) DoCast(m_creature, SPELL_ENRAGE, true); isEnraged = true; } - + if(!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1) { if(Unit *Sath = Unit::GetUnit(*m_creature, SathGUID)) @@ -673,4 +673,5 @@ void AddSC_boss_kalecgos() newscript->Name="kalocegos_teleporter"; newscript->pGOHello = &GOkalocegos_teleporter; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h index 61d4519983b..8ae61602616 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h @@ -38,3 +38,4 @@ /*** Misc ***/ #endif + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp index 4118275e9ef..cd4f62584f0 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp @@ -198,3 +198,4 @@ void AddSC_instance_sunwell_plateau() newscript->GetInstanceData = &GetInstanceData_instance_sunwell_plateau; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index 4a6e6a4641a..538aee596ec 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -607,3 +607,4 @@ void AddSC_tanaris() newscript->pQuestAccept = &QuestAccept_npc_OOX17; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp index bc6e80e1c95..7b013c54781 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -527,3 +527,4 @@ void AddSC_arcatraz() newscript->GetAI = &GetAI_mob_zerekethvoidzoneAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index aa80f2d38e4..8e17151c0c5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -312,3 +312,4 @@ void AddSC_boss_harbinger_skyriss() newscript->GetAI = &GetAI_boss_harbinger_skyriss_illusion; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h index 420e27d7c16..3f8dee8bbd0 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h @@ -18,3 +18,4 @@ #define TYPE_SHIELD_OPEN 11 #define DATA_SPHERE_SHIELD 12 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp index 47797f2caf7..36ff863abe7 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -236,3 +236,4 @@ void AddSC_instance_arcatraz() newscript->GetInstanceData = &GetInstanceData_instance_arcatraz; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index fe713c13f3e..59ccd996236 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -196,3 +196,4 @@ void AddSC_boss_high_botanist_freywinn() newscript->GetAI = &GetAI_boss_high_botanist_freywinn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp index 269b20add4c..1c4e27bac48 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp @@ -202,3 +202,4 @@ void AddSC_boss_laj() newscript->GetAI = &GetAI_boss_laj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp index 2ae692a3aab..dd6344269de 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp @@ -225,3 +225,4 @@ void AddSC_boss_warp_splinter() newscript->GetAI = &GetAI_mob_treant; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp index 9bf7fe0a437..3486f937214 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp @@ -502,3 +502,4 @@ void AddSC_boss_alar() newscript->GetAI = &GetAI_mob_flame_patch_alar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index 0a4dfb9e35c..e20c32e21d0 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_FEAR 29321 #define SPELL_VOID_BOLT 39329 #define SPELL_SPOTLIGHT 25824 - + #define CENTER_X 432.909f #define CENTER_Y -373.424f #define CENTER_Z 17.9608f @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI float Portals[3][3]; bool AppearDelay; - bool BlindingLight; + bool BlindingLight; void Reset() { @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI void StartEvent() { DoScriptText(SAY_AGGRO, m_creature); - + if(pInstance) pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); } @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(target); - + Summons.Summon(Summoned); } } @@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } AppearDelay_Timer = 2000; }else AppearDelay_Timer -= diff; - } + } if (Phase == 1) { @@ -236,12 +236,12 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI if(!m_creature->HasInArc(2.5f, target)) target = m_creature->getVictim(); - if(target) + if(target) DoCast(target, SPELL_ARCANE_MISSILES); } ArcaneMissiles_Timer = 3000; }else ArcaneMissiles_Timer -= diff; - + if (MarkOfTheSolarian_Timer < diff) { DoCast(m_creature->getVictim(), MARK_OF_SOLARIAN); @@ -469,3 +469,4 @@ void AddSC_boss_high_astromancer_solarian() newscript->GetAI = &GetAI_mob_solarium_priest; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index 99e61096f24..7a3ac76d596 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -1607,3 +1607,4 @@ void AddSC_boss_kaelthas() newscript->GetAI = &GetAI_mob_phoenix_egg_tk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp index 2af70c15d88..3ea1e12ef1e 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp @@ -172,3 +172,4 @@ void AddSC_boss_void_reaver() newscript->GetAI = &GetAI_boss_void_reaver; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h index 342c257f7de..d0d3ea09061 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h @@ -17,3 +17,4 @@ #define DATA_VOIDREAVEREVENT 11 #define DATA_ALAR 12 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp index c2d13436806..bc407a3de99 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp @@ -174,3 +174,4 @@ void AddSC_instance_the_eye() newscript->GetInstanceData = &GetInstanceData_instance_the_eye; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp index 8bce75fce4a..83ba68c955c 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp @@ -96,3 +96,4 @@ void AddSC_the_eye() newscript->GetAI = &GetAI_mob_crystalcore_devastator; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp index 79070f98eb0..268cfeb2918 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp @@ -34,4 +34,5 @@ EndScriptData */ #define SPELL_SAW_BLADE 35318 #define H_SPELL_SAW_BLADE 39192 #define SPELL_SHADOW_POWER 35322 -#define H_SPELL_SHADOW_POWER 39193
\ No newline at end of file +#define H_SPELL_SHADOW_POWER 39193 + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index aa8da37ec97..2fcf154eb67 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -146,3 +146,4 @@ void AddSC_boss_gatewatcher_iron_hand() newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 49aee52839c..66542333e5a 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -258,3 +258,4 @@ void AddSC_boss_nethermancer_sepethrea() newscript->GetAI = &GetAI_mob_ragin_flames; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index a15156b6fe9..dd46457c759 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -252,3 +252,4 @@ void AddSC_boss_pathaleon_the_calculator() newscript->GetAI = &GetAI_mob_nether_wraith; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h index 5bbfe79ffb4..8a054604b9d 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h @@ -4,3 +4,4 @@ #define DATA_SEPETHREA_DEATH 1 #define DATA_SEPETHREAISDEAD 2 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp index 362e0bfe032..45a6d8fb641 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -88,3 +88,4 @@ void AddSC_instance_mechanar() newscript->GetInstanceData = &GetInstanceData_instance_mechanar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp index 2a5e2c4a8ff..fe42ae53dd7 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -346,3 +346,4 @@ void AddSC_bug_trio() newscript->GetAI = &GetAI_boss_yauj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index eac028190ce..96801fd334b 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -1344,3 +1344,4 @@ void AddSC_boss_cthun() newscript->GetAI = &GetAI_flesh_tentacle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp index 08c24b49a7e..b06225344a0 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp @@ -188,3 +188,4 @@ void AddSC_boss_fankriss() newscript->GetAI = &GetAI_boss_fankriss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp index c741b2e0bf5..7d39c026cbc 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp @@ -145,3 +145,4 @@ void AddSC_boss_huhuran() newscript->GetAI = &GetAI_boss_huhuran; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp index df7facfbd37..a8542f14fe6 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp @@ -138,3 +138,4 @@ void AddSC_boss_ouro() newscript->GetAI = &GetAI_boss_ouro; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp index 1598126bf94..5b0495cb097 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp @@ -297,3 +297,4 @@ void AddSC_boss_sartura() newscript->GetAI = &GetAI_mob_sartura_royal_guard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp index 256d92e2360..8ecb7ef0a7a 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp @@ -306,3 +306,4 @@ void AddSC_boss_skeram() newscript->GetAI = &GetAI_boss_skeram; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp index 78950503580..92be01c4a6d 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -647,3 +647,4 @@ void AddSC_boss_twinemperors() newscript->GetAI = &GetAI_boss_veklor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp index 1b55d9e182a..2bb9f1bfb0b 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp @@ -27,3 +27,4 @@ EndScriptData */ #define SPELL_POISONBOLT_VOLLEY 25991 #define SPELL_TOXIN_CLOUD 25989 + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h index 8ab70caa625..5d545ed7c74 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h @@ -20,3 +20,4 @@ #define DATA_CTHUN_PHASE 20 #endif + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 2b40ddf173c..9048591b774 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -163,3 +163,4 @@ void AddSC_instance_temple_of_ahnqiraj() newscript->GetInstanceData = &GetInstanceData_instance_temple_of_ahnqiraj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index a069e861d2f..d86e3937b13 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -342,3 +342,4 @@ SentinelAbilityAura::SentinelAbilityAura(aqsentinelAI *abilityOwner, SpellEntry abilityId = ability; currentBasePoints = 0; } + diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 0fd39a8f532..8d71b61e7cc 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -533,3 +533,4 @@ void AddSC_terokkar_forest() newscript->pQuestAccept = &QuestAccept_npc_isla_starmane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index d92a468a239..c4c21fdc132 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -17,17 +17,22 @@ /* ScriptData SDName: Thousand Needles SD%Complete: 100 -SDComment: Support for Quest: 4770 +SDComment: Support for Quest: 4770, 1950 SDCategory: Thousand Needles EndScriptData */ /* ContentData npc_swiftmountain +npc_plucky EndContentData */ #include "precompiled.h" #include "../../npc/npc_escortAI.h" +/*##### +# npc_swiftmountain +######*/ + #define SAY_READY -1000147 #define SAY_AGGRO -1000148 #define SAY_FINISH -1000149 @@ -35,8 +40,6 @@ EndContentData */ #define QUEST_HOMEWARD_BOUND 4770 #define ENTRY_WYVERN 4107 - - struct TRINITY_DLL_DECL npc_swiftmountainAI : public npc_escortAI { npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} @@ -69,11 +72,10 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} void Reset() { - + m_creature->setFaction(104); } - void Aggro(Unit* who) - {} + void Aggro(Unit* who){} void JustSummoned(Creature* summoned) { @@ -101,7 +103,6 @@ bool QuestAccept_npc_swiftmountain(Player* player, Creature* creature, Quest con { ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); DoScriptText(SAY_READY, creature, player); - // Change faction so mobs attack creature->setFaction(113); } @@ -188,6 +189,120 @@ CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) return (CreatureAI*)thisAI; } +/*##### +# npc_plucky +######*/ + +#define GOSSIP_P "<Learn Secret phrase>" + +#define SPELL_TRANSFORM_HUMAN 9192 +#define QUEST_GET_THE_SCOOP 1950 + +struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI +{ + npc_pluckyAI(Creature *c) : ScriptedAI(c) {Reset();} + + bool Transformed; + bool Chicken; + + uint32 Timer; + uint32 ChickenTimer; + + void Reset() { + + Transformed = false; + Chicken = false; + m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + Timer = 0; + ChickenTimer = 0; + } + + void Aggro(Unit *who){} + + void TransformHuman(uint32 emoteid) + { + if (!Transformed) + { + Transformed = true; + DoCast(m_creature, SPELL_TRANSFORM_HUMAN); + Timer = 120000; + if (emoteid == TEXTEMOTE_BECKON) + m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + else + { + ChickenTimer = 1500; + Chicken = true; + } + } + } + + void UpdateAI(const uint32 diff) + { + if (Transformed) + { + if (Timer < diff) + Reset(); + else Timer-=diff; + } + + if(Chicken) + { + if (ChickenTimer < diff) + { + m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + Chicken = false; + }else ChickenTimer-=diff; + } + + if(!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +bool ReceiveEmote_npc_plucky( Player *player, Creature *_Creature, uint32 emote ) +{ + if( (emote == TEXTEMOTE_BECKON || emote == TEXTEMOTE_CHICKEN && + player->GetQuestStatus(QUEST_GET_THE_SCOOP) == QUEST_STATUS_INCOMPLETE) ) + { + _Creature->SetInFront(player); + ((npc_pluckyAI*)((Creature*)_Creature)->AI())->TransformHuman(emote); + } + + return true; +} + +bool GossipHello_npc_plucky(Player *player, Creature *_Creature) +{ + if(player->GetQuestStatus(QUEST_GET_THE_SCOOP) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(0, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(738, _Creature->GetGUID()); + + return true; +} + +bool GossipSelect_npc_plucky(Player *player, Creature *_Creature, uint32 sender, uint32 action) +{ + switch( action ) + { + case GOSSIP_ACTION_INFO_DEF+1: + player->CLOSE_GOSSIP_MENU(); + player->CompleteQuest(QUEST_GET_THE_SCOOP); + break; + } + return true; +} + +CreatureAI* GetAI_npc_plucky(Creature *_Creature) +{ +return new npc_pluckyAI(_Creature); +} + +/*##### +# +######*/ + void AddSC_thousand_needles() { Script *newscript; @@ -197,4 +312,13 @@ void AddSC_thousand_needles() newscript->GetAI = &GetAI_npc_swiftmountain; newscript->pQuestAccept = &QuestAccept_npc_swiftmountain; newscript->RegisterSelf(); -}
\ No newline at end of file + + newscript = new Script; + newscript->Name = "npc_plucky"; + newscript->GetAI = &GetAI_npc_plucky; + newscript->pReceiveEmote = &ReceiveEmote_npc_plucky; + newscript->pGossipHello = &GossipHello_npc_plucky; + newscript->pGossipSelect = &GossipSelect_npc_plucky; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp index fb4328025cd..e5d345bd0e7 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -135,3 +135,4 @@ void AddSC_thunder_bluff() newscript->pGossipSelect = &GossipSelect_npc_cairne_bloodhoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index 21d353eb10d..4e23707e371 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -160,3 +160,4 @@ void AddSC_tirisfal_glades() newscript->pGOHello = &GOHello_go_mausoleum_trigger; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index 8859b947eaf..dee990fb495 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -494,3 +494,4 @@ void AddSC_boss_archaedas() newscript->GetAI = &GetAI_mob_stonekeepers; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp index 2b1fac514eb..85eede55913 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp @@ -103,3 +103,4 @@ void AddSC_boss_ironaya() newscript->GetAI = &GetAI_boss_ironaya; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp index bca17fcd031..a8a1820f0a4 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp @@ -303,3 +303,4 @@ void AddSC_instance_uldaman() newscript->GetInstanceData = &GetInstanceData_instance_uldaman; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index 7be5d22c6a2..2fecc120d14 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -185,3 +185,4 @@ void AddSC_uldaman() newscript->pGossipSelect = &GossipSelect_npc_lore_keeper_of_norgannon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index d92a55b1fe4..590bf5608c0 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -263,3 +263,4 @@ void AddSC_undercity() newscript->pGossipSelect = &GossipSelect_npc_parqual_fintallas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index 36598bddf2d..16877f16d65 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -207,3 +207,4 @@ void AddSC_ungoro_crater() newscript->pQuestAccept = &QuestAccept_npc_ame; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp index 6ed57836455..5327bf7041d 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp @@ -22,3 +22,4 @@ SDCategory: Wailing Caverns EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp index f97231c2c1c..51fe821f0af 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -181,3 +181,4 @@ void AddSC_western_plaguelands() newscript->GetAI = &GetAI_npc_the_scourge_cauldron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp index 751bd941495..a70d2134d36 100644 --- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp +++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp @@ -177,3 +177,4 @@ void AddSC_westfall() newscript->pQuestAccept = &QuestAccept_npc_defias_traitor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp index ea999a4af93..db6555d058f 100644 --- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp +++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp @@ -165,3 +165,4 @@ void AddSC_winterspring() newscript->pGossipSelect = &GossipSelect_npc_witch_doctor_mauari; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index 7fcd3101e7c..7d76ea20917 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -411,3 +411,4 @@ void AddSC_zangarmarsh() newscript->pQuestAccept = &QuestAccept_npc_kayra_longmane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index 4daff002f38..bd0bcb0ba0f 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -466,3 +466,4 @@ void AddSC_boss_akilzon() newscript->GetAI = &GetAI_mob_soaring_eagle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index 555fa34154f..3ab0be0747e 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -401,3 +401,4 @@ void AddSC_boss_halazzi() newscript->GetAI = &GetAI_boss_spiritlynxAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index c2827ce6701..51e21d86c22 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -909,4 +909,5 @@ void AddSC_boss_hex_lord_malacrass() newscript->Name="boss_alyson_antille"; newscript->GetAI = &GetAI_boss_alyson_antille; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 4b51f7eef42..fe38ef9771a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -712,3 +712,4 @@ void AddSC_boss_janalai() newscript->GetAI = &GetAI_mob_eggAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index ae20e234931..8e908880d3a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -450,3 +450,4 @@ void AddSC_boss_nalorakk() newscript->GetAI = &GetAI_boss_nalorakk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index d4be29c3557..fd7326a0b7d 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -613,3 +613,4 @@ void AddSC_boss_zuljin() newscript->GetAI = &GetAI_feather_vortexAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h b/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h index 977c42a89e7..6fb0ef173bd 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h +++ b/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h @@ -16,3 +16,4 @@ #define TYPE_RAND_VENDOR_2 9 #endif + diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp index b5a8a73b249..2ff8a6e9b8a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp @@ -330,3 +330,4 @@ void AddSC_instance_zulaman() newscript->GetInstanceData = &GetInstanceData_instance_zulaman; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index e2ec994c75d..78fe5ee274b 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -190,3 +190,4 @@ void AddSC_zulaman() newscript->pGossipSelect = &GossipSelect_npc_zulaman_hostage; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index 3a616d605a0..a91acd38b54 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -222,3 +222,4 @@ void AddSC_zulfarrak() newscript->pGossipSelect = &GossipSelect_npc_weegli_blastfuse; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp index 8de897f4d62..466b8bd489f 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp @@ -207,3 +207,4 @@ void AddSC_boss_arlokk() newscript->GetAI = &GetAI_boss_arlokk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp index 58765b7d805..d0c11277cb5 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp @@ -90,3 +90,4 @@ void AddSC_boss_gahzranka() newscript->GetAI = &GetAI_boss_gahzranka; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp index 36f73ebce69..adfddad2ac0 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp @@ -90,3 +90,4 @@ void AddSC_boss_grilek() newscript->GetAI = &GetAI_boss_grilek; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index d76de14c926..4c6c62fa4e3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -247,3 +247,4 @@ void AddSC_boss_hakkar() newscript->GetAI = &GetAI_boss_hakkar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp index 6afc789eaea..c32608a01a3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp @@ -98,3 +98,4 @@ void AddSC_boss_hazzarah() newscript->GetAI = &GetAI_boss_hazzarah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index 995ed5e74f9..3f340a9daf3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -293,3 +293,4 @@ void AddSC_boss_jeklik() newscript->GetAI = &GetAI_mob_batrider; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index 6c81497f7f2..df3a02e69f2 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -267,3 +267,4 @@ void AddSC_boss_jindo() newscript->GetAI = &GetAI_mob_shade_of_jindo; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index 8574846576c..f6d606490c8 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -332,3 +332,4 @@ void AddSC_boss_mandokir() newscript->GetAI = &GetAI_mob_ohgan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index adfe134235b..309e6135a64 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -254,3 +254,4 @@ void AddSC_boss_marli() newscript->GetAI = &GetAI_mob_spawn_of_marli; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp index 8d5f1232f39..268c5c13b00 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp @@ -149,3 +149,4 @@ void AddSC_boss_renataki() newscript->GetAI = &GetAI_boss_renataki; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 8dc7bfcd626..ebf3b9dc309 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -534,3 +534,4 @@ void AddSC_boss_thekal() newscript->GetAI = &GetAI_mob_zealot_zath; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 061e3d47246..04a51ff7925 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -197,3 +197,4 @@ void AddSC_boss_venoxis() newscript->GetAI = &GetAI_boss_venoxis; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp index 9ba3ab622ff..858feb06e54 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp @@ -82,3 +82,4 @@ void AddSC_boss_wushoolay() newscript->GetAI = &GetAI_boss_wushoolay; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h b/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h index 06071e2f6b3..f14bd8eca98 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h +++ b/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h @@ -34,3 +34,4 @@ #define DATA_ZATH_ALIVE 27 #define DATA_ZATH_DEATH 28 #endif + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp b/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp index 4c580cd91d5..eb3cbd1d495 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp @@ -236,3 +236,4 @@ void AddSC_instance_zulgurub() newscript->GetInstanceData = &GetInstanceData_instance_zulgurub; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/system.cpp b/src/bindings/scripts/system.cpp index 703fa139bee..ab62e530681 100644 --- a/src/bindings/scripts/system.cpp +++ b/src/bindings/scripts/system.cpp @@ -19,3 +19,4 @@ */ #include "precompiled.h" + diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index cf41be4953f..858b8c1e1d3 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -60,3 +60,4 @@ class Permissible virtual int Permit(const T *) const = 0; }; #endif + diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index ef61ef38cde..8c2659e8f53 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectRegistry } }; #endif + diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index 0210f62faf7..646345705d3 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -129,3 +129,4 @@ class TRINITY_DLL_DECL Grid TypeMapContainer<WORLD_OBJECT_TYPES> i_objects; }; #endif + diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h index df46585c225..8a483044f8f 100644 --- a/src/framework/GameSystem/GridLoader.h +++ b/src/framework/GameSystem/GridLoader.h @@ -76,3 +76,4 @@ class TRINITY_DLL_DECL GridLoader } }; #endif + diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h index 63e5065dc12..bd32f836e18 100644 --- a/src/framework/GameSystem/GridRefManager.h +++ b/src/framework/GameSystem/GridRefManager.h @@ -41,3 +41,4 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT> iterator rend() { return iterator(NULL); } }; #endif + diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index 529278ea036..d4bd6752515 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, GridReference *next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); } }; #endif + diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 6ed87624662..6b89cdbedba 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -160,3 +160,4 @@ class TRINITY_DLL_DECL NGrid bool i_GridObjectDataLoaded; }; #endif + diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index e4a30103d2d..9e4c6da65e2 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -128,3 +128,4 @@ class TRINITY_DLL_DECL TypeMapContainer ContainerMapList<OBJECT_TYPES> i_elements; }; #endif + diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index ec005e2218c..f9945f84ac7 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -172,3 +172,4 @@ namespace Trinity } #endif + diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h index 5f15f6c65a7..b22c07db2b4 100644 --- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h +++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h @@ -167,3 +167,4 @@ namespace Trinity } #endif + diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h index c544afa0f5e..97570b370c2 100644 --- a/src/framework/GameSystem/TypeContainerVisitor.h +++ b/src/framework/GameSystem/TypeContainerVisitor.h @@ -116,3 +116,4 @@ class TRINITY_DLL_DECL TypeContainerVisitor VISITOR &i_visitor; }; #endif + diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h index e18be535e91..e69f2fb41e0 100644 --- a/src/framework/Network/SocketDefines.h +++ b/src/framework/Network/SocketDefines.h @@ -46,3 +46,4 @@ typedef int SocketHandle; typedef fd_set SelectSet; #endif #endif + diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index 2bf7f7872f9..691acb2e6d7 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -61,3 +61,4 @@ # pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif #endif + diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 574793a285d..e4d45f6b456 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -123,3 +123,4 @@ typedef uint32 DWORD; typedef uint64 OBJECT_HANDLE; #endif //TRINITY_DEFINE_H + diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h index 10ed0109583..91bec9eab37 100644 --- a/src/framework/Policies/CreationPolicy.h +++ b/src/framework/Policies/CreationPolicy.h @@ -107,3 +107,4 @@ namespace Trinity }; } #endif + diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp index 55d452f801d..852e382a0e9 100644 --- a/src/framework/Policies/ObjectLifeTime.cpp +++ b/src/framework/Policies/ObjectLifeTime.cpp @@ -33,3 +33,4 @@ namespace Trinity external_wrapper((void*)func); } } + diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h index 0666d7e19a8..86303f889fb 100644 --- a/src/framework/Policies/ObjectLifeTime.h +++ b/src/framework/Policies/ObjectLifeTime.h @@ -50,3 +50,4 @@ namespace Trinity } } #endif + diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h index e33a52b2462..66daaba5a9a 100644 --- a/src/framework/Policies/Singleton.h +++ b/src/framework/Policies/Singleton.h @@ -62,3 +62,4 @@ namespace Trinity }; } #endif + diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h index 386b321c1f1..89a4738ae22 100644 --- a/src/framework/Policies/SingletonImp.h +++ b/src/framework/Policies/SingletonImp.h @@ -90,3 +90,4 @@ Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySing template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \ template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false #endif + diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h index c482b2f10ad..a380fe78323 100644 --- a/src/framework/Policies/ThreadingModel.h +++ b/src/framework/Policies/ThreadingModel.h @@ -127,3 +127,4 @@ template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_m #define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \ template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX > #endif + diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h index c770be449cb..d9282c1787d 100644 --- a/src/framework/Utilities/ByteConverter.h +++ b/src/framework/Utilities/ByteConverter.h @@ -63,3 +63,4 @@ inline void EndianConvertReverse(uint8&) { } inline void EndianConvertReverse( int8&) { } #endif + diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h index 3b8c3e450f3..28c0931e6e7 100644 --- a/src/framework/Utilities/Callback.h +++ b/src/framework/Utilities/Callback.h @@ -382,3 +382,4 @@ namespace Trinity } #endif + diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h index 7954c437966..1e1083e1a66 100644 --- a/src/framework/Utilities/CountedReference/Reference.h +++ b/src/framework/Utilities/CountedReference/Reference.h @@ -97,3 +97,4 @@ class TRINITY_DLL_DECL Referencer ReferenceeHolder *i_holder; }; #endif + diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h index 03edff4c7cd..4cfb7d16ded 100644 --- a/src/framework/Utilities/CountedReference/ReferenceHolder.h +++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h @@ -39,3 +39,4 @@ struct ReferenceHolder : public THREADING_MODEL typedef typename THREADING_MODEL::Lock Lock; }; #endif + diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h index 43a01e2bc85..c3116a21cf4 100644 --- a/src/framework/Utilities/CountedReference/ReferenceImpl.h +++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h @@ -130,3 +130,4 @@ Referencer<T, THREADING_MODEL>::addReference(ReferenceHolder<T, THREADING_MODEL> ++holder->i_referenceCount; } #endif + diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp index d6e74ced42c..852f84bc4e2 100644 --- a/src/framework/Utilities/EventProcessor.cpp +++ b/src/framework/Utilities/EventProcessor.cpp @@ -98,3 +98,4 @@ uint64 EventProcessor::CalculateTime(uint64 t_offset) { return(m_time + t_offset); } + diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h index ecc7ec608be..d0a98c80e30 100644 --- a/src/framework/Utilities/EventProcessor.h +++ b/src/framework/Utilities/EventProcessor.h @@ -70,3 +70,4 @@ class EventProcessor bool m_aborting; }; #endif + diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h index 22a80f0b9ba..171ff3601e3 100644 --- a/src/framework/Utilities/LinkedList.h +++ b/src/framework/Utilities/LinkedList.h @@ -246,3 +246,4 @@ class LinkedListHead //============================================ #endif + diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h index bef8b32862c..ed580f49ec2 100644 --- a/src/framework/Utilities/LinkedReference/RefManager.h +++ b/src/framework/Utilities/LinkedReference/RefManager.h @@ -55,3 +55,4 @@ template <class TO, class FROM> class RefManager : public LinkedListHead //===================================================== #endif + diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h index 5ca167a3948..c77d3a2cbdb 100644 --- a/src/framework/Utilities/LinkedReference/Reference.h +++ b/src/framework/Utilities/LinkedReference/Reference.h @@ -91,3 +91,4 @@ template <class TO, class FROM> class Reference : public LinkedListElement //===================================================== #endif + diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h index fc9f869aa2b..07b1ebad3e6 100644 --- a/src/framework/Utilities/TypeList.h +++ b/src/framework/Utilities/TypeList.h @@ -43,3 +43,4 @@ struct TypeList #define TYPELIST_4(T1, T2, T3, T4) TypeList<T1, TYPELIST_3(T2, T3, T4) > #define TYPELIST_5(T1, T2, T3, T4, T5) TypeList<T1, TYPELIST_4(T2, T3, T4, T5) > #endif + diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 13f9d58619b..dd539cc0bda 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -70,3 +70,4 @@ namespace __gnu_cxx using std::hash_map; #endif #endif + diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index d5d7ee1a59a..a39203f3755 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -217,3 +217,4 @@ bool AccountMgr::normilizeString(std::string& utf8str) return WStrToUtf8(wstr_buf,wstr_len,utf8str); } + diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h index a40c93989ed..adb1bdfa6b9 100644 --- a/src/game/AccountMgr.h +++ b/src/game/AccountMgr.h @@ -58,3 +58,4 @@ class AccountMgr #define accmgr Trinity::Singleton<AccountMgr>::Instance() #endif + diff --git a/src/game/AddonHandler.cpp b/src/game/AddonHandler.cpp index 1372f9c323c..4dd25c56b26 100644 --- a/src/game/AddonHandler.cpp +++ b/src/game/AddonHandler.cpp @@ -229,3 +229,4 @@ void AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target, ui } } */ + diff --git a/src/game/AddonHandler.h b/src/game/AddonHandler.h index 78305db42bd..fd9ad395924 100644 --- a/src/game/AddonHandler.h +++ b/src/game/AddonHandler.h @@ -37,3 +37,4 @@ class AddonHandler }; #define sAddOnHandler Trinity::Singleton<AddonHandler>::Instance() #endif + diff --git a/src/game/AggressorAI.cpp b/src/game/AggressorAI.cpp index 441a526fd3b..2afe3442a21 100644 --- a/src/game/AggressorAI.cpp +++ b/src/game/AggressorAI.cpp @@ -113,3 +113,4 @@ AggressorAI::UpdateAI(const uint32 /*diff*/) } } } + diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h index ef8e081a30f..a2a0230939a 100644 --- a/src/game/AggressorAI.h +++ b/src/game/AggressorAI.h @@ -50,3 +50,4 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI TimeTracker i_tracker; }; #endif + diff --git a/src/game/AnimalRandomMovementGenerator.h b/src/game/AnimalRandomMovementGenerator.h index 86a70d0279a..9c64edcaa44 100644 --- a/src/game/AnimalRandomMovementGenerator.h +++ b/src/game/AnimalRandomMovementGenerator.h @@ -28,3 +28,4 @@ * animal creatures. */ #endif + diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index 46dd80f86f8..0e2ea0d341d 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -684,3 +684,4 @@ arenateam fields (id from 2.3.3 client): 1430 - unk - rank? 1431 - personal arena rating */ + diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h index 4b839401e12..ec79e305ba9 100644 --- a/src/game/ArenaTeam.h +++ b/src/game/ArenaTeam.h @@ -224,3 +224,4 @@ class ArenaTeam ArenaTeamStats stats; }; #endif + diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index 56c9a219a73..e625ca41dca 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -438,3 +438,4 @@ ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S "%s is full" ERR_ARENA_TEAM_LEVEL_TOO_LOW_I "You must be level %d to form an arena team" */ + diff --git a/src/game/AuctionHouse.cpp b/src/game/AuctionHouse.cpp new file mode 100644 index 00000000000..9fc448cf20b --- /dev/null +++ b/src/game/AuctionHouse.cpp @@ -0,0 +1,759 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "WorldPacket.h" +#include "WorldSession.h" +#include "Opcodes.h" +#include "Log.h" +#include "World.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "UpdateMask.h" +#include "AuctionHouseObject.h" +#include "Util.h" +#include "AuctionHouseBot.h" + +//please DO NOT use iterator++, because it is slower than ++iterator!!! +//post-incrementation is always slower than pre-incrementation ! + +//void called when player click on auctioneer npc +void WorldSession::HandleAuctionHelloOpcode( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8); + + uint64 guid; //NPC guid + recv_data >> guid; + + Creature *unit = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!unit) + { + sLog.outDebug( "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + SendAuctionHello(guid, unit); +} + +static uint8 AuctioneerFactionToLocation(uint32 faction) +{ + if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) + return 7; // neutral + + FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(faction); + if(!u_entry) + return 7; // neutral + + if(u_entry->ourMask & FACTION_MASK_ALLIANCE) + return 2; + else if(u_entry->ourMask & FACTION_MASK_HORDE) + return 6; + else + return 7; +} + +//this void causes that auction window is opened +void WorldSession::SendAuctionHello( uint64 guid, Creature* unit ) +{ + WorldPacket data( MSG_AUCTION_HELLO, 12 ); + data << (uint64) guid; + data << (uint32) AuctioneerFactionToLocation(unit->getFaction()); + SendPacket( &data ); +} + +//this function inserts to WorldPacket auction's data +bool WorldSession::SendAuctionInfo(WorldPacket & data, AuctionEntry* auction) +{ + Item *pItem = objmgr.GetAItem(auction->item_guidlow); + if (!pItem) + { + sLog.outError("auction to item, that doesn't exist !!!!"); + return false; + } + data << (uint32) auction->Id; + data << (uint32) pItem->GetEntry(); + + for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; i++) + { + data << (uint32) pItem->GetEnchantmentId(EnchantmentSlot(i)); + data << (uint32) pItem->GetEnchantmentDuration(EnchantmentSlot(i)); + data << (uint32) pItem->GetEnchantmentCharges(EnchantmentSlot(i)); + } + + data << (uint32) pItem->GetItemRandomPropertyId(); //random item property id + data << (uint32) pItem->GetItemSuffixFactor(); //SuffixFactor + data << (uint32) pItem->GetCount(); //item->count + data << (uint32) pItem->GetSpellCharges(); //item->charge FFFFFFF + data << (uint32) 0; //Unknown + data << (uint64) auction->owner; //Auction->owner + data << (uint32) auction->startbid; //Auction->startbid (not sure if useful) + data << (uint32) ((auction->bid)? objmgr.GetAuctionOutBid(auction->bid) : 0); + //minimal outbid + data << (uint32) auction->buyout; //auction->buyout + data << (uint32) (auction->time - time(NULL)) * 1000; //time left + data << (uint64) auction->bidder; //auction->bidder current + data << (uint32) auction->bid; //current bid + return true; +} + +//call this method when player bids, creates, or deletes auction +void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError ) +{ + WorldPacket data( SMSG_AUCTION_COMMAND_RESULT, 16 ); + data << auctionId; + data << Action; + data << ErrorCode; + if ( !ErrorCode && Action ) + data << bidError; //when bid, then send 0, once... + SendPacket(&data); +} + +//this function sends notification, if bidder is online +void WorldSession::SendAuctionBidderNotification( uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template) +{ + WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4)); + data << location; + data << auctionId; + data << (uint64) bidder; + data << bidSum; + data << (uint32) diff; + data << item_template; + data << (uint32) 0; + SendPacket(&data); +} + +//this void causes on client to display: "Your auction sold" +void WorldSession::SendAuctionOwnerNotification( AuctionEntry* auction) +{ + WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (7*4)); + data << auction->Id; + data << auction->bid; + data << (uint32) 0; //unk + data << (uint32) 0; //unk + data << (uint32) 0; //unk + data << auction->item_template; + data << (uint32) 0; //unk + SendPacket(&data); +} + +//this function sends mail to old bidder +void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction, uint32 newPrice) +{ + uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder,0, HIGHGUID_PLAYER); + Player *oldBidder = objmgr.GetPlayer(oldBidder_guid); + + uint32 oldBidder_accId = 0; + if(!oldBidder) + oldBidder_accId = objmgr.GetPlayerAccountIdByGUID(oldBidder_guid); + + // old bidder exist + if(oldBidder || oldBidder_accId) + { + std::ostringstream msgAuctionOutbiddedSubject; + msgAuctionOutbiddedSubject << auction->item_template << ":0:" << AUCTION_OUTBIDDED; + + if (oldBidder && !_player) + oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, AHBplayerGUID, newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template); + + if (oldBidder && _player) + oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, _player->GetGUID(), newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template); + + WorldSession::SendMailTo(oldBidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionOutbiddedSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE); + } +} + +//this function sends mail, when auction is canceled to old bidder +void WorldSession::SendAuctionCancelledToBidderMail( AuctionEntry* auction ) +{ + uint64 bidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER); + Player *bidder = objmgr.GetPlayer(bidder_guid); + + uint32 bidder_accId = 0; + if(!bidder) + bidder_accId = objmgr.GetPlayerAccountIdByGUID(bidder_guid); + + // bidder exist + if(bidder || bidder_accId) + { + std::ostringstream msgAuctionCancelledSubject; + msgAuctionCancelledSubject << auction->item_template << ":0:" << AUCTION_CANCELLED_TO_BIDDER; + + WorldSession::SendMailTo(bidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionCancelledSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE); + } +} + +//this void creates new auction and adds auction to some auctionhouse +void WorldSession::HandleAuctionSellItem( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+8+4+4+4); + + uint64 auctioneer, item; + uint32 etime, bid, buyout; + recv_data >> auctioneer >> item; + recv_data >> bid >> buyout >> etime; + Player *pl = GetPlayer(); + + if (!item || !bid || !etime) + return; //check for cheaters + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // client send time in minutes, convert to common used sec time + etime *= MINUTE; + + // client understand only 3 auction time + switch(etime) + { + case 1*MIN_AUCTION_TIME: + case 2*MIN_AUCTION_TIME: + case 4*MIN_AUCTION_TIME: + break; + default: + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + Item *it = pl->GetItemByGuid( item ); + //do not allow to sell already auctioned items + if(objmgr.GetAItem(GUID_LOPART(item))) + { + sLog.outError("AuctionError, player %s is sending item id: %u, but item is already in another auction", pl->GetName(), GUID_LOPART(item)); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + // prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction) + if(!it) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_ITEM_NOT_FOUND); + return; + } + + if(!it->CanBeTraded()) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + + if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || it->GetUInt32Value(ITEM_FIELD_DURATION)) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + //we have to take deposit : + uint32 deposit = objmgr.GetAuctionDeposit( location, etime, it ); + if ( pl->GetMoney() < deposit ) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_NOT_ENOUGHT_MONEY); + return; + } + + if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) ) + { + sLog.outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", + GetPlayerName(),GetAccountId(),it->GetProto()->Name1,it->GetEntry(),it->GetCount()); + } + + pl->ModifyMoney( -int32(deposit) ); + + uint32 auction_time = uint32(etime * sWorld.getRate(RATE_AUCTION_TIME)); + + AuctionEntry *AH = new AuctionEntry; + AH->Id = objmgr.GenerateAuctionID(); + AH->auctioneer = GUID_LOPART(auctioneer); + AH->item_guidlow = GUID_LOPART(item); + AH->item_template = it->GetEntry(); + AH->owner = pl->GetGUIDLow(); + AH->startbid = bid; + AH->bidder = 0; + AH->bid = 0; + AH->buyout = buyout; + AH->time = time(NULL) + auction_time; + AH->deposit = deposit; + AH->location = location; + + sLog.outDetail("selling item %u to auctioneer %u with initial bid %u with buyout %u and with time %u (in sec) in location: %u", GUID_LOPART(item), GUID_LOPART(auctioneer), bid, buyout, auction_time, location); + mAuctions->AddAuction(AH); + + objmgr.AddAItem(it); + pl->MoveItemFromInventory( it->GetBagSlot(), it->GetSlot(), true); + + CharacterDatabase.BeginTransaction(); + it->DeleteFromInventoryDB(); + it->SaveToDB(); // recursive and not have transaction guard into self, not in inventiory and can be save standalone + CharacterDatabase.PExecute("INSERT INTO auctionhouse (id,auctioneerguid,itemguid,item_template,itemowner,buyoutprice,time,buyguid,lastbid,startbid,deposit,location) " + "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u')", + AH->Id, AH->auctioneer, AH->item_guidlow, AH->item_template, AH->owner, AH->buyout, (uint64)AH->time, AH->bidder, AH->bid, AH->startbid, AH->deposit, AH->location); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); + + SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK); +} + +//this function is called when client bids or buys out auction +void WorldSession::HandleAuctionPlaceBid( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+4); + + uint64 auctioneer; + uint32 auctionId; + uint32 price; + recv_data >> auctioneer; + recv_data >> auctionId >> price; + + if (!auctionId || !price) + return; //check for cheaters + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + AuctionEntry *auction = mAuctions->GetAuction(auctionId); + Player *pl = GetPlayer(); + + if( !auction || auction->owner == pl->GetGUIDLow() ) + { + //you cannot bid your own auction: + SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR ); + return; + } + + // impossible have online own another character (use this for speedup check in case online owner) + Player* auction_owner = objmgr.GetPlayer(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)); + if( !auction_owner && objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)) == pl->GetSession()->GetAccountId()) + { + //you cannot bid your another character auction: + SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR ); + return; + } + + // cheating + if(price <= auction->bid) + return; + + // price too low for next bid if not buyout + if ((price < auction->buyout || auction->buyout == 0) && + price < auction->bid + objmgr.GetAuctionOutBid(auction->bid)) + { + //auction has already higher bid, client tests it! + return; + } + + if (price > pl->GetMoney()) + { + //you don't have enought money!, client tests! + //SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???); + return; + } + + if ((price < auction->buyout) || (auction->buyout == 0)) + { + if (auction->bidder > 0) + { + if ( auction->bidder == pl->GetGUIDLow() ) + { + pl->ModifyMoney( -int32(price - auction->bid)); + } + else + { + // mail to last bidder and return money + SendAuctionOutbiddedMail( auction , price ); + pl->ModifyMoney( -int32(price) ); + } + } + else + { + pl->ModifyMoney( -int32(price) ); + } + auction->bidder = pl->GetGUIDLow(); + auction->bid = price; + + // after this update we should save player's money ... + CharacterDatabase.PExecute("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id); + + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK, 0 ); + } + else + { + //buyout: + if (pl->GetGUIDLow() == auction->bidder ) + { + pl->ModifyMoney(-int32(auction->buyout - auction->bid)); + } + else + { + pl->ModifyMoney(-int32(auction->buyout)); + if ( auction->bidder ) //buyout for bidded auction .. + { + SendAuctionOutbiddedMail( auction, auction->buyout ); + } + } + auction->bidder = pl->GetGUIDLow(); + auction->bid = auction->buyout; + + objmgr.SendAuctionSalePendingMail( auction ); + objmgr.SendAuctionSuccessfulMail( auction ); + objmgr.SendAuctionWonMail( auction ); + + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK); + + objmgr.RemoveAItem(auction->item_guidlow); + mAuctions->RemoveAuction(auction->Id); + CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id); + + delete auction; + } + CharacterDatabase.BeginTransaction(); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); +} + +//this void is called when auction_owner cancels his auction +void WorldSession::HandleAuctionRemoveItem( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4); + + uint64 auctioneer; + uint32 auctionId; + recv_data >> auctioneer; + recv_data >> auctionId; + //sLog.outDebug( "Cancel AUCTION AuctionID: %u", auctionId); + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + AuctionEntry *auction = mAuctions->GetAuction(auctionId); + Player *pl = GetPlayer(); + + if (auction && auction->owner == pl->GetGUIDLow()) + { + Item *pItem = objmgr.GetAItem(auction->item_guidlow); + if (pItem) + { + if (auction->bidder > 0) // If we have a bidder, we have to send him the money he paid + { + uint32 auctionCut = objmgr.GetAuctionCut( auction->location, auction->bid); + if ( pl->GetMoney() < auctionCut ) //player doesn't have enough money, maybe message needed + return; + //some auctionBidderNotification would be needed, but don't know that parts.. + SendAuctionCancelledToBidderMail( auction ); + pl->ModifyMoney( -int32(auctionCut) ); + } + // Return the item by mail + std::ostringstream msgAuctionCanceledOwner; + msgAuctionCanceledOwner << auction->item_template << ":0:" << AUCTION_CANCELED; + + MailItemsInfo mi; + mi.AddItem(auction->item_guidlow, auction->item_template, pItem); + + // item will deleted or added to received mail list + WorldSession::SendMailTo(pl, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, pl->GetGUIDLow(), msgAuctionCanceledOwner.str(), 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE); + } + else + { + sLog.outError("Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->item_guidlow); + SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR ); + return; + } + } + else + { + SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR ); + //this code isn't possible ... maybe there should be assert + sLog.outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", pl->GetGUIDLow(), auctionId ); + return; + } + + //inform player, that auction is removed + SendAuctionCommandResult( auction->Id, AUCTION_CANCEL, AUCTION_OK ); + // Now remove the auction + CharacterDatabase.BeginTransaction(); + CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); + objmgr.RemoveAItem( auction->item_guidlow ); + mAuctions->RemoveAuction( auction->Id ); + delete auction; +} + +//called when player lists his bids +void WorldSession::HandleAuctionListBidderItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+4); + + uint64 guid; //NPC guid + uint32 listfrom; //page of auctions + uint32 outbiddedCount; //count of outbidded auctions + + recv_data >> guid; + recv_data >> listfrom; // not used in fact (this list not have page control in client) + recv_data >> outbiddedCount; + if (recv_data.size() != (16 + outbiddedCount * 4 )) + { + sLog.outError("Client sent bad opcode!!! with count: %u and size : %d (mustbe: %d", outbiddedCount, recv_data.size(),(16 + outbiddedCount * 4 )); + outbiddedCount = 0; + } + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location ); + + WorldPacket data( SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4) ); + Player *pl = GetPlayer(); + data << (uint32) 0; //add 0 as count + uint32 count = 0; + uint32 totalcount = 0; + while ( outbiddedCount > 0) //add all data, which client requires + { + --outbiddedCount; + uint32 outbiddedAuctionId; + recv_data >> outbiddedAuctionId; + AuctionEntry * auction = mAuctions->GetAuction( outbiddedAuctionId ); + if ( auction && SendAuctionInfo(data, auction)) + { + ++totalcount; + ++count; + } + } + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + if( Aentry && Aentry->bidder == pl->GetGUIDLow() ) + { + if (SendAuctionInfo(data, itr->second)) + ++count; + ++totalcount; + } + } + data.put<uint32>( 0, count ); // add count to placeholder + data << totalcount; + data << (uint32)300; //unk 2.3.0 + SendPacket(&data); +} + +//this void sends player info about his auctions +void WorldSession::HandleAuctionListOwnerItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4); + + uint32 listfrom; + uint64 guid; + + recv_data >> guid; + recv_data >> listfrom; // not used in fact (this list not have page control in client) + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location ); + + WorldPacket data( SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4) ); + data << (uint32) 0; // amount place holder + + uint32 count = 0; + uint32 totalcount = 0; + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + if( Aentry && Aentry->owner == _player->GetGUIDLow() ) + { + if(SendAuctionInfo(data, itr->second)) + ++count; + ++totalcount; + } + } + data.put<uint32>(0, count); + data << (uint32) totalcount; + data << (uint32) 0; + SendPacket(&data); +} + +//this void is called when player clicks on search button +void WorldSession::HandleAuctionListItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+1+1+1+4+4+4+4+1); + + std::string searchedname, name; + uint8 levelmin, levelmax, usable, location; + uint32 count, totalcount, listfrom, auctionSlotID, auctionMainCategory, auctionSubCategory, quality; + uint64 guid; + + recv_data >> guid; + recv_data >> listfrom; // start, used for page control listing by 50 elements + recv_data >> searchedname; + + // recheck with known string size + CHECK_PACKET_SIZE(recv_data,8+4+(searchedname.size()+1)+1+1+4+4+4+4+1); + + recv_data >> levelmin >> levelmax; + recv_data >> auctionSlotID >> auctionMainCategory >> auctionSubCategory; + recv_data >> quality >> usable; + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + //sLog.outDebug("Auctionhouse search guid: " I64FMTD ", list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", guid, listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); + + WorldPacket data( SMSG_AUCTION_LIST_RESULT, (4+4+4) ); + count = 0; + totalcount = 0; + data << (uint32) 0; + + // converting string that we try to find to lower case + std::wstring wsearchedname; + if(!Utf8toWStr(searchedname,wsearchedname)) + return; + + wstrToLower(wsearchedname); + + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + Item *item = objmgr.GetAItem(Aentry->item_guidlow); + if( item ) + { + ItemPrototype const *proto = item->GetProto(); + if( proto ) + { + if( auctionMainCategory == (0xffffffff) || proto->Class == auctionMainCategory ) + { + if( auctionSubCategory == (0xffffffff) || proto->SubClass == auctionSubCategory ) + { + if( auctionSlotID == (0xffffffff) || proto->InventoryType == auctionSlotID ) + { + if( quality == (0xffffffff) || proto->Quality == quality ) + { + if( usable == (0x00) || _player->CanUseItem( item ) == EQUIP_ERR_OK ) + { + if( ( levelmin == (0x00) || proto->RequiredLevel >= levelmin ) && ( levelmax == (0x00) || proto->RequiredLevel <= levelmax ) ) + { + name = proto->Name1; + + // local name + int loc_idx = GetSessionDbLocaleIndex(); + if ( loc_idx >= 0 ) + { + ItemLocale const *il = objmgr.GetItemLocale(proto->ItemId); + if (il) + { + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) + name = il->Name[loc_idx]; + } + } + + if(name.empty()) + continue; + + if( wsearchedname.empty() || Utf8FitTo(name, wsearchedname) ) + { + if ((count < 50) && (totalcount >= listfrom)) + { + ++count; + SendAuctionInfo( data, Aentry); + } + ++totalcount; + } + } + } + } + } + } + } + } + } + } + data.put<uint32>(0, count); + data << (uint32) totalcount; + data << (uint32) 300; // unk 2.3.0 const? + SendPacket(&data); +} + diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp index 94ee49c54be..afdc08ca7cd 100644 --- a/src/game/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot.cpp @@ -1194,3 +1194,4 @@ void AuctionHouseBotLoadValues(AHBConfig *config) {sLog.outError("buyerBidsPerInterval = %u", config->GetBidsPerInterval());} } } + diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h index 0d45adb415f..5113089e969 100644 --- a/src/game/AuctionHouseBot.h +++ b/src/game/AuctionHouseBot.h @@ -686,3 +686,4 @@ void AuctionHouseBotInit(); void AuctionHouseBotLoadValues(AHBConfig*); void AuctionHouseBotCommands(uint32, AuctionLocation, uint32, char*); #endif + diff --git a/src/game/AuctionHouseObject.h b/src/game/AuctionHouseObject.h new file mode 100644 index 00000000000..83fd19d19c6 --- /dev/null +++ b/src/game/AuctionHouseObject.h @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _AUCTION_HOUSE_H +#define _AUCTION_HOUSE_H + +#include "SharedDefines.h" + +#define MIN_AUCTION_TIME (12*HOUR) + +enum AuctionError +{ + AUCTION_OK = 0, + AUCTION_INTERNAL_ERROR = 2, + AUCTION_NOT_ENOUGHT_MONEY = 3, + AUCTION_ITEM_NOT_FOUND = 4, + CANNOT_BID_YOUR_AUCTION_ERROR = 10 +}; + +enum AuctionAction +{ + AUCTION_SELL_ITEM = 0, + AUCTION_CANCEL = 1, + AUCTION_PLACE_BID = 2 +}; + +struct AuctionEntry +{ + uint32 Id; + uint32 auctioneer; + uint32 item_guidlow; + uint32 item_template; + uint32 owner; + uint32 startbid; //maybe useless + uint32 bid; + uint32 buyout; + time_t time; + uint32 bidder; + uint32 deposit; //deposit can be calculated only when creating auction + uint32 location; +}; + +//this class is used as auctionhouse instance +class AuctionHouseObject +{ + public: + AuctionHouseObject() {} + ~AuctionHouseObject() + { + for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) + delete itr->second; + } + + typedef std::map<uint32, AuctionEntry*> AuctionEntryMap; + + uint32 Getcount() { return AuctionsMap.size(); } + + AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();} + AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();} + + void AddAuction(AuctionEntry *ah) + { + ASSERT( ah ); + AuctionsMap[ah->Id] = ah; + } + + AuctionEntry* GetAuction(uint32 id) const + { + AuctionEntryMap::const_iterator itr = AuctionsMap.find( id ); + if( itr != AuctionsMap.end() ) + return itr->second; + return NULL; + } + + bool RemoveAuction(uint32 id) + { + AuctionEntryMap::iterator i = AuctionsMap.find(id); + if (i == AuctionsMap.end()) + { + return false; + } + AuctionsMap.erase(i); + return true; + } + + private: + AuctionEntryMap AuctionsMap; +}; +#endif + diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp index 1293b058d00..c3b83a39e2b 100644 --- a/src/game/Bag.cpp +++ b/src/game/Bag.cpp @@ -224,3 +224,4 @@ Item* Bag::GetItemByPos( uint8 slot ) const return NULL; } + diff --git a/src/game/Bag.h b/src/game/Bag.h index 6f38057b4ce..34f56439cea 100644 --- a/src/game/Bag.h +++ b/src/game/Bag.h @@ -75,3 +75,4 @@ inline Item* NewItemOrBag(ItemPrototype const * proto) return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item; } #endif + diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index bdb78552102..e65266dc811 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1635,4 +1635,3 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid ) if(old_raid) old_raid->SetBattlegroundGroup(NULL); if(bg_raid) bg_raid->SetBattlegroundGroup(this); old_raid = bg_raid; -} diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index aa7cd316eb4..270d20cdb31 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -540,3 +540,4 @@ class BattleGround float m_TeamStartLocO[2]; }; #endif + diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp index fa7a90014ef..ca52e4ddaf2 100644 --- a/src/game/BattleGroundAA.cpp +++ b/src/game/BattleGroundAA.cpp @@ -63,3 +63,4 @@ bool BattleGroundAA::SetupBattleGround() { return true; } + diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGroundAA.h index 3d4dad0be9a..4f073b21da4 100644 --- a/src/game/BattleGroundAA.h +++ b/src/game/BattleGroundAA.h @@ -47,3 +47,4 @@ class BattleGroundAA : public BattleGround void HandleKillPlayer(Player* player, Player *killer); }; #endif + diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp index 322c1f6c920..7aecb33af8e 100644 --- a/src/game/BattleGroundAB.cpp +++ b/src/game/BattleGroundAB.cpp @@ -675,3 +675,4 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value break; } } + diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h index d859b34b1e1..5f05d182bee 100644 --- a/src/game/BattleGroundAB.h +++ b/src/game/BattleGroundAB.h @@ -284,3 +284,4 @@ class BattleGroundAB : public BattleGround bool m_IsInformedNearVictory; }; #endif + diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index c8d1ed3b673..972c24a8f4d 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -1446,3 +1446,4 @@ void BattleGroundAV::ResetBGSubclass() } + diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h index d4581b07d41..ef6731b5e73 100644 --- a/src/game/BattleGroundAV.h +++ b/src/game/BattleGroundAV.h @@ -1579,3 +1579,4 @@ class BattleGroundAV : public BattleGround }; #endif + diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp index e3d7b268c92..c23fae887a1 100644 --- a/src/game/BattleGroundBE.cpp +++ b/src/game/BattleGroundBE.cpp @@ -253,3 +253,4 @@ spell 32725 - Green Team 35774 Gold Team 35775 Green Team */ + diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGroundBE.h index 94b7a189b53..b8922e8f983 100644 --- a/src/game/BattleGroundBE.h +++ b/src/game/BattleGroundBE.h @@ -74,3 +74,4 @@ class BattleGroundBE : public BattleGround void UpdatePlayerScore(Player *Source, uint32 type, uint32 value); }; #endif + diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index 05456abc78d..40d55ea6f18 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -944,3 +944,4 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(float x, float y, return nearestEntry; } + diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h index 3a4215d713e..52106461e5a 100644 --- a/src/game/BattleGroundEY.h +++ b/src/game/BattleGroundEY.h @@ -372,3 +372,4 @@ class BattleGroundEY : public BattleGround int32 m_PointAddingTimer; }; #endif + diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 6cd12f1c722..7d5a2f503bf 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -872,3 +872,4 @@ void WorldSession::SendBattleGroundOrArenaJoinError(uint8 err) SendPacket(&data); return; } + diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 2b6cd408f91..3e0fbb28164 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1926,4 +1926,3 @@ void BattleGroundMgr::LoadBattleMastersEntry() sLog.outString(); sLog.outString( ">> Loaded %u battlemaster entries", count ); -} diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h index 07047e3aaa0..11ff62ab37f 100644 --- a/src/game/BattleGroundMgr.h +++ b/src/game/BattleGroundMgr.h @@ -259,3 +259,4 @@ class BattleGroundMgr #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance() #endif + diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp index 9574adac9b1..007ff659020 100644 --- a/src/game/BattleGroundNA.cpp +++ b/src/game/BattleGroundNA.cpp @@ -228,3 +228,4 @@ bool BattleGroundNA::SetupBattleGround() 0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08 | ................ 0050: 00 00 00 00 00 00 | ...... */ + diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGroundNA.h index 531cbe0cb23..8adef0a131b 100644 --- a/src/game/BattleGroundNA.h +++ b/src/game/BattleGroundNA.h @@ -72,3 +72,4 @@ class BattleGroundNA : public BattleGround bool HandlePlayerUnderMap(Player * plr); }; #endif + diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp index 9b2ffa18289..501ee704948 100644 --- a/src/game/BattleGroundRL.cpp +++ b/src/game/BattleGroundRL.cpp @@ -228,3 +228,4 @@ Packet S->C, id 600, SMSG_INIT_WORLD_STATES (706), len 86 0040: 00 00 00 00 00 00 D3 08 00 00 00 00 00 00 D4 08 | ................ 0050: 00 00 00 00 00 00 | ...... */ + diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGroundRL.h index cc3e460fa6b..abb6b25d4ff 100644 --- a/src/game/BattleGroundRL.h +++ b/src/game/BattleGroundRL.h @@ -68,3 +68,4 @@ class BattleGroundRL : public BattleGround bool HandlePlayerUnderMap(Player * plr); }; #endif + diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index 2af90fcd3c6..93b5659a0b9 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -741,3 +741,4 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data) data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1); } + diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h index 92bc8a03008..732c078d2f3 100644 --- a/src/game/BattleGroundWS.h +++ b/src/game/BattleGroundWS.h @@ -185,3 +185,4 @@ class BattleGroundWS : public BattleGround int32 m_FlagsDropTimer[2]; }; #endif + diff --git a/src/game/Cell.h b/src/game/Cell.h index 2459e3e73d2..7e66d5d9f73 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.h @@ -163,3 +163,4 @@ struct TRINITY_DLL_DECL CellLock } }; #endif + diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index 0aea067b32b..e74e0013a19 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -178,3 +178,4 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi } } #endif + diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 992a20353ac..87ede40f0b0 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -989,3 +989,4 @@ void Channel::LeaveNotify(uint64 guid) data << GetName(); SendToAll(&data); } + diff --git a/src/game/Channel.h b/src/game/Channel.h index b4fe04feb44..0e12ff9362c 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -285,3 +285,4 @@ class Channel void LeaveNotify(uint64 guid); // invisible notify }; #endif + diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp index 2fc634077c5..9b06693c589 100644 --- a/src/game/ChannelHandler.cpp +++ b/src/game/ChannelHandler.cpp @@ -387,3 +387,4 @@ void WorldSession::HandleChannelJoinNotify(WorldPacket &recvPacket) if(Channel *chn = cMgr->GetChannel(channelname, _player)) chn->JoinNotify(_player->GetGUID());*/ } + diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index a664e009b90..3a5469d8c63 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -101,3 +101,4 @@ inline ChannelMgr* channelMgr(uint32 team) return NULL; } #endif + diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index ffdd9942bb5..680fcdbc768 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -1326,5 +1326,3 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data) data << uint8(hairStyle); data << uint8(hairColor); data << uint8(facialHair); - SendPacket(&data); -} diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index bfd711c4737..a028fdc860f 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1583,3 +1583,4 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G return true; } + diff --git a/src/game/Chat.h b/src/game/Chat.h index ab8c840ec4a..6303a37c773 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -560,3 +560,4 @@ class CliHandler : public ChatHandler char const *fmtstring( char const *format, ... ); #endif + diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 8a79dc42397..97b980eea61 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -588,3 +588,4 @@ void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket) { sLog.outDebug("Opcode %u", recvPacket.GetOpcode()); } + diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp index 1458af5fcef..0c8e5e6bde9 100644 --- a/src/game/CombatHandler.cpp +++ b/src/game/CombatHandler.cpp @@ -95,3 +95,4 @@ void WorldSession::SendAttackStop(Unit const* enemy) data << uint32(0); // unk, can be 1 also SendPacket(&data); } + diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp index 483c4979194..06871ecdfa4 100644 --- a/src/game/ConfusedMovementGenerator.cpp +++ b/src/game/ConfusedMovementGenerator.cpp @@ -161,3 +161,4 @@ template void ConfusedMovementGenerator<Player>::Reset(Player &player); template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature); template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff); template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff); + diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h index 2ad5990214f..ad47b13cb39 100644 --- a/src/game/ConfusedMovementGenerator.h +++ b/src/game/ConfusedMovementGenerator.h @@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC ConfusedMovementGenerator uint32 i_nextMove; }; #endif + diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index 75c89ba7287..6f4b0191bb4 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -216,3 +216,4 @@ bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const { return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } + diff --git a/src/game/Corpse.h b/src/game/Corpse.h index 45203a9de76..200512f1cdf 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -100,3 +100,4 @@ class Corpse : public WorldObject GridPair m_grid; // gride for corpse position for fast search }; #endif + diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 7fa615d1c8a..e6fc9e394ba 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -2329,3 +2329,4 @@ const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const return GetName(); } + diff --git a/src/game/Creature.h b/src/game/Creature.h index a99b089214e..a5acdf3eaea 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -727,3 +727,4 @@ class AssistDelayEvent : public BasicEvent }; #endif + diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 7343bb8333a..880522c20d2 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -100,3 +100,4 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/) if(!target || !charmer->canAttack(target)) AttackStart(charmer->SelectNearestTarget()); } + diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index eb5b6fd49bc..6e291e2a604 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -177,3 +177,4 @@ typedef FactoryHolder<CreatureAI> CreatureAICreator; typedef FactoryHolder<CreatureAI>::FactoryHolderRegistry CreatureAIRegistry; typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository; #endif + diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index cb422c2a016..a8b8271c5ff 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -30,3 +30,4 @@ CreatureAIFactory<REAL_AI>::Create(void *data) const return (new REAL_AI(creature)); } #endif + diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp index 9ed1763141f..2964508af89 100644 --- a/src/game/CreatureAIRegistry.cpp +++ b/src/game/CreatureAIRegistry.cpp @@ -53,3 +53,4 @@ namespace AIRegistry (new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf(); } } + diff --git a/src/game/CreatureAIRegistry.h b/src/game/CreatureAIRegistry.h index 53776e3d4e9..2b92a096731 100644 --- a/src/game/CreatureAIRegistry.h +++ b/src/game/CreatureAIRegistry.h @@ -26,3 +26,4 @@ namespace AIRegistry void Initialize(void); } #endif + diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index 8b4205980be..40b9f0c0c07 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -125,3 +125,4 @@ namespace FactorySelector } } + diff --git a/src/game/CreatureAISelector.h b/src/game/CreatureAISelector.h index a6fc47e3913..436233b5b21 100644 --- a/src/game/CreatureAISelector.h +++ b/src/game/CreatureAISelector.h @@ -31,3 +31,4 @@ namespace FactorySelector MovementGenerator* selectMovementGenerator(Creature *); } #endif + diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index a45c59f9186..215bca059e8 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -212,3 +212,4 @@ void CreatureGroup::SetMemberDestination(Creature *member) member->GetMotionMaster()->MovePoint(0, x, y, z); } } + diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h index 45df16086b1..11d45167fd9 100644 --- a/src/game/CreatureGroups.h +++ b/src/game/CreatureGroups.h @@ -66,3 +66,4 @@ extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap; #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance() #endif + diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 68e934abc7c..2ec72818fd7 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -657,5 +657,3 @@ bool ChatHandler::HandleSendSetPhaseShiftCommand(const char* args) uint32 PhaseShift = atoi(args); m_session->SendSetPhaseShift(PhaseShift); - return true; -} diff --git a/src/game/DestinationHolder.cpp b/src/game/DestinationHolder.cpp index 6f4e08256c5..f2158e3b5be 100644 --- a/src/game/DestinationHolder.cpp +++ b/src/game/DestinationHolder.cpp @@ -19,3 +19,4 @@ */ #include "DestinationHolder.h" + diff --git a/src/game/DestinationHolder.h b/src/game/DestinationHolder.h index a1d295ead09..94e12a1757d 100644 --- a/src/game/DestinationHolder.h +++ b/src/game/DestinationHolder.h @@ -62,3 +62,4 @@ class TRINITY_DLL_DECL DestinationHolder }; #endif + diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h index 963e074fff9..54d087d3f2f 100644 --- a/src/game/DestinationHolderImp.h +++ b/src/game/DestinationHolderImp.h @@ -247,3 +247,4 @@ DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y, } #endif + diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp index acde3b4ef51..f0b7980821d 100644 --- a/src/game/DuelHandler.cpp +++ b/src/game/DuelHandler.cpp @@ -90,3 +90,4 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket) GetPlayer()->DuelComplete(DUEL_INTERUPTED); } + diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 09856f1233e..b63928e7278 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -52,6 +52,13 @@ void DynamicObject::AddToWorld() void DynamicObject::RemoveFromWorld() { + // Make sure the object is back to grid container for removal as farsight targets + // are switched to world container on creation and they are also set to active + if (isActive()) + { + GetMap()->SwitchGridContainers(this, false); + setActive(false); + } ///- Remove the dynamicObject from the accessor if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this); WorldObject::RemoveFromWorld(); @@ -129,19 +136,6 @@ void DynamicObject::Update(uint32 p_time) void DynamicObject::Delete() { - // Make sure the object is back to grid container for removal as farsight targets - // are switched to world container on creation and they are also set to active - if (isActive()) - { - Map* map = GetMap(); - if(!map) - { - sLog.outError("DynamicObject (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId()); - return; - } - map->SwitchGridContainers(this, false); - setActive(false); - } SendObjectDeSpawnAnim(GetGUID()); AddObjectToRemoveList(); } @@ -160,3 +154,4 @@ bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) con && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false) || GetCasterGUID() == u->GetGUID()); } + diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 05a5f3d930d..2eda623e36d 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -73,3 +73,4 @@ class DynamicObject : public WorldObject GridReference<DynamicObject> m_gridRef; }; #endif + diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index a3bbb965961..8f9eb6073d5 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -409,3 +409,4 @@ template void FleeingMovementGenerator<Player>::Reset(Player &); template void FleeingMovementGenerator<Creature>::Reset(Creature &); template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &); template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &); + diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h index 9bf967fa42d..ec110b62b92 100644 --- a/src/game/FleeingMovementGenerator.h +++ b/src/game/FleeingMovementGenerator.h @@ -63,3 +63,4 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator DestinationHolder< Traveller<T> > i_destinationHolder; }; #endif + diff --git a/src/game/FollowerRefManager.h b/src/game/FollowerRefManager.h index 06e04c8d3ae..093c85adcee 100644 --- a/src/game/FollowerRefManager.h +++ b/src/game/FollowerRefManager.h @@ -31,3 +31,4 @@ class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase }; #endif + diff --git a/src/game/FollowerReference.cpp b/src/game/FollowerReference.cpp index d6a113a8bb6..173f9881c54 100644 --- a/src/game/FollowerReference.cpp +++ b/src/game/FollowerReference.cpp @@ -36,3 +36,4 @@ void FollowerReference::sourceObjectDestroyLink() { getSource()->stopFollowing(); } + diff --git a/src/game/FollowerReference.h b/src/game/FollowerReference.h index d15664ab6db..3c0b3dc9e7c 100644 --- a/src/game/FollowerReference.h +++ b/src/game/FollowerReference.h @@ -34,3 +34,4 @@ class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMoveme void sourceObjectDestroyLink(); }; #endif + diff --git a/src/game/Formulas.h b/src/game/Formulas.h index 720a7a2825d..dc90b21e535 100644 --- a/src/game/Formulas.h +++ b/src/game/Formulas.h @@ -155,3 +155,4 @@ namespace Trinity } } #endif + diff --git a/src/game/GameEvent.cpp b/src/game/GameEvent.cpp index 62f285e25ac..6c2be2b5267 100644 --- a/src/game/GameEvent.cpp +++ b/src/game/GameEvent.cpp @@ -1535,3 +1535,4 @@ void GameEvent::SendWorldStateUpdate(Player * plr, uint16 event_id) plr->SendUpdateWorldState(itr->second.max_world_state, (uint32)(itr->second.reqNum)); } } + diff --git a/src/game/GameEvent.h b/src/game/GameEvent.h index ab5a1ed3292..6333d906256 100644 --- a/src/game/GameEvent.h +++ b/src/game/GameEvent.h @@ -160,3 +160,4 @@ class GameEvent #define gameeventmgr Trinity::Singleton<GameEvent>::Instance() #endif + diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index e22bd7264ab..8c51259e9f0 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1380,3 +1380,4 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const return GetName(); } + diff --git a/src/game/GameObject.h b/src/game/GameObject.h index a492e4dad35..0213bcc9bf2 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -608,3 +608,4 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject GridReference<GameObject> m_gridRef; }; #endif + diff --git a/src/game/GlobalEvents.cpp b/src/game/GlobalEvents.cpp index 807b0c695d0..a544113f5c8 100644 --- a/src/game/GlobalEvents.cpp +++ b/src/game/GlobalEvents.cpp @@ -86,3 +86,4 @@ void CorpsesErase() CorpsesErase(true, 20*MINUTE); CorpsesErase(false,3*DAY); } + diff --git a/src/game/GlobalEvents.h b/src/game/GlobalEvents.h index 0b76b09330a..aa99c47985e 100644 --- a/src/game/GlobalEvents.h +++ b/src/game/GlobalEvents.h @@ -29,3 +29,4 @@ void CorpsesErase(); void HandleCorpsesErase(void*); #endif /// @} + diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 65e0f54d925..8f810d6355b 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -807,3 +807,4 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID pSession->SendPacket( &data ); sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() ); } + diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index dc52eb4dc3b..cbb3e89af41 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -207,3 +207,4 @@ class TRINITY_DLL_SPEC PlayerMenu void SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel ); }; #endif + diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h index b45bfe92913..2823df5e101 100644 --- a/src/game/GridDefines.h +++ b/src/game/GridDefines.h @@ -188,3 +188,4 @@ namespace Trinity } } #endif + diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index 8df2cad8009..31820d427dc 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -1013,3 +1013,4 @@ namespace Trinity #endif } #endif + diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index c237c95a28b..aee78386b6d 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -540,3 +540,4 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) } #endif // TRINITY_GRIDNOTIFIERSIMPL_H + diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp index 92df04ef06e..cedec1de60f 100644 --- a/src/game/GridStates.cpp +++ b/src/game/GridStates.cpp @@ -73,3 +73,4 @@ RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, c } } } + diff --git a/src/game/GridStates.h b/src/game/GridStates.h index dd22c482c0a..12d64ad58ca 100644 --- a/src/game/GridStates.h +++ b/src/game/GridStates.h @@ -73,3 +73,4 @@ class TRINITY_DLL_DECL RemovalState : public GridState void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; }; #endif + diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 9007da3bdaa..33dc3226ec2 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1560,3 +1560,4 @@ void Group::BroadcastGroupUpdate(void) } } } + diff --git a/src/game/Group.h b/src/game/Group.h index 79129969513..939f240a7e2 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -413,3 +413,4 @@ class TRINITY_DLL_SPEC Group uint8* m_subGroupsCounts; }; #endif + diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 574ebd7de75..79007564c38 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -949,3 +949,4 @@ void WorldSession::HandleGroupPassOnLootOpcode( WorldPacket & recv_data ) if(unkn!=0) sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!"); } + diff --git a/src/game/GroupRefManager.h b/src/game/GroupRefManager.h index b17c3394b94..ab3b6417611 100644 --- a/src/game/GroupRefManager.h +++ b/src/game/GroupRefManager.h @@ -33,3 +33,4 @@ class GroupRefManager : public RefManager<Group, Player> GroupReference* getFirst() { return ((GroupReference* ) RefManager<Group, Player>::getFirst()); } }; #endif + diff --git a/src/game/GroupReference.cpp b/src/game/GroupReference.cpp index e9994a133ca..a09fc769dad 100644 --- a/src/game/GroupReference.cpp +++ b/src/game/GroupReference.cpp @@ -39,3 +39,4 @@ void GroupReference::sourceObjectDestroyLink() // called from invalidate() getTarget()->DelinkMember(this); } + diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h index 60948435533..da896cf02dd 100644 --- a/src/game/GroupReference.h +++ b/src/game/GroupReference.h @@ -41,3 +41,4 @@ class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player> void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; } }; #endif + diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp index 4ec794767ea..8fc8e3e143f 100644 --- a/src/game/GuardAI.cpp +++ b/src/game/GuardAI.cpp @@ -137,3 +137,4 @@ void GuardAI::JustDied(Unit *killer) i_creature.SendZoneUnderAttackMessage(pkiller); } + diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h index 2f91f359115..3bc7ac35f8e 100644 --- a/src/game/GuardAI.h +++ b/src/game/GuardAI.h @@ -53,3 +53,4 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI TimeTracker i_tracker; }; #endif + diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 6c158888310..5c773c14c88 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -2020,3 +2020,4 @@ bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const return false; } + diff --git a/src/game/Guild.h b/src/game/Guild.h index a1bd6d2e36f..a43c594fd1d 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -457,3 +457,4 @@ class Guild Item* _StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone ); }; #endif + diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index f1a59814d57..0889bf1a646 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -1702,3 +1702,4 @@ void WorldSession::SendSaveGuildEmblem( uint32 msg ) data << uint32(msg); // not part of guild SendPacket( &data ); } + diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp index ea31b82f776..1a3adef9419 100644 --- a/src/game/HomeMovementGenerator.cpp +++ b/src/game/HomeMovementGenerator.cpp @@ -85,3 +85,4 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff return true; } + diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h index 77e78ca23d3..3e3a59456cd 100644 --- a/src/game/HomeMovementGenerator.h +++ b/src/game/HomeMovementGenerator.h @@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature> uint32 i_travel_timer; }; #endif + diff --git a/src/game/HostilRefManager.cpp b/src/game/HostilRefManager.cpp index aed4c8d02eb..aee035ded49 100644 --- a/src/game/HostilRefManager.cpp +++ b/src/game/HostilRefManager.cpp @@ -147,3 +147,4 @@ void HostilRefManager::setOnlineOfflineState(Unit *pCreature,bool pIsOnline) } //================================================= + diff --git a/src/game/HostilRefManager.h b/src/game/HostilRefManager.h index 8c4ac623ac0..316509e3908 100644 --- a/src/game/HostilRefManager.h +++ b/src/game/HostilRefManager.h @@ -66,3 +66,4 @@ class HostilRefManager : public RefManager<Unit, ThreatManager> }; //================================================= #endif + diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp index b8910f555d0..10cca1d85ff 100644 --- a/src/game/IdleMovementGenerator.cpp +++ b/src/game/IdleMovementGenerator.cpp @@ -49,3 +49,4 @@ DistractMovementGenerator::Update(Unit& owner, const uint32& time_diff) m_timer -= time_diff; return true; } + diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h index 19618be8e86..7f1f41f9166 100644 --- a/src/game/IdleMovementGenerator.h +++ b/src/game/IdleMovementGenerator.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC DistractMovementGenerator : public MovementGenerator }; #endif + diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index 79b1f8bcbb3..473d8433395 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -29,3 +29,4 @@ void InstanceData::SaveToDB() CharacterDatabase.escape_string(data); CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId()); } + diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 146e955f8fe..0b7c1f7faf3 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -70,3 +70,4 @@ class TRINITY_DLL_SPEC InstanceData virtual void SetData(uint32, uint32 data) {} }; #endif + diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index ad827a07bf2..b138c33d9a6 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -650,3 +650,4 @@ uint32 InstanceSaveManager::GetNumBoundGroupsTotal() ret += itr->second->GetGroupCount(); return ret; } + diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index f868f2e8094..2a913e5cedf 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -173,3 +173,4 @@ class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceS #define sInstanceSaveManager Trinity::Singleton<InstanceSaveManager>::Instance() #endif + diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 2cb1fe3caa4..85df92f998b 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -943,3 +943,4 @@ Item* Item::CloneItem( uint32 count, Player const* player ) const newItem->SetItemRandomProperties(GetItemRandomPropertyId()); return newItem; } + diff --git a/src/game/Item.h b/src/game/Item.h index 4f901302105..8e4fc410531 100644 --- a/src/game/Item.h +++ b/src/game/Item.h @@ -302,3 +302,4 @@ class TRINITY_DLL_SPEC Item : public Object bool mb_in_trade; // true if item is currently in trade-window }; #endif + diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp index 305e3a64ebc..e4b2d809582 100644 --- a/src/game/ItemEnchantmentMgr.cpp +++ b/src/game/ItemEnchantmentMgr.cpp @@ -202,3 +202,4 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id) } return 0; } + diff --git a/src/game/ItemEnchantmentMgr.h b/src/game/ItemEnchantmentMgr.h index 0feed4319d5..ce627515aee 100644 --- a/src/game/ItemEnchantmentMgr.h +++ b/src/game/ItemEnchantmentMgr.h @@ -27,3 +27,4 @@ void LoadRandomEnchantmentsTable(); uint32 GetItemEnchantMod(uint32 entry); uint32 GenerateEnchSuffixFactor(uint32 item_id); #endif + diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 522539b6bab..7ffa5143786 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1334,3 +1334,4 @@ void WorldSession::HandleCancelTempItemEnchantmentOpcode(WorldPacket& recv_data) GetPlayer()->ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false); item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT); } + diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index c23c0d5978c..1087154c5e7 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -668,3 +668,4 @@ struct ItemLocale #pragma pack(pop) #endif #endif + diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index 182e89a42c5..85c196a9346 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -337,3 +337,4 @@ void WorldSession::HandleSetLfgOpcode( WorldPacket & recv_data ) SendLfgResult(type, entry, 0); } + diff --git a/src/game/Language.h b/src/game/Language.h index da7f564755a..ff732ca3bdb 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -898,3 +898,4 @@ enum TrinityStrings // For other tables maybe 2000010000-2147483647 (max index) }; #endif + diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index d02671c724e..fcd40455072 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -266,3 +266,4 @@ bool ChatHandler::HandleServerMotdCommand(const char* /*args*/) PSendSysMessage(LANG_MOTD_CURRENT, sWorld.GetMotd()); return true; } + diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 8bf4e52a2d4..44818cfc7be 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -2991,3 +2991,4 @@ bool ChatHandler::HandleDrunkCommand(const char* args) return true; } + diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index f731d2ce7ad..0097da93525 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -7398,3 +7398,4 @@ bool ChatHandler::HandleUnbindSightCommand(const char* args) m_session->GetPlayer()->StopCastingBindSight(); return true; } + diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 438b3922cb6..9c04baa6716 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -514,3 +514,4 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data ) pLoot->NotifyItemRemoved(slotid); --pLoot->unlootedCount; } + diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index af310b452fe..95a641862c4 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -1339,3 +1339,4 @@ void LoadLootTemplates_Reference() // output error for any still listed ids (not referenced from any loot table) LootTemplates_Reference.ReportUnusedIds(ids_set); } + diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index 2d024b307a9..7841a2e0d3b 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -346,3 +346,4 @@ inline void LoadLootTables() } #endif + diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index a699d9acc4d..62327ccdc6e 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -862,3 +862,4 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station } CharacterDatabase.CommitTransaction(); } + diff --git a/src/game/Mail.h b/src/game/Mail.h index ee4f6e54c4b..acf0d9346fe 100644 --- a/src/game/Mail.h +++ b/src/game/Mail.h @@ -212,3 +212,4 @@ struct Mail bool HasItems() const { return !items.empty(); } }; #endif + diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 5ea2de9efb4..fe060d14dff 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -257,17 +257,16 @@ template<> void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell) { // add to world object registry in grid - if(obj->isPet() || obj->isPossessedByPlayer() || obj->isVehicle()) + if(obj->isPet() || obj->HasSharedVision() || obj->isVehicle()) { (*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj, obj->GetGUID()); - obj->SetCurrentCell(cell); } // add to grid object store else { (*grid)(cell.CellX(), cell.CellY()).AddGridObject<Creature>(obj, obj->GetGUID()); - obj->SetCurrentCell(cell); } + obj->SetCurrentCell(cell); } template<class T> @@ -301,7 +300,7 @@ template<> void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell) { // remove from world object registry in grid - if(obj->isPet() || obj->isPossessedByPlayer() || obj->isVehicle()) + if(obj->isPet() || obj->HasSharedVision() || obj->isVehicle()) { (*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<Creature>(obj, obj->GetGUID()); } @@ -327,7 +326,8 @@ void Map::SwitchGridContainers(T* obj, bool active) grid.RemoveGridObject<T>(obj, obj->GetGUID()); grid.AddWorldObject<T>(obj, obj->GetGUID()); } - } else + } + else { if (!grid.GetGridObject(obj->GetGUID(), obj)) { @@ -338,7 +338,6 @@ void Map::SwitchGridContainers(T* obj, bool active) } template void Map::SwitchGridContainers(Creature *, bool); -template void Map::SwitchGridContainers(Corpse *, bool); template void Map::SwitchGridContainers(DynamicObject *, bool); template<class T> @@ -349,20 +348,20 @@ void Map::DeleteFromWorld(T* obj) } template<class T> -void Map::AddNotifier(T* , Cell const& , CellPair const& ) +void Map::AddNotifier(T*) { } template<> -void Map::AddNotifier(Player* obj, Cell const& cell, CellPair const& cellpair) +void Map::AddNotifier(Player* obj) { - PlayerRelocationNotify(obj,cell,cellpair); + AddUnitToNotify(obj); } template<> -void Map::AddNotifier(Creature* obj, Cell const& cell, CellPair const& cellpair) +void Map::AddNotifier(Creature* obj) { - CreatureRelocationNotify(obj,cell,cellpair); + AddUnitToNotify(obj); } void @@ -427,33 +426,6 @@ Map::EnsureGridLoadedForPlayer(const Cell &cell, Player *player, bool add_player AddToGrid(player,grid,cell); } -void -Map::LoadGrid(const Cell& cell, bool no_unload) -{ - EnsureGridCreated(GridPair(cell.GridX(), cell.GridY())); - NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); - - assert(grid != NULL); - if( !isGridObjectDataLoaded(cell.GridX(), cell.GridY()) ) - { - ObjectGridLoader loader(*grid, this, cell); - loader.LoadN(); - setGridObjectDataLoaded(true,cell.GridX(), cell.GridY()); - - // Add resurrectable corpses to world object list in grid - ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this); - - // Not sure if this is the reason that far sight cause crash - // Seems crash happens when trying to delete a far sight dynobj from an unopened grid - ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 1.0f); - grid->SetGridState(GRID_STATE_ACTIVE); - - if(no_unload) - getNGrid(cell.GridX(), cell.GridY())->setUnloadFlag(false); - } - //LoadVMap(63-cell.GridX(),63-cell.GridY()); -} - void Map::LoadGrid(float x, float y) { CellPair pair = Trinity::ComputeCellPair(x, y); @@ -476,11 +448,8 @@ bool Map::Add(Player *player) SendInitSelf(player); SendInitTransports(player); - //UpdatePlayerVisibility(player,cell,p); - //UpdateObjectsVisibilityFor(player,cell,p); + AddNotifier(player); - //AddNotifier(player,cell,p); - AddUnitToNotify(player); return true; } @@ -510,9 +479,7 @@ Map::Add(T *obj) UpdateObjectVisibility(obj,cell,p); - //AddNotifier(obj,cell,p); - if(obj->GetTypeId() == TYPEID_UNIT || obj->GetTypeId() == TYPEID_PLAYER) - AddUnitToNotify((Unit*)obj); + AddNotifier(obj); } void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self, bool to_possessor) @@ -610,49 +577,6 @@ bool Map::loaded(const GridPair &p) const return ( getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord) ); } -/*void Map::UpdateActiveCells(const float &x, const float &y, const uint32 &t_diff) -{ - CellPair standing_cell(Trinity::ComputeCellPair(x, y)); - - // Check for correctness of standing_cell, it also avoids problems with update_cell - if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP) - return; - - // will this reduce the speed? - Trinity::ObjectUpdater updater(t_diff); - // for creature - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer > grid_object_update(updater); - // for pets - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater); - - // the overloaded operators handle range checking - // so ther's no need for range checking inside the loop - CellPair begin_cell(standing_cell), end_cell(standing_cell); - begin_cell << 1; begin_cell -= 1; // upper left - end_cell >> 1; end_cell += 1; // lower right - - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) - { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) - { - // marked cells are those that have been visited - // don't visit the same cell twice - uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x; - if(!isCellMarked(cell_id)) - { - markCell(cell_id); - CellPair pair(x,y); - Cell cell(pair); - cell.data.Part.reserved = CENTER_DISTRICT; - cell.SetNoCreate(); - CellLock<NullGuard> cell_lock(cell, pair); - cell_lock->Visit(cell_lock, grid_object_update, *this); - cell_lock->Visit(cell_lock, world_object_update, *this); - } - } - } -}*/ - void Map::RelocationNotify() { //creatures may be added to the list during update @@ -838,9 +762,6 @@ void Map::Remove(Player *player, bool remove) SendRemoveTransports(player); - //UpdateObjectsVisibilityFor(player,cell,p); - //AddUnitToNotify(player); - if( remove ) DeleteFromWorld(player); } @@ -918,21 +839,12 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati RemoveFromGrid(player, oldGrid,old_cell); if( !old_cell.DiffGrid(new_cell) ) AddToGrid(player, oldGrid,new_cell); - - if( old_cell.DiffGrid(new_cell) ) + else EnsureGridLoadedForPlayer(new_cell, player, true); } - // if move then update what player see and who seen - //UpdatePlayerVisibility(player,new_cell,new_val); - //UpdateObjectsVisibilityFor(player,new_cell,new_val); - - // also update what possessing player sees - //if(player->isPossessedByPlayer()) - // UpdateObjectsVisibilityFor((Player*)player->GetCharmer(), new_cell, new_val); - - //PlayerRelocationNotify(player,new_cell,new_val); AddUnitToNotify(player); + NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY()); if( !same_cell && newGrid->GetGridState()!= GRID_STATE_ACTIVE ) { @@ -971,11 +883,6 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang else { creature->Relocate(x, y, z, ang); - // Update visibility back to player who is controlling the creature - //if(creature->isPossessedByPlayer()) - // UpdateObjectsVisibilityFor((Player*)creature->GetCharmer(), new_cell, new_val); - - //CreatureRelocationNotify(creature,new_cell,new_val); AddUnitToNotify(creature); } assert(CheckGridIntegrity(creature,true)); @@ -1042,12 +949,8 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell) sLog.outDebug("Creature (GUID: %u Entry: %u) moved in grid[%u,%u] from cell[%u,%u] to cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); #endif - if( !old_cell.DiffGrid(new_cell) ) - { - RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); - AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); - c->SetCurrentCell(new_cell); - } + RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); + AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); } else { @@ -1504,60 +1407,6 @@ void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair cell_lock->Visit(cell_lock, player_notifier, *this); } -/*void Map::UpdatePlayerVisibility( Player* player, Cell cell, CellPair cellpair ) -{ - cell.data.Part.reserved = ALL_DISTRICT; - - Trinity::PlayerNotifier pl_notifier(*player); - TypeContainerVisitor<Trinity::PlayerNotifier, WorldTypeMapContainer > player_notifier(pl_notifier); - - CellLock<ReadGuard> cell_lock(cell, cellpair); - cell_lock->Visit(cell_lock, player_notifier, *this); -}*/ - -void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpair ) -{ - Trinity::VisibleNotifier notifier(*player); - - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - TypeContainerVisitor<Trinity::VisibleNotifier, WorldTypeMapContainer > world_notifier(notifier); - TypeContainerVisitor<Trinity::VisibleNotifier, GridTypeMapContainer > grid_notifier(notifier); - CellLock<GridReadGuard> cell_lock(cell, cellpair); - cell_lock->Visit(cell_lock, world_notifier, *this); - cell_lock->Visit(cell_lock, grid_notifier, *this); - - // send data - notifier.Notify(); -} - -void Map::PlayerRelocationNotify( Player* player, Cell cell, CellPair cellpair ) -{ - CellLock<ReadGuard> cell_lock(cell, cellpair); - Trinity::PlayerRelocationNotifier relocationNotifier(*player); - cell.data.Part.reserved = ALL_DISTRICT; - - TypeContainerVisitor<Trinity::PlayerRelocationNotifier, GridTypeMapContainer > p2grid_relocation(relocationNotifier); - TypeContainerVisitor<Trinity::PlayerRelocationNotifier, WorldTypeMapContainer > p2world_relocation(relocationNotifier); - - cell_lock->Visit(cell_lock, p2grid_relocation, *this); - cell_lock->Visit(cell_lock, p2world_relocation, *this); -} - -void Map::CreatureRelocationNotify(Creature *creature, Cell cell, CellPair cellpair) -{ - CellLock<ReadGuard> cell_lock(cell, cellpair); - Trinity::CreatureRelocationNotifier relocationNotifier(*creature); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); // not trigger load unloaded grids at notifier call - - TypeContainerVisitor<Trinity::CreatureRelocationNotifier, WorldTypeMapContainer > c2world_relocation(relocationNotifier); - TypeContainerVisitor<Trinity::CreatureRelocationNotifier, GridTypeMapContainer > c2grid_relocation(relocationNotifier); - - cell_lock->Visit(cell_lock, c2world_relocation, *this); - cell_lock->Visit(cell_lock, c2grid_relocation, *this); -} - void Map::SendInitSelf( Player * player ) { sLog.outDetail("Creating player data for himself %u", player->GetGUIDLow()); @@ -2220,4 +2069,5 @@ void Map::AddUnitToNotify(Unit* u) i_unitsToNotify.push_back(u->GetGUID()); u->m_IsInNotifyList = true; } -}
\ No newline at end of file +} + diff --git a/src/game/Map.h b/src/game/Map.h index 3c227b47e88..2b6fcfe6900 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -168,7 +168,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O bool GetUnloadFlag(const GridPair &p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadFlag(); } void SetUnloadFlag(const GridPair &p, bool unload) { getNGrid(p.x_coord, p.y_coord)->setUnloadFlag(unload); } - void LoadGrid(const Cell& cell, bool no_unload = false); void LoadGrid(float x, float y); bool UnloadGrid(const uint32 &x, const uint32 &y, bool pForce); virtual void UnloadAll(bool pForce); @@ -251,8 +250,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O virtual bool RemoveBones(uint64 guid, float x, float y); void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair); - //void UpdatePlayerVisibility(Player* player, Cell cell, CellPair cellpair); - void UpdateObjectsVisibilityFor(Player* player, Cell cell, CellPair cellpair); void resetMarkedCells() { marked_cells.reset(); } bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); } @@ -290,9 +287,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O void SendInitTransports( Player * player ); void SendRemoveTransports( Player * player ); - void PlayerRelocationNotify(Player* player, Cell cell, CellPair cellpair); - void CreatureRelocationNotify(Creature *creature, Cell newcell, CellPair newval); - bool CreatureCellRelocation(Creature *creature, Cell new_cell); void AddCreatureToMoveList(Creature *c, float x, float y, float z, float ang); @@ -349,7 +343,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O void AddToGrid(T*, NGridType *, Cell const&); template<class T> - void AddNotifier(T*, Cell const&, CellPair const&); + void AddNotifier(T*); template<class T> void RemoveFromGrid(T*, NGridType *, Cell const&); @@ -481,3 +475,4 @@ Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER ¬ifier) cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off); } #endif + diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index 37a4e1dcd6e..5a26a28159f 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -274,3 +274,4 @@ bool MapInstanced::CanEnter(Player *player) return false; } + diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h index 581c42aaad5..11c08d4517a 100644 --- a/src/game/MapInstanced.h +++ b/src/game/MapInstanced.h @@ -71,3 +71,4 @@ class TRINITY_DLL_DECL MapInstanced : public Map uint16 GridMapReference[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS]; }; #endif + diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index d159b1a6265..fd1f7963593 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -291,12 +291,12 @@ bool MapManager::IsValidMAP(uint32 mapid) // TODO: add check for battleground template } -void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) +/*void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) { CellPair p = Trinity::ComputeCellPair(x,y); Cell cell(p); GetMap(mapid, obj)->LoadGrid(cell,no_unload); -} +}*/ void MapManager::UnloadAll() { @@ -350,3 +350,4 @@ uint32 MapManager::GetNumPlayersInInstances() } return ret; } + diff --git a/src/game/MapManager.h b/src/game/MapManager.h index 8d4b2ba8885..6ca9305711d 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -75,7 +75,7 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit i_timer.Reset(); } - void LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload = false); + //void LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload = false); void UnloadAll(); static bool ExistMapAndVMap(uint32 mapid, float x, float y); @@ -147,3 +147,4 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit uint32 i_MaxInstanceId; }; #endif + diff --git a/src/game/MapRefManager.h b/src/game/MapRefManager.h index 02f8b2ea465..4337aa75fd9 100644 --- a/src/game/MapRefManager.h +++ b/src/game/MapRefManager.h @@ -42,3 +42,4 @@ class MapRefManager : public RefManager<Map, Player> const_iterator end() const { return const_iterator(NULL); } }; #endif + diff --git a/src/game/MapReference.h b/src/game/MapReference.h index 397eec0a06b..ae485af7487 100644 --- a/src/game/MapReference.h +++ b/src/game/MapReference.h @@ -50,3 +50,4 @@ class TRINITY_DLL_SPEC MapReference : public Reference<Map, Player> MapReference const *nocheck_prev() const { return (MapReference const*)Reference<Map, Player>::nocheck_prev(); } }; #endif + diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index fe3ff829ccd..2ea74470156 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1691,4 +1691,3 @@ void WorldSession::HandleInspectAchievements( WorldPacket & recv_data ) return; player->GetAchievementMgr().SendRespondInspectAchievements(_player); -} diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index b5a68a19d38..7bfae33c079 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -471,3 +471,4 @@ bool MotionMaster::GetDestination(float &x, float &y, float &z) return top()->GetDestination(x,y,z); } + diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index 84057741d08..d362e6574f0 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -152,3 +152,4 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *> uint8 m_cleanFlag; }; #endif + diff --git a/src/game/MovementGenerator.cpp b/src/game/MovementGenerator.cpp index a80f09c7204..7784df315c9 100644 --- a/src/game/MovementGenerator.cpp +++ b/src/game/MovementGenerator.cpp @@ -23,3 +23,4 @@ MovementGenerator::~MovementGenerator() { } + diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h index 554158129d6..cb352b7f1c6 100644 --- a/src/game/MovementGenerator.h +++ b/src/game/MovementGenerator.h @@ -98,3 +98,4 @@ typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGenerator typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; #endif + diff --git a/src/game/MovementGeneratorImpl.h b/src/game/MovementGeneratorImpl.h index 03b0c873f33..fc676704d3a 100644 --- a/src/game/MovementGeneratorImpl.h +++ b/src/game/MovementGeneratorImpl.h @@ -30,3 +30,4 @@ MovementGeneratorFactory<MOVEMENT_GEN>::Create(void *data) const return (new MOVEMENT_GEN()); } #endif + diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 8d595c38089..8ada92957ec 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -488,3 +488,4 @@ void WorldSession::HandleSummonResponseOpcode(WorldPacket& recv_data) _player->SummonIfPossible(agree); } + diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index 019de97db11..8ab1844fab7 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -837,3 +837,4 @@ void WorldSession::HandleRepairItemOpcode( WorldPacket & recv_data ) pGuild->SendMoneyInfo(this, _player->GetGUIDLow()); } } + diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h index 9020bcd8ec8..4d0395a0c87 100644 --- a/src/game/NPCHandler.h +++ b/src/game/NPCHandler.h @@ -76,3 +76,4 @@ struct NpcTextLocale std::vector<std::vector<std::string> > Text_1; }; #endif + diff --git a/src/game/NullCreatureAI.cpp b/src/game/NullCreatureAI.cpp index 37dcdc3bc9d..33218251718 100644 --- a/src/game/NullCreatureAI.cpp +++ b/src/game/NullCreatureAI.cpp @@ -39,3 +39,4 @@ void CritterAI::EnterEvadeMode() me->SetControlled(false, UNIT_STAT_FLEEING); CreatureAI::EnterEvadeMode(); } + diff --git a/src/game/NullCreatureAI.h b/src/game/NullCreatureAI.h index 7d88518ab1a..671e9ea63ab 100644 --- a/src/game/NullCreatureAI.h +++ b/src/game/NullCreatureAI.h @@ -55,3 +55,4 @@ class TRINITY_DLL_DECL CritterAI : public PassiveAI }; #endif + diff --git a/src/game/Object.h b/src/game/Object.h index 8bb8d770519..1d7749c3989 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -527,3 +527,4 @@ class TRINITY_DLL_SPEC WorldObject : public Object bool mSemaphoreTeleport; }; #endif + diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 95ead040cb8..e832aec0c57 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -596,3 +596,4 @@ template Creature* ObjectAccessor::GetObjectInWorld<Creature>(uint32 mapid, floa 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*/); + diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index 723eecb1510..c6144ec4d5b 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -235,3 +235,4 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor LockType i_petGuard; }; #endif + diff --git a/src/game/ObjectDefines.h b/src/game/ObjectDefines.h index 39082fb5e4d..ee58e8a5f34 100644 --- a/src/game/ObjectDefines.h +++ b/src/game/ObjectDefines.h @@ -118,3 +118,4 @@ inline char const* GetLogNameForGuid(uint64 guid) } } #endif + diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 89df0582de0..56334d1c53d 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -304,3 +304,4 @@ ObjectGridStoper::Visit(CreatureMapType &m) template void ObjectGridUnloader::Visit(GameObjectMapType &); template void ObjectGridUnloader::Visit(DynamicObjectMapType &); + diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index b75db484463..7b5c827b7ea 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectGridStoper typedef GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> GridLoaderType; #endif + diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 8b459e7d6de..fe547522a88 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -7640,3 +7640,4 @@ void ObjectMgr::LoadTransportEvents() delete result; } + diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 08f16571734..e766d6a5404 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -926,3 +926,4 @@ TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id); TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id); #endif + diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 78fdeb8d0ce..bba5c81ae9e 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -1226,3 +1226,4 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x4AB*/ { "UMSG_UNKNOWN_1195", STATUS_NEVER, &WorldSession::Handle_NULL }, /*0x4AC*/ { "UMSG_UNKNOWN_1196", STATUS_NEVER, &WorldSession::Handle_NULL }, }; + diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 2eb5d2d2920..d57cfd62852 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1265,3 +1265,4 @@ inline const char* LookupOpcodeName(uint16 id) } #endif /// @} + diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index adbe220fbe5..b48a226d6a4 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -776,3 +776,4 @@ bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger) { return false; } + diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h index 542863a5341..c1c39c1ff65 100644 --- a/src/game/OutdoorPvP.h +++ b/src/game/OutdoorPvP.h @@ -223,3 +223,4 @@ protected: }; #endif /*OUTDOOR_PVP_H_*/ + diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp index c403a5dc094..f0ff85574c0 100644 --- a/src/game/OutdoorPvPEP.cpp +++ b/src/game/OutdoorPvPEP.cpp @@ -928,3 +928,4 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(EP_CGT_N_A,0); plr->SendUpdateWorldState(EP_CGT_N_H,0); } + diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h index 2a6a47827d6..5ba4591e48d 100644 --- a/src/game/OutdoorPvPEP.h +++ b/src/game/OutdoorPvPEP.h @@ -279,3 +279,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp index 7294db0fb77..6058b82c102 100644 --- a/src/game/OutdoorPvPHP.cpp +++ b/src/game/OutdoorPvPHP.cpp @@ -396,3 +396,4 @@ bool OutdoorPvPObjectiveHP::HandleCapturePointEvent(Player *plr, uint32 eventId) } return false; } + diff --git a/src/game/OutdoorPvPHP.h b/src/game/OutdoorPvPHP.h index 986e8daee7e..a538f82b216 100644 --- a/src/game/OutdoorPvPHP.h +++ b/src/game/OutdoorPvPHP.h @@ -116,3 +116,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 757cbe82188..f6af15e7529 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -240,3 +240,4 @@ void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId) return; } } + diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h index 2478acf76f4..28b01c586b7 100644 --- a/src/game/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvPMgr.h @@ -79,3 +79,4 @@ private: #define sOutdoorPvPMgr Trinity::Singleton<OutdoorPvPMgr>::Instance() #endif /*OUTDOOR_PVP_MGR_H_*/ + diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index c8134944cc1..9030337f2cd 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -722,3 +722,4 @@ bool OutdoorPvPObjectiveNA::HandleCapturePointEvent(Player *plr, uint32 eventId) } return false; } + diff --git a/src/game/OutdoorPvPNA.h b/src/game/OutdoorPvPNA.h index e7f157879bc..92e0b9dcbbb 100644 --- a/src/game/OutdoorPvPNA.h +++ b/src/game/OutdoorPvPNA.h @@ -295,3 +295,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPObjectiveAI.cpp b/src/game/OutdoorPvPObjectiveAI.cpp index 6e6cf8d64e5..233fffd6b2f 100644 --- a/src/game/OutdoorPvPObjectiveAI.cpp +++ b/src/game/OutdoorPvPObjectiveAI.cpp @@ -45,3 +45,4 @@ int OutdoorPvPObjectiveAI::Permissible(const Creature * c) return PERMIT_BASE_NO; } + diff --git a/src/game/OutdoorPvPObjectiveAI.h b/src/game/OutdoorPvPObjectiveAI.h index 3395b7e1be5..5c68f45b082 100644 --- a/src/game/OutdoorPvPObjectiveAI.h +++ b/src/game/OutdoorPvPObjectiveAI.h @@ -33,3 +33,4 @@ class TRINITY_DLL_DECL OutdoorPvPObjectiveAI : public NullCreatureAI static int Permissible(const Creature *); }; #endif + diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index 9e95c315c7f..615f6fab9f8 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -260,3 +260,4 @@ bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go } return true; } + diff --git a/src/game/OutdoorPvPSI.h b/src/game/OutdoorPvPSI.h index 208e35d09a1..1f2331b4251 100644 --- a/src/game/OutdoorPvPSI.h +++ b/src/game/OutdoorPvPSI.h @@ -73,3 +73,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp index 39acc70ba53..01b224cffa9 100644 --- a/src/game/OutdoorPvPTF.cpp +++ b/src/game/OutdoorPvPTF.cpp @@ -364,3 +364,4 @@ bool OutdoorPvPObjectiveTF::Update(uint32 diff) } return false; } + diff --git a/src/game/OutdoorPvPTF.h b/src/game/OutdoorPvPTF.h index 802f163d977..255ddb1fda9 100644 --- a/src/game/OutdoorPvPTF.h +++ b/src/game/OutdoorPvPTF.h @@ -115,3 +115,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index d8ac0de5f7d..29997eec920 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -492,3 +492,4 @@ void OutdoorPvPZM::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,0); plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,0); } + diff --git a/src/game/OutdoorPvPZM.h b/src/game/OutdoorPvPZM.h index c99ad69fa22..405c0133b5c 100644 --- a/src/game/OutdoorPvPZM.h +++ b/src/game/OutdoorPvPZM.h @@ -213,3 +213,4 @@ private: // todo: flag carrier death/leave/mount/activitychange should give back the gossip options #endif + diff --git a/src/game/Path.h b/src/game/Path.h index fe1c3587caf..2fd6723b01c 100644 --- a/src/game/Path.h +++ b/src/game/Path.h @@ -85,3 +85,4 @@ class Path std::vector<PathNode> i_nodes; }; #endif + diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index bf150ec3a42..9444bca7a02 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1795,3 +1795,4 @@ void Pet::CastPetAura(PetAura const* aura) else CastSpell(this, auraId, true); } + diff --git a/src/game/Pet.h b/src/game/Pet.h index f863051b74d..f536794fcee 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -244,3 +244,4 @@ class Pet : public Creature } }; #endif + diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp index 4545b9a395f..9685b71a934 100644 --- a/src/game/PetAI.cpp +++ b/src/game/PetAI.cpp @@ -332,3 +332,4 @@ void PetAI::UpdateAllies() (!i_pet.GetCharmInfo()->HasCommandState(COMMAND_STAY) || i_pet.IsWithinMeleeRange(attacker))) AttackStart(attacker); }*/ + diff --git a/src/game/PetAI.h b/src/game/PetAI.h index ceaa00e7ed3..82f143e725e 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -58,3 +58,4 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI std::vector<TargetSpellPair> m_targetSpellStore; }; #endif + diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 17c2ba4275b..3c1c6e95aaa 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -808,4 +808,3 @@ void WorldSession::HandlePetLearnTalent( WorldPacket & recv_data ) // learn! (other talent ranks will unlearned at learning) pet->learnSpell(spellid); sLog.outDetail("TalentID: %u Rank: %u Spell: %u\n", talent_id, requested_rank, spellid); -} diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index 5911af4e560..87a8d512597 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -972,3 +972,4 @@ void WorldSession::SendPetitionShowList(uint64 guid) SendPacket(&data); sLog.outDebug("Sent SMSG_PETITION_SHOWLIST"); } + diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 20abcc3ec02..0a7090265a2 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1841,8 +1841,6 @@ void Player::RemoveFromWorld() ///- Release charmed creatures, unsummon totems and remove pets/guardians StopCastingCharm(); StopCastingBindSight(); - RemoveCharmAuras(); - RemoveBindSightAuras(); UnsummonAllTotems(); RemoveMiniPet(); RemoveGuardians(); @@ -20395,4 +20393,3 @@ uint8 Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_s } return EQUIP_ERR_OK; -} diff --git a/src/game/Player.h b/src/game/Player.h index 8e34ca7e9cd..96180d8d69c 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2463,3 +2463,4 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas return T(diff); } #endif + diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index d698e8c293c..fea5666c9e0 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -628,3 +628,4 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s return DUMP_SUCCESS; } + diff --git a/src/game/PlayerDump.h b/src/game/PlayerDump.h index a33eb9edf24..01f97718267 100644 --- a/src/game/PlayerDump.h +++ b/src/game/PlayerDump.h @@ -96,3 +96,4 @@ class PlayerDumpReader : public PlayerDump }; #endif + diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index bcc25987e56..f3b1f2281f7 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -82,3 +82,4 @@ template void PointMovementGenerator<Player>::MovementInform(Player&); template void PointMovementGenerator<Creature>::Initialize(Creature&); template bool PointMovementGenerator<Creature>::Update(Creature&, const uint32 &diff); + diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index 08050b24e3d..49b48772ffb 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -51,3 +51,4 @@ class TRINITY_DLL_SPEC PointMovementGenerator DestinationHolder< Traveller<T> > i_destinationHolder; }; #endif + diff --git a/src/game/PossessedAI.cpp b/src/game/PossessedAI.cpp index 7ac36a37352..e8d499bf576 100644 --- a/src/game/PossessedAI.cpp +++ b/src/game/PossessedAI.cpp @@ -119,3 +119,4 @@ void PossessedAI::KilledUnit(Unit* victim) if (victim->GetTypeId() == TYPEID_UNIT) victim->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } + diff --git a/src/game/PossessedAI.h b/src/game/PossessedAI.h index 5671cfa912d..fd90c5429b0 100644 --- a/src/game/PossessedAI.h +++ b/src/game/PossessedAI.h @@ -50,3 +50,4 @@ class TRINITY_DLL_DECL PossessedAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index 9829efc3946..eefecbce078 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -450,3 +450,4 @@ void WorldSession::HandlePageQueryOpcode( WorldPacket & recv_data ) sLog.outDebug( "WORLD: Sent SMSG_PAGE_TEXT_QUERY_RESPONSE " ); } } + diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index 5d5b4bdf6f5..bbc344732b8 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -205,3 +205,4 @@ int32 Quest::GetRewOrReqMoney() const return int32(RewOrReqMoney * sWorld.getRate(RATE_DROP_MONEY)); } + diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index c9bfdf83874..4d4c9829ba8 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -341,3 +341,4 @@ struct QuestStatusData uint32 m_creatureOrGOcount[ QUEST_OBJECTIVES_COUNT ]; }; #endif + diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 98d4972c406..24d02504d33 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -654,3 +654,4 @@ void WorldSession::HandleQuestgiverStatusQueryMultipleOpcode(WorldPacket& /*recv data.put<uint32>(0, count); // write real count SendPacket(&data); } + diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index 0e85c1911a5..3e4912d00cd 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -182,3 +182,4 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff } return true; } + diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index e2d2a5005fb..20afe23d375 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC RandomMovementGenerator uint32 i_nextMove; }; #endif + diff --git a/src/game/ReactorAI.cpp b/src/game/ReactorAI.cpp index 02799431991..7c4d1a73eb6 100644 --- a/src/game/ReactorAI.cpp +++ b/src/game/ReactorAI.cpp @@ -114,3 +114,4 @@ ReactorAI::EnterEvadeMode() else if (i_creature.GetOwner() && i_creature.GetOwner()->isAlive()) i_creature.GetMotionMaster()->MoveFollow(i_creature.GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); } + diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h index e549bfc7243..1cc7da43743 100644 --- a/src/game/ReactorAI.h +++ b/src/game/ReactorAI.h @@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ReactorAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp index 78d63c460ce..c101cd6c10a 100644 --- a/src/game/ScriptCalls.cpp +++ b/src/game/ScriptCalls.cpp @@ -100,3 +100,4 @@ bool LoadScriptingModule(char const* libName) return true; } + diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h index 216a694936f..bb618e5af9f 100644 --- a/src/game/ScriptCalls.h +++ b/src/game/ScriptCalls.h @@ -92,3 +92,4 @@ typedef struct extern ScriptsSet Script; #endif + diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index aa9d4fe153f..f359fab74f6 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -2311,3 +2311,4 @@ enum BattleGroundTypeId #define MAX_BATTLEGROUND_TYPE_ID 12 #endif + diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index f5e79bf220b..c6c85990e26 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -217,3 +217,4 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) return 0; } + diff --git a/src/game/SkillDiscovery.h b/src/game/SkillDiscovery.h index 9ee29c86810..9981eb133f6 100644 --- a/src/game/SkillDiscovery.h +++ b/src/game/SkillDiscovery.h @@ -29,3 +29,4 @@ void LoadSkillDiscoveryTable(); uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player); uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player); #endif + diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp index 67ec9719659..f0061f97c00 100644 --- a/src/game/SkillExtraItems.cpp +++ b/src/game/SkillExtraItems.cpp @@ -144,3 +144,4 @@ bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChanc // enable extra item creation return true; } + diff --git a/src/game/SkillExtraItems.h b/src/game/SkillExtraItems.h index 5d71d8fd753..3a44619a862 100644 --- a/src/game/SkillExtraItems.h +++ b/src/game/SkillExtraItems.h @@ -30,3 +30,4 @@ bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChanc // function to load the extra item creation info from DB void LoadSkillExtraItemTable(); #endif + diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp index 58c35fe463e..fb00b13c68c 100644 --- a/src/game/SkillHandler.cpp +++ b/src/game/SkillHandler.cpp @@ -175,3 +175,4 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket & recv_data) recv_data >> skill_id; GetPlayer()->SetSkill(skill_id, 0, 0); } + diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index e98e147b505..b208cc5ece4 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -323,3 +323,4 @@ PlayerSocial *SocialMgr::LoadFromDB(QueryResult *result, uint32 guid) delete result; return social; } + diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h index 864cf8b2455..1ca04d69707 100644 --- a/src/game/SocialMgr.h +++ b/src/game/SocialMgr.h @@ -158,3 +158,4 @@ class SocialMgr #define sSocialMgr Trinity::Singleton<SocialMgr>::Instance() #endif + diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index c752cd8d26f..4c862e893ba 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1254,9 +1254,9 @@ struct ChainHealingOrder : public std::binary_function<const Unit*, const Unit*, int32 ChainHealingHash(Unit const* Target) const { - if (Target == MainTarget) + /*if (Target == MainTarget) return 0; - else if (Target->GetTypeId() == TYPEID_PLAYER && MainTarget->GetTypeId() == TYPEID_PLAYER && + else*/ if (Target->GetTypeId() == TYPEID_PLAYER && MainTarget->GetTypeId() == TYPEID_PLAYER && ((Player const*)Target)->IsInSameRaidWith((Player const*)MainTarget)) { if (Target->GetHealth() == Target->GetMaxHealth()) @@ -5784,3 +5784,4 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul return damageDone; } + diff --git a/src/game/Spell.h b/src/game/Spell.h index beae2f97e04..daeab913345 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -737,3 +737,4 @@ class SpellEvent : public BasicEvent Spell* m_Spell; }; #endif + diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index d4bd7a1efe6..efb0f3b11c9 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -345,3 +345,4 @@ enum AreaAuraType AREA_AURA_OWNER }; #endif + diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 011ce5b743e..4f9d4ea8cff 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5770,7 +5770,7 @@ void Aura::PeriodicTick() int32 gain = pCaster->ModifyPower(power,gain_amount); m_target->AddThreat(pCaster, float(gain) * 0.5f, GetSpellSchoolMask(GetSpellProto()), GetSpellProto()); } - + // Mark of Kaz'rogal if(GetId() == 31447 && m_target->GetPower(power) == 0) { diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index c09feca92b9..e615aa70c20 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -382,3 +382,4 @@ class TRINITY_DLL_SPEC PersistentAreaAura : public Aura Aura* CreateAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster = NULL, Item* castItem = NULL); #endif + diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index a76f20e0536..2a6d7adf84d 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -708,7 +708,7 @@ void Spell::EffectDummy(uint32 i) if(ihit->effectMask & (1<<i)) { Unit* casttarget = Unit::GetUnit((*unitTarget), ihit->targetGUID); - if(casttarget) + if(casttarget) m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false); } } @@ -732,7 +732,7 @@ void Spell::EffectDummy(uint32 i) pGameObj->SetRespawnTime(0); pGameObj->SetOwnerGUID(m_caster->GetGUID()); - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()); pGameObj->SetSpellId(m_spellInfo->Id); MapManager::Instance().GetMap(creatureTarget->GetMapId(), pGameObj)->Add(pGameObj); @@ -5005,14 +5005,14 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 48025: // Headless Horseman's Mount { - if(!unitTarget) + if(!unitTarget) return; switch(((Player*)unitTarget)->GetBaseSkillValue(762)) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; - case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; + case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; case 300: unitTarget->CastSpell(unitTarget, 48023, true); break; default: break; } @@ -5020,7 +5020,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 47977: // Magic Broom { - if(!unitTarget) + if(!unitTarget) return; if(unitTarget) @@ -5894,7 +5894,7 @@ void Spell::EffectSummonObject(uint32 i) return; } - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel()); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel()); int32 duration = GetSpellDuration(m_spellInfo); pGameObj->SetRespawnTime(duration > 0 ? duration/1000 : 0); pGameObj->SetSpellId(m_spellInfo->Id); @@ -6249,7 +6249,7 @@ void Spell::EffectKnockBack(uint32 i) return; float x, y; - if(m_targets.HasDest()) + if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) { x = m_targets.m_destX; y = m_targets.m_destY; @@ -6262,10 +6262,19 @@ void Spell::EffectKnockBack(uint32 i) float dx = unitTarget->GetPositionX() - x; float dy = unitTarget->GetPositionY() - y; - float dist = sqrt((dx*dx) + (dy*dy)); - - float vcos = dx / dist; - float vsin = dy / dist; + float vcos, vsin; + if(dx < 0.001f && dy < 0.001f) + { + float angle = rand_norm()*2*M_PI; + vcos = cos(angle); + vsin = sin(angle); + } + else + { + float dist = sqrt((dx*dx) + (dy*dy)); + vcos = dx / dist; + vsin = dy / dist; + } float speedxy = float(m_spellInfo->EffectMiscValue[i])/10; float speedz = float(damage/-10); @@ -6594,7 +6603,7 @@ void Spell::EffectTransmitted(uint32 effIndex) pGameObj->SetOwnerGUID(m_caster->GetGUID() ); - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); pGameObj->SetSpellId(m_spellInfo->Id); DEBUG_LOG("AddObject at SpellEfects.cpp EffectTransmitted\n"); @@ -6614,7 +6623,7 @@ void Spell::EffectTransmitted(uint32 effIndex) m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation(), 0, 0, 0, 0, 100, 1)) { linkedGO->SetRespawnTime(duration > 0 ? duration/1000 : 0); - linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); + //linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); linkedGO->SetSpellId(m_spellInfo->Id); linkedGO->SetOwnerGUID(m_caster->GetGUID() ); @@ -6858,4 +6867,3 @@ void Spell::EffectRenamePet(uint32 /*eff_idx*/) return; unitTarget->SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_ALLOWED); -} diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 676bb6a2dae..3c739a85bb0 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -467,3 +467,4 @@ void WorldSession::HandleSelfResOpcode( WorldPacket & /*recv_data*/ ) _player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0); } } + diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 927044be3a6..6128383590e 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2930,3 +2930,4 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group) return DRTYPE_NONE; } + diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 83d17ec2b85..28e574b978f 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -1119,3 +1119,4 @@ class SpellMgr #define spellmgr SpellMgr::Instance() #endif + diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 8be79c3cfd8..5d31614cecb 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -1140,3 +1140,4 @@ void Pet::UpdateDamagePhysical(WeaponAttackType attType) SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage); SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage); } + diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index d39c2c68071..bdc49d03e4d 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -211,3 +211,4 @@ template bool TargetedMovementGenerator<Player>::Update(Player &, const uint32 & template bool TargetedMovementGenerator<Creature>::Update(Creature &, const uint32 &); template Unit* TargetedMovementGenerator<Player>::GetTarget() const; template Unit* TargetedMovementGenerator<Creature>::GetTarget() const; + diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h index e6579c0b1de..2083dd95369 100644 --- a/src/game/TargetedMovementGenerator.h +++ b/src/game/TargetedMovementGenerator.h @@ -73,3 +73,4 @@ class TRINITY_DLL_SPEC TargetedMovementGenerator bool i_recalculateTravel; }; #endif + diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp index 743f09f94fc..289e141fdd3 100644 --- a/src/game/TaxiHandler.cpp +++ b/src/game/TaxiHandler.cpp @@ -278,3 +278,4 @@ void WorldSession::HandleActivateTaxiOpcode( WorldPacket & recv_data ) GetPlayer()->ActivateTaxiPathTo(nodes, 0, npc); } + diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp index 1214ed1bd84..147133bd362 100644 --- a/src/game/TemporarySummon.cpp +++ b/src/game/TemporarySummon.cpp @@ -185,3 +185,4 @@ void TemporarySummon::UnSummon() void TemporarySummon::SaveToDB() { } + diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h index c3441704438..eaefbab1d84 100644 --- a/src/game/TemporarySummon.h +++ b/src/game/TemporarySummon.h @@ -41,3 +41,4 @@ class TemporarySummon : public Creature uint64 m_summoner; }; #endif + diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 8807dff64f8..111da6bff48 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -368,7 +368,8 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask scho float threat = ThreatCalcHelper::calcThreat(pVictim, iOwner, pThreat, schoolMask, pThreatSpell); - if(pVictim->GetReducedThreatPercent()) + // must check > 0.0f, otherwise dead loop + if(threat > 0.0f && pVictim->GetReducedThreatPercent()) { float reducedThreat = threat * pVictim->GetReducedThreatPercent() / 100; threat -= reducedThreat; @@ -511,3 +512,4 @@ bool ThreatManager::processThreatEvent(const UnitBaseEvent* pUnitBaseEvent) } return consumed; } + diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h index 2d81f411e78..3b07a4ec43d 100644 --- a/src/game/ThreatManager.h +++ b/src/game/ThreatManager.h @@ -216,3 +216,4 @@ class TRINITY_DLL_SPEC ThreatManager //================================================= #endif + diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 8d6ed30687e..068a1592df1 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -188,3 +188,4 @@ void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/ // Send Packet SendPacket(&data); } + diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index a622a41aedc..8d89bf9d20b 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -206,3 +206,4 @@ uint64 TicketMgr::GenerateTicketID() { return ++m_ticketid; } + diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index 25d62462dc2..bee4d49fa0d 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -74,3 +74,4 @@ class TicketMgr #endif #define ticketmgr Trinity::Singleton<TicketMgr>::Instance() + diff --git a/src/game/Tools.cpp b/src/game/Tools.cpp index f8663a4b4e4..d1728c78c9e 100644 --- a/src/game/Tools.cpp +++ b/src/game/Tools.cpp @@ -114,3 +114,4 @@ void writeGUID(WorldPacket & data, uint64 & guid) data.append(PackedGuid,j); } + diff --git a/src/game/Tools.h b/src/game/Tools.h index 887fe03045a..bdb3ad8e762 100644 --- a/src/game/Tools.h +++ b/src/game/Tools.h @@ -26,3 +26,4 @@ bool readGUID(WorldPacket & data, uint64& guid); void writeGUID(WorldPacket & data, uint64 & guid); #endif + diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp index 0178ed07fdf..ae06be79187 100644 --- a/src/game/Totem.cpp +++ b/src/game/Totem.cpp @@ -193,3 +193,4 @@ bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) co } return Creature::IsImmunedToSpellEffect(spellInfo, index); } + diff --git a/src/game/Totem.h b/src/game/Totem.h index 572cfa6d315..af2ca7a4023 100644 --- a/src/game/Totem.h +++ b/src/game/Totem.h @@ -64,3 +64,4 @@ class Totem : public Creature uint32 m_duration; }; #endif + diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp index 184cb141913..7d9a6cfd058 100644 --- a/src/game/TotemAI.cpp +++ b/src/game/TotemAI.cpp @@ -121,3 +121,4 @@ TotemAI::AttackStart(Unit *) ((Player*)i_totem.GetOwner())->GetSession()->SendPacket(&data); } } + diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h index 64675cd11e3..9a19d2c99e5 100644 --- a/src/game/TotemAI.h +++ b/src/game/TotemAI.h @@ -46,3 +46,4 @@ class TRINITY_DLL_DECL TotemAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index f444866e8aa..cc3bcab62d2 100644 --- a/src/game/TradeHandler.cpp +++ b/src/game/TradeHandler.cpp @@ -642,3 +642,4 @@ void WorldSession::HandleClearTradeItemOpcode(WorldPacket& recvPacket) _player->pTrader->GetSession()->SendUpdateTrade(); } + diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index f1d1ff412bf..a46fdee553b 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -561,3 +561,4 @@ void Transport::Update(uint32 /*p_time*/) sLog.outDetail("%s is at wp id: %u", this->m_name.c_str(), m_curr->second.id); } } + diff --git a/src/game/Transports.h b/src/game/Transports.h index 0cb6a6e7503..6fd0898362c 100644 --- a/src/game/Transports.h +++ b/src/game/Transports.h @@ -117,3 +117,4 @@ class Transport : private GameObject WayPointMap::iterator GetNextWayPoint(); }; #endif + diff --git a/src/game/Traveller.h b/src/game/Traveller.h index 6e7757d9bbf..d5e5036447f 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -113,3 +113,4 @@ inline void Traveller<Player>::MoveTo(float x, float y, float z, uint32 t) typedef Traveller<Creature> CreatureTraveller; typedef Traveller<Player> PlayerTraveller; #endif + diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b7a92c98125..0c1910d43ea 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4305,7 +4305,7 @@ void Unit::RemoveDynObject(uint32 spellid) for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();) { DynamicObject* dynObj = ObjectAccessor::GetDynamicObject(*this, *i); - if(!dynObj) + if(!dynObj) // may happen if a dynobj is removed when grid unload { i = m_dynObjGUIDs.erase(i); } @@ -7670,20 +7670,11 @@ void Unit::RemovePlayerFromVision(Player* plr) void Unit::RemoveBindSightAuras() { - /*while (!m_sharedVision.empty()) - { - Player* plr = *m_sharedVision.begin(); - m_sharedVision.erase(m_sharedVision.begin()); - plr->ClearFarsight(); - }*/ RemoveSpellsCausingAura(SPELL_AURA_BIND_SIGHT); } void Unit::RemoveCharmAuras() { - if (!GetCharmer()) - return; - RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM); RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS_PET); RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS); @@ -10702,6 +10693,8 @@ void Unit::RemoveFromWorld() // cleanup if(IsInWorld()) { + RemoveCharmAuras(); + RemoveBindSightAuras(); RemoveNotOwnSingleTargetAuras(); } diff --git a/src/game/Unit.h b/src/game/Unit.h index a767bbe08eb..0e0bbda6225 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1192,10 +1192,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject CharmInfo* GetCharmInfo() { return m_charmInfo; } CharmInfo* InitCharmInfo(Unit* charm); SharedVisionList const& GetSharedVisionList() { return m_sharedVision; } - void RemoveBindSightAuras(); - void RemoveCharmAuras(); void AddPlayerToVision(Player* plr); void RemovePlayerFromVision(Player* plr); + bool HasSharedVision() const { return !m_sharedVision.empty(); } + void RemoveBindSightAuras(); + void RemoveCharmAuras(); Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0); @@ -1611,3 +1612,4 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint64 m_misdirectionTargetGUID; }; #endif + diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h index 0bde9ca5ada..67f8d01f0d6 100644 --- a/src/game/UnitEvents.h +++ b/src/game/UnitEvents.h @@ -136,3 +136,4 @@ class TRINITY_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent //============================================================== #endif + diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index bdd3345751d..de615c9cc8e 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -160,3 +160,4 @@ void UpdateData::Clear() m_outOfRangeGUIDs.clear(); m_blockCount = 0; } + diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h index c33e06589c1..71a9258b90b 100644 --- a/src/game/UpdateData.h +++ b/src/game/UpdateData.h @@ -68,3 +68,4 @@ class UpdateData void Compress(void* dst, uint32 *dst_size, void* src, int src_size); }; #endif + diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h index ca971dac460..97fcbeb05d6 100644 --- a/src/game/UpdateFields.h +++ b/src/game/UpdateFields.h @@ -500,3 +500,4 @@ enum ECorpseFields CORPSE_END = OBJECT_END + 0x0022, }; #endif + diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h index 8909b23ed51..3d510c00d60 100644 --- a/src/game/UpdateMask.h +++ b/src/game/UpdateMask.h @@ -124,3 +124,4 @@ class UpdateMask uint32 *mUpdateMask; }; #endif + diff --git a/src/game/VoiceChatHandler.cpp b/src/game/VoiceChatHandler.cpp index ddc178a8694..4cf86493060 100644 --- a/src/game/VoiceChatHandler.cpp +++ b/src/game/VoiceChatHandler.cpp @@ -45,3 +45,4 @@ void WorldSession::HandleChannelVoiceChatQuery( WorldPacket & recv_data ) // uint32, string recv_data.hexlike(); } + diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index 6e303ca3053..a677fd5b6d2 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -149,3 +149,4 @@ void WaypointStore::UpdatePath(uint32 id) delete result; } + diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h index e9787090ede..85f8b765d45 100644 --- a/src/game/WaypointManager.h +++ b/src/game/WaypointManager.h @@ -59,3 +59,4 @@ class WaypointStore extern WaypointStore WaypointMgr; #endif + diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index e5b625fb6e5..9810d83dcd1 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -652,3 +652,4 @@ int GetFCost(int to, int num, int parentNum, float *gcost) return (int)(gc + hc); } #endif //__PATHFINDING__ + diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 5b5df75d31e..9804c150d63 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -116,3 +116,4 @@ public PathMovementBase<Player> }; #endif + diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp index 9fd91764ca3..2c41fa886be 100644 --- a/src/game/Weather.cpp +++ b/src/game/Weather.cpp @@ -318,3 +318,4 @@ WeatherState Weather::GetWeatherState() const return WEATHER_STATE_FINE; } } + diff --git a/src/game/Weather.h b/src/game/Weather.h index fd04d6b6abd..e312f004060 100644 --- a/src/game/Weather.h +++ b/src/game/Weather.h @@ -72,3 +72,4 @@ class Weather WeatherZoneChances const* m_weatherChances; }; #endif + diff --git a/src/game/World.cpp b/src/game/World.cpp index d1a10078efc..084be8f691b 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -3057,3 +3057,4 @@ void World::LoadDBVersion() else m_DBVersion = "unknown world database"; } + diff --git a/src/game/World.h b/src/game/World.h index 8ceb356c076..408c571d9b0 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -610,3 +610,4 @@ extern uint32 realmID; #define sWorld Trinity::Singleton<World>::Instance() #endif /// @} + diff --git a/src/game/WorldLog.cpp b/src/game/WorldLog.cpp index eeac973ba5f..7a10986f749 100644 --- a/src/game/WorldLog.cpp +++ b/src/game/WorldLog.cpp @@ -51,3 +51,4 @@ void WorldLog::Initialize() } #define sWorldLog WorldLog::Instance() + diff --git a/src/game/WorldLog.h b/src/game/WorldLog.h index 47e1a912986..97374ddc5f5 100644 --- a/src/game/WorldLog.h +++ b/src/game/WorldLog.h @@ -76,3 +76,4 @@ class TRINITY_DLL_DECL WorldLog : public Trinity::Singleton<WorldLog, Trinity::C #define sWorldLog WorldLog::Instance() #endif /// @} + diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index bfe9946e7d3..17d78ae677d 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -613,5 +613,3 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi) { CHECK_PACKET_SIZE(data, data.rpos()+4); data >> mi->u_unk1; - } -} diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 05cf4cec8b3..46fb0f43a1d 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -702,3 +702,4 @@ class TRINITY_DLL_SPEC WorldSession }; #endif /// @} + diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index 9913c912c70..06247f810a6 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -1124,3 +1124,4 @@ bool WorldSocket::iFlushPacketQueue () return haveone; }*/ + diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h index 15d3ec31e06..67e15adf148 100644 --- a/src/game/WorldSocket.h +++ b/src/game/WorldSocket.h @@ -219,3 +219,4 @@ class WorldSocket : protected WorldHandler #endif /* _WORLDSOCKET_H */ /// @} + diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index b6ea361f7e3..e8f8bad5894 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -366,3 +366,4 @@ WorldSocketMgr::Instance () { return ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>::instance(); } + diff --git a/src/game/WorldSocketMgr.h b/src/game/WorldSocketMgr.h index d7cb627b11c..94cfa78324c 100644 --- a/src/game/WorldSocketMgr.h +++ b/src/game/WorldSocketMgr.h @@ -77,3 +77,4 @@ private: #endif /// @} + diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp index 2d8bd824fd1..0b2a3f64338 100644 --- a/src/shared/Auth/AuthCrypt.cpp +++ b/src/shared/Auth/AuthCrypt.cpp @@ -80,3 +80,4 @@ void AuthCrypt::GenerateKey(uint8 *key, BigNumber *bn) hash.Finalize(); memcpy(key, hash.GetDigest(), SHA_DIGEST_LENGTH); } + diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h index 7a0b0a4d219..5c35511ad9f 100644 --- a/src/shared/Auth/AuthCrypt.h +++ b/src/shared/Auth/AuthCrypt.h @@ -51,3 +51,4 @@ class AuthCrypt bool _initialized; }; #endif + diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index becbe44c0ed..7872b141f3d 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -207,3 +207,4 @@ const char *BigNumber::AsDecStr() { return BN_bn2dec(_bn); } + diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h index 9ce18ea3047..b9038e86b13 100644 --- a/src/shared/Auth/BigNumber.h +++ b/src/shared/Auth/BigNumber.h @@ -94,3 +94,4 @@ class BigNumber uint8 *_array; }; #endif + diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp index 5f97ee65cc2..a8572f0e9f8 100644 --- a/src/shared/Auth/Hmac.cpp +++ b/src/shared/Auth/Hmac.cpp @@ -56,3 +56,4 @@ void HmacHash::Finalize() HMAC_Final(&m_ctx, m_digest, &length); ASSERT(length == SHA_DIGEST_LENGTH) } + diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h index b8ab30f2dc7..fc80bdca4c4 100644 --- a/src/shared/Auth/Hmac.h +++ b/src/shared/Auth/Hmac.h @@ -46,3 +46,4 @@ class HmacHash uint8 m_digest[SHA_DIGEST_LENGTH]; }; #endif + diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp index f367c2919b3..8743a14b838 100644 --- a/src/shared/Auth/Sha1.cpp +++ b/src/shared/Auth/Sha1.cpp @@ -65,3 +65,4 @@ void Sha1Hash::Finalize(void) { SHA1_Final(mDigest, &mC); } + diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index 811ccc2053a..68c61eb7a8e 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -51,3 +51,4 @@ class Sha1Hash uint8 mDigest[SHA_DIGEST_LENGTH]; }; #endif + diff --git a/src/shared/Auth/md5.h b/src/shared/Auth/md5.h index fa2937e13e4..0463051b6a6 100644 --- a/src/shared/Auth/md5.h +++ b/src/shared/Auth/md5.h @@ -89,3 +89,4 @@ extern "C" } /* end extern "C" */ #endif #endif /* md5_INCLUDED */ + diff --git a/src/shared/Base.cpp b/src/shared/Base.cpp index 9929cd41fdf..ca5094810d6 100644 --- a/src/shared/Base.cpp +++ b/src/shared/Base.cpp @@ -65,3 +65,4 @@ int Base::GetRefCount () { return RefCount; } + diff --git a/src/shared/Base.h b/src/shared/Base.h index d5907fdf473..e14ea6b27b9 100644 --- a/src/shared/Base.h +++ b/src/shared/Base.h @@ -52,3 +52,4 @@ class Base }; #endif // __BASE_H__ + diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index 2dd01e8a022..97b6c1cbd17 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -505,3 +505,4 @@ template <typename K, typename V> ByteBuffer &operator>>(ByteBuffer &b, std::map return b; } #endif + diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp index e70dc8358c2..27ae9184d69 100644 --- a/src/shared/Common.cpp +++ b/src/shared/Common.cpp @@ -40,3 +40,4 @@ LocaleConstant GetLocaleByName(const std::string& name) return LOCALE_enUS; // including enGB case } + diff --git a/src/shared/Common.h b/src/shared/Common.h index a0884a8455e..9f5b9473bd9 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -208,3 +208,4 @@ LocaleConstant GetLocaleByName(const std::string& name); #endif #endif + diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp index b3a3b13d652..52fca953f64 100644 --- a/src/shared/Config/Config.cpp +++ b/src/shared/Config/Config.cpp @@ -174,3 +174,4 @@ float Config::GetFloatDefault(const char* name, const float def) float val; return (GetFloat(name, &val) ? val : def); } + diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h index 424c369bd92..2c709f02ae5 100644 --- a/src/shared/Config/Config.h +++ b/src/shared/Config/Config.h @@ -58,3 +58,4 @@ class TRINITY_DLL_SPEC Config #define sConfig Trinity::Singleton<Config>::Instance() #endif + diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h index 6c3a54a45fc..75209a7fc6b 100644 --- a/src/shared/Config/ConfigEnv.h +++ b/src/shared/Config/ConfigEnv.h @@ -27,3 +27,4 @@ #include "Config.h" #endif + diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp index c46b1fe6fb9..bd575d95ece 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.cpp +++ b/src/shared/Config/dotconfpp/dotconfpp.cpp @@ -586,3 +586,4 @@ void DOTCONFDocument::setRequiredOptionNames(const char ** requiredOptionNames) ++requiredOptionNames; } } + diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h index 15c4f7fcd78..7887f86ccc1 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.h +++ b/src/shared/Config/dotconfpp/dotconfpp.h @@ -108,3 +108,4 @@ public: }; #endif + diff --git a/src/shared/Config/dotconfpp/mempool.cpp b/src/shared/Config/dotconfpp/mempool.cpp index cf589ffb2bc..487dae0bd0a 100644 --- a/src/shared/Config/dotconfpp/mempool.cpp +++ b/src/shared/Config/dotconfpp/mempool.cpp @@ -98,3 +98,4 @@ char * AsyncDNSMemPool::strdup(const char *str) { return ::strcpy((char*)this->alloc(strlen(str)+1), str); } + diff --git a/src/shared/Config/dotconfpp/mempool.h b/src/shared/Config/dotconfpp/mempool.h index 04bd1e006ad..81c01d15a58 100644 --- a/src/shared/Config/dotconfpp/mempool.h +++ b/src/shared/Config/dotconfpp/mempool.h @@ -44,3 +44,4 @@ public: }; #endif + diff --git a/src/shared/Database/DBCEnums.h b/src/shared/Database/DBCEnums.h index e546b1f7828..ee4f165f898 100644 --- a/src/shared/Database/DBCEnums.h +++ b/src/shared/Database/DBCEnums.h @@ -321,3 +321,4 @@ enum SummonFlags }; */ #endif + diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index 6e49a344b1a..8890ad0eb1e 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -709,3 +709,4 @@ uint32 const* GetTalentTabPages(uint32 cls) TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore() { return &sSoundEntriesStore; } TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore() { return &sSpellStore; } TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore() { return &sSpellRangeStore; } + diff --git a/src/shared/Database/DBCStores.h b/src/shared/Database/DBCStores.h index 4a67164a773..8a7ee02cc95 100644 --- a/src/shared/Database/DBCStores.h +++ b/src/shared/Database/DBCStores.h @@ -221,3 +221,4 @@ TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore(); TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore(); TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore(); #endif + diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index 4be24d9e24b..975dbf300f1 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -1578,3 +1578,4 @@ typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath; #define TaxiMaskSize 12 typedef uint32 TaxiMask[TaxiMaskSize]; #endif + diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index 5d7f5bf473e..07ece3b0cd9 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -171,3 +171,4 @@ bool Database::DirectPExecute(const char * format,...) return DirectExecute(szQuery); } + diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index beff0fb740a..92a1c991dcc 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -135,3 +135,4 @@ class TRINITY_DLL_SPEC Database std::string m_logsDir; }; #endif + diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index df1f51adbe7..9366d1e0070 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/src/shared/Database/DatabaseEnv.h @@ -56,3 +56,4 @@ extern DatabaseType CharacterDatabase; extern DatabaseType LoginDatabase; #endif + diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index c9a02a0a4a1..3d3c53f0873 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -205,3 +205,4 @@ Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, Sq #undef ASYNC_QUERY_BODY #undef ASYNC_PQUERY_BODY #undef ASYNC_DELAYHOLDER_BODY + diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 7e67861d883..e7babedddfe 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -408,3 +408,4 @@ void DatabaseMysql::HaltDelayThread() m_threadBody = NULL; } #endif + diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index 6dbaf4a59ab..2fa157e75a5 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -77,3 +77,4 @@ class TRINITY_DLL_SPEC DatabaseMysql : public Database }; #endif #endif + diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp index 8f8cf95b429..502808b7933 100644 --- a/src/shared/Database/DatabasePostgre.cpp +++ b/src/shared/Database/DatabasePostgre.cpp @@ -345,3 +345,4 @@ void DatabasePostgre::HaltDelayThread() m_threadBody = NULL; } #endif + diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h index 9a2aeb84a07..c7242add572 100644 --- a/src/shared/Database/DatabasePostgre.h +++ b/src/shared/Database/DatabasePostgre.h @@ -75,3 +75,4 @@ class DatabasePostgre : public Database bool _TransactionCmd(const char *sql); }; #endif + diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp index a3fffd8aa4c..b5def933723 100644 --- a/src/shared/Database/DatabaseSqlite.cpp +++ b/src/shared/Database/DatabaseSqlite.cpp @@ -101,3 +101,4 @@ bool DatabaseSqlite::Execute(const char *sql) return true; } #endif + diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h index a9593989143..c84b59eea80 100644 --- a/src/shared/Database/DatabaseSqlite.h +++ b/src/shared/Database/DatabaseSqlite.h @@ -43,3 +43,4 @@ class DatabaseSqlite : public Database }; #endif #endif + diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp index 18831e23687..9a1fbfa5178 100644 --- a/src/shared/Database/Field.cpp +++ b/src/shared/Database/Field.cpp @@ -65,3 +65,4 @@ void Field::SetValue(const char *value) else mValue = NULL; } + diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h index a4514c963cd..da6a865c6f2 100644 --- a/src/shared/Database/Field.h +++ b/src/shared/Database/Field.h @@ -75,3 +75,4 @@ class Field enum DataTypes mType; }; #endif + diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h index 5f3e66de722..fcebe3fbd35 100644 --- a/src/shared/Database/MySQLDelayThread.h +++ b/src/shared/Database/MySQLDelayThread.h @@ -30,3 +30,4 @@ class MySQLDelayThread : public SqlDelayThread void Stop() { SqlDelayThread::Stop(); } }; #endif //__MYSQLDELAYTHREAD_H + diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h index bd6a2bf962d..8d219bd9c1e 100644 --- a/src/shared/Database/PGSQLDelayThread.h +++ b/src/shared/Database/PGSQLDelayThread.h @@ -30,3 +30,4 @@ class PGSQLDelayThread : public SqlDelayThread void Stop() { SqlDelayThread::Stop(); } }; #endif //__PGSQLDELAYTHREAD_H + diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index 0fab7a3633b..01da45ed281 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -64,3 +64,4 @@ class TRINITY_DLL_SPEC QueryResult FieldNames mFieldNames; }; #endif + diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp index 8ae59b350d8..5bc11ae308f 100644 --- a/src/shared/Database/QueryResultMysql.cpp +++ b/src/shared/Database/QueryResultMysql.cpp @@ -110,3 +110,4 @@ enum Field::DataTypes QueryResultMysql::ConvertNativeType(enum_field_types mysql } } #endif + diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h index 39d2985ad77..06b1353c12e 100644 --- a/src/shared/Database/QueryResultMysql.h +++ b/src/shared/Database/QueryResultMysql.h @@ -48,3 +48,4 @@ class QueryResultMysql : public QueryResult }; #endif #endif + diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp index e10905f0feb..500ca053885 100644 --- a/src/shared/Database/QueryResultPostgre.cpp +++ b/src/shared/Database/QueryResultPostgre.cpp @@ -139,3 +139,4 @@ enum Field::DataTypes QueryResultPostgre::ConvertNativeType(Oid pOid ) const return Field::DB_TYPE_UNKNOWN; } #endif + diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h index aa183ab4b96..30d69114dc6 100644 --- a/src/shared/Database/QueryResultPostgre.h +++ b/src/shared/Database/QueryResultPostgre.h @@ -48,3 +48,4 @@ class QueryResultPostgre : public QueryResult uint32 mTableIndex; }; #endif + diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp index 9a32e36bc84..06a02d1db59 100644 --- a/src/shared/Database/QueryResultSqlite.cpp +++ b/src/shared/Database/QueryResultSqlite.cpp @@ -96,3 +96,4 @@ enum Field::DataTypes QueryResultSqlite::ConvertNativeType(const char* sqliteTyp return Field::DB_TYPE_UNKNOWN; } #endif + diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h index d3462977e49..5dc3287b385 100644 --- a/src/shared/Database/QueryResultSqlite.h +++ b/src/shared/Database/QueryResultSqlite.h @@ -43,3 +43,4 @@ class QueryResultSqlite : public QueryResult }; #endif #endif + diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 2f4f4534b3a..2401f715074 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -81,3 +81,4 @@ void SQLStorage::Load() SQLStorageLoader loader; loader.Load(*this); } + diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h index f2250410c26..1b5b9d5dcf1 100644 --- a/src/shared/Database/SQLStorage.h +++ b/src/shared/Database/SQLStorage.h @@ -114,3 +114,4 @@ struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader> }; #endif + diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index b820d68619b..6cb67832f02 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -212,3 +212,4 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store) store.MaxEntry = maxi; store.data = _data; } + diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp index a35090adb7e..27f58510a0a 100644 --- a/src/shared/Database/SqlDelayThread.cpp +++ b/src/shared/Database/SqlDelayThread.cpp @@ -55,3 +55,4 @@ void SqlDelayThread::Stop() { m_running = false; } + diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index 1fc35741fc5..cbae0c1e5eb 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -48,3 +48,4 @@ class SqlDelayThread : public ZThread::Runnable virtual void run(); ///< Main Thread loop }; #endif //__SQLDELAYTHREAD_H + diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index 233eed1e4cb..68f5759a85e 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -199,3 +199,4 @@ void SqlQueryHolderEx::Execute(Database *db) /// sync with the caller thread m_queue->add(m_callback); } + diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index b7c84b5d6cf..61eef4bb7c4 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -121,3 +121,4 @@ class SqlQueryHolderEx : public SqlOperation void Execute(Database *db); }; #endif //__SQLOPERATIONS_H + diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp index f0b7e6e3c15..c40c8b223e1 100644 --- a/src/shared/Database/dbcfile.cpp +++ b/src/shared/Database/dbcfile.cpp @@ -243,3 +243,4 @@ char* DBCFile::AutoProduceStrings(const char* format, char* dataTable) return stringPool; } + diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h index 470322326aa..e94417b4371 100644 --- a/src/shared/Database/dbcfile.h +++ b/src/shared/Database/dbcfile.h @@ -107,3 +107,4 @@ class DBCFile unsigned char *stringTable; }; #endif + diff --git a/src/shared/Errors.h b/src/shared/Errors.h index a521ae7f3f0..b7bd19a1d94 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -29,3 +29,4 @@ #define ASSERT WPAssert #endif + diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index 2ed66ae3189..c0f70f4790b 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -796,3 +796,4 @@ void error_db_log(const char * str, ...) Trinity::Singleton<Log>::Instance().outErrorDb(buf); } + diff --git a/src/shared/Log.h b/src/shared/Log.h index 076d660be61..b4344eac262 100644 --- a/src/shared/Log.h +++ b/src/shared/Log.h @@ -165,3 +165,4 @@ void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2); void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2); void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2); #endif + diff --git a/src/shared/Mthread.cpp b/src/shared/Mthread.cpp index 8985b9cebc8..fbbeeb5a620 100644 --- a/src/shared/Mthread.cpp +++ b/src/shared/Mthread.cpp @@ -203,3 +203,4 @@ MMutex *MMutex::Create () return mutex; } #endif + diff --git a/src/shared/Mthread.h b/src/shared/Mthread.h index 1afee4acd1b..d0ac6deb43c 100644 --- a/src/shared/Mthread.h +++ b/src/shared/Mthread.h @@ -60,3 +60,4 @@ class MMutex : public Base virtual void Unlock (); }; #endif // MTHREAD_H + diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp index 2fcd6c58b9b..96c9727e7fa 100644 --- a/src/shared/PacketLog.cpp +++ b/src/shared/PacketLog.cpp @@ -157,3 +157,4 @@ void PacketLog::WorldHexDump(WorldPacket* data, uint32 socket, bool direction) HexDump((char *)data->contents(), data->size(), "world.log"); } + diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h index b4313c48624..49ac72ebc4b 100644 --- a/src/shared/PacketLog.h +++ b/src/shared/PacketLog.h @@ -46,3 +46,4 @@ class PacketLog #define sPacketLog Trinity::Singleton<PacketLog>::Instance() #endif + diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp index 0108dfec974..b72118ad804 100644 --- a/src/shared/ProgressBar.cpp +++ b/src/shared/ProgressBar.cpp @@ -80,3 +80,4 @@ void barGoLink::step( void ) rec_pos = n; } } + diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h index 8c551ed65dc..50c5c7d11e5 100644 --- a/src/shared/ProgressBar.h +++ b/src/shared/ProgressBar.h @@ -40,3 +40,4 @@ class TRINITY_DLL_SPEC barGoLink ~barGoLink(); }; #endif + diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp index 878656b1d91..bdc2a371297 100644 --- a/src/shared/ServiceWin32.cpp +++ b/src/shared/ServiceWin32.cpp @@ -260,3 +260,4 @@ bool WinServiceRun() return true; } #endif + diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h index 762502ccaa7..18a52c396ea 100644 --- a/src/shared/ServiceWin32.h +++ b/src/shared/ServiceWin32.h @@ -28,3 +28,4 @@ bool WinServiceRun(); #endif // _WIN32_SERVICE_ #endif // WIN32 + diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h index 7d0143085b4..679eee407e6 100644 --- a/src/shared/SystemConfig.h +++ b/src/shared/SystemConfig.h @@ -52,3 +52,4 @@ #define DEFAULT_REALMSERVER_PORT 3724 #define DEFAULT_SOCKET_SELECT_TIME 10000 #endif + diff --git a/src/shared/Timer.h b/src/shared/Timer.h index 30f5966afce..82f5be161d9 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -96,3 +96,4 @@ struct TimeTrackerSmall }; #endif + diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp index 0d3010c5f04..36c41e5da48 100644 --- a/src/shared/Util.cpp +++ b/src/shared/Util.cpp @@ -425,3 +425,4 @@ bool Utf8FitTo(const std::string& str, std::wstring search) return true; } + diff --git a/src/shared/Util.h b/src/shared/Util.h index adfbdad620a..712f100bd33 100644 --- a/src/shared/Util.h +++ b/src/shared/Util.h @@ -544,4 +544,3 @@ public: return (part[el]); }; }; -#endif diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp index 5d365639fbf..7b97edd8f5b 100644 --- a/src/shared/WheatyExceptionReport.cpp +++ b/src/shared/WheatyExceptionReport.cpp @@ -1013,3 +1013,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...) return retValue; } + diff --git a/src/shared/WheatyExceptionReport.h b/src/shared/WheatyExceptionReport.h index 896d9c72f36..32cd78fa100 100644 --- a/src/shared/WheatyExceptionReport.h +++ b/src/shared/WheatyExceptionReport.h @@ -115,3 +115,4 @@ class WheatyExceptionReport extern WheatyExceptionReport g_WheatyExceptionReport; // global instance of class #endif //WheatyExceptionReport + diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h index 4d30533d2f1..1eb3f12dd86 100644 --- a/src/shared/WorldPacket.h +++ b/src/shared/WorldPacket.h @@ -51,3 +51,4 @@ class WorldPacket : public ByteBuffer uint16 m_opcode; }; #endif + diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h index bc33a6699d1..ff4335b6774 100644 --- a/src/shared/vmap/AABSPTree.h +++ b/src/shared/vmap/AABSPTree.h @@ -1618,3 +1618,4 @@ public: + diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp index bce9c718acd..2ffd5672218 100644 --- a/src/shared/vmap/BaseModel.cpp +++ b/src/shared/vmap/BaseModel.cpp @@ -95,3 +95,4 @@ namespace VMAP } } // VMAP + diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h index 42e277634ba..098e1d9381b 100644 --- a/src/shared/vmap/BaseModel.h +++ b/src/shared/vmap/BaseModel.h @@ -99,3 +99,4 @@ namespace VMAP } #endif /*BASEMODEL_H_*/ + diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp index 9c7cbe58a6b..c362101ffb4 100644 --- a/src/shared/vmap/CoordModelMapping.cpp +++ b/src/shared/vmap/CoordModelMapping.cpp @@ -187,3 +187,4 @@ namespace VMAP //================================================================= } + diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index 10392ca7eaf..7c89f0e8a0f 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -144,3 +144,4 @@ namespace VMAP }; } #endif /*_COORDMODELMAPPING_H_*/ + diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp index 26846fa5783..de656f4cfc5 100644 --- a/src/shared/vmap/DebugCmdLogger.cpp +++ b/src/shared/vmap/DebugCmdLogger.cpp @@ -125,3 +125,4 @@ namespace VMAP } //======================================================== } + diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h index f0e35d377bf..5493ab6f332 100644 --- a/src/shared/vmap/DebugCmdLogger.h +++ b/src/shared/vmap/DebugCmdLogger.h @@ -116,3 +116,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h index 49f639b845e..243a15aef73 100644 --- a/src/shared/vmap/IVMapManager.h +++ b/src/shared/vmap/IVMapManager.h @@ -99,3 +99,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp index 34800b3b5f7..c7bfefe7179 100644 --- a/src/shared/vmap/ManagedModelContainer.cpp +++ b/src/shared/vmap/ManagedModelContainer.cpp @@ -35,3 +35,4 @@ namespace VMAP } } + diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h index 5aa6bfdf1c3..e6862f915c7 100644 --- a/src/shared/vmap/ManagedModelContainer.h +++ b/src/shared/vmap/ManagedModelContainer.h @@ -49,3 +49,4 @@ namespace VMAP //======================================================= } #endif + diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp index a4bc5b8aa17..4a722d2585b 100644 --- a/src/shared/vmap/ModelContainer.cpp +++ b/src/shared/vmap/ModelContainer.cpp @@ -375,3 +375,4 @@ namespace VMAP } //================================================================= } // VMAP + diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h index f66b11658d6..abc96261050 100644 --- a/src/shared/vmap/ModelContainer.h +++ b/src/shared/vmap/ModelContainer.h @@ -108,3 +108,4 @@ namespace VMAP void getBounds(const ModelContainer* pMc, G3D::AABox& pAABox); } #endif + diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h index 70bd0eeefae..54fc5ee99b6 100644 --- a/src/shared/vmap/NodeValueAccess.h +++ b/src/shared/vmap/NodeValueAccess.h @@ -48,3 +48,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h index 059e59f47e6..0e98677aa9e 100644 --- a/src/shared/vmap/ShortBox.h +++ b/src/shared/vmap/ShortBox.h @@ -148,3 +148,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h index d02e6b4081e..5f0fb7d9fd8 100644 --- a/src/shared/vmap/ShortVector.h +++ b/src/shared/vmap/ShortVector.h @@ -134,3 +134,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp index ed586ce6b52..370c80062d6 100644 --- a/src/shared/vmap/SubModel.cpp +++ b/src/shared/vmap/SubModel.cpp @@ -248,3 +248,4 @@ namespace VMAP //========================================================== } + diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h index 5a0b0d38be7..89ea9b91d7b 100644 --- a/src/shared/vmap/SubModel.h +++ b/src/shared/vmap/SubModel.h @@ -102,3 +102,4 @@ namespace VMAP //==================================== } // VMAP #endif + diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp index e57836a6f9e..64d67205f68 100644 --- a/src/shared/vmap/TileAssembler.cpp +++ b/src/shared/vmap/TileAssembler.cpp @@ -570,3 +570,4 @@ namespace VMAP //========================================== } // VMAP + diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h index cdfd6e1311d..d2183794a9e 100644 --- a/src/shared/vmap/TileAssembler.h +++ b/src/shared/vmap/TileAssembler.h @@ -93,3 +93,4 @@ namespace VMAP //=============================================== } // VMAP #endif /*_TILEASSEMBLER_H_*/ + diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp index 1c0cff7d4b3..c884f9b3b1d 100644 --- a/src/shared/vmap/TreeNode.cpp +++ b/src/shared/vmap/TreeNode.cpp @@ -37,3 +37,4 @@ namespace VMAP //================================================================= //================================================================= } + diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h index d30b470b4b3..1b9532001e5 100644 --- a/src/shared/vmap/TreeNode.h +++ b/src/shared/vmap/TreeNode.h @@ -223,3 +223,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h index 35c672bd82e..fd28a91d515 100644 --- a/src/shared/vmap/VMapDefinitions.h +++ b/src/shared/vmap/VMapDefinitions.h @@ -37,3 +37,4 @@ namespace VMAP //====================================== } #endif + diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp index f0a78ba4f1c..5189f79daba 100644 --- a/src/shared/vmap/VMapFactory.cpp +++ b/src/shared/vmap/VMapFactory.cpp @@ -110,3 +110,4 @@ namespace VMAP } } } + diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h index 738a8a7f4e0..f3375d723c1 100644 --- a/src/shared/vmap/VMapFactory.h +++ b/src/shared/vmap/VMapFactory.h @@ -43,3 +43,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp index 9cf35b2655d..f5c2640be70 100644 --- a/src/shared/vmap/VMapManager.cpp +++ b/src/shared/vmap/VMapManager.cpp @@ -774,3 +774,4 @@ namespace VMAP //========================================================= //========================================================= } + diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index 02e0ec3e179..bfeba3cfe67 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.h @@ -173,3 +173,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h index 5253392f867..3af3a29310d 100644 --- a/src/shared/vmap/VMapTools.h +++ b/src/shared/vmap/VMapTools.h @@ -150,3 +150,4 @@ namespace VMAP }; } #endif + diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index 83cf4da7c62..1fefe3677fe 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -405,3 +405,4 @@ int main(int argc, char **argv) return 0; } + diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp index a0609309298..e256128ed90 100644 --- a/src/trinitycore/CliRunnable.cpp +++ b/src/trinitycore/CliRunnable.cpp @@ -373,3 +373,4 @@ void CliRunnable::run() ///- End the database thread WorldDatabase.ThreadEnd(); // free mySQL thread resources } + diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h index f50cae814bc..ea60ef695bc 100644 --- a/src/trinitycore/CliRunnable.h +++ b/src/trinitycore/CliRunnable.h @@ -33,3 +33,4 @@ class CliRunnable : public ZThread::Runnable }; #endif /// @} + diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index df9d9185deb..43783dc24ee 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -172,3 +172,4 @@ extern int main(int argc, char **argv) } /// @} + diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 8eeda54ab83..557124ca5e0 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -518,3 +518,4 @@ void Master::_UnhookSignals() signal(SIGBREAK, 0); #endif } + diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h index 36d4b29495e..456202594f6 100644 --- a/src/trinitycore/Master.h +++ b/src/trinitycore/Master.h @@ -50,3 +50,4 @@ class Master #define sMaster Trinity::Singleton<Master>::Instance() #endif /// @} + diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp index a48928d5a23..48749b09ceb 100644 --- a/src/trinitycore/RASocket.cpp +++ b/src/trinitycore/RASocket.cpp @@ -257,3 +257,4 @@ void RASocket::zprint( const char * szText ) #endif } + diff --git a/src/trinitycore/RASocket.h b/src/trinitycore/RASocket.h new file mode 100644 index 00000000000..145afd52c60 --- /dev/null +++ b/src/trinitycore/RASocket.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup Trinityd +/// @{ +/// \file + +#ifndef _RASOCKET_H +#define _RASOCKET_H + +#include "Common.h" +#include "sockets/TcpSocket.h" + +#define RA_BUFF_SIZE 1024 + +class ISocketHandler; + +/// Remote Administration socket +class RASocket: public TcpSocket +{ + public: + + RASocket(ISocketHandler& h); + ~RASocket(); + + void OnAccept(); + void OnRead(); + + private: + + char * buff; + std::string szLogin; + uint32 iSess; + unsigned int iInputLength; + bool bLog; + bool bSecure; //kick on wrong pass, non exist. user, user with no priv + //will protect from DOS, bruteforce attacks + //some 'smart' protection must be added for more security + uint8 iMinLevel; + enum + { + NONE, //initial value + LG, //only login was entered + OK, //both login and pass were given, and they are correct and user have enough priv. + }stage; + + static void zprint( const char * szText ); +}; +#endif +/// @} + diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index ec4c25a6cf6..b29e1434a64 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -84,3 +84,4 @@ void WorldRunnable::run() ///- End the database thread WorldDatabase.ThreadEnd(); // free mySQL thread resources } + diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h index 73a7f17e52f..b84e5b6a04c 100644 --- a/src/trinitycore/WorldRunnable.h +++ b/src/trinitycore/WorldRunnable.h @@ -33,3 +33,4 @@ class WorldRunnable : public ZThread::Runnable }; #endif /// @} + diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h index 7dc5cb9ef7b..fbc730320b4 100644 --- a/src/trinitycore/resource.h +++ b/src/trinitycore/resource.h @@ -13,3 +13,4 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + diff --git a/src/trinityrealm/AuthCodes.h b/src/trinityrealm/AuthCodes.h index 14a65b89504..defa513dede 100644 --- a/src/trinityrealm/AuthCodes.h +++ b/src/trinityrealm/AuthCodes.h @@ -73,3 +73,4 @@ enum LoginResult #define EXPECTED_TRINITY_CLIENT_BUILD {8606, 0} #endif + diff --git a/src/trinityrealm/AuthSocket.cpp b/src/trinityrealm/AuthSocket.cpp index c5c81593737..dd7bc31e45b 100644 --- a/src/trinityrealm/AuthSocket.cpp +++ b/src/trinityrealm/AuthSocket.cpp @@ -1092,3 +1092,4 @@ Patcher::~Patcher() for(Patches::iterator i = _patches.begin(); i != _patches.end(); i++ ) delete i->second; } + diff --git a/src/trinityrealm/AuthSocket.h b/src/trinityrealm/AuthSocket.h new file mode 100644 index 00000000000..73aa1b280e2 --- /dev/null +++ b/src/trinityrealm/AuthSocket.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup realmd +/// @{ +/// \file + +#ifndef _AUTHSOCKET_H +#define _AUTHSOCKET_H + +#include "Common.h" +#include "Auth/BigNumber.h" +#include "sockets/TcpSocket.h" +#include "sockets/SocketHandler.h" +#include "sockets/ListenSocket.h" +#include "sockets/Utility.h" +#include "sockets/Parse.h" +#include "sockets/Socket.h" +#include "zthread/Mutex.h" + +/// Handle login commands +class AuthSocket: public TcpSocket +{ + public: + const static int s_BYTE_SIZE = 32; + + AuthSocket(ISocketHandler& h); + ~AuthSocket(); + + void OnAccept(); + void OnRead(); + + bool _HandleLogonChallenge(); + bool _HandleLogonProof(); + bool _HandleReconnectChallenge(); + bool _HandleReconnectProof(); + bool _HandleRealmList(); + //data transfer handle for patch + + bool _HandleXferResume(); + bool _HandleXferCancel(); + bool _HandleXferAccept(); + + void _SetVSFields(const std::string& rI); + + FILE *pPatch; + ZThread::Mutex patcherLock; + bool IsLag(); + + private: + + BigNumber N, s, g, v; + BigNumber b, B; + BigNumber K; + BigNumber _reconnectProof; + + bool _authed; + + std::string _login; + std::string _safelogin; + + // Since GetLocaleByName() is _NOT_ bijective, we have to store the locale as a string. Otherwise we can't differ + // between enUS and enGB, which is important for the patch system + std::string _localizationName; + uint16 _build; + AccountTypes _accountSecurityLevel; +}; +#endif +/// @} + diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp index 95829ee96ca..8c2c199b2f4 100644 --- a/src/trinityrealm/Main.cpp +++ b/src/trinityrealm/Main.cpp @@ -351,3 +351,4 @@ void UnhookSignals() } /// @} + diff --git a/src/trinityrealm/RealmList.cpp b/src/trinityrealm/RealmList.cpp index 6a3d6b47e0f..692f457b1a8 100644 --- a/src/trinityrealm/RealmList.cpp +++ b/src/trinityrealm/RealmList.cpp @@ -100,3 +100,4 @@ void RealmList::UpdateRealms(bool init) delete result; } } + diff --git a/src/trinityrealm/RealmList.h b/src/trinityrealm/RealmList.h index 842482bb75a..31690a19eb3 100644 --- a/src/trinityrealm/RealmList.h +++ b/src/trinityrealm/RealmList.h @@ -66,3 +66,4 @@ class RealmList }; #endif /// @} + diff --git a/src/trinityrealm/resource.h b/src/trinityrealm/resource.h index 7dc5cb9ef7b..fbc730320b4 100644 --- a/src/trinityrealm/resource.h +++ b/src/trinityrealm/resource.h @@ -13,3 +13,4 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + |