diff options
Diffstat (limited to 'src')
645 files changed, 9488 insertions, 9488 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 17d12c41a87..73b2148a3b7 100755 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -177,13 +177,13 @@ extern int main(int argc, char **argv) ULONG_PTR appAff; ULONG_PTR sysAff; - if (GetProcessAffinityMask(hProcess,&appAff,&sysAff)) + if (GetProcessAffinityMask(hProcess, &appAff, &sysAff)) { ULONG_PTR curAff = Aff & appAff; // remove non accessible processors if (!curAff) sLog->outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for authserver. Accessible processors bitmask (hex): %x", Aff, appAff); - else if (SetProcessAffinityMask(hProcess,curAff)) + else if (SetProcessAffinityMask(hProcess, curAff)) sLog->outString("Using processors (bitmask, hex): %x", curAff); else sLog->outError("Can't set used processors (hex): %x", curAff); diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 7fa8bbd76e3..8ec1fcd1fd3 100755 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -50,11 +50,11 @@ enum eStatus STATUS_AUTHED }; -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some paltform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some paltform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif typedef struct AUTH_LOGON_CHALLENGE_C @@ -169,7 +169,7 @@ public: Patches::const_iterator begin() const { return _patches.begin(); } Patches::const_iterator end() const { return _patches.end(); } void LoadPatchMD5(char*); - bool GetHash(char * pat,uint8 mymd5[16]); + bool GetHash(char * pat, uint8 mymd5[16]); private: void LoadPatchesInfo(); @@ -909,7 +909,7 @@ bool AuthSocket::_HandleXferResume() // Launch a PatcherRunnable thread starting at given patch file offset uint64 start; socket().recv_skip(1); - socket().recv((char*)&start,sizeof(start)); + socket().recv((char*)&start, sizeof(start)); fseek(pPatch, long(start), 0); ACE_Based::Thread u(new PatcherRunnable(this)); diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h index 111d81e3722..a600dcb4895 100755 --- a/src/server/collision/Management/IVMapManager.h +++ b/src/server/collision/Management/IVMapManager.h @@ -63,7 +63,7 @@ namespace VMAP virtual bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) = 0; virtual float getHeight(unsigned int pMapId, float x, float y, float z, float maxSearchDist) = 0; /** - test if we hit an object. return true if we hit one. rx,ry,rz will hold the hit position or the dest position, if no intersection was found + test if we hit an object. return true if we hit one. rx, ry, rz will hold the hit position or the dest position, if no intersection was found return a position, that is pReduceDist closer to the origin */ virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) = 0; diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp index 1af711075d5..b12924af2ad 100755 --- a/src/server/collision/Management/VMapFactory.cpp +++ b/src/server/collision/Management/VMapFactory.cpp @@ -31,7 +31,7 @@ namespace VMAP char lc = str[str.length()-1]; if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') { - str = str.substr(0,str.length()-1); + str = str.substr(0, str.length()-1); } else { @@ -43,7 +43,7 @@ namespace VMAP char lc = str[0]; if(lc == ' ' || lc == '"' || lc == '\'') { - str = str.substr(1,str.length()-1); + str = str.substr(1, str.length()-1); } else { diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index b318b91b29e..5b2d6fafc20 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -161,8 +161,8 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1); + Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); if (pos1 != pos2) { result = instanceTree->second->isInLineOfSight(pos1, pos2); @@ -186,11 +186,11 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1); + Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); Vector3 resultPos; result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, pModifyDist); - resultPos = convertPositionToMangosRep(resultPos.x,resultPos.y,resultPos.z); + resultPos = convertPositionToMangosRep(resultPos.x, resultPos.y, resultPos.z); rx = resultPos.x; ry = resultPos.y; rz = resultPos.z; @@ -212,7 +212,7 @@ namespace VMAP InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); if (instanceTree != iInstanceMapTrees.end()) { - Vector3 pos = convertPositionToInternalRep(x,y,z); + Vector3 pos = convertPositionToInternalRep(x, y, z); height = instanceTree->second->getHeight(pos, maxSearchDist); if (!(height < G3D::inf())) { diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index cd4c74d2ead..632b4138c85 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -226,7 +226,7 @@ namespace VMAP float StaticMapTree::getHeight(const Vector3& pPos, float maxSearchDist) const { float height = G3D::inf(); - Vector3 dir = Vector3(0,0,-1); + Vector3 dir = Vector3(0, 0, -1); G3D::Ray ray(pPos, dir); // direction with length of 1 float maxDist = maxSearchDist; if (getIntersectionTime(ray, maxDist, false)) @@ -356,7 +356,7 @@ namespace VMAP } if (!iTreeValues) { - sLog->outError("StaticMapTree::LoadMapTile() : tree has not been initialized [%u,%u]", tileX, tileY); + sLog->outError("StaticMapTree::LoadMapTile() : tree has not been initialized [%u, %u]", tileX, tileY); return false; } bool result = true; @@ -382,7 +382,7 @@ namespace VMAP // acquire model instance WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name); if (!model) - sLog->outError("StaticMapTree::LoadMapTile() : could not acquire WorldModel pointer [%u,%u]", tileX, tileY); + sLog->outError("StaticMapTree::LoadMapTile() : could not acquire WorldModel pointer [%u, %u]", tileX, tileY); // update tree uint32 referencedVal; diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index 324294ae9f3..d2bbe851af0 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -262,12 +262,12 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define READ_OR_RETURN_WITH_DELETE(V,S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete V; return(false); }readOperation++; - #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); @@ -362,8 +362,8 @@ namespace VMAP if (!rf) { - printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str()); - printf("... or form: %s",filename.c_str() ); + printf("ERROR: Can't open model file in form: %s", pModelFilename.c_str()); + printf("... or form: %s", filename.c_str() ); return false; } @@ -372,11 +372,11 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define READ_OR_RETURN_WITH_DELETE(V,S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete V; return(false); }readOperation++; - #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 325594fd6be..03101170c44 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -456,7 +456,7 @@ namespace VMAP } #ifdef VMAP_DEBUG const GroupModel &gm = prims[entry]; - printf("%10u %8X %7.3f,%7.3f,%7.3f | %7.3f,%7.3f,%7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(), + printf("%10u %8X %7.3f, %7.3f, %7.3f | %7.3f, %7.3f, %7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(), gm.GetBound().low().x, gm.GetBound().low().y, gm.GetBound().low().z, gm.GetBound().high().x, gm.GetBound().high().y, gm.GetBound().high().z, group_Z, point.z); #endif @@ -507,7 +507,7 @@ namespace VMAP bool result = true; uint32 chunkSize, count; - result = fwrite(VMAP_MAGIC,1,8,wf) == 8; + result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8; if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false; chunkSize = sizeof(uint32) + sizeof(uint32); if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 020c7819460..5cc6423698d 100755 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -269,7 +269,7 @@ AOEAI::AOEAI(Creature *c) : CreatureAI(c) me->SetVisible(true);//visible to see all spell anims me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);//can't be targeted me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_1);//can't be damaged - me->SetDisplayId(11686);//invisible model,around a size of a player + me->SetDisplayId(11686);//invisible model, around a size of a player } bool AOEAI::CanAIAttack(const Unit * /*who*/) const @@ -284,7 +284,7 @@ void AOEAI::AttackStart(Unit * /*who*/) void AOEAI::UpdateAI(const uint32 /*diff*/) { if (!me->HasAura(me->m_spells[0])) - me->CastSpell(me, me->m_spells[0],false); + me->CastSpell(me, me->m_spells[0], false); } ////////////// diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index ecff2d2a031..1ebc9e69078 100755 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -62,7 +62,7 @@ void GuardAI::MoveInLineOfSight(Unit* unit) unit->isInAccessiblePlaceFor(me)) { float attackRadius = me->GetAttackDistance(unit); - if (me->IsWithinDistInMap(unit,attackRadius)) + if (me->IsWithinDistInMap(unit, attackRadius)) { //Need add code to let guard support player AttackStart(unit); diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index db6aa16910b..c43c1e143ae 100755 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -116,7 +116,7 @@ void PetAI::UpdateAI(const uint32 diff) HandleReturnMovement(); } else if (owner && !me->HasUnitState(UNIT_STAT_FOLLOW)) // no charm info and no victim - me->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST, me->GetFollowAngle()); + me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); if (!me->GetCharmInfo()) return; @@ -183,7 +183,7 @@ void PetAI::UpdateAI(const uint32 diff) bool spellUsed = false; for (std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) { - Unit* Target = ObjectAccessor::GetUnit(*me,*tar); + Unit* Target = ObjectAccessor::GetUnit(*me, *tar); //only buff targets that are in combat, unless the spell can only be cast while out of combat if (!Target) @@ -352,12 +352,12 @@ void PetAI::HandleReturnMovement() // Return to previous position where stay was clicked if (!me->GetCharmInfo()->IsCommandAttack()) { - float x,y,z; + float x, y, z; me->GetCharmInfo()->GetStayPosition(x, y, z); me->GetCharmInfo()->SetIsReturning(true); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(me->GetGUIDLow(),x,y,z); + me->GetMotionMaster()->MovePoint(me->GetGUIDLow(), x, y, z); } } } @@ -389,7 +389,7 @@ void PetAI::DoAttack(Unit *target, bool chase) if (chase) { - if (me->Attack(target,true)) + if (me->Attack(target, true)) { me->GetCharmInfo()->SetIsAtStay(false); me->GetCharmInfo()->SetIsFollowing(false); @@ -403,7 +403,7 @@ void PetAI::DoAttack(Unit *target, bool chase) me->GetCharmInfo()->SetIsAtStay(true); me->GetCharmInfo()->SetIsFollowing(false); me->GetCharmInfo()->SetIsReturning(false); - me->Attack(target,true); + me->Attack(target, true); } } diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 8d95a0260e4..6598ec7707a 100755 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -102,7 +102,7 @@ void UnitAI::DoAddAuraToAllHostilePlayers(uint32 spellid) std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { - if (Unit *pTemp = Unit::GetUnit(*me,(*itr)->getUnitGuid())) + if (Unit *pTemp = Unit::GetUnit(*me, (*itr)->getUnitGuid())) if (pTemp->GetTypeId() == TYPEID_PLAYER) me->AddAura(spellid, pTemp); } @@ -117,7 +117,7 @@ void UnitAI::DoCastToAllHostilePlayers(uint32 spellid, bool triggered) std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { - if (Unit *pTemp = Unit::GetUnit(*me,(*itr)->getUnitGuid())) + if (Unit *pTemp = Unit::GetUnit(*me, (*itr)->getUnitGuid())) if (pTemp->GetTypeId() == TYPEID_PLAYER) me->CastSpell(pTemp, spellid, triggered); } diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index e641c4fca6b..30a981cfef2 100755 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -27,14 +27,14 @@ template<class T> inline const T& RAND(const T& v1, const T& v2) { - return (urand(0,1)) ? v1 : v2; + return (urand(0, 1)) ? v1 : v2; } template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3) { - switch (urand(0,2)) + switch (urand(0, 2)) { default: case 0: return v1; @@ -47,7 +47,7 @@ template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4) { - switch (urand(0,3)) + switch (urand(0, 3)) { default: case 0: return v1; @@ -61,7 +61,7 @@ template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5) { - switch (urand(0,4)) + switch (urand(0, 4)) { default: case 0: return v1; @@ -76,7 +76,7 @@ template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6) { - switch (urand(0,5)) + switch (urand(0, 5)) { default: case 0: return v1; @@ -92,7 +92,7 @@ template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7) { - switch (urand(0,6)) + switch (urand(0, 6)) { default: case 0: return v1; @@ -109,7 +109,7 @@ template<class T> inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8) { - switch (urand(0,7)) + switch (urand(0, 7)) { default: case 0: return v1; @@ -128,7 +128,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9) { - switch (urand(0,8)) + switch (urand(0, 8)) { default: case 0: return v1; @@ -148,7 +148,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10) { - switch (urand(0,9)) + switch (urand(0, 9)) { default: case 0: return v1; @@ -169,7 +169,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11) { - switch (urand(0,10)) + switch (urand(0, 10)) { default: case 0: return v1; @@ -191,7 +191,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11, const T& v12) { - switch (urand(0,11)) + switch (urand(0, 11)) { default: case 0: return v1; @@ -214,7 +214,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11, const T& v12, const T& v13) { - switch (urand(0,12)) + switch (urand(0, 12)) { default: case 0: return v1; @@ -238,7 +238,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14) { - switch (urand(0,13)) + switch (urand(0, 13)) { default: case 0: return v1; @@ -263,7 +263,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14, const T& v15) { - switch (urand(0,14)) + switch (urand(0, 14)) { default: case 0: return v1; @@ -289,7 +289,7 @@ inline const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8, const T& v9, const T& v10, const T& v11, const T& v12, const T& v13, const T& v14, const T& v15, const T& v16) { - switch (urand(0,15)) + switch (urand(0, 15)) { default: case 0: return v1; diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 26adbe60c76..f201fb9eb31 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -125,14 +125,14 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.timer.repeatMin,event.timer.repeatMax); + pHolder.UpdateRepeatTimer(me, event.timer.repeatMin, event.timer.repeatMax); break; case EVENT_T_TIMER_OOC: if (me->isInCombat()) return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.timer.repeatMin,event.timer.repeatMax); + pHolder.UpdateRepeatTimer(me, event.timer.repeatMin, event.timer.repeatMax); break; case EVENT_T_HP: { @@ -145,7 +145,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.percent_range.repeatMin,event.percent_range.repeatMax); + pHolder.UpdateRepeatTimer(me, event.percent_range.repeatMin, event.percent_range.repeatMax); break; } case EVENT_T_MANA: @@ -159,14 +159,14 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.percent_range.repeatMin,event.percent_range.repeatMax); + pHolder.UpdateRepeatTimer(me, event.percent_range.repeatMin, event.percent_range.repeatMax); break; } case EVENT_T_AGGRO: break; case EVENT_T_KILL: //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.kill.repeatMin,event.kill.repeatMax); + pHolder.UpdateRepeatTimer(me, event.kill.repeatMin, event.kill.repeatMax); break; case EVENT_T_DEATH: case EVENT_T_EVADE: @@ -175,15 +175,15 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction //Spell hit is special case, param1 and param2 handled within CreatureEventAI::SpellHit //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.spell_hit.repeatMin,event.spell_hit.repeatMax); + pHolder.UpdateRepeatTimer(me, event.spell_hit.repeatMin, event.spell_hit.repeatMax); break; case EVENT_T_RANGE: //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.range.repeatMin,event.range.repeatMax); + pHolder.UpdateRepeatTimer(me, event.range.repeatMin, event.range.repeatMax); break; case EVENT_T_OOC_LOS: //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.ooc_los.repeatMin,event.ooc_los.repeatMax); + pHolder.UpdateRepeatTimer(me, event.ooc_los.repeatMin, event.ooc_los.repeatMax); break; case EVENT_T_RESET: case EVENT_T_SPAWNED: @@ -199,7 +199,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.percent_range.repeatMin,event.percent_range.repeatMax); + pHolder.UpdateRepeatTimer(me, event.percent_range.repeatMin, event.percent_range.repeatMax); break; } case EVENT_T_TARGET_CASTING: @@ -207,7 +207,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.target_casting.repeatMin,event.target_casting.repeatMax); + pHolder.UpdateRepeatTimer(me, event.target_casting.repeatMin, event.target_casting.repeatMax); break; case EVENT_T_FRIENDLY_HP: { @@ -221,7 +221,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction pActionInvoker = pUnit; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.friendly_hp.repeatMin,event.friendly_hp.repeatMax); + pHolder.UpdateRepeatTimer(me, event.friendly_hp.repeatMin, event.friendly_hp.repeatMax); break; } case EVENT_T_FRIENDLY_IS_CC: @@ -240,7 +240,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction pActionInvoker = *(pList.begin()); //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.friendly_is_cc.repeatMin,event.friendly_is_cc.repeatMax); + pHolder.UpdateRepeatTimer(me, event.friendly_is_cc.repeatMin, event.friendly_is_cc.repeatMax); break; } case EVENT_T_FRIENDLY_MISSING_BUFF: @@ -256,7 +256,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction pActionInvoker = *(pList.begin()); //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.friendly_buff.repeatMin,event.friendly_buff.repeatMax); + pHolder.UpdateRepeatTimer(me, event.friendly_buff.repeatMin, event.friendly_buff.repeatMax); break; } case EVENT_T_SUMMONED_UNIT: @@ -270,7 +270,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.summon_unit.repeatMin,event.summon_unit.repeatMax); + pHolder.UpdateRepeatTimer(me, event.summon_unit.repeatMin, event.summon_unit.repeatMax); break; } case EVENT_T_TARGET_MANA: @@ -284,7 +284,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.percent_range.repeatMin,event.percent_range.repeatMax); + pHolder.UpdateRepeatTimer(me, event.percent_range.repeatMin, event.percent_range.repeatMax); break; } case EVENT_T_REACHED_HOME: @@ -299,7 +299,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.buffed.repeatMin,event.buffed.repeatMax); + pHolder.UpdateRepeatTimer(me, event.buffed.repeatMin, event.buffed.repeatMax); break; } case EVENT_T_TARGET_BUFFED: @@ -315,7 +315,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction return false; //Repeat Timers - pHolder.UpdateRepeatTimer(me,event.buffed.repeatMin,event.buffed.repeatMax); + pHolder.UpdateRepeatTimer(me, event.buffed.repeatMin, event.buffed.repeatMax); break; } default: @@ -353,8 +353,8 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 int32 temp = 0; if (action.text.TextId2 && action.text.TextId3) - temp = RAND(action.text.TextId1,action.text.TextId2,action.text.TextId3); - else if (action.text.TextId2 && urand(0,1)) + temp = RAND(action.text.TextId1, action.text.TextId2, action.text.TextId3); + else if (action.text.TextId2 && urand(0, 1)) temp = action.text.TextId2; else temp = action.text.TextId1; @@ -410,7 +410,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 { if (CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(action.morph.creatureId)) { - uint32 display_id = sObjectMgr->ChooseDisplayId(0,ci); + uint32 display_id = sObjectMgr->ChooseDisplayId(0, ci); me->SetDisplayId(display_id); } } @@ -527,7 +527,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 { std::list<HostileReference*>& threatList = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::iterator i = threatList.begin(); i != threatList.end(); ++i) - if (Unit* Temp = Unit::GetUnit(*me,(*i)->getUnitGuid())) + if (Unit* Temp = Unit::GetUnit(*me, (*i)->getUnitGuid())) me->getThreatManager().modifyThreatPercent(Temp, action.threat_all_pct.percent); break; } @@ -632,16 +632,16 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 case ACTION_T_QUEST_EVENT_ALL: if (pActionInvoker && pActionInvoker->GetTypeId() == TYPEID_PLAYER) { - if (Unit* Temp = Unit::GetUnit(*me,pActionInvoker->GetGUID())) + if (Unit* Temp = Unit::GetUnit(*me, pActionInvoker->GetGUID())) if (Temp->GetTypeId() == TYPEID_PLAYER) - Temp->ToPlayer()->GroupEventHappens(action.quest_event_all.questId,me); + Temp->ToPlayer()->GroupEventHappens(action.quest_event_all.questId, me); } break; case ACTION_T_CAST_EVENT_ALL: { std::list<HostileReference*>& threatList = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::iterator i = threatList.begin(); i != threatList.end(); ++i) - if (Unit* Temp = Unit::GetUnit(*me,(*i)->getUnitGuid())) + if (Unit* Temp = Unit::GetUnit(*me, (*i)->getUnitGuid())) if (Temp->GetTypeId() == TYPEID_PLAYER) Temp->ToPlayer()->CastedCreatureOrGO(action.cast_event_all.creatureId, me->GetGUID(), action.cast_event_all.spellId); break; @@ -769,9 +769,9 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 // TRINITY ONLY case ACTION_T_MOVE_RANDOM_POINT: //dosen't work in combat { - float x,y,z; + float x, y, z; me->GetClosePoint(x, y, z, me->GetObjectSize() / 3, (float)action.raw.param1); - me->GetMotionMaster()->MovePoint(0,x,y,z); + me->GetMotionMaster()->MovePoint(0, x, y, z); break; } case ACTION_T_SET_STAND_STATE: @@ -796,8 +796,8 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 { GameObject* pObject = NULL; - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); pObject = me->SummonGameObject(action.raw.param1, x, y, z, 0, 0, 0, 0, 0, action.raw.param2); if (!pObject) { @@ -885,7 +885,7 @@ void CreatureEventAI::Reset() //Reset all out of combat timers case EVENT_T_TIMER_OOC: { - if ((*i).UpdateRepeatTimer(me,event.timer.initialMin,event.timer.initialMax)) + if ((*i).UpdateRepeatTimer(me, event.timer.initialMin, event.timer.initialMax)) (*i).Enabled = true; break; } @@ -985,7 +985,7 @@ void CreatureEventAI::EnterCombat(Unit *enemy) break; //Reset all in combat timers case EVENT_T_TIMER: - if ((*i).UpdateRepeatTimer(me,event.timer.initialMin,event.timer.initialMax)) + if ((*i).UpdateRepeatTimer(me, event.timer.initialMin, event.timer.initialMax)) (*i).Enabled = true; break; //All normal events need to be re-enabled and their time set to 0 @@ -1111,7 +1111,7 @@ void CreatureEventAI::UpdateAI(const uint32 diff) case EVENT_T_RANGE: if (me->getVictim()) if (me->IsInMap(me->getVictim())) - if (me->IsInRange(me->getVictim(),(float)(*i).Event.range.minDist,(float)(*i).Event.range.maxDist)) + if (me->IsInRange(me->getVictim(), (float)(*i).Event.range.minDist, (float)(*i).Event.range.maxDist)) ProcessEvent(*i); break; } @@ -1163,13 +1163,13 @@ inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoke case TARGET_T_HOSTILE: return me->getVictim(); case TARGET_T_HOSTILE_SECOND_AGGRO: - return SelectTarget(SELECT_TARGET_TOPAGGRO,1); + return SelectTarget(SELECT_TARGET_TOPAGGRO, 1); case TARGET_T_HOSTILE_LAST_AGGRO: - return SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0); + return SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); case TARGET_T_HOSTILE_RANDOM: - return SelectTarget(SELECT_TARGET_RANDOM,0); + return SelectTarget(SELECT_TARGET_RANDOM, 0); case TARGET_T_HOSTILE_RANDOM_NOT_TOP: - return SelectTarget(SELECT_TARGET_RANDOM,1); + return SelectTarget(SELECT_TARGET_RANDOM, 1); case TARGET_T_ACTION_INVOKER: return pActionInvoker; default: @@ -1236,13 +1236,13 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* { if (!pSource) { - sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i, invalid Source pointer.",textEntry); + sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i, invalid Source pointer.", textEntry); return; } if (textEntry >= 0) { - sLog->outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry); + sLog->outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), textEntry); return; } @@ -1250,18 +1250,18 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* if (i == sEventAIMgr->GetCreatureEventAITextMap().end()) { - sLog->outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry); + sLog->outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), textEntry); return; } - sLog->outDebug(LOG_FILTER_DATABASE_AI, "CreatureEventAI: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u",textEntry,(*i).second.SoundId,(*i).second.Type,(*i).second.Language,(*i).second.Emote); + sLog->outDebug(LOG_FILTER_DATABASE_AI, "CreatureEventAI: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", textEntry, (*i).second.SoundId, (*i).second.Type, (*i).second.Language, (*i).second.Emote); if ((*i).second.SoundId) { if (GetSoundEntriesStore()->LookupEntry((*i).second.SoundId)) pSource->PlayDirectSound((*i).second.SoundId); else - sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process invalid sound id %u.",textEntry,(*i).second.SoundId); + sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process invalid sound id %u.", textEntry, (*i).second.SoundId); } if ((*i).second.Emote) @@ -1271,7 +1271,7 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* ((Unit*)pSource)->HandleEmoteCommand((*i).second.Emote); } else - sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry,pSource->GetTypeId()); + sLog->outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", textEntry, pSource->GetTypeId()); } switch((*i).second.Type) @@ -1329,7 +1329,7 @@ bool CreatureEventAI::CanCast(Unit* Target, SpellEntry const *Spell, bool Trigge return false; //Unit is out of range of this spell - if (!me->IsInRange(Target,TempRange->minRangeHostile,TempRange->maxRangeHostile)) + if (!me->IsInRange(Target, TempRange->minRangeHostile, TempRange->maxRangeHostile)) return false; return true; @@ -1389,7 +1389,7 @@ bool CreatureEventAI::SpawnedEventConditionsCheck(CreatureEventAI_Event const& e { // zone ID check uint32 zone, area; - me->GetZoneAndAreaId(zone,area); + me->GetZoneAndAreaId(zone, area); return zone == event.spawned.conditionValue1 || area == event.spawned.conditionValue1; } default: diff --git a/src/server/game/AI/EventAI/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h index 2f580f23f0e..7b8d3e04e9f 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.h +++ b/src/server/game/AI/EventAI/CreatureEventAI.h @@ -36,7 +36,7 @@ enum EventAI_Type EVENT_T_TIMER = 0, // InitialMin, InitialMax, RepeatMin, RepeatMax EVENT_T_TIMER_OOC = 1, // InitialMin, InitialMax, RepeatMin, RepeatMax EVENT_T_HP = 2, // HPMax%, HPMin%, RepeatMin, RepeatMax - EVENT_T_MANA = 3, // ManaMax%,ManaMin% RepeatMin, RepeatMax + EVENT_T_MANA = 3, // ManaMax%, ManaMin% RepeatMin, RepeatMax EVENT_T_AGGRO = 4, // NONE EVENT_T_KILL = 5, // RepeatMin, RepeatMax EVENT_T_DEATH = 6, // NONE @@ -105,9 +105,9 @@ enum EventAI_ActionType ACTION_T_DIE = 37, // No Params ACTION_T_ZONE_COMBAT_PULSE = 38, // No Params ACTION_T_CALL_FOR_HELP = 39, // Radius - ACTION_T_SET_SHEATH = 40, // Sheath (0-passive,1-melee,2-ranged) + ACTION_T_SET_SHEATH = 40, // Sheath (0-passive, 1-melee, 2-ranged) ACTION_T_FORCE_DESPAWN = 41, // No Params - ACTION_T_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue, format(0-flat,1-percent from max health) + ACTION_T_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue, format(0-flat, 1-percent from max health) ACTION_T_MOUNT_TO_ENTRY_OR_MODEL = 43, // Creature_template entry(param1) OR ModelId (param2) (or 0 for both to unmount) ACTION_T_SET_PHASE_MASK = 97, diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index 175fee02317..a4bb08bf905 100755 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -34,7 +34,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts() m_CreatureEventAI_TextMap.clear(); // Load EventAI Text - sObjectMgr->LoadTrinityStrings("creature_ai_texts",MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID); + sObjectMgr->LoadTrinityStrings("creature_ai_texts", MIN_CREATURE_AI_TEXT_STRING_ID, MAX_CREATURE_AI_TEXT_STRING_ID); // Gather Additional data from EventAI Texts QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM creature_ai_texts"); @@ -62,33 +62,33 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts() // range negative if (i > MIN_CREATURE_AI_TEXT_STRING_ID || i <= MAX_CREATURE_AI_TEXT_STRING_ID) { - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` is not in valid range(%d-%d)",i,MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` is not in valid range(%d-%d)", i, MIN_CREATURE_AI_TEXT_STRING_ID, MAX_CREATURE_AI_TEXT_STRING_ID); continue; } // range negative (don't must be happen, loaded from same table) if (!sObjectMgr->GetTrinityStringLocale(i)) { - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` not found",i); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` not found", i); continue; } if (temp.SoundId) { if (!sSoundEntriesStore.LookupEntry(temp.SoundId)) - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Sound %u but sound does not exist.",i,temp.SoundId); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Sound %u but sound does not exist.", i, temp.SoundId); } if (!GetLanguageDescByID(temp.Language)) - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` using Language %u but Language does not exist.",i,temp.Language); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` using Language %u but Language does not exist.", i, temp.Language); if (temp.Type > CHAT_TYPE_ZONE_YELL) - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Type %u but this Chat Type does not exist.",i,temp.Type); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Type %u but this Chat Type does not exist.", i, temp.Type); if (temp.Emote) { if (!sEmotesStore.LookupEntry(temp.Emote)) - sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Emote %u but emote does not exist.",i,temp.Emote); + sLog->outErrorDb("CreatureEventAI: Entry %i in table `creature_ai_texts` has Emote %u but emote does not exist.", i, temp.Emote); } m_CreatureEventAI_TextMap[i] = temp; @@ -133,9 +133,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons() temp.orientation = fields[4].GetFloat(); temp.SpawnTimeSecs = fields[5].GetUInt32(); - if (!Trinity::IsValidMapCoord(temp.position_x,temp.position_y,temp.position_z,temp.orientation)) + if (!Trinity::IsValidMapCoord(temp.position_x, temp.position_y, temp.position_z, temp.orientation)) { - sLog->outErrorDb("CreatureEventAI: Summon id %u have wrong coordinates (%f,%f,%f,%f), skipping.", i,temp.position_x,temp.position_y,temp.position_z,temp.orientation); + sLog->outErrorDb("CreatureEventAI: Summon id %u have wrong coordinates (%f, %f, %f, %f), skipping.", i, temp.position_x, temp.position_y, temp.position_z, temp.orientation); continue; } @@ -189,7 +189,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() //Report any errors in event if (e_type >= EVENT_T_END) { - sLog->outErrorDb("CreatureEventAI: Event %u have wrong type (%u), skipping.", i,e_type); + sLog->outErrorDb("CreatureEventAI: Event %u have wrong type (%u), skipping.", i, e_type); continue; } temp.event_type = EventAI_Type(e_type); @@ -351,7 +351,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() { if (!sEmotesTextStore.LookupEntry(temp.receive_emote.emoteId)) { - sLog->outErrorDb("CreatureEventAI: Creature %u using event %u: param1 (EmoteTextId: %u) are not valid.",temp.creature_id, i, temp.receive_emote.emoteId); + sLog->outErrorDb("CreatureEventAI: Creature %u using event %u: param1 (EmoteTextId: %u) are not valid.", temp.creature_id, i, temp.receive_emote.emoteId); continue; } if (temp.receive_emote.condition) @@ -362,7 +362,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() cond.mConditionValue2 = temp.receive_emote.conditionValue2; if (!sConditionMgr->isConditionTypeValid(&cond)) { - sLog->outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.",temp.creature_id, i, temp.receive_emote.condition); + sLog->outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.", temp.creature_id, i, temp.receive_emote.condition); continue; } } @@ -462,7 +462,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() { if (action.morph.creatureId) { - sLog->outErrorDb("CreatureEventAI: Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j+1, action.morph.modelId,action.morph.creatureId); + sLog->outErrorDb("CreatureEventAI: Event %u Action %u have unused ModelId %u with also set creature id %u.", i, j+1, action.morph.modelId, action.morph.creatureId); action.morph.modelId = 0; } else if (!sCreatureDisplayInfoStore.LookupEntry(action.morph.modelId)) @@ -509,7 +509,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() { //output as debug for now, also because there's no general rule all spells have RecoveryTime if (temp.event_param3 < spell->RecoveryTime) - sLog->outDebug("CreatureEventAI: Event %u Action %u uses SpellID %u but cooldown is longer(%u) than minumum defined in event param3(%u).", i, j+1,action.cast.spellId, spell->RecoveryTime, temp.event_param3); + sLog->outDebug("CreatureEventAI: Event %u Action %u uses SpellID %u but cooldown is longer(%u) than minumum defined in event param3(%u).", i, j+1, action.cast.spellId, spell->RecoveryTime, temp.event_param3); } } */ @@ -618,7 +618,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts() if (action.random_phase_range.phaseMin >= action.random_phase_range.phaseMax) { sLog->outErrorDb("CreatureEventAI: Event %u Action %u attempts to set phaseMax <= phaseMin.", i, j+1); - std::swap(action.random_phase_range.phaseMin,action.random_phase_range.phaseMax); + std::swap(action.random_phase_range.phaseMin, action.random_phase_range.phaseMax); // equal case processed at call } break; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index d60e5defa33..55d340164ca 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -19,8 +19,8 @@ #define CAST_CRE(a) (SCRIPT_CAST_TYPE<Creature*>(a)) #define CAST_SUM(a) (SCRIPT_CAST_TYPE<TempSummon*>(a)) #define CAST_PET(a) (SCRIPT_CAST_TYPE<Pet*>(a)) -#define CAST_AI(a,b) (SCRIPT_CAST_TYPE<a*>(b)) -#define CAST_INST(a,b) (SCRIPT_CAST_TYPE<a*>(b)) +#define CAST_AI(a, b) (SCRIPT_CAST_TYPE<a*>(b)) +#define CAST_INST(a, b) (SCRIPT_CAST_TYPE<a*>(b)) #define GET_SPELL(a) (const_cast<SpellEntry*>(GetSpellStore()->LookupEntry(a))) diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h index 3d05775c642..59943fa2c9c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h @@ -79,11 +79,11 @@ enum eTradeskill // d - Action (identifys this Menu Item) // e - Text to be displayed in pop up box // f - Money value in pop up box -#define ADD_GOSSIP_ITEM(a,b,c,d) PlayerTalkClass->GetGossipMenu().AddMenuItem(a,b,c,d,"",0) -#define ADD_GOSSIP_ITEM_EXTENDED(a,b,c,d,e,f,g) PlayerTalkClass->GetGossipMenu().AddMenuItem(a,b,c,d,e,f,g) +#define ADD_GOSSIP_ITEM(a, b, c, d) PlayerTalkClass->GetGossipMenu().AddMenuItem(a, b, c, d, "", 0) +#define ADD_GOSSIP_ITEM_EXTENDED(a, b, c, d, e, f, g) PlayerTalkClass->GetGossipMenu().AddMenuItem(a, b, c, d, e, f, g) // This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32) , b - npc guid(uint64) -#define SEND_GOSSIP_MENU(a,b) PlayerTalkClass->SendGossipMenu(a,b) +#define SEND_GOSSIP_MENU(a, b) PlayerTalkClass->SendGossipMenu(a, b) // Closes the Menu #define CLOSE_GOSSIP_MENU() PlayerTalkClass->CloseGossip() diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp index 5614d9f84e6..cb3f9aa8346 100755 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp @@ -54,7 +54,7 @@ SimpleAI::SimpleAI(Creature *c) : ScriptedAI(c) Kill_Spell = 0; Kill_Target_Type = 0; - memset(Spell,0,sizeof(Spell)); + memset(Spell, 0, sizeof(Spell)); EnterEvadeMode(); } @@ -97,7 +97,7 @@ void SimpleAI::EnterCombat(Unit *who) Spell_Timer[9] = Spell[9].First_Cast; else Spell_Timer[9] = 1000; - uint8 random_text = urand(0,2); + uint8 random_text = urand(0, 2); //Random text if (Aggro_TextId[random_text]) @@ -110,7 +110,7 @@ void SimpleAI::EnterCombat(Unit *who) void SimpleAI::KilledUnit(Unit *victim) { - uint8 random_text = urand(0,2); + uint8 random_text = urand(0, 2); //Random yell if (Kill_TextId[random_text]) @@ -134,13 +134,13 @@ void SimpleAI::KilledUnit(Unit *victim) pTarget = me->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); break; case CAST_HOSTILE_LAST_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); break; case CAST_HOSTILE_RANDOM: - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); break; case CAST_KILLEDUNIT_VICTIM: pTarget = victim; @@ -158,7 +158,7 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage) if (me->GetHealth() > damage) return; - uint8 random_text = urand(0,2); + uint8 random_text = urand(0, 2); //Random yell if (Death_TextId[random_text]) @@ -182,13 +182,13 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage) pTarget = me->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); break; case CAST_HOSTILE_LAST_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); break; case CAST_HOSTILE_RANDOM: - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); break; case CAST_JUSTDIED_KILLER: pTarget = killer; @@ -233,13 +233,13 @@ void SimpleAI::UpdateAI(const uint32 diff) pTarget = me->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); break; case CAST_HOSTILE_LAST_AGGRO: - pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0); break; case CAST_HOSTILE_RANDOM: - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); break; } @@ -253,7 +253,7 @@ void SimpleAI::UpdateAI(const uint32 diff) //Yell and sound use the same number so that you can make //the Creature yell with the correct sound effect attached - uint8 random_text = urand(0,2); + uint8 random_text = urand(0, 2); //Random yell if (Spell[i].TextId[random_text]) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index f6eea40eb4b..4221daeb821 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -344,7 +344,7 @@ void SmartAI::UpdateAI(const uint32 diff) { if (mFollowArrivedTimer < diff) { - if (me->FindNearestCreature(mFollowArrivedEntry,INTERACTION_DISTANCE, true)) + if (me->FindNearestCreature(mFollowArrivedEntry, INTERACTION_DISTANCE, true)) { if (Player* plr = me->GetPlayer(*me, mFollowGuid)) { @@ -744,7 +744,7 @@ void SmartAI::sQuestReward(Player* player, Quest const* quest, uint32 opt) bool SmartAI::sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex) { - GetScript()->ProcessEventsFor(SMART_EVENT_DUMMY_EFFECT,caster,spellId,(uint32)effIndex); + GetScript()->ProcessEventsFor(SMART_EVENT_DUMMY_EFFECT, caster, spellId, (uint32)effIndex); return true; } @@ -843,7 +843,7 @@ void SmartGameObjectAI::Reset() bool SmartGameObjectAI::GossipHello(Player* player) { sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartGameObjectAI::GossipHello"); - GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0 ,0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player, 0 , 0 , false, NULL, go); return false; } @@ -863,14 +863,14 @@ bool SmartGameObjectAI::GossipSelectCode(Player* /*player*/, uint32 /*sender*/, // Called when a player accepts a quest from the gameobject. bool SmartGameObjectAI::QuestAccept(Player* player, Quest const* quest) { - GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId() ,0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_ACCEPTED_QUEST, player, quest->GetQuestId() , 0 , false, NULL, go); return false; } // Called when a player selects a quest reward. bool SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, uint32 opt) { - GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId() ,opt , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_REWARD_QUEST, player, quest->GetQuestId() , opt , false, NULL, go); return false; } @@ -880,7 +880,7 @@ uint32 SmartGameObjectAI::GetDialogStatus(Player* /*player*/) { return 100; } // Called when the gameobject is destroyed (destructible buildings only). void SmartGameObjectAI::Destroyed(Player* player, uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId ,0 , false, NULL, go); + GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId , 0 , false, NULL, go); } void SmartGameObjectAI::SetData(uint32 id, uint32 value) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index a9e0e03ebae..f63d433c278 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -56,7 +56,7 @@ void SmartWaypointMgr::LoadFromDB() Field* fields = result->Fetch(); uint32 entry = fields[0].GetUInt32(); uint32 id = fields[1].GetUInt32(); - float x,y,z; + float x, y, z; x = fields[2].GetFloat(); y = fields[3].GetFloat(); z = fields[4].GetFloat(); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index bbd38df61d6..21cfb92a75a 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -88,13 +88,13 @@ enum SMART_EVENT SMART_EVENT_HEALT_PCT = 2, //1 // HPMin%, HPMax%, RepeatMin, RepeatMax SMART_EVENT_MANA_PCT = 3, //1 // ManaMin%, ManaMax%, RepeatMin, RepeatMax SMART_EVENT_AGGRO = 4, //1 // NONE - SMART_EVENT_KILL = 5, //1 // CooldownMin0, CooldownMax1,playerOnly2,else creature entry3 + SMART_EVENT_KILL = 5, //1 // CooldownMin0, CooldownMax1, playerOnly2, else creature entry3 SMART_EVENT_DEATH = 6, //1 // NONE SMART_EVENT_EVADE = 7, //1 // NONE SMART_EVENT_SPELLHIT = 8, //1 // SpellID, School, CooldownMin, CooldownMax SMART_EVENT_RANGE = 9, //1 // MinDist, MaxDist, RepeatMin, RepeatMax SMART_EVENT_OOC_LOS = 10, //1 // NoHostile, MaxRnage, CooldownMin, CooldownMax - SMART_EVENT_RESPAWN = 11, //1 // type, MapId,ZoneId + SMART_EVENT_RESPAWN = 11, //1 // type, MapId, ZoneId SMART_EVENT_TARGET_HEALTH_PCT = 12, //1 // HPMin%, HPMax%, RepeatMin, RepeatMax SMART_EVENT_TARGET_CASTING = 13, //1 // RepeatMin, RepeatMax SMART_EVENT_FRIENDLY_HEALTH = 14, //1 // HPDeficit, Radius, RepeatMin, RepeatMax @@ -105,7 +105,7 @@ enum SMART_EVENT SMART_EVENT_ACCEPTED_QUEST = 19, //1 // QuestID(0any) SMART_EVENT_REWARD_QUEST = 20, //1 // QuestID(0any) SMART_EVENT_REACHED_HOME = 21, //1 // NONE - SMART_EVENT_RECEIVE_EMOTE = 22, //1 // EmoteId, CooldownMin, CooldownMax, condition, val1,val2,val3 + SMART_EVENT_RECEIVE_EMOTE = 22, //1 // EmoteId, CooldownMin, CooldownMax, condition, val1, val2, val3 SMART_EVENT_HAS_AURA = 23, //1 // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 RepeatMin, RepeatMax SMART_EVENT_TARGET_BUFFED = 24, //1 // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 RepeatMin, RepeatMax SMART_EVENT_RESET = 25, //1 // Called after combat, when the creature respawn and spawn. @@ -370,7 +370,7 @@ enum SMART_ACTION SMART_ACTION_ACTIVATE_GOBJECT = 9, // SMART_ACTION_RANDOM_EMOTE = 10, // EmoteId1, EmoteId2, EmoteId3... SMART_ACTION_CAST = 11, // SpellId, CastFlags - SMART_ACTION_SUMMON_CREATURE = 12, // CreatureID,summonType, duration in ms, storageID, attackInvoker, + SMART_ACTION_SUMMON_CREATURE = 12, // CreatureID, summonType, duration in ms, storageID, attackInvoker, SMART_ACTION_THREAT_SINGLE_PCT = 13, // Threat% SMART_ACTION_THREAT_ALL_PCT = 14, // Threat% SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS = 15, // QuestID @@ -387,7 +387,7 @@ enum SMART_ACTION SMART_ACTION_CALL_GROUPEVENTHAPPENS = 26, // QuestID SMART_ACTION_CALL_CASTEDCREATUREORGO = 27, // CreatureId, SpellId SMART_ACTION_REMOVEAURASFROMSPELL = 28, // Spellid - SMART_ACTION_FOLLOW = 29, // Distance, Angle, EndCreatureEntry, credit, creditType (0monsterkill,1event) + SMART_ACTION_FOLLOW = 29, // Distance, Angle, EndCreatureEntry, credit, creditType (0monsterkill, 1event) SMART_ACTION_RANDOM_PHASE = 30, // PhaseId1, PhaseId2, PhaseId3... SMART_ACTION_RANDOM_PHASE_RANGE = 31, // PhaseMin, PhaseMax SMART_ACTION_RESET_GOBJECT = 32, // @@ -398,7 +398,7 @@ enum SMART_ACTION SMART_ACTION_DIE = 37, // No Params SMART_ACTION_SET_IN_COMBAT_WITH_ZONE = 38, // No Params SMART_ACTION_CALL_FOR_HELP = 39, // Radius - SMART_ACTION_SET_SHEATH = 40, // Sheath (0-unarmed,1-melee,2-ranged) + SMART_ACTION_SET_SHEATH = 40, // Sheath (0-unarmed, 1-melee, 2-ranged) SMART_ACTION_FORCE_DESPAWN = 41, // timer SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue(+pct, -flat) SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL = 43, // Creature_template entry(param1) OR ModelId (param2) (or 0 for both to unmount) @@ -431,7 +431,7 @@ enum SMART_ACTION SMART_ACTION_PLAYMOVIE = 68, // entry SMART_ACTION_MOVE_TO_POS = 69, // xyz SMART_ACTION_RESPAWN_TARGET = 70, // - SMART_ACTION_EQUIP = 71, // entry, slotmask slot1,slot2,slot3 ,only slots with mask set will be sent to client, bits are 1,2,4, leaving mask 0 is defaulted to mask 7 (send all), slots1-3 are only used if no entry is set + SMART_ACTION_EQUIP = 71, // entry, slotmask slot1, slot2, slot3 , only slots with mask set will be sent to client, bits are 1, 2, 4, leaving mask 0 is defaulted to mask 7 (send all), slots1-3 are only used if no entry is set SMART_ACTION_CLOSE_GOSSIP = 72, // none SMART_ACTION_TRIGGER_TIMED_EVENT = 73, // id(>1) SMART_ACTION_REMOVE_TIMED_EVENT = 74, // id(>1) @@ -903,7 +903,7 @@ struct SmartTarget raw.param3 = p3; } SMARTAI_TARGETS type; - float x,y,z,o; + float x, y, z, o; union { struct @@ -993,16 +993,16 @@ enum eSmartAI enum SmartScriptType { - SMART_SCRIPT_TYPE_CREATURE = 0,//done - SMART_SCRIPT_TYPE_GAMEOBJECT = 1,//done - SMART_SCRIPT_TYPE_AREATRIGGER = 2,//done - SMART_SCRIPT_TYPE_EVENT = 3,// - SMART_SCRIPT_TYPE_GOSSIP = 4,// - SMART_SCRIPT_TYPE_QUEST = 5,// - SMART_SCRIPT_TYPE_SPELL = 6,// - SMART_SCRIPT_TYPE_TRANSPORT = 7,// - SMART_SCRIPT_TYPE_INSTANCE = 8,// - SMART_SCRIPT_TYPE_TIMED_ACTIONLIST = 9,// + SMART_SCRIPT_TYPE_CREATURE = 0, //done + SMART_SCRIPT_TYPE_GAMEOBJECT = 1, //done + SMART_SCRIPT_TYPE_AREATRIGGER = 2, //done + SMART_SCRIPT_TYPE_EVENT = 3, // + SMART_SCRIPT_TYPE_GOSSIP = 4, // + SMART_SCRIPT_TYPE_QUEST = 5, // + SMART_SCRIPT_TYPE_SPELL = 6, // + SMART_SCRIPT_TYPE_TRANSPORT = 7, // + SMART_SCRIPT_TYPE_INSTANCE = 8, // + SMART_SCRIPT_TYPE_TIMED_ACTIONLIST = 9, // SMART_SCRIPT_TYPE_MAX = 10 }; diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index cf1fb265c30..614400af21f 100755 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -39,8 +39,8 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass return AOR_NAME_ALREDY_EXIST; // username does already exist } - LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()); - LoginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL"); + LoginDatabase.PExecute("INSERT INTO account(username, sha_pass_hash, joindate) VALUES('%s', '%s', NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()); + LoginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist, account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL"); return AOR_OK; // everything's fine } @@ -52,7 +52,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid) return AOR_NAME_NOT_EXIST; // account doesn't exist // existed characters list - result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'",accid); + result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'", accid); if (result) { do @@ -110,7 +110,7 @@ AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string safe_new_uname = new_uname; LoginDatabase.escape_string(safe_new_uname); - LoginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%d'", safe_new_uname.c_str(), + LoginDatabase.PExecute("UPDATE account SET v='0', s='0', username='%s', sha_pass_hash='%s' WHERE id='%d'", safe_new_uname.c_str(), CalculateShaPassHash(new_uname, new_passwd).c_str(), accid); return AOR_OK; @@ -221,7 +221,7 @@ bool AccountMgr::normalizeString(std::string& utf8str) wchar_t wstr_buf[MAX_ACCOUNT_STR+1]; size_t wstr_len = MAX_ACCOUNT_STR; - if (!Utf8toWStr(utf8str,wstr_buf,wstr_len)) + if (!Utf8toWStr(utf8str, wstr_buf, wstr_len)) return false; #ifdef _MSC_VER #pragma warning(disable: 4996) @@ -231,7 +231,7 @@ bool AccountMgr::normalizeString(std::string& utf8str) #pragma warning(default: 4996) #endif - return WStrToUtf8(wstr_buf,wstr_len,utf8str); + return WStrToUtf8(wstr_buf, wstr_len, utf8str); } std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password) diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 1c12b88ab3d..4a8b2cf14aa 100755 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -48,7 +48,7 @@ namespace Trinity : i_player(pl), i_msgtype(msgtype), i_textId(textId), i_achievementId(ach_id) {} void operator()(WorldPacket& data, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(i_textId,loc_idx); + char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); data << uint8(i_msgtype); data << uint32(LANG_UNIVERSAL); @@ -73,7 +73,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) { if (dataType >= MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE) { - sLog->outErrorDb("Table `achievement_criteria_data` for criteria (Entry: %u) has wrong data type (%u), ignored.", criteria->ID,dataType); + sLog->outErrorDb("Table `achievement_criteria_data` for criteria (Entry: %u) has wrong data type (%u), ignored.", criteria->ID, dataType); return false; } @@ -113,7 +113,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (!creature.id || !sObjectMgr->GetCreatureTemplate(creature.id)) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_CREATURE (%u) has non-existing creature id in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,creature.id); + criteria->ID, criteria->requiredType, dataType, creature.id); return false; } return true; @@ -121,19 +121,19 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (!classRace.class_id && !classRace.race_id) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_PLAYER_CLASS_RACE (%u) must not have 0 in either value field, ignored.", - criteria->ID, criteria->requiredType,dataType); + criteria->ID, criteria->requiredType, dataType); return false; } if (classRace.class_id && ((1 << (classRace.class_id-1)) & CLASSMASK_ALL_PLAYABLE) == 0) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_CREATURE (%u) has non-existing class in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,classRace.class_id); + criteria->ID, criteria->requiredType, dataType, classRace.class_id); return false; } if (classRace.race_id && ((1 << (classRace.race_id-1)) & RACEMASK_ALL_PLAYABLE) == 0) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_CREATURE (%u) has non-existing race in value2 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,classRace.race_id); + criteria->ID, criteria->requiredType, dataType, classRace.race_id); return false; } return true; @@ -141,7 +141,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (health.percent < 1 || health.percent > 100) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_PLAYER_LESS_HEALTH (%u) has wrong percent value in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,health.percent); + criteria->ID, criteria->requiredType, dataType, health.percent); return false; } return true; @@ -149,7 +149,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (player_dead.own_team_flag > 1) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_DEAD (%u) has wrong boolean value1 (%u).", - criteria->ID, criteria->requiredType,dataType,player_dead.own_team_flag); + criteria->ID, criteria->requiredType, dataType, player_dead.own_team_flag); return false; } return true; @@ -160,19 +160,19 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (!spellEntry) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type %s (%u) has wrong spell id in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,(dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"),dataType,aura.spell_id); + criteria->ID, criteria->requiredType, (dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"), dataType, aura.spell_id); return false; } if (aura.effect_idx >= 3) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type %s (%u) has wrong spell effect index in value2 (%u), ignored.", - criteria->ID, criteria->requiredType,(dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"),dataType,aura.effect_idx); + criteria->ID, criteria->requiredType, (dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"), dataType, aura.effect_idx); return false; } if (!spellEntry->EffectApplyAuraName[aura.effect_idx]) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type %s (%u) has non-aura spell effect (ID: %u Effect: %u), ignores.", - criteria->ID, criteria->requiredType,(dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"),dataType,aura.spell_id,aura.effect_idx); + criteria->ID, criteria->requiredType, (dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA?"ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA":"ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA"), dataType, aura.spell_id, aura.effect_idx); return false; } return true; @@ -181,7 +181,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (!GetAreaEntryByAreaID(area.id)) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AREA (%u) has wrong area id in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,area.id); + criteria->ID, criteria->requiredType, dataType, area.id); return false; } return true; @@ -189,7 +189,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (level.minlevel > STRONG_MAX_LEVEL) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL (%u) has wrong minlevel in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,level.minlevel); + criteria->ID, criteria->requiredType, dataType, level.minlevel); return false; } return true; @@ -197,7 +197,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (gender.gender > GENDER_NONE) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER (%u) has wrong gender in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,gender.gender); + criteria->ID, criteria->requiredType, dataType, gender.gender); return false; } return true; @@ -213,7 +213,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (difficulty.difficulty >= MAX_DIFFICULTY) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_DIFFICULTY (%u) has wrong difficulty in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,difficulty.difficulty); + criteria->ID, criteria->requiredType, dataType, difficulty.difficulty); return false; } return true; @@ -221,7 +221,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (map_players.maxcount <= 0) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_PLAYER_COUNT (%u) has wrong max players count in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,map_players.maxcount); + criteria->ID, criteria->requiredType, dataType, map_players.maxcount); return false; } return true; @@ -229,7 +229,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (team.team != ALLIANCE && team.team != HORDE) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_T_TEAM (%u) has unknown team in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,team.team); + criteria->ID, criteria->requiredType, dataType, team.team); return false; } return true; @@ -237,7 +237,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (drunk.state >= MAX_DRUNKEN) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK (%u) has unknown drunken state in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,drunk.state); + criteria->ID, criteria->requiredType, dataType, drunk.state); return false; } return true; @@ -245,7 +245,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (!sHolidaysStore.LookupEntry(holiday.id)) { sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_HOLIDAY (%u) has unknown holiday in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,holiday.id); + criteria->ID, criteria->requiredType, dataType, holiday.id); return false; } return true; @@ -255,7 +255,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) if (equipped_item.item_quality >= MAX_ITEM_QUALITY) { sLog->outErrorDb("Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_S_EQUIPED_ITEM (%u) has unknown quality state in value1 (%u), ignored.", - criteria->ID, criteria->requiredType,dataType,equipped_item.item_quality); + criteria->ID, criteria->requiredType, dataType, equipped_item.item_quality); return false; } return true; @@ -268,7 +268,7 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) } return true; default: - sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) has data for non-supported data type (%u), ignored.", criteria->ID, criteria->requiredType,dataType); + sLog->outErrorDb("Table `achievement_criteria_data` (Entry: %u Type: %u) has data for non-supported data type (%u), ignored.", criteria->ID, criteria->requiredType, dataType); return false; } } @@ -303,15 +303,15 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un return (player->GetTeam() == source->GetTeam()) == (player_dead.own_team_flag != 0); return false; case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AURA: - return source->HasAuraEffect(aura.spell_id,aura.effect_idx); + return source->HasAuraEffect(aura.spell_id, aura.effect_idx); case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AREA: { - uint32 zone_id,area_id; - source->GetZoneAndAreaId(zone_id,area_id); + uint32 zone_id, area_id; + source->GetZoneAndAreaId(zone_id, area_id); return area.id == zone_id || area.id == area_id; } case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA: - return target && target->HasAuraEffect(aura.spell_id,aura.effect_idx); + return target && target->HasAuraEffect(aura.spell_id, aura.effect_idx); case ACHIEVEMENT_CRITERIA_DATA_TYPE_VALUE: return miscvalue1 >= value.minvalue; case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL: @@ -341,7 +341,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un Battleground* bg = source->GetBattleground(); if (!bg) return false; - return bg->IsTeamScoreInRange(source->GetTeam() == ALLIANCE ? HORDE : ALLIANCE,bg_loss_team_score.min_score,bg_loss_team_score.max_score); + return bg->IsTeamScoreInRange(source->GetTeam() == ALLIANCE ? HORDE : ALLIANCE, bg_loss_team_score.min_score, bg_loss_team_score.max_score); } case ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT: { @@ -400,14 +400,14 @@ void AchievementMgr::Reset() { for (CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter != m_completedAchievements.end(); ++iter) { - WorldPacket data(SMSG_ACHIEVEMENT_DELETED,4); + WorldPacket data(SMSG_ACHIEVEMENT_DELETED, 4); data << uint32(iter->first); m_player->SendDirectMessage(&data); } for (CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter != m_criteriaProgress.end(); ++iter) { - WorldPacket data(SMSG_CRITERIA_DELETED,4); + WorldPacket data(SMSG_CRITERIA_DELETED, 4); data << uint32(iter->first); m_player->SendDirectMessage(&data); } @@ -454,8 +454,8 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin void AchievementMgr::DeleteFromDB(uint32 lowguid) { SQLTransaction trans = CharacterDatabase.BeginTransaction(); - trans->PAppend("DELETE FROM character_achievement WHERE guid = %u",lowguid); - trans->PAppend("DELETE FROM character_achievement_progress WHERE guid = %u",lowguid); + trans->PAppend("DELETE FROM character_achievement WHERE guid = %u", lowguid); + trans->PAppend("DELETE FROM character_achievement_progress WHERE guid = %u", lowguid); CharacterDatabase.CommitTransaction(trans); } @@ -606,8 +606,8 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ if (!criteria) { // we will remove not existed criteria for all characters - sLog->outError("Non-existing achievement criteria %u data removed from table `character_achievement_progress`.",id); - CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id); + sLog->outError("Non-existing achievement criteria %u data removed from table `character_achievement_progress`.", id); + CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u", id); continue; } @@ -637,9 +637,9 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) if (Guild* guild = sObjectMgr->GetGuildById(GetPlayer()->GetGuildId())) { - Trinity::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID); + Trinity::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); Trinity::LocalizedPacketDo<Trinity::AchievementChatBuilder> say_do(say_builder); - guild->BroadcastWorker(say_do,GetPlayer()); + guild->BroadcastWorker(say_do, GetPlayer()); } if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL|ACHIEVEMENT_FLAG_REALM_FIRST_REACH)) @@ -708,7 +708,7 @@ void AchievementMgr::CheckAllAchievementCriteria() static const uint32 achievIdByArenaSlot[MAX_ARENA_SLOT] = { 1057, 1107, 1108 }; static const uint32 achievIdForDungeon[][4] = { - // ach_cr_id,is_dungeon,is_raid,is_heroic_dungeon + // ach_cr_id, is_dungeon, is_raid, is_heroic_dungeon { 321, true, true, true }, { 916, false, true, false }, { 917, false, true, false }, @@ -798,7 +798,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; SetCriteriaProgress(achievementCriteria, miscValue1, PROGRESS_ACCUMULATE); @@ -814,7 +814,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; SetCriteriaProgress(achievementCriteria, miscValue2, PROGRESS_ACCUMULATE); @@ -1008,7 +1008,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; // miscvalue1 is the ingame fallheight*100 as stored in dbc @@ -1050,7 +1050,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; break; } @@ -1072,7 +1072,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if (!data) continue; - if (!data->Meets(GetPlayer(),unit)) + if (!data->Meets(GetPlayer(), unit)) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); @@ -1089,7 +1089,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if (!data) continue; - if (!data->Meets(GetPlayer(),unit)) + if (!data->Meets(GetPlayer(), unit)) continue; SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE); @@ -1116,7 +1116,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; } @@ -1139,7 +1139,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit,miscValue1)) + if (!data || !data->Meets(GetPlayer(), unit, miscValue1)) { // reset the progress as we have a win without the requirement. SetCriteriaProgress(achievementCriteria, 0); @@ -1275,7 +1275,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { // those requirements couldn't be found in the dbc AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria); - if (!data || !data->Meets(GetPlayer(),unit)) + if (!data || !data->Meets(GetPlayer(), unit)) continue; } @@ -1359,7 +1359,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui if (!data) continue; - if (!data->Meets(GetPlayer(),unit)) + if (!data->Meets(GetPlayer(), unit)) continue; } @@ -1763,7 +1763,7 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry) { AchievementCriteriaEntry const* criteria = *itr; - bool completed = IsCompletedCriteria(criteria,entry); + bool completed = IsCompletedCriteria(criteria, entry); // found an uncompleted criteria, but DONT return false yet - there might be a completed criteria with ACHIEVEMENT_CRITERIA_COMPLETE_FLAG_ALL if (completed) @@ -1867,7 +1867,7 @@ void AchievementMgr::RemoveCriteriaProgress(const AchievementCriteriaEntry *entr if (criteriaProgress == m_criteriaProgress.end()) return; - WorldPacket data(SMSG_CRITERIA_DELETED,4); + WorldPacket data(SMSG_CRITERIA_DELETED, 4); data << uint32(entry->ID); m_player->SendDirectMessage(&data); @@ -1978,7 +1978,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement, b // mail if (reward->sender) { - Item* item = reward->itemId ? Item::CreateItem(reward->itemId,1,GetPlayer ()) : NULL; + Item* item = reward->itemId ? Item::CreateItem(reward->itemId, 1, GetPlayer ()) : NULL; int loc_idx = GetPlayer()->GetSession()->GetSessionDbLocaleIndex(); @@ -2128,7 +2128,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() m_AchievementCriteriasByTimedType[criteria->timedType].push_back(criteria); } - sLog->outString(">> Loaded %lu achievement criteria in %u ms",(unsigned long)m_AchievementCriteriasByType->size(), GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(">> Loaded %lu achievement criteria in %u ms", (unsigned long)m_AchievementCriteriasByType->size(), GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); } @@ -2156,7 +2156,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList() ++count; } - sLog->outString(">> Loaded %u achievement references in %u ms",count, GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(">> Loaded %u achievement references in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); } @@ -2323,15 +2323,15 @@ void AchievementGlobalMgr::LoadCompletedAchievements() if (!sAchievementStore.LookupEntry(achievement_id)) { // we will remove not existed achievement for all characters - sLog->outError("Non-existing achievement %u data removed from table `character_achievement`.",achievement_id); - CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u",achievement_id); + sLog->outError("Non-existing achievement %u data removed from table `character_achievement`.", achievement_id); + CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u", achievement_id); continue; } m_allCompletedAchievements.insert(achievement_id); } while (result->NextRow()); - sLog->outString(">> Loaded %lu completed achievements in %u ms",(unsigned long)m_allCompletedAchievements.size(), GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(">> Loaded %lu completed achievements in %u ms", (unsigned long)m_allCompletedAchievements.size(), GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); } @@ -2449,8 +2449,8 @@ void AchievementGlobalMgr::LoadRewardLocales() m_achievementRewardLocales.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,subject_loc1,text_loc1,subject_loc2,text_loc2,subject_loc3,text_loc3,subject_loc4,text_loc4," - "subject_loc5,text_loc5,subject_loc6,text_loc6,subject_loc7,text_loc7,subject_loc8,text_loc8" + QueryResult result = WorldDatabase.Query("SELECT entry, subject_loc1, text_loc1, subject_loc2, text_loc2, subject_loc3, text_loc3, subject_loc4, text_loc4, " + "subject_loc5, text_loc5, subject_loc6, text_loc6, subject_loc7, text_loc7, subject_loc8, text_loc8" " FROM locales_achievement_reward"); if (!result) diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 92a4d2e3b74..3456e31d86c 100755 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -30,8 +30,8 @@ typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList; typedef std::list<AchievementEntry const*> AchievementEntryList; -typedef std::map<uint32,AchievementCriteriaEntryList> AchievementCriteriaListByAchievement; -typedef std::map<uint32,AchievementEntryList> AchievementListByReferencedId; +typedef std::map<uint32, AchievementCriteriaEntryList> AchievementCriteriaListByAchievement; +typedef std::map<uint32, AchievementEntryList> AchievementListByReferencedId; struct CriteriaProgress { @@ -52,17 +52,17 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA = 7, // spell_id effect_idx ACHIEVEMENT_CRITERIA_DATA_TYPE_VALUE = 8, // minvalue value provided with achievement update must be not less that limit ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL = 9, // minlevel minlevel of target - ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER = 10,// gender 0=male; 1=female - ACHIEVEMENT_CRITERIA_DATA_TYPE_SCRIPT = 11,// scripted requirement - ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_DIFFICULTY = 12,// difficulty normal/heroic difficulty for current event map - ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_PLAYER_COUNT = 13,// count "with less than %u people in the zone" - ACHIEVEMENT_CRITERIA_DATA_TYPE_T_TEAM = 14,// team HORDE(67), ALLIANCE(469) - ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK = 15,// drunken_state 0 (enum DrunkenState) of player - ACHIEVEMENT_CRITERIA_DATA_TYPE_HOLIDAY = 16,// holiday_id 0 event in holiday time - ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE = 17,// min_score max_score player's team win bg and opposition team have team score in range - ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT = 18,// 0 0 maker instance script call for check current criteria requirements fit - ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM = 19,// item_level item_quality for equipped item in slot to check item level and quality - ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_ID = 20,// map_id 0 player must be on map with id in map_id + ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER = 10, // gender 0=male; 1=female + ACHIEVEMENT_CRITERIA_DATA_TYPE_SCRIPT = 11, // scripted requirement + ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_DIFFICULTY = 12, // difficulty normal/heroic difficulty for current event map + ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_PLAYER_COUNT = 13, // count "with less than %u people in the zone" + ACHIEVEMENT_CRITERIA_DATA_TYPE_T_TEAM = 14, // team HORDE(67), ALLIANCE(469) + ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK = 15, // drunken_state 0 (enum DrunkenState) of player + ACHIEVEMENT_CRITERIA_DATA_TYPE_HOLIDAY = 16, // holiday_id 0 event in holiday time + ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE = 17, // min_score max_score player's team win bg and opposition team have team score in range + ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT = 18, // 0 0 maker instance script call for check current criteria requirements fit + ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM = 19, // item_level item_quality for equipped item in slot to check item level and quality + ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_ID = 20, // map_id 0 player must be on map with id in map_id }; #define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 21 // maximum value in AchievementCriteriaDataType enum @@ -207,7 +207,7 @@ struct AchievementCriteriaDataSet Storage storage; }; -typedef std::map<uint32,AchievementCriteriaDataSet> AchievementCriteriaDataMap; +typedef std::map<uint32, AchievementCriteriaDataSet> AchievementCriteriaDataMap; struct AchievementReward { @@ -218,7 +218,7 @@ struct AchievementReward std::string text; }; -typedef std::map<uint32,AchievementReward> AchievementRewards; +typedef std::map<uint32, AchievementReward> AchievementRewards; struct AchievementRewardLocale { @@ -226,7 +226,7 @@ struct AchievementRewardLocale StringVector text; }; -typedef std::map<uint32,AchievementRewardLocale> AchievementRewardLocales; +typedef std::map<uint32, AchievementRewardLocale> AchievementRewardLocales; struct CompletedAchievementData { diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index ef3db81758c..ffffeaeac43 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -114,20 +114,20 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction, SQLTransaction& if (bidder_security > SEC_PLAYER) // not do redundant DB requests { - if (!sObjectMgr->GetPlayerNameByGUID(bidder_guid,bidder_name)) + if (!sObjectMgr->GetPlayerNameByGUID(bidder_guid, bidder_name)) bidder_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); } } if (bidder_security > SEC_PLAYER) { std::string owner_name; - if (!sObjectMgr->GetPlayerNameByGUID(auction->owner,owner_name)) + if (!sObjectMgr->GetPlayerNameByGUID(auction->owner, owner_name)) owner_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); uint32 owner_accid = sObjectMgr->GetPlayerAccountIdByGUID(auction->owner); - sLog->outCommand(bidder_accId,"GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)", - bidder_name.c_str(),bidder_accId,pItem->GetTemplate()->Name1.c_str(),pItem->GetEntry(),pItem->GetCount(),auction->bid,owner_name.c_str(),owner_accid); + sLog->outCommand(bidder_accId, "GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)", + bidder_name.c_str(), bidder_accId, pItem->GetTemplate()->Name1.c_str(), pItem->GetEntry(), pItem->GetCount(), auction->bid, owner_name.c_str(), owner_accid); } } @@ -159,7 +159,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction, SQLTransaction& MailDraft(msgAuctionWonSubject.str(), msgAuctionWonBody.str()) .AddItem(pItem) - .SendMailTo(trans, MailReceiver(bidder,auction->bidder), auction, MAIL_CHECK_MASK_COPIED); + .SendMailTo(trans, MailReceiver(bidder, auction->bidder), auction, MAIL_CHECK_MASK_COPIED); } } @@ -188,7 +188,7 @@ void AuctionHouseMgr::SendAuctionSalePendingMail(AuctionEntry * auction, SQLTran sLog->outDebug(LOG_FILTER_AUCTIONHOUSE, "AuctionSalePending body string : %s", msgAuctionSalePendingBody.str().c_str()); MailDraft(msgAuctionSalePendingSubject.str(), msgAuctionSalePendingBody.str()) - .SendMailTo(trans, MailReceiver(owner,auction->owner), auction, MAIL_CHECK_MASK_COPIED); + .SendMailTo(trans, MailReceiver(owner, auction->owner), auction, MAIL_CHECK_MASK_COPIED); } } @@ -226,7 +226,7 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction, SQLTrans } MailDraft(msgAuctionSuccessfulSubject.str(), auctionSuccessfulBody.str()) .AddMoney(profit) - .SendMailTo(trans, MailReceiver(owner,auction->owner), auction, MAIL_CHECK_MASK_COPIED, sWorld->getIntConfig(CONFIG_MAIL_DELIVERY_DELAY)); + .SendMailTo(trans, MailReceiver(owner, auction->owner), auction, MAIL_CHECK_MASK_COPIED, sWorld->getIntConfig(CONFIG_MAIL_DELIVERY_DELAY)); } } @@ -252,14 +252,14 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction, SQLTransact MailDraft(subject.str(), "") // TODO: fix body .AddItem(pItem) - .SendMailTo(trans, MailReceiver(owner,auction->owner), auction, MAIL_CHECK_MASK_COPIED, 0); + .SendMailTo(trans, MailReceiver(owner, auction->owner), auction, MAIL_CHECK_MASK_COPIED, 0); } } //this function sends mail to old bidder void AuctionHouseMgr::SendAuctionOutbiddedMail(AuctionEntry *auction, uint32 newPrice, Player* newBidder, SQLTransaction& trans) { - uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder,0, HIGHGUID_PLAYER); + uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER); Player *oldBidder = sObjectMgr->GetPlayer(oldBidder_guid); uint32 oldBidder_accId = 0; @@ -331,7 +331,7 @@ void AuctionHouseMgr::LoadAuctionItems() ItemTemplate const *proto = sObjectMgr->GetItemTemplate(item_template); if (!proto) { - sLog->outError("AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid,item_template); + sLog->outError("AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid, item_template); continue; } diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index dbb99218b1d..b09aa8d101a 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -777,7 +777,7 @@ void Battleground::EndBattleground(uint32 winner) if (member) plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, member->PersonalRating); - winner_arena_team->MemberWon(plr,loser_matchmaker_rating, winner_change); + winner_arena_team->MemberWon(plr, loser_matchmaker_rating, winner_change); } else { @@ -1081,16 +1081,16 @@ void Battleground::AddPlayer(Player* plr) if (team == ALLIANCE) // gold { if (plr->GetTeam() == HORDE) - plr->CastSpell(plr, SPELL_HORDE_GOLD_FLAG,true); + plr->CastSpell(plr, SPELL_HORDE_GOLD_FLAG, true); else - plr->CastSpell(plr, SPELL_ALLIANCE_GOLD_FLAG,true); + plr->CastSpell(plr, SPELL_ALLIANCE_GOLD_FLAG, true); } else // green { if (plr->GetTeam() == HORDE) - plr->CastSpell(plr, SPELL_HORDE_GREEN_FLAG,true); + plr->CastSpell(plr, SPELL_HORDE_GREEN_FLAG, true); else - plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG,true); + plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG, true); } plr->DestroyConjuredItems(true); diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 237c427b04e..2dea23a573d 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -683,7 +683,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds() uint32 scriptId = 0; // 0 1 2 3 4 5 6 7 8 9 10 - QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam,MaxPlayersPerTeam,MinLvl,MaxLvl,AllianceStartLoc,AllianceStartO,HordeStartLoc,HordeStartO,Weight,ScriptName FROM battleground_template"); + QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, Weight, ScriptName FROM battleground_template"); if (!result) { @@ -911,7 +911,7 @@ void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket *data, const uint6 if (Battleground* bgTemplate = sBattlegroundMgr->GetBattlegroundTemplate(bgTypeId)) { // expected bracket entry - if (PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgTemplate->GetMapId(),plr->getLevel())) + if (PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgTemplate->GetMapId(), plr->getLevel())) { uint32 count = 0; BattlegroundBracketId bracketId = bracketEntry->GetBracketId(); @@ -943,7 +943,7 @@ void BattlegroundMgr::SendToBattleground(Player *pl, uint32 instanceId, Battlegr } else { - sLog->outError("player %u is trying to port to non-existent bg instance %u",pl->GetGUIDLow(), instanceId); + sLog->outError("player %u is trying to port to non-existent bg instance %u", pl->GetGUIDLow(), instanceId); } } @@ -1143,7 +1143,7 @@ void BattlegroundMgr::LoadBattleMastersEntry() uint32 bgTypeId = fields[1].GetUInt32(); if (!sBattlemasterListStore.LookupEntry(bgTypeId)) { - sLog->outErrorDb("Table `battlemaster_entry` contain entry %u for not existed battleground type %u, ignored.",entry,bgTypeId); + sLog->outErrorDb("Table `battlemaster_entry` contain entry %u for not existed battleground type %u, ignored.", entry, bgTypeId); continue; } diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 9611fb00ea6..eef8c941f8a 100755 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -443,7 +443,7 @@ bool BattlegroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, Battleground * b ginfo->RemoveInviteTime = getMSTime() + INVITE_ACCEPT_WAIT_TIME; // loop through the players - for (std::map<uint64,PlayerQueueInfo*>::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr) + for (std::map<uint64, PlayerQueueInfo*>::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr) { // get the player Player* plr = sObjectMgr->GetPlayer(itr->first); @@ -471,7 +471,7 @@ bool BattlegroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, Battleground * b uint32 queueSlot = plr->GetBattlegroundQueueIndex(bgQueueTypeId); - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: invited plr %s (%u) to BG instance %u queueindex %u bgtype %u, I can't help it if they don't press the enter battle button.",plr->GetName(),plr->GetGUIDLow(),bg->GetInstanceID(),queueSlot,bg->GetTypeID()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: invited plr %s (%u) to BG instance %u queueindex %u bgtype %u, I can't help it if they don't press the enter battle button.", plr->GetName(), plr->GetGUIDLow(), bg->GetInstanceID(), queueSlot, bg->GetTypeID()); // send status packet sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME, 0, ginfo->ArenaType); @@ -783,7 +783,7 @@ void BattlegroundQueue::Update(BattlegroundTypeId bgTypeId, BattlegroundBracketI return; } - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketById(bg_template->GetMapId(),bracket_id); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketById(bg_template->GetMapId(), bracket_id); if (!bracketEntry) { sLog->outError("Battleground: Update: bg bracket entry not found for map %u bracket id %u", bg_template->GetMapId(), bracket_id); @@ -1080,7 +1080,7 @@ bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) BattlegroundQueue &bgQueue = sBattlegroundMgr->m_BattlegroundQueues[m_BgQueueTypeId]; if (bgQueue.IsPlayerInvited(m_PlayerGuid, m_BgInstanceGUID, m_RemoveTime)) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: removing player %u from bg queue for instance %u because of not pressing enter battle in time.",plr->GetGUIDLow(),m_BgInstanceGUID); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: removing player %u from bg queue for instance %u because of not pressing enter battle in time.", plr->GetGUIDLow(), m_BgInstanceGUID); plr->RemoveBattlegroundQueueId(m_BgQueueTypeId); bgQueue.RemovePlayer(m_PlayerGuid, true); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 92cc37dd28c..6b56f2a14a6 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -94,19 +94,19 @@ void BattlegroundAB::Update(uint32 diff) // create new occupied banner _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true); _SendNodeUpdate(node); - _NodeOccupied(node,(teamIndex == 0) ? ALLIANCE:HORDE); + _NodeOccupied(node, (teamIndex == 0) ? ALLIANCE:HORDE); // Message to chatlog if (teamIndex == 0) { // FIXME: team and node names not localized - SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_ALLIANCE,NULL,LANG_BG_AB_ALLY,_GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_AB_ALLY, _GetNodeNameId(node)); PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_ALLIANCE); } else { // FIXME: team and node names not localized - SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_HORDE,NULL,LANG_BG_AB_HORDE,_GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_AB_HORDE, _GetNodeNameId(node)); PlaySoundToAll(BG_AB_SOUND_NODE_CAPTURED_HORDE); } } @@ -187,8 +187,8 @@ void BattlegroundAB::StartingEventCloseDoors() SpawnBGObject(BG_AB_OBJECT_GATE_H, RESPAWN_IMMEDIATELY); // Starting base spirit guides - _NodeOccupied(BG_AB_SPIRIT_ALIANCE,ALLIANCE); - _NodeOccupied(BG_AB_SPIRIT_HORDE,HORDE); + _NodeOccupied(BG_AB_SPIRIT_ALIANCE, ALLIANCE); + _NodeOccupied(BG_AB_SPIRIT_HORDE, HORDE); } void BattlegroundAB::StartingEventOpenDoors() @@ -363,10 +363,10 @@ void BattlegroundAB::_SendNodeUpdate(uint8 node) UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_HORDE, horde); } -void BattlegroundAB::_NodeOccupied(uint8 node,Team team) +void BattlegroundAB::_NodeOccupied(uint8 node, Team team) { if (!AddSpiritGuide(node, BG_AB_SpiritGuidePos[node][0], BG_AB_SpiritGuidePos[node][1], BG_AB_SpiritGuidePos[node][2], BG_AB_SpiritGuidePos[node][3], team)) - sLog->outError("Failed to spawn spirit guide! point: %u, team: %u,", node, team); + sLog->outError("Failed to spawn spirit guide! point: %u, team: %u, ", node, team); uint8 capturedNodes = 0; for (uint8 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i) @@ -383,7 +383,7 @@ void BattlegroundAB::_NodeOccupied(uint8 node,Team team) return; Creature* trigger = GetBGCreature(node+7);//0-6 spirit guides if (!trigger) - trigger = AddCreature(WORLD_TRIGGER,node+7,team,BG_AB_NodePositions[node][0],BG_AB_NodePositions[node][1],BG_AB_NodePositions[node][2],BG_AB_NodePositions[node][3]); + trigger = AddCreature(WORLD_TRIGGER, node+7, team, BG_AB_NodePositions[node][0], BG_AB_NodePositions[node][1], BG_AB_NodePositions[node][2], BG_AB_NodePositions[node][3]); //add bonus honor aura trigger creature when node is accupied //cast bonus aura (+50% honor in 25yards) @@ -437,7 +437,7 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ uint8 node = BG_AB_NODE_STABLES; GameObject* obj=GetBgMap()->GetGameObject(m_BgObjects[node*8+7]); - while ((node < BG_AB_DYNAMIC_NODES_COUNT) && ((!obj) || (!source->IsWithinDistInMap(obj,10)))) + while ((node < BG_AB_DYNAMIC_NODES_COUNT) && ((!obj) || (!source->IsWithinDistInMap(obj, 10)))) { ++node; obj=GetBgMap()->GetGameObject(m_BgObjects[node*8+BG_AB_OBJECT_AURA_CONTESTED]); @@ -472,9 +472,9 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ // FIXME: team and node names not localized if (teamIndex == 0) - SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_AB_ALLY); + SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_AB_ALLY); else - SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_AB_HORDE); + SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_AB_HORDE); sound = BG_AB_SOUND_NODE_CLAIMED; } @@ -496,9 +496,9 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ // FIXME: node names not localized if (teamIndex == BG_TEAM_ALLIANCE) - SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); else - SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); } // If contested, change back to occupied else @@ -512,13 +512,13 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ _CreateBanner(node, BG_AB_NODE_TYPE_OCCUPIED, teamIndex, true); _SendNodeUpdate(node); m_NodeTimers[node] = 0; - _NodeOccupied(node,(teamIndex == BG_TEAM_ALLIANCE) ? ALLIANCE:HORDE); + _NodeOccupied(node, (teamIndex == BG_TEAM_ALLIANCE) ? ALLIANCE:HORDE); // FIXME: node names not localized if (teamIndex == BG_TEAM_ALLIANCE) - SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); else - SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); } sound = (teamIndex == BG_TEAM_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE; } @@ -538,9 +538,9 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ // FIXME: node names not localized if (teamIndex == BG_TEAM_ALLIANCE) - SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node)); else - SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED, CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node)); sound = (teamIndex == BG_TEAM_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE; } @@ -550,9 +550,9 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ { // FIXME: team and node names not localized if (teamIndex == BG_TEAM_ALLIANCE) - SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_AB_ALLY, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, LANG_BG_AB_ALLY, _GetNodeNameId(node)); else - SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN,CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_AB_HORDE, _GetNodeNameId(node)); + SendMessage2ToAll(LANG_BG_AB_NODE_TAKEN, CHAT_MSG_BG_SYSTEM_HORDE, NULL, LANG_BG_AB_HORDE, _GetNodeNameId(node)); } PlaySoundToAll(sound); } @@ -561,22 +561,22 @@ bool BattlegroundAB::SetupBattleground() { for (int i = 0 ; i < BG_AB_DYNAMIC_NODES_COUNT; ++i) { - if (!AddObject(BG_AB_OBJECT_BANNER_NEUTRAL + 8*i,BG_AB_OBJECTID_NODE_BANNER_0 + i,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_BANNER_CONT_A + 8*i,BG_AB_OBJECTID_BANNER_CONT_A,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_BANNER_CONT_H + 8*i,BG_AB_OBJECTID_BANNER_CONT_H,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_BANNER_ALLY + 8*i,BG_AB_OBJECTID_BANNER_A,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_BANNER_HORDE + 8*i,BG_AB_OBJECTID_BANNER_H,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_AURA_ALLY + 8*i,BG_AB_OBJECTID_AURA_A,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_AURA_HORDE + 8*i,BG_AB_OBJECTID_AURA_H,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AB_OBJECT_AURA_CONTESTED + 8*i,BG_AB_OBJECTID_AURA_C,BG_AB_NodePositions[i][0],BG_AB_NodePositions[i][1],BG_AB_NodePositions[i][2],BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2),RESPAWN_ONE_DAY) + if (!AddObject(BG_AB_OBJECT_BANNER_NEUTRAL + 8*i, BG_AB_OBJECTID_NODE_BANNER_0 + i, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_BANNER_CONT_A + 8*i, BG_AB_OBJECTID_BANNER_CONT_A, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_BANNER_CONT_H + 8*i, BG_AB_OBJECTID_BANNER_CONT_H, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_BANNER_ALLY + 8*i, BG_AB_OBJECTID_BANNER_A, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_BANNER_HORDE + 8*i, BG_AB_OBJECTID_BANNER_H, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_AURA_ALLY + 8*i, BG_AB_OBJECTID_AURA_A, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_AURA_HORDE + 8*i, BG_AB_OBJECTID_AURA_H, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AB_OBJECT_AURA_CONTESTED + 8*i, BG_AB_OBJECTID_AURA_C, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, sin(BG_AB_NodePositions[i][3]/2), cos(BG_AB_NodePositions[i][3]/2), RESPAWN_ONE_DAY) ) { sLog->outErrorDb("BatteGroundAB: Failed to spawn some object Battleground not created!"); return false; } } - if (!AddObject(BG_AB_OBJECT_GATE_A,BG_AB_OBJECTID_GATE_A,BG_AB_DoorPositions[0][0],BG_AB_DoorPositions[0][1],BG_AB_DoorPositions[0][2],BG_AB_DoorPositions[0][3],BG_AB_DoorPositions[0][4],BG_AB_DoorPositions[0][5],BG_AB_DoorPositions[0][6],BG_AB_DoorPositions[0][7],RESPAWN_IMMEDIATELY) - || !AddObject(BG_AB_OBJECT_GATE_H,BG_AB_OBJECTID_GATE_H,BG_AB_DoorPositions[1][0],BG_AB_DoorPositions[1][1],BG_AB_DoorPositions[1][2],BG_AB_DoorPositions[1][3],BG_AB_DoorPositions[1][4],BG_AB_DoorPositions[1][5],BG_AB_DoorPositions[1][6],BG_AB_DoorPositions[1][7],RESPAWN_IMMEDIATELY) + if (!AddObject(BG_AB_OBJECT_GATE_A, BG_AB_OBJECTID_GATE_A, BG_AB_DoorPositions[0][0], BG_AB_DoorPositions[0][1], BG_AB_DoorPositions[0][2], BG_AB_DoorPositions[0][3], BG_AB_DoorPositions[0][4], BG_AB_DoorPositions[0][5], BG_AB_DoorPositions[0][6], BG_AB_DoorPositions[0][7], RESPAWN_IMMEDIATELY) + || !AddObject(BG_AB_OBJECT_GATE_H, BG_AB_OBJECTID_GATE_H, BG_AB_DoorPositions[1][0], BG_AB_DoorPositions[1][1], BG_AB_DoorPositions[1][2], BG_AB_DoorPositions[1][3], BG_AB_DoorPositions[1][4], BG_AB_DoorPositions[1][5], BG_AB_DoorPositions[1][6], BG_AB_DoorPositions[1][7], RESPAWN_IMMEDIATELY) ) { sLog->outErrorDb("BatteGroundAB: Failed to spawn door object Battleground not created!"); @@ -698,7 +698,7 @@ void BattlegroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value Source->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE, AB_OBJECTIVE_DEFEND_BASE); break; default: - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); break; } } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index 6d8d25f5bd5..151b8009243 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -196,7 +196,7 @@ const float BG_AB_DoorPositions[2][8] = { {708.0903f, 708.4479f, -17.8342f, -2.391099f, 0.050291f, 0.015127f, 0.929217f, -0.365784f} }; -// Tick intervals and given points: case 0,1,2,3,4,5 captured nodes +// Tick intervals and given points: case 0, 1, 2, 3, 4, 5 captured nodes const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000}; const uint32 BG_AB_TickPoints[6] = {0, 10, 10, 10, 10, 30}; @@ -251,7 +251,7 @@ class BattlegroundAB : public Battleground void AddPlayer(Player *plr); virtual void StartingEventCloseDoors(); virtual void StartingEventOpenDoors(); - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); virtual bool SetupBattleground(); virtual void Reset(); @@ -277,7 +277,7 @@ class BattlegroundAB : public Battleground /* Creature spawning/despawning */ // TODO: working, scripted peons spawning - void _NodeOccupied(uint8 node,Team team); + void _NodeOccupied(uint8 node, Team team); void _NodeDeOccupied(uint8 node); int32 _GetNodeNameId(uint8 node); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index f15a58f74d5..1f920ff68da 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -53,12 +53,12 @@ void BattlegroundAV::HandleKillPlayer(Player *player, Player *killer) return; Battleground::HandleKillPlayer(player, killer); - UpdateScore(player->GetTeam(),-1); + UpdateScore(player->GetTeam(), -1); } void BattlegroundAV::HandleKillUnit(Creature *unit, Player *killer) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av HandleKillUnit %i",unit->GetEntry()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av HandleKillUnit %i", unit->GetEntry()); if (GetStatus() != STATUS_IN_PROGRESS) return; uint32 entry = unit->GetEntry(); @@ -75,17 +75,17 @@ void BattlegroundAV::HandleKillUnit(Creature *unit, Player *killer) */ if (entry == BG_AV_CreatureInfo[AV_NPC_A_BOSS][0]) { - CastSpellOnTeam(23658,HORDE); //this is a spell which finishes a quest where a player has to kill the boss - RewardReputationToTeam(729,BG_AV_REP_BOSS,HORDE); - RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_BOSS),HORDE); + CastSpellOnTeam(23658, HORDE); //this is a spell which finishes a quest where a player has to kill the boss + RewardReputationToTeam(729, BG_AV_REP_BOSS, HORDE); + RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_BOSS), HORDE); EndBattleground(HORDE); DelCreature(AV_CPLACE_TRIGGER17); } else if (entry == BG_AV_CreatureInfo[AV_NPC_H_BOSS][0]) { - CastSpellOnTeam(23658,ALLIANCE); //this is a spell which finishes a quest where a player has to kill the boss - RewardReputationToTeam(730,BG_AV_REP_BOSS,ALLIANCE); - RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_BOSS),ALLIANCE); + CastSpellOnTeam(23658, ALLIANCE); //this is a spell which finishes a quest where a player has to kill the boss + RewardReputationToTeam(730, BG_AV_REP_BOSS, ALLIANCE); + RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_BOSS), ALLIANCE); EndBattleground(ALLIANCE); DelCreature(AV_CPLACE_TRIGGER19); } @@ -97,15 +97,15 @@ void BattlegroundAV::HandleKillUnit(Creature *unit, Player *killer) return; } m_CaptainAlive[0]=false; - RewardReputationToTeam(729,BG_AV_REP_CAPTAIN,HORDE); - RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN),HORDE); - UpdateScore(ALLIANCE,(-1)*BG_AV_RES_CAPTAIN); + RewardReputationToTeam(729, BG_AV_REP_CAPTAIN, HORDE); + RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN), HORDE); + UpdateScore(ALLIANCE, (-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura for (uint8 i=0; i <= 9; i++) - SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+i,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+i, RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,GetTrinityString(LANG_BG_AV_A_CAPTAIN_DEAD),LANG_UNIVERSAL); + YellToAll(creature, GetTrinityString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL); DelCreature(AV_CPLACE_TRIGGER16); } else if (entry == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0]) @@ -116,21 +116,21 @@ void BattlegroundAV::HandleKillUnit(Creature *unit, Player *killer) return; } m_CaptainAlive[1]=false; - RewardReputationToTeam(730,BG_AV_REP_CAPTAIN,ALLIANCE); - RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN),ALLIANCE); - UpdateScore(HORDE,(-1)*BG_AV_RES_CAPTAIN); + RewardReputationToTeam(730, BG_AV_REP_CAPTAIN, ALLIANCE); + RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_CAPTAIN), ALLIANCE); + UpdateScore(HORDE, (-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura for (uint8 i=0; i <= 9; i++) - SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE+i,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE+i, RESPAWN_IMMEDIATELY); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,GetTrinityString(LANG_BG_AV_H_CAPTAIN_DEAD),LANG_UNIVERSAL); + YellToAll(creature, GetTrinityString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL); DelCreature(AV_CPLACE_TRIGGER18); } else if (entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_N_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_A_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_H_4][0]) - ChangeMineOwner(AV_NORTH_MINE,killer->GetTeam()); + ChangeMineOwner(AV_NORTH_MINE, killer->GetTeam()); else if (entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_N_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_A_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_H_4][0]) - ChangeMineOwner(AV_SOUTH_MINE,killer->GetTeam()); + ChangeMineOwner(AV_SOUTH_MINE, killer->GetTeam()); } void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) @@ -139,7 +139,7 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) return;//maybe we should log this, cause this must be a cheater or a big bug uint8 team = GetTeamIndexByTeamId(player->GetTeam()); //TODO add reputation, events (including quest not available anymore, next quest availabe, go/npc de/spawning)and maybe honor - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed", questid); switch(questid) { case AV_QUEST_A_SCRAPS1: @@ -147,9 +147,9 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) case AV_QUEST_H_SCRAPS1: case AV_QUEST_H_SCRAPS2: m_Team_QuestStatus[team][0]+=20; - if (m_Team_QuestStatus[team][0] == 500 || m_Team_QuestStatus[team][0] == 1000 || m_Team_QuestStatus[team][0] == 1500) //25,50,75 turn ins + if (m_Team_QuestStatus[team][0] == 500 || m_Team_QuestStatus[team][0] == 1000 || m_Team_QuestStatus[team][0] == 1500) //25, 50, 75 turn ins { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed starting with unit upgrading..",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed starting with unit upgrading..", questid); for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) if (m_Nodes[i].Owner == player->GetTeam() && m_Nodes[i].State == POINT_CONTROLED) { @@ -162,23 +162,23 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) case AV_QUEST_A_COMMANDER1: case AV_QUEST_H_COMMANDER1: m_Team_QuestStatus[team][1]++; - RewardReputationToTeam(team,1,player->GetTeam()); + RewardReputationToTeam(team, 1, player->GetTeam()); if (m_Team_QuestStatus[team][1] == 30) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); break; case AV_QUEST_A_COMMANDER2: case AV_QUEST_H_COMMANDER2: m_Team_QuestStatus[team][2]++; - RewardReputationToTeam(team,1,player->GetTeam()); + RewardReputationToTeam(team, 1, player->GetTeam()); if (m_Team_QuestStatus[team][2] == 60) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); break; case AV_QUEST_A_COMMANDER3: case AV_QUEST_H_COMMANDER3: m_Team_QuestStatus[team][3]++; - RewardReputationToTeam(team,1,player->GetTeam()); + RewardReputationToTeam(team, 1, player->GetTeam()); if (m_Team_QuestStatus[team][1] == 120) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); break; case AV_QUEST_A_BOSS1: case AV_QUEST_H_BOSS1: @@ -187,16 +187,16 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) case AV_QUEST_H_BOSS2: m_Team_QuestStatus[team][4]++; if (m_Team_QuestStatus[team][4] >= 200) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); break; case AV_QUEST_A_NEAR_MINE: case AV_QUEST_H_NEAR_MINE: m_Team_QuestStatus[team][5]++; if (m_Team_QuestStatus[team][5] == 28) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); if (m_Team_QuestStatus[team][6] == 7) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid); } break; case AV_QUEST_A_OTHER_MINE: @@ -204,9 +204,9 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) m_Team_QuestStatus[team][6]++; if (m_Team_QuestStatus[team][6] == 7) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); if (m_Team_QuestStatus[team][5] == 20) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - ground assault ready", questid); } break; case AV_QUEST_A_RIDER_HIDE: @@ -214,9 +214,9 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) m_Team_QuestStatus[team][7]++; if (m_Team_QuestStatus[team][7] == 25) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); if (m_Team_QuestStatus[team][8] == 25) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid); } break; case AV_QUEST_A_RIDER_TAME: @@ -224,13 +224,13 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player *player) m_Team_QuestStatus[team][8]++; if (m_Team_QuestStatus[team][8] == 25) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here", questid); if (m_Team_QuestStatus[team][7] == 25) - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed (need to implement some events here - rider assault ready", questid); } break; default: - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed but is not interesting at all",questid); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV Quest %i completed but is not interesting at all", questid); return; //was no interesting quest at all break; } @@ -269,14 +269,14 @@ Creature* BattlegroundAV::AddAVCreature(uint16 cinfoid, uint16 type) { type -= AV_CPLACE_MAX; cinfoid=uint16(BG_AV_StaticCreaturePos[type][4]); - creature = AddCreature(BG_AV_StaticCreatureInfo[cinfoid][0],(type+AV_CPLACE_MAX),BG_AV_StaticCreatureInfo[cinfoid][1],BG_AV_StaticCreaturePos[type][0],BG_AV_StaticCreaturePos[type][1],BG_AV_StaticCreaturePos[type][2],BG_AV_StaticCreaturePos[type][3]); - level = (BG_AV_StaticCreatureInfo[cinfoid][2] == BG_AV_StaticCreatureInfo[cinfoid][3]) ? BG_AV_StaticCreatureInfo[cinfoid][2] : urand(BG_AV_StaticCreatureInfo[cinfoid][2],BG_AV_StaticCreatureInfo[cinfoid][3]); + creature = AddCreature(BG_AV_StaticCreatureInfo[cinfoid][0], (type+AV_CPLACE_MAX), BG_AV_StaticCreatureInfo[cinfoid][1], BG_AV_StaticCreaturePos[type][0], BG_AV_StaticCreaturePos[type][1], BG_AV_StaticCreaturePos[type][2], BG_AV_StaticCreaturePos[type][3]); + level = (BG_AV_StaticCreatureInfo[cinfoid][2] == BG_AV_StaticCreatureInfo[cinfoid][3]) ? BG_AV_StaticCreatureInfo[cinfoid][2] : urand(BG_AV_StaticCreatureInfo[cinfoid][2], BG_AV_StaticCreatureInfo[cinfoid][3]); isStatic = true; } else { - creature = AddCreature(BG_AV_CreatureInfo[cinfoid][0],type,BG_AV_CreatureInfo[cinfoid][1],BG_AV_CreaturePos[type][0],BG_AV_CreaturePos[type][1],BG_AV_CreaturePos[type][2],BG_AV_CreaturePos[type][3]); - level = (BG_AV_CreatureInfo[cinfoid][2] == BG_AV_CreatureInfo[cinfoid][3]) ? BG_AV_CreatureInfo[cinfoid][2] : urand(BG_AV_CreatureInfo[cinfoid][2],BG_AV_CreatureInfo[cinfoid][3]); + creature = AddCreature(BG_AV_CreatureInfo[cinfoid][0], type, BG_AV_CreatureInfo[cinfoid][1], BG_AV_CreaturePos[type][0], BG_AV_CreaturePos[type][1], BG_AV_CreaturePos[type][2], BG_AV_CreaturePos[type][3]); + level = (BG_AV_CreatureInfo[cinfoid][2] == BG_AV_CreatureInfo[cinfoid][3]) ? BG_AV_CreatureInfo[cinfoid][2] : urand(BG_AV_CreatureInfo[cinfoid][2], BG_AV_CreatureInfo[cinfoid][3]); } if (!creature) return NULL; @@ -329,7 +329,7 @@ Creature* BattlegroundAV::AddAVCreature(uint16 cinfoid, uint16 type) } if (triggerSpawnID && newFaction) { - if (Creature* trigger = AddCreature(WORLD_TRIGGER,triggerSpawnID,BG_AV_CreatureInfo[creature->GetEntry()][1],BG_AV_CreaturePos[triggerSpawnID][0],BG_AV_CreaturePos[triggerSpawnID][1],BG_AV_CreaturePos[triggerSpawnID][2],BG_AV_CreaturePos[triggerSpawnID][3])) + if (Creature* trigger = AddCreature(WORLD_TRIGGER, triggerSpawnID, BG_AV_CreatureInfo[creature->GetEntry()][1], BG_AV_CreaturePos[triggerSpawnID][0], BG_AV_CreaturePos[triggerSpawnID][1], BG_AV_CreaturePos[triggerSpawnID][2], BG_AV_CreaturePos[triggerSpawnID][3])) { trigger->setFaction(newFaction); trigger->CastSpell(trigger, SPELL_HONORABLE_DEFENDER_25Y, false); @@ -355,19 +355,19 @@ void BattlegroundAV::Update(uint32 diff) { if (i == 0) { - CastSpellOnTeam(AV_BUFF_A_CAPTAIN,ALLIANCE); + CastSpellOnTeam(AV_BUFF_A_CAPTAIN, ALLIANCE); Creature* creature = GetBGCreature(AV_CPLACE_MAX + 61); if (creature) - YellToAll(creature,LANG_BG_AV_A_CAPTAIN_BUFF,LANG_COMMON); + YellToAll(creature, LANG_BG_AV_A_CAPTAIN_BUFF, LANG_COMMON); } else { - CastSpellOnTeam(AV_BUFF_H_CAPTAIN,HORDE); + CastSpellOnTeam(AV_BUFF_H_CAPTAIN, HORDE); Creature* creature = GetBGCreature(AV_CPLACE_MAX + 59); //TODO: make the captains a dynamic creature if (creature) - YellToAll(creature,LANG_BG_AV_H_CAPTAIN_BUFF,LANG_ORCISH); + YellToAll(creature, LANG_BG_AV_H_CAPTAIN_BUFF, LANG_ORCISH); } - m_CaptainBuffTimer[i] = 120000 + urand(0,4)* 60000; //as far as i could see, the buff is randomly so i make 2minutes (thats the duration of the buff itself) + 0-4minutes TODO get the right times + m_CaptainBuffTimer[i] = 120000 + urand(0, 4)* 60000; //as far as i could see, the buff is randomly so i make 2minutes (thats the duration of the buff itself) + 0-4minutes TODO get the right times } } //add points from mine owning, and look if he neutral team wanrts to reclaim the mine @@ -377,12 +377,12 @@ void BattlegroundAV::Update(uint32 diff) if (m_Mine_Owner[mine] == ALLIANCE || m_Mine_Owner[mine] == HORDE) { if (m_Mine_Timer <= 0) - UpdateScore(m_Mine_Owner[mine],1); + UpdateScore(m_Mine_Owner[mine], 1); if (m_Mine_Reclaim_Timer[mine] > diff) m_Mine_Reclaim_Timer[mine] -= diff; else{ //we don't need to set this timer to 0 cause this codepart wont get called when this thing is 0 - ChangeMineOwner(mine,AV_NEUTRAL_TEAM); + ChangeMineOwner(mine, AV_NEUTRAL_TEAM); } } } @@ -411,11 +411,11 @@ void BattlegroundAV::StartingEventOpenDoors() { sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning mine stuff"); for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_N_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_N_MAX; i++) - SpawnBGObject(i,RESPAWN_IMMEDIATELY); + SpawnBGObject(i, RESPAWN_IMMEDIATELY); for (uint16 i= BG_AV_OBJECT_MINE_SUPPLY_S_MIN; i <= BG_AV_OBJECT_MINE_SUPPLY_S_MAX; i++) - SpawnBGObject(i,RESPAWN_IMMEDIATELY); + SpawnBGObject(i, RESPAWN_IMMEDIATELY); for (uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population - ChangeMineOwner(mine, AV_NEUTRAL_TEAM,true); + ChangeMineOwner(mine, AV_NEUTRAL_TEAM, true); UpdateWorldState(AV_SHOW_H_SCORE, 1); UpdateWorldState(AV_SHOW_A_SCORE, 1); @@ -439,8 +439,8 @@ void BattlegroundAV::EndBattleground(uint32 winner) { //calculate bonuskills for both teams: //first towers: - uint8 kills[2]={0,0}; //0=ally 1=horde - uint8 rep[2]={0,0}; //0=ally 1=horde + uint8 kills[2]={0, 0}; //0=ally 1=horde + uint8 rep[2]={0, 0}; //0=ally 1=horde for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) { if (m_Nodes[i].State == POINT_CONTROLED) @@ -466,16 +466,16 @@ void BattlegroundAV::EndBattleground(uint32 winner) rep[i] += BG_AV_REP_SURVIVING_CAPTAIN; } if (rep[i] != 0) - RewardReputationToTeam((i == 0)?730:729,rep[i],(i == 0)?ALLIANCE:HORDE); + RewardReputationToTeam((i == 0)?730:729, rep[i], (i == 0)?ALLIANCE:HORDE); if (kills[i] != 0) - RewardHonorToTeam(GetBonusHonor(kills[i]),(i == 0)?ALLIANCE:HORDE); + RewardHonorToTeam(GetBonusHonor(kills[i]), (i == 0)?ALLIANCE:HORDE); } //TODO add enterevademode for all attacking creatures Battleground::EndBattleground(winner); } -void BattlegroundAV::RemovePlayer(Player* plr,uint64 /*guid*/) +void BattlegroundAV::RemovePlayer(Player* plr, uint64 /*guid*/) { if (!plr) { @@ -563,7 +563,7 @@ void BattlegroundAV::UpdatePlayerScore(Player* Source, uint32 type, uint32 value ((BattlegroundAVScore*)itr->second)->SecondaryObjectives += value; break; default: - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); break; } } @@ -572,7 +572,7 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) { uint32 object = GetObjectThroughNode(node); - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player destroyed point node %i object %i",node,object); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player destroyed point node %i object %i", node, object); //despawn banner SpawnBGObject(object, RESPAWN_ONE_DAY); @@ -587,17 +587,17 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) if (m_BgCreatures[AV_CPLACE_A_MARSHAL_SOUTH + tmp]) DelCreature(AV_CPLACE_A_MARSHAL_SOUTH + tmp); else - sLog->outError("BG_AV: playerdestroyedpoint: marshal %i doesn't exist",AV_CPLACE_A_MARSHAL_SOUTH + tmp); + sLog->outError("BG_AV: playerdestroyedpoint: marshal %i doesn't exist", AV_CPLACE_A_MARSHAL_SOUTH + tmp); //spawn destroyed aura for (uint8 i=0; i <= 9; i++) - SpawnBGObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH + i + (tmp * 10),RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH + i + (tmp * 10), RESPAWN_IMMEDIATELY); UpdateScore((owner == ALLIANCE) ? HORDE : ALLIANCE, (-1)*BG_AV_RES_TOWER); - RewardReputationToTeam((owner == ALLIANCE)?730:729,BG_AV_REP_TOWER,owner); - RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_TOWER),owner); + RewardReputationToTeam((owner == ALLIANCE)?730:729, BG_AV_REP_TOWER, owner); + RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_TOWER), owner); - SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp),RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp),RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp), RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp), RESPAWN_ONE_DAY); } else { @@ -605,28 +605,28 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) SpawnBGObject(object-11, RESPAWN_IMMEDIATELY); else SpawnBGObject(object+11, RESPAWN_IMMEDIATELY); - SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node,RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(owner)+3*node,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node, RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(owner)+3*node, RESPAWN_IMMEDIATELY); PopulateNode(node); if (node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall eyecandy { for (uint8 i = 0; i < 4; i++) { - SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i,RESPAWN_ONE_DAY); - SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H)+i,RESPAWN_IMMEDIATELY); + SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i, RESPAWN_ONE_DAY); + SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H)+i, RESPAWN_IMMEDIATELY); } } } //send a nice message to all :) char buf[256]; if (IsTower(node)) - sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node),(owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); else - sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node),(owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,buf,LANG_UNIVERSAL); + YellToAll(creature, buf, LANG_UNIVERSAL); } void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) @@ -645,7 +645,7 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) if (!initial) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av depopulating mine %i (0=north,1=south)",mine); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av depopulating mine %i (0=north, 1=south)", mine); if (mine == AV_SOUTH_MINE) for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) if (m_BgCreatures[i]) @@ -656,7 +656,7 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) } SendMineWorldStates(mine); - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av populating mine %i (0=north,1=south)",mine); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av populating mine %i (0=north, 1=south)", mine); uint16 miner; //also neutral team exists.. after a big time, the neutral team tries to conquer the mine if (mine == AV_NORTH_MINE) @@ -686,14 +686,14 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) else cinfo = AV_NPC_S_MINE_N_S; for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) - AddAVCreature(cinfo,i); + AddAVCreature(cinfo, i); } for (uint16 i=((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN); i <= ((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MAX:AV_CPLACE_MINE_S_1_MAX); i++) - AddAVCreature(miner,i); + AddAVCreature(miner, i); //the next chooses randomly between 2 cretures for (uint16 i=((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MIN:AV_CPLACE_MINE_S_2_MIN); i <= ((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_2_MAX:AV_CPLACE_MINE_S_2_MAX); i++) - AddAVCreature(miner+(urand(1,2)),i); - AddAVCreature(miner+3,(mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); + AddAVCreature(miner+(urand(1, 2)), i); + AddAVCreature(miner+3, (mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); //because the gameobjects in this mine have changed, update all surrounding players: // for (uint16 i = ((mine == AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MIN:BG_AV_OBJECT_MINE_SUPPLY_N_MIN); i <= ((mine == AV_NORTH_MINE)?BG_AV_OBJECT_MINE_SUPPLY_N_MAX:BG_AV_OBJECT_MINE_SUPPLY_N_MAX); i++) // { @@ -706,7 +706,7 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) sprintf(buf, GetTrinityString(LANG_BG_AV_MINE_TAKEN), GetTrinityString((mine == AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,buf,LANG_UNIVERSAL); + YellToAll(creature, buf, LANG_UNIVERSAL); } else { @@ -719,7 +719,7 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) return; } -bool BattlegroundAV::PlayerCanDoMineQuest(int32 GOId,uint32 team) +bool BattlegroundAV::PlayerCanDoMineQuest(int32 GOId, uint32 team) { if (GOId == BG_AV_OBJECTID_MINE_N) return (m_Mine_Owner[AV_NORTH_MINE] == team); @@ -752,17 +752,17 @@ void BattlegroundAV::PopulateNode(BG_AV_Nodes node) if (m_BgCreatures[node]) DelCreature(node); if (!AddSpiritGuide(node, BG_AV_CreaturePos[node][0], BG_AV_CreaturePos[node][1], BG_AV_CreaturePos[node][2], BG_AV_CreaturePos[node][3], owner)) - sLog->outError("AV: couldn't spawn spiritguide at node %i",node); + sLog->outError("AV: couldn't spawn spiritguide at node %i", node); } for (uint8 i=0; i<4; i++) - AddAVCreature(creatureid,c_place+i); + AddAVCreature(creatureid, c_place+i); if (node >= BG_AV_NODES_MAX)//fail safe return; Creature* trigger = GetBGCreature(node + 302);//0-302 other creatures if (!trigger) - trigger = AddCreature(WORLD_TRIGGER,node + 302,owner,BG_AV_CreaturePos[node + 302][0],BG_AV_CreaturePos[node + 302][1],BG_AV_CreaturePos[node + 302][2],BG_AV_CreaturePos[node + 302][3]); + trigger = AddCreature(WORLD_TRIGGER, node + 302, owner, BG_AV_CreaturePos[node + 302][0], BG_AV_CreaturePos[node + 302][1], BG_AV_CreaturePos[node + 302][2], BG_AV_CreaturePos[node + 302][3]); //add bonus honor aura trigger creature when node is accupied //cast bonus aura (+50% honor in 25yards) @@ -795,7 +795,7 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node) BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV getnodethroughobject %i",object); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV getnodethroughobject %i", object); if (object <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER) return BG_AV_Nodes(object); if (object <= BG_AV_OBJECT_FLAG_C_A_FROSTWOLF_HUT) @@ -817,7 +817,7 @@ BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object) uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node) { //this function is the counterpart to GetNodeThroughObject() - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV GetObjectThroughNode %i",node); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_AV GetObjectThroughNode %i", node); if (m_Nodes[node].Owner == ALLIANCE) { if (m_Nodes[node].State == POINT_ASSAULTED) @@ -848,7 +848,7 @@ uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node) } else if (m_Nodes[node].Owner == AV_NEUTRAL_TEAM) return BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; - sLog->outError("BattlegroundAV: Error! GetPlaceNode couldn't resolve node %i",node); + sLog->outError("BattlegroundAV: Error! GetPlaceNode couldn't resolve node %i", node); ASSERT(false); return 0; } @@ -860,7 +860,7 @@ void BattlegroundAV::EventPlayerClickedOnFlag(Player *source, GameObject* target if (GetStatus() != STATUS_IN_PROGRESS) return; int32 object = GetObjectType(target_obj->GetGUID()); - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV using gameobject %i with type %i",target_obj->GetEntry(),object); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV using gameobject %i with type %i", target_obj->GetEntry(), object); if (object < 0) return; switch(target_obj->GetEntry()) @@ -896,13 +896,13 @@ void BattlegroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) if (m_Nodes[node].TotalOwner == AV_NEUTRAL_TEAM) { //until snowfall doesn't belong to anyone it is better handled in assault-code ASSERT(node == BG_AV_NODES_SNOWFALL_GRAVE); //currently the only neutral grave - EventPlayerAssaultsPoint(player,object); + EventPlayerAssaultsPoint(player, object); return; } - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "player defends point object: %i node: %i",object,node); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "player defends point object: %i node: %i", object, node); if (m_Nodes[node].PrevOwner != team) { - sLog->outError("BG_AV: player defends point which doesn't belong to his team %i",node); + sLog->outError("BG_AV: player defends point which doesn't belong to his team %i", node); return; } @@ -914,38 +914,38 @@ void BattlegroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) if (!IsTower(node)) { - SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node,RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(team)+3*node,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node, RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(team)+3*node, RESPAWN_IMMEDIATELY); } // despawn old go SpawnBGObject(object, RESPAWN_ONE_DAY); - DefendNode(node,team); + DefendNode(node, team); PopulateNode(node); UpdateNodeWorldState(node); if (IsTower(node)) { //spawn big flag+aura on top of tower - SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); } else if (node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall eyecandy { for (uint8 i = 0; i < 4; i++) { - SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i,RESPAWN_ONE_DAY); - SpawnBGObject(((team == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H)+i,RESPAWN_IMMEDIATELY); + SpawnBGObject(((owner == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_PA : BG_AV_OBJECT_SNOW_EYECANDY_PH)+i, RESPAWN_ONE_DAY); + SpawnBGObject(((team == ALLIANCE)?BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H)+i, RESPAWN_IMMEDIATELY); } } //send a nice message to all :) char buf[256]; - sprintf(buf, GetTrinityString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node),(team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); + sprintf(buf, GetTrinityString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,buf,LANG_UNIVERSAL); + YellToAll(creature, buf, LANG_UNIVERSAL); //update the statistic for the defending player UpdatePlayerScore(player, (IsTower(node)) ? SCORE_TOWERS_DEFENDED : SCORE_GRAVEYARDS_DEFENDED, 1); if (IsTower(node)) @@ -961,7 +961,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) BG_AV_Nodes node = GetNodeThroughObject(object); uint32 owner = m_Nodes[node].Owner; //maybe name it prevowner uint32 team = player->GetTeam(); - sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player assaults point object %i node %i",object,node); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "bg_av: player assaults point object %i node %i", object, node); if (owner == team || team == m_Nodes[node].TotalOwner) return; //surely a gm used this object @@ -974,7 +974,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) SpawnBGObject(BG_AV_OBJECT_FLAG_C_A_SNOWFALL_GRAVE, RESPAWN_IMMEDIATELY); else SpawnBGObject(BG_AV_OBJECT_FLAG_C_H_SNOWFALL_GRAVE, RESPAWN_IMMEDIATELY); - SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node,RESPAWN_IMMEDIATELY); //neutral aura spawn + SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node, RESPAWN_IMMEDIATELY); //neutral aura spawn } else if (m_Nodes[node].TotalOwner == AV_NEUTRAL_TEAM) //recapping, when no team owns this node realy { @@ -985,7 +985,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) SpawnBGObject(object+11, RESPAWN_IMMEDIATELY); } //eyecandy - uint32 spawn,despawn; + uint32 spawn, despawn; if (team == ALLIANCE) { despawn = (m_Nodes[node].State == POINT_ASSAULTED)?BG_AV_OBJECT_SNOW_EYECANDY_PH : BG_AV_OBJECT_SNOW_EYECANDY_H; @@ -998,8 +998,8 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) } for (uint8 i = 0; i < 4; i++) { - SpawnBGObject(despawn+i,RESPAWN_ONE_DAY); - SpawnBGObject(spawn+i,RESPAWN_IMMEDIATELY); + SpawnBGObject(despawn+i, RESPAWN_ONE_DAY); + SpawnBGObject(spawn+i, RESPAWN_IMMEDIATELY); } } @@ -1013,16 +1013,16 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) SpawnBGObject(object+22, RESPAWN_IMMEDIATELY); if (IsTower(node)) { //spawning/despawning of bigflag+aura - SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); - SpawnBGObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)),(team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == ALLIANCE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); + SpawnBGObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(node-BG_AV_NODES_DUNBALDAR_SOUTH)), (team == HORDE)? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); } else { //spawning/despawning of aura - SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node,RESPAWN_IMMEDIATELY); //neutral aura spawn - SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(owner)+3*node,RESPAWN_ONE_DAY); //teeamaura despawn + SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node, RESPAWN_IMMEDIATELY); //neutral aura spawn + SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+GetTeamIndexByTeamId(owner)+3*node, RESPAWN_ONE_DAY); //teeamaura despawn // Those who are waiting to resurrect at this object are taken to the closest own object's graveyard std::vector<uint64> ghost_list = m_ReviveQueue[m_BgCreatures[node]]; if (!ghost_list.empty()) @@ -1046,7 +1046,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) } SpawnBGObject(object, RESPAWN_ONE_DAY); //delete old banner - AssaultNode(node,team); + AssaultNode(node, team); UpdateNodeWorldState(node); //send a nice message to all :) @@ -1054,7 +1054,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) sprintf(buf, (IsTower(node)) ? GetTrinityString(LANG_BG_AV_TOWER_ASSAULTED) : GetTrinityString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)); Creature* creature = GetBGCreature(AV_CPLACE_HERALD); if (creature) - YellToAll(creature,buf,LANG_UNIVERSAL); + YellToAll(creature, buf, LANG_UNIVERSAL); //update the statistic for the assaulting player UpdatePlayerScore(player, (IsTower(node)) ? SCORE_TOWERS_ASSAULTED : SCORE_GRAVEYARDS_ASSAULTED, 1); PlaySoundToAll((team == ALLIANCE)?AV_SOUND_ALLIANCE_ASSAULTS:AV_SOUND_HORDE_ASSAULTS); @@ -1069,8 +1069,8 @@ void BattlegroundAV::FillInitialWorldStates(WorldPacket& data) for (uint8 j =1; j <= 3; j+=2) {//j=1=assaulted j=3=controled stateok = (m_Nodes[i].State == j); - data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j,ALLIANCE)]) << uint32((m_Nodes[i].Owner == ALLIANCE && stateok)?1:0); - data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j,HORDE)]) << uint32((m_Nodes[i].Owner == HORDE && stateok)?1:0); + data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j, ALLIANCE)]) << uint32((m_Nodes[i].Owner == ALLIANCE && stateok)?1:0); + data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j, HORDE)]) << uint32((m_Nodes[i].Owner == HORDE && stateok)?1:0); } } @@ -1079,8 +1079,8 @@ void BattlegroundAV::FillInitialWorldStates(WorldPacket& data) for (uint8 j =1; j <= 3; j+=2) {//j=1=assaulted j=3=controled //i dont have j=2=destroyed cause destroyed is the same like enemy-team controll stateok = (m_Nodes[i].State == j || (m_Nodes[i].State == POINT_DESTROYED && j == 3)); - data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j,ALLIANCE)]) << uint32((m_Nodes[i].Owner == ALLIANCE && stateok)?1:0); - data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j,HORDE)]) << uint32((m_Nodes[i].Owner == HORDE && stateok)?1:0); + data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j, ALLIANCE)]) << uint32((m_Nodes[i].Owner == ALLIANCE && stateok)?1:0); + data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j, HORDE)]) << uint32((m_Nodes[i].Owner == HORDE && stateok)?1:0); } if (m_Nodes[BG_AV_NODES_SNOWFALL_GRAVE].Owner == AV_NEUTRAL_TEAM) //cause neutral teams aren't handled generic data << uint32(AV_SNOWFALL_N) << uint32(1); @@ -1118,17 +1118,17 @@ uint8 BattlegroundAV::GetWorldStateType(uint8 state, uint16 team) //this is used if (state == POINT_ASSAULTED) return 3; } - sLog->outError("BG_AV: should update a strange worldstate state:%i team:%i",state,team); + sLog->outError("BG_AV: should update a strange worldstate state:%i team:%i", state, team); return 5; //this will crash the game, but i want to know if something is wrong here } void BattlegroundAV::UpdateNodeWorldState(BG_AV_Nodes node) { - UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].State,m_Nodes[node].Owner)],1); + UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].State, m_Nodes[node].Owner)], 1); if (m_Nodes[node].PrevOwner == AV_NEUTRAL_TEAM) //currently only snowfall is supported as neutral node (i don't want to make an extra row (neutral states) in worldstatesarray just for one node - UpdateWorldState(AV_SNOWFALL_N,0); + UpdateWorldState(AV_SNOWFALL_N, 0); else - UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].PrevState,m_Nodes[node].PrevOwner)],0); + UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].PrevState, m_Nodes[node].PrevOwner)], 0); } void BattlegroundAV::SendMineWorldStates(uint32 mine) @@ -1138,7 +1138,7 @@ void BattlegroundAV::SendMineWorldStates(uint32 mine) // ASSERT(m_Mine_PrevOwner[mine] == ALLIANCE || m_Mine_PrevOwner[mine] == HORDE || m_Mine_PrevOwner[mine] == AV_NEUTRAL_TEAM); // ASSERT(m_Mine_Owner[mine] == ALLIANCE || m_Mine_Owner[mine] == HORDE || m_Mine_Owner[mine] == AV_NEUTRAL_TEAM); - uint8 owner,prevowner,mine2; //those variables are needed to access the right worldstate in the BG_AV_MineWorldStates array + uint8 owner, prevowner, mine2; //those variables are needed to access the right worldstate in the BG_AV_MineWorldStates array mine2 = (mine == AV_NORTH_MINE)?0:1; if (m_Mine_PrevOwner[mine] == ALLIANCE) prevowner = 0; @@ -1153,9 +1153,9 @@ void BattlegroundAV::SendMineWorldStates(uint32 mine) else owner = 1; - UpdateWorldState(BG_AV_MineWorldStates[mine2][owner],1); + UpdateWorldState(BG_AV_MineWorldStates[mine2][owner], 1); if (prevowner != owner) - UpdateWorldState(BG_AV_MineWorldStates[mine2][prevowner],0); + UpdateWorldState(BG_AV_MineWorldStates[mine2][prevowner], 0); } WorldSafeLocsEntry const* BattlegroundAV::GetClosestGraveYard(Player* player) @@ -1193,9 +1193,9 @@ bool BattlegroundAV::SetupBattleground() // Create starting objects if ( // alliance gates - !AddObject(BG_AV_OBJECT_DOOR_A, BG_AV_OBJECTID_GATE_A, BG_AV_DoorPositons[0][0],BG_AV_DoorPositons[0][1],BG_AV_DoorPositons[0][2],BG_AV_DoorPositons[0][3],0,0,sin(BG_AV_DoorPositons[0][3]/2),cos(BG_AV_DoorPositons[0][3]/2),RESPAWN_IMMEDIATELY) + !AddObject(BG_AV_OBJECT_DOOR_A, BG_AV_OBJECTID_GATE_A, BG_AV_DoorPositons[0][0], BG_AV_DoorPositons[0][1], BG_AV_DoorPositons[0][2], BG_AV_DoorPositons[0][3], 0, 0, sin(BG_AV_DoorPositons[0][3]/2), cos(BG_AV_DoorPositons[0][3]/2), RESPAWN_IMMEDIATELY) // horde gates - || !AddObject(BG_AV_OBJECT_DOOR_H, BG_AV_OBJECTID_GATE_H, BG_AV_DoorPositons[1][0],BG_AV_DoorPositons[1][1],BG_AV_DoorPositons[1][2],BG_AV_DoorPositons[1][3],0,0,sin(BG_AV_DoorPositons[1][3]/2),cos(BG_AV_DoorPositons[1][3]/2),RESPAWN_IMMEDIATELY)) + || !AddObject(BG_AV_OBJECT_DOOR_H, BG_AV_OBJECTID_GATE_H, BG_AV_DoorPositons[1][0], BG_AV_DoorPositons[1][1], BG_AV_DoorPositons[1][2], BG_AV_DoorPositons[1][3], 0, 0, sin(BG_AV_DoorPositons[1][3]/2), cos(BG_AV_DoorPositons[1][3]/2), RESPAWN_IMMEDIATELY)) { sLog->outErrorDb("BatteGroundAV: Failed to spawn some object Battleground not created!1"); return false; @@ -1206,14 +1206,14 @@ bool BattlegroundAV::SetupBattleground() { if (i <= BG_AV_NODES_FROSTWOLF_HUT) { - if (!AddObject(i,BG_AV_OBJECTID_BANNER_A_B,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(i+11,BG_AV_OBJECTID_BANNER_CONT_A_B,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(i+33,BG_AV_OBJECTID_BANNER_H_B,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(i+22,BG_AV_OBJECTID_BANNER_CONT_H_B,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) + if (!AddObject(i, BG_AV_OBJECTID_BANNER_A_B, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(i+11, BG_AV_OBJECTID_BANNER_CONT_A_B, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(i+33, BG_AV_OBJECTID_BANNER_H_B, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(i+22, BG_AV_OBJECTID_BANNER_CONT_H_B, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) //aura - || !AddObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+i*3,BG_AV_OBJECTID_AURA_N,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+i*3,BG_AV_OBJECTID_AURA_A,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+i*3,BG_AV_OBJECTID_AURA_H,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY)) + || !AddObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+i*3, BG_AV_OBJECTID_AURA_N, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+i*3, BG_AV_OBJECTID_AURA_A, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+i*3, BG_AV_OBJECTID_AURA_H, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!2"); return false; @@ -1223,12 +1223,12 @@ bool BattlegroundAV::SetupBattleground() { if (i <= BG_AV_NODES_STONEHEART_BUNKER) //alliance towers { - if (!AddObject(i,BG_AV_OBJECTID_BANNER_A,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(i+22,BG_AV_OBJECTID_BANNER_CONT_H,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_AURA_A,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_AURA_N,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_TOWER_BANNER_A,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_TOWER_BANNER_PH,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(i, BG_AV_OBJECTID_BANNER_A, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(i+22, BG_AV_OBJECTID_BANNER_CONT_H, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_AURA_A, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_AURA_N, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_TOWER_BANNER_A, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_TOWER_BANNER_PH, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!3"); return false; @@ -1236,12 +1236,12 @@ bool BattlegroundAV::SetupBattleground() } else //horde towers { - if (!AddObject(i+7,BG_AV_OBJECTID_BANNER_CONT_A,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(i+29,BG_AV_OBJECTID_BANNER_H,BG_AV_ObjectPos[i][0],BG_AV_ObjectPos[i][1],BG_AV_ObjectPos[i][2],BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_AURA_N,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_AURA_H,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_TOWER_BANNER_PA,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)),BG_AV_OBJECTID_TOWER_BANNER_H,BG_AV_ObjectPos[i+8][0],BG_AV_ObjectPos[i+8][1],BG_AV_ObjectPos[i+8][2],BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(i+7, BG_AV_OBJECTID_BANNER_CONT_A, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(i+29, BG_AV_OBJECTID_BANNER_H, BG_AV_ObjectPos[i][0], BG_AV_ObjectPos[i][1], BG_AV_ObjectPos[i][2], BG_AV_ObjectPos[i][3], 0, 0, sin(BG_AV_ObjectPos[i][3]/2), cos(BG_AV_ObjectPos[i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_AURA_N, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TAURA_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_AURA_H, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_TOWER_BANNER_PA, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH+(2*(i-BG_AV_NODES_DUNBALDAR_SOUTH)), BG_AV_OBJECTID_TOWER_BANNER_H, BG_AV_ObjectPos[i+8][0], BG_AV_ObjectPos[i+8][1], BG_AV_ObjectPos[i+8][2], BG_AV_ObjectPos[i+8][3], 0, 0, sin(BG_AV_ObjectPos[i+8][3]/2), cos(BG_AV_ObjectPos[i+8][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!4"); return false; @@ -1249,9 +1249,9 @@ bool BattlegroundAV::SetupBattleground() } for (uint8 j=0; j <= 9; j++) //burning aura { - if (!AddObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j,BG_AV_OBJECTID_FIRE,BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][0],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][1],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][2],BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j, BG_AV_OBJECTID_FIRE, BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][0], BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][1], BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][2], BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_DUNBALDAR_SOUTH+((i-BG_AV_NODES_DUNBALDAR_SOUTH)*10)+j][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!5.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!5.%i", i); return false; } } @@ -1263,17 +1263,17 @@ bool BattlegroundAV::SetupBattleground() { if (j<5) { - if (!AddObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+(i*10)+j,BG_AV_OBJECTID_SMOKE,BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][0],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][1],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][2],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+(i*10)+j, BG_AV_OBJECTID_SMOKE, BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][0], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][1], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][2], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!6.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!6.%i", i); return false; } } else { - if (!AddObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+(i*10)+j,BG_AV_OBJECTID_FIRE,BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][0],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][1],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][2],BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+(i*10)+j, BG_AV_OBJECTID_FIRE, BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][0], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][1], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][2], BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_BURN_BUILDING_A+(i*10)+j][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!7.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!7.%i", i); return false; } } @@ -1281,34 +1281,34 @@ bool BattlegroundAV::SetupBattleground() } for (uint16 i= 0; i <= (BG_AV_OBJECT_MINE_SUPPLY_N_MAX-BG_AV_OBJECT_MINE_SUPPLY_N_MIN); i++) { - if (!AddObject(BG_AV_OBJECT_MINE_SUPPLY_N_MIN+i,BG_AV_OBJECTID_MINE_N,BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][0],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][1],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][2],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_MINE_SUPPLY_N_MIN+i, BG_AV_OBJECTID_MINE_N, BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][0], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][1], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][2], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_N_MIN+i][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some mine supplies Battleground not created!7.5.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some mine supplies Battleground not created!7.5.%i", i); return false; } } for (uint16 i= 0 ; i <= (BG_AV_OBJECT_MINE_SUPPLY_S_MAX-BG_AV_OBJECT_MINE_SUPPLY_S_MIN); i++) { - if (!AddObject(BG_AV_OBJECT_MINE_SUPPLY_S_MIN+i,BG_AV_OBJECTID_MINE_S,BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][0],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][1],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][2],BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2),RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_MINE_SUPPLY_S_MIN+i, BG_AV_OBJECTID_MINE_S, BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][0], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][1], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][2], BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_MINE_SUPPLY_S_MIN+i][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some mine supplies Battleground not created!7.6.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some mine supplies Battleground not created!7.6.%i", i); return false; } } - if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N ,BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3],0,0,sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N , BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2], BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3], 0, 0, sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY)) { sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!8"); return false; } for (uint8 i = 0; i < 4; i++) { - if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) - || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH ,BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2],BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3],0,0,sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) + if (!AddObject(BG_AV_OBJECT_SNOW_EYECANDY_A+i, BG_AV_OBJECTID_SNOWFALL_CANDY_A , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PA+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PA , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_H+i, BG_AV_OBJECTID_SNOWFALL_CANDY_H , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY) + || !AddObject(BG_AV_OBJECT_SNOW_EYECANDY_PH+i, BG_AV_OBJECTID_SNOWFALL_CANDY_PH , BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][0], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][1], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][2], BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3], 0, 0, sin(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), cos(BG_AV_ObjectPos[AV_OPLACE_SNOW_1+i][3]/2), RESPAWN_ONE_DAY)) { - sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!9.%i",i); + sLog->outError("BatteGroundAV: Failed to spawn some object Battleground not created!9.%i", i); return false; } } @@ -1319,7 +1319,7 @@ bool BattlegroundAV::SetupBattleground() for (i = 0; i < BG_AV_OBJECT_MAX; i++) SpawnBGObject(i, RESPAWN_ONE_DAY); for (i = BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_GRAVE ; i++){ - SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+3*i,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_A_FIRSTAID_STATION+3*i, RESPAWN_IMMEDIATELY); SpawnBGObject(i, RESPAWN_IMMEDIATELY); } for (i = BG_AV_OBJECT_FLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER ; i++) @@ -1327,7 +1327,7 @@ bool BattlegroundAV::SetupBattleground() for (i = BG_AV_OBJECT_FLAG_H_ICEBLOOD_GRAVE; i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER ; i++){ SpawnBGObject(i, RESPAWN_IMMEDIATELY); if (i <= BG_AV_OBJECT_FLAG_H_FROSTWOLF_HUT) - SpawnBGObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+3*GetNodeThroughObject(i),RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_H_FIRSTAID_STATION+3*GetNodeThroughObject(i), RESPAWN_IMMEDIATELY); } for (i = BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH; i <= BG_AV_OBJECT_TFLAG_A_STONEHEART_BUNKER; i+=2) { @@ -1342,7 +1342,7 @@ bool BattlegroundAV::SetupBattleground() //snowfall and the doors for (i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++) SpawnBGObject(i, RESPAWN_IMMEDIATELY); - SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE,RESPAWN_IMMEDIATELY); + SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE, RESPAWN_IMMEDIATELY); //creatures sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV start poputlating nodes"); @@ -1354,7 +1354,7 @@ bool BattlegroundAV::SetupBattleground() //all creatures which don't get despawned through the script are static sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning static creatures"); for (i=0; i < AV_STATICCPLACE_MAX; i++) - AddAVCreature(0,i+AV_CPLACE_MAX); + AddAVCreature(0, i+AV_CPLACE_MAX); //mainspiritguides: sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning spiritguides creatures"); AddSpiritGuide(7, BG_AV_CreaturePos[7][0], BG_AV_CreaturePos[7][1], BG_AV_CreaturePos[7][2], BG_AV_CreaturePos[7][3], ALLIANCE); @@ -1362,8 +1362,8 @@ bool BattlegroundAV::SetupBattleground() //spawn the marshals (those who get deleted, if a tower gets destroyed) sLog->outDebug(LOG_FILTER_BATTLEGROUND, "BG_AV: start spawning marshal creatures"); for (i=AV_NPC_A_MARSHAL_SOUTH; i <= AV_NPC_H_MARSHAL_WTOWER; i++) - AddAVCreature(i,AV_CPLACE_A_MARSHAL_SOUTH+(i-AV_NPC_A_MARSHAL_SOUTH)); - AddAVCreature(AV_NPC_HERALD,AV_CPLACE_HERALD); + AddAVCreature(i, AV_CPLACE_A_MARSHAL_SOUTH+(i-AV_NPC_A_MARSHAL_SOUTH)); + AddAVCreature(AV_NPC_HERALD, AV_CPLACE_HERALD); return true; } @@ -1387,7 +1387,7 @@ const char* BattlegroundAV::GetNodeName(BG_AV_Nodes node) case BG_AV_NODES_FROSTWOLF_WTOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_FROST_W); case BG_AV_NODES_FROSTWOLF_HUT: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_FROST_HUT); default: - sLog->outError("tried to get name for node %u",node); + sLog->outError("tried to get name for node %u", node); break; } @@ -1469,19 +1469,19 @@ void BattlegroundAV::ResetBGSubclass() m_Team_Scores[i]=BG_AV_SCORE_INITIAL_POINTS; m_IsInformedNearVictory[i]=false; m_CaptainAlive[i] = true; - m_CaptainBuffTimer[i] = 120000 + urand(0,4)* 60; //as far as i could see, the buff is randomly so i make 2minutes (thats the duration of the buff itself) + 0-4minutes TODO get the right times + m_CaptainBuffTimer[i] = 120000 + urand(0, 4)* 60; //as far as i could see, the buff is randomly so i make 2minutes (thats the duration of the buff itself) + 0-4minutes TODO get the right times m_Mine_Owner[i] = AV_NEUTRAL_TEAM; m_Mine_PrevOwner[i] = m_Mine_Owner[i]; } for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_STONEHEART_GRAVE; ++i) //alliance graves - InitNode(i,ALLIANCE,false); + InitNode(i, ALLIANCE, false); for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i) //alliance towers - InitNode(i,ALLIANCE,true); + InitNode(i, ALLIANCE, true); for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_GRAVE; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) //horde graves - InitNode(i,HORDE,false); + InitNode(i, HORDE, false); for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) //horde towers - InitNode(i,HORDE,true); - InitNode(BG_AV_NODES_SNOWFALL_GRAVE,AV_NEUTRAL_TEAM,false); //give snowfall neutral owner + InitNode(i, HORDE, true); + InitNode(BG_AV_NODES_SNOWFALL_GRAVE, AV_NEUTRAL_TEAM, false); //give snowfall neutral owner m_Mine_Timer=AV_MINE_TICK_TIMER; for (uint16 i = 0; i < AV_CPLACE_MAX+AV_STATICCPLACE_MAX; i++) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index e6ec18aa04e..c50ee1c2a80 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -86,7 +86,7 @@ horde: AV_SOUND_NEAR_VICTORY = 8456, //not confirmed yet - AV_SOUND_ALLIANCE_ASSAULTS = 8212, //tower,grave + enemy boss if someone tries to attack him + AV_SOUND_ALLIANCE_ASSAULTS = 8212, //tower, grave + enemy boss if someone tries to attack him AV_SOUND_HORDE_ASSAULTS = 8174, AV_SOUND_ALLIANCE_GOOD = 8173, //if something good happens for the team: wins(maybe only through killing the boss), captures mine or grave, destroys tower and defends grave AV_SOUND_HORDE_GOOD = 8213, @@ -228,7 +228,7 @@ enum BG_AV_ObjectTypes BG_AV_OBJECT_DOOR_H = 45, BG_AV_OBJECT_DOOR_A = 46, -//auras for graveyards (3auras per graveyard neutral,alliance,horde) +//auras for graveyards (3auras per graveyard neutral, alliance, horde) BG_AV_OBJECT_AURA_N_FIRSTAID_STATION = 47, BG_AV_OBJECT_AURA_A_FIRSTAID_STATION = 48, BG_AV_OBJECT_AURA_H_FIRSTAID_STATION = 49, @@ -251,7 +251,7 @@ enum BG_AV_ObjectTypes BG_AV_OBJECT_AURA_A_FROSTWOLF_HUT = 66, BG_AV_OBJECT_AURA_H_FROSTWOLF_HUT = 67, - //big flags on top of towers 2 flags on each (contested,(alliance | horde)) + 2 auras + //big flags on top of towers 2 flags on each (contested, (alliance | horde)) + 2 auras BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH = 67, BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH = 68, BG_AV_OBJECT_TFLAG_A_DUNBALDAR_NORTH = 69, @@ -355,174 +355,174 @@ enum BG_AV_OBJECTS AV_OPLACE_MAX = 149 }; const float BG_AV_ObjectPos[AV_OPLACE_MAX][4] = { - {638.592f,-32.422f,46.0608f,-1.62316f },//firstaid station - {669.007f,-294.078f,30.2909f,2.77507f },//stormpike - {77.8013f,-404.7f,46.7549f,-0.872665f },//stone grave - {-202.581f,-112.73f,78.4876f,-0.715585f },//snowfall - {-611.962f,-396.17f,60.8351f,2.53682f}, //iceblood grave - {-1082.45f,-346.823f,54.9219f,-1.53589f },//frostwolf grave - {-1402.21f,-307.431f,89.4424f,0.191986f },//frostwolf hut - {553.779f,-78.6566f,51.9378f,-1.22173f }, //dunnbaldar south - {674.001f,-143.125f,63.6615f,0.994838f }, //dunbaldar north - {203.281f,-360.366f,56.3869f,-0.925024f }, //icew - {-152.437f,-441.758f,40.3982f,-1.95477f }, //stone - {-571.88f,-262.777f,75.0087f,-0.802851f }, //ice tower - {-768.907f,-363.71f,90.8949f,1.07991f}, //tower point - {-1302.9f,-316.981f,113.867f,2.00713f }, //frostwolf etower - {-1297.5f,-266.767f,114.15f,3.31044f}, //frostwolf wtower + {638.592f, -32.422f, 46.0608f, -1.62316f }, //firstaid station + {669.007f, -294.078f, 30.2909f, 2.77507f }, //stormpike + {77.8013f, -404.7f, 46.7549f, -0.872665f }, //stone grave + {-202.581f, -112.73f, 78.4876f, -0.715585f }, //snowfall + {-611.962f, -396.17f, 60.8351f, 2.53682f}, //iceblood grave + {-1082.45f, -346.823f, 54.9219f, -1.53589f }, //frostwolf grave + {-1402.21f, -307.431f, 89.4424f, 0.191986f }, //frostwolf hut + {553.779f, -78.6566f, 51.9378f, -1.22173f }, //dunnbaldar south + {674.001f, -143.125f, 63.6615f, 0.994838f }, //dunbaldar north + {203.281f, -360.366f, 56.3869f, -0.925024f }, //icew + {-152.437f, -441.758f, 40.3982f, -1.95477f }, //stone + {-571.88f, -262.777f, 75.0087f, -0.802851f }, //ice tower + {-768.907f, -363.71f, 90.8949f, 1.07991f}, //tower point + {-1302.9f, -316.981f, 113.867f, 2.00713f }, //frostwolf etower + {-1297.5f, -266.767f, 114.15f, 3.31044f}, //frostwolf wtower //bigbanner: - {555.848f,-84.4151f,64.4397f,3.12414f }, //duns - {679.339f,-136.468f,73.9626f,-2.16421f }, //dunn - {208.973f,-365.971f,66.7409f,-0.244346f }, //icew - {-155.832f,-449.401f,52.7306f,0.610865f }, //stone - {-572.329f,-262.476f,88.6496f,-0.575959f }, //icetower - {-768.199f,-363.105f,104.537f,0.10472f }, //towerp - {-1302.84f,-316.582f,127.516f,0.122173f }, //etower - {-1297.87f,-266.762f,127.796f,0.0698132f }, //wtower + {555.848f, -84.4151f, 64.4397f, 3.12414f }, //duns + {679.339f, -136.468f, 73.9626f, -2.16421f }, //dunn + {208.973f, -365.971f, 66.7409f, -0.244346f }, //icew + {-155.832f, -449.401f, 52.7306f, 0.610865f }, //stone + {-572.329f, -262.476f, 88.6496f, -0.575959f }, //icetower + {-768.199f, -363.105f, 104.537f, 0.10472f }, //towerp + {-1302.84f, -316.582f, 127.516f, 0.122173f }, //etower + {-1297.87f, -266.762f, 127.796f, 0.0698132f }, //wtower //burning auras towers have 9*179065 captain-buildings have 5*179066+5*179065 //dunns - {562.632f,-88.1815f,61.993f,0.383972f }, - {562.523f,-74.5028f,37.9474f,-0.0523599f }, - {558.097f,-70.9842f,52.4876f,0.820305f }, - {578.167f,-71.8191f,38.1514f,2.72271f }, - {556.028f,-94.9242f,44.8191f,3.05433f }, - {572.451f,-94.3655f,37.9443f,-1.72788f }, - {549.263f,-79.3645f,44.8191f,0.436332f }, - {543.513f,-94.4006f,52.4819f,0.0349066f }, - {572.149f,-93.7862f,52.5726f,0.541052f }, - {582.162f,-81.2375f,37.9216f,0.0872665f }, + {562.632f, -88.1815f, 61.993f, 0.383972f }, + {562.523f, -74.5028f, 37.9474f, -0.0523599f }, + {558.097f, -70.9842f, 52.4876f, 0.820305f }, + {578.167f, -71.8191f, 38.1514f, 2.72271f }, + {556.028f, -94.9242f, 44.8191f, 3.05433f }, + {572.451f, -94.3655f, 37.9443f, -1.72788f }, + {549.263f, -79.3645f, 44.8191f, 0.436332f }, + {543.513f, -94.4006f, 52.4819f, 0.0349066f }, + {572.149f, -93.7862f, 52.5726f, 0.541052f }, + {582.162f, -81.2375f, 37.9216f, 0.0872665f }, //dunn - {664.797f,-143.65f,64.1784f,-0.453786f}, - {664.505f,-139.452f,49.6696f,-0.0349067f}, - {676.067f,-124.319f,49.6726f,-1.01229f}, - {693.004f,-144.025f,64.1755f,2.44346f}, - {661.175f,-117.691f,49.645f,1.91986f}, - {684.423f,-146.582f,63.6662f,0.994838f}, - {682.791f,-127.769f,62.4155f,1.09956f}, - {674.576f,-147.101f,56.5425f,-1.6057f}, - {655.719f,-126.673f,49.8138f,2.80998f}, - {0,0,0,0}, + {664.797f, -143.65f, 64.1784f, -0.453786f}, + {664.505f, -139.452f, 49.6696f, -0.0349067f}, + {676.067f, -124.319f, 49.6726f, -1.01229f}, + {693.004f, -144.025f, 64.1755f, 2.44346f}, + {661.175f, -117.691f, 49.645f, 1.91986f}, + {684.423f, -146.582f, 63.6662f, 0.994838f}, + {682.791f, -127.769f, 62.4155f, 1.09956f}, + {674.576f, -147.101f, 56.5425f, -1.6057f}, + {655.719f, -126.673f, 49.8138f, 2.80998f}, + {0, 0, 0, 0}, //icew - {231.503f,-356.688f,42.3704f,0.296706f}, - {224.989f,-348.175f,42.5607f,1.50098f}, - {205.782f,-351.335f,56.8998f,1.01229f}, - {196.605f,-369.187f,56.3914f,2.46091f}, - {210.619f,-376.938f,49.2677f,2.86234f}, - {209.647f,-352.632f,42.3959f,-0.698132f}, - {220.65f,-368.132f,42.3978f,-0.2618f}, - {224.682f,-374.031f,57.0679f,0.541052f}, - {200.26f,-359.968f,49.2677f,-2.89725f}, - {196.619f,-378.016f,56.9131f,1.01229f}, + {231.503f, -356.688f, 42.3704f, 0.296706f}, + {224.989f, -348.175f, 42.5607f, 1.50098f}, + {205.782f, -351.335f, 56.8998f, 1.01229f}, + {196.605f, -369.187f, 56.3914f, 2.46091f}, + {210.619f, -376.938f, 49.2677f, 2.86234f}, + {209.647f, -352.632f, 42.3959f, -0.698132f}, + {220.65f, -368.132f, 42.3978f, -0.2618f}, + {224.682f, -374.031f, 57.0679f, 0.541052f}, + {200.26f, -359.968f, 49.2677f, -2.89725f}, + {196.619f, -378.016f, 56.9131f, 1.01229f}, //stone - {-155.488f,-437.356f,33.2796f,2.60054f}, - {-163.441f,-454.188f,33.2796f,1.93732f}, - {-143.977f,-445.148f,26.4097f,-1.8675f}, - {-135.764f,-464.708f,26.3823f,2.25147f}, - {-154.076f,-466.929f,41.0636f,-1.8675f}, - {-149.908f,-460.332f,26.4083f,-2.09439f}, - {-151.638f,-439.521f,40.3797f,0.436332f}, - {-131.301f,-454.905f,26.5771f,2.93215f}, - {-171.291f,-444.684f,40.9211f,2.30383f}, - {-143.591f,-439.75f,40.9275f,-1.72788f}, + {-155.488f, -437.356f, 33.2796f, 2.60054f}, + {-163.441f, -454.188f, 33.2796f, 1.93732f}, + {-143.977f, -445.148f, 26.4097f, -1.8675f}, + {-135.764f, -464.708f, 26.3823f, 2.25147f}, + {-154.076f, -466.929f, 41.0636f, -1.8675f}, + {-149.908f, -460.332f, 26.4083f, -2.09439f}, + {-151.638f, -439.521f, 40.3797f, 0.436332f}, + {-131.301f, -454.905f, 26.5771f, 2.93215f}, + {-171.291f, -444.684f, 40.9211f, 2.30383f}, + {-143.591f, -439.75f, 40.9275f, -1.72788f}, //iceblood - {-572.667f,-267.923f,56.8542f,2.35619f}, - {-561.021f,-262.689f,68.4589f,1.37881f}, - {-572.538f,-262.649f,88.6197f,1.8326f}, - {-574.77f,-251.45f,74.9422f,-1.18682f}, - {-578.625f,-267.571f,68.4696f,0.506145f}, - {-571.476f,-257.234f,63.3223f,3.10669f}, - {-566.035f,-273.907f,52.9582f,-0.890118f}, - {-580.948f,-259.77f,68.4696f,1.46608f}, - {-568.318f,-267.1f,75.0008f,1.01229f}, - {-559.621f,-268.597f,52.8986f,0.0523599f}, + {-572.667f, -267.923f, 56.8542f, 2.35619f}, + {-561.021f, -262.689f, 68.4589f, 1.37881f}, + {-572.538f, -262.649f, 88.6197f, 1.8326f}, + {-574.77f, -251.45f, 74.9422f, -1.18682f}, + {-578.625f, -267.571f, 68.4696f, 0.506145f}, + {-571.476f, -257.234f, 63.3223f, 3.10669f}, + {-566.035f, -273.907f, 52.9582f, -0.890118f}, + {-580.948f, -259.77f, 68.4696f, 1.46608f}, + {-568.318f, -267.1f, 75.0008f, 1.01229f}, + {-559.621f, -268.597f, 52.8986f, 0.0523599f}, //towerp - {-776.072f,-368.046f,84.3558f,2.63545f}, - {-777.564f,-368.521f,90.6701f,1.72788f}, - {-765.461f,-357.711f,90.888f,0.314159f}, - {-768.763f,-362.735f,104.612f,1.81514f}, - {-760.356f,-358.896f,84.3558f,2.1293f}, - {-771.967f,-352.838f,84.3484f,1.74533f}, - {-773.333f,-364.653f,79.2351f,-1.64061f}, - {-764.109f,-366.069f,70.0934f,0.383972f}, - {-767.103f,-350.737f,68.7933f,2.80998f}, - {-760.115f,-353.845f,68.8633f,1.79769f}, + {-776.072f, -368.046f, 84.3558f, 2.63545f}, + {-777.564f, -368.521f, 90.6701f, 1.72788f}, + {-765.461f, -357.711f, 90.888f, 0.314159f}, + {-768.763f, -362.735f, 104.612f, 1.81514f}, + {-760.356f, -358.896f, 84.3558f, 2.1293f}, + {-771.967f, -352.838f, 84.3484f, 1.74533f}, + {-773.333f, -364.653f, 79.2351f, -1.64061f}, + {-764.109f, -366.069f, 70.0934f, 0.383972f}, + {-767.103f, -350.737f, 68.7933f, 2.80998f}, + {-760.115f, -353.845f, 68.8633f, 1.79769f}, //froste - {-1304.87f,-304.525f,91.8366f,-0.680679f}, - {-1301.77f,-310.974f,95.8252f,0.907571f}, - {-1305.58f,-320.625f,102.166f,-0.558505f}, - {-1294.27f,-323.468f,113.893f,-1.67552f}, - {-1302.65f,-317.192f,127.487f,2.30383f}, - {-1293.89f,-313.478f,107.328f,1.6057f}, - {-1312.41f,-312.999f,107.328f,1.5708f}, - {-1311.57f,-308.08f,91.7666f,-1.85005f}, - {-1314.7f,-322.131f,107.36f,0.645772f}, - {-1304.6f,-310.754f,113.859f,-0.401426f}, + {-1304.87f, -304.525f, 91.8366f, -0.680679f}, + {-1301.77f, -310.974f, 95.8252f, 0.907571f}, + {-1305.58f, -320.625f, 102.166f, -0.558505f}, + {-1294.27f, -323.468f, 113.893f, -1.67552f}, + {-1302.65f, -317.192f, 127.487f, 2.30383f}, + {-1293.89f, -313.478f, 107.328f, 1.6057f}, + {-1312.41f, -312.999f, 107.328f, 1.5708f}, + {-1311.57f, -308.08f, 91.7666f, -1.85005f}, + {-1314.7f, -322.131f, 107.36f, 0.645772f}, + {-1304.6f, -310.754f, 113.859f, -0.401426f}, //frostw - {-1308.24f,-273.26f,92.0514f,-0.139626f}, - {-1302.26f,-262.858f,95.9269f,0.418879f}, - {-1297.28f,-267.773f,126.756f,2.23402f}, - {-1299.08f,-256.89f,114.108f,-2.44346f}, - {-1303.41f,-268.237f,114.151f,-1.23918f}, - {-1304.43f,-273.682f,107.612f,0.244346f}, - {-1309.53f,-265.951f,92.1418f,-2.49582f}, - {-1295.55f,-263.865f,105.033f,0.925024f}, - {-1294.71f,-281.466f,107.664f,-1.50098f}, - {-1289.69f,-259.521f,107.612f,-2.19912f}, + {-1308.24f, -273.26f, 92.0514f, -0.139626f}, + {-1302.26f, -262.858f, 95.9269f, 0.418879f}, + {-1297.28f, -267.773f, 126.756f, 2.23402f}, + {-1299.08f, -256.89f, 114.108f, -2.44346f}, + {-1303.41f, -268.237f, 114.151f, -1.23918f}, + {-1304.43f, -273.682f, 107.612f, 0.244346f}, + {-1309.53f, -265.951f, 92.1418f, -2.49582f}, + {-1295.55f, -263.865f, 105.033f, 0.925024f}, + {-1294.71f, -281.466f, 107.664f, -1.50098f}, + {-1289.69f, -259.521f, 107.612f, -2.19912f}, //the two buildings of the captains //alliance - {-64.4987f,-289.33f,33.4616f,-2.82743f}, - {-5.98025f,-326.144f,38.8538f,0}, - {-2.67893f,-306.998f,33.4165f,0}, - {-60.25f,-309.232f,50.2408f,-1.46608f}, - {-48.7941f,-266.533f,47.7916f,2.44346f}, - {-3.40929f,-306.288f,33.34f,0}, - {-48.619f,-266.917f,47.8168f,0}, - {-62.9474f,-286.212f,66.7288f,0}, - {-5.05132f,-325.323f,38.8536f,0}, - {-64.2677f,-289.412f,33.469f,0}, + {-64.4987f, -289.33f, 33.4616f, -2.82743f}, + {-5.98025f, -326.144f, 38.8538f, 0}, + {-2.67893f, -306.998f, 33.4165f, 0}, + {-60.25f, -309.232f, 50.2408f, -1.46608f}, + {-48.7941f, -266.533f, 47.7916f, 2.44346f}, + {-3.40929f, -306.288f, 33.34f, 0}, + {-48.619f, -266.917f, 47.8168f, 0}, + {-62.9474f, -286.212f, 66.7288f, 0}, + {-5.05132f, -325.323f, 38.8536f, 0}, + {-64.2677f, -289.412f, 33.469f, 0}, //horde - {-524.276f,-199.6f,82.8733f,-1.46608f}, - {-518.196f,-173.085f,102.43f,0}, - {-500.732f,-145.358f,88.5337f,2.44346f}, - {-501.084f,-150.784f,80.8506f,0}, - {-518.309f,-163.963f,102.521f,2.96706f}, - {-517.053f,-200.429f,80.759f,0}, - {-514.361f,-163.864f,104.163f,0}, - {-568.04f,-188.707f,81.55f,0}, - {-501.775f,-151.581f,81.2027f,0}, - {-509.975f,-191.652f,83.2978f,0}, + {-524.276f, -199.6f, 82.8733f, -1.46608f}, + {-518.196f, -173.085f, 102.43f, 0}, + {-500.732f, -145.358f, 88.5337f, 2.44346f}, + {-501.084f, -150.784f, 80.8506f, 0}, + {-518.309f, -163.963f, 102.521f, 2.96706f}, + {-517.053f, -200.429f, 80.759f, 0}, + {-514.361f, -163.864f, 104.163f, 0}, + {-568.04f, -188.707f, 81.55f, 0}, + {-501.775f, -151.581f, 81.2027f, 0}, + {-509.975f, -191.652f, 83.2978f, 0}, //snowfall eyecandy - {-191.153f,-129.868f,78.5595f,-1.25664f }, - {-201.282f,-134.319f,78.6753f,-0.942478f }, - {-215.981f,-91.4101f,80.8702f,-1.74533f }, - {-200.465f,-96.418f,79.7587f,1.36136f }, + {-191.153f, -129.868f, 78.5595f, -1.25664f }, + {-201.282f, -134.319f, 78.6753f, -0.942478f }, + {-215.981f, -91.4101f, 80.8702f, -1.74533f }, + {-200.465f, -96.418f, 79.7587f, 1.36136f }, //mine supplies //irondeep - {870.899f,-388.434f,61.6406f,-1.22173f}, - {825.214f,-320.174f,63.712f,-2.82743f}, - {837.117f,-452.556f,47.2331f,-3.12414f}, - {869.755f,-448.867f,52.5448f,-0.855212f}, - {949.877f,-458.198f,56.4874f,0.314159f}, - {900.35f,-479.024f,58.3553f,0.122173f}, - {854.449f,-442.255f,50.6589f,0.401426f}, - {886.685f,-442.358f,54.6962f,-1.22173f}, - {817.509f,-457.331f,48.4666f,2.07694f}, - {793.411f,-326.281f,63.1117f,-2.79253f}, + {870.899f, -388.434f, 61.6406f, -1.22173f}, + {825.214f, -320.174f, 63.712f, -2.82743f}, + {837.117f, -452.556f, 47.2331f, -3.12414f}, + {869.755f, -448.867f, 52.5448f, -0.855212f}, + {949.877f, -458.198f, 56.4874f, 0.314159f}, + {900.35f, -479.024f, 58.3553f, 0.122173f}, + {854.449f, -442.255f, 50.6589f, 0.401426f}, + {886.685f, -442.358f, 54.6962f, -1.22173f}, + {817.509f, -457.331f, 48.4666f, 2.07694f}, + {793.411f, -326.281f, 63.1117f, -2.79253f}, //coldtooth - {-934.212f,-57.3517f,80.277f,-0.0174535f}, - {-916.281f,-36.8579f,77.0227f,0.122173f}, - {-902.73f,-103.868f,75.4378f,-1.58825f}, - {-900.514f,-143.527f,75.9686f,1.8675f}, - {-862.882f,-0.353299f,72.1526f,-2.51327f}, - {-854.932f,-85.9184f,68.6056f,-2.04204f}, - {-851.833f,-118.959f,63.8672f,-0.0698131f}, - {-849.832f,-20.8421f,70.4672f,-1.81514f}, - {-844.25f,-60.0374f,72.1031f,-2.19912f}, - {-820.644f,-136.043f,63.1977f,2.40855f}, - {-947.642f,-208.807f,77.0101f,1.36136f}, - {-951.394f,-193.695f,67.634f,0.802851f} + {-934.212f, -57.3517f, 80.277f, -0.0174535f}, + {-916.281f, -36.8579f, 77.0227f, 0.122173f}, + {-902.73f, -103.868f, 75.4378f, -1.58825f}, + {-900.514f, -143.527f, 75.9686f, 1.8675f}, + {-862.882f, -0.353299f, 72.1526f, -2.51327f}, + {-854.932f, -85.9184f, 68.6056f, -2.04204f}, + {-851.833f, -118.959f, 63.8672f, -0.0698131f}, + {-849.832f, -20.8421f, 70.4672f, -1.81514f}, + {-844.25f, -60.0374f, 72.1031f, -2.19912f}, + {-820.644f, -136.043f, 63.1977f, 2.40855f}, + {-947.642f, -208.807f, 77.0101f, 1.36136f}, + {-951.394f, -193.695f, 67.634f, 0.802851f} }; const float BG_AV_DoorPositons[2][4] = { @@ -611,7 +611,7 @@ enum BG_AV_CreaturePlace AV_CPLACE_TRIGGER14 = 315, AV_CPLACE_TRIGGER15 = 316, - //boss,captain triggers + //boss, captain triggers AV_CPLACE_TRIGGER16 = 317, AV_CPLACE_TRIGGER17 = 318, AV_CPLACE_TRIGGER18 = 319, @@ -623,359 +623,359 @@ enum BG_AV_CreaturePlace //x, y, z, o const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = { //spiritguides - {643.000000f,44.000000f,69.740196f,-0.001854f}, - {676.000000f,-374.000000f,30.000000f,-0.001854f}, - {73.417755f,-496.433105f,48.731918f,-0.001854f}, - {-157.409195f,31.206272f,77.050598f,-0.001854f}, - {-531.217834f,-405.231384f,49.551376f,-0.001854f}, - {-1090.476807f,-253.308670f,57.672371f,-0.001854f}, - {-1496.065063f,-333.338409f,101.134804f,-0.001854f}, - {873.001770f,-491.283630f,96.541931f,-0.001854f}, - {-1437.670044f,-610.088989f,51.161900f,-0.001854f}, + {643.000000f, 44.000000f, 69.740196f, -0.001854f}, + {676.000000f, -374.000000f, 30.000000f, -0.001854f}, + {73.417755f, -496.433105f, 48.731918f, -0.001854f}, + {-157.409195f, 31.206272f, 77.050598f, -0.001854f}, + {-531.217834f, -405.231384f, 49.551376f, -0.001854f}, + {-1090.476807f, -253.308670f, 57.672371f, -0.001854f}, + {-1496.065063f, -333.338409f, 101.134804f, -0.001854f}, + {873.001770f, -491.283630f, 96.541931f, -0.001854f}, + {-1437.670044f, -610.088989f, 51.161900f, -0.001854f}, //grave //firstaid - {635.17f,-29.5594f,46.5056f,4.81711f}, - {642.488f,-32.9437f,46.365f,4.67748f}, - {642.326f,-27.9442f,46.9211f,4.59022f}, - {635.945f,-33.6171f,45.7164f,4.97419f}, + {635.17f, -29.5594f, 46.5056f, 4.81711f}, + {642.488f, -32.9437f, 46.365f, 4.67748f}, + {642.326f, -27.9442f, 46.9211f, 4.59022f}, + {635.945f, -33.6171f, 45.7164f, 4.97419f}, //stormpike - {669.272f,-297.304f,30.291f,4.66604f}, - {674.08f,-292.328f,30.4817f,0.0918785f}, - {667.01f,-288.532f,29.8809f,1.81583f}, - {664.153f,-294.042f,30.2851f,3.28531f}, + {669.272f, -297.304f, 30.291f, 4.66604f}, + {674.08f, -292.328f, 30.4817f, 0.0918785f}, + {667.01f, -288.532f, 29.8809f, 1.81583f}, + {664.153f, -294.042f, 30.2851f, 3.28531f}, //stone - {81.7027f,-406.135f,47.7843f,0.598464f}, - {78.1431f,-409.215f,48.0401f,5.05953f}, - {73.4135f,-407.035f,46.7527f,3.34736f}, - {78.2258f,-401.859f,46.4202f,2.05852f}, + {81.7027f, -406.135f, 47.7843f, 0.598464f}, + {78.1431f, -409.215f, 48.0401f, 5.05953f}, + {73.4135f, -407.035f, 46.7527f, 3.34736f}, + {78.2258f, -401.859f, 46.4202f, 2.05852f}, //snowfall - {-207.412f,-110.616f,78.7959f,2.43251f}, - {-197.95f,-112.205f,78.5686f,6.22441f}, - {-202.709f,-116.829f,78.4358f,5.13742f}, - {-202.059f,-108.314f,78.5783f,5.91968f}, + {-207.412f, -110.616f, 78.7959f, 2.43251f}, + {-197.95f, -112.205f, 78.5686f, 6.22441f}, + {-202.709f, -116.829f, 78.4358f, 5.13742f}, + {-202.059f, -108.314f, 78.5783f, 5.91968f}, //ice - {-615.501f,-393.802f,60.4299f,3.06147f}, - {-608.513f,-392.717f,62.5724f,2.06323f}, - {-609.769f,-400.072f,60.7174f,5.22367f}, - {-616.093f,-398.293f,60.5628f,3.73613f}, + {-615.501f, -393.802f, 60.4299f, 3.06147f}, + {-608.513f, -392.717f, 62.5724f, 2.06323f}, + {-609.769f, -400.072f, 60.7174f, 5.22367f}, + {-616.093f, -398.293f, 60.5628f, 3.73613f}, //frost - {-1077.7f,-340.21f,55.4682f,6.25569f}, - {-1082.74f,-333.821f,54.7962f,2.05459f}, - {-1090.66f,-341.267f,54.6768f,3.27746f}, - {-1081.58f,-344.63f,55.256f,4.75636f}, + {-1077.7f, -340.21f, 55.4682f, 6.25569f}, + {-1082.74f, -333.821f, 54.7962f, 2.05459f}, + {-1090.66f, -341.267f, 54.6768f, 3.27746f}, + {-1081.58f, -344.63f, 55.256f, 4.75636f}, //frost hut - {-1408.95f,-311.69f,89.2536f,4.49954f}, - {-1407.15f,-305.323f,89.1993f,2.86827f}, - {-1400.64f,-304.3f,89.7008f,1.0595f}, - {-1400.4f,-311.35f,89.3028f,4.99434f}, + {-1408.95f, -311.69f, 89.2536f, 4.49954f}, + {-1407.15f, -305.323f, 89.1993f, 2.86827f}, + {-1400.64f, -304.3f, 89.7008f, 1.0595f}, + {-1400.4f, -311.35f, 89.3028f, 4.99434f}, //towers //dun south - OK - {569.395f,-101.064f,52.8296f,2.34974f}, - {574.85f,-92.9842f,52.5869f,3.09325f}, - {575.411f,-83.597f,52.3626f,6.26573f}, - {571.352f,-75.6582f,52.479f,0.523599f}, + {569.395f, -101.064f, 52.8296f, 2.34974f}, + {574.85f, -92.9842f, 52.5869f, 3.09325f}, + {575.411f, -83.597f, 52.3626f, 6.26573f}, + {571.352f, -75.6582f, 52.479f, 0.523599f}, //dun north - OK - {668.60f,-122.53f,64.12f,2.34f}, //not 100% ok - {662.253f,-129.105f,64.1794f,2.77507f}, - {661.209f,-138.877f,64.2251f,3.38594f}, - {665.481f,-146.857f,64.1271f,3.75246f}, + {668.60f, -122.53f, 64.12f, 2.34f}, //not 100% ok + {662.253f, -129.105f, 64.1794f, 2.77507f}, + {661.209f, -138.877f, 64.2251f, 3.38594f}, + {665.481f, -146.857f, 64.1271f, 3.75246f}, //icewing - OK - {225.228f,-368.909f,56.9983f,6.23806f}, - {191.36f,-369.899f,57.1524f,3.24631f}, - {215.518f,-384.019f,56.9889f,5.09636f}, - {199.625f,-382.177f,56.8691f,4.08407f}, + {225.228f, -368.909f, 56.9983f, 6.23806f}, + {191.36f, -369.899f, 57.1524f, 3.24631f}, + {215.518f, -384.019f, 56.9889f, 5.09636f}, + {199.625f, -382.177f, 56.8691f, 4.08407f}, //stone - {-172.851f,-452.366f,40.8725f,3.31829f}, - {-147.147f,-435.053f,40.8022f,0.599238f}, - {-169.456f,-440.325f,40.985f,2.59101f}, - {-163.494f,-434.904f,41.0725f,1.84174f}, + {-172.851f, -452.366f, 40.8725f, 3.31829f}, + {-147.147f, -435.053f, 40.8022f, 0.599238f}, + {-169.456f, -440.325f, 40.985f, 2.59101f}, + {-163.494f, -434.904f, 41.0725f, 1.84174f}, //ice - OK - {-573.522f,-271.854f,75.0078f,3.9619f}, - {-565.616f,-269.051f,74.9952f,5.02655f}, - {-562.825f,-261.087f,74.9898f,5.95157f}, - {-569.176f,-254.446f,74.8771f,0.820305f}, + {-573.522f, -271.854f, 75.0078f, 3.9619f}, + {-565.616f, -269.051f, 74.9952f, 5.02655f}, + {-562.825f, -261.087f, 74.9898f, 5.95157f}, + {-569.176f, -254.446f, 74.8771f, 0.820305f}, //towerpoint - {-763.04f,-371.032f,90.7933f,5.25979f}, - {-759.764f,-358.264f,90.8681f,0.289795f}, - {-768.808f,-353.056f,90.8811f,1.52601f}, - {-775.944f,-362.639f,90.8949f,2.59573f}, + {-763.04f, -371.032f, 90.7933f, 5.25979f}, + {-759.764f, -358.264f, 90.8681f, 0.289795f}, + {-768.808f, -353.056f, 90.8811f, 1.52601f}, + {-775.944f, -362.639f, 90.8949f, 2.59573f}, //frost etower - {-1294.13f,-313.045f,107.328f,0.270162f}, - {-1306.5f,-308.105f,113.767f,1.78755f}, - {-1294.78f,-319.966f,113.79f,5.94545f}, - {-1294.83f,-312.241f,113.799f,0.295293f}, + {-1294.13f, -313.045f, 107.328f, 0.270162f}, + {-1306.5f, -308.105f, 113.767f, 1.78755f}, + {-1294.78f, -319.966f, 113.79f, 5.94545f}, + {-1294.83f, -312.241f, 113.799f, 0.295293f}, //frost wtower - {-1300.96f,-275.111f,114.058f,4.12804f}, - {-1302.41f,-259.256f,114.065f,1.67602f}, - {-1287.97f,-262.087f,114.165f,6.18264f}, - {-1291.59f,-271.166f,114.151f,5.28257f}, + {-1300.96f, -275.111f, 114.058f, 4.12804f}, + {-1302.41f, -259.256f, 114.065f, 1.67602f}, + {-1287.97f, -262.087f, 114.165f, 6.18264f}, + {-1291.59f, -271.166f, 114.151f, 5.28257f}, //alliance marshall - {721.104f,-7.64155f,50.7046f,3.45575f},// south - {723.058f,-14.1548f,50.7046f,3.40339f},// north - {715.691f,-4.72233f,50.2187f,3.47321f},// icewing - {720.046f,-19.9413f,50.2187f,3.36849f},// stone + {721.104f, -7.64155f, 50.7046f, 3.45575f}, // south + {723.058f, -14.1548f, 50.7046f, 3.40339f}, // north + {715.691f, -4.72233f, 50.2187f, 3.47321f}, // icewing + {720.046f, -19.9413f, 50.2187f, 3.36849f}, // stone //horde (coords not 100% ok) - {-1363.99f,-221.99f,98.4053f,4.93012f}, - {-1370.96f,-223.532f,98.4266f,4.93012f}, - {-1378.37f,-228.614f,99.3546f,5.38565f}, - {-1358.02f,-228.998f,98.868f,3.87768f}, + {-1363.99f, -221.99f, 98.4053f, 4.93012f}, + {-1370.96f, -223.532f, 98.4266f, 4.93012f}, + {-1378.37f, -228.614f, 99.3546f, 5.38565f}, + {-1358.02f, -228.998f, 98.868f, 3.87768f}, //irondeep mine //Irondeep Trogg - {971.671f,-442.657f,57.6951f,3.1765f}, - {969.979f,-457.148f,58.1119f,4.5204f}, - {958.692f,-333.477f,63.2276f,5.77704f}, - {957.113f,-325.92f,61.7589f,1.13446f}, - {948.25f,-448.268f,56.9009f,5.60251f}, - {934.727f,-385.802f,63.0344f,3.75246f}, - {931.751f,-403.458f,59.6737f,5.63741f}, - {931.146f,-359.666f,66.0294f,3.9619f}, - {929.702f,-412.401f,56.8776f,5.89921f}, - {926.849f,-379.074f,63.5286f,2.0944f}, - {921.972f,-358.597f,66.4313f,2.93215f}, - {921.449f,-341.981f,67.1264f,3.4383f}, - {921.1f,-395.812f,60.4615f,2.71695f}, - {919.274f,-394.986f,60.3478f,2.71696f}, - {916.852f,-393.891f,60.1726f,2.71695f}, - {914.568f,-326.21f,66.1733f,2.25147f}, - {913.064f,-395.773f,60.1364f,4.41568f}, - {909.246f,-474.576f,58.2067f,0.226893f}, - {909.246f,-474.576f,58.2901f,0.226893f}, - {907.209f,-428.267f,59.8065f,1.8675f}, - {905.973f,-459.528f,58.7594f,1.37189f}, - {905.067f,-396.074f,60.2085f,5.07891f}, - {901.809f,-457.709f,59.0116f,3.52557f}, - {900.962f,-427.44f,59.0842f,1.50098f}, - {897.929f,-471.742f,59.7729f,2.54818f}, - {893.376f,-343.171f,68.1499f,5.35816f}, - {890.584f,-406.049f,61.1925f,5.67232f}, - {888.208f,-332.564f,68.148f,1.93732f}, - {887.647f,-391.537f,61.8734f,1.37881f}, - {885.109f,-343.338f,67.0867f,3.78979f}, - {881.618f,-419.948f,53.5228f,0.593412f}, - {878.675f,-345.36f,66.1052f,3.45651f}, - {877.127f,-351.8f,66.5296f,5.74213f}, - {876.778f,-345.97f,65.7724f,3.45262f}, - {874.577f,-414.786f,52.7817f,1.67552f}, - {868.247f,-343.136f,64.9894f,1.6057f}, - {859.03f,-367.231f,47.4655f,0.0174533f}, - {857.513f,-351.817f,65.1867f,4.39823f}, - {852.632f,-372.416f,48.1657f,3.66519f}, - {849.86f,-340.944f,66.2447f,0.401426f}, - {847.99f,-386.287f,60.9277f,2.32374f}, - {847.601f,-423.072f,50.0852f,4.57276f}, - {847.135f,-411.307f,50.2106f,1.5708f}, - {835.077f,-379.418f,48.2755f,5.93412f}, - {834.87f,-453.304f,47.9075f,0.226893f}, - {834.634f,-365.981f,62.8801f,1.32645f}, - {834.354f,-355.526f,48.1491f,6.07375f}, - {833.702f,-327.506f,65.0439f,0.331613f}, - {833.151f,-374.228f,63.0938f,3.66519f}, - {831.711f,-346.785f,47.2975f,0.226893f}, - {827.874f,-413.624f,48.5818f,1.49241f}, - {827.728f,-415.483f,48.5593f,1.49238f}, - {827.016f,-424.543f,48.2856f,1.49236f}, - {823.222f,-334.283f,65.6306f,4.88692f}, - {821.892f,-464.723f,48.9451f,4.66003f}, - {821.006f,-387.635f,49.0728f,3.15905f}, - {817.26f,-447.432f,49.4308f,2.18166f}, - {805.399f,-320.146f,52.7712f,0.296706f}, - {801.405f,-328.055f,53.0195f,4.31096f}, + {971.671f, -442.657f, 57.6951f, 3.1765f}, + {969.979f, -457.148f, 58.1119f, 4.5204f}, + {958.692f, -333.477f, 63.2276f, 5.77704f}, + {957.113f, -325.92f, 61.7589f, 1.13446f}, + {948.25f, -448.268f, 56.9009f, 5.60251f}, + {934.727f, -385.802f, 63.0344f, 3.75246f}, + {931.751f, -403.458f, 59.6737f, 5.63741f}, + {931.146f, -359.666f, 66.0294f, 3.9619f}, + {929.702f, -412.401f, 56.8776f, 5.89921f}, + {926.849f, -379.074f, 63.5286f, 2.0944f}, + {921.972f, -358.597f, 66.4313f, 2.93215f}, + {921.449f, -341.981f, 67.1264f, 3.4383f}, + {921.1f, -395.812f, 60.4615f, 2.71695f}, + {919.274f, -394.986f, 60.3478f, 2.71696f}, + {916.852f, -393.891f, 60.1726f, 2.71695f}, + {914.568f, -326.21f, 66.1733f, 2.25147f}, + {913.064f, -395.773f, 60.1364f, 4.41568f}, + {909.246f, -474.576f, 58.2067f, 0.226893f}, + {909.246f, -474.576f, 58.2901f, 0.226893f}, + {907.209f, -428.267f, 59.8065f, 1.8675f}, + {905.973f, -459.528f, 58.7594f, 1.37189f}, + {905.067f, -396.074f, 60.2085f, 5.07891f}, + {901.809f, -457.709f, 59.0116f, 3.52557f}, + {900.962f, -427.44f, 59.0842f, 1.50098f}, + {897.929f, -471.742f, 59.7729f, 2.54818f}, + {893.376f, -343.171f, 68.1499f, 5.35816f}, + {890.584f, -406.049f, 61.1925f, 5.67232f}, + {888.208f, -332.564f, 68.148f, 1.93732f}, + {887.647f, -391.537f, 61.8734f, 1.37881f}, + {885.109f, -343.338f, 67.0867f, 3.78979f}, + {881.618f, -419.948f, 53.5228f, 0.593412f}, + {878.675f, -345.36f, 66.1052f, 3.45651f}, + {877.127f, -351.8f, 66.5296f, 5.74213f}, + {876.778f, -345.97f, 65.7724f, 3.45262f}, + {874.577f, -414.786f, 52.7817f, 1.67552f}, + {868.247f, -343.136f, 64.9894f, 1.6057f}, + {859.03f, -367.231f, 47.4655f, 0.0174533f}, + {857.513f, -351.817f, 65.1867f, 4.39823f}, + {852.632f, -372.416f, 48.1657f, 3.66519f}, + {849.86f, -340.944f, 66.2447f, 0.401426f}, + {847.99f, -386.287f, 60.9277f, 2.32374f}, + {847.601f, -423.072f, 50.0852f, 4.57276f}, + {847.135f, -411.307f, 50.2106f, 1.5708f}, + {835.077f, -379.418f, 48.2755f, 5.93412f}, + {834.87f, -453.304f, 47.9075f, 0.226893f}, + {834.634f, -365.981f, 62.8801f, 1.32645f}, + {834.354f, -355.526f, 48.1491f, 6.07375f}, + {833.702f, -327.506f, 65.0439f, 0.331613f}, + {833.151f, -374.228f, 63.0938f, 3.66519f}, + {831.711f, -346.785f, 47.2975f, 0.226893f}, + {827.874f, -413.624f, 48.5818f, 1.49241f}, + {827.728f, -415.483f, 48.5593f, 1.49238f}, + {827.016f, -424.543f, 48.2856f, 1.49236f}, + {823.222f, -334.283f, 65.6306f, 4.88692f}, + {821.892f, -464.723f, 48.9451f, 4.66003f}, + {821.006f, -387.635f, 49.0728f, 3.15905f}, + {817.26f, -447.432f, 49.4308f, 2.18166f}, + {805.399f, -320.146f, 52.7712f, 0.296706f}, + {801.405f, -328.055f, 53.0195f, 4.31096f}, //irondeep skullthumber irondeep shaman - {955.812f,-440.302f,55.3411f,3.19395f}, - {937.378f,-377.816f,65.3919f,3.56047f}, - {925.059f,-331.347f,65.7564f,3.66519f}, - {922.918f,-396.634f,60.3942f,2.71695f}, - {909.99f,-462.154f,59.0811f,3.7001f}, - {907.893f,-388.787f,61.7923f,5.74213f}, - {898.801f,-437.105f,58.5266f,0.959931f}, - {884.237f,-407.597f,61.566f,0.820305f}, - {880.744f,-344.683f,66.4086f,3.4644f}, - {876.047f,-341.857f,65.8743f,4.45059f}, - {874.674f,-402.077f,61.7573f,0.26341f}, - {871.914f,-404.209f,62.1269f,6.06163f}, - {871.606f,-403.665f,62.0795f,0.765774f}, - {871.561f,-404.114f,62.1297f,0.00981727f}, - {871.528f,-404.248f,62.1455f,0.498032f}, - {871.493f,-404.122f,62.1331f,5.65727f}, - {871.282f,-403.843f,62.1108f,0.788382f}, - {868.294f,-392.395f,61.4772f,4.38685f}, - {868.256f,-392.363f,61.4803f,0.732738f}, - {867.804f,-392.51f,61.5089f,2.30167f}, - {867.612f,-392.371f,61.524f,2.86149f}, - {858.593f,-439.614f,50.2184f,0.872665f}, - {851.471f,-362.52f,47.314f,4.06662f}, - {846.939f,-347.279f,66.2876f,0.942478f}, - {842.08f,-421.775f,48.2659f,1.0821f}, - {838.358f,-371.212f,63.3299f,4.04916f}, - {827.57f,-417.483f,48.4538f,1.49237f}, - {827.012f,-457.397f,48.9331f,2.35619f}, - {825.535f,-322.373f,63.9357f,4.76475f}, - {867.635f,-443.605f,51.3347f,1.38626f}, - {957.293f,-455.039f,56.7395f,5.79449f}, - {950.077f,-326.672f,61.6552f,5.48033f}, - {936.692f,-356.78f,65.9835f,2.75762f}, - {926.475f,-419.345f,56.1833f,2.0944f}, - {924.729f,-397.453f,60.213f,2.71695f}, - {902.195f,-475.891f,58.312f,1.39626f}, - {897.464f,-338.758f,68.1715f,2.94961f}, - {884.237f,-407.597f,61.566f,0.820305f}, - {882.517f,-344.111f,66.7887f,3.46962f}, - {881.437f,-400.254f,61.2028f,0.263427f}, - {880.156f,-400.678f,61.3113f,3.41373f}, - {877.989f,-418.051f,52.9753f,4.46804f}, - {871.212f,-404.12f,62.1433f,3.6554f}, - {871.036f,-404.119f,62.2237f,4.50295f}, - {857.396f,-395.766f,61.263f,4.78684f}, - {857.276f,-395.395f,61.2418f,0.0845553f}, - {857.231f,-394.577f,61.2174f,1.96817f}, - {857.108f,-395.682f,61.2317f,4.87022f}, - {856.709f,-395.28f,61.1814f,2.54913f}, - {850.922f,-390.399f,60.8771f,2.85405f}, - {847.556f,-388.228f,60.9438f,2.56872f}, - {842.031f,-384.663f,61.6028f,2.56871f}, - {832.035f,-389.301f,47.5567f,2.11185f}, - {827.415f,-419.468f,48.3322f,1.49232f}, - {826.402f,-349.454f,47.2722f,1.51844f}, - {817.83f,-455.715f,48.4207f,0.925025f}, - {808.953f,-325.964f,52.4043f,3.01942f}, + {955.812f, -440.302f, 55.3411f, 3.19395f}, + {937.378f, -377.816f, 65.3919f, 3.56047f}, + {925.059f, -331.347f, 65.7564f, 3.66519f}, + {922.918f, -396.634f, 60.3942f, 2.71695f}, + {909.99f, -462.154f, 59.0811f, 3.7001f}, + {907.893f, -388.787f, 61.7923f, 5.74213f}, + {898.801f, -437.105f, 58.5266f, 0.959931f}, + {884.237f, -407.597f, 61.566f, 0.820305f}, + {880.744f, -344.683f, 66.4086f, 3.4644f}, + {876.047f, -341.857f, 65.8743f, 4.45059f}, + {874.674f, -402.077f, 61.7573f, 0.26341f}, + {871.914f, -404.209f, 62.1269f, 6.06163f}, + {871.606f, -403.665f, 62.0795f, 0.765774f}, + {871.561f, -404.114f, 62.1297f, 0.00981727f}, + {871.528f, -404.248f, 62.1455f, 0.498032f}, + {871.493f, -404.122f, 62.1331f, 5.65727f}, + {871.282f, -403.843f, 62.1108f, 0.788382f}, + {868.294f, -392.395f, 61.4772f, 4.38685f}, + {868.256f, -392.363f, 61.4803f, 0.732738f}, + {867.804f, -392.51f, 61.5089f, 2.30167f}, + {867.612f, -392.371f, 61.524f, 2.86149f}, + {858.593f, -439.614f, 50.2184f, 0.872665f}, + {851.471f, -362.52f, 47.314f, 4.06662f}, + {846.939f, -347.279f, 66.2876f, 0.942478f}, + {842.08f, -421.775f, 48.2659f, 1.0821f}, + {838.358f, -371.212f, 63.3299f, 4.04916f}, + {827.57f, -417.483f, 48.4538f, 1.49237f}, + {827.012f, -457.397f, 48.9331f, 2.35619f}, + {825.535f, -322.373f, 63.9357f, 4.76475f}, + {867.635f, -443.605f, 51.3347f, 1.38626f}, + {957.293f, -455.039f, 56.7395f, 5.79449f}, + {950.077f, -326.672f, 61.6552f, 5.48033f}, + {936.692f, -356.78f, 65.9835f, 2.75762f}, + {926.475f, -419.345f, 56.1833f, 2.0944f}, + {924.729f, -397.453f, 60.213f, 2.71695f}, + {902.195f, -475.891f, 58.312f, 1.39626f}, + {897.464f, -338.758f, 68.1715f, 2.94961f}, + {884.237f, -407.597f, 61.566f, 0.820305f}, + {882.517f, -344.111f, 66.7887f, 3.46962f}, + {881.437f, -400.254f, 61.2028f, 0.263427f}, + {880.156f, -400.678f, 61.3113f, 3.41373f}, + {877.989f, -418.051f, 52.9753f, 4.46804f}, + {871.212f, -404.12f, 62.1433f, 3.6554f}, + {871.036f, -404.119f, 62.2237f, 4.50295f}, + {857.396f, -395.766f, 61.263f, 4.78684f}, + {857.276f, -395.395f, 61.2418f, 0.0845553f}, + {857.231f, -394.577f, 61.2174f, 1.96817f}, + {857.108f, -395.682f, 61.2317f, 4.87022f}, + {856.709f, -395.28f, 61.1814f, 2.54913f}, + {850.922f, -390.399f, 60.8771f, 2.85405f}, + {847.556f, -388.228f, 60.9438f, 2.56872f}, + {842.031f, -384.663f, 61.6028f, 2.56871f}, + {832.035f, -389.301f, 47.5567f, 2.11185f}, + {827.415f, -419.468f, 48.3322f, 1.49232f}, + {826.402f, -349.454f, 47.2722f, 1.51844f}, + {817.83f, -455.715f, 48.4207f, 0.925025f}, + {808.953f, -325.964f, 52.4043f, 3.01942f}, // Morloch - {865.554f,-438.735f,50.7333f,2.12431f}, + {865.554f, -438.735f, 50.7333f, 2.12431f}, //coldtooth mine //miner/digger - {-917.648f,-46.8922f,77.0872f,5.27089f}, - {-912.689f,-45.4494f,76.2277f,4.60767f}, - {-905.455f,-84.5179f,75.3642f,3.29867f}, - {-904.332f,-111.509f,75.5925f,2.47837f}, - {-904.27f,-160.419f,61.9876f,3.61192f}, - {-904.023f,-90.4558f,75.3706f,3.40339f}, - {-978.678f,-37.3136f,75.8364f,2.84489f}, - {-973.076f,-36.5013f,77.5047f,1.0821f}, - {-963.951f,-87.734f,81.5555f,0.575959f}, - {-961.941f,-90.7252f,81.6629f,0.820305f}, - {-957.623f,-186.582f,66.6021f,1.95477f}, - {-952.476f,-179.778f,78.6771f,4.5204f}, - {-950.427f,-115.007f,79.6127f,3.68264f}, - {-950.25f,-151.95f,79.4598f,-1.81423f}, - {-950.169f,-188.099f,66.6184f,5.55015f}, - {-949.944f,-142.977f,80.5382f,2.70526f}, - {-947.854f,-170.5f,79.7618f,0.942478f}, - {-946.738f,-139.567f,80.0904f,2.3911f}, - {-945.503f,-65.0654f,79.7907f,5.02655f}, - {-943.678f,-110.986f,80.2557f,0.959931f}, - {-942.993f,-56.9881f,79.8915f,5.65487f}, - {-938.197f,-155.838f,61.3111f,1.65806f}, - {-930.488f,-214.524f,72.1431f,2.1236f}, - {-929.947f,-154.449f,61.5084f,1.67552f}, - {-927.412f,-135.313f,61.1987f,3.29867f}, - {-920.677f,-156.859f,62.8033f,3.15306f}, - {-916.75f,-136.094f,62.2357f,0.0698132f}, - {-915.319f,-132.718f,62.562f,1.16984f}, - {-913.589f,-146.794f,76.9366f,1.8675f}, - {-907.572f,-148.937f,76.6898f,4.76475f}, - {-902.02f,-64.6174f,73.9707f,1.19169f}, - {-899.489f,-61.7252f,73.2498f,5.09636f}, - {-894.792f,-127.141f,75.3834f,6.14356f}, - {-892.408f,-162.525f,64.1212f,2.69884f}, - {-892.326f,-123.158f,76.0318f,5.5676f}, - {-888.468f,-148.462f,61.8012f,1.65806f}, - {-883.268f,-159.738f,63.5311f,5.20108f}, - {-877.76f,-118.07f,65.215f,2.94961f}, - {-876.792f,-128.646f,64.1045f,3.40339f}, - {-874.901f,-36.6579f,69.4246f,2.00713f}, - {-874.856f,-151.351f,62.7537f,3.57875f}, - {-872.135f,-150.08f,62.7513f,3.57201f}, - {-870.288f,-149.217f,62.5413f,3.56624f}, - {-870.03f,-6.27443f,70.3867f,2.3911f}, - {-869.023f,-82.2118f,69.5848f,3.22886f}, - {-866.354f,-40.2455f,70.842f,0.0698132f}, - {-865.305f,-152.302f,63.5044f,4.86947f}, - {-861.926f,-79.0519f,71.4178f,0.20944f}, - {-857.292f,-152.277f,63.2114f,4.18879f}, - {-853.357f,-0.696194f,72.0655f,0.994838f}, - {-850.685f,-14.2596f,70.2298f,0.20944f}, - {-839.987f,-67.7695f,72.7916f,4.93928f}, - {-839.199f,-57.0558f,73.4891f,1.67552f}, - {-836.963f,-153.224f,63.3821f,4.46804f}, - {-832.721f,-67.7555f,72.9062f,4.99164f}, - {-821.496f,-143.095f,63.1292f,0.541052f}, - {-818.829f,-153.004f,62.1757f,6.12611f}, + {-917.648f, -46.8922f, 77.0872f, 5.27089f}, + {-912.689f, -45.4494f, 76.2277f, 4.60767f}, + {-905.455f, -84.5179f, 75.3642f, 3.29867f}, + {-904.332f, -111.509f, 75.5925f, 2.47837f}, + {-904.27f, -160.419f, 61.9876f, 3.61192f}, + {-904.023f, -90.4558f, 75.3706f, 3.40339f}, + {-978.678f, -37.3136f, 75.8364f, 2.84489f}, + {-973.076f, -36.5013f, 77.5047f, 1.0821f}, + {-963.951f, -87.734f, 81.5555f, 0.575959f}, + {-961.941f, -90.7252f, 81.6629f, 0.820305f}, + {-957.623f, -186.582f, 66.6021f, 1.95477f}, + {-952.476f, -179.778f, 78.6771f, 4.5204f}, + {-950.427f, -115.007f, 79.6127f, 3.68264f}, + {-950.25f, -151.95f, 79.4598f, -1.81423f}, + {-950.169f, -188.099f, 66.6184f, 5.55015f}, + {-949.944f, -142.977f, 80.5382f, 2.70526f}, + {-947.854f, -170.5f, 79.7618f, 0.942478f}, + {-946.738f, -139.567f, 80.0904f, 2.3911f}, + {-945.503f, -65.0654f, 79.7907f, 5.02655f}, + {-943.678f, -110.986f, 80.2557f, 0.959931f}, + {-942.993f, -56.9881f, 79.8915f, 5.65487f}, + {-938.197f, -155.838f, 61.3111f, 1.65806f}, + {-930.488f, -214.524f, 72.1431f, 2.1236f}, + {-929.947f, -154.449f, 61.5084f, 1.67552f}, + {-927.412f, -135.313f, 61.1987f, 3.29867f}, + {-920.677f, -156.859f, 62.8033f, 3.15306f}, + {-916.75f, -136.094f, 62.2357f, 0.0698132f}, + {-915.319f, -132.718f, 62.562f, 1.16984f}, + {-913.589f, -146.794f, 76.9366f, 1.8675f}, + {-907.572f, -148.937f, 76.6898f, 4.76475f}, + {-902.02f, -64.6174f, 73.9707f, 1.19169f}, + {-899.489f, -61.7252f, 73.2498f, 5.09636f}, + {-894.792f, -127.141f, 75.3834f, 6.14356f}, + {-892.408f, -162.525f, 64.1212f, 2.69884f}, + {-892.326f, -123.158f, 76.0318f, 5.5676f}, + {-888.468f, -148.462f, 61.8012f, 1.65806f}, + {-883.268f, -159.738f, 63.5311f, 5.20108f}, + {-877.76f, -118.07f, 65.215f, 2.94961f}, + {-876.792f, -128.646f, 64.1045f, 3.40339f}, + {-874.901f, -36.6579f, 69.4246f, 2.00713f}, + {-874.856f, -151.351f, 62.7537f, 3.57875f}, + {-872.135f, -150.08f, 62.7513f, 3.57201f}, + {-870.288f, -149.217f, 62.5413f, 3.56624f}, + {-870.03f, -6.27443f, 70.3867f, 2.3911f}, + {-869.023f, -82.2118f, 69.5848f, 3.22886f}, + {-866.354f, -40.2455f, 70.842f, 0.0698132f}, + {-865.305f, -152.302f, 63.5044f, 4.86947f}, + {-861.926f, -79.0519f, 71.4178f, 0.20944f}, + {-857.292f, -152.277f, 63.2114f, 4.18879f}, + {-853.357f, -0.696194f, 72.0655f, 0.994838f}, + {-850.685f, -14.2596f, 70.2298f, 0.20944f}, + {-839.987f, -67.7695f, 72.7916f, 4.93928f}, + {-839.199f, -57.0558f, 73.4891f, 1.67552f}, + {-836.963f, -153.224f, 63.3821f, 4.46804f}, + {-832.721f, -67.7555f, 72.9062f, 4.99164f}, + {-821.496f, -143.095f, 63.1292f, 0.541052f}, + {-818.829f, -153.004f, 62.1757f, 6.12611f}, //special - {-954.622f,-110.958f,80.7911f,6.24828f}, - {-951.477f,-53.9647f,80.0235f,5.32325f}, - {-946.812f,-126.04f,78.8601f,5.15265f}, - {-940.689f,-140.707f,79.9225f,2.79253f}, - {-933.954f,-159.632f,60.778f,2.56563f}, - {-922.537f,-130.291f,61.3756f,4.95674f}, - {-915.862f,-151.74f,76.9427f,0.942478f}, - {-888.321f,-159.831f,62.5303f,1.20428f}, - {-874.361f,-42.4751f,69.4316f,0.785398f}, - {-873.19f,-50.4899f,70.0568f,-2.41288f}, - {-868.511f,-148.386f,62.3547f,3.57875f}, - {-868.44f,-121.649f,64.5056f,3.33358f}, - {-868.324f,-77.7196f,71.4768f,5.41052f}, - {-859.846f,-19.6549f,70.7304f,1.97222f}, - {-828.05f,-150.508f,62.2019f,2.14675f}, - {-826.254f,-58.6911f,72.0041f,3.68264f}, - {-976.086f,-44.1775f,76.029f,1.46608f}, - {-971.864f,-87.4223f,81.4954f,5.8294f}, - {-966.551f,-74.1111f,80.0243f,4.2129f}, - {-958.509f,-173.652f,77.9013f,6.24828f}, - {-951.511f,-181.242f,65.529f,4.39823f}, - {-940.967f,-186.243f,77.698f,1.28164f}, - {-930.004f,-65.0898f,79.077f,0.0581657f}, - {-920.864f,-40.2009f,78.256f,5.16617f}, - {-919.089f,-148.021f,62.0317f,2.59327f}, - {-901.516f,-116.329f,75.6876f,0.471239f}, - {-897.864f,-84.4348f,74.083f,3.00197f}, - {-897.617f,-52.0457f,71.9503f,4.36332f}, - {-894.891f,-153.951f,61.6827f,3.23569f}, - {-893.933f,-111.625f,75.6591f,4.22536f}, - {-883.265f,-152.854f,61.8384f,0.0941087f}, - {-868.293f,-147.243f,62.1097f,3.2056f}, - {-867.501f,-11.8709f,70.018f,6.14356f}, - {-866.699f,-147.54f,62.1646f,3.57878f}, - {-866.566f,-91.1916f,67.4414f,4.56707f}, - {-857.272f,-141.142f,61.7356f,4.17134f}, - {-847.446f,-98.0061f,68.5131f,3.24631f}, - {-837.026f,-140.729f,62.5141f,5.51524f}, - {-824.204f,-65.053f,72.3381f,3.01942f}, + {-954.622f, -110.958f, 80.7911f, 6.24828f}, + {-951.477f, -53.9647f, 80.0235f, 5.32325f}, + {-946.812f, -126.04f, 78.8601f, 5.15265f}, + {-940.689f, -140.707f, 79.9225f, 2.79253f}, + {-933.954f, -159.632f, 60.778f, 2.56563f}, + {-922.537f, -130.291f, 61.3756f, 4.95674f}, + {-915.862f, -151.74f, 76.9427f, 0.942478f}, + {-888.321f, -159.831f, 62.5303f, 1.20428f}, + {-874.361f, -42.4751f, 69.4316f, 0.785398f}, + {-873.19f, -50.4899f, 70.0568f, -2.41288f}, + {-868.511f, -148.386f, 62.3547f, 3.57875f}, + {-868.44f, -121.649f, 64.5056f, 3.33358f}, + {-868.324f, -77.7196f, 71.4768f, 5.41052f}, + {-859.846f, -19.6549f, 70.7304f, 1.97222f}, + {-828.05f, -150.508f, 62.2019f, 2.14675f}, + {-826.254f, -58.6911f, 72.0041f, 3.68264f}, + {-976.086f, -44.1775f, 76.029f, 1.46608f}, + {-971.864f, -87.4223f, 81.4954f, 5.8294f}, + {-966.551f, -74.1111f, 80.0243f, 4.2129f}, + {-958.509f, -173.652f, 77.9013f, 6.24828f}, + {-951.511f, -181.242f, 65.529f, 4.39823f}, + {-940.967f, -186.243f, 77.698f, 1.28164f}, + {-930.004f, -65.0898f, 79.077f, 0.0581657f}, + {-920.864f, -40.2009f, 78.256f, 5.16617f}, + {-919.089f, -148.021f, 62.0317f, 2.59327f}, + {-901.516f, -116.329f, 75.6876f, 0.471239f}, + {-897.864f, -84.4348f, 74.083f, 3.00197f}, + {-897.617f, -52.0457f, 71.9503f, 4.36332f}, + {-894.891f, -153.951f, 61.6827f, 3.23569f}, + {-893.933f, -111.625f, 75.6591f, 4.22536f}, + {-883.265f, -152.854f, 61.8384f, 0.0941087f}, + {-868.293f, -147.243f, 62.1097f, 3.2056f}, + {-867.501f, -11.8709f, 70.018f, 6.14356f}, + {-866.699f, -147.54f, 62.1646f, 3.57878f}, + {-866.566f, -91.1916f, 67.4414f, 4.56707f}, + {-857.272f, -141.142f, 61.7356f, 4.17134f}, + {-847.446f, -98.0061f, 68.5131f, 3.24631f}, + {-837.026f, -140.729f, 62.5141f, 5.51524f}, + {-824.204f, -65.053f, 72.3381f, 3.01942f}, //vermin (s.th special for this mine) - {-951.955f,-197.5f,77.212f,5.63741f}, - {-944.837f,-199.608f,77.0737f,4.97419f}, - {-933.494f,-209.063f,73.7803f,5.88176f}, - {-929.666f,-201.308f,73.7032f,5.02655f}, - {-978.997f,-249.356f,65.4345f,5.05464f}, - {-974.565f,-224.828f,69.5858f,4.88846f}, - {-946.514f,-259.239f,66.0874f,3.78132f}, - {-918.402f,-250.439f,69.5271f,2.21352f}, - {-910.14f,-229.959f,72.9279f,0.27677f}, - {-851.563f,-88.6527f,68.5983f,3.61896f}, + {-951.955f, -197.5f, 77.212f, 5.63741f}, + {-944.837f, -199.608f, 77.0737f, 4.97419f}, + {-933.494f, -209.063f, 73.7803f, 5.88176f}, + {-929.666f, -201.308f, 73.7032f, 5.02655f}, + {-978.997f, -249.356f, 65.4345f, 5.05464f}, + {-974.565f, -224.828f, 69.5858f, 4.88846f}, + {-946.514f, -259.239f, 66.0874f, 3.78132f}, + {-918.402f, -250.439f, 69.5271f, 2.21352f}, + {-910.14f, -229.959f, 72.9279f, 0.27677f}, + {-851.563f, -88.6527f, 68.5983f, 3.61896f}, //boss - {-848.902f,-92.931f,68.6325f,3.33350f}, + {-848.902f, -92.931f, 68.6325f, 3.33350f}, //herald - {-48.459f,-288.802f,55.47f,1.0f}, + {-48.459f, -288.802f, 55.47f, 1.0f}, //triggers - {637.083f,-32.6603f,45.9715f,1.14353f}, //firstaid_station - {669.007f,-294.078f,30.2909f,2.77507f}, //stormpike_grave - {77.8013f,-404.7f,46.7549f,-0.872665f}, //stoneheart_grave - {-202.581f,-112.73f,78.4876f,-0.715585f}, //snowfall_grave - {-611.962f,-396.17f,60.8351f,2.53682f}, //iceblood_grave - {-1082.45f,-346.823f,54.9219f,-1.53589f}, //frostwolf_grave - {-1402.21f,-307.431f,89.4424f,0.191986f}, //frostwolf_hut - {553.779f,-78.6566f,51.9378f,-1.22173f}, //dunbaldar_south - {674.001f,-143.125f,63.6615f,0.994838f}, //dunbaldar_north - {203.281f,-360.366f,56.3869f,-0.925024f}, //icewing_bunker - {-152.437f,-441.758f,40.3982f,-1.95477f}, //stoneheart_bunker - {-571.88f,-262.777f,75.0087f,-0.802851f}, //iceblood_tower - {-768.907f,-363.71f,90.8949f,1.07991f}, //tower_point - {-1302.9f,-316.981f,113.867f,2.00713f}, //frostwolf_etower - {-1297.5f,-266.767f,114.15f,3.31044f}, //frostwolf_wtower - {-57.7891f,-286.597f,15.6479f,6.02139f}, //AV_NPC_A_CAPTAIN balinda - {722.43f,-10.9982f,50.7046f,3.42085f}, //AV_NPC_A_BOSS vanndar - {-545.23f,-165.35f,57.7886f,3.01145f}, //AV_NPC_H_CAPTAIN galvangar - {-1370.9f,-219.793f,98.4258f,5.04381f} //AV_NPC_H_BOSS drek thar + {637.083f, -32.6603f, 45.9715f, 1.14353f}, //firstaid_station + {669.007f, -294.078f, 30.2909f, 2.77507f}, //stormpike_grave + {77.8013f, -404.7f, 46.7549f, -0.872665f}, //stoneheart_grave + {-202.581f, -112.73f, 78.4876f, -0.715585f}, //snowfall_grave + {-611.962f, -396.17f, 60.8351f, 2.53682f}, //iceblood_grave + {-1082.45f, -346.823f, 54.9219f, -1.53589f}, //frostwolf_grave + {-1402.21f, -307.431f, 89.4424f, 0.191986f}, //frostwolf_hut + {553.779f, -78.6566f, 51.9378f, -1.22173f}, //dunbaldar_south + {674.001f, -143.125f, 63.6615f, 0.994838f}, //dunbaldar_north + {203.281f, -360.366f, 56.3869f, -0.925024f}, //icewing_bunker + {-152.437f, -441.758f, 40.3982f, -1.95477f}, //stoneheart_bunker + {-571.88f, -262.777f, 75.0087f, -0.802851f}, //iceblood_tower + {-768.907f, -363.71f, 90.8949f, 1.07991f}, //tower_point + {-1302.9f, -316.981f, 113.867f, 2.00713f}, //frostwolf_etower + {-1297.5f, -266.767f, 114.15f, 3.31044f}, //frostwolf_wtower + {-57.7891f, -286.597f, 15.6479f, 6.02139f}, //AV_NPC_A_CAPTAIN balinda + {722.43f, -10.9982f, 50.7046f, 3.42085f}, //AV_NPC_A_BOSS vanndar + {-545.23f, -165.35f, 57.7886f, 3.01145f}, //AV_NPC_H_CAPTAIN galvangar + {-1370.9f, -219.793f, 98.4258f, 5.04381f} //AV_NPC_H_BOSS drek thar }; enum BG_AV_CreatureIds @@ -1042,16 +1042,16 @@ const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX][4] = { { 13326, 1216, 59, 59 }, //Seasoned Defender { 13331, 1216, 60, 60 }, //Veteran Defender { 13422, 1216, 61, 61 }, //Champion Defender - { 13358, 1216, 59, 60 }, //Stormpike Bowman //i think its 60,61 and 69,70.. but this is until now not possible TODO look if this is ok - { 11949,469,0,0},//not spawned with this data, but used for handlekillunit - { 11948,469,0,0},//not spawned with this data, but used for handlekillunit + { 13358, 1216, 59, 60 }, //Stormpike Bowman //i think its 60, 61 and 69, 70.. but this is until now not possible TODO look if this is ok + { 11949, 469, 0, 0}, //not spawned with this data, but used for handlekillunit + { 11948, 469, 0, 0}, //not spawned with this data, but used for handlekillunit { 12053, 1214, 58, 58 }, //Frostwolf Guardian { 13328, 1214, 59, 59 }, //Seasoned Guardian { 13332, 1214, 60, 60 }, //Veteran Guardian { 13421, 1214, 61, 61 }, //Champion Guardian { 13359, 1214, 59, 60 }, //Frostwolf Bowman - { 11947,67,0,0}, //not spawned with this data, but used for handlekillunit - { 11946,67,0,0}, //not spawned with this data, but used for handlekillunit + { 11947, 67, 0, 0}, //not spawned with this data, but used for handlekillunit + { 11946, 67, 0, 0}, //not spawned with this data, but used for handlekillunit { 14763, 1534, 60, 60 }, //Dun Baldar South Marshal { 14762, 1534, 60, 60 }, //Dun Baldar North Marshal { 14764, 1534, 60, 60 }, //Icewing Marshal @@ -1067,15 +1067,15 @@ const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX][4] = { { 11602, 59, 54, 55 }, //Irondeep Skullthumper { 11657, 59, 58, 58 }, //Morloch - {13396,469,52,53}, //irondeep alliance TODO: get the right ids - {13080,469,53,54}, - {13098,469,54,55}, - {13078,469,58,58}, + {13396, 469, 52, 53}, //irondeep alliance TODO: get the right ids + {13080, 469, 53, 54}, + {13098, 469, 54, 55}, + {13078, 469, 58, 58}, - {13397,67,52,53}, //irondeep horde - {13099,67,53,54}, - {13081,67,54,55}, - {13079,67,58,58}, + {13397, 67, 52, 53}, //irondeep horde + {13099, 67, 53, 54}, + {13081, 67, 54, 55}, + {13079, 67, 58, 58}, { 11603, 59, 52, 53 }, //south mine neutral { 11604, 59, 53, 54 }, @@ -1083,144 +1083,144 @@ const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX][4] = { { 11677, 59, 58, 58 }, { 10982, 59, 52, 53 }, //vermin - {13317,469,52,53}, //alliance - {13096,469,54,55}, //explorer - {13087,469,54,55}, //invader - {13086,469,58,58}, + {13317, 469, 52, 53}, //alliance + {13096, 469, 54, 55}, //explorer + {13087, 469, 54, 55}, //invader + {13086, 469, 58, 58}, - {13316,67,52,53}, //horde - {13097,67,54,55}, //surveypr - {13089,67,54,55}, //guard - {13088,67,58,58}, - {14848,67,58,58} //Herald + {13316, 67, 52, 53}, //horde + {13097, 67, 54, 55}, //surveypr + {13089, 67, 54, 55}, //guard + {13088, 67, 58, 58}, + {14848, 67, 58, 58} //Herald }; -//x,y,z,o,static_creature_info-id +//x, y, z, o, static_creature_info-id const float BG_AV_StaticCreaturePos[AV_STATICCPLACE_MAX][5] = { //static creatures - {-1235.31f,-340.777f,60.5088f,3.31613f,0 },//2225 - Zora Guthrek - {-1244.02f,-323.795f,61.0485f,5.21853f,1 },//3343 - Grelkor - {-1235.16f,-332.302f,60.2985f,2.96706f,2 },//3625 - Rarck - {587.303f,-42.8257f,37.5615f,5.23599f,3 },//4255 - Brogus Thunderbrew - {643.635f,-58.3987f,41.7405f,4.72984f,4 },//4257 - Lana Thunderbrew - {591.464f,-44.452f,37.6166f,5.65487f,5 },//5134 - Jonivera Farmountain - {608.515f,-33.3935f,42.0003f,5.41052f,6 },//5135 - Svalbrad Farmountain - {617.656f,-32.0701f,42.7168f,4.06662f,7 },//5139 - Kurdrum Barleybeard - {-1183.76f,-268.295f,72.8233f,3.28122f,8 },//10364 - Yaelika Farclaw - {-1187.86f,-275.31f,73.0481f,3.63028f,9 },//10367 - Shrye Ragefist - {-1008.42f,-368.006f,55.3426f,5.95647f,10 },//10981 - Frostwolf - {-1091.92f,-424.28f,53.0139f,2.93958f,10 },//10981 - Frostwolf - {-558.455f,-198.768f,58.1755f,4.97946f,10 },//10981 - Frostwolf - {-861.247f,-312.51f,55.1427f,3.35382f,10 },//10981 - Frostwolf - {-1003.81f,-395.913f,50.4736f,2.85631f,10 },//10981 - Frostwolf - {-904.5f,-289.815f,65.1222f,5.7847f,10 },//10981 - Frostwolf - {-1064.41f,-438.839f,51.3614f,1.88857f,10 },//10981 - Frostwolf - {258.814f,76.2017f,18.6468f,6.19052f,11 },//10986 - Snowblind Harpy - {265.838f,-315.846f,-16.5429f,3.15917f,11 },//10986 - Snowblind Harpy - {426.485f,-51.1927f,-5.66286f,1.60347f,11 },//10986 - Snowblind Harpy - {452.044f,-33.9594f,-0.044651f,2.72815f,11 },//10986 - Snowblind Harpy - {266.032f,-315.639f,-16.5429f,4.67962f,11 },//10986 - Snowblind Harpy - {532.64f,-54.5863f,20.7024f,2.93215f,11 },//10986 - Snowblind Harpy - {295.183f,-299.908f,-34.6123f,0.135851f,12 },//10990 - Alterac Ram - {421.08f,-225.006f,-23.73f,0.166754f,12 },//10990 - Alterac Ram - {-55.7766f,-192.498f,20.4352f,6.12221f,12 },//10990 - Alterac Ram - {527.887f,-477.223f,62.3559f,0.170935f,12 },//10990 - Alterac Ram - {389.144f,-346.508f,-30.334f,4.14117f,12 },//10990 - Alterac Ram - {108.121f,-322.248f,37.5655f,4.46788f,12 },//10990 - Alterac Ram - {507.479f,-67.9403f,10.3571f,3.26304f,12 },//10990 - Alterac Ram - {329.071f,-185.016f,-29.1542f,0.356943f,12 },//10990 - Alterac Ram - {252.449f,-422.313f,35.1404f,4.53771f,12 },//10990 - Alterac Ram - {358.882f,-118.061f,-24.9119f,2.29257f,12 },//10990 - Alterac Ram - {487.151f,-174.229f,14.7558f,4.73192f,12 },//10990 - Alterac Ram - {449.652f,-123.561f,6.14273f,6.12029f,12 },//10990 - Alterac Ram - {272.419f,-261.802f,-41.8835f,3.66559f,12 },//10990 - Alterac Ram - {359.021f,-210.954f,-29.3483f,4.31339f,12 },//10990 - Alterac Ram - {450.598f,-318.048f,-37.7548f,0.655219f,12 },//10990 - Alterac Ram - {509.333f,-218.2f,3.05439f,3.66292f,12 },//10990 - Alterac Ram - {485.771f,-223.613f,-1.53f,2.04862f,12 },//10990 - Alterac Ram - {486.636f,-452.172f,39.6592f,2.3341f,12 },//10990 - Alterac Ram - {702.783f,-257.494f,25.9777f,1.68329f,12 },//10990 - Alterac Ram - {460.942f,-199.263f,-6.0149f,0.380506f,12 },//10990 - Alterac Ram - {483.108f,-115.307f,10.1056f,3.69701f,12 },//10990 - Alterac Ram - {471.601f,-154.174f,14.0702f,5.5807f,12 },//10990 - Alterac Ram - {213.938f,-420.793f,41.2549f,5.71394f,12 },//10990 - Alterac Ram - {289.387f,-294.685f,-33.9073f,0.555494f,12 },//10990 - Alterac Ram - {155.649f,-402.891f,43.3915f,5.94838f,12 },//10990 - Alterac Ram - {517.184f,-295.105f,-9.78195f,6.05668f,12 },//10990 - Alterac Ram - {102.334f,-332.165f,38.9812f,3.31445f,12 },//10990 - Alterac Ram - {320.244f,-107.793f,-42.6357f,-1.00311f,12 },//10990 - Alterac Ram - {217.976f,110.774f,15.7603f,4.56793f,13 },//11675 - Snowblind Windcaller - {269.872f,6.66684f,20.7592f,0.381212f,13 },//11675 - Snowblind Windcaller - {313.528f,-319.041f,-27.2373f,0.554098f,13 },//11675 - Snowblind Windcaller - {435.441f,-39.9289f,-0.169651f,0.549454f,13 },//11675 - Snowblind Windcaller - {315.115f,-317.62f,-29.1123f,0.90111f,13 },//11675 - Snowblind Windcaller - {428.091f,-122.731f,3.40332f,6.05901f,14 },//11678 - Snowblind Ambusher - {235.05f,85.5705f,18.3079f,-0.914255f,14 },//11678 - Snowblind Ambusher - {-1553.04f,-344.342f,64.4163f,6.09933f,15 },//11839 - Wildpaw Brute - {-545.23f,-165.35f,57.7886f,3.01145f,16 },//11947 - Captain Galvangar - {722.43f,-10.9982f,50.7046f,3.42085f,17 },//11948 - Vanndar Stormpike - {-57.7891f,-286.597f,15.6479f,6.02139f,18 },//11949 - Captain Balinda Stonehearth - {930.498f,-520.755f,93.7334f,1.8326f,19 },//11997 - Stormpike Herald - {-776.092f,-345.161f,67.4092f,1.89257f,20 },//12051 - Frostwolf Legionnaire - {-1224.63f,-308.144f,65.0087f,4.01139f,20 },//12051 - Frostwolf Legionnaire - {-713.039f,-442.515f,82.8638f,0.68724f,20 },//12051 - Frostwolf Legionnaire - {-711.783f,-444.061f,82.7039f,0.683494f,20 },//12051 - Frostwolf Legionnaire - {587.633f,-45.9816f,37.5438f,5.81195f,21 },//12096 - Stormpike Quartermaster - {-1293.79f,-194.407f,72.4398f,5.84685f,22 },//12097 - Frostwolf Quartermaster - {446.163f,-377.119f,-1.12725f,0.209526f,23 },//12127 - Stormpike Guardsman - {549.348f,-399.254f,53.3537f,3.24729f,23 },//12127 - Stormpike Guardsman - {549.801f,-401.217f,53.8305f,3.24729f,23 },//12127 - Stormpike Guardsman - {192.704f,-406.874f,42.9183f,6.10696f,23 },//12127 - Stormpike Guardsman - {441.305f,-435.765f,28.2385f,2.14472f,23 },//12127 - Stormpike Guardsman - {192.982f,-404.891f,43.0132f,6.1061f,23 },//12127 - Stormpike Guardsman - {355.342f,-391.989f,-0.486707f,3.00643f,23 },//12127 - Stormpike Guardsman - {446.035f,-375.104f,-1.12725f,0.21033f,23 },//12127 - Stormpike Guardsman - {697.864f,-433.238f,62.7914f,1.65776f,23 },//12127 - Stormpike Guardsman - {610.74f,-331.585f,30.8021f,5.14253f,23 },//12127 - Stormpike Guardsman - {609.815f,-329.775f,30.9271f,-2.38829f,23 },//12127 - Stormpike Guardsman - {695.874f,-433.434f,62.8543f,1.65776f,23 },//12127 - Stormpike Guardsman - {443.337f,-435.283f,28.6842f,2.13768f,23 },//12127 - Stormpike Guardsman - {-1251.5f,-316.327f,62.6565f,5.02655f,24 },//13176 - Smith Regzar - {-1332.0f,-331.243f,91.2631f,1.50098f,25 },//13179 - Wing Commander Guse - {569.983f,-94.9992f,38.0325f,1.39626f,26 },//13216 - Gaelden Hammersmith - {-1244.92f,-308.916f,63.2525f,1.62316f,27 },//13218 - Grunnda Wolfheart - {-1319.56f,-342.675f,60.3404f,1.20428f,28 },//13236 - Primalist Thurloga - {647.61f,-61.1548f,41.7405f,4.24115f,29 },//13257 - Murgot Deepforge - {-1321.64f,-343.73f,60.4833f,1.01229f,30 },//13284 - Frostwolf Shaman - {-1317.61f,-342.853f,60.3726f,2.47837f,30 },//13284 - Frostwolf Shaman - {-1319.31f,-344.475f,60.3825f,1.72788f,30 },//13284 - Frostwolf Shaman - {569.963f,-42.0218f,37.7581f,4.27606f,31 },//13438 - Wing Commander Slidore - {729.2f,-78.812f,51.6335f,3.97935f,32 },//13442 - Arch Druid Renferal - {729.118f,-82.8713f,51.6335f,2.53073f,33 },//13443 - Druid of the Grove - {725.554f,-79.4973f,51.6335f,5.27089f,33 },//13443 - Druid of the Grove - {724.768f,-84.1642f,51.6335f,0.733038f,33 },//13443 - Druid of the Grove - {596.68f,-83.0633f,39.0051f,6.24828f,34 },//13447 - Corporal Noreg Stormpike - {600.032f,-2.92475f,42.0788f,5.00909f,35 },//13577 - Stormpike Ram Rider Commander - {610.239f,-21.8454f,43.272f,4.90438f,36 },//13617 - Stormpike Stable Master - {613.422f,-150.764f,33.4517f,5.55015f,37 },//13797 - Mountaineer Boombellow - {-1213.91f,-370.619f,56.4455f,0.837758f,38 },//13798 - Jotek - {704.35f,-22.9071f,50.2187f,0.785398f,39 },//13816 - Prospector Stonehewer - {-1271.24f,-335.766f,62.3971f,5.75959f,40 },//14185 - Najak Hexxen - {-1268.64f,-332.688f,62.6171f,5.28835f,41 },//14186 - Ravak Grimtotem - {648.363f,-65.2233f,41.7405f,3.12414f,42 },//14187 - Athramanis - {648.238f,-67.8931f,41.7405f,2.60054f,43 },//14188 - Dirk Swindle - {-1223.44f,-309.833f,64.9331f,4.0131f,44 },//14282 - Frostwolf Bloodhound - {-1226.4f,-307.136f,64.9706f,4.0145f,44 },//14282 - Frostwolf Bloodhound - {356.001f,-389.969f,-0.438796f,3.0334f,45 },//14283 - Stormpike Owl - {355.835f,-394.005f,-0.60149f,3.02498f,45 },//14283 - Stormpike Owl - {882.266f,-496.378f,96.7707f,4.83248f,45 },//14283 - Stormpike Owl - {878.649f,-495.917f,96.6171f,4.67693f,45 },//14283 - Stormpike Owl - {932.851f,-511.017f,93.6748f,3.61004f,45 },//14283 - Stormpike Owl - {935.806f,-513.983f,93.7436f,3.61788f,45 },//14283 - Stormpike Owl - {947.412f,-509.982f,95.1098f,2.82743f,46 },//14284 - Stormpike Battleguard - {934.557f,-512.395f,93.662f,3.61004f,46 },//14284 - Stormpike Battleguard - {939.42f,-502.777f,94.5887f,5.14872f,46 },//14284 - Stormpike Battleguard - {854.276f,-494.241f,96.8017f,5.44543f,46 },//14284 - Stormpike Battleguard - {776.621f,-487.775f,99.4049f,3.50811f,46 },//14284 - Stormpike Battleguard - {880.169f,-495.699f,96.6204f,4.8325f,46 },//14284 - Stormpike Battleguard - {773.651f,-497.482f,99.0408f,2.11185f,46 },//14284 - Stormpike Battleguard - {949.1f,-506.913f,95.4237f,3.31613f,46 },//14284 - Stormpike Battleguard - {-1370.9f,-219.793f,98.4258f,5.04381f,47}, //drek thar + {-1235.31f, -340.777f, 60.5088f, 3.31613f, 0 }, //2225 - Zora Guthrek + {-1244.02f, -323.795f, 61.0485f, 5.21853f, 1 }, //3343 - Grelkor + {-1235.16f, -332.302f, 60.2985f, 2.96706f, 2 }, //3625 - Rarck + {587.303f, -42.8257f, 37.5615f, 5.23599f, 3 }, //4255 - Brogus Thunderbrew + {643.635f, -58.3987f, 41.7405f, 4.72984f, 4 }, //4257 - Lana Thunderbrew + {591.464f, -44.452f, 37.6166f, 5.65487f, 5 }, //5134 - Jonivera Farmountain + {608.515f, -33.3935f, 42.0003f, 5.41052f, 6 }, //5135 - Svalbrad Farmountain + {617.656f, -32.0701f, 42.7168f, 4.06662f, 7 }, //5139 - Kurdrum Barleybeard + {-1183.76f, -268.295f, 72.8233f, 3.28122f, 8 }, //10364 - Yaelika Farclaw + {-1187.86f, -275.31f, 73.0481f, 3.63028f, 9 }, //10367 - Shrye Ragefist + {-1008.42f, -368.006f, 55.3426f, 5.95647f, 10 }, //10981 - Frostwolf + {-1091.92f, -424.28f, 53.0139f, 2.93958f, 10 }, //10981 - Frostwolf + {-558.455f, -198.768f, 58.1755f, 4.97946f, 10 }, //10981 - Frostwolf + {-861.247f, -312.51f, 55.1427f, 3.35382f, 10 }, //10981 - Frostwolf + {-1003.81f, -395.913f, 50.4736f, 2.85631f, 10 }, //10981 - Frostwolf + {-904.5f, -289.815f, 65.1222f, 5.7847f, 10 }, //10981 - Frostwolf + {-1064.41f, -438.839f, 51.3614f, 1.88857f, 10 }, //10981 - Frostwolf + {258.814f, 76.2017f, 18.6468f, 6.19052f, 11 }, //10986 - Snowblind Harpy + {265.838f, -315.846f, -16.5429f, 3.15917f, 11 }, //10986 - Snowblind Harpy + {426.485f, -51.1927f, -5.66286f, 1.60347f, 11 }, //10986 - Snowblind Harpy + {452.044f, -33.9594f, -0.044651f, 2.72815f, 11 }, //10986 - Snowblind Harpy + {266.032f, -315.639f, -16.5429f, 4.67962f, 11 }, //10986 - Snowblind Harpy + {532.64f, -54.5863f, 20.7024f, 2.93215f, 11 }, //10986 - Snowblind Harpy + {295.183f, -299.908f, -34.6123f, 0.135851f, 12 }, //10990 - Alterac Ram + {421.08f, -225.006f, -23.73f, 0.166754f, 12 }, //10990 - Alterac Ram + {-55.7766f, -192.498f, 20.4352f, 6.12221f, 12 }, //10990 - Alterac Ram + {527.887f, -477.223f, 62.3559f, 0.170935f, 12 }, //10990 - Alterac Ram + {389.144f, -346.508f, -30.334f, 4.14117f, 12 }, //10990 - Alterac Ram + {108.121f, -322.248f, 37.5655f, 4.46788f, 12 }, //10990 - Alterac Ram + {507.479f, -67.9403f, 10.3571f, 3.26304f, 12 }, //10990 - Alterac Ram + {329.071f, -185.016f, -29.1542f, 0.356943f, 12 }, //10990 - Alterac Ram + {252.449f, -422.313f, 35.1404f, 4.53771f, 12 }, //10990 - Alterac Ram + {358.882f, -118.061f, -24.9119f, 2.29257f, 12 }, //10990 - Alterac Ram + {487.151f, -174.229f, 14.7558f, 4.73192f, 12 }, //10990 - Alterac Ram + {449.652f, -123.561f, 6.14273f, 6.12029f, 12 }, //10990 - Alterac Ram + {272.419f, -261.802f, -41.8835f, 3.66559f, 12 }, //10990 - Alterac Ram + {359.021f, -210.954f, -29.3483f, 4.31339f, 12 }, //10990 - Alterac Ram + {450.598f, -318.048f, -37.7548f, 0.655219f, 12 }, //10990 - Alterac Ram + {509.333f, -218.2f, 3.05439f, 3.66292f, 12 }, //10990 - Alterac Ram + {485.771f, -223.613f, -1.53f, 2.04862f, 12 }, //10990 - Alterac Ram + {486.636f, -452.172f, 39.6592f, 2.3341f, 12 }, //10990 - Alterac Ram + {702.783f, -257.494f, 25.9777f, 1.68329f, 12 }, //10990 - Alterac Ram + {460.942f, -199.263f, -6.0149f, 0.380506f, 12 }, //10990 - Alterac Ram + {483.108f, -115.307f, 10.1056f, 3.69701f, 12 }, //10990 - Alterac Ram + {471.601f, -154.174f, 14.0702f, 5.5807f, 12 }, //10990 - Alterac Ram + {213.938f, -420.793f, 41.2549f, 5.71394f, 12 }, //10990 - Alterac Ram + {289.387f, -294.685f, -33.9073f, 0.555494f, 12 }, //10990 - Alterac Ram + {155.649f, -402.891f, 43.3915f, 5.94838f, 12 }, //10990 - Alterac Ram + {517.184f, -295.105f, -9.78195f, 6.05668f, 12 }, //10990 - Alterac Ram + {102.334f, -332.165f, 38.9812f, 3.31445f, 12 }, //10990 - Alterac Ram + {320.244f, -107.793f, -42.6357f, -1.00311f, 12 }, //10990 - Alterac Ram + {217.976f, 110.774f, 15.7603f, 4.56793f, 13 }, //11675 - Snowblind Windcaller + {269.872f, 6.66684f, 20.7592f, 0.381212f, 13 }, //11675 - Snowblind Windcaller + {313.528f, -319.041f, -27.2373f, 0.554098f, 13 }, //11675 - Snowblind Windcaller + {435.441f, -39.9289f, -0.169651f, 0.549454f, 13 }, //11675 - Snowblind Windcaller + {315.115f, -317.62f, -29.1123f, 0.90111f, 13 }, //11675 - Snowblind Windcaller + {428.091f, -122.731f, 3.40332f, 6.05901f, 14 }, //11678 - Snowblind Ambusher + {235.05f, 85.5705f, 18.3079f, -0.914255f, 14 }, //11678 - Snowblind Ambusher + {-1553.04f, -344.342f, 64.4163f, 6.09933f, 15 }, //11839 - Wildpaw Brute + {-545.23f, -165.35f, 57.7886f, 3.01145f, 16 }, //11947 - Captain Galvangar + {722.43f, -10.9982f, 50.7046f, 3.42085f, 17 }, //11948 - Vanndar Stormpike + {-57.7891f, -286.597f, 15.6479f, 6.02139f, 18 }, //11949 - Captain Balinda Stonehearth + {930.498f, -520.755f, 93.7334f, 1.8326f, 19 }, //11997 - Stormpike Herald + {-776.092f, -345.161f, 67.4092f, 1.89257f, 20 }, //12051 - Frostwolf Legionnaire + {-1224.63f, -308.144f, 65.0087f, 4.01139f, 20 }, //12051 - Frostwolf Legionnaire + {-713.039f, -442.515f, 82.8638f, 0.68724f, 20 }, //12051 - Frostwolf Legionnaire + {-711.783f, -444.061f, 82.7039f, 0.683494f, 20 }, //12051 - Frostwolf Legionnaire + {587.633f, -45.9816f, 37.5438f, 5.81195f, 21 }, //12096 - Stormpike Quartermaster + {-1293.79f, -194.407f, 72.4398f, 5.84685f, 22 }, //12097 - Frostwolf Quartermaster + {446.163f, -377.119f, -1.12725f, 0.209526f, 23 }, //12127 - Stormpike Guardsman + {549.348f, -399.254f, 53.3537f, 3.24729f, 23 }, //12127 - Stormpike Guardsman + {549.801f, -401.217f, 53.8305f, 3.24729f, 23 }, //12127 - Stormpike Guardsman + {192.704f, -406.874f, 42.9183f, 6.10696f, 23 }, //12127 - Stormpike Guardsman + {441.305f, -435.765f, 28.2385f, 2.14472f, 23 }, //12127 - Stormpike Guardsman + {192.982f, -404.891f, 43.0132f, 6.1061f, 23 }, //12127 - Stormpike Guardsman + {355.342f, -391.989f, -0.486707f, 3.00643f, 23 }, //12127 - Stormpike Guardsman + {446.035f, -375.104f, -1.12725f, 0.21033f, 23 }, //12127 - Stormpike Guardsman + {697.864f, -433.238f, 62.7914f, 1.65776f, 23 }, //12127 - Stormpike Guardsman + {610.74f, -331.585f, 30.8021f, 5.14253f, 23 }, //12127 - Stormpike Guardsman + {609.815f, -329.775f, 30.9271f, -2.38829f, 23 }, //12127 - Stormpike Guardsman + {695.874f, -433.434f, 62.8543f, 1.65776f, 23 }, //12127 - Stormpike Guardsman + {443.337f, -435.283f, 28.6842f, 2.13768f, 23 }, //12127 - Stormpike Guardsman + {-1251.5f, -316.327f, 62.6565f, 5.02655f, 24 }, //13176 - Smith Regzar + {-1332.0f, -331.243f, 91.2631f, 1.50098f, 25 }, //13179 - Wing Commander Guse + {569.983f, -94.9992f, 38.0325f, 1.39626f, 26 }, //13216 - Gaelden Hammersmith + {-1244.92f, -308.916f, 63.2525f, 1.62316f, 27 }, //13218 - Grunnda Wolfheart + {-1319.56f, -342.675f, 60.3404f, 1.20428f, 28 }, //13236 - Primalist Thurloga + {647.61f, -61.1548f, 41.7405f, 4.24115f, 29 }, //13257 - Murgot Deepforge + {-1321.64f, -343.73f, 60.4833f, 1.01229f, 30 }, //13284 - Frostwolf Shaman + {-1317.61f, -342.853f, 60.3726f, 2.47837f, 30 }, //13284 - Frostwolf Shaman + {-1319.31f, -344.475f, 60.3825f, 1.72788f, 30 }, //13284 - Frostwolf Shaman + {569.963f, -42.0218f, 37.7581f, 4.27606f, 31 }, //13438 - Wing Commander Slidore + {729.2f, -78.812f, 51.6335f, 3.97935f, 32 }, //13442 - Arch Druid Renferal + {729.118f, -82.8713f, 51.6335f, 2.53073f, 33 }, //13443 - Druid of the Grove + {725.554f, -79.4973f, 51.6335f, 5.27089f, 33 }, //13443 - Druid of the Grove + {724.768f, -84.1642f, 51.6335f, 0.733038f, 33 }, //13443 - Druid of the Grove + {596.68f, -83.0633f, 39.0051f, 6.24828f, 34 }, //13447 - Corporal Noreg Stormpike + {600.032f, -2.92475f, 42.0788f, 5.00909f, 35 }, //13577 - Stormpike Ram Rider Commander + {610.239f, -21.8454f, 43.272f, 4.90438f, 36 }, //13617 - Stormpike Stable Master + {613.422f, -150.764f, 33.4517f, 5.55015f, 37 }, //13797 - Mountaineer Boombellow + {-1213.91f, -370.619f, 56.4455f, 0.837758f, 38 }, //13798 - Jotek + {704.35f, -22.9071f, 50.2187f, 0.785398f, 39 }, //13816 - Prospector Stonehewer + {-1271.24f, -335.766f, 62.3971f, 5.75959f, 40 }, //14185 - Najak Hexxen + {-1268.64f, -332.688f, 62.6171f, 5.28835f, 41 }, //14186 - Ravak Grimtotem + {648.363f, -65.2233f, 41.7405f, 3.12414f, 42 }, //14187 - Athramanis + {648.238f, -67.8931f, 41.7405f, 2.60054f, 43 }, //14188 - Dirk Swindle + {-1223.44f, -309.833f, 64.9331f, 4.0131f, 44 }, //14282 - Frostwolf Bloodhound + {-1226.4f, -307.136f, 64.9706f, 4.0145f, 44 }, //14282 - Frostwolf Bloodhound + {356.001f, -389.969f, -0.438796f, 3.0334f, 45 }, //14283 - Stormpike Owl + {355.835f, -394.005f, -0.60149f, 3.02498f, 45 }, //14283 - Stormpike Owl + {882.266f, -496.378f, 96.7707f, 4.83248f, 45 }, //14283 - Stormpike Owl + {878.649f, -495.917f, 96.6171f, 4.67693f, 45 }, //14283 - Stormpike Owl + {932.851f, -511.017f, 93.6748f, 3.61004f, 45 }, //14283 - Stormpike Owl + {935.806f, -513.983f, 93.7436f, 3.61788f, 45 }, //14283 - Stormpike Owl + {947.412f, -509.982f, 95.1098f, 2.82743f, 46 }, //14284 - Stormpike Battleguard + {934.557f, -512.395f, 93.662f, 3.61004f, 46 }, //14284 - Stormpike Battleguard + {939.42f, -502.777f, 94.5887f, 5.14872f, 46 }, //14284 - Stormpike Battleguard + {854.276f, -494.241f, 96.8017f, 5.44543f, 46 }, //14284 - Stormpike Battleguard + {776.621f, -487.775f, 99.4049f, 3.50811f, 46 }, //14284 - Stormpike Battleguard + {880.169f, -495.699f, 96.6204f, 4.8325f, 46 }, //14284 - Stormpike Battleguard + {773.651f, -497.482f, 99.0408f, 2.11185f, 46 }, //14284 - Stormpike Battleguard + {949.1f, -506.913f, 95.4237f, 3.31613f, 46 }, //14284 - Stormpike Battleguard + {-1370.9f, -219.793f, 98.4258f, 5.04381f, 47}, //drek thar }; @@ -1433,42 +1433,42 @@ enum BG_AV_WorldStates //alliance_control neutral_control horde_control const uint32 BG_AV_MineWorldStates[2][3] = { - {1358, 1360,1359}, - {1355, 1357,1356} + {1358, 1360, 1359}, + {1355, 1357, 1356} }; //alliance_control alliance_assault h_control h_assault const uint32 BG_AV_NodeWorldStates[16][4] = { //Stormpike first aid station - {1325, 1326,1327,1328}, + {1325, 1326, 1327, 1328}, //Stormpike Graveyard - {1333,1335,1334,1336}, + {1333, 1335, 1334, 1336}, //Stoneheart Grave - {1302,1304,1301,1303}, + {1302, 1304, 1301, 1303}, //Snowfall Grave - {1341,1343,1342,1344}, + {1341, 1343, 1342, 1344}, //Iceblood grave - {1346,1348,1347,1349}, + {1346, 1348, 1347, 1349}, //Frostwolf Grave - {1337,1339,1338,1340}, + {1337, 1339, 1338, 1340}, //Frostwolf Hut - {1329,1331,1330,1332}, + {1329, 1331, 1330, 1332}, //Dunbaldar South Bunker - {1361,1375,1370,1378}, + {1361, 1375, 1370, 1378}, //Dunbaldar North Bunker - {1362,1374,1371,1379}, + {1362, 1374, 1371, 1379}, //Icewing Bunker - {1363,1376,1372,1380}, + {1363, 1376, 1372, 1380}, //Stoneheart Bunker - {1364,1377,1373,1381}, + {1364, 1377, 1373, 1381}, //Iceblood Tower - {1368,1390,1385,1395}, + {1368, 1390, 1385, 1395}, //Tower Point - {1367,1389,1384,1394}, + {1367, 1389, 1384, 1394}, //Frostwolf East - {1366,1388,1383,1393}, + {1366, 1388, 1383, 1393}, //Frostwolf West - {1365,1387,1382,1392}, + {1365, 1387, 1382, 1392}, }; enum BG_AV_QuestIds @@ -1546,7 +1546,7 @@ class BattlegroundAV : public Battleground virtual void StartingEventCloseDoors(); virtual void StartingEventOpenDoors(); - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); virtual void ResetBGSubclass(); @@ -1560,7 +1560,7 @@ class BattlegroundAV : public Battleground void HandleKillPlayer(Player* player, Player *killer); void HandleKillUnit(Creature *unit, Player *killer); void HandleQuestComplete(uint32 questid, Player *player); - bool PlayerCanDoMineQuest(int32 GOId,uint32 team); + bool PlayerCanDoMineQuest(int32 GOId, uint32 team); void EndBattleground(uint32 winner); @@ -1572,7 +1572,7 @@ class BattlegroundAV : public Battleground void EventPlayerDefendsPoint(Player* player, uint32 object); void EventPlayerDestroyedPoint(BG_AV_Nodes node); - void AssaultNode(BG_AV_Nodes node,uint16 team); + void AssaultNode(BG_AV_Nodes node, uint16 team); void DestroyNode(BG_AV_Nodes node); void InitNode(BG_AV_Nodes node, uint16 team, bool tower); void DefendNode(BG_AV_Nodes node, uint16 team); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp index 57be71c1d21..35ff312d663 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp @@ -107,7 +107,7 @@ void BattlegroundBE::HandleKillPlayer(Player *player, Player *killer) return; } - Battleground::HandleKillPlayer(player,killer); + Battleground::HandleKillPlayer(player, killer); UpdateArenaWorldState(); CheckArenaWinConditions(); @@ -115,7 +115,7 @@ void BattlegroundBE::HandleKillPlayer(Player *player, Player *killer) bool BattlegroundBE::HandlePlayerUnderMap(Player *player) { - player->TeleportTo(GetMapId(),6238.930176f,262.963470f,0.889519f,player->GetOrientation(),false); + player->TeleportTo(GetMapId(), 6238.930176f, 262.963470f, 0.889519f, player->GetOrientation(), false); return true; } @@ -142,7 +142,7 @@ void BattlegroundBE::HandleAreaTrigger(Player *Source, uint32 Trigger) } //if (buff_guid) - // HandleTriggerBuff(buff_guid,Source); + // HandleTriggerBuff(buff_guid, Source); } void BattlegroundBE::FillInitialWorldStates(WorldPacket &data) @@ -183,7 +183,7 @@ void BattlegroundBE::UpdatePlayerScore(Player* Source, uint32 type, uint32 value return; //there is nothing special in this score - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index c4e5189998e..7ad258449d3 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -130,7 +130,7 @@ void BattlegroundDS::HandleKillPlayer(Player* player, Player* killer) return; } - Battleground::HandleKillPlayer(player,killer); + Battleground::HandleKillPlayer(player, killer); UpdateArenaWorldState(); CheckArenaWinConditions(); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 06f8e6d840f..ce8b2ae1857 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -569,7 +569,7 @@ void BattlegroundEY::RespawnFlagAfterDrop() if (obj) obj->Delete(); else - sLog->outError("BattlegroundEY: Unknown dropped flag guid: %u",GUID_LOPART(GetDroppedFlagGUID())); + sLog->outError("BattlegroundEY: Unknown dropped flag guid: %u", GUID_LOPART(GetDroppedFlagGUID())); SetDroppedFlagGUID(0); } @@ -687,9 +687,9 @@ void BattlegroundEY::EventTeamLostPoint(Player *Source, uint32 Point) m_PointState[Point] = EY_POINT_NO_OWNER; if (Team == ALLIANCE) - SendMessageToAll(m_LosingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); + SendMessageToAll(m_LosingPointTypes[Point].MessageIdAlliance, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); else - SendMessageToAll(m_LosingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source); + SendMessageToAll(m_LosingPointTypes[Point].MessageIdHorde, CHAT_MSG_BG_SYSTEM_HORDE, Source); UpdatePointsIcons(Team, Point); UpdatePointsCount(Team); @@ -731,9 +731,9 @@ void BattlegroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point) m_PointState[Point] = EY_POINT_UNDER_CONTROL; if (Team == ALLIANCE) - SendMessageToAll(m_CapturingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); + SendMessageToAll(m_CapturingPointTypes[Point].MessageIdAlliance, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); else - SendMessageToAll(m_CapturingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source); + SendMessageToAll(m_CapturingPointTypes[Point].MessageIdHorde, CHAT_MSG_BG_SYSTEM_HORDE, Source); if (m_BgCreatures[Point]) DelCreature(Point); @@ -744,7 +744,7 @@ void BattlegroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point) sLog->outError("BatteGroundEY: Failed to spawn spirit guide! point: %u, team: %u, graveyard_id: %u", Point, Team, m_CapturingPointTypes[Point].GraveYardId); -// SpawnBGCreature(Point,RESPAWN_IMMEDIATELY); +// SpawnBGCreature(Point, RESPAWN_IMMEDIATELY); UpdatePointsIcons(Team, Point); UpdatePointsCount(Team); @@ -754,7 +754,7 @@ void BattlegroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point) Creature* trigger = GetBGCreature(Point + 6);//0-5 spirit guides if (!trigger) - trigger = AddCreature(WORLD_TRIGGER,Point+6,Team,BG_EY_TriggerPositions[Point][0],BG_EY_TriggerPositions[Point][1],BG_EY_TriggerPositions[Point][2],BG_EY_TriggerPositions[Point][3]); + trigger = AddCreature(WORLD_TRIGGER, Point+6, Team, BG_EY_TriggerPositions[Point][0], BG_EY_TriggerPositions[Point][1], BG_EY_TriggerPositions[Point][2], BG_EY_TriggerPositions[Point][3]); //add bonus honor aura trigger creature when node is accupied //cast bonus aura (+50% honor in 25yards) @@ -910,7 +910,7 @@ WorldSafeLocsEntry const *BattlegroundEY::GetClosestGraveYard(Player* player) { entry = sWorldSafeLocsStore.LookupEntry(m_CapturingPointTypes[i].GraveYardId); if (!entry) - sLog->outError("BattlegroundEY: Not found graveyard: %u",m_CapturingPointTypes[i].GraveYardId); + sLog->outError("BattlegroundEY: Not found graveyard: %u", m_CapturingPointTypes[i].GraveYardId); else { distance = (entry->x - plr_x)*(entry->x - plr_x) + (entry->y - plr_y)*(entry->y - plr_y) + (entry->z - plr_z)*(entry->z - plr_z); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 86d9569ae43..5a86767f286 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -348,7 +348,7 @@ class BattlegroundEY : public Battleground void RespawnFlag(bool send_message); void RespawnFlagAfterDrop(); - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleBuffUse(uint64 const& buff_guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); void HandleKillPlayer(Player *player, Player *killer); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 0487b0bce79..9876bb05607 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -63,10 +63,10 @@ BattlegroundIC::~BattlegroundIC() void BattlegroundIC::HandlePlayerResurrect(Player* player) { if (nodePoint[NODE_TYPE_QUARRY].nodeState == (player->GetTeamId() == TEAM_ALLIANCE ? NODE_STATE_CONTROLLED_A : NODE_STATE_CONTROLLED_H)) - player->CastSpell(player,SPELL_QUARRY,true); + player->CastSpell(player, SPELL_QUARRY, true); if (nodePoint[NODE_TYPE_REFINERY].nodeState == (player->GetTeamId() == TEAM_ALLIANCE ? NODE_STATE_CONTROLLED_A : NODE_STATE_CONTROLLED_H)) - player->CastSpell(player,SPELL_OIL_REFINERY,true); + player->CastSpell(player, SPELL_OIL_REFINERY, true); } void BattlegroundIC::SendTransportInit(Player* player) @@ -95,8 +95,8 @@ void BattlegroundIC::DoAction(uint32 action, uint64 var) if (!plr || !gunshipAlliance || !gunshipHorde) return; - plr->CastSpell(plr,SPELL_PARACHUTE,true); // this must be changed, there is a trigger in each transport that casts the spell. - plr->CastSpell(plr,SPELL_SLOW_FALL,true); + plr->CastSpell(plr, SPELL_PARACHUTE, true); // this must be changed, there is a trigger in each transport that casts the spell. + plr->CastSpell(plr, SPELL_SLOW_FALL, true); plr->SetTransport(plr->GetTeamId() == TEAM_ALLIANCE ? gunshipAlliance : gunshipHorde); @@ -105,7 +105,7 @@ void BattlegroundIC::DoAction(uint32 action, uint64 var) plr->m_movementInfo.t_pos.m_positionZ = TransportMovementInfo.GetPositionZ(); plr->m_movementInfo.t_guid = (plr->GetTeamId() == TEAM_ALLIANCE ? gunshipAlliance : gunshipHorde)->GetGUID(); - plr->TeleportTo(GetMapId(),TeleportToTransportPosition.GetPositionX(),TeleportToTransportPosition.GetPositionY(),TeleportToTransportPosition.GetPositionZ(),TeleportToTransportPosition.GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT); + plr->TeleportTo(GetMapId(), TeleportToTransportPosition.GetPositionX(), TeleportToTransportPosition.GetPositionY(), TeleportToTransportPosition.GetPositionZ(), TeleportToTransportPosition.GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT); } void BattlegroundIC::Update(uint32 diff) @@ -148,7 +148,7 @@ void BattlegroundIC::Update(uint32 diff) } } - // we need to confirm this is blizzlike,not sure if it is every 3 minutes + // we need to confirm this is blizzlike, not sure if it is every 3 minutes for (uint8 u = (nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_NPC_GLAIVE_THROWER_1_A : BG_IC_NPC_GLAIVE_THROWER_1_H); u < (nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_NPC_GLAIVE_THROWER_2_A : BG_IC_NPC_GLAIVE_THROWER_2_H); u++) { if (Creature* glaiveThrower = GetBGCreature(u)) @@ -176,9 +176,9 @@ void BattlegroundIC::Update(uint32 diff) { if (siege->isAlive()) { - if (siege->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_UNK_14|UNIT_FLAG_OOC_NOT_ATTACKABLE)) + if (siege->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_UNK_14|UNIT_FLAG_OOC_NOT_ATTACKABLE)) // following sniffs the vehicle always has UNIT_FLAG_UNK_14 - siege->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE); + siege->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE); else siege->SetHealth(siege->GetMaxHealth()); } @@ -205,7 +205,7 @@ void BattlegroundIC::Update(uint32 diff) { if (nodePoint[i].timer <= diff) { - uint32 nextBanner = GetNextBanner(&nodePoint[i],nodePoint[i].faction,true); + uint32 nextBanner = GetNextBanner(&nodePoint[i], nodePoint[i].faction, true); nodePoint[i].last_entry = nodePoint[i].gameobject_entry; nodePoint[i].gameobject_entry = nextBanner; @@ -219,14 +219,14 @@ void BattlegroundIC::Update(uint32 diff) float cords[4] = {banner->GetPositionX(), banner->GetPositionY(), banner->GetPositionZ(), banner->GetOrientation() }; DelObject(nodePoint[i].gameobject_type); - AddObject(nodePoint[i].gameobject_type,nodePoint[i].gameobject_entry,cords[0],cords[1],cords[2],cords[3],0,0,0,0,RESPAWN_ONE_DAY); + AddObject(nodePoint[i].gameobject_type, nodePoint[i].gameobject_entry, cords[0], cords[1], cords[2], cords[3], 0, 0, 0, 0, RESPAWN_ONE_DAY); GetBGObject(nodePoint[i].gameobject_type)->SetUInt32Value(GAMEOBJECT_FACTION, nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_Factions[1] : BG_IC_Factions[0]); UpdateNodeWorldState(&nodePoint[i]); - HandleCapturedNodes(&nodePoint[i],false); + HandleCapturedNodes(&nodePoint[i], false); - SendMessage2ToAll(LANG_BG_IC_TEAM_HAS_TAKEN_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,NULL,(nodePoint[i].faction == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE),nodePoint[i].string); + SendMessage2ToAll(LANG_BG_IC_TEAM_HAS_TAKEN_NODE, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (nodePoint[i].faction == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE), nodePoint[i].string); nodePoint[i].needChange = false; nodePoint[i].timer = BANNER_STATE_CHANGE_TIME; @@ -242,7 +242,7 @@ void BattlegroundIC::Update(uint32 diff) nodePoint[i].nodeState == NODE_STATE_CONTROLLED_H) { factionReinforcements[nodePoint[i].faction] += 1; - RewardHonorToTeam(RESOURCE_HONOR_AMOUNT,nodePoint[i].faction == TEAM_ALLIANCE ? ALLIANCE : HORDE); + RewardHonorToTeam(RESOURCE_HONOR_AMOUNT, nodePoint[i].faction == TEAM_ALLIANCE ? ALLIANCE : HORDE); UpdateWorldState((nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_ALLIANCE_RENFORT : BG_IC_HORDE_RENFORT), factionReinforcements[nodePoint[i].faction]); } } @@ -272,11 +272,11 @@ void BattlegroundIC::StartingEventOpenDoors() for (uint8 i = 0; i < MAX_FORTRESS_TELEPORTERS_SPAWNS; i++) { - if (!AddObject(BG_IC_Teleporters[i].type,BG_IC_Teleporters[i].entry, - BG_IC_Teleporters[i].x,BG_IC_Teleporters[i].y, - BG_IC_Teleporters[i].z,BG_IC_Teleporters[i].o, - 0,0,0,0,RESPAWN_ONE_DAY)) - sLog->outError("Isle of Conquest | Starting Event Open Doors: There was an error spawning gameobject %u",BG_IC_Teleporters[i].entry); + if (!AddObject(BG_IC_Teleporters[i].type, BG_IC_Teleporters[i].entry, + BG_IC_Teleporters[i].x, BG_IC_Teleporters[i].y, + BG_IC_Teleporters[i].z, BG_IC_Teleporters[i].o, + 0, 0, 0, 0, RESPAWN_ONE_DAY)) + sLog->outError("Isle of Conquest | Starting Event Open Doors: There was an error spawning gameobject %u", BG_IC_Teleporters[i].entry); } } @@ -302,10 +302,10 @@ void BattlegroundIC::AddPlayer(Player *plr) m_PlayerScores[plr->GetGUID()] = sc; if (nodePoint[NODE_TYPE_QUARRY].nodeState == (plr->GetTeamId() == TEAM_ALLIANCE ? NODE_STATE_CONTROLLED_A : NODE_STATE_CONTROLLED_H)) - plr->CastSpell(plr,SPELL_QUARRY,true); + plr->CastSpell(plr, SPELL_QUARRY, true); if (nodePoint[NODE_TYPE_REFINERY].nodeState == (plr->GetTeamId() == TEAM_ALLIANCE ? NODE_STATE_CONTROLLED_A : NODE_STATE_CONTROLLED_H)) - plr->CastSpell(plr,SPELL_OIL_REFINERY,true); + plr->CastSpell(plr, SPELL_OIL_REFINERY, true); SendTransportInit(plr); } @@ -339,7 +339,7 @@ void BattlegroundIC::UpdatePlayerScore(Player* Source, uint32 type, uint32 value ((BattlegroundICScore*)itr->second)->BasesDefended += value; break; default: - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); break; } } @@ -353,7 +353,7 @@ void BattlegroundIC::FillInitialWorldStates(WorldPacket& data) for (uint8 i = 0; i < MAX_FORTRESS_GATES_SPAWNS; i++) { - uint32 uws = GetWorldStateFromGateEntry(BG_IC_ObjSpawnlocs[i].entry,(GateStatus[GetGateIDFromEntry(BG_IC_ObjSpawnlocs[i].entry)] == BG_IC_GATE_DESTROYED ? true : false)); + uint32 uws = GetWorldStateFromGateEntry(BG_IC_ObjSpawnlocs[i].entry, (GateStatus[GetGateIDFromEntry(BG_IC_ObjSpawnlocs[i].entry)] == BG_IC_GATE_DESTROYED ? true : false)); data << uint32(uws) << uint32(1); } @@ -365,39 +365,39 @@ bool BattlegroundIC::SetupBattleground() { for (uint8 i = 0; i < MAX_NORMAL_GAMEOBJECTS_SPAWNS; i++) { - if (!AddObject(BG_IC_ObjSpawnlocs[i].type,BG_IC_ObjSpawnlocs[i].entry, - BG_IC_ObjSpawnlocs[i].x,BG_IC_ObjSpawnlocs[i].y, - BG_IC_ObjSpawnlocs[i].z,BG_IC_ObjSpawnlocs[i].o, - 0,0,0,0,RESPAWN_ONE_DAY)) + if (!AddObject(BG_IC_ObjSpawnlocs[i].type, BG_IC_ObjSpawnlocs[i].entry, + BG_IC_ObjSpawnlocs[i].x, BG_IC_ObjSpawnlocs[i].y, + BG_IC_ObjSpawnlocs[i].z, BG_IC_ObjSpawnlocs[i].o, + 0, 0, 0, 0, RESPAWN_ONE_DAY)) { - sLog->outError("Isle of Conquest: There was an error spawning gameobject %u",BG_IC_ObjSpawnlocs[i].entry); + sLog->outError("Isle of Conquest: There was an error spawning gameobject %u", BG_IC_ObjSpawnlocs[i].entry); return false; } } for (uint8 i = 0; i < MAX_NORMAL_NPCS_SPAWNS; i++) { - if (!AddCreature(BG_IC_NpcSpawnlocs[i].entry,BG_IC_NpcSpawnlocs[i].type,BG_IC_NpcSpawnlocs[i].team, - BG_IC_NpcSpawnlocs[i].x,BG_IC_NpcSpawnlocs[i].y, - BG_IC_NpcSpawnlocs[i].z,BG_IC_NpcSpawnlocs[i].o, + if (!AddCreature(BG_IC_NpcSpawnlocs[i].entry, BG_IC_NpcSpawnlocs[i].type, BG_IC_NpcSpawnlocs[i].team, + BG_IC_NpcSpawnlocs[i].x, BG_IC_NpcSpawnlocs[i].y, + BG_IC_NpcSpawnlocs[i].z, BG_IC_NpcSpawnlocs[i].o, RESPAWN_ONE_DAY)) { - sLog->outError("Isle of Conquest: There was an error spawning creature %u",BG_IC_NpcSpawnlocs[i].entry); + sLog->outError("Isle of Conquest: There was an error spawning creature %u", BG_IC_NpcSpawnlocs[i].entry); return false; } } - if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+5,BG_IC_SpiritGuidePos[5][0], BG_IC_SpiritGuidePos[5][1],BG_IC_SpiritGuidePos[5][2], BG_IC_SpiritGuidePos[5][3],ALLIANCE) - || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+6,BG_IC_SpiritGuidePos[6][0], BG_IC_SpiritGuidePos[6][1],BG_IC_SpiritGuidePos[6][2], BG_IC_SpiritGuidePos[6][3],HORDE) - || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+3,BG_IC_SpiritGuidePos[7][0], BG_IC_SpiritGuidePos[7][1],BG_IC_SpiritGuidePos[7][2], BG_IC_SpiritGuidePos[7][3],ALLIANCE) - || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+4,BG_IC_SpiritGuidePos[8][0], BG_IC_SpiritGuidePos[8][1],BG_IC_SpiritGuidePos[8][2], BG_IC_SpiritGuidePos[8][3],HORDE)) + if (!AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+5, BG_IC_SpiritGuidePos[5][0], BG_IC_SpiritGuidePos[5][1], BG_IC_SpiritGuidePos[5][2], BG_IC_SpiritGuidePos[5][3], ALLIANCE) + || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+6, BG_IC_SpiritGuidePos[6][0], BG_IC_SpiritGuidePos[6][1], BG_IC_SpiritGuidePos[6][2], BG_IC_SpiritGuidePos[6][3], HORDE) + || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+3, BG_IC_SpiritGuidePos[7][0], BG_IC_SpiritGuidePos[7][1], BG_IC_SpiritGuidePos[7][2], BG_IC_SpiritGuidePos[7][3], ALLIANCE) + || !AddSpiritGuide(BG_IC_NPC_SPIRIT_GUIDE_1+4, BG_IC_SpiritGuidePos[8][0], BG_IC_SpiritGuidePos[8][1], BG_IC_SpiritGuidePos[8][2], BG_IC_SpiritGuidePos[8][3], HORDE)) { sLog->outError("Isle of Conquest: Failed to spawn initial spirit guide!"); return false; } - gunshipHorde = CreateTransport(GO_HORDE_GUNSHIP,TRANSPORT_PERIOD_TIME); - gunshipAlliance = CreateTransport(GO_ALLIANCE_GUNSHIP,TRANSPORT_PERIOD_TIME); + gunshipHorde = CreateTransport(GO_HORDE_GUNSHIP, TRANSPORT_PERIOD_TIME); + gunshipAlliance = CreateTransport(GO_ALLIANCE_GUNSHIP, TRANSPORT_PERIOD_TIME); if (!gunshipAlliance || !gunshipHorde) { @@ -433,19 +433,19 @@ void BattlegroundIC::HandleKillUnit(Creature *unit, Player* killer) uint32 entry = unit->GetEntry(); if (entry == NPC_HIGH_COMMANDER_HALFORD_WYRMBANE) { - RewardHonorToTeam(WINNER_HONOR_AMOUNT,HORDE); + RewardHonorToTeam(WINNER_HONOR_AMOUNT, HORDE); EndBattleground(HORDE); } else if (entry == NPC_OVERLORD_AGMAR) { - RewardHonorToTeam(WINNER_HONOR_AMOUNT,ALLIANCE); + RewardHonorToTeam(WINNER_HONOR_AMOUNT, ALLIANCE); EndBattleground(ALLIANCE); } //Achievement Mowed Down // TO-DO: This should be done on the script of each vehicle of the BG. if (unit->IsVehicle()) - killer->CastSpell(killer,SPELL_DESTROYED_VEHICLE_ACHIEVEMENT,true); + killer->CastSpell(killer, SPELL_DESTROYED_VEHICLE_ACHIEVEMENT, true); } void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer) @@ -466,7 +466,7 @@ void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer) void BattlegroundIC::EndBattleground(uint32 winner) { - SendMessage2ToAll(LANG_BG_IC_TEAM_WINS,CHAT_MSG_BG_SYSTEM_NEUTRAL,NULL, (winner == ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); + SendMessage2ToAll(LANG_BG_IC_TEAM_WINS, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (winner == ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); Battleground::EndBattleground(winner); } @@ -507,7 +507,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target if (nodePoint[i].faction == player->GetTeamId()) return; - uint32 nextBanner = GetNextBanner(&nodePoint[i],player->GetTeamId(),false); + uint32 nextBanner = GetNextBanner(&nodePoint[i], player->GetTeamId(), false); // we set the new settings of the nodePoint nodePoint[i].faction = player->GetTeamId(); @@ -531,8 +531,8 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target UpdatePlayerScore(player, SCORE_BASES_ASSAULTED, 1); - SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_1,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string); - SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_2,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); + SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_1, CHAT_MSG_BG_SYSTEM_NEUTRAL, player, nodePoint[i].string); + SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_2, CHAT_MSG_BG_SYSTEM_NEUTRAL, player, nodePoint[i].string, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); HandleContestedNodes(&nodePoint[i]); } else if (nextBanner == nodePoint[i].banners[BANNER_A_CONTROLLED] || nextBanner == nodePoint[i].banners[BANNER_H_CONTROLLED]) @@ -540,8 +540,8 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target { nodePoint[i].timer = BANNER_STATE_CHANGE_TIME; nodePoint[i].needChange = false; - SendMessage2ToAll(LANG_BG_IC_TEAM_DEFENDED_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string); - HandleCapturedNodes(&nodePoint[i],true); + SendMessage2ToAll(LANG_BG_IC_TEAM_DEFENDED_NODE, CHAT_MSG_BG_SYSTEM_NEUTRAL, player, nodePoint[i].string); + HandleCapturedNodes(&nodePoint[i], true); UpdatePlayerScore(player, SCORE_BASES_DEFENDED, 1); } @@ -553,7 +553,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target float cords[4] = {banner->GetPositionX(), banner->GetPositionY(), banner->GetPositionZ(), banner->GetOrientation() }; DelObject(nodePoint[i].gameobject_type); - AddObject(nodePoint[i].gameobject_type,nodePoint[i].gameobject_entry,cords[0],cords[1],cords[2],cords[3],0,0,0,0,RESPAWN_ONE_DAY); + AddObject(nodePoint[i].gameobject_type, nodePoint[i].gameobject_entry, cords[0], cords[1], cords[2], cords[3], 0, 0, 0, 0, RESPAWN_ONE_DAY); GetBGObject(nodePoint[i].gameobject_type)->SetUInt32Value(GAMEOBJECT_FACTION, nodePoint[i].faction == TEAM_ALLIANCE ? BG_IC_Factions[1] : BG_IC_Factions[0]); @@ -587,9 +587,9 @@ void BattlegroundIC::UpdateNodeWorldState(ICNodePoint* nodePoint) // with this we are sure we dont bug the client for (uint8 i = 0; i < 4; i++) - UpdateWorldState(nodePoint->worldStates[i],0); + UpdateWorldState(nodePoint->worldStates[i], 0); - UpdateWorldState(worldstate,1); + UpdateWorldState(worldstate, 1); } uint32 BattlegroundIC::GetNextBanner(ICNodePoint* nodePoint, uint32 team, bool returnDefinitve) @@ -637,7 +637,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) BG_IC_SpiritGuidePos[nodePoint->nodeType][0], BG_IC_SpiritGuidePos[nodePoint->nodeType][1], BG_IC_SpiritGuidePos[nodePoint->nodeType][2], BG_IC_SpiritGuidePos[nodePoint->nodeType][3], (nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE))) - sLog->outError("Isle of Conquest: Failed to spawn spirit guide! point: %u, team: %u,", nodePoint->nodeType, nodePoint->faction); + sLog->outError("Isle of Conquest: Failed to spawn spirit guide! point: %u, team: %u, ", nodePoint->nodeType, nodePoint->faction); } switch(nodePoint->gameobject_type) @@ -651,9 +651,9 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) { uint8 type = BG_IC_GO_HANGAR_TELEPORTER_1+u; AddObject(type, (nodePoint->faction == TEAM_ALLIANCE ? GO_ALLIANCE_GUNSHIP_PORTAL : GO_HORDE_GUNSHIP_PORTAL), - BG_IC_HangarTeleporters[u].GetPositionX(),BG_IC_HangarTeleporters[u].GetPositionY(), - BG_IC_HangarTeleporters[u].GetPositionZ(),BG_IC_HangarTeleporters[u].GetOrientation(), - 0,0,0,0,RESPAWN_ONE_DAY); + BG_IC_HangarTeleporters[u].GetPositionX(), BG_IC_HangarTeleporters[u].GetPositionY(), + BG_IC_HangarTeleporters[u].GetPositionZ(), BG_IC_HangarTeleporters[u].GetOrientation(), + 0, 0, 0, 0, RESPAWN_ONE_DAY); } //sLog->outError("BG_IC_GO_HANGAR_BANNER CAPTURED Faction: %u", nodePoint->faction); @@ -663,12 +663,12 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) // we should spawn teleporters break; case BG_IC_GO_QUARRY_BANNER: - RemoveAuraOnTeam(SPELL_QUARRY,(nodePoint->faction == TEAM_ALLIANCE ? HORDE : ALLIANCE)); - CastSpellOnTeam(SPELL_QUARRY,(nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE)); + RemoveAuraOnTeam(SPELL_QUARRY, (nodePoint->faction == TEAM_ALLIANCE ? HORDE : ALLIANCE)); + CastSpellOnTeam(SPELL_QUARRY, (nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE)); break; case BG_IC_GO_REFINERY_BANNER: - RemoveAuraOnTeam(SPELL_OIL_REFINERY,(nodePoint->faction == TEAM_ALLIANCE ? HORDE : ALLIANCE)); - CastSpellOnTeam(SPELL_OIL_REFINERY,(nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE)); + RemoveAuraOnTeam(SPELL_OIL_REFINERY, (nodePoint->faction == TEAM_ALLIANCE ? HORDE : ALLIANCE)); + CastSpellOnTeam(SPELL_OIL_REFINERY, (nodePoint->faction == TEAM_ALLIANCE ? ALLIANCE : HORDE)); break; case BG_IC_GO_DOCKS_BANNER: @@ -711,9 +711,9 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) continue; - if (AddCreature(nodePoint->faction == TEAM_ALLIANCE ? NPC_GLAIVE_THROWER_A : NPC_GLAIVE_THROWER_H,type,nodePoint->faction, - BG_IC_DocksVehiclesGlaives[i].GetPositionX(),BG_IC_DocksVehiclesGlaives[i].GetPositionY(), - BG_IC_DocksVehiclesGlaives[i].GetPositionZ(),BG_IC_DocksVehiclesGlaives[i].GetOrientation(), + if (AddCreature(nodePoint->faction == TEAM_ALLIANCE ? NPC_GLAIVE_THROWER_A : NPC_GLAIVE_THROWER_H, type, nodePoint->faction, + BG_IC_DocksVehiclesGlaives[i].GetPositionX(), BG_IC_DocksVehiclesGlaives[i].GetPositionY(), + BG_IC_DocksVehiclesGlaives[i].GetPositionZ(), BG_IC_DocksVehiclesGlaives[i].GetOrientation(), RESPAWN_ONE_DAY)) GetBGCreature(type)->setFaction(BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); } @@ -726,9 +726,9 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) continue; - if (AddCreature(NPC_CATAPULT,type,nodePoint->faction, - BG_IC_DocksVehiclesCatapults[i].GetPositionX(),BG_IC_DocksVehiclesCatapults[i].GetPositionY(), - BG_IC_DocksVehiclesCatapults[i].GetPositionZ(),BG_IC_DocksVehiclesCatapults[i].GetOrientation(), + if (AddCreature(NPC_CATAPULT, type, nodePoint->faction, + BG_IC_DocksVehiclesCatapults[i].GetPositionX(), BG_IC_DocksVehiclesCatapults[i].GetPositionY(), + BG_IC_DocksVehiclesCatapults[i].GetPositionZ(), BG_IC_DocksVehiclesCatapults[i].GetOrientation(), RESPAWN_ONE_DAY)) GetBGCreature(type)->setFaction(BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); } @@ -761,9 +761,9 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) if (GetBGCreature(type) && GetBGCreature(type)->isAlive()) continue; - if (AddCreature(NPC_DEMOLISHER,type,nodePoint->faction, - BG_IC_WorkshopVehicles[i].GetPositionX(),BG_IC_WorkshopVehicles[i].GetPositionY(), - BG_IC_WorkshopVehicles[i].GetPositionZ(),BG_IC_WorkshopVehicles[i].GetOrientation(), + if (AddCreature(NPC_DEMOLISHER, type, nodePoint->faction, + BG_IC_WorkshopVehicles[i].GetPositionX(), BG_IC_WorkshopVehicles[i].GetPositionY(), + BG_IC_WorkshopVehicles[i].GetPositionZ(), BG_IC_WorkshopVehicles[i].GetOrientation(), RESPAWN_ONE_DAY)) GetBGCreature(type)->setFaction(BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); } @@ -784,14 +784,14 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) uint8 siegeType = (nodePoint->faction == TEAM_ALLIANCE ? BG_IC_NPC_SIEGE_ENGINE_A : BG_IC_NPC_SIEGE_ENGINE_H); if (!GetBGCreature(siegeType) || !GetBGCreature(siegeType)->isAlive()) { - AddCreature((nodePoint->faction == TEAM_ALLIANCE ? NPC_SIEGE_ENGINE_A : NPC_SIEGE_ENGINE_H),siegeType,nodePoint->faction, - BG_IC_WorkshopVehicles[4].GetPositionX(),BG_IC_WorkshopVehicles[4].GetPositionY(), - BG_IC_WorkshopVehicles[4].GetPositionZ(),BG_IC_WorkshopVehicles[4].GetOrientation(), + AddCreature((nodePoint->faction == TEAM_ALLIANCE ? NPC_SIEGE_ENGINE_A : NPC_SIEGE_ENGINE_H), siegeType, nodePoint->faction, + BG_IC_WorkshopVehicles[4].GetPositionX(), BG_IC_WorkshopVehicles[4].GetPositionY(), + BG_IC_WorkshopVehicles[4].GetPositionZ(), BG_IC_WorkshopVehicles[4].GetOrientation(), RESPAWN_ONE_DAY); if (Creature* siegeEngine = GetBGCreature(siegeType)) { - siegeEngine->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_UNK_14|UNIT_FLAG_OOC_NOT_ATTACKABLE); + siegeEngine->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_UNK_14|UNIT_FLAG_OOC_NOT_ATTACKABLE); siegeEngine->setFaction(BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); } } @@ -799,15 +799,15 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture) for (uint8 i = 0; i < MAX_WORKSHOP_BOMBS_SPAWNS_PER_FACTION; i++) { - AddObject(BG_IC_GO_SEAFORIUM_BOMBS_1+i,GO_SEAFORIUM_BOMBS, - workshopBombs[i].GetPositionX(),workshopBombs[i].GetPositionY(), - workshopBombs[i].GetPositionZ(),workshopBombs[i].GetOrientation(), - 0,0,0,0,10); + AddObject(BG_IC_GO_SEAFORIUM_BOMBS_1+i, GO_SEAFORIUM_BOMBS, + workshopBombs[i].GetPositionX(), workshopBombs[i].GetPositionY(), + workshopBombs[i].GetPositionZ(), workshopBombs[i].GetOrientation(), + 0, 0, 0, 0, 10); if (GameObject* seaforiumBombs = GetBGObject(BG_IC_GO_SEAFORIUM_BOMBS_1+i)) { seaforiumBombs->SetRespawnTime(10); - seaforiumBombs->SetUInt32Value(GAMEOBJECT_FACTION,BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); + seaforiumBombs->SetUInt32Value(GAMEOBJECT_FACTION, BG_IC_Factions[(nodePoint->faction == TEAM_ALLIANCE ? 0 : 1)]); } } break; @@ -824,7 +824,7 @@ void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 /*destroyedE uint32 uws_close = GetWorldStateFromGateEntry(go->GetEntry(), false); if (uws_open) { - UpdateWorldState(uws_close,0); + UpdateWorldState(uws_close, 0); UpdateWorldState(uws_open, 1); } DoorOpen((pl->GetTeamId() == TEAM_ALLIANCE ? BG_IC_GO_HORDE_KEEP_PORTCULLIS : BG_IC_GO_DOODAD_PORTCULLISACTIVE02)); @@ -850,7 +850,7 @@ void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 /*destroyedE break; } - SendMessage2ToAll(lang_entry,CHAT_MSG_BG_SYSTEM_NEUTRAL,NULL,(pl->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP)); + SendMessage2ToAll(lang_entry, CHAT_MSG_BG_SYSTEM_NEUTRAL, NULL, (pl->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP)); } void BattlegroundIC::EventPlayerDamagedGO(Player* /*plr*/, GameObject* /*go*/, uint32 /*eventType*/) @@ -897,9 +897,9 @@ WorldSafeLocsEntry const* BattlegroundIC::GetClosestGraveYard(Player* player) return good_entry; } -Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period) +Transport* BattlegroundIC::CreateTransport(uint32 goEntry, uint32 period) { - Transport* t = new Transport(period,0); + Transport* t = new Transport(period, 0); const GameObjectTemplate* goinfo = sObjectMgr->GetGameObjectTemplate(goEntry); @@ -915,7 +915,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period) if (!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed)) // skip transports with empty waypoints list { - sLog->outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId); + sLog->outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.", goinfo->moTransport.taxiPathId); delete t; return NULL; } @@ -928,7 +928,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period) float o = 1; // creates the Gameobject - if (!t->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_MO_TRANSPORT),goEntry, mapid, x, y, z, o, 100, 0)) + if (!t->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_MO_TRANSPORT), goEntry, mapid, x, y, z, o, 100, 0)) { delete t; return NULL; @@ -938,7 +938,7 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period) t->SetMap(GetBgMap()); for (uint8 i = 0; i < 5; i++) - t->AddNPCPassenger(0,(goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()),(goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); + t->AddNPCPassenger(0, (goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation())); return t; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index 662e0f27c31..282ec5f531a 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -445,44 +445,44 @@ enum BG_IC_MaxSpawns const ICNpc BG_IC_NpcSpawnlocs[MAX_NORMAL_NPCS_SPAWNS]= { - {BG_IC_NPC_OVERLORD_AGMAR,NPC_OVERLORD_AGMAR,TEAM_HORDE,1295.44f,-765.733f,70.0541f,0.0f},//Overlord Agmar 1 - {BG_IC_NPC_HIGH_COMMANDER_HALFORD_WYRMBANE,NPC_HIGH_COMMANDER_HALFORD_WYRMBANE,TEAM_ALLIANCE,224.983f,-831.573f,60.9034f,0.0f},//High Commander Halford Wyrmbane 2 - {BG_IC_NPC_KOR_KRON_GUARD_1,NPC_KOR_KRON_GUARD,TEAM_HORDE,1296.01f,-773.256f,69.958f,0.292168f}, // 3 - {BG_IC_NPC_KOR_KRON_GUARD_2,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.94f,-757.756f,69.9587f,6.02165f}, // 4 - {BG_IC_NPC_KOR_KRON_GUARD_3,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.09f,-760.927f,69.9587f,5.94311f}, // 5 - {BG_IC_NPC_KOR_KRON_GUARD_4,NPC_KOR_KRON_GUARD,TEAM_HORDE,1295.13f,-769.7f,69.95f,0.34f}, // 6 - - {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_1,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,223.969f,-822.958f,60.8151f,0.46337f}, // 7 - {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_2,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,224.211f,-826.952f,60.8188f,6.25961f}, // 8 - {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_3,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,223.119f,-838.386f,60.8145f,5.64857f}, // 9 - {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_4,NPC_SEVEN_TH_LEGION_INFANTRY,TEAM_ALLIANCE,223.889f,-835.102f,60.8201f,6.21642f},// 10 - - {BG_IC_NPC_KEEP_CANNON_1,NPC_KEEP_CANNON,TEAM_ALLIANCE,415.825f,-754.634f,87.799f,1.78024f},// 11 - {BG_IC_NPC_KEEP_CANNON_2,NPC_KEEP_CANNON,TEAM_ALLIANCE,410.142f,-755.332f,87.7991f,1.78024f},// 12 - {BG_IC_NPC_KEEP_CANNON_3,NPC_KEEP_CANNON,TEAM_ALLIANCE,424.33f,-879.352f,88.0446f,0.436332f},// 13 - {BG_IC_NPC_KEEP_CANNON_4,NPC_KEEP_CANNON,TEAM_ALLIANCE,425.602f,-786.646f,87.7991f,5.74213f},// 14 - {BG_IC_NPC_KEEP_CANNON_5,NPC_KEEP_CANNON,TEAM_ALLIANCE,426.743f,-884.939f,87.9613f,0.436332f},// 15 - {BG_IC_NPC_KEEP_CANNON_6,NPC_KEEP_CANNON,TEAM_ALLIANCE,404.736f,-755.495f,87.7989f,1.78024f},// 16 - {BG_IC_NPC_KEEP_CANNON_7,NPC_KEEP_CANNON,TEAM_ALLIANCE,428.375f,-780.797f,87.7991f,5.79449f},// 17 - {BG_IC_NPC_KEEP_CANNON_8,NPC_KEEP_CANNON,TEAM_ALLIANCE,429.175f,-890.436f,88.0446f,0.436332f},// 18 - {BG_IC_NPC_KEEP_CANNON_9,NPC_KEEP_CANNON,TEAM_ALLIANCE,430.872f,-775.278f,87.7991f,5.88176f},// 19 - {BG_IC_NPC_KEEP_CANNON_10,NPC_KEEP_CANNON,TEAM_ALLIANCE,408.056f,-911.283f,88.0445f,4.64258f},// 20 - {BG_IC_NPC_KEEP_CANNON_11,NPC_KEEP_CANNON,TEAM_ALLIANCE,413.609f,-911.566f,88.0447f,4.66003f},// 21 - {BG_IC_NPC_KEEP_CANNON_12,NPC_KEEP_CANNON,TEAM_ALLIANCE,402.554f,-910.557f,88.0446f,4.57276f},// 22 - - {BG_IC_NPC_KEEP_CANNON_13,NPC_KEEP_CANNON,TEAM_HORDE,1158.91f,-660.144f,87.9332f,0.750492f},// 23 - {BG_IC_NPC_KEEP_CANNON_14,NPC_KEEP_CANNON,TEAM_HORDE,1156.22f,-866.809f,87.8754f,5.27089f},// 24 - {BG_IC_NPC_KEEP_CANNON_15,NPC_KEEP_CANNON,TEAM_HORDE,1163.74f,-663.67f,88.3571f,0.558505f},// 25 - {BG_IC_NPC_KEEP_CANNON_16,NPC_KEEP_CANNON,TEAM_HORDE,1135.18f,-683.896f,88.0409f,3.9619f},// 26 - {BG_IC_NPC_KEEP_CANNON_17,NPC_KEEP_CANNON,TEAM_HORDE,1138.91f,-836.359f,88.3728f,2.18166f},// 27 - {BG_IC_NPC_KEEP_CANNON_18,NPC_KEEP_CANNON,TEAM_HORDE,1162.08f,-863.717f,88.358f,5.48033f},// 28 - {BG_IC_NPC_KEEP_CANNON_19,NPC_KEEP_CANNON,TEAM_HORDE,1167.13f,-669.212f,87.9682f,0.383972f},// 29 - {BG_IC_NPC_KEEP_CANNON_20,NPC_KEEP_CANNON,TEAM_HORDE,1137.72f,-688.517f,88.4023f,3.9619f},// 30 - {BG_IC_NPC_KEEP_CANNON_21,NPC_KEEP_CANNON,TEAM_HORDE,1135.29f,-840.878f,88.0252f,2.30383f},// 31 - {BG_IC_NPC_KEEP_CANNON_22,NPC_KEEP_CANNON,TEAM_HORDE,1144.33f,-833.309f,87.9268f,2.14675f},// 32 - {BG_IC_NPC_KEEP_CANNON_23,NPC_KEEP_CANNON,TEAM_HORDE,1135.29f,-840.878f,88.0252f,2.30383f},// 33 - {BG_IC_NPC_KEEP_CANNON_24,NPC_KEEP_CANNON,TEAM_HORDE,1142.59f,-691.946f,87.9756f,3.9619f},// 34 - {BG_IC_NPC_KEEP_CANNON_25,NPC_KEEP_CANNON,TEAM_HORDE,1166.13f,-858.391f,87.9653f,5.63741f},// 35 + {BG_IC_NPC_OVERLORD_AGMAR, NPC_OVERLORD_AGMAR, TEAM_HORDE, 1295.44f, -765.733f, 70.0541f, 0.0f}, //Overlord Agmar 1 + {BG_IC_NPC_HIGH_COMMANDER_HALFORD_WYRMBANE, NPC_HIGH_COMMANDER_HALFORD_WYRMBANE, TEAM_ALLIANCE, 224.983f, -831.573f, 60.9034f, 0.0f}, //High Commander Halford Wyrmbane 2 + {BG_IC_NPC_KOR_KRON_GUARD_1, NPC_KOR_KRON_GUARD, TEAM_HORDE, 1296.01f, -773.256f, 69.958f, 0.292168f}, // 3 + {BG_IC_NPC_KOR_KRON_GUARD_2, NPC_KOR_KRON_GUARD, TEAM_HORDE, 1295.94f, -757.756f, 69.9587f, 6.02165f}, // 4 + {BG_IC_NPC_KOR_KRON_GUARD_3, NPC_KOR_KRON_GUARD, TEAM_HORDE, 1295.09f, -760.927f, 69.9587f, 5.94311f}, // 5 + {BG_IC_NPC_KOR_KRON_GUARD_4, NPC_KOR_KRON_GUARD, TEAM_HORDE, 1295.13f, -769.7f, 69.95f, 0.34f}, // 6 + + {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_1, NPC_SEVEN_TH_LEGION_INFANTRY, TEAM_ALLIANCE, 223.969f, -822.958f, 60.8151f, 0.46337f}, // 7 + {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_2, NPC_SEVEN_TH_LEGION_INFANTRY, TEAM_ALLIANCE, 224.211f, -826.952f, 60.8188f, 6.25961f}, // 8 + {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_3, NPC_SEVEN_TH_LEGION_INFANTRY, TEAM_ALLIANCE, 223.119f, -838.386f, 60.8145f, 5.64857f}, // 9 + {BG_IC_NPC_SEVEN_TH_LEGION_INFANTRY_4, NPC_SEVEN_TH_LEGION_INFANTRY, TEAM_ALLIANCE, 223.889f, -835.102f, 60.8201f, 6.21642f}, // 10 + + {BG_IC_NPC_KEEP_CANNON_1, NPC_KEEP_CANNON, TEAM_ALLIANCE, 415.825f, -754.634f, 87.799f, 1.78024f}, // 11 + {BG_IC_NPC_KEEP_CANNON_2, NPC_KEEP_CANNON, TEAM_ALLIANCE, 410.142f, -755.332f, 87.7991f, 1.78024f}, // 12 + {BG_IC_NPC_KEEP_CANNON_3, NPC_KEEP_CANNON, TEAM_ALLIANCE, 424.33f, -879.352f, 88.0446f, 0.436332f}, // 13 + {BG_IC_NPC_KEEP_CANNON_4, NPC_KEEP_CANNON, TEAM_ALLIANCE, 425.602f, -786.646f, 87.7991f, 5.74213f}, // 14 + {BG_IC_NPC_KEEP_CANNON_5, NPC_KEEP_CANNON, TEAM_ALLIANCE, 426.743f, -884.939f, 87.9613f, 0.436332f}, // 15 + {BG_IC_NPC_KEEP_CANNON_6, NPC_KEEP_CANNON, TEAM_ALLIANCE, 404.736f, -755.495f, 87.7989f, 1.78024f}, // 16 + {BG_IC_NPC_KEEP_CANNON_7, NPC_KEEP_CANNON, TEAM_ALLIANCE, 428.375f, -780.797f, 87.7991f, 5.79449f}, // 17 + {BG_IC_NPC_KEEP_CANNON_8, NPC_KEEP_CANNON, TEAM_ALLIANCE, 429.175f, -890.436f, 88.0446f, 0.436332f}, // 18 + {BG_IC_NPC_KEEP_CANNON_9, NPC_KEEP_CANNON, TEAM_ALLIANCE, 430.872f, -775.278f, 87.7991f, 5.88176f}, // 19 + {BG_IC_NPC_KEEP_CANNON_10, NPC_KEEP_CANNON, TEAM_ALLIANCE, 408.056f, -911.283f, 88.0445f, 4.64258f}, // 20 + {BG_IC_NPC_KEEP_CANNON_11, NPC_KEEP_CANNON, TEAM_ALLIANCE, 413.609f, -911.566f, 88.0447f, 4.66003f}, // 21 + {BG_IC_NPC_KEEP_CANNON_12, NPC_KEEP_CANNON, TEAM_ALLIANCE, 402.554f, -910.557f, 88.0446f, 4.57276f}, // 22 + + {BG_IC_NPC_KEEP_CANNON_13, NPC_KEEP_CANNON, TEAM_HORDE, 1158.91f, -660.144f, 87.9332f, 0.750492f}, // 23 + {BG_IC_NPC_KEEP_CANNON_14, NPC_KEEP_CANNON, TEAM_HORDE, 1156.22f, -866.809f, 87.8754f, 5.27089f}, // 24 + {BG_IC_NPC_KEEP_CANNON_15, NPC_KEEP_CANNON, TEAM_HORDE, 1163.74f, -663.67f, 88.3571f, 0.558505f}, // 25 + {BG_IC_NPC_KEEP_CANNON_16, NPC_KEEP_CANNON, TEAM_HORDE, 1135.18f, -683.896f, 88.0409f, 3.9619f}, // 26 + {BG_IC_NPC_KEEP_CANNON_17, NPC_KEEP_CANNON, TEAM_HORDE, 1138.91f, -836.359f, 88.3728f, 2.18166f}, // 27 + {BG_IC_NPC_KEEP_CANNON_18, NPC_KEEP_CANNON, TEAM_HORDE, 1162.08f, -863.717f, 88.358f, 5.48033f}, // 28 + {BG_IC_NPC_KEEP_CANNON_19, NPC_KEEP_CANNON, TEAM_HORDE, 1167.13f, -669.212f, 87.9682f, 0.383972f}, // 29 + {BG_IC_NPC_KEEP_CANNON_20, NPC_KEEP_CANNON, TEAM_HORDE, 1137.72f, -688.517f, 88.4023f, 3.9619f}, // 30 + {BG_IC_NPC_KEEP_CANNON_21, NPC_KEEP_CANNON, TEAM_HORDE, 1135.29f, -840.878f, 88.0252f, 2.30383f}, // 31 + {BG_IC_NPC_KEEP_CANNON_22, NPC_KEEP_CANNON, TEAM_HORDE, 1144.33f, -833.309f, 87.9268f, 2.14675f}, // 32 + {BG_IC_NPC_KEEP_CANNON_23, NPC_KEEP_CANNON, TEAM_HORDE, 1135.29f, -840.878f, 88.0252f, 2.30383f}, // 33 + {BG_IC_NPC_KEEP_CANNON_24, NPC_KEEP_CANNON, TEAM_HORDE, 1142.59f, -691.946f, 87.9756f, 3.9619f}, // 34 + {BG_IC_NPC_KEEP_CANNON_25, NPC_KEEP_CANNON, TEAM_HORDE, 1166.13f, -858.391f, 87.9653f, 5.63741f}, // 35 }; const Position BG_IC_WorkshopVehicles[5] = @@ -510,9 +510,9 @@ const Position BG_IC_DocksVehiclesCatapults[4] = const Position BG_IC_HangarTeleporters[3] = { - {827.958f,-994.467f,134.071f,0.0f}, // Gunship Portal - {738.613f,-1106.58f,134.745f,2.54818f}, // Gunship Portal - {672.283f,-1156.99f,133.706f,1.37881f}, // Gunship Portal + {827.958f, -994.467f, 134.071f, 0.0f}, // Gunship Portal + {738.613f, -1106.58f, 134.745f, 2.54818f}, // Gunship Portal + {672.283f, -1156.99f, 133.706f, 1.37881f}, // Gunship Portal }; struct ICGo @@ -527,128 +527,128 @@ struct ICGo const ICGo BG_IC_Teleporters[MAX_FORTRESS_TELEPORTERS_SPAWNS] = { - {BG_IC_GO_TELEPORTER_1_1,GO_TELEPORTER_1,1143.25f,-779.599f,48.629f,1.64061f}, // Teleporter - {BG_IC_GO_TELEPORTER_1_2,GO_TELEPORTER_1,1236.53f,-669.415f,48.2729f,0.104719f}, // Teleporter - {BG_IC_GO_TELEPORTER_2_1,GO_TELEPORTER_2,1233.27f,-844.526f,48.8824f,-0.0174525f}, // Teleporter - {BG_IC_GO_TELEPORTER_3_1,GO_TELEPORTER_3,311.92f,-913.972f,48.8159f,3.08918f}, // Teleporter - {BG_IC_GO_TELEPORTER_2_2,GO_TELEPORTER_2,1235.53f,-683.872f,49.304f,-3.08918f}, // Teleporter - {BG_IC_GO_TELEPORTER_4_1,GO_TELEPORTER_4,397.089f,-859.382f,48.8993f,1.64061f}, // Teleporter - {BG_IC_GO_TELEPORTER_3_2,GO_TELEPORTER_3,324.635f,-749.128f,49.3602f,0.0174525f}, // Teleporter - {BG_IC_GO_TELEPORTER_3_3,GO_TELEPORTER_3,425.675f,-857.09f,48.5104f,-1.6057f}, // Teleporter - {BG_IC_GO_TELEPORTER_4_2,GO_TELEPORTER_4,323.54f,-888.361f,48.9197f,0.0349063f}, // Teleporter - {BG_IC_GO_TELEPORTER_4_3,GO_TELEPORTER_4,326.285f,-777.366f,49.0208f,3.12412f}, // Teleporter - {BG_IC_GO_TELEPORTER_1_3,GO_TELEPORTER_1,1235.09f,-857.898f,48.9163f,3.07177f}, // Teleporter - {BG_IC_GO_TELEPORTER_2_3,GO_TELEPORTER_2,1158.76f,-746.182f,48.6277f,-1.51844f}, // Teleporter - - {BG_IC_GO_TELEPORTER_EFFECTS_A_1,GO_TELEPORTER_EFFECTS_A,425.686f,-857.092f,48.51f,-1.62316f}, // Teleporter Effects (Alliance) - {BG_IC_GO_TELEPORTER_EFFECTS_A_2,GO_TELEPORTER_EFFECTS_A,324.634f,-749.148f,49.359f,0.0174525f}, // Teleporter Effects (Alliance) - {BG_IC_GO_TELEPORTER_EFFECTS_A_3,GO_TELEPORTER_EFFECTS_A,311.911f,-913.986f,48.8157f,3.08918f}, // Teleporter Effects (Alliance) - {BG_IC_GO_TELEPORTER_EFFECTS_A_4,GO_TELEPORTER_EFFECTS_A,326.266f,-777.347f,49.0215f,3.12412f}, // Teleporter Effects (Alliance) - {BG_IC_GO_TELEPORTER_EFFECTS_A_5,GO_TELEPORTER_EFFECTS_A,323.55f,-888.347f,48.9198f,0.0174525f}, // Teleporter Effects (Alliance) - {BG_IC_GO_TELEPORTER_EFFECTS_A_6,GO_TELEPORTER_EFFECTS_A,397.116f,-859.378f,48.8989f,1.64061f}, // Teleporter Effects (Alliance) - - {BG_IC_GO_TELEPORTER_EFFECTS_H_1,GO_TELEPORTER_EFFECTS_H,1143.25f,-779.623f,48.6291f,1.62316f}, // Teleporter Effects (Horde) - {BG_IC_GO_TELEPORTER_EFFECTS_H_2,GO_TELEPORTER_EFFECTS_H,1158.64f,-746.148f,48.6277f,-1.50098f}, // Teleporter Effects (Horde) - {BG_IC_GO_TELEPORTER_EFFECTS_H_3,GO_TELEPORTER_EFFECTS_H,1233.25f,-844.573f,48.8836f,0.0174525f}, // Teleporter Effects (Horde) - {BG_IC_GO_TELEPORTER_EFFECTS_H_4,GO_TELEPORTER_EFFECTS_H,1235.07f,-857.957f,48.9163f,3.05433f}, // Teleporter Effects (Horde) - {BG_IC_GO_TELEPORTER_EFFECTS_H_5,GO_TELEPORTER_EFFECTS_H,1236.46f,-669.344f,48.2684f,0.087266f}, // Teleporter Effects (Horde) - {BG_IC_GO_TELEPORTER_EFFECTS_H_6,GO_TELEPORTER_EFFECTS_H,1235.6f,-683.806f,49.3028f,-3.07177f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_1_1, GO_TELEPORTER_1, 1143.25f, -779.599f, 48.629f, 1.64061f}, // Teleporter + {BG_IC_GO_TELEPORTER_1_2, GO_TELEPORTER_1, 1236.53f, -669.415f, 48.2729f, 0.104719f}, // Teleporter + {BG_IC_GO_TELEPORTER_2_1, GO_TELEPORTER_2, 1233.27f, -844.526f, 48.8824f, -0.0174525f}, // Teleporter + {BG_IC_GO_TELEPORTER_3_1, GO_TELEPORTER_3, 311.92f, -913.972f, 48.8159f, 3.08918f}, // Teleporter + {BG_IC_GO_TELEPORTER_2_2, GO_TELEPORTER_2, 1235.53f, -683.872f, 49.304f, -3.08918f}, // Teleporter + {BG_IC_GO_TELEPORTER_4_1, GO_TELEPORTER_4, 397.089f, -859.382f, 48.8993f, 1.64061f}, // Teleporter + {BG_IC_GO_TELEPORTER_3_2, GO_TELEPORTER_3, 324.635f, -749.128f, 49.3602f, 0.0174525f}, // Teleporter + {BG_IC_GO_TELEPORTER_3_3, GO_TELEPORTER_3, 425.675f, -857.09f, 48.5104f, -1.6057f}, // Teleporter + {BG_IC_GO_TELEPORTER_4_2, GO_TELEPORTER_4, 323.54f, -888.361f, 48.9197f, 0.0349063f}, // Teleporter + {BG_IC_GO_TELEPORTER_4_3, GO_TELEPORTER_4, 326.285f, -777.366f, 49.0208f, 3.12412f}, // Teleporter + {BG_IC_GO_TELEPORTER_1_3, GO_TELEPORTER_1, 1235.09f, -857.898f, 48.9163f, 3.07177f}, // Teleporter + {BG_IC_GO_TELEPORTER_2_3, GO_TELEPORTER_2, 1158.76f, -746.182f, 48.6277f, -1.51844f}, // Teleporter + + {BG_IC_GO_TELEPORTER_EFFECTS_A_1, GO_TELEPORTER_EFFECTS_A, 425.686f, -857.092f, 48.51f, -1.62316f}, // Teleporter Effects (Alliance) + {BG_IC_GO_TELEPORTER_EFFECTS_A_2, GO_TELEPORTER_EFFECTS_A, 324.634f, -749.148f, 49.359f, 0.0174525f}, // Teleporter Effects (Alliance) + {BG_IC_GO_TELEPORTER_EFFECTS_A_3, GO_TELEPORTER_EFFECTS_A, 311.911f, -913.986f, 48.8157f, 3.08918f}, // Teleporter Effects (Alliance) + {BG_IC_GO_TELEPORTER_EFFECTS_A_4, GO_TELEPORTER_EFFECTS_A, 326.266f, -777.347f, 49.0215f, 3.12412f}, // Teleporter Effects (Alliance) + {BG_IC_GO_TELEPORTER_EFFECTS_A_5, GO_TELEPORTER_EFFECTS_A, 323.55f, -888.347f, 48.9198f, 0.0174525f}, // Teleporter Effects (Alliance) + {BG_IC_GO_TELEPORTER_EFFECTS_A_6, GO_TELEPORTER_EFFECTS_A, 397.116f, -859.378f, 48.8989f, 1.64061f}, // Teleporter Effects (Alliance) + + {BG_IC_GO_TELEPORTER_EFFECTS_H_1, GO_TELEPORTER_EFFECTS_H, 1143.25f, -779.623f, 48.6291f, 1.62316f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_EFFECTS_H_2, GO_TELEPORTER_EFFECTS_H, 1158.64f, -746.148f, 48.6277f, -1.50098f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_EFFECTS_H_3, GO_TELEPORTER_EFFECTS_H, 1233.25f, -844.573f, 48.8836f, 0.0174525f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_EFFECTS_H_4, GO_TELEPORTER_EFFECTS_H, 1235.07f, -857.957f, 48.9163f, 3.05433f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_EFFECTS_H_5, GO_TELEPORTER_EFFECTS_H, 1236.46f, -669.344f, 48.2684f, 0.087266f}, // Teleporter Effects (Horde) + {BG_IC_GO_TELEPORTER_EFFECTS_H_6, GO_TELEPORTER_EFFECTS_H, 1235.6f, -683.806f, 49.3028f, -3.07177f}, // Teleporter Effects (Horde) }; const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] = { - {BG_IC_GO_ALLIANCE_GATE_1,GO_ALLIANCE_GATE_1,351.615f,-762.75f,48.9162f,-1.5708f}, // Alliance Gate || Left - {BG_IC_GO_ALLIANCE_GATE_2,GO_ALLIANCE_GATE_2,351.024f,-903.326f,48.9247f,1.5708f}, // Alliance Gate || Right - {BG_IC_GO_ALLIANCE_GATE_3,GO_ALLIANCE_GATE_3,413.479f,-833.95f,48.5238f,3.14159f}, // Alliance Gate || Front - - {BG_IC_GO_HORDE_GATE_1,GO_HORDE_GATE_1,1150.9f,-762.606f,47.5077f,3.14159f}, // Horde Gate || Front - {BG_IC_GO_HORDE_GATE_2,GO_HORDE_GATE_2,1218.74f,-851.155f,48.2533f,-1.5708f}, // Horde Gate || Left - {BG_IC_GO_HORDE_GATE_3,GO_HORDE_GATE_3,1217.9f,-676.948f,47.6341f,1.5708f}, // Horde Gate || Right - - {BG_IC_GO_HORDE_BANNER,GO_HORDE_BANNER,1284.76f,-705.668f,48.9163f,-3.08918f}, // Horde Banner - {BG_IC_GO_ALLIANCE_BANNER,GO_ALLIANCE_BANNER,299.153f,-784.589f,48.9162f,-0.157079f}, // Alliance Banner - - {BG_IC_GO_WORKSHOP_BANNER,GO_WORKSHOP_BANNER,776.229f,-804.283f,6.45052f,1.6057f}, // Workshop Banner - {BG_IC_GO_DOCKS_BANNER,GO_DOCKS_BANNER,726.385f,-360.205f,17.8153f,-1.62316f}, // Docks Banner - {BG_IC_GO_HANGAR_BANNER,GO_HANGAR_BANNER,807.78f,-1000.07f,132.381f,-1.93732f}, // Hangar Banner - {BG_IC_GO_QUARRY_BANNER,GO_QUARRY_BANNER,251.016f,-1159.32f,17.2376f,-2.25147f}, // Quarry Banner - {BG_IC_GO_REFINERY_BANNER,GO_REFINERY_BANNER,1269.5f,-400.809f,37.6253f,-1.76278f}, // Refinery Banner - - {BG_IC_GO_BENCH_1,GO_BENCH_1,834.208f,-461.826f,22.3067f,1.5708f}, // Bench - {BG_IC_GO_BENCH_2,GO_BENCH_2,826.153f,-461.985f,22.5149f,1.5708f}, // Bench - {BG_IC_GO_BENCH_3,GO_BENCH_3,817.446f,-470.47f,25.372f,-1.56207f}, // Bench - {BG_IC_GO_BENCH_4,GO_BENCH_4,827.001f,-474.415f,25.372f,1.57952f}, // Bench - {BG_IC_GO_BENCH_5,GO_BENCH_5,819.264f,-461.961f,22.7614f,1.57952f}, // Bench - - {BG_IC_GO_BONFIRE_1,GO_BONFIRE_1,1162.91f,-734.578f,48.8948f,-2.9845f}, // Bonfire - {BG_IC_GO_BONFIRE_2,GO_BONFIRE_2,1282.34f,-799.762f,87.1357f,-3.13286f}, // Bonfire - {BG_IC_GO_BONFIRE_3,GO_BONFIRE_3,1358.06f,-732.178f,87.1606f,-3.13284f}, // Bonfire - {BG_IC_GO_BONFIRE_4,GO_BONFIRE_4,1281.76f,-732.844f,87.1574f,-3.13246f}, // Bonfire - {BG_IC_GO_BONFIRE_5,GO_BONFIRE_5,1358.81f,-797.899f,87.2953f,3.13312f}, // Bonfire - {BG_IC_GO_BONFIRE_6,GO_BONFIRE_6,1162.21f,-790.543f,48.9162f,2.27765f}, // Bonfire - - {BG_IC_GO_BRAZIER_1,GO_BRAZIER_1,1262.21f,-751.358f,48.8133f,2.26893f}, // Brazier - {BG_IC_GO_BRAZIER_2,GO_BRAZIER_2,1262.58f,-781.861f,48.8132f,2.04203f}, // Brazier - {BG_IC_GO_BRAZIER_3,GO_BRAZIER_3,223.818f,-839.352f,60.7917f,1.09083f}, // Brazier - {BG_IC_GO_BRAZIER_4,GO_BRAZIER_4,224.277f,-822.77f,60.7917f,2.06822f}, // Brazier - - {BG_IC_GO_CHAIR_1,GO_CHAIR_1,632.876f,-282.461f,5.45364f,-0.851094f}, // Chair - {BG_IC_GO_CHAIR_2,GO_CHAIR_2,635.796f,-276.295f,5.48659f,-3.03273f}, // Chair - {BG_IC_GO_CHAIR_3_1,GO_CHAIR_3,762.245f,-444.795f,22.8526f,-1.98095f}, // Chair - {BG_IC_GO_CHAIR_4,GO_CHAIR_4,632.156f,-304.503f,5.4879f,1.15603f}, // Chair - {BG_IC_GO_CHAIR_5,GO_CHAIR_5,643.86f,-270.204f,5.48898f,2.36903f}, // Chair - {BG_IC_GO_CHAIR_6_1,GO_CHAIR_6,902.234f,-455.508f,18.3935f,-1.00356f}, // Chair - {BG_IC_GO_CHAIR_7,GO_CHAIR_7,810.237f,-461.2f,25.4627f,1.5708f}, // Chair - {BG_IC_GO_CHAIR_3_2,GO_CHAIR_3,1117.19f,-365.674f,18.8456f,0.968657f}, // Chair - {BG_IC_GO_CHAIR_6_2,GO_CHAIR_6,1066.19f,-337.214f,18.8225f,0.453785f}, // Chair - {BG_IC_GO_CHAIR_8_1,GO_CHAIR_8,798.324f,-444.951f,22.5601f,-1.02102f}, // Chair - {BG_IC_GO_CHAIR_8_2,GO_CHAIR_8,1081.81f,-358.637f,18.5531f,1.92859f}, // Chair - {BG_IC_GO_CHAIR_9,GO_CHAIR_9,814.931f,-470.816f,33.6373f,-3.12412f}, // Chair - - {BG_IC_GO_DOODAD_HU_PORTCULLIS01_1,GO_DOODAD_HU_PORTCULLIS01,401.024f,-780.724f,49.9482f,-2.52896f}, // Doodad_HU_Portcullis01 - {BG_IC_GO_DOODAD_HU_PORTCULLIS01_2,GO_DOODAD_HU_PORTCULLIS01,399.802f,-885.208f,50.1939f,2.516f}, // Doodad_HU_Portcullis01 - - {BG_IC_GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01,GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01,413.479f,-833.95f,48.5238f,3.14159f}, // Doodad_ND_Human_Gate_ClosedFX_Door01 - - {BG_IC_GO_DOODAD_PORTCULLISACTIVE01,GO_DOODAD_PORTCULLISACTIVE01,-832.595f,51.4109f,-0.0261791f, 0.0f}, // Doodad_PortcullisActive01 - - {BG_IC_GO_DOODAD_PORTCULLISACTIVE02,GO_DOODAD_PORTCULLISACTIVE02,273.033f,-832.199f,51.4109f,-0.0261791f}, // Doodad_PortcullisActive02 - - {BG_IC_GO_DOODAD_VR_PORTCULLIS01_1,GO_DOODAD_VR_PORTCULLIS01,1156.89f,-843.998f,48.6322f,0.732934f}, // Doodad_VR_Portcullis01 - {BG_IC_GO_DOODAD_VR_PORTCULLIS01_2,GO_DOODAD_VR_PORTCULLIS01,1157.05f,-682.36f,48.6322f,-0.829132f}, // Doodad_VR_Portcullis01 - - {BG_IC_GO_FLAGPOLE_1_1,GO_FLAGPOLE_1,-400.809f,37.6253f,-1.76278f, 0.0f}, // Flagpole - {BG_IC_GO_FLAGPOLE_2_1,GO_FLAGPOLE_2,1284.76f,-705.668f,48.9163f,-3.08918f}, // Flagpole - {BG_IC_GO_FLAGPOLE_2_2,GO_FLAGPOLE_2,299.153f,-784.589f,48.9162f,-0.157079f}, // Flagpole - {BG_IC_GO_FLAGPOLE_1_2,GO_FLAGPOLE_1,726.385f,-360.205f,17.8153f,-1.6057f}, // Flagpole - {BG_IC_GO_FLAGPOLE_1_3,GO_FLAGPOLE_1,807.78f,-1000.07f,132.381f,-1.91986f}, // Flagpole - {BG_IC_GO_FLAGPOLE_1_4,GO_FLAGPOLE_1,776.229f,-804.283f,6.45052f,1.6057f}, // Flagpole - {BG_IC_GO_FLAGPOLE_1_5,GO_FLAGPOLE_1,251.016f,-1159.32f,17.2376f,-2.25147f}, // Flagpole - - {BG_IC_GO_HORDE_KEEP_PORTCULLIS,GO_HORDE_KEEP_PORTCULLIS,1283.05f,-765.878f,50.8297f,-3.13286f}, // Horde Keep Portcullis - - {BG_IC_GO_STOVE_1_1,GO_STOVE_1,903.291f,-457.345f,18.1356f,2.23402f}, // Stove - {BG_IC_GO_STOVE_2_1,GO_STOVE_2,761.462f,-446.684f,22.5602f,0.244344f}, // Stove - {BG_IC_GO_STOVE_1_2,GO_STOVE_1,11068.13f,-336.373f,18.5647f,-2.59181f}, // Stove - {BG_IC_GO_STOVE_2_2,GO_STOVE_2,1118.32f,-363.969f,18.5532f,-3.08918f}, // Stove - - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_1,GO_HUGE_SEAFORIUM_BOMB_A,297.3212f,-851.321167f,48.91627f,-0.94247663f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_2,GO_HUGE_SEAFORIUM_BOMB_A,298.104156f,-861.026062f,48.916275f,-2.75761318f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_3,GO_HUGE_SEAFORIUM_BOMB_A,300.371521f,-818.732666f,48.91625f,0.785396755f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_4,GO_HUGE_SEAFORIUM_BOMB_A,302.1354f,-810.7083f,48.91625f,-1.04719758f}, - - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_1,GO_HUGE_SEAFORIUM_BOMB_H,1268.30908f, -745.783f, 48.9187775f, 0.785396755f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_2,GO_HUGE_SEAFORIUM_BOMB_H,1268.50867f, -738.1215f, 48.9175f, -1.04719758f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_3,GO_HUGE_SEAFORIUM_BOMB_H,1273.066f, -786.572937f, 48.9419174f, -0.94247663f}, - {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_4,GO_HUGE_SEAFORIUM_BOMB_H,1273.849f, -796.2778f, 48.9364281f, -2.75761318f}, - - {BG_IC_GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01,GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01,1150.9f,-762.606f,47.0f,3.14159f} // Doodad_ND_WinterOrc_Wall_GateFX_Door01 -> this was not sniffed because I only had alliance sniffs + {BG_IC_GO_ALLIANCE_GATE_1, GO_ALLIANCE_GATE_1, 351.615f, -762.75f, 48.9162f, -1.5708f}, // Alliance Gate || Left + {BG_IC_GO_ALLIANCE_GATE_2, GO_ALLIANCE_GATE_2, 351.024f, -903.326f, 48.9247f, 1.5708f}, // Alliance Gate || Right + {BG_IC_GO_ALLIANCE_GATE_3, GO_ALLIANCE_GATE_3, 413.479f, -833.95f, 48.5238f, 3.14159f}, // Alliance Gate || Front + + {BG_IC_GO_HORDE_GATE_1, GO_HORDE_GATE_1, 1150.9f, -762.606f, 47.5077f, 3.14159f}, // Horde Gate || Front + {BG_IC_GO_HORDE_GATE_2, GO_HORDE_GATE_2, 1218.74f, -851.155f, 48.2533f, -1.5708f}, // Horde Gate || Left + {BG_IC_GO_HORDE_GATE_3, GO_HORDE_GATE_3, 1217.9f, -676.948f, 47.6341f, 1.5708f}, // Horde Gate || Right + + {BG_IC_GO_HORDE_BANNER, GO_HORDE_BANNER, 1284.76f, -705.668f, 48.9163f, -3.08918f}, // Horde Banner + {BG_IC_GO_ALLIANCE_BANNER, GO_ALLIANCE_BANNER, 299.153f, -784.589f, 48.9162f, -0.157079f}, // Alliance Banner + + {BG_IC_GO_WORKSHOP_BANNER, GO_WORKSHOP_BANNER, 776.229f, -804.283f, 6.45052f, 1.6057f}, // Workshop Banner + {BG_IC_GO_DOCKS_BANNER, GO_DOCKS_BANNER, 726.385f, -360.205f, 17.8153f, -1.62316f}, // Docks Banner + {BG_IC_GO_HANGAR_BANNER, GO_HANGAR_BANNER, 807.78f, -1000.07f, 132.381f, -1.93732f}, // Hangar Banner + {BG_IC_GO_QUARRY_BANNER, GO_QUARRY_BANNER, 251.016f, -1159.32f, 17.2376f, -2.25147f}, // Quarry Banner + {BG_IC_GO_REFINERY_BANNER, GO_REFINERY_BANNER, 1269.5f, -400.809f, 37.6253f, -1.76278f}, // Refinery Banner + + {BG_IC_GO_BENCH_1, GO_BENCH_1, 834.208f, -461.826f, 22.3067f, 1.5708f}, // Bench + {BG_IC_GO_BENCH_2, GO_BENCH_2, 826.153f, -461.985f, 22.5149f, 1.5708f}, // Bench + {BG_IC_GO_BENCH_3, GO_BENCH_3, 817.446f, -470.47f, 25.372f, -1.56207f}, // Bench + {BG_IC_GO_BENCH_4, GO_BENCH_4, 827.001f, -474.415f, 25.372f, 1.57952f}, // Bench + {BG_IC_GO_BENCH_5, GO_BENCH_5, 819.264f, -461.961f, 22.7614f, 1.57952f}, // Bench + + {BG_IC_GO_BONFIRE_1, GO_BONFIRE_1, 1162.91f, -734.578f, 48.8948f, -2.9845f}, // Bonfire + {BG_IC_GO_BONFIRE_2, GO_BONFIRE_2, 1282.34f, -799.762f, 87.1357f, -3.13286f}, // Bonfire + {BG_IC_GO_BONFIRE_3, GO_BONFIRE_3, 1358.06f, -732.178f, 87.1606f, -3.13284f}, // Bonfire + {BG_IC_GO_BONFIRE_4, GO_BONFIRE_4, 1281.76f, -732.844f, 87.1574f, -3.13246f}, // Bonfire + {BG_IC_GO_BONFIRE_5, GO_BONFIRE_5, 1358.81f, -797.899f, 87.2953f, 3.13312f}, // Bonfire + {BG_IC_GO_BONFIRE_6, GO_BONFIRE_6, 1162.21f, -790.543f, 48.9162f, 2.27765f}, // Bonfire + + {BG_IC_GO_BRAZIER_1, GO_BRAZIER_1, 1262.21f, -751.358f, 48.8133f, 2.26893f}, // Brazier + {BG_IC_GO_BRAZIER_2, GO_BRAZIER_2, 1262.58f, -781.861f, 48.8132f, 2.04203f}, // Brazier + {BG_IC_GO_BRAZIER_3, GO_BRAZIER_3, 223.818f, -839.352f, 60.7917f, 1.09083f}, // Brazier + {BG_IC_GO_BRAZIER_4, GO_BRAZIER_4, 224.277f, -822.77f, 60.7917f, 2.06822f}, // Brazier + + {BG_IC_GO_CHAIR_1, GO_CHAIR_1, 632.876f, -282.461f, 5.45364f, -0.851094f}, // Chair + {BG_IC_GO_CHAIR_2, GO_CHAIR_2, 635.796f, -276.295f, 5.48659f, -3.03273f}, // Chair + {BG_IC_GO_CHAIR_3_1, GO_CHAIR_3, 762.245f, -444.795f, 22.8526f, -1.98095f}, // Chair + {BG_IC_GO_CHAIR_4, GO_CHAIR_4, 632.156f, -304.503f, 5.4879f, 1.15603f}, // Chair + {BG_IC_GO_CHAIR_5, GO_CHAIR_5, 643.86f, -270.204f, 5.48898f, 2.36903f}, // Chair + {BG_IC_GO_CHAIR_6_1, GO_CHAIR_6, 902.234f, -455.508f, 18.3935f, -1.00356f}, // Chair + {BG_IC_GO_CHAIR_7, GO_CHAIR_7, 810.237f, -461.2f, 25.4627f, 1.5708f}, // Chair + {BG_IC_GO_CHAIR_3_2, GO_CHAIR_3, 1117.19f, -365.674f, 18.8456f, 0.968657f}, // Chair + {BG_IC_GO_CHAIR_6_2, GO_CHAIR_6, 1066.19f, -337.214f, 18.8225f, 0.453785f}, // Chair + {BG_IC_GO_CHAIR_8_1, GO_CHAIR_8, 798.324f, -444.951f, 22.5601f, -1.02102f}, // Chair + {BG_IC_GO_CHAIR_8_2, GO_CHAIR_8, 1081.81f, -358.637f, 18.5531f, 1.92859f}, // Chair + {BG_IC_GO_CHAIR_9, GO_CHAIR_9, 814.931f, -470.816f, 33.6373f, -3.12412f}, // Chair + + {BG_IC_GO_DOODAD_HU_PORTCULLIS01_1, GO_DOODAD_HU_PORTCULLIS01, 401.024f, -780.724f, 49.9482f, -2.52896f}, // Doodad_HU_Portcullis01 + {BG_IC_GO_DOODAD_HU_PORTCULLIS01_2, GO_DOODAD_HU_PORTCULLIS01, 399.802f, -885.208f, 50.1939f, 2.516f}, // Doodad_HU_Portcullis01 + + {BG_IC_GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01, GO_DOODAD_ND_HUMAN_GATE_CLOSEDFX_DOOR01, 413.479f, -833.95f, 48.5238f, 3.14159f}, // Doodad_ND_Human_Gate_ClosedFX_Door01 + + {BG_IC_GO_DOODAD_PORTCULLISACTIVE01, GO_DOODAD_PORTCULLISACTIVE01, -832.595f, 51.4109f, -0.0261791f, 0.0f}, // Doodad_PortcullisActive01 + + {BG_IC_GO_DOODAD_PORTCULLISACTIVE02, GO_DOODAD_PORTCULLISACTIVE02, 273.033f, -832.199f, 51.4109f, -0.0261791f}, // Doodad_PortcullisActive02 + + {BG_IC_GO_DOODAD_VR_PORTCULLIS01_1, GO_DOODAD_VR_PORTCULLIS01, 1156.89f, -843.998f, 48.6322f, 0.732934f}, // Doodad_VR_Portcullis01 + {BG_IC_GO_DOODAD_VR_PORTCULLIS01_2, GO_DOODAD_VR_PORTCULLIS01, 1157.05f, -682.36f, 48.6322f, -0.829132f}, // Doodad_VR_Portcullis01 + + {BG_IC_GO_FLAGPOLE_1_1, GO_FLAGPOLE_1, -400.809f, 37.6253f, -1.76278f, 0.0f}, // Flagpole + {BG_IC_GO_FLAGPOLE_2_1, GO_FLAGPOLE_2, 1284.76f, -705.668f, 48.9163f, -3.08918f}, // Flagpole + {BG_IC_GO_FLAGPOLE_2_2, GO_FLAGPOLE_2, 299.153f, -784.589f, 48.9162f, -0.157079f}, // Flagpole + {BG_IC_GO_FLAGPOLE_1_2, GO_FLAGPOLE_1, 726.385f, -360.205f, 17.8153f, -1.6057f}, // Flagpole + {BG_IC_GO_FLAGPOLE_1_3, GO_FLAGPOLE_1, 807.78f, -1000.07f, 132.381f, -1.91986f}, // Flagpole + {BG_IC_GO_FLAGPOLE_1_4, GO_FLAGPOLE_1, 776.229f, -804.283f, 6.45052f, 1.6057f}, // Flagpole + {BG_IC_GO_FLAGPOLE_1_5, GO_FLAGPOLE_1, 251.016f, -1159.32f, 17.2376f, -2.25147f}, // Flagpole + + {BG_IC_GO_HORDE_KEEP_PORTCULLIS, GO_HORDE_KEEP_PORTCULLIS, 1283.05f, -765.878f, 50.8297f, -3.13286f}, // Horde Keep Portcullis + + {BG_IC_GO_STOVE_1_1, GO_STOVE_1, 903.291f, -457.345f, 18.1356f, 2.23402f}, // Stove + {BG_IC_GO_STOVE_2_1, GO_STOVE_2, 761.462f, -446.684f, 22.5602f, 0.244344f}, // Stove + {BG_IC_GO_STOVE_1_2, GO_STOVE_1, 11068.13f, -336.373f, 18.5647f, -2.59181f}, // Stove + {BG_IC_GO_STOVE_2_2, GO_STOVE_2, 1118.32f, -363.969f, 18.5532f, -3.08918f}, // Stove + + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_1, GO_HUGE_SEAFORIUM_BOMB_A, 297.3212f, -851.321167f, 48.91627f, -0.94247663f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_2, GO_HUGE_SEAFORIUM_BOMB_A, 298.104156f, -861.026062f, 48.916275f, -2.75761318f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_3, GO_HUGE_SEAFORIUM_BOMB_A, 300.371521f, -818.732666f, 48.91625f, 0.785396755f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_A_4, GO_HUGE_SEAFORIUM_BOMB_A, 302.1354f, -810.7083f, 48.91625f, -1.04719758f}, + + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_1, GO_HUGE_SEAFORIUM_BOMB_H, 1268.30908f, -745.783f, 48.9187775f, 0.785396755f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_2, GO_HUGE_SEAFORIUM_BOMB_H, 1268.50867f, -738.1215f, 48.9175f, -1.04719758f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_3, GO_HUGE_SEAFORIUM_BOMB_H, 1273.066f, -786.572937f, 48.9419174f, -0.94247663f}, + {BG_IC_GO_HUGE_SEAFORIUM_BOMBS_H_4, GO_HUGE_SEAFORIUM_BOMB_H, 1273.849f, -796.2778f, 48.9364281f, -2.75761318f}, + + {BG_IC_GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01, GO_DOODAD_ND_WINTERORC_WALL_GATEFX_DOOR01, 1150.9f, -762.606f, 47.0f, 3.14159f} // Doodad_ND_WinterOrc_Wall_GateFX_Door01 -> this was not sniffed because I only had alliance sniffs }; const Position workshopBombs[2] = { - {750.601f,-864.597f,13.4754f,1.93731f}, - {785.509f,-864.715f,13.3993f,2.47837f} + {750.601f, -864.597f, 13.4754f, 1.93731f}, + {785.509f, -864.715f, 13.3993f, 2.47837f} }; enum Spells @@ -780,7 +780,7 @@ enum ICNodeState const uint32 BG_IC_GraveyardIds[MAX_NODE_TYPES+2] = {0, 0, 1480, 1481, 1482, 1485, 1486, 1483, 1484}; const Position TransportMovementInfo = {7.305609f, -0.095246f, 34.51022f, 0.0f}; -const Position TeleportToTransportPosition = {661.0f,-1244.0f,288.0f,0.0f}; +const Position TeleportToTransportPosition = {661.0f, -1244.0f, 288.0f, 0.0f}; const float BG_IC_SpiritGuidePos[MAX_NODE_TYPES+2][4] = { @@ -831,13 +831,13 @@ struct ICNodePoint const ICNodePoint nodePointInitial[7] = { - {BG_IC_GO_REFINERY_BANNER,GO_REFINERY_BANNER,TEAM_NEUTRAL,NODE_TYPE_REFINERY,{GO_ALLIANCE_BANNER_REFINERY,GO_ALLIANCE_BANNER_REFINERY_CONT,GO_HORDE_BANNER_REFINERY,GO_HORDE_BANNER_REFINERY_CONT},false,0,0,{BG_IC_REFINERY_UNCONTROLLED,BG_IC_REFINERY_CONFLICT_A,BG_IC_REFINERY_CONFLICT_H,BG_IC_REFINERY_CONTROLLED_A,BG_IC_REFINERY_CONTROLLED_H},NODE_STATE_UNCONTROLLED,LANG_BG_IC_REFINERY}, - {BG_IC_GO_QUARRY_BANNER,GO_QUARRY_BANNER,TEAM_NEUTRAL,NODE_TYPE_QUARRY, {GO_ALLIANCE_BANNER_QUARRY,GO_ALLIANCE_BANNER_QUARRY_CONT,GO_HORDE_BANNER_QUARRY,GO_HORDE_BANNER_QUARRY_CONT},false,0,0,{BG_IC_QUARRY_UNCONTROLLED,BG_IC_QUARRY_CONFLICT_A,BG_IC_QUARRY_CONFLICT_H,BG_IC_QUARRY_CONTROLLED_A,BG_IC_QUARRY_CONTROLLED_H},NODE_STATE_UNCONTROLLED,LANG_BG_IC_QUARRY}, - {BG_IC_GO_DOCKS_BANNER,GO_DOCKS_BANNER,TEAM_NEUTRAL,NODE_TYPE_DOCKS, {GO_ALLIANCE_BANNER_DOCK,GO_ALLIANCE_BANNER_DOCK_CONT,GO_HORDE_BANNER_DOCK,GO_HORDE_BANNER_DOCK_CONT},false,0,0,{BG_IC_DOCKS_UNCONTROLLED, BG_IC_DOCKS_CONFLICT_A, BG_IC_DOCKS_CONFLICT_H, BG_IC_DOCKS_CONTROLLED_A,BG_IC_DOCKS_CONTROLLED_H},NODE_STATE_UNCONTROLLED,LANG_BG_IC_DOCKS}, - {BG_IC_GO_HANGAR_BANNER,GO_HANGAR_BANNER,TEAM_NEUTRAL,NODE_TYPE_HANGAR, {GO_ALLIANCE_BANNER_HANGAR,GO_ALLIANCE_BANNER_HANGAR_CONT,GO_HORDE_BANNER_HANGAR,GO_HORDE_BANNER_HANGAR_CONT},false,0,0,{BG_IC_HANGAR_UNCONTROLLED,BG_IC_HANGAR_CONFLICT_A, BG_IC_HANGAR_CONFLICT_H, BG_IC_HANGAR_CONTROLLED_A, BG_IC_HANGAR_CONTROLLED_H},NODE_STATE_UNCONTROLLED,LANG_BG_IC_HANGAR}, - {BG_IC_GO_WORKSHOP_BANNER,GO_WORKSHOP_BANNER,TEAM_NEUTRAL, NODE_TYPE_WORKSHOP, {GO_ALLIANCE_BANNER_WORKSHOP,GO_ALLIANCE_BANNER_WORKSHOP_CONT,GO_HORDE_BANNER_WORKSHOP,GO_HORDE_BANNER_WORKSHOP_CONT},false,0,0,{BG_IC_WORKSHOP_UNCONTROLLED,BG_IC_WORKSHOP_CONFLICT_A,BG_IC_WORKSHOP_CONFLICT_H,BG_IC_WORKSHOP_CONTROLLED_A,BG_IC_WORKSHOP_CONTROLLED_H},NODE_STATE_UNCONTROLLED,LANG_BG_IC_WORKSHOP}, - {BG_IC_GO_ALLIANCE_BANNER,GO_ALLIANCE_BANNER,TEAM_ALLIANCE,NODE_TYPE_GRAVEYARD_A, {GO_ALLIANCE_BANNER_GRAVEYARD_A,GO_ALLIANCE_BANNER_GRAVEYARD_A_CONT,GO_HORDE_BANNER_GRAVEYARD_A,GO_HORDE_BANNER_GRAVEYARD_A_CONT},false,0,0,{BG_IC_ALLIANCE_KEEP_UNCONTROLLED,BG_IC_ALLIANCE_KEEP_CONFLICT_A,BG_IC_ALLIANCE_KEEP_CONFLICT_H,BG_IC_ALLIANCE_KEEP_CONTROLLED_A,BG_IC_ALLIANCE_KEEP_CONTROLLED_H},NODE_STATE_CONTROLLED_A,LANG_BG_IC_ALLIANCE_KEEP}, - {BG_IC_GO_HORDE_BANNER,GO_HORDE_BANNER,TEAM_HORDE,NODE_TYPE_GRAVEYARD_H, {GO_ALLIANCE_BANNER_GRAVEYARD_H,GO_ALLIANCE_BANNER_GRAVEYARD_H_CONT,GO_HORDE_BANNER_GRAVEYARD_H,GO_HORDE_BANNER_GRAVEYARD_H_CONT},false,0,0,{BG_IC_HORDE_KEEP_UNCONTROLLED,BG_IC_HORDE_KEEP_CONFLICT_A,BG_IC_HORDE_KEEP_CONFLICT_H,BG_IC_HORDE_KEEP_CONTROLLED_A,BG_IC_HORDE_KEEP_CONTROLLED_H},NODE_STATE_CONTROLLED_H,LANG_BG_IC_HORDE_KEEP}, + {BG_IC_GO_REFINERY_BANNER, GO_REFINERY_BANNER, TEAM_NEUTRAL, NODE_TYPE_REFINERY, {GO_ALLIANCE_BANNER_REFINERY, GO_ALLIANCE_BANNER_REFINERY_CONT, GO_HORDE_BANNER_REFINERY, GO_HORDE_BANNER_REFINERY_CONT}, false, 0, 0, {BG_IC_REFINERY_UNCONTROLLED, BG_IC_REFINERY_CONFLICT_A, BG_IC_REFINERY_CONFLICT_H, BG_IC_REFINERY_CONTROLLED_A, BG_IC_REFINERY_CONTROLLED_H}, NODE_STATE_UNCONTROLLED, LANG_BG_IC_REFINERY}, + {BG_IC_GO_QUARRY_BANNER, GO_QUARRY_BANNER, TEAM_NEUTRAL, NODE_TYPE_QUARRY, {GO_ALLIANCE_BANNER_QUARRY, GO_ALLIANCE_BANNER_QUARRY_CONT, GO_HORDE_BANNER_QUARRY, GO_HORDE_BANNER_QUARRY_CONT}, false, 0, 0, {BG_IC_QUARRY_UNCONTROLLED, BG_IC_QUARRY_CONFLICT_A, BG_IC_QUARRY_CONFLICT_H, BG_IC_QUARRY_CONTROLLED_A, BG_IC_QUARRY_CONTROLLED_H}, NODE_STATE_UNCONTROLLED, LANG_BG_IC_QUARRY}, + {BG_IC_GO_DOCKS_BANNER, GO_DOCKS_BANNER, TEAM_NEUTRAL, NODE_TYPE_DOCKS, {GO_ALLIANCE_BANNER_DOCK, GO_ALLIANCE_BANNER_DOCK_CONT, GO_HORDE_BANNER_DOCK, GO_HORDE_BANNER_DOCK_CONT}, false, 0, 0, {BG_IC_DOCKS_UNCONTROLLED, BG_IC_DOCKS_CONFLICT_A, BG_IC_DOCKS_CONFLICT_H, BG_IC_DOCKS_CONTROLLED_A, BG_IC_DOCKS_CONTROLLED_H}, NODE_STATE_UNCONTROLLED, LANG_BG_IC_DOCKS}, + {BG_IC_GO_HANGAR_BANNER, GO_HANGAR_BANNER, TEAM_NEUTRAL, NODE_TYPE_HANGAR, {GO_ALLIANCE_BANNER_HANGAR, GO_ALLIANCE_BANNER_HANGAR_CONT, GO_HORDE_BANNER_HANGAR, GO_HORDE_BANNER_HANGAR_CONT}, false, 0, 0, {BG_IC_HANGAR_UNCONTROLLED, BG_IC_HANGAR_CONFLICT_A, BG_IC_HANGAR_CONFLICT_H, BG_IC_HANGAR_CONTROLLED_A, BG_IC_HANGAR_CONTROLLED_H}, NODE_STATE_UNCONTROLLED, LANG_BG_IC_HANGAR}, + {BG_IC_GO_WORKSHOP_BANNER, GO_WORKSHOP_BANNER, TEAM_NEUTRAL, NODE_TYPE_WORKSHOP, {GO_ALLIANCE_BANNER_WORKSHOP, GO_ALLIANCE_BANNER_WORKSHOP_CONT, GO_HORDE_BANNER_WORKSHOP, GO_HORDE_BANNER_WORKSHOP_CONT}, false, 0, 0, {BG_IC_WORKSHOP_UNCONTROLLED, BG_IC_WORKSHOP_CONFLICT_A, BG_IC_WORKSHOP_CONFLICT_H, BG_IC_WORKSHOP_CONTROLLED_A, BG_IC_WORKSHOP_CONTROLLED_H}, NODE_STATE_UNCONTROLLED, LANG_BG_IC_WORKSHOP}, + {BG_IC_GO_ALLIANCE_BANNER, GO_ALLIANCE_BANNER, TEAM_ALLIANCE, NODE_TYPE_GRAVEYARD_A, {GO_ALLIANCE_BANNER_GRAVEYARD_A, GO_ALLIANCE_BANNER_GRAVEYARD_A_CONT, GO_HORDE_BANNER_GRAVEYARD_A, GO_HORDE_BANNER_GRAVEYARD_A_CONT}, false, 0, 0, {BG_IC_ALLIANCE_KEEP_UNCONTROLLED, BG_IC_ALLIANCE_KEEP_CONFLICT_A, BG_IC_ALLIANCE_KEEP_CONFLICT_H, BG_IC_ALLIANCE_KEEP_CONTROLLED_A, BG_IC_ALLIANCE_KEEP_CONTROLLED_H}, NODE_STATE_CONTROLLED_A, LANG_BG_IC_ALLIANCE_KEEP}, + {BG_IC_GO_HORDE_BANNER, GO_HORDE_BANNER, TEAM_HORDE, NODE_TYPE_GRAVEYARD_H, {GO_ALLIANCE_BANNER_GRAVEYARD_H, GO_ALLIANCE_BANNER_GRAVEYARD_H_CONT, GO_HORDE_BANNER_GRAVEYARD_H, GO_HORDE_BANNER_GRAVEYARD_H_CONT}, false, 0, 0, {BG_IC_HORDE_KEEP_UNCONTROLLED, BG_IC_HORDE_KEEP_CONFLICT_A, BG_IC_HORDE_KEEP_CONFLICT_H, BG_IC_HORDE_KEEP_CONTROLLED_A, BG_IC_HORDE_KEEP_CONTROLLED_H}, NODE_STATE_CONTROLLED_H, LANG_BG_IC_HORDE_KEEP}, }; enum HonorRewards @@ -869,7 +869,7 @@ class BattlegroundIC : public Battleground virtual void StartingEventCloseDoors(); virtual void StartingEventOpenDoors(); - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); void SpawnLeader(uint32 teamid); @@ -908,7 +908,7 @@ class BattlegroundIC : public Battleground Transport* gunshipAlliance; Transport* gunshipHorde; - uint32 GetNextBanner(ICNodePoint* nodePoint,uint32 team, bool returnDefinitve); + uint32 GetNextBanner(ICNodePoint* nodePoint, uint32 team, bool returnDefinitve); uint32 GetGateIDFromEntry(uint32 id) { @@ -957,7 +957,7 @@ class BattlegroundIC : public Battleground void UpdateNodeWorldState(ICNodePoint* nodePoint); void HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture); void HandleContestedNodes(ICNodePoint* nodePoint); - Transport* CreateTransport(uint32 goEntry,uint32 period); + Transport* CreateTransport(uint32 goEntry, uint32 period); void SendTransportInit(Player* player); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp index e33d9f0123a..ec784385940 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp @@ -104,7 +104,7 @@ void BattlegroundNA::HandleKillPlayer(Player *player, Player *killer) return; } - Battleground::HandleKillPlayer(player,killer); + Battleground::HandleKillPlayer(player, killer); UpdateArenaWorldState(); CheckArenaWinConditions(); @@ -112,7 +112,7 @@ void BattlegroundNA::HandleKillPlayer(Player *player, Player *killer) bool BattlegroundNA::HandlePlayerUnderMap(Player *player) { - player->TeleportTo(GetMapId(),4055.504395f,2919.660645f,13.611241f,player->GetOrientation(),false); + player->TeleportTo(GetMapId(), 4055.504395f, 2919.660645f, 13.611241f, player->GetOrientation(), false); return true; } @@ -135,7 +135,7 @@ void BattlegroundNA::HandleAreaTrigger(Player *Source, uint32 Trigger) } //if (buff_guid) - // HandleTriggerBuff(buff_guid,Source); + // HandleTriggerBuff(buff_guid, Source); } void BattlegroundNA::FillInitialWorldStates(WorldPacket &data) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp index c860d65d33c..5adc117a1be 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRB.cpp @@ -57,7 +57,7 @@ void BattlegroundRB::AddPlayer(Player *plr) m_PlayerScores[plr->GetGUID()] = sc; } -void BattlegroundRB::RemovePlayer(Player* /*plr*/,uint64 /*guid*/) +void BattlegroundRB::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } @@ -75,5 +75,5 @@ void BattlegroundRB::UpdatePlayerScore(Player* Source, uint32 type, uint32 value if (itr == m_PlayerScores.end()) // player not found... return; - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRB.h b/src/server/game/Battlegrounds/Zones/BattlegroundRB.h index eb2e5cd181f..7a521ae489f 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRB.h @@ -41,7 +41,7 @@ class BattlegroundRB : public Battleground virtual void StartingEventCloseDoors(); virtual void StartingEventOpenDoors(); - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); /* Scorekeeping */ diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp index 4581feaabca..c6f991ce184 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp @@ -104,7 +104,7 @@ void BattlegroundRL::HandleKillPlayer(Player *player, Player *killer) return; } - Battleground::HandleKillPlayer(player,killer); + Battleground::HandleKillPlayer(player, killer); UpdateArenaWorldState(); CheckArenaWinConditions(); @@ -112,7 +112,7 @@ void BattlegroundRL::HandleKillPlayer(Player *player, Player *killer) bool BattlegroundRL::HandlePlayerUnderMap(Player *player) { - player->TeleportTo(GetMapId(),1285.810547f,1667.896851f,39.957642f,player->GetOrientation(),false); + player->TeleportTo(GetMapId(), 1285.810547f, 1667.896851f, 39.957642f, player->GetOrientation(), false); return true; } @@ -136,7 +136,7 @@ void BattlegroundRL::HandleAreaTrigger(Player *Source, uint32 Trigger) } //if (buff_guid) - // HandleTriggerBuff(buff_guid,Source); + // HandleTriggerBuff(buff_guid, Source); } void BattlegroundRL::FillInitialWorldStates(WorldPacket &data) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index c1ad44f7929..9a1e4a8c0b2 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -46,7 +46,7 @@ BattlegroundSA::~BattlegroundSA() void BattlegroundSA::Reset() { TotalTime = 0; - Attackers = ((urand(0,1)) ? TEAM_ALLIANCE : TEAM_HORDE); + Attackers = ((urand(0, 1)) ? TEAM_ALLIANCE : TEAM_HORDE); for (uint8 i = 0; i <= 5; i++) GateStatus[i] = BG_SA_GATE_OK; ShipsStarted = false; @@ -83,7 +83,7 @@ bool BattlegroundSA::ResetObjs() for (uint8 i = 0; i < BG_SA_BOAT_ONE; i++) { - if (!AddObject(i,BG_SA_ObjEntries[i],BG_SA_ObjSpawnlocs[i][0],BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2],BG_SA_ObjSpawnlocs[i][3],0,0,0,0,RESPAWN_ONE_DAY)) + if (!AddObject(i, BG_SA_ObjEntries[i], BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2], BG_SA_ObjSpawnlocs[i][3], 0, 0, 0, 0, RESPAWN_ONE_DAY)) return false; } @@ -99,18 +99,18 @@ bool BattlegroundSA::ResetObjs() boatid= Attackers ? BG_SA_BOAT_TWO_H : BG_SA_BOAT_TWO_A; break; } - if (!AddObject(i,boatid,BG_SA_ObjSpawnlocs[i][0], + if (!AddObject(i, boatid, BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2]+(Attackers ? -3.750f: 0), - BG_SA_ObjSpawnlocs[i][3],0,0,0,0,RESPAWN_ONE_DAY)) + BG_SA_ObjSpawnlocs[i][3], 0, 0, 0, 0, RESPAWN_ONE_DAY)) return false; } for (uint8 i = BG_SA_SIGIL_1; i < BG_SA_CENTRAL_FLAG; i++) { - if (!AddObject(i,BG_SA_ObjEntries[i], - BG_SA_ObjSpawnlocs[i][0],BG_SA_ObjSpawnlocs[i][1], - BG_SA_ObjSpawnlocs[i][2],BG_SA_ObjSpawnlocs[i][3], - 0,0,0,0,RESPAWN_ONE_DAY)) + if (!AddObject(i, BG_SA_ObjEntries[i], + BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], + BG_SA_ObjSpawnlocs[i][2], BG_SA_ObjSpawnlocs[i][3], + 0, 0, 0, 0, RESPAWN_ONE_DAY)) return false; } @@ -125,8 +125,8 @@ bool BattlegroundSA::ResetObjs() for (uint8 i = 0; i < BG_SA_NPC_SPARKLIGHT; i++) { if (!AddCreature(BG_SA_NpcEntries[i], i, (Attackers == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE), - BG_SA_NpcSpawnlocs[i][0],BG_SA_NpcSpawnlocs[i][1], - BG_SA_NpcSpawnlocs[i][2],BG_SA_NpcSpawnlocs[i][3],600)) + BG_SA_NpcSpawnlocs[i][0], BG_SA_NpcSpawnlocs[i][1], + BG_SA_NpcSpawnlocs[i][2], BG_SA_NpcSpawnlocs[i][3], 600)) return false; } @@ -156,7 +156,7 @@ bool BattlegroundSA::ResetObjs() if (!sg) { - sLog->outError("SOTA: Can't find GY entry %u",BG_SA_GYEntries[i]); + sLog->outError("SOTA: Can't find GY entry %u", BG_SA_GYEntries[i]); return false; } @@ -169,7 +169,7 @@ bool BattlegroundSA::ResetObjs() { GraveyardStatus[i] = ((Attackers == TEAM_HORDE)? TEAM_ALLIANCE : TEAM_HORDE); if (!AddSpiritGuide(i + BG_SA_MAXNPC, sg->x, sg->y, sg->z, BG_SA_GYOrientation[i], ((Attackers == TEAM_HORDE)? ALLIANCE : HORDE))) - sLog->outError("SOTA: couldn't spawn GY: %u",i); + sLog->outError("SOTA: couldn't spawn GY: %u", i); } } @@ -179,7 +179,7 @@ bool BattlegroundSA::ResetObjs() AddObject(i, (BG_SA_ObjEntries[i] - (Attackers == TEAM_ALLIANCE ? 1:0)), BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2], BG_SA_ObjSpawnlocs[i][3], - 0,0,0,0,RESPAWN_ONE_DAY); + 0, 0, 0, 0, RESPAWN_ONE_DAY); GetBGObject(i)->SetUInt32Value(GAMEOBJECT_FACTION, atF); } @@ -188,7 +188,7 @@ bool BattlegroundSA::ResetObjs() AddObject(i, BG_SA_ObjEntries[i], BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2], BG_SA_ObjSpawnlocs[i][3], - 0,0,0,0,RESPAWN_ONE_DAY); + 0, 0, 0, 0, RESPAWN_ONE_DAY); GetBGObject(i)->SetUInt32Value(GAMEOBJECT_FACTION, defF); } @@ -197,7 +197,7 @@ bool BattlegroundSA::ResetObjs() AddObject(i, BG_SA_ObjEntries[BG_SA_BOMB], BG_SA_ObjSpawnlocs[i][0], BG_SA_ObjSpawnlocs[i][1], BG_SA_ObjSpawnlocs[i][2], BG_SA_ObjSpawnlocs[i][3], - 0,0,0,0,RESPAWN_ONE_DAY); + 0, 0, 0, 0, RESPAWN_ONE_DAY); GetBGObject(i)->SetUInt32Value(GAMEOBJECT_FACTION, atF); } @@ -220,8 +220,8 @@ bool BattlegroundSA::ResetObjs() UpdateWorldState(BG_SA_RIGHT_ATT_TOKEN_HRD, 0); UpdateWorldState(BG_SA_LEFT_ATT_TOKEN_HRD, 0); - UpdateWorldState(BG_SA_HORDE_DEFENCE_TOKEN,1); - UpdateWorldState(BG_SA_ALLIANCE_DEFENCE_TOKEN,0); + UpdateWorldState(BG_SA_HORDE_DEFENCE_TOKEN, 1); + UpdateWorldState(BG_SA_ALLIANCE_DEFENCE_TOKEN, 0); } else { @@ -233,8 +233,8 @@ bool BattlegroundSA::ResetObjs() UpdateWorldState(BG_SA_RIGHT_ATT_TOKEN_HRD, 1); UpdateWorldState(BG_SA_LEFT_ATT_TOKEN_HRD, 1); - UpdateWorldState(BG_SA_HORDE_DEFENCE_TOKEN,0); - UpdateWorldState(BG_SA_ALLIANCE_DEFENCE_TOKEN,1); + UpdateWorldState(BG_SA_HORDE_DEFENCE_TOKEN, 0); + UpdateWorldState(BG_SA_ALLIANCE_DEFENCE_TOKEN, 1); } UpdateWorldState(BG_SA_PURPLE_GATEWS, 1); @@ -443,9 +443,9 @@ void BattlegroundSA::AddPlayer(Player *plr) { if (plr->GetTeamId() == Attackers) { - plr->CastSpell(plr,12438,true);//Without this player falls before boat loads... + plr->CastSpell(plr, 12438, true);//Without this player falls before boat loads... - if (urand(0,1)) + if (urand(0, 1)) plr->TeleportTo(607, 2682.936f, -830.368f, 50.0f, 2.895f, 0); else plr->TeleportTo(607, 2577.003f, 980.261f, 50.0f, 0.807f, 0); @@ -465,7 +465,7 @@ void BattlegroundSA::AddPlayer(Player *plr) m_PlayerScores[plr->GetGUID()] = sc; } -void BattlegroundSA::RemovePlayer(Player* /*plr*/,uint64 /*guid*/) +void BattlegroundSA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/) { } @@ -487,7 +487,7 @@ void BattlegroundSA::UpdatePlayerScore(Player* Source, uint32 type, uint32 value else if (type == SCORE_DESTROYED_WALL) ((BattlegroundSAScore*)itr->second)->gates_destroyed += value; else - Battleground::UpdatePlayerScore(Source,type,value, doAddHonor); + Battleground::UpdatePlayerScore(Source, type, value, doAddHonor); } void BattlegroundSA::TeleportPlayers() @@ -511,9 +511,9 @@ void BattlegroundSA::TeleportPlayers() if (plr->GetTeamId() == Attackers) { - plr->CastSpell(plr,12438,true); //Without this player falls before boat loads... + plr->CastSpell(plr, 12438, true); //Without this player falls before boat loads... - if (urand(0,1)) + if (urand(0, 1)) plr->TeleportTo(607, 2682.936f, -830.368f, 50.0f, 2.895f, 0); else plr->TeleportTo(607, 2577.003f, 980.261f, 50.0f, 0.807f, 0); @@ -635,9 +635,9 @@ void BattlegroundSA::DestroyGate(Player* pl, GameObject* /*go*/, uint32 destroye if (i < 5) DelObject(i+9); - UpdatePlayerScore(pl,SCORE_DESTROYED_WALL, 1); + UpdatePlayerScore(pl, SCORE_DESTROYED_WALL, 1); if (rewardHonor) - UpdatePlayerScore(pl,SCORE_BONUS_HONOR,(GetBonusHonorFromKill(1))); + UpdatePlayerScore(pl, SCORE_BONUS_HONOR, (GetBonusHonorFromKill(1))); } } } @@ -648,9 +648,9 @@ WorldSafeLocsEntry const* BattlegroundSA::GetClosestGraveYard(Player* player) WorldSafeLocsEntry const* ret; WorldSafeLocsEntry const* closest; float dist, nearest; - float x,y,z; + float x, y, z; - player->GetPosition(x,y,z); + player->GetPosition(x, y, z); if (player->GetTeamId() == Attackers) safeloc = BG_SA_GYEntries[BG_SA_BEACH_GY]; @@ -727,9 +727,9 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player *Source) case BG_SA_LEFT_CAPTURABLE_GY: flag = BG_SA_LEFT_FLAG; DelObject(flag); - AddObject(flag,(BG_SA_ObjEntries[flag] - (Source->GetTeamId() == TEAM_ALLIANCE ? 0:1)), - BG_SA_ObjSpawnlocs[flag][0],BG_SA_ObjSpawnlocs[flag][1], - BG_SA_ObjSpawnlocs[flag][2],BG_SA_ObjSpawnlocs[flag][3],0,0,0,0,RESPAWN_ONE_DAY); + AddObject(flag, (BG_SA_ObjEntries[flag] - (Source->GetTeamId() == TEAM_ALLIANCE ? 0:1)), + BG_SA_ObjSpawnlocs[flag][0], BG_SA_ObjSpawnlocs[flag][1], + BG_SA_ObjSpawnlocs[flag][2], BG_SA_ObjSpawnlocs[flag][3], 0, 0, 0, 0, RESPAWN_ONE_DAY); npc = BG_SA_NPC_RIGSPARK; AddCreature(BG_SA_NpcEntries[npc], npc, Attackers, @@ -747,8 +747,8 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player *Source) flag = BG_SA_RIGHT_FLAG; DelObject(flag); AddObject(flag, (BG_SA_ObjEntries[flag] - (Source->GetTeamId() == TEAM_ALLIANCE ? 0:1)), - BG_SA_ObjSpawnlocs[flag][0],BG_SA_ObjSpawnlocs[flag][1], - BG_SA_ObjSpawnlocs[flag][2],BG_SA_ObjSpawnlocs[flag][3],0,0,0,0,RESPAWN_ONE_DAY); + BG_SA_ObjSpawnlocs[flag][0], BG_SA_ObjSpawnlocs[flag][1], + BG_SA_ObjSpawnlocs[flag][2], BG_SA_ObjSpawnlocs[flag][3], 0, 0, 0, 0, RESPAWN_ONE_DAY); npc = BG_SA_NPC_SPARKLIGHT; AddCreature(BG_SA_NpcEntries[npc], npc, Attackers, @@ -766,8 +766,8 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player *Source) flag = BG_SA_CENTRAL_FLAG; DelObject(flag); AddObject(flag, (BG_SA_ObjEntries[flag] - (Source->GetTeamId() == TEAM_ALLIANCE ? 0:1)), - BG_SA_ObjSpawnlocs[flag][0],BG_SA_ObjSpawnlocs[flag][1], - BG_SA_ObjSpawnlocs[flag][2],BG_SA_ObjSpawnlocs[flag][3],0,0,0,0,RESPAWN_ONE_DAY); + BG_SA_ObjSpawnlocs[flag][0], BG_SA_ObjSpawnlocs[flag][1], + BG_SA_ObjSpawnlocs[flag][2], BG_SA_ObjSpawnlocs[flag][3], 0, 0, 0, 0, RESPAWN_ONE_DAY); UpdateWorldState(BG_SA_CENTER_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE? 1:0)); UpdateWorldState(BG_SA_CENTER_GY_HORDE, (GraveyardStatus[i] == TEAM_ALLIANCE? 0:1)); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 5bd5216b708..a481194402a 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -170,10 +170,10 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] = { 1236.213f, 92.287f, 64.965f, 5.751f }, { 1215.11f, 57.772f, 64.739f, 5.78f } , //Demolishers - { 1611.597656f,-117.270073f,8.719355f,2.513274f}, - { 1575.562500f,-158.421875f,5.024450f,2.129302f}, - { 1618.047729f,61.424641f,7.248210f,3.979351f}, - { 1575.103149f,98.873344f,2.830360f,3.752458f}, + { 1611.597656f, -117.270073f, 8.719355f, 2.513274f}, + { 1575.562500f, -158.421875f, 5.024450f, 2.129302f}, + { 1618.047729f, 61.424641f, 7.248210f, 3.979351f}, + { 1575.103149f, 98.873344f, 2.830360f, 3.752458f}, //trigger { 1453.49f, -250.453f, 30.896f, 4.2883f}, { 1377.05f, 97.036f, 30.8605f, 2.46539f}, @@ -240,19 +240,19 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] = { 1230.75f, -210.724f, 67.611f, 0.5023f }, { 1217.8f, 79.532f, 66.58f, 5.745f }, //Flagpoles - { 1215.114258f,-65.711861f,70.084267f,-3.124123f}, - {1338.863892f,-153.336533f,30.895121f,-2.530723f}, - {1309.124268f,9.410645f,30.893402f,-1.623156f}, + { 1215.114258f, -65.711861f, 70.084267f, -3.124123f}, + {1338.863892f, -153.336533f, 30.895121f, -2.530723f}, + {1309.124268f, 9.410645f, 30.893402f, -1.623156f}, //Flags - { 1215.108032f,-65.715767f,70.084267f,-3.124123f}, - { 1338.859253f,-153.327316f,30.895077f,-2.530723f}, - { 1309.192017f,9.416233f,30.893402f,1.518436f}, + { 1215.108032f, -65.715767f, 70.084267f, -3.124123f}, + { 1338.859253f, -153.327316f, 30.895077f, -2.530723f}, + { 1309.192017f, 9.416233f, 30.893402f, 1.518436f}, //Portal {1468.380005f, -225.798996f, 30.896200f, 0.0f}, //blue - {1394.270020f, 72.551399f, 31.054300f, 0.0f},//green - {1065.260010f, -89.79501f, 81.073402f, 0.0f},//yellow - {1216.069946f, 47.904301f, 54.278198f,0.0f}, //purple - {1255.569946f, -233.548996f, 56.43699f, 0.0f},//red + {1394.270020f, 72.551399f, 31.054300f, 0.0f}, //green + {1065.260010f, -89.79501f, 81.073402f, 0.0f}, //yellow + {1216.069946f, 47.904301f, 54.278198f, 0.0f}, //purple + {1255.569946f, -233.548996f, 56.43699f, 0.0f}, //red //Bombs {1333.45f, 211.354f, 31.0538f, 5.03666f}, {1334.29f, 209.582f, 31.0532f, 1.28088f}, @@ -346,8 +346,8 @@ const uint32 BG_SA_ObjEntries[BG_SA_MAXOBJ + BG_SA_FLAG_AMOUNT] = 190723, 192549, 192834, - 0,// Boat - 0,// Boat + 0, // Boat + 0, // Boat 192687, 192685, 192689, @@ -481,7 +481,7 @@ class BattlegroundSA : public Battleground void EndBattleground(uint32 winner); /// CAlled when a player leave battleground - void RemovePlayer(Player *plr,uint64 guid); + void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); /* Scorekeeping */ @@ -566,7 +566,7 @@ class BattlegroundSA : public Battleground bool SignaledRoundTwoHalfMin; /// for know if second round has been init bool InitSecondRound; - std::map<uint32/*id*/,uint32/*timer*/> DemoliserRespawnList; + std::map<uint32/*id*/, uint32/*timer*/> DemoliserRespawnList; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index fe2791c3d14..927b8fc81ed 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -38,13 +38,13 @@ enum BG_WSG_Rewards }; uint32 BG_WSG_Honor[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = { - {20,40,40}, // normal honor - {60,40,80} // holiday + {20, 40, 40}, // normal honor + {60, 40, 80} // holiday }; uint32 BG_WSG_Reputation[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = { - {0,35,0}, // normal honor - {0,45,0} // holiday + {0, 35, 0}, // normal honor + {0, 45, 0} // holiday }; BattlegroundWS::BattlegroundWS() @@ -143,9 +143,9 @@ void BattlegroundWS::Update(uint32 diff) if (m_FlagDebuffState == 0 && m_FlagSpellForceTimer >= 600000) //10 minutes { if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) - plr->CastSpell(plr,WS_SPELL_FOCUSED_ASSAULT,true); + plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true); if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) - plr->CastSpell(plr,WS_SPELL_FOCUSED_ASSAULT,true); + plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true); m_FlagDebuffState = 1; } else if (m_FlagDebuffState == 1 && m_FlagSpellForceTimer >= 900000) //15 minutes @@ -153,12 +153,12 @@ void BattlegroundWS::Update(uint32 diff) if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0])) { plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT); - plr->CastSpell(plr,WS_SPELL_BRUTAL_ASSAULT,true); + plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true); } if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1])) { plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT); - plr->CastSpell(plr,WS_SPELL_BRUTAL_ASSAULT,true); + plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true); } m_FlagDebuffState = 2; } @@ -242,7 +242,7 @@ void BattlegroundWS::RespawnFlagAfterDrop(uint32 team) if (GetStatus() != STATUS_IN_PROGRESS) return; - RespawnFlag(team,false); + RespawnFlag(team, false); if (team == ALLIANCE) { SpawnBGObject(BG_WS_OBJECT_A_FLAG, RESPAWN_IMMEDIATELY); @@ -260,9 +260,9 @@ void BattlegroundWS::RespawnFlagAfterDrop(uint32 team) if (obj) obj->Delete(); else - sLog->outError("unknown droped flag bg, guid: %u",GUID_LOPART(GetDroppedFlagGUID(team))); + sLog->outError("unknown droped flag bg, guid: %u", GUID_LOPART(GetDroppedFlagGUID(team))); - SetDroppedFlagGUID(0,team); + SetDroppedFlagGUID(0, team); m_BothFlagsKept = false; } @@ -509,9 +509,9 @@ void BattlegroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target m_FlagState[BG_TEAM_ALLIANCE] = BG_WS_FLAG_STATE_ON_PLAYER; UpdateFlagState(HORDE, BG_WS_FLAG_STATE_ON_PLAYER); if (m_FlagDebuffState == 1) - Source->CastSpell(Source,WS_SPELL_FOCUSED_ASSAULT,true); + Source->CastSpell(Source, WS_SPELL_FOCUSED_ASSAULT, true); if (m_FlagDebuffState == 2) - Source->CastSpell(Source,WS_SPELL_BRUTAL_ASSAULT,true); + Source->CastSpell(Source, WS_SPELL_BRUTAL_ASSAULT, true); UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 1); } //called in HandleGameObjectUseOpcode: @@ -543,9 +543,9 @@ void BattlegroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_PLAYER; UpdateFlagState(ALLIANCE, BG_WS_FLAG_STATE_ON_PLAYER); if (m_FlagDebuffState == 1) - Source->CastSpell(Source,WS_SPELL_FOCUSED_ASSAULT,true); + Source->CastSpell(Source, WS_SPELL_FOCUSED_ASSAULT, true); if (m_FlagDebuffState == 2) - Source->CastSpell(Source,WS_SPELL_BRUTAL_ASSAULT,true); + Source->CastSpell(Source, WS_SPELL_BRUTAL_ASSAULT, true); UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 1); } //called in HandleGameObjectUseOpcode: @@ -652,7 +652,7 @@ void BattlegroundWS::HandleAreaTrigger(Player *Source, uint32 Trigger) } //if (buff_guid) - // HandleTriggerBuff(buff_guid,Source); + // HandleTriggerBuff(buff_guid, Source); } bool BattlegroundWS::SetupBattleground() diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 692067b3dc3..d1c5aa78cd5 100755 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -76,7 +76,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) uint64 banned_guid = atol(*iter); if (banned_guid) { - sLog->outDebug(LOG_FILTER_CHATSYS,"Channel(%s) loaded banned guid:" UI64FMTD "",name.c_str(), banned_guid); + sLog->outDebug(LOG_FILTER_CHATSYS, "Channel(%s) loaded banned guid:" UI64FMTD "", name.c_str(), banned_guid); banned.insert(banned_guid); } } @@ -88,7 +88,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team) stmt->setString(0, name); stmt->setUInt32(1, m_Team); CharacterDatabase.Execute(stmt); - sLog->outDebug(LOG_FILTER_CHATSYS,"Channel(%s) saved in database", name.c_str()); + sLog->outDebug(LOG_FILTER_CHATSYS, "Channel(%s) saved in database", name.c_str()); } m_IsSaved = true; @@ -116,7 +116,7 @@ void Channel::UpdateChannelInDB() const stmt->setUInt32(5, m_Team); CharacterDatabase.Execute(stmt); - sLog->outDebug(LOG_FILTER_CHATSYS,"Channel(%s) updated in database", m_name.c_str()); + sLog->outDebug(LOG_FILTER_CHATSYS, "Channel(%s) updated in database", m_name.c_str()); } } @@ -137,7 +137,7 @@ void Channel::CleanOldChannelsInDB() stmt->setUInt32(0, sWorld->getIntConfig(CONFIG_PRESERVE_CUSTOM_CHANNEL_DURATION) * DAY); CharacterDatabase.Execute(stmt); - sLog->outDebug(LOG_FILTER_CHATSYS,"Cleaned out unused custom chat channels."); + sLog->outDebug(LOG_FILTER_CHATSYS, "Cleaned out unused custom chat channels."); } } @@ -576,7 +576,7 @@ void Channel::List(Player* player) } } - data.put<uint32>(pos,count); + data.put<uint32>(pos, count); SendToOne(&data, p); } diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index bc5f5b34f4b..136cc89aaf3 100755 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -44,12 +44,12 @@ ChannelMgr::~ChannelMgr() Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id) { std::wstring wname; - Utf8toWStr(name,wname); + Utf8toWStr(name, wname); wstrToLower(wname); if (channels.find(wname) == channels.end()) { - Channel *nchan = new Channel(name,channel_id, team); + Channel *nchan = new Channel(name, channel_id, team); channels[wname] = nchan; return nchan; } @@ -60,7 +60,7 @@ Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id) Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt) { std::wstring wname; - Utf8toWStr(name,wname); + Utf8toWStr(name, wname); wstrToLower(wname); ChannelMap::const_iterator i = channels.find(wname); @@ -70,7 +70,7 @@ Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt) if (pkt) { WorldPacket data; - MakeNotOnPacket(&data,name); + MakeNotOnPacket(&data, name); p->GetSession()->SendPacket(&data); } @@ -83,7 +83,7 @@ Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt) void ChannelMgr::LeftChannel(std::string name) { std::wstring wname; - Utf8toWStr(name,wname); + Utf8toWStr(name, wname); wstrToLower(wname); ChannelMap::const_iterator i = channels.find(wname); diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index 2e99830f579..971bcaa196b 100755 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -31,7 +31,7 @@ class ChannelMgr { public: uint32 team; - typedef std::map<std::wstring,Channel*> ChannelMap; + typedef std::map<std::wstring, Channel*> ChannelMap; ChannelMgr() {team = 0;} ~ChannelMgr(); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index b394ba94211..32da0947aff 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -240,28 +240,28 @@ ChatCommand * ChatHandler::getCommandTable() static ChatCommand serverIdleRestartCommandTable[] = { - { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>,"", NULL }, + { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>, "", NULL }, { "" , SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerIdleRestartCommand>, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand serverIdleShutdownCommandTable[] = { - { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>,"", NULL }, + { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>, "", NULL }, { "" , SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerIdleShutDownCommand>, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand serverRestartCommandTable[] = { - { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>,"", NULL }, + { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>, "", NULL }, { "" , SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerRestartCommand>, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; static ChatCommand serverShutdownCommandTable[] = { - { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>,"", NULL }, + { "cancel", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCancelCommand>, "", NULL }, { "" , SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleServerShutDownCommand>, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; @@ -401,7 +401,7 @@ ChatCommand * ChatHandler::getCommandTable() { "cometome", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleComeToMeCommand>, "", NULL }, { "damage", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleDamageCommand>, "", NULL }, { "combatstop", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleCombatStopCommand>, "", NULL }, - { "flusharenapoints",SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleFlushArenaPointsCommand>, "", NULL }, + { "flusharenapoints", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleFlushArenaPointsCommand>, "", NULL }, { "repairitems", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleRepairitemsCommand>, "", NULL }, { "waterwalk", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleWaterwalkCommand>, "", NULL }, @@ -443,7 +443,7 @@ ChatCommand * ChatHandler::getCommandTable() added += appendCommandTable(commandTableCache + added, *it); } - QueryResult result = WorldDatabase.Query("SELECT name,security,help FROM command"); + QueryResult result = WorldDatabase.Query("SELECT name, security, help FROM command"); if (result) { do @@ -499,7 +499,7 @@ bool ChatHandler::HasLowerSecurity(Player* target, uint64 guid, bool strong) return true; } - return HasLowerSecurityAccount(target_session,target_account,strong); + return HasLowerSecurityAccount(target_session, target_account, strong); } bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_account, bool strong) @@ -620,7 +620,7 @@ void ChatHandler::PSendSysMessage(int32 entry, ...) va_list ap; char str [2048]; va_start(ap, entry); - vsnprintf(str,2048,format, ap); + vsnprintf(str, 2048, format, ap); va_end(ap); SendSysMessage(str); } @@ -630,7 +630,7 @@ void ChatHandler::PSendSysMessage(const char *format, ...) va_list ap; char str [2048]; va_start(ap, format); - vsnprintf(str,2048,format, ap); + vsnprintf(str, 2048, format, ap); va_end(ap); SendSysMessage(str); } @@ -661,7 +661,7 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co if (!hasStringAbbr(table[j].Name, cmd.c_str())) continue; - if (strcmp(table[j].Name,cmd.c_str()) != 0) + if (strcmp(table[j].Name, cmd.c_str()) != 0) continue; else { @@ -683,7 +683,7 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co else SendSysMessage(LANG_CMD_SYNTAX); - ShowHelpForCommand(table[i].ChildCommands,text); + ShowHelpForCommand(table[i].ChildCommands, text); } return true; @@ -704,8 +704,8 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co { Player* p = m_session->GetPlayer(); uint64 sel_guid = p->GetSelection(); - sLog->outCommand(m_session->GetAccountId(),"Command: %s [Player: %s (Account: %u) X: %f Y: %f Z: %f Map: %u Selected %s: %s (GUID: %u)]", - fullcmd.c_str(),p->GetName(),m_session->GetAccountId(),p->GetPositionX(),p->GetPositionY(),p->GetPositionZ(),p->GetMapId(), + sLog->outCommand(m_session->GetAccountId(), "Command: %s [Player: %s (Account: %u) X: %f Y: %f Z: %f Map: %u Selected %s: %s (GUID: %u)]", + fullcmd.c_str(), p->GetName(), m_session->GetAccountId(), p->GetPositionX(), p->GetPositionY(), p->GetPositionZ(), p->GetMapId(), GetLogNameForGuid(sel_guid), (p->GetSelectedUnit()) ? p->GetSelectedUnit()->GetName() : "", GUID_LOPART(sel_guid)); } } @@ -756,12 +756,12 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text, // expected subcommand by full name DB content else if (*text) { - sLog->outErrorDb("Table `command` have unexpected subcommand '%s' in command '%s', skip.",text,fullcommand.c_str()); + sLog->outErrorDb("Table `command` have unexpected subcommand '%s' in command '%s', skip.", text, fullcommand.c_str()); return false; } if (table[i].SecurityLevel != security) - sLog->outDetail("Table `command` overwrite for command '%s' default security (%u) by %u",fullcommand.c_str(),table[i].SecurityLevel,security); + sLog->outDetail("Table `command` overwrite for command '%s' default security (%u) by %u", fullcommand.c_str(), table[i].SecurityLevel, security); table[i].SecurityLevel = security; table[i].Help = help; @@ -772,9 +772,9 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text, if (!cmd.empty()) { if (table == getCommandTable()) - sLog->outErrorDb("Table `command` have not existed command '%s', skip.",cmd.c_str()); + sLog->outErrorDb("Table `command` have not existed command '%s', skip.", cmd.c_str()); else - sLog->outErrorDb("Table `command` have not existed subcommand '%s' in command '%s', skip.",cmd.c_str(),fullcommand.c_str()); + sLog->outErrorDb("Table `command` have not existed subcommand '%s' in command '%s', skip.", cmd.c_str(), fullcommand.c_str()); } return false; @@ -910,10 +910,10 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd, ch if (table == getCommandTable()) { SendSysMessage(LANG_AVIABLE_CMD); - PSendSysMessage("%s",list.c_str()); + PSendSysMessage("%s", list.c_str()); } else - PSendSysMessage(LANG_SUBCMDS_LIST,cmd,list.c_str()); + PSendSysMessage(LANG_SUBCMDS_LIST, cmd, list.c_str()); return true; } @@ -944,7 +944,7 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd) SendSysMessage(table[i].Help.c_str()); if (table[i].ChildCommands) - if (ShowHelpForSubCommands(table[i].ChildCommands,table[i].Name,subcmd ? subcmd : "")) + if (ShowHelpForSubCommands(table[i].ChildCommands, table[i].Name, subcmd ? subcmd : "")) return true; return !table[i].Help.empty(); @@ -965,14 +965,14 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd) SendSysMessage(table[i].Help.c_str()); if (table[i].ChildCommands) - if (ShowHelpForSubCommands(table[i].ChildCommands,"","")) + if (ShowHelpForSubCommands(table[i].ChildCommands, "", "")) return true; return !table[i].Help.empty(); } } - return ShowHelpForSubCommands(table,"",cmd); + return ShowHelpForSubCommands(table, "", cmd); } //Note: target_guid used only in CHAT_MSG_WHISPER_INFORM mode (in this case channelName ignored) @@ -1079,7 +1079,7 @@ Unit* ChatHandler::getSelectedUnit() if (guid == 0) return m_session->GetPlayer(); - return ObjectAccessor::GetUnit(*m_session->GetPlayer(),guid); + return ObjectAccessor::GetUnit(*m_session->GetPlayer(), guid); } WorldObject *ChatHandler::getSelectedObject() @@ -1092,7 +1092,7 @@ WorldObject *ChatHandler::getSelectedObject() if (guid == 0) return GetNearbyGameObject(); - return ObjectAccessor::GetUnit(*m_session->GetPlayer(),guid); + return ObjectAccessor::GetUnit(*m_session->GetPlayer(), guid); } Creature* ChatHandler::getSelectedCreature() @@ -1100,7 +1100,7 @@ Creature* ChatHandler::getSelectedCreature() if (!m_session) return NULL; - return ObjectAccessor::GetCreatureOrPetOrVehicle(*m_session->GetPlayer(),m_session->GetPlayer()->GetSelection()); + return ObjectAccessor::GetCreatureOrPetOrVehicle(*m_session->GetPlayer(), m_session->GetPlayer()->GetSelection()); } char* ChatHandler::extractKeyFromLink(char* text, char const* linkType, char** something1) @@ -1132,9 +1132,9 @@ char* ChatHandler::extractKeyFromLink(char* text, char const* linkType, char** s if (!cLinkType) return NULL; // end of data - if (strcmp(cLinkType,linkType) != 0) + if (strcmp(cLinkType, linkType) != 0) { - strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL,s) use after retturn from function + strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL, s) use after retturn from function SendSysMessage(LANG_WRONG_LINK_TYPE); return NULL; } @@ -1147,7 +1147,7 @@ char* ChatHandler::extractKeyFromLink(char* text, char const* linkType, char** s *something1 = strtok(NULL, ":|"); // extract something strtok(cKeysTail, "]"); // restart scan tail and skip name with possible spaces - strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL,s) use after return from function + strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL, s) use after return from function return cKey; } @@ -1193,7 +1193,7 @@ char* ChatHandler::extractKeyFromLink(char* text, char const* const* linkTypes, for (int i = 0; linkTypes[i]; ++i) { - if (strcmp(cLinkType,linkTypes[i]) == 0) + if (strcmp(cLinkType, linkTypes[i]) == 0) { char* cKeys = strtok(NULL, "|"); // extract keys and values char* cKeysTail = strtok(NULL, ""); @@ -1203,14 +1203,14 @@ char* ChatHandler::extractKeyFromLink(char* text, char const* const* linkTypes, *something1 = strtok(NULL, ":|"); // extract something strtok(cKeysTail, "]"); // restart scan tail and skip name with possible spaces - strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL,s) use after return from function + strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL, s) use after return from function if (found_idx) *found_idx = i; return cKey; } } - strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL,s) use after return from function + strtok(NULL, " "); // skip link tail (to allow continue strtok(NULL, s) use after return from function SendSysMessage(LANG_WRONG_LINK_TYPE); return NULL; } @@ -1228,7 +1228,7 @@ GameObject* ChatHandler::GetNearbyGameObject() return obj; } -GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry) +GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid, uint32 entry) { if (!m_session) return NULL; @@ -1244,8 +1244,8 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - Trinity::GameObjectWithDbGUIDCheck go_check(*pl,lowguid); - Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(pl,obj,go_check); + Trinity::GameObjectWithDbGUIDCheck go_check(*pl, lowguid); + Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(pl, obj, go_check); TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker); cell.Visit(p, object_checker, *pl->GetMap()); @@ -1278,11 +1278,11 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text) // number or [name] Shift-click form |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r // number or [name] Shift-click form |color|Hglyph:glyph_slot_id:glyph_prop_id|h[%s]|h|r // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r - // number or [name] Shift-click form |color|Htalent:talent_id,rank|h[name]|h|r - // number or [name] Shift-click form |color|Htrade:spell_id,skill_id,max_value,cur_value|h[name]|h|r + // number or [name] Shift-click form |color|Htalent:talent_id, rank|h[name]|h|r + // number or [name] Shift-click form |color|Htrade:spell_id, skill_id, max_value, cur_value|h[name]|h|r int type = 0; char* param1_str = NULL; - char* idS = extractKeyFromLink(text,spellKeys,&type,¶m1_str); + char* idS = extractKeyFromLink(text, spellKeys, &type, ¶m1_str); if (!idS) return 0; @@ -1330,7 +1330,7 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text) GameTele const* ChatHandler::extractGameTeleFromLink(char* text) { // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r - char* cId = extractKeyFromLink(text,"Htele"); + char* cId = extractKeyFromLink(text, "Htele"); if (!cId) return false; @@ -1364,7 +1364,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) // |color|Hcreature:creature_guid|h[name]|h|r // |color|Hgameobject:go_guid|h[name]|h|r // |color|Hplayer:name|h[name]|h|r - char* idS = extractKeyFromLink(text,guidKeys,&type); + char* idS = extractKeyFromLink(text, guidKeys, &type); if (!idS) return 0; @@ -1389,7 +1389,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) uint32 lowguid = (uint32)atol(idS); if (CreatureData const* data = sObjectMgr->GetCreatureData(lowguid)) - return MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT); + return MAKE_NEW_GUID(lowguid, data->id, HIGHGUID_UNIT); else return 0; } @@ -1398,7 +1398,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) uint32 lowguid = (uint32)atol(idS); if (GameObjectData const* data = sObjectMgr->GetGOData(lowguid)) - return MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_GAMEOBJECT); + return MAKE_NEW_GUID(lowguid, data->id, HIGHGUID_GAMEOBJECT); else return 0; } @@ -1411,7 +1411,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text) std::string ChatHandler::extractPlayerNameFromLink(char* text) { // |color|Hplayer:name|h[name]|h|r - char* name_str = extractKeyFromLink(text,"Hplayer"); + char* name_str = extractKeyFromLink(text, "Hplayer"); if (!name_str) return ""; @@ -1422,7 +1422,7 @@ std::string ChatHandler::extractPlayerNameFromLink(char* text) return name; } -bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* player_guid /*=NULL*/,std::string* player_name /*= NULL*/) +bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* player_guid /*=NULL*/, std::string* player_name /*= NULL*/) { if (args && *args) { diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index bef14f17c8e..216ce95ad9c 100755 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -63,14 +63,14 @@ class ChatHandler FillMessageData(data, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, 0, message); } - static char* LineFromMessage(char*& pos) { char* start = strtok(pos,"\n"); pos = NULL; return start; } + static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = NULL; return start; } // function with different implementation for chat/console virtual const char *GetTrinityString(int32 entry) const; virtual void SendSysMessage(const char *str); void SendSysMessage(int32 entry); - void PSendSysMessage(const char *format, ...) ATTR_PRINTF(2,3); + void PSendSysMessage(const char *format, ...) ATTR_PRINTF(2, 3); void PSendSysMessage(int32 entry, ...); std::string PGetParseString(int32 entry, ...) const; @@ -118,7 +118,7 @@ class ChatHandler std::string GetNameLink(Player* chr) const { return playerLink(chr->GetName()); } GameObject* GetNearbyGameObject(); - GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry); + GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid, uint32 entry); bool HasSentErrorMessage() { return sentErrorMessage;} void SetSentErrorMessage(bool val){ sentErrorMessage = val;}; static bool LoadCommandTable() { return load_command_table;} @@ -352,11 +352,11 @@ class ChatHandler // Utility methods for commands bool LookupPlayerSearchCommand(QueryResult result, int32 limit); bool HandleBanListHelper(QueryResult result); - bool HandleBanHelper(BanMode mode,char const* args); + bool HandleBanHelper(BanMode mode, char const* args); bool HandleBanInfoHelper(uint32 accountid, char const* accountname); - bool HandleUnBanHelper(BanMode mode,char const* args); + bool HandleUnBanHelper(BanMode mode, char const* args); void HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel); - void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id); + void HandleLearnSkillRecipesHelper(Player* player, uint32 skill_id); // Stores informations about a deleted character struct DeletedInfo diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index bb0c0889a44..7bf56ee85bc 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -37,7 +37,7 @@ // |color|Hquest:quest_id:quest_level|h[name]|h|r - client, quest list name shift-click // |color|Hskill:skill_id|h[name]|h|r // |color|Hspell:spell_id|h[name]|h|r - client, spellbook spell icon shift-click -// |color|Htalent:talent_id,rank|h[name]|h|r - client, talent icon shift-click +// |color|Htalent:talent_id, rank|h[name]|h|r - client, talent icon shift-click // |color|Htaxinode:id|h[name]|h|r // |color|Htele:id|h[name]|h|r // |color|Htitle:id|h[name]|h|r diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 1fa6ba0e0eb..671aae504db 100755 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -78,7 +78,7 @@ bool ChatHandler::HandleGMAnnounceCommand(const char* args) if (!*args) return false; - sWorld->SendGMText(LANG_GM_BROADCAST,args); + sWorld->SendGMText(LANG_GM_BROADCAST, args); return true; } @@ -121,7 +121,7 @@ bool ChatHandler::HandleGPSCommand(const char* args) { uint64 guid = extractGuidFromLink((char*)args); if (guid) - obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(), guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!obj) { @@ -145,7 +145,7 @@ bool ChatHandler::HandleGPSCommand(const char* args) Cell cell(cell_val); uint32 zone_id, area_id; - obj->GetZoneAndAreaId(zone_id,area_id); + obj->GetZoneAndAreaId(zone_id, area_id); MapEntry const* mapEntry = sMapStore.LookupEntry(obj->GetMapId()); AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zone_id); @@ -154,7 +154,7 @@ bool ChatHandler::HandleGPSCommand(const char* args) float zone_x = obj->GetPositionX(); float zone_y = obj->GetPositionY(); - Map2ZoneCoordinates(zone_x,zone_y,zone_id); + Map2ZoneCoordinates(zone_x, zone_y, zone_id); Map const *map = obj->GetMap(); float ground_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), MAX_HEIGHT); @@ -166,8 +166,8 @@ bool ChatHandler::HandleGPSCommand(const char* args) int gx = 63 - p.x_coord; int gy = 63 - p.y_coord; - uint32 have_map = Map::ExistMap(obj->GetMapId(),gx,gy) ? 1 : 0; - uint32 have_vmap = Map::ExistVMap(obj->GetMapId(),gx,gy) ? 1 : 0; + uint32 have_map = Map::ExistMap(obj->GetMapId(), gx, gy) ? 1 : 0; + uint32 have_vmap = Map::ExistVMap(obj->GetMapId(), gx, gy) ? 1 : 0; if(have_vmap) { @@ -202,7 +202,7 @@ bool ChatHandler::HandleSummonCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; Player* _player = m_session->GetPlayer(); @@ -234,7 +234,7 @@ bool ChatHandler::HandleSummonCommand(const char* args) // only allow if gm mode is on if (!_player->isGameMaster()) { - PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,nameLink.c_str()); + PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str()); SetSentErrorMessage(true); return false; } @@ -262,13 +262,13 @@ bool ChatHandler::HandleSummonCommand(const char* args) (m_session->GetPlayer()->GetGroup()->GetLeaderGUID() != m_session->GetPlayer()->GetGUID())) // the last check is a bit excessive, but let it be, just in case { - PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,nameLink.c_str()); + PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str()); SetSentErrorMessage(true); return false; } } - PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),""); + PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), ""); if (needReportToTarget(target)) ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, playerLink(_player->GetName()).c_str()); @@ -283,9 +283,9 @@ bool ChatHandler::HandleSummonCommand(const char* args) target->SaveRecallPosition(); // before GM - float x,y,z; - m_session->GetPlayer()->GetClosePoint(x,y,z,target->GetObjectSize()); - target->TeleportTo(m_session->GetPlayer()->GetMapId(),x,y,z,target->GetOrientation()); + float x, y, z; + m_session->GetPlayer()->GetClosePoint(x, y, z, target->GetObjectSize()); + target->TeleportTo(m_session->GetPlayer()->GetMapId(), x, y, z, target->GetOrientation()); target->SetPhaseMask(m_session->GetPlayer()->GetPhaseMask(), true); } else @@ -296,7 +296,7 @@ bool ChatHandler::HandleSummonCommand(const char* args) std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),GetTrinityString(LANG_OFFLINE)); + PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), GetTrinityString(LANG_OFFLINE)); // in point where GM stay Player::SavePositionInDB(m_session->GetPlayer()->GetMapId(), @@ -317,7 +317,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; Player* _player = m_session->GetPlayer(); @@ -342,7 +342,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) // only allow if gm mode is on if (!_player->isGameMaster()) { - PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,chrNameLink.c_str()); + PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM, chrNameLink.c_str()); SetSentErrorMessage(true); return false; } @@ -367,7 +367,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) // we are in group, we can go only if we are in the player group if (_player->GetGroup() != target->GetGroup()) { - PSendSysMessage(LANG_CANNOT_GO_TO_INST_PARTY,chrNameLink.c_str()); + PSendSysMessage(LANG_CANNOT_GO_TO_INST_PARTY, chrNameLink.c_str()); SetSentErrorMessage(true); return false; } @@ -377,7 +377,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) // we are not in group, let's verify our GM mode if (!_player->isGameMaster()) { - PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM,chrNameLink.c_str()); + PSendSysMessage(LANG_CANNOT_GO_TO_INST_GM, chrNameLink.c_str()); SetSentErrorMessage(true); return false; } @@ -415,8 +415,8 @@ bool ChatHandler::HandleAppearCommand(const char* args) _player->SaveRecallPosition(); // to point to see at target with same orientation - float x,y,z; - target->GetContactPoint(_player,x,y,z); + float x, y, z; + target->GetContactPoint(_player, x, y, z); _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE); _player->SetPhaseMask(target->GetPhaseMask(), true); @@ -432,10 +432,10 @@ bool ChatHandler::HandleAppearCommand(const char* args) PSendSysMessage(LANG_APPEARING_AT, nameLink.c_str()); // to point where player stay (if loaded) - float x,y,z,o; + float x, y, z, o; uint32 map; bool in_flight; - if (!Player::LoadPositionFromDB(map,x,y,z,o,in_flight,target_guid)) + if (!Player::LoadPositionFromDB(map, x, y, z, o, in_flight, target_guid)) return false; // stop flight if need @@ -448,7 +448,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) else _player->SaveRecallPosition(); - _player->TeleportTo(map, x, y, z,_player->GetOrientation()); + _player->TeleportTo(map, x, y, z, _player->GetOrientation()); } return true; @@ -458,7 +458,7 @@ bool ChatHandler::HandleAppearCommand(const char* args) bool ChatHandler::HandleRecallCommand(const char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; // check online security @@ -537,7 +537,7 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr (namepart,wnamepart)) + if (!Utf8toWStr (namepart, wnamepart)) return false; bool found = false; @@ -621,7 +621,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args) std::string namepart = str; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -655,7 +655,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args) if (reply.str().empty()) SendSysMessage(LANG_COMMAND_TELE_NOLOCATION); else - PSendSysMessage(LANG_COMMAND_TELE_LOCATION,reply.str().c_str()); + PSendSysMessage(LANG_COMMAND_TELE_LOCATION, reply.str().c_str()); if (limitReached) PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults); @@ -709,7 +709,7 @@ bool ChatHandler::HandleSendMailCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; char* tail1 = strtok(NULL, ""); @@ -733,12 +733,12 @@ bool ChatHandler::HandleSendMailCommand(const char* args) std::string text = msgText; // from console show not existed sender - MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); + MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); //- TODO: Fix poor design SQLTransaction trans = CharacterDatabase.BeginTransaction(); MailDraft(subject, text) - .SendMailTo(trans, MailReceiver(target,GUID_LOPART(target_guid)),sender); + .SendMailTo(trans, MailReceiver(target, GUID_LOPART(target_guid)), sender); CharacterDatabase.CommitTransaction(trans); @@ -751,7 +751,7 @@ bool ChatHandler::HandleSendMailCommand(const char* args) bool ChatHandler::HandleGroupSummonCommand(const char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; // check online security @@ -764,7 +764,7 @@ bool ChatHandler::HandleGroupSummonCommand(const char* args) if (!grp) { - PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str()); + PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str()); SetSentErrorMessage(true); return false; } @@ -810,13 +810,13 @@ bool ChatHandler::HandleGroupSummonCommand(const char* args) if (plMap->Instanceable() && plMap->GetInstanceId() != gmMap->GetInstanceId()) { // cannot summon from instance to instance - PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,plNameLink.c_str()); + PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink.c_str()); SetSentErrorMessage(true); return false; } } - PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(),""); + PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(), ""); if (needReportToTarget(pl)) ChatHandler(pl).PSendSysMessage(LANG_SUMMONED_BY, GetNameLink().c_str()); @@ -831,9 +831,9 @@ bool ChatHandler::HandleGroupSummonCommand(const char* args) pl->SaveRecallPosition(); // before GM - float x,y,z; - m_session->GetPlayer()->GetClosePoint(x,y,z,pl->GetObjectSize()); - pl->TeleportTo(m_session->GetPlayer()->GetMapId(),x,y,z,pl->GetOrientation()); + float x, y, z; + m_session->GetPlayer()->GetClosePoint(x, y, z, pl->GetObjectSize()); + pl->TeleportTo(m_session->GetPlayer()->GetMapId(), x, y, z, pl->GetOrientation()); } return true; diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 2f85c764270..2aa29687a39 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -48,7 +48,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) { char* nameStr; char* delayStr; - extractOptFirstArg((char*)args,&nameStr,&delayStr); + extractOptFirstArg((char*)args, &nameStr, &delayStr); if (!delayStr) return false; @@ -60,7 +60,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr->GetPlayerAccountIdByGUID(target_guid); @@ -73,7 +73,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) uint32 notspeaktime = (uint32) atoi(delayStr); // must have strong lesser security level - if (HasLowerSecurity (target,target_guid,true)) + if (HasLowerSecurity (target, target_guid, true)) return false; time_t mutetime = time(NULL) + notspeaktime*60; @@ -81,7 +81,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) if (target) target->GetSession()->m_muteTime = mutetime; - LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id); + LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'", uint64(mutetime), account_id); if (target) ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str()); @@ -99,7 +99,7 @@ bool ChatHandler::HandleUnmuteCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr->GetPlayerAccountIdByGUID(target_guid); @@ -110,7 +110,7 @@ bool ChatHandler::HandleUnmuteCommand(const char* args) target = session->GetPlayer(); // must have strong lesser security level - if (HasLowerSecurity (target,target_guid,true)) + if (HasLowerSecurity (target, target_guid, true)) return false; if (target) @@ -236,7 +236,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; uint32 accId = 0; @@ -289,11 +289,11 @@ bool ChatHandler::HandlePInfoCommand(const char* args) uint32 security = 0; std::string last_login = GetTrinityString(LANG_ERROR); - QueryResult result = LoginDatabase.PQuery("SELECT a.username,aa.gmlevel,a.email,a.last_ip,a.last_login " + QueryResult result = LoginDatabase.PQuery("SELECT a.username, aa.gmlevel, a.email, a.last_ip, a.last_login " "FROM account a " "LEFT JOIN account_access aa " "ON (a.id = aa.id) " - "WHERE a.id = '%u'",accId); + "WHERE a.id = '%u'", accId); if (result) { Field* fields = result->Fetch(); @@ -348,7 +348,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) case CLASS_DRUID: Class_s = "Druid"; break; } - std::string timeStr = secsToTimeString(total_player_time,true,true); + std::string timeStr = secsToTimeString(total_player_time, true, true); uint32 gold = money /GOLD; uint32 silv = (money % GOLD) / SILVER; uint32 copp = (money % GOLD) % SILVER; @@ -363,7 +363,7 @@ bool ChatHandler::HandleCharacterRenameCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; if (target) @@ -396,7 +396,7 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; if (target) @@ -422,7 +422,7 @@ bool ChatHandler::HandleCharacterChangeFactionCommand(const char * args) uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if(!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; if(target) @@ -449,7 +449,7 @@ bool ChatHandler::HandleCharacterChangeRaceCommand(const char * args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if(!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; if(target) @@ -474,7 +474,7 @@ bool ChatHandler::HandleCharacterChangeRaceCommand(const char * args) bool ChatHandler::HandleCharacterReputationCommand(const char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -521,7 +521,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) std::wstring wnamepart; // converting string that we try to find to lower case - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; wstrToLower(wnamepart); @@ -552,9 +552,9 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) char const* active = activeEvents.find(id) != activeEvents.end() ? GetTrinityString(LANG_ACTIVE) : ""; if (m_session) - PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,id,id,eventData.description.c_str(),active); + PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, id, id, eventData.description.c_str(), active); else - PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,id,eventData.description.c_str(),active); + PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, id, eventData.description.c_str(), active); if (!found) found = true; @@ -570,7 +570,7 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) bool ChatHandler::HandleCombatStopCommand(const char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; // check online security @@ -594,9 +594,9 @@ bool ChatHandler::HandleLookupPlayerIpCommand(const char* args) LoginDatabase.escape_string (ip); - QueryResult result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE last_ip = '%s'", ip.c_str ()); + QueryResult result = LoginDatabase.PQuery ("SELECT id, username FROM account WHERE last_ip = '%s'", ip.c_str ()); - return LookupPlayerSearchCommand (result,limit); + return LookupPlayerSearchCommand (result, limit); } bool ChatHandler::HandleLookupPlayerAccountCommand(const char* args) @@ -613,9 +613,9 @@ bool ChatHandler::HandleLookupPlayerAccountCommand(const char* args) LoginDatabase.escape_string (account); - QueryResult result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE username = '%s'", account.c_str ()); + QueryResult result = LoginDatabase.PQuery ("SELECT id, username FROM account WHERE username = '%s'", account.c_str ()); - return LookupPlayerSearchCommand (result,limit); + return LookupPlayerSearchCommand (result, limit); } bool ChatHandler::HandleLookupPlayerEmailCommand(const char* args) @@ -630,9 +630,9 @@ bool ChatHandler::HandleLookupPlayerEmailCommand(const char* args) LoginDatabase.escape_string (email); - QueryResult result = LoginDatabase.PQuery ("SELECT id,username FROM account WHERE email = '%s'", email.c_str ()); + QueryResult result = LoginDatabase.PQuery ("SELECT id, username FROM account WHERE email = '%s'", email.c_str ()); - return LookupPlayerSearchCommand (result,limit); + return LookupPlayerSearchCommand (result, limit); } bool ChatHandler::LookupPlayerSearchCommand(QueryResult result, int32 limit) @@ -659,10 +659,10 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult result, int32 limit) uint32 acc_id = fields[0].GetUInt32(); std::string acc_name = fields[1].GetString(); - QueryResult chars = CharacterDatabase.PQuery("SELECT guid,name FROM characters WHERE account = '%u'", acc_id); + QueryResult chars = CharacterDatabase.PQuery("SELECT guid, name FROM characters WHERE account = '%u'", acc_id); if (chars) { - PSendSysMessage(LANG_LOOKUP_PLAYER_ACCOUNT,acc_name.c_str(),acc_id); + PSendSysMessage(LANG_LOOKUP_PLAYER_ACCOUNT, acc_name.c_str(), acc_id); uint64 guid = 0; std::string name; @@ -673,7 +673,7 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult result, int32 limit) guid = charfields[0].GetUInt64(); name = charfields[1].GetString(); - PSendSysMessage(LANG_LOOKUP_PLAYER_CHARACTER,name.c_str(),guid); + PSendSysMessage(LANG_LOOKUP_PLAYER_CHARACTER, name.c_str(), guid); ++i; } while (chars->NextRow() && (limit == -1 || i < limit)); @@ -700,7 +700,7 @@ bool ChatHandler::HandleServerCorpsesCommand(const char* /*args*/) bool ChatHandler::HandleRepairitemsCommand(const char* args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; // check online security @@ -807,7 +807,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* /*args*/) } // prepare visual effect for levelup - pet->SetUInt32Value(UNIT_FIELD_LEVEL,creatureTarget->getLevel()-1); + pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->getLevel()-1); pet->GetCharmInfo()->SetPetNumber(sObjectMgr->GeneratePetNumber(), true); // this enables pet details window (Shift+P) @@ -817,7 +817,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* /*args*/) pet->GetMap()->Add(pet->ToCreature()); // visual effect for levelup - pet->SetUInt32Value(UNIT_FIELD_LEVEL,creatureTarget->getLevel()); + pet->SetUInt32Value(UNIT_FIELD_LEVEL, creatureTarget->getLevel()); player->SetMinion(pet, true); pet->SavePetToDB(PET_SAVE_AS_CURRENT); @@ -858,7 +858,7 @@ bool ChatHandler::HandlePetLearnCommand(const char* args) SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo)) { - PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spellId); + PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spellId); SetSentErrorMessage(true); return false; } @@ -931,7 +931,7 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -983,13 +983,13 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) : ""; char titleNameStr[80]; - snprintf(titleNameStr,80,name.c_str(),targetName); + snprintf(titleNameStr, 80, name.c_str(), targetName); // send title in "id (idx:idx) - [namedlink locale]" format if (m_session) - PSendSysMessage(LANG_TITLE_LIST_CHAT,id,titleInfo->bit_index,id,titleNameStr,localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, localeNames[loc], knownStr, activeStr); else - PSendSysMessage(LANG_TITLE_LIST_CONSOLE,id,titleInfo->bit_index,titleNameStr,localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, titleNameStr, localeNames[loc], knownStr, activeStr); ++counter; } @@ -1006,7 +1006,7 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) return false; Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -1028,13 +1028,13 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) : ""; char titleNameStr[80]; - snprintf(titleNameStr,80,name.c_str(),targetName); + snprintf(titleNameStr, 80, name.c_str(), targetName); // send title in "id (idx:idx) - [namedlink locale]" format if (m_session) - PSendSysMessage(LANG_TITLE_LIST_CHAT,id,titleInfo->bit_index,id,titleNameStr,localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, localeNames[loc], knownStr, activeStr); else - PSendSysMessage(LANG_TITLE_LIST_CONSOLE,id,titleInfo->bit_index,name.c_str(),localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, name.c_str(), localeNames[loc], knownStr, activeStr); } } return true; diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 778a7007cce..9d5f1b91ca4 100755 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -80,7 +80,7 @@ bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/) bool ChatHandler::HandleSetSkillCommand(const char *args) { // number or [name] Shift-click form |color|Hskill:skill_id|h[name]|h|r - char* skill_p = extractKeyFromLink((char*)args,"Hskill"); + char* skill_p = extractKeyFromLink((char*)args, "Hskill"); if (!skill_p) return false; @@ -147,7 +147,7 @@ bool ChatHandler::HandleUnLearnCommand(const char *args) if (!spell_id) return false; - char const* allStr = strtok(NULL," "); + char const* allStr = strtok(NULL, " "); bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false; Player* target = getSelectedPlayer(); @@ -162,7 +162,7 @@ bool ChatHandler::HandleUnLearnCommand(const char *args) spell_id = sSpellMgr->GetFirstSpellInChain (spell_id); if (target->HasSpell(spell_id)) - target->removeSpell(spell_id,false,!allRanks); + target->removeSpell(spell_id, false, !allRanks); else SendSysMessage(LANG_FORGET_SPELL); @@ -203,7 +203,7 @@ bool ChatHandler::HandleCooldownCommand(const char *args) return false; } - target->RemoveSpellCooldown(spell_id,true); + target->RemoveSpellCooldown(spell_id, true); PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target == m_session->GetPlayer() ? GetTrinityString(LANG_YOU) : tNameLink.c_str()); } return true; @@ -238,7 +238,7 @@ bool ChatHandler::HandleAddItemCommand(const char *args) } else // item_id or [name] Shift-click form |color|Hitem:item_id:0:0:0|h[name]|h|r { - char* cId = extractKeyFromLink((char*)args,"Hitem"); + char* cId = extractKeyFromLink((char*)args, "Hitem"); if (!cId) return false; itemId = atol(cId); @@ -303,9 +303,9 @@ bool ChatHandler::HandleAddItemCommand(const char *args) if (count > 0 && item) { - pl->SendNewItem(item,count,false,true); + pl->SendNewItem(item, count, false, true); if (pl != plTarget) - plTarget->SendNewItem(item,count,true,false); + plTarget->SendNewItem(item, count, true, false); } if (noSpaceForCount > 0) @@ -319,7 +319,7 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) if (!*args) return false; - char* cId = extractKeyFromLink((char*)args,"Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r + char* cId = extractKeyFromLink((char*)args, "Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r if (!cId) return false; @@ -328,7 +328,7 @@ bool ChatHandler::HandleAddItemSetCommand(const char *args) // prevent generation all items with itemset field value '0' if (itemsetId == 0) { - PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId); + PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, itemsetId); SetSentErrorMessage(true); return false; } @@ -385,7 +385,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) if (!*args) return false; - char* cId = extractKeyFromLink((char*)args,"Hitem"); + char* cId = extractKeyFromLink((char*)args, "Hitem"); if (!cId) return false; @@ -513,7 +513,7 @@ bool ChatHandler::HandleListItemCommand(const char *args) // auction case uint32 auc_count = 0; - result=CharacterDatabase.PQuery("SELECT COUNT(itemEntry) FROM auctionhouse ah INNER JOIN item_instance ii ON ii.guid = ah.itemguid WHERE itemEntry = '%u'",item_id); + result=CharacterDatabase.PQuery("SELECT COUNT(itemEntry) FROM auctionhouse ah INNER JOIN item_instance ii ON ii.guid = ah.itemguid WHERE itemEntry = '%u'", item_id); if (result) auc_count = (*result)[0].GetUInt32(); @@ -600,7 +600,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args) return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = extractKeyFromLink((char*)args, "Hgameobject_entry"); if (!cId) return false; @@ -629,7 +629,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args) QueryResult result; uint32 obj_count = 0; - result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'",go_id); + result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'", go_id); if (result) obj_count = (*result)[0].GetUInt32(); @@ -637,11 +637,11 @@ bool ChatHandler::HandleListObjectCommand(const char *args) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, id, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),go_id,uint32(count)); + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), go_id, uint32(count)); } else result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, id FROM gameobject WHERE id = '%u' LIMIT %u", - go_id,uint32(count)); + go_id, uint32(count)); if (result) { @@ -662,7 +662,7 @@ bool ChatHandler::HandleListObjectCommand(const char *args) } while (result->NextRow()); } - PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE,go_id,obj_count); + PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE, go_id, obj_count); return true; } @@ -672,7 +672,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) return false; // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hcreature_entry"); + char* cId = extractKeyFromLink((char*)args, "Hcreature_entry"); if (!cId) return false; @@ -701,7 +701,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) QueryResult result; uint32 cr_count = 0; - result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id); + result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'", cr_id); if (result) cr_count = (*result)[0].GetUInt32(); @@ -709,11 +709,11 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM creature WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), cr_id,uint32(count)); + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), cr_id, uint32(count)); } else result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id = '%u' LIMIT %u", - cr_id,uint32(count)); + cr_id, uint32(count)); if (result) { @@ -733,7 +733,7 @@ bool ChatHandler::HandleListCreatureCommand(const char *args) } while (result->NextRow()); } - PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE,cr_id,cr_count); + PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE, cr_id, cr_count); return true; } @@ -746,7 +746,7 @@ bool ChatHandler::HandleLookupItemCommand(const char *args) std::wstring wnamepart; // converting string that we try to find to lower case - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; wstrToLower(wnamepart); @@ -827,7 +827,7 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -875,9 +875,9 @@ bool ChatHandler::HandleLookupItemSetCommand(const char *args) // send item set in "id - [namedlink locale]" format if (m_session) - PSendSysMessage(LANG_ITEMSET_LIST_CHAT,id,id,name.c_str(),localeNames[loc]); + PSendSysMessage(LANG_ITEMSET_LIST_CHAT, id, id, name.c_str(), localeNames[loc]); else - PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE,id,name.c_str(),localeNames[loc]); + PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE, id, name.c_str(), localeNames[loc]); if (!found) found = true; @@ -900,7 +900,7 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -957,14 +957,14 @@ bool ChatHandler::HandleLookupSkillCommand(const char *args) uint32 tempValue = target->GetSkillTempBonusValue(id); char const* valFormat = GetTrinityString(LANG_SKILL_VALUES); - snprintf(valStr,50,valFormat,curValue,maxValue,permValue,tempValue); + snprintf(valStr, 50, valFormat, curValue, maxValue, permValue, tempValue); } // send skill in "id - [namedlink locale]" format if (m_session) - PSendSysMessage(LANG_SKILL_LIST_CHAT,id,id,name.c_str(),localeNames[loc],knownStr,valStr); + PSendSysMessage(LANG_SKILL_LIST_CHAT, id, id, name.c_str(), localeNames[loc], knownStr, valStr); else - PSendSysMessage(LANG_SKILL_LIST_CONSOLE,id,name.c_str(),localeNames[loc],knownStr,valStr); + PSendSysMessage(LANG_SKILL_LIST_CONSOLE, id, name.c_str(), localeNames[loc], knownStr, valStr); if (!found) found = true; @@ -987,7 +987,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char *args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -1097,7 +1097,7 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) std::wstring wnamepart; // converting string that we try to find to lower case - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; wstrToLower(wnamepart); @@ -1147,9 +1147,9 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) } if (m_session) - PSendSysMessage(LANG_QUEST_LIST_CHAT,qinfo->GetQuestId(),qinfo->GetQuestId(),qinfo->GetQuestLevel(),title.c_str(),statusStr); + PSendSysMessage(LANG_QUEST_LIST_CHAT, qinfo->GetQuestId(), qinfo->GetQuestId(), qinfo->GetQuestLevel(), title.c_str(), statusStr); else - PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr); + PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qinfo->GetQuestId(), title.c_str(), statusStr); if (!found) found = true; @@ -1190,9 +1190,9 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args) } if (m_session) - PSendSysMessage(LANG_QUEST_LIST_CHAT,qinfo->GetQuestId(),qinfo->GetQuestId(),qinfo->GetQuestLevel(),title.c_str(),statusStr); + PSendSysMessage(LANG_QUEST_LIST_CHAT, qinfo->GetQuestId(), qinfo->GetQuestId(), qinfo->GetQuestLevel(), title.c_str(), statusStr); else - PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr); + PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qinfo->GetQuestId(), title.c_str(), statusStr); if (!found) found = true; @@ -1214,7 +1214,7 @@ bool ChatHandler::HandleLookupCreatureCommand(const char *args) std::wstring wnamepart; // converting string that we try to find to lower case - if (!Utf8toWStr (namepart,wnamepart)) + if (!Utf8toWStr (namepart, wnamepart)) return false; wstrToLower (wnamepart); @@ -1295,7 +1295,7 @@ bool ChatHandler::HandleLookupObjectCommand(const char *args) std::wstring wnamepart; // converting string that we try to find to lower case - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; wstrToLower(wnamepart); @@ -1377,7 +1377,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char *args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr (namepart,wnamepart)) + if (!Utf8toWStr (namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -1476,7 +1476,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case @@ -1524,11 +1524,11 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args) // send taxinode in "id - [name] (Map:m X:x Y:y Z:z)" format if (m_session) - PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CHAT, id, id, name.c_str(),localeNames[loc], - nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z); + PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CHAT, id, id, name.c_str(), localeNames[loc], + nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z); else PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CONSOLE, id, name.c_str(), localeNames[loc], - nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z); + nodeEntry->map_id, nodeEntry->x, nodeEntry->y, nodeEntry->z); if (!found) found = true; @@ -1681,7 +1681,7 @@ bool ChatHandler::HandleGuildCreateCommand(const char *args) } Guild *guild = new Guild; - if (!guild->Create (target,guildname)) + if (!guild->Create (target, guildname)) { delete guild; SendSysMessage (LANG_GUILD_NOT_CREATED); @@ -1724,7 +1724,7 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args) { Player* target; uint64 target_guid; - if (!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args, &target, &target_guid)) return false; uint32 glId = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid); @@ -1744,14 +1744,14 @@ bool ChatHandler::HandleGuildRankCommand(const char *args) { char* nameStr; char* rankStr; - extractOptFirstArg((char*)args,&nameStr,&rankStr); + extractOptFirstArg((char*)args, &nameStr, &rankStr); if (!rankStr) return false; Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; uint32 glId = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid); @@ -1794,7 +1794,7 @@ bool ChatHandler::HandleGetDistanceCommand(const char *args) { uint64 guid = extractGuidFromLink((char*)args); if (guid) - obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(), guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!obj) { @@ -1832,7 +1832,7 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/) if (target->GetTypeId() == TYPEID_PLAYER) { - if (HasLowerSecurity((Player*)target,0,false)) + if (HasLowerSecurity((Player*)target, 0, false)) return false; } @@ -1902,14 +1902,14 @@ bool ChatHandler::HandleDamageCommand(const char * args) uint32 absorb = 0; uint32 resist = 0; - m_session->GetPlayer()->CalcAbsorbResist(target,schoolmask, SPELL_DIRECT_DAMAGE, damage, &absorb, &resist); + m_session->GetPlayer()->CalcAbsorbResist(target, schoolmask, SPELL_DIRECT_DAMAGE, damage, &absorb, &resist); if (damage <= absorb + resist) return true; damage -= absorb + resist; - m_session->GetPlayer()->DealDamageMods(target,damage,&absorb); + m_session->GetPlayer()->DealDamageMods(target, damage, &absorb); m_session->GetPlayer()->DealDamage(target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false); m_session->GetPlayer()->SendAttackStateUpdate (HITINFO_NORMALSWING2, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_HIT, 0); return true; @@ -1930,7 +1930,7 @@ bool ChatHandler::HandleReviveCommand(const char *args) { Player* target; uint64 target_guid; - if (!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args, &target, &target_guid)) return false; if (target) @@ -2009,9 +2009,9 @@ bool ChatHandler::HandleLinkGraveCommand(const char *args) if (!px2) g_team = 0; - else if (strncmp(px2,"horde",6) == 0) + else if (strncmp(px2, "horde", 6) == 0) g_team = HORDE; - else if (strncmp(px2,"alliance",9) == 0) + else if (strncmp(px2, "alliance", 9) == 0) g_team = ALLIANCE; else return false; @@ -2032,15 +2032,15 @@ bool ChatHandler::HandleLinkGraveCommand(const char *args) AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId); if (!areaEntry || areaEntry->zone !=0) { - PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id,zoneId); + PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, g_id, zoneId); SetSentErrorMessage(true); return false; } - if (sObjectMgr->AddGraveYardLink(g_id,zoneId,g_team)) - PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id,zoneId); + if (sObjectMgr->AddGraveYardLink(g_id, zoneId, g_team)) + PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id, zoneId); else - PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id,zoneId); + PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id, zoneId); return true; } @@ -2053,9 +2053,9 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) if (!*args) g_team = 0; - else if (strncmp((char*)args,"horde",argslen) == 0) + else if (strncmp((char*)args, "horde", argslen) == 0) g_team = HORDE; - else if (strncmp((char*)args,"alliance",argslen) == 0) + else if (strncmp((char*)args, "alliance", argslen) == 0) g_team = ALLIANCE; else return false; @@ -2064,16 +2064,16 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) uint32 zone_id = player->GetZoneId(); WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveYard( - player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(),player->GetMapId(),g_team); + player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), g_team); if (graveyard) { uint32 g_id = graveyard->ID; - GraveYardData const* data = sObjectMgr->FindGraveYardData(g_id,zone_id); + GraveYardData const* data = sObjectMgr->FindGraveYardData(g_id, zone_id); if (!data) { - PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR,g_id); + PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR, g_id); SetSentErrorMessage(true); return false; } @@ -2089,7 +2089,7 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) else if (g_team == ALLIANCE) team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE); - PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id,team_name.c_str(),zone_id); + PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id, team_name.c_str(), zone_id); } else { @@ -2105,7 +2105,7 @@ bool ChatHandler::HandleNearGraveCommand(const char *args) if (g_team == ~uint32(0)) PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id); else - PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id,team_name.c_str()); + PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str()); } return true; @@ -2130,24 +2130,24 @@ bool ChatHandler::HandleExploreCheatCommand(const char *args) { PSendSysMessage(LANG_YOU_SET_EXPLORE_ALL, GetNameLink(chr).c_str()); if (needReportToTarget(chr)) - ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL,GetNameLink().c_str()); + ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL, GetNameLink().c_str()); } else { PSendSysMessage(LANG_YOU_SET_EXPLORE_NOTHING, GetNameLink(chr).c_str()); if (needReportToTarget(chr)) - ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetNameLink().c_str()); + ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING, GetNameLink().c_str()); } for (uint8 i=0; i<PLAYER_EXPLORED_ZONES_SIZE; ++i) { if (flag != 0) { - m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i,0xFFFFFFFF); + m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0xFFFFFFFF); } else { - m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i,0); + m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0); } } @@ -2179,16 +2179,16 @@ void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint3 { player->GiveLevel(newlevel); player->InitTalentForLevel(); - player->SetUInt32Value(PLAYER_XP,0); + player->SetUInt32Value(PLAYER_XP, 0); if (needReportToTarget(player)) { if (oldlevel == newlevel) - ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET,GetNameLink().c_str()); + ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET, GetNameLink().c_str()); else if (oldlevel < newlevel) - ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP,GetNameLink().c_str(),newlevel); + ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP, GetNameLink().c_str(), newlevel); else // if (oldlevel > newlevel) - ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN,GetNameLink().c_str(),newlevel); + ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, GetNameLink().c_str(), newlevel); } } else @@ -2202,7 +2202,7 @@ bool ChatHandler::HandleCharacterLevelCommand(const char *args) { char* nameStr; char* levelStr; - extractOptFirstArg((char*)args,&nameStr,&levelStr); + extractOptFirstArg((char*)args, &nameStr, &levelStr); if (!levelStr) return false; @@ -2216,7 +2216,7 @@ bool ChatHandler::HandleCharacterLevelCommand(const char *args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid); @@ -2228,12 +2228,12 @@ bool ChatHandler::HandleCharacterLevelCommand(const char *args) if (newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level newlevel = STRONG_MAX_LEVEL; - HandleCharacterLevel(target,target_guid,oldlevel,newlevel); + HandleCharacterLevel(target, target_guid, oldlevel, newlevel); if (!m_session || m_session->GetPlayer() != target) // including player == NULL { std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel); + PSendSysMessage(LANG_YOU_CHANGE_LVL, nameLink.c_str(), newlevel); } return true; @@ -2243,7 +2243,7 @@ bool ChatHandler::HandleLevelUpCommand(const char *args) { char* nameStr; char* levelStr; - extractOptFirstArg((char*)args,&nameStr,&levelStr); + extractOptFirstArg((char*)args, &nameStr, &levelStr); // exception opt second arg: .character level $name if (levelStr && isalpha(levelStr[0])) @@ -2255,7 +2255,7 @@ bool ChatHandler::HandleLevelUpCommand(const char *args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid); @@ -2268,12 +2268,12 @@ bool ChatHandler::HandleLevelUpCommand(const char *args) if (newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level newlevel = STRONG_MAX_LEVEL; - HandleCharacterLevel(target,target_guid,oldlevel,newlevel); + HandleCharacterLevel(target, target_guid, oldlevel, newlevel); if (!m_session || m_session->GetPlayer() != target) // including chr == NULL { std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel); + PSendSysMessage(LANG_YOU_CHANGE_LVL, nameLink.c_str(), newlevel); } return true; @@ -2422,8 +2422,8 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) aura->GetCharges(), aura->GetStackAmount(), aurApp->GetSlot(), aura->GetDuration(), aura->GetMaxDuration(), ss_name.str().c_str(), - (aura->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""), - IS_PLAYER_GUID(aura->GetCasterGUID()) ? "player" : "creature",GUID_LOPART(aura->GetCasterGUID())); + (aura->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""), + IS_PLAYER_GUID(aura->GetCasterGUID()) ? "player" : "creature", GUID_LOPART(aura->GetCasterGUID())); } else { @@ -2431,8 +2431,8 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/) aura->GetCharges(), aura->GetStackAmount(), aurApp->GetSlot(), aura->GetDuration(), aura->GetMaxDuration(), name, - (aura->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""), - IS_PLAYER_GUID(aura->GetCasterGUID()) ? "player" : "creature",GUID_LOPART(aura->GetCasterGUID())); + (aura->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""), + IS_PLAYER_GUID(aura->GetCasterGUID()) ? "player" : "creature", GUID_LOPART(aura->GetCasterGUID())); } } for (uint16 i = 0; i < TOTAL_AURAS; ++i) @@ -2460,7 +2460,7 @@ bool ChatHandler::HandleResetAchievementsCommand (const char * args) { Player* target; uint64 target_guid; - if (!extractPlayerTarget((char*)args,&target,&target_guid)) + if (!extractPlayerTarget((char*)args, &target, &target_guid)) return false; if (target) @@ -2474,7 +2474,7 @@ bool ChatHandler::HandleResetAchievementsCommand (const char * args) bool ChatHandler::HandleResetHonorCommand (const char * args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; target->SetHonorPoints(0); @@ -2492,7 +2492,7 @@ static bool HandleResetStatsOrLevelHelper(Player* player) ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(player->getClass()); if (!cEntry) { - sLog->outError("Class %u not found in DBC (Wrong DBC files?)",player->getClass()); + sLog->outError("Class %u not found in DBC (Wrong DBC files?)", player->getClass()); return false; } @@ -2527,7 +2527,7 @@ static bool HandleResetStatsOrLevelHelper(Player* player) bool ChatHandler::HandleResetLevelCommand(const char * args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; if (!HandleResetStatsOrLevelHelper(target)) @@ -2547,7 +2547,7 @@ bool ChatHandler::HandleResetLevelCommand(const char * args) target->InitTaxiNodesForLevel(); target->InitGlyphsForLevel(); target->InitTalentForLevel(); - target->SetUInt32Value(PLAYER_XP,0); + target->SetUInt32Value(PLAYER_XP, 0); target->_ApplyAllLevelScaleItemMods(true); @@ -2561,7 +2561,7 @@ bool ChatHandler::HandleResetLevelCommand(const char * args) bool ChatHandler::HandleResetStatsCommand(const char * args) { Player* target; - if (!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; if (!HandleResetStatsOrLevelHelper(target)) @@ -2581,7 +2581,7 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; if (target) @@ -2590,12 +2590,12 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) ChatHandler(target).SendSysMessage(LANG_RESET_SPELLS); if (!m_session || m_session->GetPlayer() != target) - PSendSysMessage(LANG_RESET_SPELLS_ONLINE,GetNameLink(target).c_str()); + PSendSysMessage(LANG_RESET_SPELLS_ONLINE, GetNameLink(target).c_str()); } else { - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_SPELLS), GUID_LOPART(target_guid)); - PSendSysMessage(LANG_RESET_SPELLS_OFFLINE,target_name.c_str()); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", uint32(AT_LOGIN_RESET_SPELLS), GUID_LOPART(target_guid)); + PSendSysMessage(LANG_RESET_SPELLS_OFFLINE, target_name.c_str()); } return true; @@ -2606,7 +2606,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) Player* target; uint64 target_guid; std::string target_name; - if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) { // Try reset talents as Hunter Pet Creature* creature = getSelectedCreature(); @@ -2620,7 +2620,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) ChatHandler(owner->ToPlayer()).SendSysMessage(LANG_RESET_PET_TALENTS); if (!m_session || m_session->GetPlayer() != owner->ToPlayer()) - PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE,GetNameLink(owner->ToPlayer()).c_str()); + PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE, GetNameLink(owner->ToPlayer()).c_str()); } return true; } @@ -2636,10 +2636,10 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) target->SendTalentsInfoData(false); ChatHandler(target).SendSysMessage(LANG_RESET_TALENTS); if (!m_session || m_session->GetPlayer() != target) - PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(target).c_str()); + PSendSysMessage(LANG_RESET_TALENTS_ONLINE, GetNameLink(target).c_str()); Pet* pet = target->GetPet(); - Pet::resetTalentsForAllPetsOf(target,pet); + Pet::resetTalentsForAllPetsOf(target, pet); if (pet) target->SendTalentsInfoData(true); return true; @@ -2647,9 +2647,9 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) else if (target_guid) { uint32 at_flags = AT_LOGIN_NONE | AT_LOGIN_RESET_PET_TALENTS; - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",at_flags, GUID_LOPART(target_guid)); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", at_flags, GUID_LOPART(target_guid)); std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_RESET_TALENTS_OFFLINE,nameLink.c_str()); + PSendSysMessage(LANG_RESET_TALENTS_OFFLINE, nameLink.c_str()); return true; } @@ -2684,12 +2684,12 @@ bool ChatHandler::HandleResetAllCommand(const char * args) } else { - PSendSysMessage(LANG_RESETALL_UNKNOWN_CASE,args); + PSendSysMessage(LANG_RESETALL_UNKNOWN_CASE, args); SetSentErrorMessage(true); return false; } - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'", atLogin, atLogin); ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder<Player>::GetLock(), true); HashMapHolder<Player>::MapType const& plist = sObjectAccessor->GetPlayers(); @@ -2736,7 +2736,7 @@ bool ChatHandler::HandleServerShutDownCommand(const char *args) sWorld->ShutdownServ (time, 0, exitcode); } else - sWorld->ShutdownServ(time,0,SHUTDOWN_EXIT_CODE); + sWorld->ShutdownServ(time, 0, SHUTDOWN_EXIT_CODE); return true; } @@ -2806,7 +2806,7 @@ bool ChatHandler::HandleServerIdleRestartCommand(const char *args) sWorld->ShutdownServ (time, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, exitcode); } else - sWorld->ShutdownServ(time,SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE,RESTART_EXIT_CODE); + sWorld->ShutdownServ(time, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, RESTART_EXIT_CODE); return true; } @@ -2841,18 +2841,18 @@ bool ChatHandler::HandleServerIdleShutDownCommand(const char *args) sWorld->ShutdownServ (time, SHUTDOWN_MASK_IDLE, exitcode); } else - sWorld->ShutdownServ(time,SHUTDOWN_MASK_IDLE,SHUTDOWN_EXIT_CODE); + sWorld->ShutdownServ(time, SHUTDOWN_MASK_IDLE, SHUTDOWN_EXIT_CODE); return true; } bool ChatHandler::HandleBanAccountCommand(const char *args) { - return HandleBanHelper(BAN_ACCOUNT,args); + return HandleBanHelper(BAN_ACCOUNT, args); } bool ChatHandler::HandleBanAccountByCharCommand(const char *args) { - return HandleBanHelper(BAN_CHARACTER,args); + return HandleBanHelper(BAN_CHARACTER, args); } bool ChatHandler::HandleBanCharacterCommand(const char *args) @@ -2866,11 +2866,11 @@ bool ChatHandler::HandleBanCharacterCommand(const char *args) std::string name = cname; - char* duration = strtok(NULL," "); + char* duration = strtok(NULL, " "); if (!duration || !atoi(duration)) return false; - char* reason = strtok(NULL,""); + char* reason = strtok(NULL, ""); if (!reason) return false; @@ -2906,7 +2906,7 @@ bool ChatHandler::HandleBanCharacterCommand(const char *args) bool ChatHandler::HandleBanIPCommand(const char *args) { - return HandleBanHelper(BAN_IP,args); + return HandleBanHelper(BAN_IP, args); } bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) @@ -2920,11 +2920,11 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) std::string nameOrIP = cnameOrIP; - char* duration = strtok (NULL," "); + char* duration = strtok (NULL, " "); if (!duration || !atoi(duration)) return false; - char* reason = strtok (NULL,""); + char* reason = strtok (NULL, ""); if (!reason) return false; @@ -2933,7 +2933,7 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str()); SetSentErrorMessage(true); return false; } @@ -2952,13 +2952,13 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) break; } - switch(sWorld->BanAccount(mode, nameOrIP, duration, reason,m_session ? m_session->GetPlayerName() : "")) + switch(sWorld->BanAccount(mode, nameOrIP, duration, reason, m_session ? m_session->GetPlayerName() : "")) { case BAN_SUCCESS: if (atoi(duration)>0) - PSendSysMessage(LANG_BAN_YOUBANNED,nameOrIP.c_str(),secsToTimeString(TimeStringToSecs(duration),true).c_str(),reason); + PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(TimeStringToSecs(duration), true).c_str(), reason); else - PSendSysMessage(LANG_BAN_YOUPERMBANNED,nameOrIP.c_str(),reason); + PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reason); break; case BAN_SYNTAX_ERROR: return false; @@ -2966,13 +2966,13 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char *args) switch(mode) { default: - PSendSysMessage(LANG_BAN_NOTFOUND,"account",nameOrIP.c_str()); + PSendSysMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str()); break; case BAN_CHARACTER: - PSendSysMessage(LANG_BAN_NOTFOUND,"character",nameOrIP.c_str()); + PSendSysMessage(LANG_BAN_NOTFOUND, "character", nameOrIP.c_str()); break; case BAN_IP: - PSendSysMessage(LANG_BAN_NOTFOUND,"ip",nameOrIP.c_str()); + PSendSysMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP.c_str()); break; } SetSentErrorMessage(true); @@ -3041,7 +3041,7 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) case BAN_ACCOUNT: if (!AccountMgr::normalizeString(nameOrIP)) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,nameOrIP.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str()); SetSentErrorMessage(true); return false; } @@ -3060,10 +3060,10 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char *args) break; } - if (sWorld->RemoveBanAccount(mode,nameOrIP)) - PSendSysMessage(LANG_UNBAN_UNBANNED,nameOrIP.c_str()); + if (sWorld->RemoveBanAccount(mode, nameOrIP)) + PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str()); else - PSendSysMessage(LANG_UNBAN_ERROR,nameOrIP.c_str()); + PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str()); return true; } @@ -3080,7 +3080,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char *args) std::string account_name = cname; if (!AccountMgr::normalizeString(account_name)) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); SetSentErrorMessage(true); return false; } @@ -3088,11 +3088,11 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char *args) uint32 accountid = sAccountMgr->GetId(account_name); if (!accountid) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); return true; } - return HandleBanInfoHelper(accountid,account_name.c_str()); + return HandleBanInfoHelper(accountid, account_name.c_str()); } bool ChatHandler::HandleBanInfoCharacterCommand(const char *args) @@ -3147,7 +3147,7 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args) bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) { - QueryResult result = LoginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC",accountid); + QueryResult result = LoginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate, banreason, bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC", accountid); if (!result) { PSendSysMessage(LANG_BANINFO_NOACCOUNTBAN, accountname); @@ -3187,7 +3187,7 @@ bool ChatHandler::HandleBanInfoIPCommand(const char *args) std::string IP = cIP; LoginDatabase.escape_string(IP); - QueryResult result = LoginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'",IP.c_str()); + QueryResult result = LoginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason, bannedby, unbandate-bandate FROM ip_banned WHERE ip = '%s'", IP.c_str()); if (!result) { PSendSysMessage(LANG_BANINFO_NOIP); @@ -3307,7 +3307,7 @@ bool ChatHandler::HandleBanListAccountCommand(const char *args) else { result = LoginDatabase.PQuery("SELECT account.id, username FROM account, account_banned" - " WHERE account.id = account_banned.id AND active = 1 AND username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" GROUP BY account.id", + " WHERE account.id = account_banned.id AND active = 1 AND username "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" GROUP BY account.id", filter.c_str()); } @@ -3332,7 +3332,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) Field* fields = result->Fetch(); uint32 accountid = fields[0].GetUInt32(); - QueryResult banresult = LoginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id",accountid); + QueryResult banresult = LoginDatabase.PQuery("SELECT account.username FROM account, account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id", accountid); if (banresult) { Field* fields2 = banresult->Fetch(); @@ -3359,10 +3359,10 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) account_name = fields[1].GetString(); // "character" case, name need extract from another DB else - sAccountMgr->GetName (account_id,account_name); + sAccountMgr->GetName (account_id, account_name); // No SQL injection. id is uint32. - QueryResult banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id); + QueryResult banInfo = LoginDatabase.PQuery("SELECT bandate, unbandate, bannedby, banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id); if (banInfo) { Field *fields2 = banInfo->Fetch(); @@ -3382,7 +3382,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) time_t t_unban = fields2[1].GetUInt64(); tm* aTm_unban = localtime(&t_unban); PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|", - account_name.c_str(),aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, + account_name.c_str(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min, fields2[2].GetCString(), fields2[3].GetCString()); } @@ -3406,15 +3406,15 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) if (filter.empty()) { - result = LoginDatabase.Query ("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" + result = LoginDatabase.Query ("SELECT ip, bandate, unbandate, bannedby, banreason FROM ip_banned" " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())" " ORDER BY unbandate"); } else { - result = LoginDatabase.PQuery("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" - " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'") - " ORDER BY unbandate",filter.c_str()); + result = LoginDatabase.PQuery("SELECT ip, bandate, unbandate, bannedby, banreason FROM ip_banned" + " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'") + " ORDER BY unbandate", filter.c_str()); } if (!result) @@ -3493,7 +3493,7 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/) cell.SetNoCreate(); Trinity::RespawnDo u_do; - Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(pl,u_do); + Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(pl, u_do); TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::RespawnDo>, GridTypeMapContainer > obj_worker(worker); cell.Visit(p, obj_worker, *pl->GetMap()); @@ -3517,7 +3517,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) std::string account_name = account; if (!AccountMgr::normalizeString(account_name)) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); SetSentErrorMessage(true); return false; } @@ -3528,15 +3528,15 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) account_id = atoi(account); // use original string if (!account_id) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); SetSentErrorMessage(true); return false; } } - if (!sAccountMgr->GetName(account_id,account_name)) + if (!sAccountMgr->GetName(account_id, account_name)) { - PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); SetSentErrorMessage(true); return false; } @@ -3556,7 +3556,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) return false; } - if (ObjectMgr::CheckPlayerName(name,true) != CHAR_NAME_SUCCESS) + if (ObjectMgr::CheckPlayerName(name, true) != CHAR_NAME_SUCCESS) { PSendSysMessage(LANG_INVALID_CHARACTER_NAME); SetSentErrorMessage(true); @@ -3580,7 +3580,7 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) if (sObjectMgr->GetPlayerAccountIdByGUID(guid)) { - PSendSysMessage(LANG_CHARACTER_GUID_IN_USE,guid); + PSendSysMessage(LANG_CHARACTER_GUID_IN_USE, guid); SetSentErrorMessage(true); return false; } @@ -3592,15 +3592,15 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args) PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS); break; case DUMP_FILE_OPEN_ERROR: - PSendSysMessage(LANG_FILE_OPEN_FAIL,file); + PSendSysMessage(LANG_FILE_OPEN_FAIL, file); SetSentErrorMessage(true); return false; case DUMP_FILE_BROKEN: - PSendSysMessage(LANG_DUMP_BROKEN,file); + PSendSysMessage(LANG_DUMP_BROKEN, file); SetSentErrorMessage(true); return false; case DUMP_TOO_MANY_CHARS: - PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL,account_name.c_str(),account_id); + PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account_name.c_str(), account_id); SetSentErrorMessage(true); return false; default: @@ -3653,7 +3653,7 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args) PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS); break; case DUMP_FILE_OPEN_ERROR: - PSendSysMessage(LANG_FILE_OPEN_FAIL,file); + PSendSysMessage(LANG_FILE_OPEN_FAIL, file); SetSentErrorMessage(true); return false; case DUMP_CHARACTER_DELETED: @@ -3679,7 +3679,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) return false; } - PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"),unit->GetGUIDLow()); + PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUIDLow()); MotionMaster* mm = unit->GetMotionMaster(); for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i) @@ -3704,7 +3704,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) TargetedMovementGenerator<Player> const* mgen = static_cast<TargetedMovementGenerator<Player> const*>(mg); Unit* target = mgen->GetTarget(); if (target) - PSendSysMessage(LANG_MOVEGENS_TARGETED_PLAYER,target->GetName(),target->GetGUIDLow()); + PSendSysMessage(LANG_MOVEGENS_TARGETED_PLAYER, target->GetName(), target->GetGUIDLow()); else SendSysMessage(LANG_MOVEGENS_TARGETED_NULL); } @@ -3713,7 +3713,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) TargetedMovementGenerator<Creature> const* mgen = static_cast<TargetedMovementGenerator<Creature> const*>(mg); Unit* target = mgen->GetTarget(); if (target) - PSendSysMessage(LANG_MOVEGENS_TARGETED_CREATURE,target->GetName(),target->GetGUIDLow()); + PSendSysMessage(LANG_MOVEGENS_TARGETED_CREATURE, target->GetName(), target->GetGUIDLow()); else SendSysMessage(LANG_MOVEGENS_TARGETED_NULL); } @@ -3722,9 +3722,9 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) case HOME_MOTION_TYPE: if (unit->GetTypeId() == TYPEID_UNIT) { - float x,y,z; - mg->GetDestination(x,y,z); - PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE,x,y,z); + float x, y, z; + mg->GetDestination(x, y, z); + PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE, x, y, z); } else SendSysMessage(LANG_MOVEGENS_HOME_PLAYER); @@ -3732,15 +3732,15 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/) case FLIGHT_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_FLIGHT); break; case POINT_MOTION_TYPE: { - float x,y,z; - mg->GetDestination(x,y,z); - PSendSysMessage(LANG_MOVEGENS_POINT,x,y,z); + float x, y, z; + mg->GetDestination(x, y, z); + PSendSysMessage(LANG_MOVEGENS_POINT, x, y, z); break; } case FLEEING_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_FEAR); break; case DISTRACT_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_DISTRACT); break; default: - PSendSysMessage(LANG_MOVEGENS_UNKNOWN,mg->GetMovementGeneratorType()); + PSendSysMessage(LANG_MOVEGENS_UNKNOWN, mg->GetMovementGeneratorType()); break; } } @@ -3757,15 +3757,15 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) int l = strlen(param); - if (strncmp(param,"player",l) == 0) + if (strncmp(param, "player", l) == 0) sWorld->SetPlayerSecurityLimit(SEC_PLAYER); - else if (strncmp(param,"moderator",l) == 0) + else if (strncmp(param, "moderator", l) == 0) sWorld->SetPlayerSecurityLimit(SEC_MODERATOR); - else if (strncmp(param,"gamemaster",l) == 0) + else if (strncmp(param, "gamemaster", l) == 0) sWorld->SetPlayerSecurityLimit(SEC_GAMEMASTER); - else if (strncmp(param,"administrator",l) == 0) + else if (strncmp(param, "administrator", l) == 0) sWorld->SetPlayerSecurityLimit(SEC_ADMINISTRATOR); - else if (strncmp(param,"reset",l) == 0) + else if (strncmp(param, "reset", l) == 0) { sWorld->SetPlayerAmountLimit(sConfig->GetIntDefault("PlayerLimit", 100)); sWorld->LoadDBAllowedSecurityLevel(); @@ -3792,7 +3792,7 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) default: secName = "<unknown>"; break; } - PSendSysMessage("Player limits: amount %u, min. security level %s.",pLimit,secName); + PSendSysMessage("Player limits: amount %u, min. security level %s.", pLimit, secName); return true; } @@ -3824,9 +3824,9 @@ bool ChatHandler::HandleCastCommand(const char *args) return false; } - if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer())) { - PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); + PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell); SetSentErrorMessage(true); return false; } @@ -3835,13 +3835,13 @@ bool ChatHandler::HandleCastCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0) + if (strncmp(trig_str, "triggered", l) != 0) return false; } bool triggered = (trig_str != NULL); - m_session->GetPlayer()->CastSpell(target,spell,triggered); + m_session->GetPlayer()->CastSpell(target, spell, triggered); return true; } @@ -3871,7 +3871,7 @@ bool ChatHandler::HandleCastBackCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0) + if (strncmp(trig_str, "triggered", l) != 0) return false; } @@ -3879,7 +3879,7 @@ bool ChatHandler::HandleCastBackCommand(const char *args) caster->SetFacingToObject(m_session->GetPlayer()); - caster->CastSpell(m_session->GetPlayer(),spell,triggered); + caster->CastSpell(m_session->GetPlayer(), spell, triggered); return true; } @@ -3902,9 +3902,9 @@ bool ChatHandler::HandleCastDistCommand(const char *args) return false; } - if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer())) { - PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); + PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell); SetSentErrorMessage(true); return false; } @@ -3920,16 +3920,16 @@ bool ChatHandler::HandleCastDistCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0) + if (strncmp(trig_str, "triggered", l) != 0) return false; } bool triggered = (trig_str != NULL); - float x,y,z; - m_session->GetPlayer()->GetClosePoint(x,y,z,dist); + float x, y, z; + m_session->GetPlayer()->GetClosePoint(x, y, z, dist); - m_session->GetPlayer()->CastSpell(x,y,z,spell,triggered); + m_session->GetPlayer()->CastSpell(x, y, z, spell, triggered); return true; } @@ -3964,7 +3964,7 @@ bool ChatHandler::HandleCastTargetCommand(const char *args) if (trig_str) { int l = strlen(trig_str); - if (strncmp(trig_str,"triggered",l) != 0) + if (strncmp(trig_str, "triggered", l) != 0) return false; } @@ -3972,7 +3972,7 @@ bool ChatHandler::HandleCastTargetCommand(const char *args) caster->SetFacingToObject(m_session->GetPlayer()); - caster->CastSpell(caster->getVictim(),spell,triggered); + caster->CastSpell(caster->getVictim(), spell, triggered); return true; } @@ -4031,14 +4031,14 @@ bool ChatHandler::HandleCastSelfCommand(const char *args) if (!spellInfo) return false; - if (!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer())) + if (!SpellMgr::IsSpellValid(spellInfo, m_session->GetPlayer())) { - PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); + PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell); SetSentErrorMessage(true); return false; } - target->CastSpell(target,spell,false); + target->CastSpell(target, spell, false); return true; } @@ -4207,7 +4207,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) Player* receiver; uint64 receiver_guid; std::string receiver_name; - if (!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget((char*)args, &receiver, &receiver_guid, &receiver_name)) return false; char* tail1 = strtok(NULL, ""); @@ -4231,7 +4231,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) std::string text = msgText; // extract items - typedef std::pair<uint32,uint32> ItemPair; + typedef std::pair<uint32, uint32> ItemPair; typedef std::list< ItemPair > ItemPairs; ItemPairs items; @@ -4263,18 +4263,18 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) uint32 item_count = itemCountStr ? atoi(itemCountStr) : 1; if (item_count < 1 || (item_proto->MaxCount > 0 && item_count > uint32(item_proto->MaxCount))) { - PSendSysMessage(LANG_COMMAND_INVALID_ITEM_COUNT, item_count,item_id); + PSendSysMessage(LANG_COMMAND_INVALID_ITEM_COUNT, item_count, item_id); SetSentErrorMessage(true); return false; } while (item_count > item_proto->GetMaxStackSize()) { - items.push_back(ItemPair(item_id,item_proto->GetMaxStackSize())); + items.push_back(ItemPair(item_id, item_proto->GetMaxStackSize())); item_count -= item_proto->GetMaxStackSize(); } - items.push_back(ItemPair(item_id,item_count)); + items.push_back(ItemPair(item_id, item_count)); if (items.size() > MAX_MAIL_ITEMS) { @@ -4285,7 +4285,7 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) } // from console show not existed sender - MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); + MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); // fill mail MailDraft draft(subject, text); @@ -4294,14 +4294,14 @@ bool ChatHandler::HandleSendItemsCommand(const char *args) for (ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr) { - if (Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0)) + if (Item* item = Item::CreateItem(itr->first, itr->second, m_session ? m_session->GetPlayer() : 0)) { item->SaveToDB(trans); // save for prevent lost at next mail load, if send fail then item will deleted draft.AddItem(item); } } - draft.SendMailTo(trans, MailReceiver(receiver,GUID_LOPART(receiver_guid)), sender); + draft.SendMailTo(trans, MailReceiver(receiver, GUID_LOPART(receiver_guid)), sender); CharacterDatabase.CommitTransaction(trans); std::string nameLink = playerLink(receiver_name); @@ -4317,7 +4317,7 @@ bool ChatHandler::HandleSendMoneyCommand(const char *args) Player* receiver; uint64 receiver_guid; std::string receiver_name; - if (!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name)) + if (!extractPlayerTarget((char*)args, &receiver, &receiver_guid, &receiver_name)) return false; char* tail1 = strtok(NULL, ""); @@ -4346,13 +4346,13 @@ bool ChatHandler::HandleSendMoneyCommand(const char *args) std::string text = msgText; // from console show not existed sender - MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); + MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); SQLTransaction trans = CharacterDatabase.BeginTransaction(); MailDraft(subject, text) .AddMoney(money) - .SendMailTo(trans, MailReceiver(receiver,GUID_LOPART(receiver_guid)),sender); + .SendMailTo(trans, MailReceiver(receiver, GUID_LOPART(receiver_guid)), sender); CharacterDatabase.CommitTransaction(trans); @@ -4388,7 +4388,7 @@ bool ChatHandler::HandleSendMessageCommand(const char *args) //Confirmation message std::string nameLink = GetNameLink(rPlayer); - PSendSysMessage(LANG_SENDMESSAGE,nameLink.c_str(),msg_str); + PSendSysMessage(LANG_SENDMESSAGE, nameLink.c_str(), msg_str); return true; } @@ -4502,7 +4502,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args) //effect if (player && player != m_session->GetPlayer()) { - PSendSysMessage(LANG_COMMAND_FREEZE,name.c_str()); + PSendSysMessage(LANG_COMMAND_FREEZE, name.c_str()); //stop combat + make player unattackable + duel stop + stop some spells player->setFaction(35); @@ -4519,11 +4519,11 @@ bool ChatHandler::HandleFreezeCommand(const char *args) pet->SavePetToDB(PET_SAVE_AS_CURRENT); // not let dismiss dead pet if (pet && pet->isAlive()) - player->RemovePet(pet,PET_SAVE_NOT_IN_SLOT); + player->RemovePet(pet, PET_SAVE_NOT_IN_SLOT); } } - //m_session->GetPlayer()->CastSpell(player,spellID,false); + //m_session->GetPlayer()->CastSpell(player, spellID, false); if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(9454)) Aura::TryCreate(spellInfo, player, player); @@ -4555,7 +4555,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) //effect if (player) { - PSendSysMessage(LANG_COMMAND_UNFREEZE,name.c_str()); + PSendSysMessage(LANG_COMMAND_UNFREEZE, name.c_str()); //Reset player faction + allow combat + allow duels player->setFactionForRace(player->getRace()); @@ -4573,7 +4573,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) if (TargetName) { //check for offline players - QueryResult result = CharacterDatabase.PQuery("SELECT characters.guid FROM characters WHERE characters.name = '%s'",name.c_str()); + QueryResult result = CharacterDatabase.PQuery("SELECT characters.guid FROM characters WHERE characters.name = '%s'", name.c_str()); if (!result) { SendSysMessage(LANG_COMMAND_FREEZE_WRONG); @@ -4583,8 +4583,8 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) Field *fields=result->Fetch(); uint64 pguid = fields[0].GetUInt64(); - CharacterDatabase.PQuery("DELETE FROM character_aura WHERE character_aura.spell = 9454 AND character_aura.guid = '%u'",pguid); - PSendSysMessage(LANG_COMMAND_UNFREEZE,name.c_str()); + CharacterDatabase.PQuery("DELETE FROM character_aura WHERE character_aura.spell = 9454 AND character_aura.guid = '%u'", pguid); + PSendSysMessage(LANG_COMMAND_UNFREEZE, name.c_str()); return true; } else @@ -4614,7 +4614,7 @@ bool ChatHandler::HandleListFreezeCommand(const char * /*args*/) { Field *fields = result->Fetch(); std::string fplayers = fields[0].GetString(); - PSendSysMessage(LANG_COMMAND_FROZEN_PLAYERS,fplayers.c_str()); + PSendSysMessage(LANG_COMMAND_FROZEN_PLAYERS, fplayers.c_str()); } while (result->NextRow()); return true; diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 92e0acb9892..10648b0b92e 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -55,7 +55,7 @@ bool Condition::Meets(Player * player, Unit* invoker) condMeets = (mConditionValue2 && player->HasItemCount(mConditionValue1, mConditionValue2)) || (!mConditionValue2 && !player->HasItemCount(mConditionValue1, mConditionValue2));//HasItemCount returns false if 0 count is used break; case CONDITION_ITEM_EQUIPPED: - condMeets = player->HasItemOrGemWithIdEquipped(mConditionValue1,1); + condMeets = player->HasItemOrGemWithIdEquipped(mConditionValue1, 1); break; case CONDITION_ZONEID: condMeets = player->GetZoneId() == mConditionValue1; @@ -252,12 +252,12 @@ ConditionList ConditionMgr::GetConditionReferences(uint32 refId) return conditions; } -bool ConditionMgr::IsPlayerMeetToConditionList(Player* player,const ConditionList& conditions, Unit* invoker) +bool ConditionMgr::IsPlayerMeetToConditionList(Player* player, const ConditionList& conditions, Unit* invoker) { std::map<uint32, bool>ElseGroupMap; for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i) { - sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u",(*i)->mConditionType,(*i)->mConditionValue1); + sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u", (*i)->mConditionType, (*i)->mConditionValue1); if ((*i)->isLoaded()) { std::map<uint32, bool>::const_iterator itr = ElseGroupMap.find((*i)->mElseGroup); @@ -377,7 +377,7 @@ void ConditionMgr::LoadConditions(bool isReload) sObjectMgr->LoadGossipMenuItems(); } - QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference," + QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, " " ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName FROM conditions"); if (!result) @@ -888,14 +888,14 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) { cond->mConditionValue3 &= ~(1 << i); sLog->outErrorDb("SourceEntry %u in `condition` table does not have any implicit target TARGET_UNIT_NEARBY_ENTRY(38) or TARGET_DST_NEARBY_ENTRY (46)" - ",TARGET_UNIT_AREA_ENTRY_SRC(7), TARGET_UNIT_AREA_ENTRY_DST(8), TARGET_UNIT_CONE_ENTRY(60), TARGET_GAMEOBJECT_NEARBY_ENTRY(40)" + ", TARGET_UNIT_AREA_ENTRY_SRC(7), TARGET_UNIT_AREA_ENTRY_DST(8), TARGET_UNIT_CONE_ENTRY(60), TARGET_GAMEOBJECT_NEARBY_ENTRY(40)" "TARGET_GAMEOBJECT_AREA_SRC(51), TARGET_GAMEOBJECT_AREA_DST(52) in effect %u", cond->mSourceEntry, uint32(i)); } } if (!targetfound && !cond->mConditionValue3) // cond->mConditionValue3 already errored up there { sLog->outErrorDb("SourceEntry %u in `condition` table does not have any implicit target TARGET_UNIT_NEARBY_ENTRY(38) or TARGET_DST_NEARBY_ENTRY (46)" - ",TARGET_UNIT_AREA_ENTRY_SRC(7), TARGET_UNIT_AREA_ENTRY_DST(8), TARGET_UNIT_CONE_ENTRY(60), TARGET_GAMEOBJECT_NEARBY_ENTRY(40)" + ", TARGET_UNIT_AREA_ENTRY_SRC(7), TARGET_UNIT_AREA_ENTRY_DST(8), TARGET_UNIT_CONE_ENTRY(60), TARGET_GAMEOBJECT_NEARBY_ENTRY(40)" "TARGET_GAMEOBJECT_AREA_SRC(51), TARGET_GAMEOBJECT_AREA_DST(52)", cond->mSourceEntry); return false; } @@ -1026,7 +1026,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) { if (cond->mConditionType == CONDITION_NONE || cond->mConditionType >= CONDITION_MAX) { - sLog->outErrorDb("Invalid ConditionType %u at SourceEntry %u in `condition` table, ignoring.", uint32(cond->mConditionType),cond->mSourceEntry); + sLog->outErrorDb("Invalid ConditionType %u at SourceEntry %u in `condition` table, ignoring.", uint32(cond->mConditionType), cond->mSourceEntry); return false; } diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 6a1dbb8fa92..11a71ea0cfd 100755 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -73,28 +73,28 @@ enum LevelConditionType enum ConditionSourceType { - CONDITION_SOURCE_TYPE_NONE = 0,//DONE - CONDITION_SOURCE_TYPE_CREATURE_LOOT_TEMPLATE = 1,//DONE - CONDITION_SOURCE_TYPE_DISENCHANT_LOOT_TEMPLATE = 2,//DONE - CONDITION_SOURCE_TYPE_FISHING_LOOT_TEMPLATE = 3,//DONE - CONDITION_SOURCE_TYPE_GAMEOBJECT_LOOT_TEMPLATE = 4,//DONE - CONDITION_SOURCE_TYPE_ITEM_LOOT_TEMPLATE = 5,//DONE - CONDITION_SOURCE_TYPE_MAIL_LOOT_TEMPLATE = 6,//DONE - CONDITION_SOURCE_TYPE_MILLING_LOOT_TEMPLATE = 7,//DONE - CONDITION_SOURCE_TYPE_PICKPOCKETING_LOOT_TEMPLATE = 8,//DONE - CONDITION_SOURCE_TYPE_PROSPECTING_LOOT_TEMPLATE = 9,//DONE - CONDITION_SOURCE_TYPE_REFERENCE_LOOT_TEMPLATE = 10,//DONE - CONDITION_SOURCE_TYPE_SKINNING_LOOT_TEMPLATE = 11,//DONE - CONDITION_SOURCE_TYPE_SPELL_LOOT_TEMPLATE = 12,//DONE - CONDITION_SOURCE_TYPE_SPELL_SCRIPT_TARGET = 13,//DONE - CONDITION_SOURCE_TYPE_GOSSIP_MENU = 14,//DONE - CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION = 15,//DONE - CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE = 16,//DONE - CONDITION_SOURCE_TYPE_SPELL = 17,//DONE - CONDITION_SOURCE_TYPE_ITEM_REQUIRED_TARGET = 18,//DONE - CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19,//DONE - CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20,//DONE - CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21,//DONE + CONDITION_SOURCE_TYPE_NONE = 0, //DONE + CONDITION_SOURCE_TYPE_CREATURE_LOOT_TEMPLATE = 1, //DONE + CONDITION_SOURCE_TYPE_DISENCHANT_LOOT_TEMPLATE = 2, //DONE + CONDITION_SOURCE_TYPE_FISHING_LOOT_TEMPLATE = 3, //DONE + CONDITION_SOURCE_TYPE_GAMEOBJECT_LOOT_TEMPLATE = 4, //DONE + CONDITION_SOURCE_TYPE_ITEM_LOOT_TEMPLATE = 5, //DONE + CONDITION_SOURCE_TYPE_MAIL_LOOT_TEMPLATE = 6, //DONE + CONDITION_SOURCE_TYPE_MILLING_LOOT_TEMPLATE = 7, //DONE + CONDITION_SOURCE_TYPE_PICKPOCKETING_LOOT_TEMPLATE = 8, //DONE + CONDITION_SOURCE_TYPE_PROSPECTING_LOOT_TEMPLATE = 9, //DONE + CONDITION_SOURCE_TYPE_REFERENCE_LOOT_TEMPLATE = 10, //DONE + CONDITION_SOURCE_TYPE_SKINNING_LOOT_TEMPLATE = 11, //DONE + CONDITION_SOURCE_TYPE_SPELL_LOOT_TEMPLATE = 12, //DONE + CONDITION_SOURCE_TYPE_SPELL_SCRIPT_TARGET = 13, //DONE + CONDITION_SOURCE_TYPE_GOSSIP_MENU = 14, //DONE + CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION = 15, //DONE + CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE = 16, //DONE + CONDITION_SOURCE_TYPE_SPELL = 17, //DONE + CONDITION_SOURCE_TYPE_ITEM_REQUIRED_TARGET = 18, //DONE + CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19, //DONE + CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20, //DONE + CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21, //DONE CONDITION_SOURCE_TYPE_MAX = 22//MAX }; @@ -166,7 +166,7 @@ class ConditionMgr bool addToLootTemplate(Condition* cond, LootTemplate* loot); bool addToGossipMenus(Condition* cond); bool addToGossipMenuItems(Condition* cond); - bool IsPlayerMeetToConditionList(Player* player,const ConditionList& conditions, Unit* invoker = NULL); + bool IsPlayerMeetToConditionList(Player* player, const ConditionList& conditions, Unit* invoker = NULL); bool isGroupable(ConditionSourceType sourceType) const { diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index ac5c43dcefa..3685dfdc0a6 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -43,7 +43,7 @@ void DisableMgr::LoadDisables() m_DisableMap.clear(); - QueryResult result = WorldDatabase.Query("SELECT sourceType,entry,flags,params_0,params_1 FROM disables"); + QueryResult result = WorldDatabase.Query("SELECT sourceType, entry, flags, params_0, params_1 FROM disables"); uint32 total_count = 0; @@ -91,14 +91,14 @@ void DisableMgr::LoadDisables() if (flags & SPELL_DISABLE_MAP) { - Tokens tokens(params_0, ','); + Tokens tokens(params_0, ', '); for (uint8 i = 0; i < tokens.size(); ) data.params[0].insert(atoi(tokens[i++])); } if (flags & SPELL_DISABLE_AREA) { - Tokens tokens(params_1, ','); + Tokens tokens(params_1, ', '); for (uint8 i = 0; i < tokens.size(); ) data.params[1].insert(atoi(tokens[i++])); } diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 9534ec9d0e3..5182a0d90ad 100755 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -278,7 +278,7 @@ enum Difficulty enum SpawnMask { - SPAWNMASK_CONTINENT = (1 << REGULAR_DIFFICULTY),// any any maps without spawn modes + SPAWNMASK_CONTINENT = (1 << REGULAR_DIFFICULTY), // any any maps without spawn modes SPAWNMASK_DUNGEON_NORMAL = (1 << DUNGEON_DIFFICULTY_NORMAL), SPAWNMASK_DUNGEON_HEROIC = (1 << DUNGEON_DIFFICULTY_HEROIC), diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 5cf90472fa5..f4056dd0a37 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -26,8 +26,8 @@ #include <map> -typedef std::map<uint16,uint32> AreaFlagByAreaID; -typedef std::map<uint32,uint32> AreaFlagByMapID; +typedef std::map<uint16, uint32> AreaFlagByAreaID; +typedef std::map<uint32, uint32> AreaFlagByMapID; struct WMOAreaTableTripple { @@ -83,7 +83,7 @@ DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore(DurabilityCostsfmt); DBCStorage <EmotesEntry> sEmotesStore(EmotesEntryfmt); DBCStorage <EmotesTextEntry> sEmotesTextStore(EmotesTextEntryfmt); -typedef std::map<uint32,SimpleFactionsList> FactionTeamMap; +typedef std::map<uint32, SimpleFactionsList> FactionTeamMap; static FactionTeamMap sFactionTeamMap; DBCStorage <FactionEntry> sFactionStore(FactionEntryfmt); DBCStorage <FactionTemplateEntry> sFactionTemplateStore(FactionTemplateEntryfmt); @@ -196,9 +196,9 @@ typedef std::list<std::string> StoreProblemList; uint32 DBCFileCount = 0; -static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, const std::string& filename) +static bool LoadDBC_assert_print(uint32 fsize, uint32 rsize, const std::string& filename) { - sLog->outError("Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).",filename.c_str(),fsize,rsize); + sLog->outError("Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).", filename.c_str(), fsize, rsize); // ASSERT must fail after function call return false; @@ -327,9 +327,9 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sGlyphSlotStore, dbcPath, "GlyphSlot.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sGtBarberShopCostBaseStore, dbcPath, "gtBarberShopCostBase.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sGtCombatRatingsStore, dbcPath, "gtCombatRatings.dbc"); - LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToMeleeCritBaseStore,dbcPath, "gtChanceToMeleeCritBase.dbc"); + LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToMeleeCritBaseStore, dbcPath, "gtChanceToMeleeCritBase.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToMeleeCritStore, dbcPath, "gtChanceToMeleeCrit.dbc"); - LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToSpellCritBaseStore,dbcPath, "gtChanceToSpellCritBase.dbc"); + LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToSpellCritBaseStore, dbcPath, "gtChanceToSpellCritBase.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sGtChanceToSpellCritStore, dbcPath, "gtChanceToSpellCrit.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sGtOCTRegenHPStore, dbcPath, "gtOCTRegenHP.dbc"); //LoadDBC(dbcCount, availableDbcLocales, bad_dbc_files, sGtOCTRegenMPStore, dbcPath, "gtOCTRegenMP.dbc"); -- not used currently @@ -376,7 +376,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sRandomPropertiesPointsStore, dbcPath, "RandPropPoints.dbc"); - LoadDBC(availableDbcLocales, bad_dbc_files, sScalingStatDistributionStore,dbcPath, "ScalingStatDistribution.dbc"); + LoadDBC(availableDbcLocales, bad_dbc_files, sScalingStatDistributionStore, dbcPath, "ScalingStatDistribution.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sScalingStatValuesStore, dbcPath, "ScalingStatValues.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sSkillLineStore, dbcPath, "SkillLine.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sSkillLineAbilityStore, dbcPath, "SkillLineAbility.dbc"); @@ -692,7 +692,7 @@ AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id) return sAreaStore.LookupEntry(areaflag); } -AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id) +AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id) { if (area_flag) return sAreaStore.LookupEntry(area_flag); @@ -725,7 +725,7 @@ uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId) ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId) { - mapid = GetVirtualMapForMapAndZone(mapid,zoneId); + mapid = GetVirtualMapForMapAndZone(mapid, zoneId); if (mapid < 2) return CONTENT_1_60; @@ -761,7 +761,7 @@ bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredT return (itemEntry->categoryMask & reqEntry->categoryMask) == reqEntry->categoryMask; } -void Zone2MapCoordinates(float& x,float& y,uint32 zone) +void Zone2MapCoordinates(float& x, float& y, uint32 zone) { WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone); @@ -769,12 +769,12 @@ void Zone2MapCoordinates(float& x,float& y,uint32 zone) if (!maEntry) return; - std::swap(x,y); // at client map coords swapped + std::swap(x, y); // at client map coords swapped x = x*((maEntry->x2-maEntry->x1)/100)+maEntry->x1; y = y*((maEntry->y2-maEntry->y1)/100)+maEntry->y1; // client y coord from top to down } -void Map2ZoneCoordinates(float& x,float& y,uint32 zone) +void Map2ZoneCoordinates(float& x, float& y, uint32 zone) { WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone); @@ -784,12 +784,12 @@ void Map2ZoneCoordinates(float& x,float& y,uint32 zone) x = (x-maEntry->x1)/((maEntry->x2-maEntry->x1)/100); y = (y-maEntry->y1)/((maEntry->y2-maEntry->y1)/100); // client y coord from top to down - std::swap(x,y); // client have map coords swapped + std::swap(x, y); // client have map coords swapped } MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty) { - MapDifficultyMap::const_iterator itr = sMapDifficultyMap.find(MAKE_PAIR32(mapId,difficulty)); + MapDifficultyMap::const_iterator itr = sMapDifficultyMap.find(MAKE_PAIR32(mapId, difficulty)); return itr != sMapDifficultyMap.end() ? &itr->second : NULL; } diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index 27fca9de326..97598e87f8e 100755 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -34,7 +34,7 @@ TalentSpellPos const* GetTalentSpellPos(uint32 spellId); int32 GetAreaFlagByAreaID(uint32 area_id); // -1 if not found AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id); -AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id); +AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id); uint32 GetAreaFlagByMapId(uint32 mapid); WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid); @@ -54,7 +54,7 @@ bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredT void Zone2MapCoordinates(float &x, float &y, uint32 zone); void Map2ZoneCoordinates(float &x, float &y, uint32 zone); -typedef std::map<uint32/*pair32(map,diff)*/,MapDifficulty> MapDifficultyMap; +typedef std::map<uint32/*pair32(map, diff)*/, MapDifficulty> MapDifficultyMap; MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty); MapDifficulty const* GetDownscaledMapDifficultyData(uint32 mapId, Difficulty &difficulty); diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index b35516ebfa4..ded277dfbe6 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -32,11 +32,11 @@ // Structures using to access raw DBC data and required packing to portability -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif struct AchievementEntry @@ -254,13 +254,13 @@ struct AchievementCriteriaEntry // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING = 38 struct { - uint32 teamtype; // 3 {2,3,5} + uint32 teamtype; // 3 {2, 3, 5} } highest_team_rating; // ACHIEVEMENT_CRITERIA_TYPE_REACH_TEAM_RATING = 39 struct { - uint32 teamtype; // 3 {2,3,5} + uint32 teamtype; // 3 {2, 3, 5} uint32 teamrating; // 4 } reach_team_rating; @@ -1214,7 +1214,7 @@ struct MapEntry float entrance_x; // 60 entrance x coordinate (if exist single entry) float entrance_y; // 61 entrance y coordinate (if exist single entry) // 62 -1, 0 and 720 - uint32 addon; // 63 (0-original maps,1-tbc addon) + uint32 addon; // 63 (0-original maps, 1-tbc addon) uint32 unk_time; // 64 some kind of time? //uint32 maxPlayers; // 65 max players @@ -1584,9 +1584,9 @@ struct SpellEntry }; typedef std::set<uint32> SpellCategorySet; -typedef std::map<uint32,SpellCategorySet > SpellCategoryStore; +typedef std::map<uint32, SpellCategorySet > SpellCategoryStore; typedef std::set<uint32> PetFamilySpellsSet; -typedef std::map<uint32,PetFamilySpellsSet > PetFamilySpellsStore; +typedef std::map<uint32, PetFamilySpellsSet > PetFamilySpellsStore; struct SpellCastTimesEntry { @@ -1599,7 +1599,7 @@ struct SpellCastTimesEntry struct SpellDifficultyEntry { uint32 ID; // 0 - int32 SpellID[MAX_DIFFICULTY]; // 1-4 instance modes: 10N,25N,10H,25H or Normal/Heroic if only 1-2 is set, if 3-4 is 0 then Mode-2 + int32 SpellID[MAX_DIFFICULTY]; // 1-4 instance modes: 10N, 25N, 10H, 25H or Normal/Heroic if only 1-2 is set, if 3-4 is 0 then Mode-2 }; struct SpellFocusObjectEntry @@ -1920,7 +1920,7 @@ struct WorldMapAreaEntry float x1; // 6 float x2; // 7 int32 virtual_map_id; // 8 -1 (map_id have correct map) other: virtual map where zone show (map_id - where zone in fact internally) - // int32 dungeonMap_id; // 9 pointer to DungeonMap.dbc (owerride x1,x2,y1,y2 coordinates) + // int32 dungeonMap_id; // 9 pointer to DungeonMap.dbc (owerride x1, x2, y1, y2 coordinates) // uint32 someMapID; // 10 }; @@ -1974,18 +1974,18 @@ struct TalentSpellPos uint8 rank; }; -typedef std::map<uint32,TalentSpellPos> TalentSpellPosMap; +typedef std::map<uint32, TalentSpellPos> TalentSpellPosMap; struct TaxiPathBySourceAndDestination { - TaxiPathBySourceAndDestination() : ID(0),price(0) {} - TaxiPathBySourceAndDestination(uint32 _id,uint32 _price) : ID(_id),price(_price) {} + TaxiPathBySourceAndDestination() : ID(0), price(0) {} + TaxiPathBySourceAndDestination(uint32 _id, uint32 _price) : ID(_id), price(_price) {} uint32 ID; uint32 price; }; -typedef std::map<uint32,TaxiPathBySourceAndDestination> TaxiPathSetForSource; -typedef std::map<uint32,TaxiPathSetForSource> TaxiPathSetBySource; +typedef std::map<uint32, TaxiPathBySourceAndDestination> TaxiPathSetForSource; +typedef std::map<uint32, TaxiPathSetForSource> TaxiPathSetBySource; struct TaxiPathNodePtr { @@ -1995,7 +1995,7 @@ struct TaxiPathNodePtr operator TaxiPathNodeEntry const& () const { return *i_ptr; } }; -typedef Path<TaxiPathNodePtr,TaxiPathNodeEntry const> TaxiPathNodeList; +typedef Path<TaxiPathNodePtr, TaxiPathNodeEntry const> TaxiPathNodeList; typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath; #define TaxiMaskSize 14 diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 827da373ac7..ae4c7ebe263 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -785,7 +785,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposal*& pProposal) uint64 frontGuid = check.front(); check.pop_front(); - // Check all-but-new compatibilities (New,A,B,C,D) --> check(A,B,C,D) + // Check all-but-new compatibilities (New, A, B, C, D) --> check(A, B, C, D) if (!CheckCompatibility(check, pProposal)) // Group not compatible { sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::CheckCompatibility: (%s) not compatibles (%s not compatibles)", strGuids.c_str(), ConcatenateGuids(check).c_str()); @@ -1140,7 +1140,7 @@ LfgAnswer LFGMgr::GetCompatibles(std::string key) /** Given a list of dungeons remove the dungeons players have restrictions. - @param[in,out] dungeons Dungeons to check restrictions + @param[in, out] dungeons Dungeons to check restrictions @param[in] players Set of players to check their dungeon restrictions @param[out] lockMap Map of players Lock status info of given dungeons (Empty if dungeons is not empty) */ @@ -1795,8 +1795,8 @@ void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player) return; // if we can take the quest, means that we haven't done this kind of "run", IE: First Heroic Random of Day. - if (player->CanRewardQuest(qReward,false)) - player->RewardQuest(qReward,0,NULL,false); + if (player->CanRewardQuest(qReward, false)) + player->RewardQuest(qReward, 0, NULL, false); else { index = 1; @@ -1804,11 +1804,11 @@ void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player) if (!qReward) return; // we give reward without informing client (retail does this) - player->RewardQuest(qReward,0,NULL,false); + player->RewardQuest(qReward, 0, NULL, false); } // Give rewards - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RewardDungeonDoneFor: [" UI64FMTD "] done dungeon %u,%s previously done.", player->GetGUID(), GetDungeon(gguid), index > 0 ? " " : " not"); + sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RewardDungeonDoneFor: [" UI64FMTD "] done dungeon %u, %s previously done.", player->GetGUID(), GetDungeon(gguid), index > 0 ? " " : " not"); player->GetSession()->SendLfgPlayerReward(dungeon->Entry(), GetDungeon(gguid, false), index, reward, qReward); } diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index 792641acbba..d977aed0719 100755 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -77,11 +77,11 @@ class Corpse : public WorldObject, public GridObject<Corpse> Player* lootRecipient; bool lootForBody; - void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } - void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } - void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } - void Whisper(int32 textId,uint64 receiver) { MonsterWhisper(textId,receiver); } - void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); } + void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId, language, TargetGuid); } + void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId, language, TargetGuid); } + void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId, TargetGuid); } + void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId, receiver); } + void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId, language, TargetGuid); } bool IsExpired(time_t t) const; diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index a53e5de6ebe..aaa6b9e7713 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -92,7 +92,7 @@ uint32 CreatureTemplate::GetRandomValidModelId() const if (Modelid3) modelIDs[c++] = Modelid3; if (Modelid4) modelIDs[c++] = Modelid4; - return ((c>0) ? modelIDs[urand(0,c-1)] : 0); + return ((c>0) ? modelIDs[urand(0, c-1)] : 0); } uint32 CreatureTemplate::GetFirstValidModelId() const @@ -243,10 +243,10 @@ void Creature::RemoveCorpse(bool setSpawnTime) if(setSpawnTime) m_respawnTime = time(NULL) + respawnDelay; - float x,y,z,o; + float x, y, z, o; GetRespawnCoord(x, y, z, &o); - SetHomePosition(x,y,z,o); - GetMap()->CreatureRelocation(this,x,y,z,o); + SetHomePosition(x, y, z, o); + GetMap()->CreatureRelocation(this, x, y, z, o); } /** @@ -289,13 +289,13 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data // equal to player Race field, but creature does not have race SetByteValue(UNIT_FIELD_BYTES_0, 0, 0); - // known valid are: CLASS_WARRIOR,CLASS_PALADIN,CLASS_ROGUE,CLASS_MAGE + // known valid are: CLASS_WARRIOR, CLASS_PALADIN, CLASS_ROGUE, CLASS_MAGE SetByteValue(UNIT_FIELD_BYTES_0, 1, uint8(cinfo->unit_class)); // Cancel load if no model defined if (!(cinfo->GetFirstValidModelId())) { - sLog->outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ",Entry); + sLog->outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ", Entry); return false; } @@ -303,7 +303,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID); if (!minfo) // Cancel load if no model defined { - sLog->outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ",Entry); + sLog->outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ", Entry); return false; } @@ -319,8 +319,8 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data SetName(normalInfo->Name); // at normal entry always - SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS,minfo->bounding_radius); - SetFloatValue(UNIT_FIELD_COMBATREACH,minfo->combat_reach); + SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); + SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f); @@ -344,7 +344,7 @@ bool Creature::InitEntry(uint32 Entry, uint32 /*team*/, const CreatureData *data bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data) { - if (!InitEntry(Entry,team,data)) + if (!InitEntry(Entry, team, data)) return false; CreatureTemplate const* cInfo = GetCreatureInfo(); @@ -370,7 +370,7 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data) SetAttackTime(BASE_ATTACK, cInfo->baseattacktime); SetAttackTime(OFF_ATTACK, cInfo->baseattacktime); - SetAttackTime(RANGED_ATTACK,cInfo->rangeattacktime); + SetAttackTime(RANGED_ATTACK, cInfo->rangeattacktime); SetUInt32Value(UNIT_FIELD_FLAGS, unit_flags); @@ -410,7 +410,7 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data) if (cInfo->flags_extra & CREATURE_FLAG_EXTRA_NO_TAUNT) { ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } // TODO: In fact monster move flags should be set - not movement flags. @@ -437,11 +437,11 @@ void Creature::Update(uint32 diff) { case JUST_ALIVED: // Don't must be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting. - sLog->outError("Creature (GUID: %u Entry: %u) in wrong state: JUST_ALIVED (4)",GetGUIDLow(),GetEntry()); + sLog->outError("Creature (GUID: %u Entry: %u) in wrong state: JUST_ALIVED (4)", GetGUIDLow(), GetEntry()); break; case JUST_DIED: // Don't must be called, see Creature::setDeathState JUST_DIED -> CORPSE promoting. - sLog->outError("Creature (GUID: %u Entry: %u) in wrong state: JUST_DEAD (1)",GetGUIDLow(),GetEntry()); + sLog->outError("Creature (GUID: %u Entry: %u) in wrong state: JUST_DEAD (1)", GetGUIDLow(), GetEntry()); break; case DEAD: { @@ -462,7 +462,7 @@ void Creature::Update(uint32 diff) if (targetGuid == GetGUID()) // if linking self, never respawn (check delayed to next day) SetRespawnTime(DAY); else - m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime)+urand(5,MINUTE); // else copy time from master and add a little + m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime)+urand(5, MINUTE); // else copy time from master and add a little SaveRespawnTime(); // also save to DB immediately } } @@ -687,7 +687,7 @@ void Creature::DoFleeToGetAssistance() UpdateSpeed(MOVE_RUN, false); if (!pCreature) - //SetFeared(true, getVictim()->GetGUID(), 0 ,sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); + //SetFeared(true, getVictim()->GetGUID(), 0 , sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY)); //TODO: use 31365 SetControlled(true, UNIT_STAT_FLEEING); else @@ -737,7 +737,7 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, { ASSERT(map); SetMap(map); - SetPhaseMask(phaseMask,false); + SetPhaseMask(phaseMask, false); CreatureTemplate const *cinfo = sObjectMgr->GetCreatureTemplate(Entry); if (!cinfo) @@ -828,7 +828,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const if ((!trainer_spells || trainer_spells->spellList.empty()) && GetCreatureInfo()->trainer_type != TRAINER_TYPE_PETS) { sLog->outErrorDb("Creature %u (Entry: %u) have UNIT_NPC_FLAG_TRAINER but have empty trainer spell list.", - GetGUIDLow(),GetEntry()); + GetGUIDLow(), GetEntry()); return false; } @@ -842,15 +842,15 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const pPlayer->PlayerTalkClass->ClearMenus(); switch(GetCreatureInfo()->trainer_class) { - case CLASS_DRUID: pPlayer->PlayerTalkClass->SendGossipMenu(4913,GetGUID()); break; - case CLASS_HUNTER: pPlayer->PlayerTalkClass->SendGossipMenu(10090,GetGUID()); break; - case CLASS_MAGE: pPlayer->PlayerTalkClass->SendGossipMenu(328,GetGUID()); break; - case CLASS_PALADIN:pPlayer->PlayerTalkClass->SendGossipMenu(1635,GetGUID()); break; - case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu(4436,GetGUID()); break; - case CLASS_ROGUE: pPlayer->PlayerTalkClass->SendGossipMenu(4797,GetGUID()); break; - case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5003,GetGUID()); break; - case CLASS_WARLOCK:pPlayer->PlayerTalkClass->SendGossipMenu(5836,GetGUID()); break; - case CLASS_WARRIOR:pPlayer->PlayerTalkClass->SendGossipMenu(4985,GetGUID()); break; + case CLASS_DRUID: pPlayer->PlayerTalkClass->SendGossipMenu(4913, GetGUID()); break; + case CLASS_HUNTER: pPlayer->PlayerTalkClass->SendGossipMenu(10090, GetGUID()); break; + case CLASS_MAGE: pPlayer->PlayerTalkClass->SendGossipMenu(328, GetGUID()); break; + case CLASS_PALADIN:pPlayer->PlayerTalkClass->SendGossipMenu(1635, GetGUID()); break; + case CLASS_PRIEST: pPlayer->PlayerTalkClass->SendGossipMenu(4436, GetGUID()); break; + case CLASS_ROGUE: pPlayer->PlayerTalkClass->SendGossipMenu(4797, GetGUID()); break; + case CLASS_SHAMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5003, GetGUID()); break; + case CLASS_WARLOCK:pPlayer->PlayerTalkClass->SendGossipMenu(5836, GetGUID()); break; + case CLASS_WARRIOR:pPlayer->PlayerTalkClass->SendGossipMenu(4985, GetGUID()); break; } } return false; @@ -860,7 +860,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const if (pPlayer->getClass() != CLASS_HUNTER) { pPlayer->PlayerTalkClass->ClearMenus(); - pPlayer->PlayerTalkClass->SendGossipMenu(3620,GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(3620, GetGUID()); return false; } break; @@ -872,16 +872,16 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const pPlayer->PlayerTalkClass->ClearMenus(); switch(GetCreatureInfo()->trainer_class) { - case RACE_DWARF: pPlayer->PlayerTalkClass->SendGossipMenu(5865,GetGUID()); break; - case RACE_GNOME: pPlayer->PlayerTalkClass->SendGossipMenu(4881,GetGUID()); break; - case RACE_HUMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5861,GetGUID()); break; - case RACE_NIGHTELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862,GetGUID()); break; - case RACE_ORC: pPlayer->PlayerTalkClass->SendGossipMenu(5863,GetGUID()); break; - case RACE_TAUREN: pPlayer->PlayerTalkClass->SendGossipMenu(5864,GetGUID()); break; - case RACE_TROLL: pPlayer->PlayerTalkClass->SendGossipMenu(5816,GetGUID()); break; - case RACE_UNDEAD_PLAYER:pPlayer->PlayerTalkClass->SendGossipMenu(624,GetGUID()); break; - case RACE_BLOODELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862,GetGUID()); break; - case RACE_DRAENEI: pPlayer->PlayerTalkClass->SendGossipMenu(5864,GetGUID()); break; + case RACE_DWARF: pPlayer->PlayerTalkClass->SendGossipMenu(5865, GetGUID()); break; + case RACE_GNOME: pPlayer->PlayerTalkClass->SendGossipMenu(4881, GetGUID()); break; + case RACE_HUMAN: pPlayer->PlayerTalkClass->SendGossipMenu(5861, GetGUID()); break; + case RACE_NIGHTELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; + case RACE_ORC: pPlayer->PlayerTalkClass->SendGossipMenu(5863, GetGUID()); break; + case RACE_TAUREN: pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; + case RACE_TROLL: pPlayer->PlayerTalkClass->SendGossipMenu(5816, GetGUID()); break; + case RACE_UNDEAD_PLAYER:pPlayer->PlayerTalkClass->SendGossipMenu(624, GetGUID()); break; + case RACE_BLOODELF: pPlayer->PlayerTalkClass->SendGossipMenu(5862, GetGUID()); break; + case RACE_DRAENEI: pPlayer->PlayerTalkClass->SendGossipMenu(5864, GetGUID()); break; } } return false; @@ -893,7 +893,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const if (msg) { pPlayer->PlayerTalkClass->ClearMenus(); - pPlayer->PlayerTalkClass->SendGossipMenu(11031,GetGUID()); + pPlayer->PlayerTalkClass->SendGossipMenu(11031, GetGUID()); } return false; } @@ -918,9 +918,9 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const pPlayer->PlayerTalkClass->ClearMenus(); switch(bgTypeId) { - case BATTLEGROUND_AV: pPlayer->PlayerTalkClass->SendGossipMenu(7616,GetGUID()); break; - case BATTLEGROUND_WS: pPlayer->PlayerTalkClass->SendGossipMenu(7599,GetGUID()); break; - case BATTLEGROUND_AB: pPlayer->PlayerTalkClass->SendGossipMenu(7642,GetGUID()); break; + case BATTLEGROUND_AV: pPlayer->PlayerTalkClass->SendGossipMenu(7616, GetGUID()); break; + case BATTLEGROUND_WS: pPlayer->PlayerTalkClass->SendGossipMenu(7599, GetGUID()); break; + case BATTLEGROUND_AB: pPlayer->PlayerTalkClass->SendGossipMenu(7642, GetGUID()); break; case BATTLEGROUND_EY: case BATTLEGROUND_NA: case BATTLEGROUND_BE: @@ -928,7 +928,7 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const case BATTLEGROUND_RL: case BATTLEGROUND_SA: case BATTLEGROUND_DS: - case BATTLEGROUND_RV: pPlayer->PlayerTalkClass->SendGossipMenu(10024,GetGUID()); break; + case BATTLEGROUND_RV: pPlayer->PlayerTalkClass->SendGossipMenu(10024, GetGUID()); break; default: break; } return false; @@ -1097,26 +1097,26 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) std::ostringstream ss; ss << "INSERT INTO creature VALUES (" - << m_DBTableGuid << "," - << GetEntry() << "," - << mapid <<"," - << uint32(spawnMask) << "," // cast to prevent save as symbol - << uint16(GetPhaseMask()) << "," // prevent out of range error - << displayId <<"," - << GetEquipmentId() <<"," - << GetPositionX() << "," - << GetPositionY() << "," - << GetPositionZ() << "," - << GetOrientation() << "," - << m_respawnDelay << "," //respawn time - << (float) m_respawnradius << "," //spawn distance (float) - << (uint32) (0) << "," //currentwaypoint - << GetHealth() << "," //curhealth - << GetPower(POWER_MANA) << "," //curmana - << (m_isDeadByDefault ? 1 : 0) << "," //is_dead - << GetDefaultMovementType() << "," //default movement generator type - << npcflag << "," - << unit_flags << "," + << m_DBTableGuid << ", " + << GetEntry() << ", " + << mapid <<", " + << uint32(spawnMask) << ", " // cast to prevent save as symbol + << uint16(GetPhaseMask()) << ", " // prevent out of range error + << displayId <<", " + << GetEquipmentId() <<", " + << GetPositionX() << ", " + << GetPositionY() << ", " + << GetPositionZ() << ", " + << GetOrientation() << ", " + << m_respawnDelay << ", " //respawn time + << (float) m_respawnradius << ", " //spawn distance (float) + << (uint32) (0) << ", " //currentwaypoint + << GetHealth() << ", " //curhealth + << GetPower(POWER_MANA) << ", " //curmana + << (m_isDeadByDefault ? 1 : 0) << ", " //is_dead + << GetDefaultMovementType() << ", " //default movement generator type + << npcflag << ", " + << unit_flags << ", " << dynamicflags << ")"; trans->Append(ss.str().c_str()); @@ -1165,8 +1165,8 @@ void Creature::SelectLevel(const CreatureTemplate *cinfo) SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod); SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod); - SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,cinfo->minrangedmg * damagemod); - SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,cinfo->maxrangedmg * damagemod); + SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, cinfo->minrangedmg * damagemod); + SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, cinfo->maxrangedmg * damagemod); SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, cinfo->attackpower * damagemod); @@ -1268,25 +1268,25 @@ bool Creature::LoadFromDB(uint32 guid, Map *map) if (!data) { - sLog->outErrorDb("Creature (GUID: %u) not found in table `creature`, can't load. ",guid); + sLog->outErrorDb("Creature (GUID: %u) not found in table `creature`, can't load. ", guid); return false; } m_DBTableGuid = guid; if (map->GetInstanceId() == 0) { - if (map->GetCreature(MAKE_NEW_GUID(guid,data->id,HIGHGUID_UNIT))) + if (map->GetCreature(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT))) return false; } else guid = sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT); uint16 team = 0; - if (!Create(guid,map,data->phaseMask,data->id,0,team,data->posX,data->posY,data->posZ,data->orientation,data)) + if (!Create(guid, map, data->phaseMask, data->id, 0, team, data->posX, data->posY, data->posZ, data->orientation, data)) return false; //We should set first home position, because then AI calls home movement - SetHomePosition(data->posX,data->posY,data->posZ,data->orientation); + SetHomePosition(data->posX, data->posY, data->posZ, data->orientation); m_respawnradius = data->spawndist; @@ -1294,15 +1294,15 @@ bool Creature::LoadFromDB(uint32 guid, Map *map) m_isDeadByDefault = data->is_dead; m_deathState = m_isDeadByDefault ? DEAD : ALIVE; - m_respawnTime = sObjectMgr->GetCreatureRespawnTime(m_DBTableGuid,GetInstanceId()); + m_respawnTime = sObjectMgr->GetCreatureRespawnTime(m_DBTableGuid, GetInstanceId()); if (m_respawnTime) // respawn on Update { m_deathState = DEAD; if (canFly()) { - float tz = map->GetHeight(data->posX,data->posY,data->posZ,false); + float tz = map->GetHeight(data->posX, data->posY, data->posZ, false); if (data->posZ - tz > 0.1) - Relocate(data->posX,data->posY,tz); + Relocate(data->posX, data->posY, tz); } } @@ -1317,12 +1317,12 @@ bool Creature::LoadFromDB(uint32 guid, Map *map) if (curhealth < 1) curhealth = 1; } - SetPower(POWER_MANA,data->curmana); + SetPower(POWER_MANA, data->curmana); } else { curhealth = GetMaxHealth(); - SetPower(POWER_MANA,GetMaxPower(POWER_MANA)); + SetPower(POWER_MANA, GetMaxPower(POWER_MANA)); } SetHealth(m_deathState == ALIVE ? curhealth : 0); @@ -1507,7 +1507,7 @@ void Creature::setDeathState(DeathState s) if (s == JUST_DIED) { - SetUInt64Value(UNIT_FIELD_TARGET,0); // remove target selection in any cases (can be set at aura remove in Unit::setDeathState) + SetUInt64Value(UNIT_FIELD_TARGET, 0); // remove target selection in any cases (can be set at aura remove in Unit::setDeathState) SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE); setActive(false); @@ -1823,7 +1823,7 @@ Unit* Creature::SelectNearestTargetInAttackDistance(float dist) const Unit *target = NULL; if (dist > ATTACK_DISTANCE) - sLog->outError("Creature (GUID: %u Entry: %u) SelectNearestTargetInAttackDistance called with dist > ATTACK_DISTANCE. Extra distance ignored.",GetGUIDLow(),GetEntry()); + sLog->outError("Creature (GUID: %u Entry: %u) SelectNearestTargetInAttackDistance called with dist > ATTACK_DISTANCE. Extra distance ignored.", GetGUIDLow(), GetEntry()); { Trinity::NearestHostileUnitInAttackDistanceCheck u_check(this, dist); @@ -1995,7 +1995,7 @@ void Creature::SaveRespawnTime() if (isSummon() || !m_DBTableGuid || (m_creatureData && !m_creatureData->dbData)) return; - sObjectMgr->SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime); + sObjectMgr->SaveCreatureRespawnTime(m_DBTableGuid, GetInstanceId(), m_respawnTime); } // this should not be called by petAI or @@ -2115,9 +2115,9 @@ void Creature::SendZoneUnderAttackMessage(Player* attacker) { uint32 enemy_team = attacker->GetTeam(); - WorldPacket data(SMSG_ZONE_UNDER_ATTACK,4); + WorldPacket data(SMSG_ZONE_UNDER_ATTACK, 4); data << (uint32)GetAreaId(); - sWorld->SendGlobalMessage(&data,NULL,(enemy_team == ALLIANCE ? HORDE : ALLIANCE)); + sWorld->SendGlobalMessage(&data, NULL, (enemy_team == ALLIANCE ? HORDE : ALLIANCE)); } void Creature::SetInCombatWithZone() @@ -2351,7 +2351,7 @@ uint32 Creature::UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 us if (itr == m_vendorItemCounts.end()) { uint32 new_count = vItem->maxcount > used_count ? vItem->maxcount-used_count : 0; - m_vendorItemCounts.push_back(VendorItemCount(vItem->item,new_count)); + m_vendorItemCounts.push_back(VendorItemCount(vItem->item, new_count)); return new_count; } diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 5f9f221ddac..9d087ecafcf 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -64,11 +64,11 @@ enum CreatureFlagsExtra CREATURE_FLAG_EXTRA_NO_SKILLGAIN | CREATURE_FLAG_EXTRA_TAUNT_DIMINISH | CREATURE_FLAG_EXTRA_ALL_DIMINISH | \ CREATURE_FLAG_EXTRA_GUARD) -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif #define MAX_KILL_CREDIT 2 @@ -401,7 +401,7 @@ struct TrainerSpellData TrainerSpell const* Find(uint32 spell_id) const; }; -typedef std::map<uint32,time_t> CreatureSpellCooldowns; +typedef std::map<uint32, time_t> CreatureSpellCooldowns; // max different by z coordinate for creature aggro reaction #define CREATURE_Z_ATTACK_RANGE 3 @@ -534,11 +534,11 @@ class Creature : public Unit, public GridObject<Creature> std::string GetScriptName() const; uint32 GetScriptId() const; - void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } - void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } - void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); } - void Whisper(int32 textId, uint64 receiver, bool IsBossWhisper = false) { MonsterWhisper(textId,receiver,IsBossWhisper); } - void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); } + void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId, language, TargetGuid); } + void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId, language, TargetGuid); } + void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId, TargetGuid, IsBossEmote); } + void Whisper(int32 textId, uint64 receiver, bool IsBossWhisper = false) { MonsterWhisper(textId, receiver, IsBossWhisper); } + void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId, language, TargetGuid); } // override WorldObject function for proper name localization const char* GetNameForLocaleIdx(LocaleConstant locale_idx) const; diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index e39b8f90dff..75e665feac0 100755 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -70,7 +70,7 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, bool Coded) void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, bool Coded) { - AddMenuItem(Icon, std::string(Message ? Message : ""),Coded); + AddMenuItem(Icon, std::string(Message ? Message : ""), Coded); } void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, uint32 dtSender, uint32 dtAction, char const* BoxMessage, uint32 BoxMoney, bool Coded) @@ -206,7 +206,7 @@ void PlayerMenu::SendPointOfInterest(uint32 poi_id) PointOfInterest const* poi = sObjectMgr->GetPointOfInterest(poi_id); if (!poi) { - sLog->outErrorDb("Request to send non-existing POI (Id: %u), ignored.",poi_id); + sLog->outErrorDb("Request to send non-existing POI (Id: %u), ignored.", poi_id); return; } diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 62174fe8c9c..92c57009832 100755 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -159,7 +159,7 @@ void TempSummon::Update(uint32 diff) } default: UnSummon(); - sLog->outError("Temporary summoned creature (entry: %u) have unknown type %u of ",GetEntry(),m_type); + sLog->outError("Temporary summoned creature (entry: %u) have unknown type %u of ", GetEntry(), m_type); break; } } diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 70e92bd06d7..444b4170104 100755 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -84,7 +84,7 @@ bool DynamicObject::Create(uint32 guidlow, Unit* caster, uint32 spellId, Positio Relocate(pos); if (!IsPositionValid()) { - sLog->outError("DynamicObject (spell %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",spellId,GetPositionX(),GetPositionY()); + sLog->outError("DynamicObject (spell %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", spellId, GetPositionX(), GetPositionY()); return false; } diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h index 77479234ce3..540e4c06113 100755 --- a/src/server/game/Entities/DynamicObject/DynamicObject.h +++ b/src/server/game/Entities/DynamicObject/DynamicObject.h @@ -61,7 +61,7 @@ class DynamicObject : public WorldObject, public GridObject<DynamicObject> void Say(int32 textId, uint32 language, uint64 targetGuid) { MonsterSay(textId, language, targetGuid); } void Yell(int32 textId, uint32 language, uint64 targetGuid) { MonsterYell(textId, language, targetGuid); } void TextEmote(int32 textId, uint64 targetGuid) { MonsterTextEmote(textId, targetGuid); } - void Whisper(int32 textId,uint64 receiver) { MonsterWhisper(textId, receiver); } + void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId, receiver); } void YellToZone(int32 textId, uint32 language, uint64 targetGuid) { MonsterYellToZone(textId, language, targetGuid); } protected: diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 003c693216d..af7fe560d9d 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -100,10 +100,10 @@ void GameObject::CleanupsBeforeDelete(bool /*finalCleanup*/) // Possible crash at access to deleted GO in Unit::m_gameobj if (uint64 owner_guid = GetOwnerGUID()) { - Unit* owner = ObjectAccessor::GetUnit(*this,owner_guid); + Unit* owner = ObjectAccessor::GetUnit(*this, owner_guid); if (owner) - owner->RemoveGameObject(this,false); + owner->RemoveGameObject(this, false); else { const char * ownerType = "creature"; @@ -144,9 +144,9 @@ void GameObject::RemoveFromWorld() if (uint64 owner_guid = GetOwnerGUID()) { if (Unit * owner = GetOwner()) - owner->RemoveGameObject(this,false); + owner->RemoveGameObject(this, false); else - sLog->outError("Delete GameObject (GUID: %u Entry: %u) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->entry,GUID_LOPART(owner_guid)); + sLog->outError("Delete GameObject (GUID: %u Entry: %u) that have references in not found creature %u GO list. Crash possible later.", GetGUIDLow(), GetGOInfo()->entry, GUID_LOPART(owner_guid)); } WorldObject::RemoveFromWorld(); sObjectAccessor->RemoveObject(this); @@ -158,14 +158,14 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa ASSERT(map); SetMap(map); - Relocate(x,y,z,ang); + Relocate(x, y, z, ang); if (!IsPositionValid()) { - sLog->outError("Gameobject (GUID: %u Entry: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,name_id,x,y); + sLog->outError("Gameobject (GUID: %u Entry: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", guidlow, name_id, x, y); return false; } - SetPhaseMask(phaseMask,false); + SetPhaseMask(phaseMask, false); SetZoneScript(); if (m_zoneScript) @@ -178,7 +178,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(name_id); if (!goinfo) { - sLog->outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist entry in `gameobject_template`. Map: %u (X: %f Y: %f Z: %f) ang: %f rotation0: %f rotation1: %f rotation2: %f rotation3: %f",guidlow, name_id, map->GetId(), x, y, z, ang, rotation0, rotation1, rotation2, rotation3); + sLog->outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist entry in `gameobject_template`. Map: %u (X: %f Y: %f Z: %f) ang: %f rotation0: %f rotation1: %f rotation2: %f rotation3: %f", guidlow, name_id, map->GetId(), x, y, z, ang, rotation0, rotation1, rotation2, rotation3); return false; } @@ -188,14 +188,14 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa if (goinfo->type >= MAX_GAMEOBJECT_TYPE) { - sLog->outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist GO type '%u' in `gameobject_template`. It's will crash client if created.",guidlow,name_id,goinfo->type); + sLog->outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist GO type '%u' in `gameobject_template`. It's will crash client if created.", guidlow, name_id, goinfo->type); return false; } SetFloatValue(GAMEOBJECT_PARENTROTATION+0, rotation0); SetFloatValue(GAMEOBJECT_PARENTROTATION+1, rotation1); - UpdateRotationFields(rotation2,rotation3); // GAMEOBJECT_FACING, GAMEOBJECT_ROTATION, GAMEOBJECT_PARENTROTATION+2/3 + UpdateRotationFields(rotation2, rotation3); // GAMEOBJECT_FACING, GAMEOBJECT_ROTATION, GAMEOBJECT_PARENTROTATION+2/3 SetFloatValue(OBJECT_FIELD_SCALE_X, goinfo->size); @@ -302,7 +302,7 @@ void GameObject::Update(uint32 diff) UpdateData udata; WorldPacket packet; - BuildValuesUpdateBlockForPlayer(&udata,caster->ToPlayer()); + BuildValuesUpdateBlockForPlayer(&udata, caster->ToPlayer()); udata.BuildPacket(&packet); caster->ToPlayer()->GetSession()->SendPacket(&packet); @@ -334,7 +334,7 @@ void GameObject::Update(uint32 diff) if (targetGuid == GetGUID()) // if linking self, never respawn (check delayed to next day) SetRespawnTime(DAY); else - m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime)+urand(5,MINUTE); // else copy time from master and add a little + m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime)+urand(5, MINUTE); // else copy time from master and add a little SaveRespawnTime(); // also save to DB immediately return; } @@ -352,7 +352,7 @@ void GameObject::Update(uint32 diff) { caster->FinishSpell(CURRENT_CHANNELED_SPELL); - WorldPacket data(SMSG_FISH_ESCAPED,0); + WorldPacket data(SMSG_FISH_ESCAPED, 0); caster->ToPlayer()->GetSession()->SendPacket(&data); } // can be delete @@ -629,12 +629,12 @@ void GameObject::getFishLoot(Loot *fishloot, Player* loot_owner) fishloot->clear(); uint32 zone, subzone; - GetZoneAndAreaId(zone,subzone); + GetZoneAndAreaId(zone, subzone); // if subzone loot exist use it if (!fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner, true, true)) // else use zone loot (must exist in like case) - fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner,true); + fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner, true); } void GameObject::SaveToDB() @@ -687,8 +687,8 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask) << m_DBTableGuid << ", " << GetEntry() << ", " << mapid << ", " - << uint32(spawnMask) << "," // cast to prevent save as symbol - << uint16(GetPhaseMask()) << "," // prevent out of range error + << uint32(spawnMask) << ", " // cast to prevent save as symbol + << uint16(GetPhaseMask()) << ", " // prevent out of range error << GetPositionX() << ", " << GetPositionY() << ", " << GetPositionZ() << ", " @@ -713,7 +713,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map) if (!data) { - sLog->outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ",guid); + sLog->outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ", guid); return false; } @@ -737,7 +737,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map) m_DBTableGuid = guid; if (map->GetInstanceId() != 0) guid = sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT); - if (!Create(guid,entry, map, phaseMask, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state, artKit)) + if (!Create(guid, entry, map, phaseMask, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state, artKit)) return false; if (data->spawntimesecs >= 0) @@ -838,7 +838,7 @@ Unit* GameObject::GetOwner() const void GameObject::SaveRespawnTime() { if (m_goData && m_goData->dbData && m_respawnTime > time(NULL) && m_spawnedByDefault) - sObjectMgr->SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime); + sObjectMgr->SaveGORespawnTime(m_DBTableGuid, GetInstanceId(), m_respawnTime); } bool GameObject::isAlwaysVisibleFor(WorldObject const* seer) const @@ -892,7 +892,7 @@ bool GameObject::ActivateToQuest(Player *pTarget) const //look for battlegroundAV for some objects which are only activated after mine gots captured by own team if (GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S) if (Battleground *bg = pTarget->GetBattleground()) - if (bg->GetTypeID(true) == BATTLEGROUND_AV && !(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(),pTarget->GetTeam()))) + if (bg->GetTypeID(true) == BATTLEGROUND_AV && !(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(), pTarget->GetTeam()))) return false; return true; } @@ -947,8 +947,8 @@ void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target) Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*target,trapEntry,range); - Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO,go_check); + Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*target, trapEntry, range); + Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO, go_check); TypeContainerVisitor<Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer > object_checker(checker); cell.Visit(p, object_checker, *GetMap(), *target, range); @@ -963,7 +963,7 @@ GameObject* GameObject::LookupFishingHoleAround(float range) { GameObject* ok = NULL; - CellPair p(Trinity::ComputeCellPair(GetPositionX(),GetPositionY())); + CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; Trinity::NearestGameObjectFishingHole u_check(*this, range); @@ -993,7 +993,7 @@ void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = f if (!time_to_restore) time_to_restore = GetGOInfo()->GetAutoCloseTime(); - SwitchDoorOrButton(true,alternative); + SwitchDoorOrButton(true, alternative); SetLootState(GO_ACTIVATED); m_cooldownTime = time(NULL) + time_to_restore; @@ -1161,7 +1161,7 @@ void GameObject::Use(Unit* user) if (itr != ChairListSlots.end()) { itr->second = player->GetGUID(); //this slot in now used by player - player->TeleportTo(GetMapId(), x_lowest, y_lowest, GetPositionZ(), GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET); + player->TeleportTo(GetMapId(), x_lowest, y_lowest, GetPositionZ(), GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET); player->SetStandState(UNIT_STAND_STATE_SIT_LOW_CHAIR+info->chair.height); return; } @@ -1269,7 +1269,7 @@ void GameObject::Use(Unit* user) case GO_READY: // ready for loot { uint32 zone, subzone; - GetZoneAndAreaId(zone,subzone); + GetZoneAndAreaId(zone, subzone); int32 zone_skill = sObjectMgr->GetFishingBaseSkillLevel(subzone); if (!zone_skill) @@ -1277,23 +1277,23 @@ void GameObject::Use(Unit* user) //provide error, no fishable zone or area should be 0 if (!zone_skill) - sLog->outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.",subzone); + sLog->outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.", subzone); int32 skill = player->GetSkillValue(SKILL_FISHING); int32 chance; if (skill < zone_skill) { - chance = int32(pow((double)skill/zone_skill,2) * 100); + chance = int32(pow((double)skill/zone_skill, 2) * 100); if (chance < 1) chance = 1; } else chance = 100; - int32 roll = irand(1,100); + int32 roll = irand(1, 100); - sLog->outStaticDebug("Fishing check (skill: %i zone min skill: %i chance %i roll: %i",skill,zone_skill,chance,roll); + sLog->outStaticDebug("Fishing check (skill: %i zone min skill: %i chance %i roll: %i", skill, zone_skill, chance, roll); // but you will likely cause junk in areas that require a high fishing skill (not yet implemented) if (chance >= roll) @@ -1301,7 +1301,7 @@ void GameObject::Use(Unit* user) player->UpdateFishingSkill(); // prevent removing GO at spell cancel - player->RemoveGameObject(this,false); + player->RemoveGameObject(this, false); SetOwnerGUID(player->GetGUID()); //TODO: find reasonable value for fishing hole search @@ -1312,7 +1312,7 @@ void GameObject::Use(Unit* user) SetLootState(GO_JUST_DEACTIVATED); } else - player->SendLoot(GetGUID(),LOOT_FISHING); + player->SendLoot(GetGUID(), LOOT_FISHING); } // TODO: else: junk @@ -1571,7 +1571,7 @@ void GameObject::Use(Unit* user) Player* player = user->ToPlayer(); // fallback, will always work - player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET); + player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET); WorldPacket data(SMSG_ENABLE_BARBER_SHOP, 0); player->GetSession()->SendPacket(&data); @@ -1592,7 +1592,7 @@ void GameObject::Use(Unit* user) if (!spellInfo) { if (user->GetTypeId() != TYPEID_PLAYER || !sOutdoorPvPMgr->HandleCustomSpell(user->ToPlayer(), spellId, this)) - sLog->outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u)", spellId,GetEntry(),GetGoType()); + sLog->outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u)", spellId, GetEntry(), GetGoType()); else sLog->outDebug(LOG_FILTER_OUTDOORPVP, "WORLD: %u non-dbc spell was handled by OutdoorPvP", spellId); return; @@ -1648,7 +1648,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId) void GameObject::SendCustomAnim(uint32 anim) { - WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4); + WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM, 8+4); data << GetGUID(); data << uint32(anim); SendMessageToSet(&data, true); diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 1055342944c..2941861ef9b 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -28,11 +28,11 @@ class GameObjectAI; -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif #define MAX_GAMEOBJECT_QUEST_ITEMS 6 @@ -636,11 +636,11 @@ class GameObject : public WorldObject, public GridObject<GameObject> void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f); - void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } - void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } - void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } - void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId,receiver); } - void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); } + void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId, language, TargetGuid); } + void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId, language, TargetGuid); } + void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId, TargetGuid); } + void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId, receiver); } + void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId, language, TargetGuid); } // overwrite WorldObject function for proper name localization const char* GetNameForLocaleIdx(LocaleConstant locale_idx) const; @@ -792,7 +792,7 @@ class GameObject : public WorldObject, public GridObject<GameObject> std::set<uint32> m_unique_users; uint32 m_usetimes; - typedef std::map<uint32,uint64> ChairSlotAndUser; + typedef std::map<uint32, uint64> ChairSlotAndUser; ChairSlotAndUser ChairListSlots; uint32 m_DBTableGuid; ///< For new or temporary gameobjects is 0 for saved it is lowguid diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index f65d58b4101..2fc5ccca6ad 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -26,7 +26,7 @@ #include "ScriptMgr.h" #include "ConditionMgr.h" -void AddItemsSetItem(Player* player,Item* item) +void AddItemsSetItem(Player* player, Item* item) { ItemTemplate const* proto = item->GetTemplate(); uint32 setid = proto->ItemSet; @@ -35,7 +35,7 @@ void AddItemsSetItem(Player* player,Item* item) if (!set) { - sLog->outErrorDb("Item set %u for item (id %u) not found, mods not applied.",setid,proto->ItemId); + sLog->outErrorDb("Item set %u for item (id %u) not found, mods not applied.", setid, proto->ItemId); return; } @@ -109,7 +109,7 @@ void AddItemsSetItem(Player* player,Item* item) } } -void RemoveItemsSetItem(Player*player,ItemTemplate const *proto) +void RemoveItemsSetItem(Player*player, ItemTemplate const *proto) { uint32 setid = proto->ItemSet; @@ -117,7 +117,7 @@ void RemoveItemsSetItem(Player*player,ItemTemplate const *proto) if (!set) { - sLog->outErrorDb("Item set #%u for item #%u not found, mods not removed.",setid,proto->ItemId); + sLog->outErrorDb("Item set #%u for item #%u not found, mods not removed.", setid, proto->ItemId); return; } @@ -152,7 +152,7 @@ void RemoveItemsSetItem(Player*player,ItemTemplate const *proto) if (eff->spells[z] && eff->spells[z]->Id == set->spells[x]) { // spell can be not active if not fit form requirement - player->ApplyEquipSpell(eff->spells[z],NULL,false); + player->ApplyEquipSpell(eff->spells[z], NULL, false); eff->spells[z]=NULL; break; } @@ -272,7 +272,7 @@ bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner) SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability); for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i) - SetSpellCharges(i,itemProto->Spells[i].SpellCharges); + SetSpellCharges(i, itemProto->Spells[i].SpellCharges); SetUInt32Value(ITEM_FIELD_DURATION, abs(itemProto->Duration)); SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0); @@ -293,7 +293,7 @@ void Item::UpdateDuration(Player* owner, uint32 diff) if (!GetUInt32Value(ITEM_FIELD_DURATION)) return; - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)",GetEntry(),GetUInt32Value(ITEM_FIELD_DURATION),diff); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff); if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff) { @@ -507,7 +507,7 @@ uint32 Item::GetSkill() const static uint32 item_armor_skills[MAX_ITEM_SUBCLASS_ARMOR] = { - 0,SKILL_CLOTH,SKILL_LEATHER,SKILL_MAIL,SKILL_PLATE_MAIL,0,SKILL_SHIELD,0,0,0,0 + 0, SKILL_CLOTH, SKILL_LEATHER, SKILL_MAIL, SKILL_PLATE_MAIL, 0, SKILL_SHIELD, 0, 0, 0, 0 }; ItemTemplate const* proto = GetTemplate(); @@ -585,7 +585,7 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id) // item can have not null only one from field values if ((itemProto->RandomProperty) && (itemProto->RandomSuffix)) { - sLog->outErrorDb("Item template %u have RandomProperty == %u and RandomSuffix == %u, but must have one from field =0",itemProto->ItemId,itemProto->RandomProperty,itemProto->RandomSuffix); + sLog->outErrorDb("Item template %u have RandomProperty == %u and RandomSuffix == %u, but must have one from field =0", itemProto->ItemId, itemProto->RandomProperty, itemProto->RandomSuffix); return 0; } @@ -596,7 +596,7 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id) ItemRandomPropertiesEntry const *random_id = sItemRandomPropertiesStore.LookupEntry(randomPropId); if (!random_id) { - sLog->outErrorDb("Enchantment id #%u used but it doesn't have records in 'ItemRandomProperties.dbc'",randomPropId); + sLog->outErrorDb("Enchantment id #%u used but it doesn't have records in 'ItemRandomProperties.dbc'", randomPropId); return 0; } @@ -609,7 +609,7 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id) ItemRandomSuffixEntry const *random_id = sItemRandomSuffixStore.LookupEntry(randomPropId); if (!random_id) { - sLog->outErrorDb("Enchantment id #%u used but it doesn't have records in sItemRandomSuffixStore.",randomPropId); + sLog->outErrorDb("Enchantment id #%u used but it doesn't have records in sItemRandomSuffixStore.", randomPropId); return 0; } @@ -629,11 +629,11 @@ void Item::SetItemRandomProperties(int32 randomPropId) { if (GetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID) != int32(item_rand->ID)) { - SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID,item_rand->ID); + SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID, item_rand->ID); SetState(ITEM_CHANGED, GetOwner()); } for (uint32 i = PROP_ENCHANTMENT_SLOT_2; i < PROP_ENCHANTMENT_SLOT_2 + 3; ++i) - SetEnchantment(EnchantmentSlot(i),item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_2],0,0); + SetEnchantment(EnchantmentSlot(i), item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_2], 0, 0); } } else @@ -644,13 +644,13 @@ void Item::SetItemRandomProperties(int32 randomPropId) if (GetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID) != -int32(item_rand->ID) || !GetItemSuffixFactor()) { - SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID,-int32(item_rand->ID)); + SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID, -int32(item_rand->ID)); UpdateItemSuffixFactor(); SetState(ITEM_CHANGED, GetOwner()); } for (uint32 i = PROP_ENCHANTMENT_SLOT_0; i < PROP_ENCHANTMENT_SLOT_0 + 3; ++i) - SetEnchantment(EnchantmentSlot(i),item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_0],0,0); + SetEnchantment(EnchantmentSlot(i), item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_0], 0, 0); } } } @@ -753,7 +753,7 @@ bool Item::CanBeTraded(bool mail, bool trade) const if (Player* owner = GetOwner()) { - if (owner->CanUnequipItem(GetPos(),false) != EQUIP_ERR_OK) + if (owner->CanUnequipItem(GetPos(), false) != EQUIP_ERR_OK) return false; if (owner->GetLootGUID() == GetGUID()) return false; @@ -881,9 +881,9 @@ void Item::SetEnchantment(EnchantmentSlot slot, uint32 id, uint32 duration, uint if ((GetEnchantmentId(slot) == id) && (GetEnchantmentDuration(slot) == duration) && (GetEnchantmentCharges(slot) == charges)) return; - SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_ID_OFFSET,id); - SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET,duration); - SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET,charges); + SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_ID_OFFSET, id); + SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET, duration); + SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET, charges); SetState(ITEM_CHANGED, GetOwner()); } @@ -892,7 +892,7 @@ void Item::SetEnchantmentDuration(EnchantmentSlot slot, uint32 duration, Player* if (GetEnchantmentDuration(slot) == duration) return; - SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET,duration); + SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET, duration); SetState(ITEM_CHANGED, owner); // Cannot use GetOwner() here, has to be passed as an argument to avoid freeze due to hashtable locking } @@ -902,7 +902,7 @@ void Item::SetEnchantmentCharges(EnchantmentSlot slot, uint32 charges) if (GetEnchantmentCharges(slot) == charges) return; - SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET,charges); + SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET, charges); SetState(ITEM_CHANGED, GetOwner()); } @@ -1112,8 +1112,8 @@ void Item::SaveRefundDataToDB() { SQLTransaction trans = CharacterDatabase.BeginTransaction(); trans->PAppend("DELETE FROM item_refund_instance WHERE item_guid = '%u'", GetGUIDLow()); - trans->PAppend("INSERT INTO item_refund_instance (`item_guid`,`player_guid`,`paidMoney`,`paidExtendedCost`)" - " VALUES('%u','%u','%u','%u')", GetGUIDLow(), GetRefundRecipient(), GetPaidMoney(), GetPaidExtendedCost()); + trans->PAppend("INSERT INTO item_refund_instance (`item_guid`, `player_guid`, `paidMoney`, `paidExtendedCost`)" + " VALUES('%u', '%u', '%u', '%u')", GetGUIDLow(), GetRefundRecipient(), GetPaidMoney(), GetPaidExtendedCost()); CharacterDatabase.CommitTransaction(trans); } diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 39ac95c209f..a584be963fc 100755 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -314,7 +314,7 @@ class Item : public Object // spell charges (signed but stored as unsigned) int32 GetSpellCharges(uint8 index/*0..5*/ = 0) const { return GetInt32Value(ITEM_FIELD_SPELL_CHARGES + index); } - void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index,value); } + void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index, value); } Loot loot; bool m_lootGenerated; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index a07fbe368cb..6dcf16935cc 100755 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -90,7 +90,7 @@ uint32 GetItemEnchantMod(int32 entry) EnchantmentStore::const_iterator tab = RandomItemEnch.find(entry); if (tab == RandomItemEnch.end()) { - sLog->outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it does not have records in `item_enchantment_template` table.",entry); + sLog->outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it does not have records in `item_enchantment_template` table.", entry); return 0; } diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index 6ba6a8eb94c..94c740de1f6 100755 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -535,11 +535,11 @@ inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemS return 0; } -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif struct _Damage diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7a79c526f1e..907d62ad5e8 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -317,7 +317,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const } else { - if (flags3 & 0x8000) // probably x,y,z coords there + if (flags3 & 0x8000) // probably x, y, z coords there { *data << (float)0; *data << (float)0; @@ -1141,7 +1141,7 @@ void Object::RemoveByteFlag(uint16 index, uint8 offset, uint8 oldFlag) bool Object::PrintIndexError(uint32 index, bool set) const { - sLog->outError("Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType); + sLog->outError("Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u", (set ? "set value to" : "get value from"), index, m_valuesCount, GetTypeId(), m_objectType); // ASSERT must fail after function call return false; @@ -1349,15 +1349,15 @@ bool WorldObject::_IsWithinDist(WorldObject const* obj, float dist2compare, bool bool WorldObject::IsWithinLOSInMap(const WorldObject* obj) const { if (!IsInMap(obj)) return false; - float ox,oy,oz; - obj->GetPosition(ox,oy,oz); + float ox, oy, oz; + obj->GetPosition(ox, oy, oz); return(IsWithinLOS(ox, oy, oz)); } bool WorldObject::IsWithinLOS(float ox, float oy, float oz) const { - float x,y,z; - GetPosition(x,y,z); + float x, y, z; + GetPosition(x, y, z); VMAP::IVMapManager *vMapManager = VMAP::VMapFactory::createOrGetVMapManager(); return vMapManager->isInLineOfSight(GetMapId(), x, y, z+2.0f, ox, oy, oz+2.0f); } @@ -1571,40 +1571,40 @@ void WorldObject::GetRandomPoint(const Position &pos, float distance, float &ran Trinity::NormalizeMapCoord(rand_x); Trinity::NormalizeMapCoord(rand_y); - UpdateGroundPositionZ(rand_x,rand_y,rand_z); // update to LOS height if available + UpdateGroundPositionZ(rand_x, rand_y, rand_z); // update to LOS height if available } void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const { - float new_z = GetBaseMap()->GetHeight(x,y,z,true); + float new_z = GetBaseMap()->GetHeight(x, y, z, true); if (new_z > INVALID_HEIGHT) z = new_z+ 0.05f; // just to be sure that we are not a few pixel under the surface } bool Position::IsPositionValid() const { - return Trinity::IsValidMapCoord(m_positionX,m_positionY,m_positionZ,m_orientation); + return Trinity::IsValidMapCoord(m_positionX, m_positionY, m_positionZ, m_orientation); } void WorldObject::MonsterSay(const char* text, uint32 language, uint64 TargetGuid) { WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data,CHAT_MSG_MONSTER_SAY,text,language,GetName(),TargetGuid); - SendMessageToSetInRange(&data,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY),true); + BuildMonsterChat(&data, CHAT_MSG_MONSTER_SAY, text, language, GetName(), TargetGuid); + SendMessageToSetInRange(&data, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), true); } void WorldObject::MonsterYell(const char* text, uint32 language, uint64 TargetGuid) { WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,text,language,GetName(),TargetGuid); - SendMessageToSetInRange(&data,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL),true); + BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, text, language, GetName(), TargetGuid); + SendMessageToSetInRange(&data, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), true); } void WorldObject::MonsterTextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote) { WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data,IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE,text,LANG_UNIVERSAL,GetName(),TargetGuid); - SendMessageToSetInRange(&data,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true); + BuildMonsterChat(&data, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, text, LANG_UNIVERSAL, GetName(), TargetGuid); + SendMessageToSetInRange(&data, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), true); } void WorldObject::MonsterWhisper(const char* text, uint64 receiver, bool IsBossWhisper) @@ -1614,7 +1614,7 @@ void WorldObject::MonsterWhisper(const char* text, uint64 receiver, bool IsBossW return; WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data,IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER,text,LANG_UNIVERSAL,GetName(),receiver); + BuildMonsterChat(&data, IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL, GetName(), receiver); player->GetSession()->SendPacket(&data); } @@ -1884,10 +1884,10 @@ namespace Trinity : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) {} void operator()(WorldPacket& data, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(i_textId,loc_idx); + char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); // TODO: i_object.GetName() also must be localized? - i_object.BuildMonsterChat(&data,i_msgtype,text,i_language,i_object.GetNameForLocaleIdx(loc_idx),i_targetGUID); + i_object.BuildMonsterChat(&data, i_msgtype, text, i_language, i_object.GetNameForLocaleIdx(loc_idx), i_targetGUID); } private: @@ -1907,9 +1907,9 @@ void WorldObject::MonsterSay(int32 textId, uint32 language, uint64 TargetGuid) cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_SAY, textId,language,TargetGuid); + Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_SAY, textId, language, TargetGuid); Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY),say_do); + Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), say_do); TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY)); } @@ -1922,16 +1922,16 @@ void WorldObject::MonsterYell(int32 textId, uint32 language, uint64 TargetGuid) cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId,language,TargetGuid); + Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId, language, TargetGuid); Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL),say_do); + Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL), say_do); TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_YELL)); } void WorldObject::MonsterYellToZone(int32 textId, uint32 language, uint64 TargetGuid) { - Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId,language,TargetGuid); + Trinity::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId, language, TargetGuid); Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); uint32 zoneid = GetZoneId(); @@ -1950,9 +1950,9 @@ void WorldObject::MonsterTextEmote(int32 textId, uint64 TargetGuid, bool IsBossE cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Trinity::MonsterChatBuilder say_build(*this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId,LANG_UNIVERSAL,TargetGuid); + Trinity::MonsterChatBuilder say_build(*this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId, LANG_UNIVERSAL, TargetGuid); Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> say_do(say_build); - Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this,sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),say_do); + Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> > say_worker(this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE), say_do); TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::MonsterChatBuilder> >, WorldTypeMapContainer > message(say_worker); cell.Visit(p, message, *GetMap(), *this, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); } @@ -1967,7 +1967,7 @@ void WorldObject::MonsterWhisper(int32 textId, uint64 receiver, bool IsBossWhisp char const* text = sObjectMgr->GetTrinityString(textId, loc_idx); WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildMonsterChat(&data,IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER,text,LANG_UNIVERSAL,GetNameForLocaleIdx(loc_idx),receiver); + BuildMonsterChat(&data, IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL, GetNameForLocaleIdx(loc_idx), receiver); player->GetSession()->SendPacket(&data); } @@ -2060,7 +2060,7 @@ void WorldObject::AddObjectToRemoveList() Map* map = FindMap(); if (!map) { - sLog->outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId()); + sLog->outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).", GetTypeId(), GetEntry(), GetGUIDLow(), GetMapId()); return; } @@ -2196,7 +2196,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy pet->Relocate(x, y, z, ang); if (!pet->IsPositionValid()) { - sLog->outError("Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",pet->GetGUIDLow(),pet->GetEntry(),pet->GetPositionX(),pet->GetPositionY()); + sLog->outError("Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)", pet->GetGUIDLow(), pet->GetEntry(), pet->GetPositionX(), pet->GetPositionY()); delete pet; return NULL; } @@ -2215,7 +2215,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy pet->setPowerType(POWER_MANA); pet->SetUInt32Value(UNIT_NPC_FLAGS , 0); - pet->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + pet->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pet->InitStatsForLevel(getLevel()); SetMinion(pet, true); @@ -2287,7 +2287,7 @@ GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float } Map *map = GetMap(); GameObject *go = new GameObject(); - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, map, GetPhaseMask(), x,y,z,ang,rotation0,rotation1,rotation2,rotation3,100,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, map, GetPhaseMask(), x, y, z, ang, rotation0, rotation1, rotation2, rotation3, 100, GO_STATE_READY)) { delete go; return NULL; @@ -2385,16 +2385,16 @@ namespace Trinity if (c == i_searcher || c == &i_object) return; - float x,y,z; + float x, y, z; if (!c->isAlive() || c->HasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) || - !c->GetMotionMaster()->GetDestination(x,y,z)) + !c->GetMotionMaster()->GetDestination(x, y, z)) { x = c->GetPositionX(); y = c->GetPositionY(); } - add(c,x,y); + add(c, x, y); } template<class T> @@ -2404,19 +2404,19 @@ namespace Trinity if (u == i_searcher || u == &i_object) return; - float x,y; + float x, y; x = u->GetPositionX(); y = u->GetPositionY(); - add(u,x,y); + add(u, x, y); } // we must add used pos that can fill places around center void add(WorldObject* u, float x, float y) const { // u is too nearest/far away to i_object - if (!i_object.IsInRange2d(x,y,i_selector.m_dist - i_selector.m_size,i_selector.m_dist + i_selector.m_size)) + if (!i_object.IsInRange2d(x, y, i_selector.m_dist - i_selector.m_size, i_selector.m_dist + i_selector.m_size)) return; float angle = i_object.GetAngle(u)-i_angle; @@ -2428,8 +2428,8 @@ namespace Trinity angle += 2.0f * M_PI; // dist include size of u - float dist2d = i_object.GetDistance2d(x,y); - i_selector.AddUsedPos(u->GetObjectSize(),angle,dist2d + i_object.GetObjectSize()); + float dist2d = i_object.GetDistance2d(x, y); + i_selector.AddUsedPos(u->GetObjectSize(), angle, dist2d + i_object.GetObjectSize()); } private: WorldObject const& i_object; @@ -2453,15 +2453,15 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle) const { - GetNearPoint2D(x,y,distance2d+searcher_size,absAngle); + GetNearPoint2D(x, y, distance2d+searcher_size, absAngle); z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); + UpdateGroundPositionZ(x, y, z); /* // if detection disabled, return first point if (!sWorld->getIntConfig(CONFIG_DETECT_POS_COLLISION)) { - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available return; } @@ -2471,7 +2471,7 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float bool first_los_conflict = false; // first point LOS problems // prepare selector for work - ObjectPosSelector selector(GetPositionX(),GetPositionY(),GetObjectSize(),distance2d+searcher_size); + ObjectPosSelector selector(GetPositionX(), GetPositionY(), GetObjectSize(), distance2d+searcher_size); // adding used positions around object { @@ -2480,8 +2480,8 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Trinity::NearUsedPosDo u_do(*this,searcher,absAngle,selector); - Trinity::WorldObjectWorker<Trinity::NearUsedPosDo> worker(this,u_do); + Trinity::NearUsedPosDo u_do(*this, searcher, absAngle, selector); + Trinity::WorldObjectWorker<Trinity::NearUsedPosDo> worker(this, u_do); TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::NearUsedPosDo>, GridTypeMapContainer > grid_obj_worker(worker); TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::NearUsedPosDo>, WorldTypeMapContainer > world_obj_worker(worker); @@ -2494,9 +2494,9 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float // maybe can just place in primary position if (selector.CheckOriginal()) { - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available - if (IsWithinLOS(x,y,z)) + if (IsWithinLOS(x, y, z)) return; first_los_conflict = true; // first point have LOS problems @@ -2507,11 +2507,11 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float // special case when one from list empty and then empty side preferred if (selector.FirstAngle(angle)) { - GetNearPoint2D(x,y,distance2d,absAngle+angle); + GetNearPoint2D(x, y, distance2d, absAngle+angle); z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available - if (IsWithinLOS(x,y,z)) + if (IsWithinLOS(x, y, z)) return; } @@ -2521,11 +2521,11 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float // select in positions after current nodes (selection one by one) while (selector.NextAngle(angle)) // angle for free pos { - GetNearPoint2D(x,y,distance2d,absAngle+angle); + GetNearPoint2D(x, y, distance2d, absAngle+angle); z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available - if (IsWithinLOS(x,y,z)) + if (IsWithinLOS(x, y, z)) return; } @@ -2537,7 +2537,7 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float x = first_x; y = first_y; - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available return; } @@ -2546,11 +2546,11 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float { if (!selector.FirstAngle(angle)) // _used_ pos { - GetNearPoint2D(x,y,distance2d,absAngle+angle); + GetNearPoint2D(x, y, distance2d, absAngle+angle); z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available - if (IsWithinLOS(x,y,z)) + if (IsWithinLOS(x, y, z)) return; } } @@ -2561,11 +2561,11 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float // select in positions after current nodes (selection one by one) while (selector.NextUsedAngle(angle)) // angle for used pos but maybe without LOS problem { - GetNearPoint2D(x,y,distance2d,absAngle+angle); + GetNearPoint2D(x, y, distance2d, absAngle+angle); z = GetPositionZ(); - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available - if (IsWithinLOS(x,y,z)) + if (IsWithinLOS(x, y, z)) return; } @@ -2573,7 +2573,7 @@ void WorldObject::GetNearPoint(WorldObject const* /*searcher*/, float &x, float x = first_x; y = first_y; - UpdateGroundPositionZ(x,y,z); // update to LOS height if available + UpdateGroundPositionZ(x, y, z); // update to LOS height if available */ } @@ -2599,7 +2599,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float floor = GetMap()->GetHeight(destx, desty, pos.m_positionZ, true); destz = fabs(ground - pos.m_positionZ) <= fabs(floor - pos.m_positionZ) ? ground : floor; - bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(),pos.m_positionX,pos.m_positionY,pos.m_positionZ+0.5f,destx,desty,destz+0.5f,destx,desty,destz,-0.5f); + bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(), pos.m_positionX, pos.m_positionY, pos.m_positionZ+0.5f, destx, desty, destz+0.5f, destx, desty, destz, -0.5f); // collision occured if (col) @@ -2647,7 +2647,7 @@ void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update) void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/) { - WorldPacket data(SMSG_PLAY_OBJECT_SOUND,4+8); + WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4+8); data << uint32(sound_id); data << uint64(GetGUID()); if (target) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index eba300feb43..13e8ca29970 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -214,7 +214,7 @@ class Object void SetFloatValue(uint16 index, float value); void SetByteValue(uint16 index, uint8 offset, uint8 value); void SetUInt16Value(uint16 index, uint8 offset, uint16 value); - void SetInt16Value(uint16 index, uint8 offset, int16 value) { SetUInt16Value(index,offset,(uint16)value); } + void SetInt16Value(uint16 index, uint8 offset, int16 value) { SetUInt16Value(index, offset, (uint16)value); } void SetStatFloatValue(uint16 index, float value); void SetStatInt32Value(uint16 index, int32 value); @@ -271,21 +271,21 @@ class Object void ApplyModFlag(uint16 index, uint32 flag, bool apply) { - if (apply) SetFlag(index,flag); else RemoveFlag(index,flag); + if (apply) SetFlag(index, flag); else RemoveFlag(index, flag); } void SetFlag64(uint16 index, uint64 newFlag) { uint64 oldval = GetUInt64Value(index); uint64 newval = oldval | newFlag; - SetUInt64Value(index,newval); + SetUInt64Value(index, newval); } void RemoveFlag64(uint16 index, uint64 oldFlag) { uint64 oldval = GetUInt64Value(index); uint64 newval = oldval & ~oldFlag; - SetUInt64Value(index,newval); + SetUInt64Value(index, newval); } void ToggleFlag64(uint16 index, uint64 flag) @@ -304,7 +304,7 @@ class Object void ApplyModFlag64(uint16 index, uint64 flag, bool apply) { - if (apply) SetFlag64(index,flag); else RemoveFlag64(index,flag); + if (apply) SetFlag64(index, flag); else RemoveFlag64(index, flag); } void ClearUpdateMask(bool remove); @@ -503,7 +503,7 @@ struct MovementInfo MovementInfo() { - pos.Relocate(0,0,0,0); + pos.Relocate(0, 0, 0, 0); guid = 0; flags = 0; flags2 = 0; @@ -511,7 +511,7 @@ struct MovementInfo splineElevation = 0; pitch = j_zspeed = j_sinAngle = j_cosAngle = j_xyspeed = 0.0f; t_guid = 0; - t_pos.Relocate(0,0,0,0); + t_pos.Relocate(0, 0, 0, 0); t_seat = -1; } @@ -597,11 +597,11 @@ class WorldObject : public Object, public WorldLocation } void GetNearPoint2D(float &x, float &y, float distance, float absAngle) const; - void GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d,float absAngle) const; + void GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle) const; void GetClosePoint(float &x, float &y, float &z, float size, float distance2d = 0, float angle = 0) const { // angle calculated from current orientation - GetNearPoint(NULL,x,y,z,size,distance2d,GetOrientation() + angle); + GetNearPoint(NULL, x, y, z, size, distance2d, GetOrientation() + angle); } void MovePosition(Position &pos, float dist, float angle); void GetNearPosition(Position &pos, float dist, float angle) @@ -624,7 +624,7 @@ class WorldObject : public Object, public WorldLocation void GetContactPoint(const WorldObject* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const { // angle to face `obj` to `this` using distance includes size of `obj` - GetNearPoint(obj,x,y,z,obj->GetObjectSize(),distance2d,GetAngle(obj)); + GetNearPoint(obj, x, y, z, obj->GetObjectSize(), distance2d, GetAngle(obj)); } float GetObjectSize() const @@ -705,11 +705,11 @@ class WorldObject : public Object, public WorldLocation // use only if you will sure about placing both object at same map bool IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D = true) const { - return obj && _IsWithinDist(obj,dist2compare,is3D); + return obj && _IsWithinDist(obj, dist2compare, is3D); } bool IsWithinDistInMap(WorldObject const* obj, float dist2compare, bool is3D = true) const { - return obj && IsInMap(obj) && _IsWithinDist(obj,dist2compare,is3D); + return obj && IsInMap(obj) && _IsWithinDist(obj, dist2compare, is3D); } bool IsWithinLOS(float x, float y, float z) const; bool IsWithinLOSInMap(const WorldObject* obj) const; @@ -717,7 +717,7 @@ class WorldObject : public Object, public WorldLocation bool IsInRange(WorldObject const* obj, float minRange, float maxRange, bool is3D = true) const; bool IsInRange2d(float x, float y, float minRange, float maxRange) const; bool IsInRange3d(float x, float y, float z, float minRange, float maxRange) const; - bool isInFront(WorldObject const* target,float distance, float arc = M_PI) const; + bool isInFront(WorldObject const* target, float distance, float arc = M_PI) const; bool isInBack(WorldObject const* target, float distance, float arc = M_PI) const; bool IsInBetween(const WorldObject *obj1, const WorldObject *obj2, float size = 0) const; diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp index 84c59b3ae19..d7b8ede76f6 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.cpp +++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp @@ -18,8 +18,8 @@ #include "ObjectPosSelector.h" -ObjectPosSelector::ObjectPosSelector(float x,float y,float size,float dist) -: m_center_x(x),m_center_y(y),m_size(size),m_dist(dist) +ObjectPosSelector::ObjectPosSelector(float x, float y, float size, float dist) +: m_center_x(x), m_center_y(y), m_size(size), m_dist(dist) { m_anglestep = acos(m_dist/(m_dist+2*m_size)); @@ -53,12 +53,12 @@ ObjectPosSelector::UsedPosList::value_type const* ObjectPosSelector::nextUsedPos return &*itr; } -void ObjectPosSelector::AddUsedPos(float size,float angle,float dist) +void ObjectPosSelector::AddUsedPos(float size, float angle, float dist) { if(angle>=0) - m_UsedPosLists[USED_POS_PLUS].insert(UsedPosList::value_type(angle,UsedPos(1.0,size,dist))); + m_UsedPosLists[USED_POS_PLUS].insert(UsedPosList::value_type(angle, UsedPos(1.0, size, dist))); else - m_UsedPosLists[USED_POS_MINUS].insert(UsedPosList::value_type(-angle,UsedPos(-1.0,size,dist))); + m_UsedPosLists[USED_POS_MINUS].insert(UsedPosList::value_type(-angle, UsedPos(-1.0, size, dist))); } void ObjectPosSelector::InitializeAngle() @@ -76,9 +76,9 @@ void ObjectPosSelector::InitializeAngle() bool ObjectPosSelector::FirstAngle(float& angle) { if(m_UsedPosLists[USED_POS_PLUS].empty() && !m_UsedPosLists[USED_POS_MINUS].empty() ) - return NextAngleFor(*m_UsedPosLists[USED_POS_MINUS].begin(),1.0,USED_POS_PLUS,angle); + return NextAngleFor(*m_UsedPosLists[USED_POS_MINUS].begin(), 1.0, USED_POS_PLUS, angle); else if(m_UsedPosLists[USED_POS_MINUS].empty() && !m_UsedPosLists[USED_POS_PLUS].empty() ) - return NextAngleFor(*m_UsedPosLists[USED_POS_PLUS].begin(),-1.0,USED_POS_MINUS,angle); + return NextAngleFor(*m_UsedPosLists[USED_POS_PLUS].begin(), -1.0, USED_POS_MINUS, angle); return false; } @@ -118,9 +118,9 @@ bool ObjectPosSelector::NextPosibleAngle( float& angle ) { bool ok; if(m_smallStepOk[USED_POS_PLUS]) - ok = NextSmallStepAngle(1.0,USED_POS_PLUS,angle); + ok = NextSmallStepAngle(1.0, USED_POS_PLUS, angle); else - ok = NextAngleFor(*m_nextUsedPos[USED_POS_PLUS],1.0,USED_POS_PLUS,angle); + ok = NextAngleFor(*m_nextUsedPos[USED_POS_PLUS], 1.0, USED_POS_PLUS, angle); if(!ok) ++m_nextUsedPos[USED_POS_PLUS]; // increase. only at fail (original or checked) @@ -131,9 +131,9 @@ bool ObjectPosSelector::NextPosibleAngle( float& angle ) { bool ok; if(m_smallStepOk[USED_POS_MINUS]) - ok = NextSmallStepAngle(-1.0,USED_POS_MINUS,angle); + ok = NextSmallStepAngle(-1.0, USED_POS_MINUS, angle); else - ok = NextAngleFor(*m_nextUsedPos[USED_POS_MINUS],-1.0,USED_POS_MINUS,angle); + ok = NextAngleFor(*m_nextUsedPos[USED_POS_MINUS], -1.0, USED_POS_MINUS, angle); if(!ok) ++m_nextUsedPos[USED_POS_MINUS]; @@ -143,12 +143,12 @@ bool ObjectPosSelector::NextPosibleAngle( float& angle ) { if( m_smallStepOk[USED_POS_PLUS] && (!m_smallStepOk[USED_POS_MINUS] || m_smallStepAngle[USED_POS_PLUS] <= m_smallStepAngle[USED_POS_MINUS]) ) { - return NextSmallStepAngle(1.0,USED_POS_PLUS,angle); + return NextSmallStepAngle(1.0, USED_POS_PLUS, angle); } // -- direction less updated else if( m_smallStepOk[USED_POS_MINUS] ) { - return NextSmallStepAngle(-1.0,USED_POS_MINUS,angle); + return NextSmallStepAngle(-1.0, USED_POS_MINUS, angle); } } diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h index a06047193a1..571f4b5f556 100755 --- a/src/server/game/Entities/Object/ObjectPosSelector.h +++ b/src/server/game/Entities/Object/ObjectPosSelector.h @@ -34,7 +34,7 @@ struct ObjectPosSelector { struct UsedPos { - UsedPos(float sign_, float size_,float dist_) : sign(sign_), size(size_),dist(dist_) {} + UsedPos(float sign_, float size_, float dist_) : sign(sign_), size(size_), dist(dist_) {} float sign; @@ -42,11 +42,11 @@ struct ObjectPosSelector float dist; // dist to central point (including central point size) }; - typedef std::multimap<float,UsedPos> UsedPosList; // abs(angle)->Node + typedef std::multimap<float, UsedPos> UsedPosList; // abs(angle)->Node - ObjectPosSelector(float x,float y,float size,float dist); + ObjectPosSelector(float x, float y, float size, float dist); - void AddUsedPos(float size,float angle,float dist); + void AddUsedPos(float size, float angle, float dist); void InitializeAngle(); bool FirstAngle(float& angle); @@ -68,8 +68,8 @@ struct ObjectPosSelector bool CheckOriginal() const { - return (m_UsedPosLists[USED_POS_PLUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_PLUS].begin(),1.0,0)) && - (m_UsedPosLists[USED_POS_MINUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_MINUS].begin(),-1.0,0)); + return (m_UsedPosLists[USED_POS_PLUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_PLUS].begin(), 1.0, 0)) && + (m_UsedPosLists[USED_POS_MINUS].empty() || CheckAngle( *m_UsedPosLists[USED_POS_MINUS].begin(), -1.0, 0)); } bool IsNonBalanced() const { return m_UsedPosLists[USED_POS_PLUS].empty() != m_UsedPosLists[USED_POS_MINUS].empty(); } diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index e4d78d65706..befd7da2705 100755 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -31,7 +31,7 @@ UpdateData::UpdateData() : m_blockCount(0) void UpdateData::AddOutOfRangeGUID(std::set<uint64>& guids) { - m_outOfRangeGUIDs.insert(guids.begin(),guids.end()); + m_outOfRangeGUIDs.insert(guids.begin(), guids.end()); } void UpdateData::AddOutOfRangeGUID(const uint64 &guid) @@ -57,7 +57,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) int z_res = deflateInit(&c_stream, sWorld->getIntConfig(CONFIG_COMPRESSION)); if (z_res != Z_OK) { - sLog->outError("Can't compress update packet (zlib: deflateInit) Error code: %i (%s)",z_res,zError(z_res)); + sLog->outError("Can't compress update packet (zlib: deflateInit) Error code: %i (%s)", z_res, zError(z_res)); *dst_size = 0; return; } @@ -70,7 +70,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) z_res = deflate(&c_stream, Z_NO_FLUSH); if (z_res != Z_OK) { - sLog->outError("Can't compress update packet (zlib: deflate) Error code: %i (%s)",z_res,zError(z_res)); + sLog->outError("Can't compress update packet (zlib: deflate) Error code: %i (%s)", z_res, zError(z_res)); *dst_size = 0; return; } @@ -85,7 +85,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) z_res = deflate(&c_stream, Z_FINISH); if (z_res != Z_STREAM_END) { - sLog->outError("Can't compress update packet (zlib: deflate should report Z_STREAM_END instead %i (%s)",z_res,zError(z_res)); + sLog->outError("Can't compress update packet (zlib: deflate should report Z_STREAM_END instead %i (%s)", z_res, zError(z_res)); *dst_size = 0; return; } @@ -93,7 +93,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) z_res = deflateEnd(&c_stream); if (z_res != Z_OK) { - sLog->outError("Can't compress update packet (zlib: deflateEnd) Error code: %i (%s)",z_res,zError(z_res)); + sLog->outError("Can't compress update packet (zlib: deflateEnd) Error code: %i (%s)", z_res, zError(z_res)); *dst_size = 0; return; } diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 2be91237121..058175b63ae 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -124,13 +124,13 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petentry, uint32 petnumber, bool c // 0 1 2(?) 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType " "FROM character_pet WHERE owner = '%u' AND entry = '%u' AND (slot = '%u' OR slot > '%u') ", - ownerid, petentry,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT); + ownerid, petentry, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT); else // any current or other non-stabled pet (for hunter "call pet") // 0 1 2(?) 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType " "FROM character_pet WHERE owner = '%u' AND (slot = '%u' OR slot > '%u') ", - ownerid,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT); + ownerid, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT); if (!result) return false; @@ -212,7 +212,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petentry, uint32 petnumber, bool c // this enables popup window (pet dismiss, cancel) break; case HUNTER_PET: - SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100); //class=warrior,gender=none,power=focus + SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100); //class=warrior, gender=none, power=focus SetSheath(SHEATH_STATE_MELEE); SetByteFlag(UNIT_FIELD_BYTES_2, 2, fields[9].GetBool() ? UNIT_CAN_BE_ABANDONED : UNIT_CAN_BE_RENAMED | UNIT_CAN_BE_ABANDONED); @@ -394,7 +394,7 @@ void Pet::SavePetToDB(PetSaveMode mode) CharacterDatabase.escape_string(name); SQLTransaction trans = CharacterDatabase.BeginTransaction(); // remove current data - trans->PAppend("DELETE FROM character_pet WHERE owner = '%u' AND id = '%u'", owner,m_charmInfo->GetPetNumber()); + trans->PAppend("DELETE FROM character_pet WHERE owner = '%u' AND id = '%u'", owner, m_charmInfo->GetPetNumber()); // prevent duplicate using slot (except PET_SAVE_NOT_IN_SLOT) if (mode <= PET_SAVE_LAST_STABLE_SLOT) @@ -404,7 +404,7 @@ void Pet::SavePetToDB(PetSaveMode mode) // prevent existence another hunter pet in PET_SAVE_AS_CURRENT and PET_SAVE_NOT_IN_SLOT if (getPetType() == HUNTER_PET && (mode == PET_SAVE_AS_CURRENT||mode > PET_SAVE_LAST_STABLE_SLOT)) trans->PAppend("DELETE FROM character_pet WHERE owner = '%u' AND (slot = '%u' OR slot > '%u')", - owner,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT); + owner, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT); // save pet std::ostringstream ss; ss << "INSERT INTO character_pet (id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType) " @@ -682,7 +682,7 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid) void Pet::Remove(PetSaveMode mode, bool returnreagent) { - m_owner->RemovePet(this,mode,returnreagent); + m_owner->RemovePet(this, mode, returnreagent); } void Pet::GivePetXP(uint32 xp) @@ -997,11 +997,11 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) SetBonusDamage(int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier)); // 14AP == 1dps, wolf's strike speed == 2s so dmg = basedmg + AP / 14 * 2 - SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE,float((petlevel * 4 - petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier * 2 / 14))); - SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE,float((petlevel * 4 + petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier * 2 / 14))); + SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float((petlevel * 4 - petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier * 2 / 14))); + SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float((petlevel * 4 + petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier * 2 / 14))); SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(m_owner->GetArmor()) * 0.35f); // Bonus Armor (35% of player armor) - SetModifierValue(UNIT_MOD_STAT_STAMINA, BASE_VALUE,float(m_owner->GetStat(STAT_STAMINA)) * 0.3f); // Bonus Stamina (30% of player stamina) + SetModifierValue(UNIT_MOD_STAT_STAMINA, BASE_VALUE, float(m_owner->GetStat(STAT_STAMINA)) * 0.3f); // Bonus Stamina (30% of player stamina) if (!HasAura(58877))//prevent apply twice for the 2 wolves AddAura(58877, this);//Spirit Hunt, passive, Spirit Wolves' attacks heal them and their master for 150% of damage done. break; @@ -1080,7 +1080,7 @@ void Pet::_LoadSpellCooldowns() m_CreatureSpellCooldowns.clear(); m_CreatureCategoryCooldowns.clear(); - QueryResult result = CharacterDatabase.PQuery("SELECT spell,time FROM pet_spell_cooldown WHERE guid = '%u'",m_charmInfo->GetPetNumber()); + QueryResult result = CharacterDatabase.PQuery("SELECT spell, time FROM pet_spell_cooldown WHERE guid = '%u'", m_charmInfo->GetPetNumber()); if (result) { @@ -1099,7 +1099,7 @@ void Pet::_LoadSpellCooldowns() if (!sSpellStore.LookupEntry(spell_id)) { - sLog->outError("Pet %u have unknown spell %u in `pet_spell_cooldown`, skipping.",m_charmInfo->GetPetNumber(),spell_id); + sLog->outError("Pet %u have unknown spell %u in `pet_spell_cooldown`, skipping.", m_charmInfo->GetPetNumber(), spell_id); continue; } @@ -1110,7 +1110,7 @@ void Pet::_LoadSpellCooldowns() data << uint32(spell_id); data << uint32(uint32(db_time-curTime)*IN_MILLISECONDS); - _AddCreatureSpellCooldown(spell_id,db_time); + _AddCreatureSpellCooldown(spell_id, db_time); sLog->outDebug(LOG_FILTER_PETS, "Pet (Number: %u) spell %u cooldown loaded (%u secs).", m_charmInfo->GetPetNumber(), spell_id, uint32(db_time-curTime)); } @@ -1134,7 +1134,7 @@ void Pet::_SaveSpellCooldowns(SQLTransaction& trans) m_CreatureSpellCooldowns.erase(itr++); else { - trans->PAppend("INSERT INTO pet_spell_cooldown (guid,spell,time) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second)); + trans->PAppend("INSERT INTO pet_spell_cooldown (guid, spell, time) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, uint32(itr->second)); ++itr; } } @@ -1142,7 +1142,7 @@ void Pet::_SaveSpellCooldowns(SQLTransaction& trans) void Pet::_LoadSpells() { - QueryResult result = CharacterDatabase.PQuery("SELECT spell,active FROM pet_spell WHERE guid = '%u'",m_charmInfo->GetPetNumber()); + QueryResult result = CharacterDatabase.PQuery("SELECT spell, active FROM pet_spell WHERE guid = '%u'", m_charmInfo->GetPetNumber()); if (result) { @@ -1174,10 +1174,10 @@ void Pet::_SaveSpells(SQLTransaction& trans) continue; case PETSPELL_CHANGED: trans->PAppend("DELETE FROM pet_spell WHERE guid = '%u' and spell = '%u'", m_charmInfo->GetPetNumber(), itr->first); - trans->PAppend("INSERT INTO pet_spell (guid,spell,active) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, itr->second.active); + trans->PAppend("INSERT INTO pet_spell (guid, spell, active) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, itr->second.active); break; case PETSPELL_NEW: - trans->PAppend("INSERT INTO pet_spell (guid,spell,active) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, itr->second.active); + trans->PAppend("INSERT INTO pet_spell (guid, spell, active) VALUES ('%u', '%u', '%u')", m_charmInfo->GetPetNumber(), itr->first, itr->second.active); break; case PETSPELL_UNCHANGED: continue; @@ -1188,9 +1188,9 @@ void Pet::_SaveSpells(SQLTransaction& trans) void Pet::_LoadAuras(uint32 timediff) { - sLog->outDebug(LOG_FILTER_PETS, "Loading auras for pet %u",GetGUIDLow()); + sLog->outDebug(LOG_FILTER_PETS, "Loading auras for pet %u", GetGUIDLow()); - QueryResult result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2,maxduration,remaintime,remaincharges FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber()); + QueryResult result = CharacterDatabase.PQuery("SELECT caster_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges FROM pet_aura WHERE guid = '%u'", m_charmInfo->GetPetNumber()); if (result) { @@ -1217,7 +1217,7 @@ void Pet::_LoadAuras(uint32 timediff) SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid); if (!spellproto) { - sLog->outError("Unknown aura (spellid %u), ignore.",spellid); + sLog->outError("Unknown aura (spellid %u), ignore.", spellid); continue; } @@ -1246,7 +1246,7 @@ void Pet::_LoadAuras(uint32 timediff) aura->Remove(); continue; } - aura->SetLoadedState(maxduration,remaintime,remaincharges,stackcount,recalculatemask,&damage[0]); + aura->SetLoadedState(maxduration, remaintime, remaincharges, stackcount, recalculatemask, &damage[0]); aura->ApplyForTargets(); sLog->outDetail("Added aura spellid %u, effectmask %u", spellproto->Id, effmask); } @@ -1288,15 +1288,15 @@ void Pet::_SaveAuras(SQLTransaction& trans) } } - trans->PAppend("INSERT INTO pet_aura (guid,caster_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2,maxduration,remaintime,remaincharges) " + trans->PAppend("INSERT INTO pet_aura (guid, caster_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges) " "VALUES ('%u', '" UI64FMTD "', '%u', '%u', '%u', '%u', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u')", m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(), itr->second->GetId(), effMask, recalculateMask, itr->second->GetStackAmount(), damage[0], damage[1], damage[2], baseDamage[0], baseDamage[1], baseDamage[2], - itr->second->GetMaxDuration(), itr->second->GetDuration(),itr->second->GetCharges()); + itr->second->GetMaxDuration(), itr->second->GetDuration(), itr->second->GetCharges()); } } -bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpellState state /*= PETSPELL_NEW*/, PetSpellType type /*= PETSPELL_NORMAL*/) +bool Pet::addSpell(uint32 spell_id, ActiveStates active /*= ACT_DECIDE*/, PetSpellState state /*= PETSPELL_NEW*/, PetSpellType type /*= PETSPELL_NORMAL*/) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id); if (!spellInfo) @@ -1304,11 +1304,11 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel // do pet spell book cleanup if (state == PETSPELL_UNCHANGED) // spell load case { - sLog->outError("Pet::addSpell: Non-existed in SpellStore spell #%u request, deleting for all pets in `pet_spell`.",spell_id); - CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE spell = '%u'",spell_id); + sLog->outError("Pet::addSpell: Non-existed in SpellStore spell #%u request, deleting for all pets in `pet_spell`.", spell_id); + CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE spell = '%u'", spell_id); } else - sLog->outError("Pet::addSpell: Non-existed in SpellStore spell #%u request.",spell_id); + sLog->outError("Pet::addSpell: Non-existed in SpellStore spell #%u request.", spell_id); return false; } @@ -1366,7 +1366,7 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel // skip unknown ranks if (!HasSpell(rankSpellId)) continue; - removeSpell(rankSpellId,false,false); + removeSpell(rankSpellId, false, false); } } } @@ -1376,21 +1376,21 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel { if (itr2->second.state == PETSPELL_REMOVED) continue; - if (sSpellMgr->IsRankSpellDueToSpell(spellInfo,itr2->first)) + if (sSpellMgr->IsRankSpellDueToSpell(spellInfo, itr2->first)) { // replace by new high rank - if (sSpellMgr->IsHighRankOfSpell(spell_id,itr2->first)) + if (sSpellMgr->IsHighRankOfSpell(spell_id, itr2->first)) { newspell.active = itr2->second.active; if (newspell.active == ACT_ENABLED) ToggleAutocast(itr2->first, false); - unlearnSpell(itr2->first,false,false); + unlearnSpell(itr2->first, false, false); break; } // ignore new lesser rank - else if (sSpellMgr->IsHighRankOfSpell(itr2->first,spell_id)) + else if (sSpellMgr->IsHighRankOfSpell(itr2->first, spell_id)) return false; } } @@ -1445,7 +1445,7 @@ void Pet::InitLevelupSpellsForLevel() { // will called first if level down if (itr->first > level) - unlearnSpell(itr->second,true); // will learn prev rank if any + unlearnSpell(itr->second, true); // will learn prev rank if any // will called if level up else learnSpell(itr->second); // will unlearn prev rank if any @@ -1465,7 +1465,7 @@ void Pet::InitLevelupSpellsForLevel() // will called first if level down if (spellEntry->spellLevel > level) - unlearnSpell(spellEntry->Id,true); + unlearnSpell(spellEntry->Id, true); // will called if level up else learnSpell(spellEntry->Id); @@ -1475,7 +1475,7 @@ void Pet::InitLevelupSpellsForLevel() bool Pet::unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab) { - if (removeSpell(spell_id,learn_prev,clear_ab)) + if (removeSpell(spell_id, learn_prev, clear_ab)) { if (!m_loading) { @@ -1571,7 +1571,7 @@ bool Pet::resetTalents(bool no_cost) // not need after this call if (owner->ToPlayer()->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS)) - owner->ToPlayer()->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true); + owner->ToPlayer()->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS, true); CreatureTemplate const * ci = GetCreatureInfo(); if (!ci) @@ -1634,9 +1634,9 @@ bool Pet::resetTalents(bool no_cost) uint32 itrFirstId = sSpellMgr->GetFirstSpellInChain(itr->first); // unlearn if first rank is talent or learned by talent - if (itrFirstId == talentInfo->RankID[j] || sSpellMgr->IsSpellLearnToSpell(talentInfo->RankID[j],itrFirstId)) + if (itrFirstId == talentInfo->RankID[j] || sSpellMgr->IsSpellLearnToSpell(talentInfo->RankID[j], itrFirstId)) { - unlearnSpell(itr->first,false); + unlearnSpell(itr->first, false); itr = m_spells.begin(); continue; } @@ -1664,7 +1664,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) { // not need after this call if (owner->ToPlayer()->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS)) - owner->ToPlayer()->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true); + owner->ToPlayer()->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS, true); // reset for online if (online_pet) @@ -1675,7 +1675,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) QueryResult resultPets = CharacterDatabase.PQuery( "SELECT id FROM character_pet WHERE owner = '%u' AND id <> '%u'", - owner->GetGUIDLow(),except_petnumber); + owner->GetGUIDLow(), except_petnumber); // no offline pets if (!resultPets) @@ -1684,7 +1684,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) QueryResult result = CharacterDatabase.PQuery( "SELECT DISTINCT pet_spell.spell FROM pet_spell, character_pet " "WHERE character_pet.owner = '%u' AND character_pet.id = pet_spell.guid AND character_pet.id <> %u", - owner->GetGUIDLow(),except_petnumber); + owner->GetGUIDLow(), except_petnumber); if (!result) return; @@ -1700,7 +1700,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) uint32 id = fields[0].GetUInt32(); if (need_comma) - ss << ","; + ss << ", "; ss << id; @@ -1721,7 +1721,7 @@ void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/) continue; if (need_execute) - ss << ","; + ss << ", "; ss << spell; @@ -1855,7 +1855,7 @@ bool Pet::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint3 ASSERT(map); SetMap(map); - SetPhaseMask(phaseMask,false); + SetPhaseMask(phaseMask, false); Object::_Create(guidlow, pet_number, HIGHGUID_PET); m_DBTableGuid = guidlow; diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 299d050b3ca..0630aec7cca 100755 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -138,9 +138,9 @@ class Pet : public Guardian bool Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 pet_number); bool CreateBaseAtCreature(Creature* creature); - bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo,Unit * owner); + bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit * owner); bool CreateBaseAtTamed(CreatureTemplate const * cinfo, Map * map, uint32 phaseMask); - bool LoadPetFromDB(Player* owner,uint32 petentry = 0,uint32 petnumber = 0, bool current = false); + bool LoadPetFromDB(Player* owner, uint32 petentry = 0, uint32 petnumber = 0, bool current = false); bool isBeingLoaded() const { return m_loading;} void SavePetToDB(PetSaveMode mode); void Remove(PetSaveMode mode, bool returnreagent = false); @@ -195,7 +195,7 @@ class Pet : public Guardian void _LoadSpells(); void _SaveSpells(SQLTransaction& trans); - bool addSpell(uint32 spell_id,ActiveStates active = ACT_DECIDE, PetSpellState state = PETSPELL_NEW, PetSpellType type = PETSPELL_NORMAL); + bool addSpell(uint32 spell_id, ActiveStates active = ACT_DECIDE, PetSpellState state = PETSPELL_NEW, PetSpellType type = PETSPELL_NORMAL); bool learnSpell(uint32 spell_id); void learnSpellHighRank(uint32 spellid); void InitLevelupSpellsForLevel(); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 88381292182..4233ba7d677 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -79,11 +79,11 @@ #define SKILL_VALUE(x) PAIR32_LOPART(x) #define SKILL_MAX(x) PAIR32_HIPART(x) -#define MAKE_SKILL_VALUE(v, m) MAKE_PAIR32(v,m) +#define MAKE_SKILL_VALUE(v, m) MAKE_PAIR32(v, m) #define SKILL_TEMP_BONUS(x) int16(PAIR32_LOPART(x)) #define SKILL_PERM_BONUS(x) int16(PAIR32_HIPART(x)) -#define MAKE_SKILL_BONUS(t, p) MAKE_PAIR32(t,p) +#define MAKE_SKILL_BONUS(t, p) MAKE_PAIR32(t, p) enum CharacterFlags { @@ -216,7 +216,7 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, uint3 { ClearTaxiDestinations(); - Tokens tokens(values,' '); + Tokens tokens(values, ' '); for (Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter) { @@ -235,13 +235,13 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, uint3 { uint32 cost; uint32 path; - sObjectMgr->GetTaxiPath(m_TaxiDestinations[i-1],m_TaxiDestinations[i],path,cost); + sObjectMgr->GetTaxiPath(m_TaxiDestinations[i-1], m_TaxiDestinations[i], path, cost); if (!path) return false; } // can't load taxi path without mount set (quest taxi path?) - if (!sObjectMgr->GetTaxiMountDisplayId(GetTaxiSource(),team,true)) + if (!sObjectMgr->GetTaxiMountDisplayId(GetTaxiSource(), team, true)) return false; return true; @@ -268,7 +268,7 @@ uint32 PlayerTaxi::GetCurrentTaxiPath() const uint32 path; uint32 cost; - sObjectMgr->GetTaxiPath(m_TaxiDestinations[0],m_TaxiDestinations[1],path,cost); + sObjectMgr->GetTaxiPath(m_TaxiDestinations[0], m_TaxiDestinations[1], path, cost); return path; } @@ -920,12 +920,12 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; i++) m_items[i] = NULL; - Relocate(info->positionX,info->positionY,info->positionZ,info->orientation); + Relocate(info->positionX, info->positionY, info->positionZ, info->orientation); ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(class_); if (!cEntry) { - sLog->outError("Class %u not found in DBC (Wrong DBC files?)",class_); + sLog->outError("Class %u not found in DBC (Wrong DBC files?)", class_); return false; } @@ -1002,46 +1002,46 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c if (sWorld->getBoolConfig(CONFIG_START_ALL_EXPLORED)) { for (uint8 i=0; i<PLAYER_EXPLORED_ZONES_SIZE; i++) - SetFlag(PLAYER_EXPLORED_ZONES_1+i,0xFFFFFFFF); + SetFlag(PLAYER_EXPLORED_ZONES_1+i, 0xFFFFFFFF); } //Reputations if "StartAllReputation" is enabled, -- TODO: Fix this in a better way if (sWorld->getBoolConfig(CONFIG_START_ALL_REP)) { - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(942),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(935),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(936),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1011),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(970),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(967),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(989),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(932),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(934),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1038),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077),42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(942), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(935), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(936), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1011), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(970), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(967), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(989), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(932), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(934), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1038), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077), 42999); // Factions depending on team, like cities and some more stuff switch(GetTeam()) { case ALLIANCE: - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(72),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(47),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(69),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(930),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(730),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(978),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(54),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(946),42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(72), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(47), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(69), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(930), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(730), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(978), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(54), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(946), 42999); break; case HORDE: - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(76),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(68),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(81),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(911),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(729),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(941),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(530),42999); - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(947),42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(76), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(68), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(81), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(911), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(729), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(941), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(530), 42999); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(947), 42999); break; default: break; @@ -1066,7 +1066,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c if (getPowerType() == POWER_MANA) { UpdateMaxPower(POWER_MANA); // Update max Mana (for add bonus from intellect) - SetPower(POWER_MANA,GetMaxPower(POWER_MANA)); + SetPower(POWER_MANA, GetMaxPower(POWER_MANA)); } if (getPowerType() == POWER_RUNIC_POWER) @@ -1082,7 +1082,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c // original action bar for (PlayerCreateInfoActions::const_iterator action_itr = info->action.begin(); action_itr != info->action.end(); ++action_itr) - addActionButton(action_itr->button,action_itr->action, action_itr->type); + addActionButton(action_itr->button, action_itr->action, action_itr->type); // original items CharStartOutfitEntry const* oEntry = NULL; @@ -1149,7 +1149,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c InventoryResult msg = CanEquipItem(NULL_SLOT, eDest, pItem, false); if (msg == EQUIP_ERR_OK) { - RemoveItem(INVENTORY_SLOT_BAG_0, i,true); + RemoveItem(INVENTORY_SLOT_BAG_0, i, true); EquipItem(eDest, pItem, true); } // move other items to more appropriate slots (ammo not equipped in special bag) @@ -1159,7 +1159,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c msg = CanStoreItem(NULL_BAG, NULL_SLOT, sDest, pItem, false); if (msg == EQUIP_ERR_OK) { - RemoveItem(INVENTORY_SLOT_BAG_0, i,true); + RemoveItem(INVENTORY_SLOT_BAG_0, i, true); pItem = StoreItem(sDest, pItem, true); } @@ -1177,7 +1177,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) { - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "STORAGE: Creating initial item, itemId = %u, count = %u",titem_id, titem_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "STORAGE: Creating initial item, itemId = %u, count = %u", titem_id, titem_amount); // attempt equip by one while (titem_amount > 0) @@ -1206,7 +1206,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) } // item can't be added - sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u",titem_id,getRace(),getClass(),msg); + sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u", titem_id, getRace(), getClass(), msg); return false; } @@ -1251,7 +1251,7 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage) damage-=absorb+resist; - DealDamageMods(this,damage,&absorb); + DealDamageMods(this, damage, &absorb); WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21)); data << uint64(GetGUID()); @@ -1268,7 +1268,7 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage) if (type == DAMAGE_FALL) // DealDamage not apply item durability loss at self damage { sLog->outStaticDebug("We are fall to death, loosing 10 percents durability"); - DurabilityLossAll(0.10f,false); + DurabilityLossAll(0.10f, false); // durability lost message WorldPacket data2(SMSG_DURABILITY_DAMAGE_DEATH, 0); GetSession()->SendPacket(&data2); @@ -1462,7 +1462,7 @@ void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId) m_invisibilityDetect.AddValue(INVISIBILITY_DRUNK, int32(newDrunkenValue - m_drunk) / 256); m_drunk = newDrunkenValue; - SetUInt32Value(PLAYER_BYTES_3,(GetUInt32Value(PLAYER_BYTES_3) & 0xFFFF0001) | (m_drunk & 0xFFFE)); + SetUInt32Value(PLAYER_BYTES_3, (GetUInt32Value(PLAYER_BYTES_3) & 0xFFFF0001) | (m_drunk & 0xFFFE)); uint32 newDrunkenState = Player::GetDrunkenstateByValue(m_drunk); @@ -1574,13 +1574,13 @@ void Player::Update(uint32 p_time) if (Unit *pVictim = getVictim()) { // default combat reach 10 - // TODO add weapon,skill check + // TODO add weapon, skill check if (isAttackReady(BASE_ATTACK)) { if (!IsWithinMeleeRange(pVictim)) { - setAttackTimer(BASE_ATTACK,100); + setAttackTimer(BASE_ATTACK, 100); if (m_swingErrorMsg != 1) // send single time (client auto repeat) { SendAttackSwingNotInRange(); @@ -1590,7 +1590,7 @@ void Player::Update(uint32 p_time) //120 degrees of radiant range else if (!HasInArc(2*M_PI/3, pVictim)) { - setAttackTimer(BASE_ATTACK,100); + setAttackTimer(BASE_ATTACK, 100); if (m_swingErrorMsg != 2) // send single time (client auto repeat) { SendAttackSwingBadFacingAttack(); @@ -1604,7 +1604,7 @@ void Player::Update(uint32 p_time) // prevent base and off attack in same time, delay attack at 0.2 sec if (haveOffhandWeapon()) if (getAttackTimer(OFF_ATTACK) < ATTACK_DISPLAY_DELAY) - setAttackTimer(OFF_ATTACK,ATTACK_DISPLAY_DELAY); + setAttackTimer(OFF_ATTACK, ATTACK_DISPLAY_DELAY); // do attack AttackerStateUpdate(pVictim, BASE_ATTACK); @@ -1615,14 +1615,14 @@ void Player::Update(uint32 p_time) if (haveOffhandWeapon() && isAttackReady(OFF_ATTACK)) { if (!IsWithinMeleeRange(pVictim)) - setAttackTimer(OFF_ATTACK,100); + setAttackTimer(OFF_ATTACK, 100); else if (!HasInArc(2*M_PI/3, pVictim)) - setAttackTimer(OFF_ATTACK,100); + setAttackTimer(OFF_ATTACK, 100); else { // prevent base and off attack in same time, delay attack at 0.2 sec if (getAttackTimer(BASE_ATTACK) < ATTACK_DISPLAY_DELAY) - setAttackTimer(BASE_ATTACK,ATTACK_DISPLAY_DELAY); + setAttackTimer(BASE_ATTACK, ATTACK_DISPLAY_DELAY); // do attack AttackerStateUpdate(pVictim, OFF_ATTACK); @@ -1668,10 +1668,10 @@ void Player::Update(uint32 p_time) if (p_time >= m_zoneUpdateTimer) { uint32 newzone, newarea; - GetZoneAndAreaId(newzone,newarea); + GetZoneAndAreaId(newzone, newarea); if (m_zoneUpdateId != newzone) - UpdateZone(newzone,newarea); // also update area + UpdateZone(newzone, newarea); // also update area else { // use area updates as well @@ -1825,7 +1825,7 @@ void Player::setDeathState(DeathState s) GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP, 1); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATH, 1); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON, 1); - GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL,ACHIEVEMENT_CRITERIA_CONDITION_NO_DEATH); + GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL, ACHIEVEMENT_CRITERIA_CONDITION_NO_DEATH); } Unit::setDeathState(s); @@ -2160,7 +2160,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if (!(options & TELE_TO_NOT_UNSUMMON_PET)) { //same map, only remove pet if out of range for new position - if (pet && !pet->IsWithinDist3d(x,y,z, GetMap()->GetVisibilityRange())) + if (pet && !pet->IsWithinDist3d(x, y, z, GetMap()->GetVisibilityRange())) UnsummonPetTemporaryIfAny(); } @@ -2736,7 +2736,7 @@ GameObject* Player::GetGameObjectIfCanInteractWith(uint64 guid, GameobjectTypes bool Player::IsUnderWater() const { return IsInWater() && - GetPositionZ() < (GetBaseMap()->GetWaterLevel(GetPositionX(),GetPositionY())-2); + GetPositionZ() < (GetBaseMap()->GetWaterLevel(GetPositionX(), GetPositionY())-2); } void Player::SetInWater(bool apply) @@ -3040,11 +3040,11 @@ void Player::GiveLevel(uint8 level) if (Pet* pet = GetPet()) pet->SynchronizeLevelWithOwner(); - if (MailLevelReward const* mailReward = sObjectMgr->GetMailLevelReward(level,getRaceMask())) + if (MailLevelReward const* mailReward = sObjectMgr->GetMailLevelReward(level, getRaceMask())) { //- TODO: Poor design of mail system SQLTransaction trans = CharacterDatabase.BeginTransaction(); - MailDraft(mailReward->mailTemplateId).SendMailTo(trans, this,MailSender(MAIL_CREATURE,mailReward->senderEntry)); + MailDraft(mailReward->mailTemplateId).SendMailTo(trans, this, MailSender(MAIL_CREATURE, mailReward->senderEntry)); CharacterDatabase.CommitTransaction(trans); } @@ -3097,10 +3097,10 @@ void Player::InitStatsForLevel(bool reapplyMods) _RemoveAllStatBonuses(); PlayerClassLevelInfo classInfo; - sObjectMgr->GetPlayerClassLevelInfo(getClass(),getLevel(),&classInfo); + sObjectMgr->GetPlayerClassLevelInfo(getClass(), getLevel(), &classInfo); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(),getClass(),getLevel(),&info); + sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), getLevel(), &info); SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(getLevel())); @@ -3114,7 +3114,7 @@ void Player::InitStatsForLevel(bool reapplyMods) SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f); // reset size before reapply auras - SetFloatValue(OBJECT_FIELD_SCALE_X,1.0f); + SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f); // save base values (bonuses already included in stored stats for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i) @@ -3136,7 +3136,7 @@ void Player::InitStatsForLevel(bool reapplyMods) for (uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index) SetUInt32Value(index, 0); - SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS,0); + SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, 0); for (uint8 i = 0; i < 7; ++i) { SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+i, 0); @@ -3158,15 +3158,15 @@ void Player::InitStatsForLevel(bool reapplyMods) SetInt32Value(UNIT_FIELD_ATTACK_POWER, 0); SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS, 0); - SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER,0.0f); + SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER, 0.0f); SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER, 0); - SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS,0); - SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER,0.0f); + SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS, 0); + SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER, 0.0f); // Base crit values (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset - SetFloatValue(PLAYER_CRIT_PERCENTAGE,0.0f); - SetFloatValue(PLAYER_OFFHAND_CRIT_PERCENTAGE,0.0f); - SetFloatValue(PLAYER_RANGED_CRIT_PERCENTAGE,0.0f); + SetFloatValue(PLAYER_CRIT_PERCENTAGE, 0.0f); + SetFloatValue(PLAYER_OFFHAND_CRIT_PERCENTAGE, 0.0f); + SetFloatValue(PLAYER_RANGED_CRIT_PERCENTAGE, 0.0f); // Init spell schools (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset for (uint8 i = 0; i < 7; ++i) @@ -3191,12 +3191,12 @@ void Player::InitStatsForLevel(bool reapplyMods) SetResistanceBuffMods(SpellSchools(i), false, 0.0f); } - SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,0); - SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,0); + SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, 0); + SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE, 0); for (uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i) { - SetUInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,0); - SetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i,0.0f); + SetUInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i, 0); + SetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i, 0.0f); } // Reset no reagent cost field for (uint8 i = 0; i < 3; ++i) @@ -3223,7 +3223,7 @@ void Player::InitStatsForLevel(bool reapplyMods) UNIT_FLAG_SKINNABLE | UNIT_FLAG_MOUNT | UNIT_FLAG_TAXI_FLIGHT ); SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); // must be set - SetFlag(UNIT_FIELD_FLAGS_2,UNIT_FLAG2_REGENERATE_POWER);// must be set + SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);// must be set // cleanup player flags (will be re-applied if need at aura load), to avoid have ghost flag without ghost aura, for example. RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK | PLAYER_FLAGS_DND | PLAYER_FLAGS_GM | PLAYER_FLAGS_GHOST | PLAYER_ALLOW_ONLY_ABILITY); @@ -3279,7 +3279,7 @@ void Player::SendInitialSpells() spellCount +=1; } - data.put<uint16>(countPos,spellCount); // write real count value + data.put<uint16>(countPos, spellCount); // write real count value uint16 spellCooldowns = m_spellCooldowns.size(); data << uint16(spellCooldowns); @@ -3399,25 +3399,25 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning) // do character spell book cleanup (all characters) if (!IsInWorld() && !learning) // spell load case { - sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request, deleting for all characters in `character_spell`.",spell_id); - CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spell = '%u'",spell_id); + sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request, deleting for all characters in `character_spell`.", spell_id); + CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spell = '%u'", spell_id); } else - sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request.",spell_id); + sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request.", spell_id); return false; } - if (!SpellMgr::IsSpellValid(spellInfo,this,false)) + if (!SpellMgr::IsSpellValid(spellInfo, this, false)) { // do character spell book cleanup (all characters) if (!IsInWorld() && !learning) // spell load case { - sLog->outError("Player::addTalent: Broken spell #%u learning not allowed, deleting for all characters in `character_talent`.",spell_id); - CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spell = '%u'",spell_id); + sLog->outError("Player::addTalent: Broken spell #%u learning not allowed, deleting for all characters in `character_talent`.", spell_id); + CharacterDatabase.PExecute("DELETE FROM character_talent WHERE spell = '%u'", spell_id); } else - sLog->outError("Player::addTalent: Broken spell #%u learning not allowed.",spell_id); + sLog->outError("Player::addTalent: Broken spell #%u learning not allowed.", spell_id); return false; } @@ -3462,25 +3462,25 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // do character spell book cleanup (all characters) if (!IsInWorld() && !learning) // spell load case { - sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request, deleting for all characters in `character_spell`.",spell_id); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id); + sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request, deleting for all characters in `character_spell`.", spell_id); + CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'", spell_id); } else - sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request.",spell_id); + sLog->outError("Player::addSpell: Non-existed in SpellStore spell #%u request.", spell_id); return false; } - if (!SpellMgr::IsSpellValid(spellInfo,this,false)) + if (!SpellMgr::IsSpellValid(spellInfo, this, false)) { // do character spell book cleanup (all characters) if (!IsInWorld() && !learning) // spell load case { - sLog->outError("Player::addSpell: Broken spell #%u learning not allowed, deleting for all characters in `character_spell`.",spell_id); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id); + sLog->outError("Player::addSpell: Broken spell #%u learning not allowed, deleting for all characters in `character_spell`.", spell_id); + CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'", spell_id); } else - sLog->outError("Player::addSpell: Broken spell #%u learning not allowed.",spell_id); + sLog->outError("Player::addSpell: Broken spell #%u learning not allowed.", spell_id); return false; } @@ -3545,7 +3545,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen if (active) { if (IsPassiveSpell(spell_id) && IsNeedCastPassiveSpellAtLearn(spellInfo)) - CastSpell (this,spell_id,true); + CastSpell (this, spell_id, true); } else if (IsInWorld()) { @@ -3615,7 +3615,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen if (!rankSpellId || rankSpellId == spell_id) continue; - removeSpell(rankSpellId,false,false); + removeSpell(rankSpellId, false, false); } } } @@ -3623,7 +3623,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen else if (uint32 prev_spell = sSpellMgr->GetPrevSpellInChain(spell_id)) { if (!IsInWorld() || disabled) // at spells loading, no output, but allow save - addSpell(prev_spell,active,true,true,disabled); + addSpell(prev_spell, active, true, true, disabled); else // at normal learning learnSpell(prev_spell, true); } @@ -3643,11 +3643,11 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen SpellEntry const *i_spellInfo = sSpellStore.LookupEntry(itr2->first); if (!i_spellInfo) continue; - if (sSpellMgr->IsRankSpellDueToSpell(spellInfo,itr2->first)) + if (sSpellMgr->IsRankSpellDueToSpell(spellInfo, itr2->first)) { if (itr2->second->active) { - if (sSpellMgr->IsHighRankOfSpell(spell_id,itr2->first)) + if (sSpellMgr->IsHighRankOfSpell(spell_id, itr2->first)) { if (IsInWorld()) // not send spell (re-/over-)learn packets at loading { @@ -3663,7 +3663,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen itr2->second->state = PLAYERSPELL_CHANGED; superceded_old = true; // new spell replace old in action bars and spell book. } - else if (sSpellMgr->IsHighRankOfSpell(itr2->first,spell_id)) + else if (sSpellMgr->IsHighRankOfSpell(itr2->first, spell_id)) { if (IsInWorld()) // not send spell (re-/over-)learn packets at loading { @@ -3694,7 +3694,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // cast talents with SPELL_EFFECT_LEARN_SPELL (other dependent spells will learned later as not auto-learned) // note: all spells with SPELL_EFFECT_LEARN_SPELL isn't passive - if (talentCost > 0 && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_LEARN_SPELL)) + if (talentCost > 0 && IsSpellHaveEffect(spellInfo, SPELL_EFFECT_LEARN_SPELL)) { // ignore stance requirement for talent learn spell (stance set for spell only for client spell description show) CastSpell(this, spell_id, true); @@ -3705,7 +3705,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen if (IsNeedCastPassiveSpellAtLearn(spellInfo)) CastSpell(this, spell_id, true); } - else if (IsSpellHaveEffect(spellInfo,SPELL_EFFECT_SKILL_STEP)) + else if (IsSpellHaveEffect(spellInfo, SPELL_EFFECT_SKILL_STEP)) { CastSpell(this, spell_id, true); return false; @@ -3765,7 +3765,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL ((pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0)) { - switch(GetSkillRangeType(pSkill,_spell_idx->second->racemask != 0)) + switch(GetSkillRangeType(pSkill, _spell_idx->second->racemask != 0)) { case SKILL_RANGE_LANGUAGE: SetSkill(pSkill->id, GetSkillStep(pSkill->id), 300, 300); @@ -3792,7 +3792,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen if (!itr2->second.autoLearned) { if (!IsInWorld() || !itr2->second.active) // at spells loading, no output, but allow save - addSpell(itr2->second.spell,itr2->second.active,true,true,false); + addSpell(itr2->second.spell, itr2->second.active, true, true, false); else // at normal learning learnSpell(itr2->second.spell, true); } @@ -3803,11 +3803,11 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen // not ranked skills for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx) { - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE,_spell_idx->second->skillId); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS,_spell_idx->second->skillId); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE, _spell_idx->second->skillId); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS, _spell_idx->second->skillId); } - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL,spell_id); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL, spell_id); } // return true (for send learn packet) only if spell active (in case ranked spells) and not replace old spell @@ -3860,7 +3860,7 @@ void Player::learnSpell(uint32 spell_id, bool dependent) bool disabled = (itr != m_spells.end()) ? itr->second->disabled : false; bool active = disabled ? itr->second->active : true; - bool learning = addSpell(spell_id,active,true,dependent,false); + bool learning = addSpell(spell_id, active, true, dependent, false); // prevent duplicated entires in spell book, also not send if not in world (loading) if (learning && IsInWorld()) @@ -3905,12 +3905,12 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) if (SpellChainNode const* node = sSpellMgr->GetSpellChainNode(spell_id)) { if (HasSpell(node->next) && !GetTalentSpellPos(node->next)) - removeSpell(node->next,disabled, false); + removeSpell(node->next, disabled, false); } //unlearn spells dependent from recently removed spells SpellsRequiringSpellMapBounds spellsRequiringSpell = sSpellMgr->GetSpellsRequiringSpellBounds(spell_id); for (SpellsRequiringSpellMap::const_iterator itr2 = spellsRequiringSpell.first; itr2 != spellsRequiringSpell.second; ++itr2) - removeSpell(itr2->second,disabled); + removeSpell(itr2->second, disabled); // re-search, it can be corrupted in prev loop itr = m_spells.find(spell_id); @@ -4074,7 +4074,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) // now re-learn if need re-activate if (cur_active && !prev_itr->second->active && learn_low_rank) { - if (addSpell(prev_id,true,false,prev_itr->second->dependent,prev_itr->second->disabled)) + if (addSpell(prev_id, true, false, prev_itr->second->dependent, prev_itr->second->disabled)) { // downgrade spell ranks in spellbook and action bar WorldPacket data(SMSG_SUPERCEDED_SPELL, 4 + 4); @@ -4220,7 +4220,7 @@ void Player::_LoadSpellCooldowns(PreparedQueryResult result) { // some cooldowns can be already set at aura loading... - //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,item,time FROM character_spell_cooldown WHERE guid = '%u'",GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT spell, item, time FROM character_spell_cooldown WHERE guid = '%u'", GetGUIDLow()); if (result) { @@ -4270,13 +4270,13 @@ void Player::_SaveSpellCooldowns(SQLTransaction& trans) { if (first_round) { - ss << "INSERT INTO character_spell_cooldown (guid,spell,item,time) VALUES "; + ss << "INSERT INTO character_spell_cooldown (guid, spell, item, time) VALUES "; first_round = false; } // next new/changed record prefix else ss << ", "; - ss << "(" << GetGUIDLow() << "," << itr->first << "," << itr->second.itemid << "," << uint64(itr->second.end) << ")"; + ss << "(" << GetGUIDLow() << ", " << itr->first << ", " << itr->second.itemid << ", " << uint64(itr->second.end) << ")"; ++itr; } else @@ -4373,11 +4373,11 @@ bool Player::resetTalents(bool no_cost) // skip non-existant talent ranks if (talentInfo->RankID[rank] == 0) continue; - removeSpell(talentInfo->RankID[rank],true); + removeSpell(talentInfo->RankID[rank], true); if (const SpellEntry *_spellEntry = sSpellStore.LookupEntry(talentInfo->RankID[rank])) for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) // search through the SpellEntry for valid trigger spells if (_spellEntry->EffectTriggerSpell[i] > 0 && _spellEntry->Effect[i] == SPELL_EFFECT_LEARN_SPELL) - removeSpell(_spellEntry->EffectTriggerSpell[i],true); // and remove any spells that the talent teaches + removeSpell(_spellEntry->EffectTriggerSpell[i], true); // and remove any spells that the talent teaches // if this talent rank can be found in the PlayerTalentMap, mark the talent as removed so it gets deleted PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->RankID[rank]); if (plrTalent != m_talents[m_activeSpec]->end()) @@ -4403,12 +4403,12 @@ bool Player::resetTalents(bool no_cost) } //FIXME: remove pet before or after unlearn spells? for now after unlearn to allow removing of talent related, pet affecting auras - RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true); + RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); /* when prev line will dropped use next line if (Pet* pet = GetPet()) { if (pet->getPetType() == HUNTER_PET && !pet->GetCreatureInfo()->isTameable(CanTameExoticPets())) - RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true); + RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } */ @@ -4418,7 +4418,7 @@ bool Player::resetTalents(bool no_cost) void Player::SetFreeTalentPoints(uint32 points) { sScriptMgr->OnPlayerFreeTalentPointsChanged(this, points); - SetUInt32Value(PLAYER_CHARACTER_POINTS1,points); + SetUInt32Value(PLAYER_CHARACTER_POINTS1, points); } Mail* Player::GetMail(uint32 id) @@ -4747,7 +4747,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC { SQLTransaction trans = CharacterDatabase.BeginTransaction(); // Return back all mails with COD and Item 0 1 2 3 4 5 6 7 - QueryResult resultMail = CharacterDatabase.PQuery("SELECT id,messageType,mailTemplateId,sender,subject,body,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", guid); + QueryResult resultMail = CharacterDatabase.PQuery("SELECT id, messageType, mailTemplateId, sender, subject, body, money, has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", guid); if (resultMail) { do @@ -4777,7 +4777,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC MailDraft draft(subject, body); if (mailTemplateId) - draft = MailDraft(mailTemplateId,false); // items are already included + draft = MailDraft(mailTemplateId, false); // items are already included if (has_items) { @@ -4852,48 +4852,48 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC } while (resultFriends->NextRow()); } - trans->PAppend("DELETE FROM characters WHERE guid = '%u'",guid); + trans->PAppend("DELETE FROM characters WHERE guid = '%u'", guid); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_ACCOUNT_DATA); stmt->setUInt32(0, guid); trans->Append(stmt); - trans->PAppend("DELETE FROM character_declinedname WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_action WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_aura WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_gifts WHERE guid = '%u'",guid); + trans->PAppend("DELETE FROM character_declinedname WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_action WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_aura WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_gifts WHERE guid = '%u'", guid); stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_HOMEBIND); stmt->setUInt32(0, guid); trans->Append(stmt); - trans->PAppend("DELETE FROM character_instance WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_inventory WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_queststatus WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_queststatus_rewarded WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_reputation WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_spell WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_spell_cooldown WHERE guid = '%u'",guid); + trans->PAppend("DELETE FROM character_instance WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_inventory WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_queststatus WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_queststatus_rewarded WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_reputation WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_spell WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_spell_cooldown WHERE guid = '%u'", guid); stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_GM_TICKETS); stmt->setUInt32(0, guid); trans->Append(stmt); - trans->PAppend("DELETE FROM item_instance WHERE owner_guid = '%u'",guid); - trans->PAppend("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'",guid,guid); - trans->PAppend("DELETE FROM mail WHERE receiver = '%u'",guid); - trans->PAppend("DELETE FROM mail_items WHERE receiver = '%u'",guid); - trans->PAppend("DELETE FROM character_pet WHERE owner = '%u'",guid); - trans->PAppend("DELETE FROM character_pet_declinedname WHERE owner = '%u'",guid); + trans->PAppend("DELETE FROM item_instance WHERE owner_guid = '%u'", guid); + trans->PAppend("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'", guid, guid); + trans->PAppend("DELETE FROM mail WHERE receiver = '%u'", guid); + trans->PAppend("DELETE FROM mail_items WHERE receiver = '%u'", guid); + trans->PAppend("DELETE FROM character_pet WHERE owner = '%u'", guid); + trans->PAppend("DELETE FROM character_pet_declinedname WHERE owner = '%u'", guid); trans->PAppend("DELETE FROM character_achievement WHERE guid = '%u' " // NOTE: These achievements have flags & 256 in DBC. "AND achievement NOT BETWEEN '456' AND '467' " // Realm First Level 80 "AND achievement NOT BETWEEN '1400' AND '1427' " // Realm First Raid Achievements "AND achievement NOT IN(1463, 3117, 3259) ", guid); // Realm First Northen Vanguard + Raid Achievements - trans->PAppend("DELETE FROM character_achievement_progress WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_equipmentsets WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'",guid, guid); - trans->PAppend("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'",guid); + trans->PAppend("DELETE FROM character_achievement_progress WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_equipmentsets WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'", guid, guid); + trans->PAppend("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'", guid); stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_BGDATA); stmt->setUInt32(0, guid); trans->Append(stmt); - trans->PAppend("DELETE FROM character_glyphs WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_queststatus_daily WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_talent WHERE guid = '%u'",guid); - trans->PAppend("DELETE FROM character_skills WHERE guid = '%u'",guid); + trans->PAppend("DELETE FROM character_glyphs WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_queststatus_daily WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_talent WHERE guid = '%u'", guid); + trans->PAppend("DELETE FROM character_skills WHERE guid = '%u'", guid); CharacterDatabase.CommitTransaction(trans); break; @@ -4938,7 +4938,7 @@ void Player::DeleteOldCharacters(uint32 keepDays) QueryResult resultChars = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Account FROM characters WHERE deleteDate IS NOT NULL AND deleteDate < '%u'", uint32(time(NULL) - time_t(keepDays * DAY))); if (resultChars) { - sLog->outString("Player::DeleteOldChars: Found " UI64FMTD " character(s) to delete",resultChars->GetRowCount()); + sLog->outString("Player::DeleteOldChars: Found " UI64FMTD " character(s) to delete", resultChars->GetRowCount()); do { Field *charFields = resultChars->Fetch(); @@ -4957,7 +4957,7 @@ void Player::SetMovement(PlayerMovementType pType) case MOVE_WATER_WALK: data.Initialize(SMSG_MOVE_WATER_WALK, GetPackGUID().size()+4); break; case MOVE_LAND_WALK: data.Initialize(SMSG_MOVE_LAND_WALK, GetPackGUID().size()+4); break; default: - sLog->outError("Player::SetMovement: Unsupported move type (%d), data not sent to client.",pType); + sLog->outError("Player::SetMovement: Unsupported move type (%d), data not sent to client.", pType); return; } data.append(GetPackGUID()); @@ -5058,8 +5058,8 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) // trigger update zone for alive state zone updates uint32 newzone, newarea; - GetZoneAndAreaId(newzone,newarea); - UpdateZone(newzone,newarea); + GetZoneAndAreaId(newzone, newarea); + UpdateZone(newzone, newarea); sOutdoorPvPMgr->HandlePlayerResurrects(this, newzone); if (InBattleground()) @@ -5241,7 +5241,7 @@ void Player::DurabilityLossAll(double percent, bool inventory) { for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) - DurabilityLoss(pItem,percent); + DurabilityLoss(pItem, percent); if (inventory) { @@ -5250,7 +5250,7 @@ void Player::DurabilityLossAll(double percent, bool inventory) for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) - DurabilityLoss(pItem,percent); + DurabilityLoss(pItem, percent); // keys not have durability //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) @@ -5259,7 +5259,7 @@ void Player::DurabilityLossAll(double percent, bool inventory) if (Bag* pBag = GetBagByPos(i)) for (uint32 j = 0; j < pBag->GetBagSize(); j++) if (Item* pItem = GetItemByPos(i, j)) - DurabilityLoss(pItem,percent); + DurabilityLoss(pItem, percent); } } @@ -5278,14 +5278,14 @@ void Player::DurabilityLoss(Item* item, double percent) if (pDurabilityLoss < 1) pDurabilityLoss = 1; - DurabilityPointsLoss(item,pDurabilityLoss); + DurabilityPointsLoss(item, pDurabilityLoss); } void Player::DurabilityPointsLossAll(int32 points, bool inventory) { for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++) if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) - DurabilityPointsLoss(pItem,points); + DurabilityPointsLoss(pItem, points); if (inventory) { @@ -5294,7 +5294,7 @@ void Player::DurabilityPointsLossAll(int32 points, bool inventory) for (uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++) if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) - DurabilityPointsLoss(pItem,points); + DurabilityPointsLoss(pItem, points); // keys not have durability //for (int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++) @@ -5303,7 +5303,7 @@ void Player::DurabilityPointsLossAll(int32 points, bool inventory) if (Bag* pBag = (Bag*)GetItemByPos(INVENTORY_SLOT_BAG_0, i)) for (uint32 j = 0; j < pBag->GetBagSize(); j++) if (Item* pItem = GetItemByPos(i, j)) - DurabilityPointsLoss(pItem,points); + DurabilityPointsLoss(pItem, points); } } @@ -5322,13 +5322,13 @@ void Player::DurabilityPointsLoss(Item* item, int32 points) { // modify item stats _before_ Durability set to 0 to pass _ApplyItemMods internal check if (pNewDurability == 0 && pOldDurability > 0 && item->IsEquipped()) - _ApplyItemMods(item,item->GetSlot(), false); + _ApplyItemMods(item, item->GetSlot(), false); item->SetUInt32Value(ITEM_FIELD_DURABILITY, pNewDurability); // modify item stats _after_ restore durability to pass _ApplyItemMods internal check if (pNewDurability > 0 && pOldDurability == 0 && item->IsEquipped()) - _ApplyItemMods(item,item->GetSlot(), true); + _ApplyItemMods(item, item->GetSlot(), true); item->SetState(ITEM_CHANGED, this); } @@ -5337,7 +5337,7 @@ void Player::DurabilityPointsLoss(Item* item, int32 points) void Player::DurabilityPointLossForEquipSlot(EquipmentSlots slot) { if (Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) - DurabilityPointsLoss(pItem,1); + DurabilityPointsLoss(pItem, 1); } uint32 Player::DurabilityRepairAll(bool cost, float discountMod, bool guildBank) @@ -5345,14 +5345,14 @@ uint32 Player::DurabilityRepairAll(bool cost, float discountMod, bool guildBank) uint32 TotalCost = 0; // equipped, backpack, bags itself for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++) - TotalCost += DurabilityRepair(((INVENTORY_SLOT_BAG_0 << 8) | i),cost,discountMod, guildBank); + TotalCost += DurabilityRepair(((INVENTORY_SLOT_BAG_0 << 8) | i), cost, discountMod, guildBank); // bank, buyback and keys not repaired // items in inventory bags for (uint8 j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; j++) for (uint8 i = 0; i < MAX_BAG_SIZE; i++) - TotalCost += DurabilityRepair(((j << 8) | i),cost,discountMod, guildBank); + TotalCost += DurabilityRepair(((j << 8) | i), cost, discountMod, guildBank); return TotalCost; } @@ -5392,7 +5392,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g return TotalCost; } - uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class,ditemProto->SubClass)]; + uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class, ditemProto->SubClass)]; uint32 costs = uint32(LostDurability*dmultiplier*double(dQualitymodEntry->quality_mod)); costs = uint32(costs * discountMod * sWorld->getRate(RATE_REPAIRCOST)); @@ -5432,7 +5432,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g // reapply mods for total broken and repaired item if equipped if (IsEquipmentPos(pos) && !curDurability) - _ApplyItemMods(item,pos & 255, true); + _ApplyItemMods(item, pos & 255, true); return TotalCost; } @@ -5623,7 +5623,7 @@ void Player::UpdateDefense() { uint32 defense_skill_gain = sWorld->getIntConfig(CONFIG_SKILL_GAIN_DEFENSE); - if (UpdateSkill(SKILL_DEFENSE,defense_skill_gain)) + if (UpdateSkill(SKILL_DEFENSE, defense_skill_gain)) { // update dependent from defense skill part UpdateDefenseBonusesMod(); @@ -5865,8 +5865,8 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) case CR_HASTE_MELEE: { float RatingChange = value / GetRatingCoefficient(cr); - ApplyAttackTimePercentMod(BASE_ATTACK,RatingChange,apply); - ApplyAttackTimePercentMod(OFF_ATTACK,RatingChange,apply); + ApplyAttackTimePercentMod(BASE_ATTACK, RatingChange, apply); + ApplyAttackTimePercentMod(OFF_ATTACK, RatingChange, apply); break; } case CR_HASTE_RANGED: @@ -5878,7 +5878,7 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) case CR_HASTE_SPELL: { float RatingChange = value / GetRatingCoefficient(cr); - ApplyCastTimePercentMod(RatingChange,apply); + ApplyCastTimePercentMod(RatingChange, apply); break; } default: @@ -6023,11 +6023,11 @@ bool Player::UpdateSkill(uint32 skill_id, uint32 step) if (new_value > max) new_value = max; - SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(new_value,max)); + SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(new_value, max)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; UpdateSkillEnchantments(skill_id, value, new_value); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,skill_id); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, skill_id); return true; } @@ -6090,17 +6090,17 @@ bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLeve case SKILL_LOCKPICKING: case SKILL_JEWELCRAFTING: case SKILL_INSCRIPTION: - return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain); + return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator, gathering_skill_gain); case SKILL_SKINNING: if (sWorld->getIntConfig(CONFIG_SKILL_CHANCE_SKINNING_STEPS) == 0) - return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain); + return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator, gathering_skill_gain); else return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator) >> (SkillValue/sWorld->getIntConfig(CONFIG_SKILL_CHANCE_SKINNING_STEPS)), gathering_skill_gain); case SKILL_MINING: if (sWorld->getIntConfig(CONFIG_SKILL_CHANCE_MINING_STEPS) == 0) - return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator,gathering_skill_gain); + return UpdateSkillPro(SkillId, SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator, gathering_skill_gain); else - return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator) >> (SkillValue/sWorld->getIntConfig(CONFIG_SKILL_CHANCE_MINING_STEPS)),gathering_skill_gain); + return UpdateSkillPro(SkillId, (SkillGainChance(SkillValue, RedLevel+100, RedLevel+50, RedLevel+25)*Multiplicator) >> (SkillValue/sWorld->getIntConfig(CONFIG_SKILL_CHANCE_MINING_STEPS)), gathering_skill_gain); } return false; } @@ -6115,13 +6115,13 @@ bool Player::UpdateFishingSkill() uint32 gathering_skill_gain = sWorld->getIntConfig(CONFIG_SKILL_GAIN_GATHERING); - return UpdateSkillPro(SKILL_FISHING,chance*10,gathering_skill_gain); + return UpdateSkillPro(SKILL_FISHING, chance*10, gathering_skill_gain); } // levels sync. with spell requirement for skill levels to learn // bonus abilities in sSkillLineAbilityStore // Used only to avoid scan DBC at each skill grow -static uint32 bonusSkillLevels[] = {75,150,225,300,375,450}; +static uint32 bonusSkillLevels[] = {75, 150, 225, 300, 375, 450}; bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) { @@ -6148,7 +6148,7 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) if (!MaxValue || !SkillValue || SkillValue >= MaxValue) return false; - int32 Roll = irand(1,1000); + int32 Roll = irand(1, 1000); if (Roll <= Chance) { @@ -6156,7 +6156,7 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) if (new_value > MaxValue) new_value = MaxValue; - SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(new_value,MaxValue)); + SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(new_value, MaxValue)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; for (uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl) @@ -6168,7 +6168,7 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) } } UpdateSkillEnchantments(SkillId, SkillValue, new_value); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,SkillId); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, SkillId); sLog->outDebug(LOG_FILTER_PLAYER_SKILLS, "Player::UpdateSkillPro Chance=%3.1f%% taken", Chance/10.0); return true; } @@ -6199,18 +6199,18 @@ void Player::UpdateWeaponSkill (WeaponAttackType attType) { case BASE_ATTACK: { - Item *tmpitem = GetWeaponForAttack(attType,true); + Item *tmpitem = GetWeaponForAttack(attType, true); if (!tmpitem) - UpdateSkill(SKILL_UNARMED,weapon_skill_gain); + UpdateSkill(SKILL_UNARMED, weapon_skill_gain); else if (tmpitem->GetTemplate()->SubClass != ITEM_SUBCLASS_WEAPON_FISHING_POLE) - UpdateSkill(tmpitem->GetSkill(),weapon_skill_gain); + UpdateSkill(tmpitem->GetSkill(), weapon_skill_gain); break; } case OFF_ATTACK: case RANGED_ATTACK: { - Item *tmpitem = GetWeaponForAttack(attType,true); + Item *tmpitem = GetWeaponForAttack(attType, true); if (tmpitem) UpdateSkill(tmpitem->GetSkill(), weapon_skill_gain); break; @@ -6258,7 +6258,7 @@ void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool de return; } -void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent) +void Player::ModifySkillBonus(uint32 skillid, int32 val, bool talent) { SkillStatusMap::const_iterator itr = mSkillStatus.find(skillid); if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED) @@ -6271,9 +6271,9 @@ void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent) int16 perm_bonus = SKILL_PERM_BONUS(bonus_val); if (talent) // permanent bonus stored in high part - SetUInt32Value(bonusIndex,MAKE_SKILL_BONUS(temp_bonus,perm_bonus+val)); + SetUInt32Value(bonusIndex, MAKE_SKILL_BONUS(temp_bonus, perm_bonus+val)); else // temporary/item bonus stored in low part - SetUInt32Value(bonusIndex,MAKE_SKILL_BONUS(temp_bonus+val,perm_bonus)); + SetUInt32Value(bonusIndex, MAKE_SKILL_BONUS(temp_bonus+val, perm_bonus)); } void Player::UpdateSkillsForLevel() @@ -6293,7 +6293,7 @@ void Player::UpdateSkillsForLevel() if (!pSkill) continue; - if (GetSkillRangeType(pSkill,false) != SKILL_RANGE_LEVEL) + if (GetSkillRangeType(pSkill, false) != SKILL_RANGE_LEVEL) continue; uint32 valueIndex = PLAYER_SKILL_VALUE_INDEX(itr->second.pos); @@ -6307,13 +6307,13 @@ void Player::UpdateSkillsForLevel() /// maximize skill always if (alwaysMaxSkill) { - SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(maxSkill,maxSkill)); + SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(maxSkill, maxSkill)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; } else if (max != maxconfskill) /// update max skill value if current max skill not maximized { - SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(val,maxSkill)); + SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(val, maxSkill)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; } @@ -6337,7 +6337,7 @@ void Player::UpdateSkillsToMaxSkillsForLevel() if (max > 1) { - SetUInt32Value(valueIndex,MAKE_SKILL_VALUE(max,max)); + SetUInt32Value(valueIndex, MAKE_SKILL_VALUE(max, max)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; } @@ -6368,24 +6368,24 @@ void Player::SetSkill(uint16 id, uint16 step, uint16 newVal, uint16 maxVal) // update step SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos), MAKE_PAIR32(id, step)); // update value - SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos),MAKE_SKILL_VALUE(newVal,maxVal)); + SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos), MAKE_SKILL_VALUE(newVal, maxVal)); if (itr->second.uState != SKILL_NEW) itr->second.uState = SKILL_CHANGED; learnSkillRewardedSpells(id, newVal); // if skill value is going up, update enchantments after setting the new value if (newVal > currVal) UpdateSkillEnchantments(id, currVal, newVal); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,id); - GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL,id); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, id); + GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL, id); } else //remove { //remove enchantments needing this skill UpdateSkillEnchantments(id, currVal, 0); // clear skill fields - SetUInt32Value(PLAYER_SKILL_INDEX(itr->second.pos),0); - SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos),0); - SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos),0); + SetUInt32Value(PLAYER_SKILL_INDEX(itr->second.pos), 0); + SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(itr->second.pos), 0); + SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(itr->second.pos), 0); // mark as deleted or simply remove from map if not saved yet if (itr->second.uState != SKILL_NEW) @@ -6414,7 +6414,7 @@ void Player::SetSkill(uint16 id, uint16 step, uint16 newVal, uint16 maxVal) } SetUInt32Value(PLAYER_SKILL_INDEX(i), MAKE_PAIR32(id, step)); - SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(newVal, maxVal)); + SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i), MAKE_SKILL_VALUE(newVal, maxVal)); UpdateSkillEnchantments(id, currVal, newVal); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL, id); GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL, id); @@ -6429,7 +6429,7 @@ void Player::SetSkill(uint16 id, uint16 step, uint16 newVal, uint16 maxVal) mSkillStatus.insert(SkillStatusMap::value_type(id, SkillStatusData(i, SKILL_NEW))); // apply skill bonuses - SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i),0); + SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i), 0); // temporary bonuses AuraEffectList const& mModSkill = GetAuraEffectsByType(SPELL_AURA_MOD_SKILL); @@ -6647,7 +6647,7 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type) ActionButton& ab = m_actionButtons[button]; // set data and update to CHANGED if not NEW - ab.SetActionAndType(action,ActionButtonType(type)); + ab.SetActionAndType(action, ActionButtonType(type)); sLog->outDetail("Player '%u' Added Action '%u' (type %u) to Button '%u'", GetGUIDLow(), action, type, button); return &ab; @@ -6771,7 +6771,7 @@ void Player::CheckAreaExploreAndOutdoor() return; bool isOutdoor; - uint16 areaFlag = GetBaseMap()->GetAreaFlag(GetPositionX(),GetPositionY(),GetPositionZ(), &isOutdoor); + uint16 areaFlag = GetBaseMap()->GetAreaFlag(GetPositionX(), GetPositionY(), GetPositionZ(), &isOutdoor); if (sWorld->getBoolConfig(CONFIG_VMAP_INDOOR_CHECK) && !isOutdoor) RemoveAurasWithAttribute(SPELL_ATTR0_OUTDOORS_ONLY); @@ -6782,7 +6782,7 @@ void Player::CheckAreaExploreAndOutdoor() if (offset >= PLAYER_EXPLORED_ZONES_SIZE) { - sLog->outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < %u ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset, PLAYER_EXPLORED_ZONES_SIZE); + sLog->outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < %u ).", areaFlag, GetPositionX(), GetPositionY(), offset, offset, PLAYER_EXPLORED_ZONES_SIZE); return; } @@ -6795,17 +6795,17 @@ void Player::CheckAreaExploreAndOutdoor() GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA); - AreaTableEntry const *p = GetAreaEntryByAreaFlagAndMap(areaFlag,GetMapId()); + AreaTableEntry const *p = GetAreaEntryByAreaFlagAndMap(areaFlag, GetMapId()); if (!p) { - sLog->outError("PLAYER: Player %u discovered unknown area (x: %f y: %f map: %u", GetGUIDLow(), GetPositionX(),GetPositionY(),GetMapId()); + sLog->outError("PLAYER: Player %u discovered unknown area (x: %f y: %f map: %u", GetGUIDLow(), GetPositionX(), GetPositionY(), GetMapId()); } else if (p->area_level > 0) { uint32 area = p->ID; if (getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { - SendExplorationExperience(area,0); + SendExplorationExperience(area, 0); } else { @@ -6831,7 +6831,7 @@ void Player::CheckAreaExploreAndOutdoor() } GiveXP(XP, NULL); - SendExplorationExperience(area,XP); + SendExplorationExperience(area, XP); } sLog->outDetail("PLAYER: Player %u discovered a new area: %u", GetGUIDLow(), area); } @@ -7040,7 +7040,7 @@ void Player::UpdateHonorFields() // this is the first update today, reset today's contribution SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0); - SetUInt32Value(PLAYER_FIELD_KILLS, MAKE_PAIR32(0,kills_today)); + SetUInt32Value(PLAYER_FIELD_KILLS, MAKE_PAIR32(0, kills_today)); } else { @@ -7167,8 +7167,8 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, int32 honor, bool pvpt // victim_guid - for show victim name in log // victim_rank [1..4] HK: <dishonored rank> // victim_rank [5..19] HK: <alliance\horde rank> - // victim_rank [0,20+] HK: <> - WorldPacket data(SMSG_PVP_CREDIT,4+8+4); + // victim_rank [0, 20+] HK: <> + WorldPacket data(SMSG_PVP_CREDIT, 4+8+4); data << honor; data << victim_guid; data << victim_rank; @@ -7291,7 +7291,7 @@ uint32 Player::GetZoneIdFromDB(uint64 guid) if (!zone) { // stored zone is zero, use generic and slow zone detection - result = CharacterDatabase.PQuery("SELECT map,position_x,position_y,position_z FROM characters WHERE guid='%u'", guidLow); + result = CharacterDatabase.PQuery("SELECT map, position_x, position_y, position_z FROM characters WHERE guid='%u'", guidLow); if (!result) return 0; fields = result->Fetch(); @@ -7300,7 +7300,7 @@ uint32 Player::GetZoneIdFromDB(uint64 guid) float posy = fields[2].GetFloat(); float posz = fields[3].GetFloat(); - zone = sMapMgr->GetZoneId(map,posx,posy,posz); + zone = sMapMgr->GetZoneId(map, posx, posy, posz); if (zone > 0) CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, guidLow); @@ -7404,7 +7404,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) { SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); SetRestType(REST_TYPE_IN_CITY); - InnEnter(time(0),GetMapId(),0,0,0); + InnEnter(time(0), GetMapId(), 0, 0, 0); } pvpInfo.inNoPvPArea = true; } @@ -7509,7 +7509,7 @@ void Player::DuelComplete(DuelCompleteType type) data << uint8(type == DUEL_WON ? 0 : 1); // 0 = just won; 1 = fled data << duel->opponent->GetName(); data << GetName(); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } sScriptMgr->OnPlayerDuelEnd(duel->opponent, this, type); @@ -7550,7 +7550,7 @@ void Player::DuelComplete(DuelCompleteType type) //Remove Duel Flag object GameObject* obj = GetMap()->GetGameObject(GetUInt64Value(PLAYER_DUEL_ARBITER)); if (obj) - duel->initiator->RemoveGameObject(obj,true); + duel->initiator->RemoveGameObject(obj, true); /* remove auras */ AuraApplicationMap &itsAuras = duel->opponent->GetAppliedAuras(); @@ -7586,7 +7586,7 @@ void Player::DuelComplete(DuelCompleteType type) // Honor points after duel (the winner) - ImpConfig if (uint32 amount = sWorld->getIntConfig(CONFIG_HONOR_AFTER_DUEL)) - duel->opponent->RewardHonor(NULL,1,amount); + duel->opponent->RewardHonor(NULL, 1, amount); //cleanups SetUInt64Value(PLAYER_DUEL_ARBITER, 0); @@ -7602,7 +7602,7 @@ void Player::DuelComplete(DuelCompleteType type) //---------------------------------------------------------// -void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) +void Player::_ApplyItemMods(Item *item, uint8 slot, bool apply) { if (slot >= INVENTORY_SLOT_BAG_END || !item) return; @@ -7616,7 +7616,7 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) if (item->IsBroken()) return; - sLog->outDetail("applying mods for item %u ",item->GetGUIDLow()); + sLog->outDetail("applying mods for item %u ", item->GetGUIDLow()); uint8 attacktype = Player::GetAttackBySlot(slot); @@ -7624,14 +7624,14 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) CorrectMetaGemEnchants(slot, apply); if (attacktype < MAX_ATTACK) - _ApplyWeaponDependentAuraMods(item,WeaponAttackType(attacktype),apply); + _ApplyWeaponDependentAuraMods(item, WeaponAttackType(attacktype), apply); - _ApplyItemBonuses(proto,slot,apply); + _ApplyItemBonuses(proto, slot, apply); if (slot == EQUIPMENT_SLOT_RANGED) _ApplyAmmoBonuses(); - ApplyItemEquipSpell(item,apply); + ApplyItemEquipSpell(item, apply); ApplyEnchantment(item, apply); sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "_ApplyItemMods complete."); @@ -7980,7 +7980,7 @@ void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const *proto, ScalingSt UpdateDamagePhysical(attType); } -void Player::_ApplyWeaponDependentAuraMods(Item *item,WeaponAttackType attackType,bool apply) +void Player::_ApplyWeaponDependentAuraMods(Item *item, WeaponAttackType attackType, bool apply) { AuraEffectList const& auraCritList = GetAuraEffectsByType(SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); for (AuraEffectList::const_iterator itr = auraCritList.begin(); itr != auraCritList.end(); ++itr) @@ -8081,7 +8081,7 @@ void Player::ApplyItemEquipSpell(Item *item, bool apply, bool form_change) if (!spellproto) continue; - ApplyEquipSpell(spellproto,item,apply,form_change); + ApplyEquipSpell(spellproto, item, apply, form_change); } } @@ -8103,7 +8103,7 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply sLog->outStaticDebug("WORLD: cast %s Equip spellId - %i", (item ? "item" : "itemset"), spellInfo->Id); - CastSpell(this,spellInfo,true,item); + CastSpell(this, spellInfo, true, item); } else { @@ -8115,7 +8115,7 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply } if (item) - RemoveAurasDueToItemSpell(item,spellInfo->Id); // un-apply all spells, not only at-equipped + RemoveAurasDueToItemSpell(item, spellInfo->Id); // un-apply all spells, not only at-equipped else RemoveAurasDueToSpell(spellInfo->Id); // un-apply spell (item set case) } @@ -8127,8 +8127,8 @@ void Player::UpdateEquipSpellsAtFormChange() { if (m_items[i] && !m_items[i]->IsBroken() && CanUseAttackType(GetAttackBySlot(i))) { - ApplyItemEquipSpell(m_items[i],false,true); // remove spells that not fit to form - ApplyItemEquipSpell(m_items[i],true,true); // add spells that fit form but not active + ApplyItemEquipSpell(m_items[i], false, true); // remove spells that not fit to form + ApplyItemEquipSpell(m_items[i], true, true); // add spells that fit form but not active } } @@ -8145,8 +8145,8 @@ void Player::UpdateEquipSpellsAtFormChange() if (!spellInfo) continue; - ApplyEquipSpell(spellInfo,NULL,false,true); // remove spells that not fit to form - ApplyEquipSpell(spellInfo,NULL,true,true); // add spells that fit form but not active + ApplyEquipSpell(spellInfo, NULL, false, true); // remove spells that not fit to form + ApplyEquipSpell(spellInfo, NULL, true, true); // add spells that fit form but not active } } } @@ -8158,7 +8158,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i) { // If usable, try to cast item spell - if (Item * item = GetItemByPos(INVENTORY_SLOT_BAG_0,i)) + if (Item * item = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) if (!item->IsBroken() && CanUseAttackType(attType)) if (ItemTemplate const *proto = item->GetTemplate()) { @@ -8290,7 +8290,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 } // Apply spell mods - ApplySpellMod(pEnchant->spellid[s],SPELLMOD_CHANCE_OF_SUCCESS,chance); + ApplySpellMod(pEnchant->spellid[s], SPELLMOD_CHANCE_OF_SUCCESS, chance); // Shiv has 100% chance to apply the poison if (FindCurrentSpellBySpellId(5938) && e_slot == TEMP_ENCHANTMENT_SLOT) @@ -8307,7 +8307,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 } } -void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex) +void Player::CastItemUseSpell(Item *item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex) { ItemTemplate const* proto = item->GetTemplate(); // special learning case @@ -8319,12 +8319,12 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c SpellEntry const *spellInfo = sSpellStore.LookupEntry(learn_spell_id); if (!spellInfo) { - sLog->outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring ",proto->ItemId, learn_spell_id); - SendEquipError(EQUIP_ERR_NONE,item,NULL); + sLog->outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring ", proto->ItemId, learn_spell_id); + SendEquipError(EQUIP_ERR_NONE, item, NULL); return; } - Spell *spell = new Spell(this, spellInfo,false); + Spell *spell = new Spell(this, spellInfo, false); spell->m_CastItem = item; spell->m_cast_count = cast_count; //set count of casts spell->SetSpellValue(SPELLVALUE_BASE_POINT0, learning_spell_id); @@ -8351,7 +8351,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId); if (!spellInfo) { - sLog->outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring",proto->ItemId, spellData.SpellId); + sLog->outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring", proto->ItemId, spellData.SpellId); continue; } @@ -8408,7 +8408,7 @@ void Player::_RemoveAllItemMods() // item set bonuses not dependent from item broken state if (proto->ItemSet) - RemoveItemsSetItem(this,proto); + RemoveItemsSetItem(this, proto); if (m_items[i]->IsBroken() || !CanUseAttackType(GetAttackBySlot(i))) continue; @@ -8430,9 +8430,9 @@ void Player::_RemoveAllItemMods() uint32 attacktype = Player::GetAttackBySlot(i); if (attacktype < MAX_ATTACK) - _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),false); + _ApplyWeaponDependentAuraMods(m_items[i], WeaponAttackType(attacktype), false); - _ApplyItemBonuses(proto,i, false); + _ApplyItemBonuses(proto, i, false); if (i == EQUIPMENT_SLOT_RANGED) _ApplyAmmoBonuses(); @@ -8459,9 +8459,9 @@ void Player::_ApplyAllItemMods() uint32 attacktype = Player::GetAttackBySlot(i); if (attacktype < MAX_ATTACK) - _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),true); + _ApplyWeaponDependentAuraMods(m_items[i], WeaponAttackType(attacktype), true); - _ApplyItemBonuses(proto,i, true); + _ApplyItemBonuses(proto, i, true); if (i == EQUIPMENT_SLOT_RANGED) _ApplyAmmoBonuses(); @@ -8478,12 +8478,12 @@ void Player::_ApplyAllItemMods() // item set bonuses not dependent from item broken state if (proto->ItemSet) - AddItemsSetItem(this,m_items[i]); + AddItemsSetItem(this, m_items[i]); if (m_items[i]->IsBroken() || !CanUseAttackType(GetAttackBySlot(i))) continue; - ApplyItemEquipSpell(m_items[i],true); + ApplyItemEquipSpell(m_items[i], true); ApplyEnchantment(m_items[i], true); } } @@ -8504,7 +8504,7 @@ void Player::_ApplyAllLevelScaleItemMods(bool apply) if (!proto) continue; - _ApplyItemBonuses(proto,i, apply, true); + _ApplyItemBonuses(proto, i, apply, true); } } } @@ -8587,7 +8587,7 @@ void Player::RemovedInsignia(Player* looterPlr) // We have to convert player corpse to bones, not to be able to resurrect there // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG - Corpse *bones = sObjectAccessor->ConvertCorpseForPlayer(GetGUID(),true); + Corpse *bones = sObjectAccessor->ConvertCorpseForPlayer(GetGUID(), true); if (!bones) return; @@ -8624,7 +8624,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type) // not check distance for GO in case owned GO (fishing bobber case, for example) // And permit out of range GO with no owner in case fishing hole - if (!go || (loot_type != LOOT_FISHINGHOLE && (loot_type != LOOT_FISHING || go->GetOwnerGUID() != GetGUID()) && !go->IsWithinDistInMap(this,INTERACTION_DISTANCE)) || (loot_type == LOOT_CORPSE && go->GetRespawnTime() && go->isSpawnedByDefault())) + if (!go || (loot_type != LOOT_FISHINGHOLE && (loot_type != LOOT_FISHING || go->GetOwnerGUID() != GetGUID()) && !go->IsWithinDistInMap(this, INTERACTION_DISTANCE)) || (loot_type == LOOT_CORPSE && go->GetRespawnTime() && go->isSpawnedByDefault())) { SendLootRelease(guid); return; @@ -8640,7 +8640,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type) if ((go->GetEntry() == BG_AV_OBJECTID_MINE_N || go->GetEntry() == BG_AV_OBJECTID_MINE_S)) if (Battleground *bg = GetBattleground()) if (bg->GetTypeID(true) == BATTLEGROUND_AV) - if (!(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(go->GetEntry(),GetTeam()))) + if (!(((BattlegroundAV*)bg)->PlayerCanDoMineQuest(go->GetEntry(), GetTeam()))) { SendLootRelease(guid); return; @@ -8665,7 +8665,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type) } if (loot_type == LOOT_FISHING) - go->getFishLoot(loot,this); + go->getFishLoot(loot, this); if (go->GetGOInfo()->type == GAMEOBJECT_TYPE_CHEST && go->GetGOInfo()->chest.groupLootRules) { @@ -8738,16 +8738,16 @@ void Player::SendLoot(uint64 guid, LootType loot_type) switch (loot_type) { case LOOT_DISENCHANTING: - loot->FillLoot(item->GetTemplate()->DisenchantID, LootTemplates_Disenchant, this,true); + loot->FillLoot(item->GetTemplate()->DisenchantID, LootTemplates_Disenchant, this, true); break; case LOOT_PROSPECTING: - loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this,true); + loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this, true); break; case LOOT_MILLING: - loot->FillLoot(item->GetEntry(), LootTemplates_Milling, this,true); + loot->FillLoot(item->GetEntry(), LootTemplates_Milling, this, true); break; default: - loot->generateMoneyLoot(item->GetTemplate()->MinMoneyLoot,item->GetTemplate()->MaxMoneyLoot); + loot->generateMoneyLoot(item->GetTemplate()->MinMoneyLoot, item->GetTemplate()->MaxMoneyLoot); loot->FillLoot(item->GetEntry(), LootTemplates_Item, this, true, loot->gold != 0); break; } @@ -8788,7 +8788,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type) Creature *creature = GetMap()->GetCreature(guid); // must be in range and creature must be alive for pickpocket and must be dead for another loot - if (!creature || creature->isAlive() != (loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this,INTERACTION_DISTANCE)) + if (!creature || creature->isAlive() != (loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this, INTERACTION_DISTANCE)) { SendLootRelease(guid); return; @@ -9590,7 +9590,7 @@ uint32 Player::GetXPRestBonus(uint32 xp) SetRestBonus(GetRestBonus() - rested_bonus); - sLog->outDetail("Player gain %u xp (+ %u Rested Bonus). Rested points=%f",xp+rested_bonus,rested_bonus,GetRestBonus()); + sLog->outDetail("Player gain %u xp (+ %u Rested Bonus). Rested points=%f", xp+rested_bonus, rested_bonus, GetRestBonus()); return rested_bonus; } @@ -9644,10 +9644,10 @@ void Player::SetVirtualItemSlot(uint8 i, Item* item) if (charges == 0) return; if (charges > 1) - item->SetEnchantmentCharges(TEMP_ENCHANTMENT_SLOT,charges-1); + item->SetEnchantmentCharges(TEMP_ENCHANTMENT_SLOT, charges-1); else if (charges <= 1) { - ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false); + ApplyEnchantment(item, TEMP_ENCHANTMENT_SLOT, false); item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT); } } @@ -9658,25 +9658,25 @@ void Player::SetSheath(SheathState sheathed) switch (sheathed) { case SHEATH_STATE_UNARMED: // no prepared weapon - SetVirtualItemSlot(0,NULL); - SetVirtualItemSlot(1,NULL); - SetVirtualItemSlot(2,NULL); + SetVirtualItemSlot(0, NULL); + SetVirtualItemSlot(1, NULL); + SetVirtualItemSlot(2, NULL); break; case SHEATH_STATE_MELEE: // prepared melee weapon { - SetVirtualItemSlot(0,GetWeaponForAttack(BASE_ATTACK,true)); - SetVirtualItemSlot(1,GetWeaponForAttack(OFF_ATTACK,true)); - SetVirtualItemSlot(2,NULL); + SetVirtualItemSlot(0, GetWeaponForAttack(BASE_ATTACK, true)); + SetVirtualItemSlot(1, GetWeaponForAttack(OFF_ATTACK, true)); + SetVirtualItemSlot(2, NULL); }; break; case SHEATH_STATE_RANGED: // prepared ranged weapon - SetVirtualItemSlot(0,NULL); - SetVirtualItemSlot(1,NULL); - SetVirtualItemSlot(2,GetWeaponForAttack(RANGED_ATTACK,true)); + SetVirtualItemSlot(0, NULL); + SetVirtualItemSlot(1, NULL); + SetVirtualItemSlot(2, GetWeaponForAttack(RANGED_ATTACK, true)); break; default: - SetVirtualItemSlot(0,NULL); - SetVirtualItemSlot(1,NULL); - SetVirtualItemSlot(2,NULL); + SetVirtualItemSlot(0, NULL); + SetVirtualItemSlot(1, NULL); + SetVirtualItemSlot(2, NULL); break; } Unit::SetSheath(sheathed); // this must visualize Sheath changing for other players... @@ -10412,13 +10412,13 @@ bool Player::HasItemTotemCategory(uint32 TotemCategory) const for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) { pItem = GetUseableItemByPos(INVENTORY_SLOT_BAG_0, i); - if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory,TotemCategory)) + if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory, TotemCategory)) return true; } for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) { pItem = GetUseableItemByPos(INVENTORY_SLOT_BAG_0, i); - if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory,TotemCategory)) + if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory, TotemCategory)) return true; } for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) @@ -10428,7 +10428,7 @@ bool Player::HasItemTotemCategory(uint32 TotemCategory) const for (uint32 j = 0; j < pBag->GetBagSize(); ++j) { pItem = GetUseableItemByPos(i, j); - if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory,TotemCategory)) + if (pItem && IsTotemCategoryCompatiableWith(pItem->GetTemplate()->TotemCategory, TotemCategory)) return true; } } @@ -10479,7 +10479,7 @@ InventoryResult Player::_CanStoreItem_InSpecificSlot(uint8 bag, uint8 slot, Item if (slot >= pBagProto->ContainerSlots) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; - if (!ItemCanGoIntoBag(pProto,pBagProto)) + if (!ItemCanGoIntoBag(pProto, pBagProto)) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; } @@ -10532,7 +10532,7 @@ InventoryResult Player::_CanStoreItem_InBag(uint8 bag, ItemPosCountVec &dest, It if (non_specialized != (pBagProto->Class == ITEM_CLASS_CONTAINER && pBagProto->SubClass == ITEM_SUBCLASS_CONTAINER)) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; - if (!ItemCanGoIntoBag(pProto,pBagProto)) + if (!ItemCanGoIntoBag(pProto, pBagProto)) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; for (uint32 j = 0; j < pBag->GetBagSize(); j++) @@ -10663,7 +10663,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de // check count of items (skip for auto move for same player from bank) uint32 no_similar_count = 0; // can't store this amount similar items - InventoryResult res = _CanTakeMoreSimilarItems(entry,count,pItem,&no_similar_count); + InventoryResult res = _CanTakeMoreSimilarItems(entry, count, pItem, &no_similar_count); if (res != EQUIP_ERR_OK) { if (count == no_similar_count) @@ -10678,7 +10678,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de // in specific slot if (bag != NULL_BAG && slot != NULL_SLOT) { - res = _CanStoreItem_InSpecificSlot(bag,slot,dest,pProto,count,swap,pItem); + res = _CanStoreItem_InSpecificSlot(bag, slot, dest, pProto, count, swap, pItem); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10707,7 +10707,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de { if (bag == INVENTORY_SLOT_BAG_0) // inventory { - res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10725,7 +10725,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS; } - res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10746,9 +10746,9 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de else // equipped bag { // we need check 2 time (specialized/non_specialized), use NULL_BAG to prevent skipping bag - res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, true, false, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) - res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, true, true, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) { @@ -10776,7 +10776,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de if (pProto->BagFamily & BAG_FAMILY_MASK_KEYS) { uint32 keyringSize = GetMaxKeyringSize(); - res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,KEYRING_SLOT_START+keyringSize,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, KEYRING_SLOT_START+keyringSize, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10794,7 +10794,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS; } - res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10814,7 +10814,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de } else if (pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS) { - res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10833,7 +10833,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de } } - res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10853,9 +10853,9 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de } else // equipped bag { - res = _CanStoreItem_InBag(bag,dest,pProto,count,false,false,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, false, false, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) - res = _CanStoreItem_InBag(bag,dest,pProto,count,false,true,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, false, true, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) { @@ -10881,7 +10881,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de // search stack for merge to if (pProto->Stackable != 1) { - res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10899,7 +10899,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS; } - res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10921,7 +10921,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de { for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, true, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -10939,7 +10939,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, true, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -10961,7 +10961,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de if (pProto->BagFamily & BAG_FAMILY_MASK_KEYS) { uint32 keyringSize = GetMaxKeyringSize(); - res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START,KEYRING_SLOT_START+keyringSize,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(KEYRING_SLOT_START, KEYRING_SLOT_START+keyringSize, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -10981,7 +10981,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de } else if (pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS) { - res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START, CURRENCYTOKEN_SLOT_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -11002,7 +11002,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de for (uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, false, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11022,7 +11022,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de return EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG; // search free slot - res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START, INVENTORY_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) { if (no_space_count) @@ -11042,7 +11042,7 @@ InventoryResult Player::_CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &de for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, false, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11246,7 +11246,7 @@ InventoryResult Player::CanStoreItems(Item** pItems, int count) const // not plain container check if (pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER) && - ItemCanGoIntoBag(pProto,pBagProto)) + ItemCanGoIntoBag(pProto, pBagProto)) { for (uint32 j = 0; j < pBag->GetBagSize(); j++) { @@ -11439,7 +11439,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item *pItem, bool Item *offItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND); ItemPosCountVec off_dest; if (offItem && (!not_loading || - CanUnequipItem(uint16(INVENTORY_SLOT_BAG_0) << 8 | EQUIPMENT_SLOT_OFFHAND,false) != EQUIP_ERR_OK || + CanUnequipItem(uint16(INVENTORY_SLOT_BAG_0) << 8 | EQUIPMENT_SLOT_OFFHAND, false) != EQUIP_ERR_OK || CanStoreItem(NULL_BAG, NULL_SLOT, off_dest, offItem, false) != EQUIP_ERR_OK)) return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_INVENTORY_FULL; } @@ -11542,7 +11542,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest return res; } - res = _CanStoreItem_InSpecificSlot(bag,slot,dest,pProto,count,swap,pItem); + res = _CanStoreItem_InSpecificSlot(bag, slot, dest, pProto, count, swap, pItem); if (res != EQUIP_ERR_OK) return res; @@ -11563,7 +11563,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest { if (bag == INVENTORY_SLOT_BAG_0) { - res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) return res; @@ -11572,9 +11572,9 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest } else { - res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, true, false, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) - res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot); + res = _CanStoreItem_InBag(bag, dest, pProto, count, true, true, pItem, NULL_BAG, slot); if (res != EQUIP_ERR_OK) return res; @@ -11587,7 +11587,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest // search free slot in bag if (bag == INVENTORY_SLOT_BAG_0) { - res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) return res; @@ -11614,7 +11614,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest if (pProto->Stackable != 1) { // in slots - res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) return res; @@ -11626,7 +11626,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest { for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, true, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11637,7 +11637,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, true, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11651,7 +11651,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest { for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, false, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11661,7 +11661,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest } // search free space - res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot); + res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START, BANK_SLOT_ITEM_END, dest, pProto, count, false, pItem, bag, slot); if (res != EQUIP_ERR_OK) return res; @@ -11670,7 +11670,7 @@ InventoryResult Player::CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec &dest for (uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++) { - res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot); + res = _CanStoreItem_InBag(i, dest, pProto, count, false, true, pItem, bag, slot); if (res != EQUIP_ERR_OK) continue; @@ -11892,11 +11892,11 @@ Item* Player::StoreItem(ItemPosCountVec const& dest, Item* pItem, bool update) if (itr == dest.end()) { - lastItem = _StoreItem(pos,pItem,count,false,update); + lastItem = _StoreItem(pos, pItem, count, false, update); break; } - lastItem = _StoreItem(pos,pItem,count,true,update); + lastItem = _StoreItem(pos, pItem, count, true, update); } GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, entry); return lastItem; @@ -12270,7 +12270,7 @@ void Player::RemoveItem(uint8 bag, uint8 slot, bool update) // Common operation need to remove item from inventory without delete in trade, auction, guild bank, mail.... void Player::MoveItemFromInventory(uint8 bag, uint8 slot, bool update) { - if (Item* it = GetItemByPos(bag,slot)) + if (Item* it = GetItemByPos(bag, slot)) { ItemRemovedQuestCheck(it->GetEntry(), it->GetCount()); RemoveItem(bag, slot, update); @@ -12612,13 +12612,13 @@ void Player::DestroyItemCount(Item* pItem, uint32 &count, bool update) if (!pItem) return; - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "STORAGE: DestroyItemCount item (GUID: %u, Entry: %u) count = %u", pItem->GetGUIDLow(),pItem->GetEntry(), count); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "STORAGE: DestroyItemCount item (GUID: %u, Entry: %u) count = %u", pItem->GetGUIDLow(), pItem->GetEntry(), count); if (pItem->GetCount() <= count) { count -= pItem->GetCount(); - DestroyItem(pItem->GetBagSlot(),pItem->GetSlot(), update); + DestroyItem(pItem->GetBagSlot(), pItem->GetSlot(), update); } else { @@ -13237,7 +13237,7 @@ void Player::SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint3 void Player::SendSellError(SellResult msg, Creature* pCreature, uint64 guid, uint32 param) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SELL_ITEM"); - WorldPacket data(SMSG_SELL_ITEM,(8+8+(param?4:0)+1)); // last check 2.0.10 + WorldPacket data(SMSG_SELL_ITEM, (8+8+(param?4:0)+1)); // last check 2.0.10 data << uint64(pCreature ? pCreature->GetGUID() : 0); data << uint64(guid); if (param > 0) @@ -13310,7 +13310,7 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly) if (m_itemDuration.empty()) return; - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Player::UpdateItemDuration(%u,%u)", time, realtimeonly); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Player::UpdateItemDuration(%u, %u)", time, realtimeonly); for (ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end();) { @@ -13318,13 +13318,13 @@ void Player::UpdateItemDuration(uint32 time, bool realtimeonly) ++itr; // current element can be erased in UpdateDuration if ((realtimeonly && item->GetTemplate()->Duration < 0) || !realtimeonly) - item->UpdateDuration(this,time); + item->UpdateDuration(this, time); } } void Player::UpdateEnchantTime(uint32 time) { - for (EnchantDurationList::iterator itr = m_enchantDuration.begin(),next; itr != m_enchantDuration.end(); itr=next) + for (EnchantDurationList::iterator itr = m_enchantDuration.begin(), next; itr != m_enchantDuration.end(); itr=next) { ASSERT(itr->item); next = itr; @@ -13420,7 +13420,7 @@ void Player::RemoveArenaEnchantments(EnchantmentSlot slot) } // duration == 0 will remove item enchant -void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 duration) +void Player::AddEnchantmentDuration(Item *item, EnchantmentSlot slot, uint32 duration) { if (!item) return; @@ -13444,7 +13444,7 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat } } -void Player::ApplyEnchantment(Item *item,bool apply) +void Player::ApplyEnchantment(Item *item, bool apply) { for (uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot) ApplyEnchantment(item, EnchantmentSlot(slot), apply); @@ -13579,39 +13579,39 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool } } - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Adding %u to stat nb %u",enchant_amount,enchant_spell_id); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "Adding %u to stat nb %u", enchant_amount, enchant_spell_id); switch (enchant_spell_id) { case ITEM_MOD_MANA: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u MANA",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u MANA", enchant_amount); HandleStatModifier(UNIT_MOD_MANA, BASE_VALUE, float(enchant_amount), apply); break; case ITEM_MOD_HEALTH: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u HEALTH",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u HEALTH", enchant_amount); HandleStatModifier(UNIT_MOD_HEALTH, BASE_VALUE, float(enchant_amount), apply); break; case ITEM_MOD_AGILITY: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u AGILITY",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u AGILITY", enchant_amount); HandleStatModifier(UNIT_MOD_STAT_AGILITY, TOTAL_VALUE, float(enchant_amount), apply); ApplyStatBuffMod(STAT_AGILITY, (float)enchant_amount, apply); break; case ITEM_MOD_STRENGTH: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u STRENGTH",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u STRENGTH", enchant_amount); HandleStatModifier(UNIT_MOD_STAT_STRENGTH, TOTAL_VALUE, float(enchant_amount), apply); ApplyStatBuffMod(STAT_STRENGTH, (float)enchant_amount, apply); break; case ITEM_MOD_INTELLECT: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u INTELLECT",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u INTELLECT", enchant_amount); HandleStatModifier(UNIT_MOD_STAT_INTELLECT, TOTAL_VALUE, float(enchant_amount), apply); ApplyStatBuffMod(STAT_INTELLECT, (float)enchant_amount, apply); break; case ITEM_MOD_SPIRIT: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u SPIRIT",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u SPIRIT", enchant_amount); HandleStatModifier(UNIT_MOD_STAT_SPIRIT, TOTAL_VALUE, float(enchant_amount), apply); ApplyStatBuffMod(STAT_SPIRIT, (float)enchant_amount, apply); break; case ITEM_MOD_STAMINA: - sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u STAMINA",enchant_amount); + sLog->outDebug(LOG_FILTER_PLAYER_ITEMS, "+ %u STAMINA", enchant_amount); HandleStatModifier(UNIT_MOD_STAT_STAMINA, TOTAL_VALUE, float(enchant_amount), apply); ApplyStatBuffMod(STAT_STAMINA, (float)enchant_amount, apply); break; @@ -14068,7 +14068,7 @@ void Player::SendPreparedGossip(WorldObject *pSource) if (pSource->GetTypeId() == TYPEID_UNIT) { // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag) - if (!pSource->ToCreature()->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !PlayerTalkClass->GetQuestMenu().Empty()) + if (!pSource->ToCreature()->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && !PlayerTalkClass->GetQuestMenu().Empty()) { SendPreparedQuest(pSource->GetGUID()); return; @@ -14147,7 +14147,7 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me break; case GOSSIP_OPTION_SPIRITHEALER: if (isDead()) - pSource->ToCreature()->CastSpell((pSource->ToCreature()),17251,true,NULL,NULL,GetGUID()); + pSource->ToCreature()->CastSpell((pSource->ToCreature()), 17251, true, NULL, NULL, GetGUID()); break; case GOSSIP_OPTION_QUESTGIVER: PrepareQuestMenu(guid); @@ -14365,7 +14365,7 @@ void Player::SendPreparedQuest(uint64 guid) // TODO: verify if check for !pQuest->IsDaily() is really correct (possibly not) else { - Object* pObject = ObjectAccessor::GetObjectByTypeMask(*this, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM); + Object* pObject = ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM); if (!pObject || (!pObject->hasQuest(quest_id) && !pObject->hasInvolvedQuest(quest_id))) { PlayerTalkClass->CloseGossip(); @@ -14395,7 +14395,7 @@ void Player::SendPreparedQuest(uint64 guid) std::string title = ""; // need pet case for some quests - Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid); + Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); if (pCreature) { uint32 textid = GetGossipTextId(pCreature); @@ -14443,7 +14443,7 @@ Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest) { QuestRelationBounds pObjectQR; - Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid); + Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid); if (pCreature) pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(pCreature->GetEntry()); else @@ -14601,7 +14601,7 @@ bool Player::CanCompleteRepeatableQuest(Quest const *pQuest) if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_DELIVER)) for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; i++) - if (pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i],pQuest->ReqItemCount[i])) + if (pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i], pQuest->ReqItemCount[i])) return false; if (!CanRewardQuest(pQuest, false)) @@ -14617,7 +14617,7 @@ bool Player::CanRewardQuest(Quest const *pQuest, bool msg) return false; // daily quest can't be rewarded (25 daily quest already completed) - if (!SatisfyQuestDay(pQuest,true) || !SatisfyQuestWeek(pQuest,true)) + if (!SatisfyQuestDay(pQuest, true) || !SatisfyQuestWeek(pQuest, true)) return false; // rewarded and not repeatable quest (only cheating case, then ignore without message) @@ -14649,7 +14649,7 @@ bool Player::CanRewardQuest(Quest const *pQuest, bool msg) bool Player::CanRewardQuest(Quest const *pQuest, uint32 reward, bool msg) { // prevent receive reward with quest items in bank or for not completed quest - if (!CanRewardQuest(pQuest,msg)) + if (!CanRewardQuest(pQuest, msg)) return false; if (pQuest->GetRewChoiceItemsCount() > 0) @@ -14750,16 +14750,16 @@ void Player::AddQuest(Quest const *pQuest, Object *questGiver) GetMap()->ScriptsStart(sQuestStartScripts, pQuest->GetQuestStartScript(), questGiver, this); // Some spells applied at quest activation - SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id,true); + SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id, true); if (saBounds.first != saBounds.second) { uint32 zone, area; - GetZoneAndAreaId(zone,area); + GetZoneAndAreaId(zone, area); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) - if (itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area)) + if (itr->second->autocast && itr->second->IsFitToRequirements(this, zone, area)) if (!HasAura(itr->second->spellId)) - CastSpell(this,itr->second->spellId,true); + CastSpell(this, itr->second->spellId, true); } UpdateForQuestWorldObjects(); @@ -14773,12 +14773,12 @@ void Player::CompleteQuest(uint32 quest_id) uint16 log_slot = FindQuestSlot(quest_id); if (log_slot < MAX_QUEST_LOG_SIZE) - SetQuestSlotState(log_slot,QUEST_STATE_COMPLETE); + SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE); if (Quest const* qInfo = sObjectMgr->GetQuestTemplate(quest_id)) { if (qInfo->HasFlag(QUEST_FLAGS_AUTO_REWARDED)) - RewardQuest(qInfo,0,this,false); + RewardQuest(qInfo, 0, this, false); else SendQuestComplete(quest_id); } @@ -14793,7 +14793,7 @@ void Player::IncompleteQuest(uint32 quest_id) uint16 log_slot = FindQuestSlot(quest_id); if (log_slot < MAX_QUEST_LOG_SIZE) - RemoveQuestSlotState(log_slot,QUEST_STATE_COMPLETE); + RemoveQuestSlotState(log_slot, QUEST_STATE_COMPLETE); } } @@ -14949,24 +14949,24 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver, SpellAreaForQuestMapBounds saEndBounds = sSpellMgr->GetSpellAreaForQuestEndMapBounds(quest_id); if (saEndBounds.first != saEndBounds.second) { - GetZoneAndAreaId(zone,area); + GetZoneAndAreaId(zone, area); for (SpellAreaForAreaMap::const_iterator itr = saEndBounds.first; itr != saEndBounds.second; ++itr) - if (!itr->second->IsFitToRequirements(this,zone,area)) + if (!itr->second->IsFitToRequirements(this, zone, area)) RemoveAurasDueToSpell(itr->second->spellId); } // Some spells applied at quest reward - SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id,false); + SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id, false); if (saBounds.first != saBounds.second) { if (!zone || !area) - GetZoneAndAreaId(zone,area); + GetZoneAndAreaId(zone, area); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) - if (itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area)) + if (itr->second->autocast && itr->second->IsFitToRequirements(this, zone, area)) if (!HasAura(itr->second->spellId)) - CastSpell(this,itr->second->spellId,true); + CastSpell(this, itr->second->spellId, true); } //lets remove flag for delayed teleports @@ -15532,7 +15532,7 @@ void Player::AdjustQuestReqItemCount(Quest const* pQuest, QuestStatusData& quest uint32 reqitemcount = pQuest->ReqItemCount[i]; if (reqitemcount != 0) { - uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i],true); + uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i], true); questStatusData.m_itemcount[i] = std::min(curitemcount, reqitemcount); m_QuestStatusSave[pQuest->GetQuestId()] = true; @@ -15655,7 +15655,7 @@ void Player::ItemRemovedQuestCheck(uint32 entry, uint32 count) if (q_status.m_status != QUEST_STATUS_COMPLETE) curitemcount = q_status.m_itemcount[j]; else - curitemcount = GetItemCount(entry,true); + curitemcount = GetItemCount(entry, true); if (curitemcount < reqitemcount + count) { uint16 remitemcount = curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount; @@ -16159,7 +16159,7 @@ void Player::SendQuestUpdateAddCreatureOrGo(Quest const* pQuest, uint64 guid, ui uint16 log_slot = FindQuestSlot(pQuest->GetQuestId()); if (log_slot < MAX_QUEST_LOG_SIZE) - SetQuestSlotCounter(log_slot,creatureOrGO_idx,GetQuestSlotCounter(log_slot,creatureOrGO_idx)+add_count); + SetQuestSlotCounter(log_slot, creatureOrGO_idx, GetQuestSlotCounter(log_slot, creatureOrGO_idx)+add_count); } /*********************************************************/ @@ -16277,9 +16277,9 @@ void Player::_LoadBGData(PreparedQueryResult result) m_bgData.mountSpell = fields[9].GetUInt32(); } -bool Player::LoadPositionFromDB(uint32& mapid, float& x,float& y,float& z,float& o, bool& in_flight, uint64 guid) +bool Player::LoadPositionFromDB(uint32& mapid, float& x, float& y, float& z, float& o, bool& in_flight, uint64 guid) { - QueryResult result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,taxi_path FROM characters WHERE guid = '%u'",GUID_LOPART(guid)); + QueryResult result = CharacterDatabase.PQuery("SELECT position_x, position_y, position_z, orientation, map, taxi_path FROM characters WHERE guid = '%u'", GUID_LOPART(guid)); if (!result) return false; @@ -16325,7 +16325,7 @@ uint32 Player::GetUInt32ValueFromArray(Tokens const& data, uint16 index) float Player::GetFloatValueFromArray(Tokens const& data, uint16 index) { float result; - uint32 temp = Player::GetUInt32ValueFromArray(data,index); + uint32 temp = Player::GetUInt32ValueFromArray(data, index); memcpy(&result, &temp, sizeof(result)); return result; @@ -16334,20 +16334,20 @@ float Player::GetFloatValueFromArray(Tokens const& data, uint16 index) bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) { //// 0 1 2 3 4 5 6 7 8 9 10 11 - //QueryResult *result = CharacterDatabase.PQuery("SELECT guid, account,name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags," + //QueryResult *result = CharacterDatabase.PQuery("SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, " // 12 13 14 15 16 17 18 19 20 21 22 23 24 - //"position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost," + //"position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, " // 25 26 27 28 29 30 31 32 33 34 35 36 37 38 - //"resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, instance_mode_mask," + //"resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, instance_mode_mask, " // 39 40 41 42 43 44 45 46 47 48 49 - //"arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk," + //"arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk, " // 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 //"health, power1, power2, power3, power4, power5, power6, power7, instance_id, speccount, activespec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars FROM characters WHERE guid = '%u'", guid); PreparedQueryResult result = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADFROM); if (!result) { - sLog->outError("Player (GUID: %u) not found in table `characters`, can't load. ",guid); + sLog->outError("Player (GUID: %u) not found in table `characters`, can't load. ", guid); return false; } @@ -16359,7 +16359,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // player should be able to load/delete character only with correct account! if (dbAccountId != GetSession()->GetAccountId()) { - sLog->outError("Player (GUID: %u) loading from wrong account (is: %u, should be: %u)",guid,GetSession()->GetAccountId(),dbAccountId); + sLog->outError("Player (GUID: %u) loading from wrong account (is: %u, should be: %u)", guid, GetSession()->GetAccountId(), dbAccountId); return false; } @@ -16377,7 +16377,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (ObjectMgr::CheckPlayerName(m_name) != CHAR_NAME_SUCCESS || (GetSession()->GetSecurity() == SEC_PLAYER && sObjectMgr->IsReservedName(m_name))) { - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid ='%u'", uint32(AT_LOGIN_RENAME),guid); + CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid ='%u'", uint32(AT_LOGIN_RENAME), guid); return false; } @@ -16509,7 +16509,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) MapEntry const * mapEntry = sMapStore.LookupEntry(mapId); if (!mapEntry || !IsPositionValid()) { - sLog->outError("Player (guidlow %d) have invalid coordinates (MapId: %u X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,mapId,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); + sLog->outError("Player (guidlow %d) have invalid coordinates (MapId: %u X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", guid, mapId, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); RelocateToHomebind(); } // Player was saved in Arena or Bg @@ -16532,7 +16532,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) currentBg->EventPlayerLoggedIn(this); currentBg->AddOrSetPlayerToCorrectBgGroup(this, m_bgData.bgTeam); - SetInviteForBattlegroundQueueType(bgQueueTypeId,currentBg->GetInstanceID()); + SetInviteForBattlegroundQueueType(bgQueueTypeId, currentBg->GetInstanceID()); } // Bg was not found - go to Entry Point else @@ -16547,7 +16547,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (mapId == MAPID_INVALID) // Battleground Entry Point not found (???) { - sLog->outError("Player (guidlow %d) was in BG in database, but BG was not found, and entry point was invalid! Teleport to default race/class locations.",guid); + sLog->outError("Player (guidlow %d) was in BG in database, but BG was not found, and entry point was invalid! Teleport to default race/class locations.", guid); RelocateToHomebind(); } else @@ -16564,14 +16564,14 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) m_movementInfo.t_pos.Relocate(fields[26].GetFloat(), fields[27].GetFloat(), fields[28].GetFloat(), fields[29].GetFloat()); if (!Trinity::IsValidMapCoord( - GetPositionX()+m_movementInfo.t_pos.m_positionX,GetPositionY()+m_movementInfo.t_pos.m_positionY, - GetPositionZ()+m_movementInfo.t_pos.m_positionZ,GetOrientation()+m_movementInfo.t_pos.m_orientation) || + GetPositionX()+m_movementInfo.t_pos.m_positionX, GetPositionY()+m_movementInfo.t_pos.m_positionY, + GetPositionZ()+m_movementInfo.t_pos.m_positionZ, GetOrientation()+m_movementInfo.t_pos.m_orientation) || // transport size limited m_movementInfo.t_pos.m_positionX > 250 || m_movementInfo.t_pos.m_positionY > 250 || m_movementInfo.t_pos.m_positionZ > 250) { sLog->outError("Player (guidlow %d) have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to bind location.", - guid,GetPositionX()+m_movementInfo.t_pos.m_positionX,GetPositionY()+m_movementInfo.t_pos.m_positionY, - GetPositionZ()+m_movementInfo.t_pos.m_positionZ,GetOrientation()+m_movementInfo.t_pos.m_orientation); + guid, GetPositionX()+m_movementInfo.t_pos.m_positionX, GetPositionY()+m_movementInfo.t_pos.m_positionY, + GetPositionZ()+m_movementInfo.t_pos.m_positionZ, GetOrientation()+m_movementInfo.t_pos.m_orientation); RelocateToHomebind(); } @@ -16590,7 +16590,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (!m_transport) { sLog->outError("Player (guidlow %d) have problems with transport guid (%u). Teleport to bind location.", - guid,transGUID); + guid, transGUID); RelocateToHomebind(); } @@ -16607,7 +16607,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) for (int i = 0; i < 2; ++i) m_taxi.AddTaxiDestination(m_bgData.taxiPath[i]); } - else if (!m_taxi.LoadTaxiDestinationsFromString(taxi_nodes,GetTeam())) + else if (!m_taxi.LoadTaxiDestinationsFromString(taxi_nodes, GetTeam())) { // problems with taxi path loading TaxiNodesEntry const* nodeEntry = NULL; @@ -16616,14 +16616,14 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (!nodeEntry) // don't know taxi start node, to homebind { - sLog->outError("Character %u have wrong data in taxi destination list, teleport to homebind.",GetGUIDLow()); + sLog->outError("Character %u have wrong data in taxi destination list, teleport to homebind.", GetGUIDLow()); RelocateToHomebind(); } else // have start node, to it { - sLog->outError("Character %u have too short taxi destination list, teleport to original node.",GetGUIDLow()); + sLog->outError("Character %u have too short taxi destination list, teleport to original node.", GetGUIDLow()); mapId = nodeEntry->map_id; - Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z,0.0f); + Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z, 0.0f); } m_taxi.ClearTaxiDestinations(); } @@ -16636,7 +16636,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) { ASSERT(nodeEntry); // checked in m_taxi.LoadTaxiDestinationsFromString mapId = nodeEntry->map_id; - Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z,0.0f); + Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z, 0.0f); } // flight will started later @@ -16671,13 +16671,13 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) AreaTrigger const* at = sObjectMgr->GetGoBackTrigger(mapId); if (at) { - sLog->outError("Player (guidlow %d) is teleported to gobacktrigger (Map: %u X: %f Y: %f Z: %f O: %f).",guid,mapId,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); + sLog->outError("Player (guidlow %d) is teleported to gobacktrigger (Map: %u X: %f Y: %f Z: %f O: %f).", guid, mapId, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); Relocate(at->target_X, at->target_Y, at->target_Z, GetOrientation()); mapId = at->target_mapId; } else { - sLog->outError("Player (guidlow %d) is teleported to home (Map: %u X: %f Y: %f Z: %f O: %f).",guid,mapId,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); + sLog->outError("Player (guidlow %d) is teleported to home (Map: %u X: %f Y: %f Z: %f O: %f).", guid, mapId, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); RelocateToHomebind(); } @@ -16686,12 +16686,12 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) { PlayerInfo const *info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); mapId = info->mapId; - Relocate(info->positionX,info->positionY,info->positionZ,0.0f); - sLog->outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); + Relocate(info->positionX, info->positionY, info->positionZ, 0.0f); + sLog->outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", guid, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); map = sMapMgr->CreateMap(mapId, this, 0); if (!map) { - sLog->outError("Player (guidlow %d) has invalid default map coordinates (X: %f Y: %f Z: %f O: %f). or instance couldn't be created",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); + sLog->outError("Player (guidlow %d) has invalid default map coordinates (X: %f Y: %f Z: %f O: %f). or instance couldn't be created", guid, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); return false; } } @@ -16715,7 +16715,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // randomize first save time in range [CONFIG_INTERVAL_SAVE] around [CONFIG_INTERVAL_SAVE] // this must help in case next save after mass player load after server startup - m_nextSave = urand(m_nextSave/2,m_nextSave*3/2); + m_nextSave = urand(m_nextSave/2, m_nextSave*3/2); SaveRecallPosition(); @@ -16755,7 +16755,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) m_stableSlots = fields[32].GetUInt8(); if (m_stableSlots > MAX_PET_STABLES) { - sLog->outError("Player can have not more %u stable slots, but have in DB %u",MAX_PET_STABLES,uint32(m_stableSlots)); + sLog->outError("Player can have not more %u stable slots, but have in DB %u", MAX_PET_STABLES, uint32(m_stableSlots)); m_stableSlots = MAX_PET_STABLES; } @@ -16772,7 +16772,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // clear channel spell data (if saved at channel spell casting) SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, 0); - SetUInt32Value(UNIT_CHANNEL_SPELL,0); + SetUInt32Value(UNIT_CHANNEL_SPELL, 0); // clear charm/summon related fields SetUInt64Value(UNIT_FIELD_SUMMONEDBY, 0); @@ -16902,7 +16902,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) for (uint8 i = 0; i < MAX_POWERS; ++i) { uint32 savedPower = fields[51+i].GetUInt32(); - SetPower(Powers(i),savedPower > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedPower); + SetPower(Powers(i), savedPower > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedPower); } sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "The value of player %s after load item and aura is: ", m_name.c_str()); @@ -17048,12 +17048,12 @@ void Player::_LoadActions(PreparedQueryResult result) void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff) { - sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Loading auras for player %u",GetGUIDLow()); + sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Loading auras for player %u", GetGUIDLow()); /* 0 1 2 3 4 5 6 7 8 9 10 - QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2, + QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, 11 12 13 - maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow()); + maxduration, remaintime, remaincharges FROM character_aura WHERE guid = '%u'", GetGUIDLow()); */ if (result) @@ -17081,7 +17081,7 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff) SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid); if (!spellproto) { - sLog->outError("Unknown aura (spellid %u), ignore.",spellid); + sLog->outError("Unknown aura (spellid %u), ignore.", spellid); continue; } @@ -17110,7 +17110,7 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff) aura->Remove(); continue; } - aura->SetLoadedState(maxduration,remaintime,remaincharges,stackcount,recalculatemask,&damage[0]); + aura->SetLoadedState(maxduration, remaintime, remaincharges, stackcount, recalculatemask, &damage[0]); aura->ApplyForTargets(); sLog->outDetail("Added aura spellid %u, effectmask %u", spellproto->Id, effmask); } @@ -17168,7 +17168,7 @@ void Player::LoadCorpse() void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff) { - //QueryResult *result = CharacterDatabase.PQuery("SELECT data,text,bag,slot,item,item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag,slot", GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT data, text, bag, slot, item, item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag, slot", GetGUIDLow()); //NOTE: the "order by `bag`" is important because it makes sure //the bagMap is filled before items in the bags are loaded //NOTE2: the "order by `slot`" is needed because mainhand weapons are (wrongly?) @@ -17400,7 +17400,7 @@ void Player::_LoadMailedItems(Mail *mail) if (!proto) { - sLog->outError("Player %u has unknown item_template (ProtoType) in mailed items(GUID: %u template: %u) in mail (%u), deleted.", GetGUIDLow(), item_guid_low, item_template,mail->messageID); + sLog->outError("Player %u has unknown item_template (ProtoType) in mailed items(GUID: %u template: %u) in mail (%u), deleted.", GetGUIDLow(), item_guid_low, item_template, mail->messageID); trans->PAppend("DELETE FROM mail_items WHERE item_guid = '%u'", item_guid_low); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE); stmt->setUInt32(0, item_guid_low); @@ -17429,7 +17429,7 @@ void Player::_LoadMailedItems(Mail *mail) void Player::_LoadMailInit(PreparedQueryResult resultUnread, PreparedQueryResult resultDelivery) { //set a count of unread mails - //QueryResult *resultMails = CharacterDatabase.PQuery("SELECT COUNT(id) FROM mail WHERE receiver = '%u' AND (checked & 1)=0 AND deliver_time <= '" UI64FMTD "'", GUID_LOPART(playerGuid),(uint64)cTime); + //QueryResult *resultMails = CharacterDatabase.PQuery("SELECT COUNT(id) FROM mail WHERE receiver = '%u' AND (checked & 1)=0 AND deliver_time <= '" UI64FMTD "'", GUID_LOPART(playerGuid), (uint64)cTime); if (resultUnread) unReadMails = (*resultUnread)[0].GetUInt8(); @@ -17443,7 +17443,7 @@ void Player::_LoadMail() { m_mail.clear(); //mails are in right order 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - QueryResult result = CharacterDatabase.PQuery("SELECT id,messageType,sender,receiver,subject,body,has_items,expire_time,deliver_time,money,cod,checked,stationery,mailTemplateId FROM mail WHERE receiver = '%u' ORDER BY id DESC",GetGUIDLow()); + QueryResult result = CharacterDatabase.PQuery("SELECT id, messageType, sender, receiver, subject, body, has_items, expire_time, deliver_time, money, cod, checked, stationery, mailTemplateId FROM mail WHERE receiver = '%u' ORDER BY id DESC", GetGUIDLow()); if (result) { do @@ -17523,7 +17523,7 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) else { questStatusData.m_status = QUEST_STATUS_INCOMPLETE; - sLog->outError("Player %s have invalid quest %d status (%u), replaced by QUEST_STATUS_INCOMPLETE(3).",GetName(),quest_id,qstatus); + sLog->outError("Player %s have invalid quest %d status (%u), replaced by QUEST_STATUS_INCOMPLETE(3).", GetName(), quest_id, qstatus); } questStatusData.m_explored = (fields[2].GetUInt8() > 0); @@ -17617,11 +17617,11 @@ void Player::_LoadQuestStatusRewarded(PreparedQueryResult result) void Player::_LoadDailyQuestStatus(PreparedQueryResult result) { for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) - SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0); + SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx, 0); m_DFQuests.clear(); - //QueryResult *result = CharacterDatabase.PQuery("SELECT quest,time FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, time FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow()); if (result) { @@ -17642,7 +17642,7 @@ void Player::_LoadDailyQuestStatus(PreparedQueryResult result) if (quest_daily_idx >= PLAYER_MAX_DAILY_QUESTS) // max amount with exist data in query { - sLog->outError("Player (GUID: %u) have more 25 daily quest records in `charcter_queststatus_daily`",GetGUIDLow()); + sLog->outError("Player (GUID: %u) have more 25 daily quest records in `charcter_queststatus_daily`", GetGUIDLow()); break; } @@ -17690,7 +17690,7 @@ void Player::_LoadWeeklyQuestStatus(PreparedQueryResult result) void Player::_LoadSpells(PreparedQueryResult result) { - //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,active,disabled FROM character_spell WHERE guid = '%u'",GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT spell, active, disabled FROM character_spell WHERE guid = '%u'", GetGUIDLow()); if (result) { @@ -17758,7 +17758,7 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) continue; } - MapDifficulty const* mapDiff = GetMapDifficultyData(mapId,Difficulty(difficulty)); + MapDifficulty const* mapDiff = GetMapDifficultyData(mapId, Difficulty(difficulty)); if (!mapDiff) { sLog->outError("_LoadBoundInstances: player %s(%d) has bind to not existed difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId); @@ -17768,7 +17768,7 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) if (!perm && group) { - sLog->outError("_LoadBoundInstances: player %s(%d) is in group %d but has a non-permanent character bind to map %d,%d,%d", GetName(), GetGUIDLow(), GUID_LOPART(group->GetGUID()), mapId, instanceId, difficulty); + sLog->outError("_LoadBoundInstances: player %s(%d) is in group %d but has a non-permanent character bind to map %d, %d, %d", GetName(), GetGUIDLow(), GUID_LOPART(group->GetGUID()), mapId, instanceId, difficulty); CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId); continue; } @@ -17784,7 +17784,7 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) InstancePlayerBind* Player::GetBoundInstance(uint32 mapid, Difficulty difficulty) { // some instances only have one difficulty - MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(mapid,difficulty); + MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(mapid, difficulty); if (!mapDiff) return NULL; @@ -18081,7 +18081,7 @@ bool Player::_LoadHomeBind(PreparedQueryResult result) MapEntry const* bindMapEntry = sMapStore.LookupEntry(m_homebindMapId); // accept saved data only for valid position (and non instanceable), and accessable - if (MapManager::IsValidMapCoord(m_homebindMapId,m_homebindX,m_homebindY,m_homebindZ) && + if (MapManager::IsValidMapCoord(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ) && !bindMapEntry->Instanceable() && GetSession()->Expansion() >= bindMapEntry->Expansion()) ok = true; else @@ -18142,7 +18142,7 @@ void Player::SaveToDB() CharacterDatabase.escape_string(sql_name); std::ostringstream ss; - ss << "REPLACE INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags," + ss << "REPLACE INTO characters (guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, " "map, instance_id, instance_mode_mask, position_x, position_y, position_z, orientation, " "taximask, online, cinematic, " "totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, " @@ -18273,13 +18273,13 @@ void Player::SaveToDB() ss << " 0 "; } - ss << "',"; + ss << "', "; ss << GetUInt32Value(PLAYER_AMMO_ID) << ", '"; for (uint32 i = 0; i < KNOWN_TITLES_SIZE*2; ++i) ss << GetUInt32Value(PLAYER__FIELD_KNOWN_TITLES + i) << " "; - ss << "',"; + ss << "', "; ss << uint32(GetByteValue(PLAYER_FIELD_BYTES, 2)); ss << ")"; @@ -18340,7 +18340,7 @@ void Player::_SaveActions(SQLTransaction& trans) switch (itr->second.uState) { case ACTIONBUTTON_NEW: - trans->PAppend("INSERT INTO character_action (guid,spec,button,action,type) VALUES ('%u', '%u', '%u', '%u', '%u')", + trans->PAppend("INSERT INTO character_action (guid, spec, button, action, type) VALUES ('%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), m_activeSpec, (uint32)itr->first, (uint32)itr->second.GetAction(), (uint32)itr->second.GetType()); itr->second.uState = ACTIONBUTTON_UNCHANGED; ++itr; @@ -18460,7 +18460,7 @@ void Player::_SaveInventory(SQLTransaction& trans) // update enchantment durations for (EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr) - itr->item->SetEnchantmentDuration(itr->slot,itr->leftduration, this); + itr->item->SetEnchantmentDuration(itr->slot, itr->leftduration, this); // if no changes if (m_itemUpdateQueue.empty()) @@ -18539,7 +18539,7 @@ void Player::_SaveMail(SQLTransaction& trans) Mail *m = (*itr); if (m->state == MAIL_STATE_CHANGED) { - trans->PAppend("UPDATE mail SET has_items = '%u',expire_time = '" UI64FMTD "', deliver_time = '" UI64FMTD "',money = '%u',cod = '%u',checked = '%u' WHERE id = '%u'", + trans->PAppend("UPDATE mail SET has_items = '%u', expire_time = '" UI64FMTD "', deliver_time = '" UI64FMTD "', money = '%u', cod = '%u', checked = '%u' WHERE id = '%u'", m->HasItems() ? 1 : 0, (uint64)m->expire_time, (uint64)m->deliver_time, m->money, m->COD, m->checked, m->messageID); if (m->removedItems.size()) { @@ -18597,7 +18597,7 @@ void Player::_SaveQuestStatus(SQLTransaction& trans) statusItr = m_QuestStatus.find(saveItr->first); if (statusItr != m_QuestStatus.end() && (keepAbandoned || statusItr->second.m_status != QUEST_STATUS_NONE)) { - trans->PAppend("REPLACE INTO character_queststatus (guid,quest,status,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4) " + trans->PAppend("REPLACE INTO character_queststatus (guid, quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, itemcount4) " "VALUES ('%u', '%u', '%u', '%u', '" UI64FMTD "', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), statusItr->first, statusItr->second.m_status, statusItr->second.m_explored, uint64(statusItr->second.m_timer / IN_MILLISECONDS+ sWorld->GetGameTime()), statusItr->second.m_creatureOrGOcount[0], statusItr->second.m_creatureOrGOcount[1], statusItr->second.m_creatureOrGOcount[2], statusItr->second.m_creatureOrGOcount[3], statusItr->second.m_itemcount[0], statusItr->second.m_itemcount[1], statusItr->second.m_itemcount[2], statusItr->second.m_itemcount[3]); } @@ -18629,18 +18629,18 @@ void Player::_SaveDailyQuestStatus(SQLTransaction& trans) // save last daily quest time for all quests: we need only mostly reset time for reset check anyway // we don't need transactions here. - trans->PAppend("DELETE FROM character_queststatus_daily WHERE guid = '%u'",GetGUIDLow()); + trans->PAppend("DELETE FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow()); for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) if (GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx)) - trans->PAppend("INSERT INTO character_queststatus_daily (guid,quest,time) VALUES ('%u', '%u','" UI64FMTD "')", - GetGUIDLow(), GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx),uint64(m_lastDailyQuestTime)); + trans->PAppend("INSERT INTO character_queststatus_daily (guid, quest, time) VALUES ('%u', '%u', '" UI64FMTD "')", + GetGUIDLow(), GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx), uint64(m_lastDailyQuestTime)); if (!m_DFQuests.empty()) { for (DFQuestsDoneList::iterator itr = m_DFQuests.begin(); itr != m_DFQuests.end(); ++itr) { - trans->PAppend("INSERT INTO character_queststatus_daily (guid,quest,time) VALUES ('%u', '%u','" UI64FMTD "')", - GetGUIDLow(),(*itr),uint64(m_lastDailyQuestTime)); + trans->PAppend("INSERT INTO character_queststatus_daily (guid, quest, time) VALUES ('%u', '%u', '" UI64FMTD "')", + GetGUIDLow(), (*itr), uint64(m_lastDailyQuestTime)); } } } @@ -18651,13 +18651,13 @@ void Player::_SaveWeeklyQuestStatus(SQLTransaction& trans) return; // we don't need transactions here. - trans->PAppend("DELETE FROM character_queststatus_weekly WHERE guid = '%u'",GetGUIDLow()); + trans->PAppend("DELETE FROM character_queststatus_weekly WHERE guid = '%u'", GetGUIDLow()); for (QuestSet::const_iterator iter = m_weeklyquests.begin(); iter != m_weeklyquests.end(); ++iter) { uint32 quest_id = *iter; - trans->PAppend("INSERT INTO character_queststatus_weekly (guid,quest) VALUES ('%u', '%u')", GetGUIDLow(), quest_id); + trans->PAppend("INSERT INTO character_queststatus_weekly (guid, quest) VALUES ('%u', '%u')", GetGUIDLow(), quest_id); } m_WeeklyQuestChanged = false; @@ -18692,7 +18692,7 @@ void Player::_SaveSkills(SQLTransaction& trans) GetGUIDLow(), itr->first, value, max); break; case SKILL_CHANGED: - trans->PAppend("UPDATE character_skills SET value = '%u',max = '%u'WHERE guid = '%u' AND skill = '%u' ", + trans->PAppend("UPDATE character_skills SET value = '%u', max = '%u'WHERE guid = '%u' AND skill = '%u' ", value, max, GetGUIDLow(), itr->first); break; default: @@ -18713,7 +18713,7 @@ void Player::_SaveSpells(SQLTransaction& trans) // add only changed/new not dependent spells if (!itr->second->dependent && (itr->second->state == PLAYERSPELL_NEW || itr->second->state == PLAYERSPELL_CHANGED)) - trans->PAppend("INSERT INTO character_spell (guid,spell,active,disabled) VALUES ('%u', '%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->active ? 1 : 0,itr->second->disabled ? 1 : 0); + trans->PAppend("INSERT INTO character_spell (guid, spell, active, disabled) VALUES ('%u', '%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->active ? 1 : 0, itr->second->disabled ? 1 : 0); if (itr->second->state == PLAYERSPELL_REMOVED) { @@ -18749,7 +18749,7 @@ void Player::_SaveStats(SQLTransaction& trans) ss << GetStat(Stats(i)) << ", "; // armor + school resistances for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) - ss << GetResistance(SpellSchools(i)) << ","; + ss << GetResistance(SpellSchools(i)) << ", "; ss << GetFloatValue(PLAYER_BLOCK_PERCENTAGE) << ", " << GetFloatValue(PLAYER_DODGE_PERCENTAGE) << ", " << GetFloatValue(PLAYER_PARRY_PERCENTAGE) << ", " @@ -18767,18 +18767,18 @@ void Player::outDebugValues() const if (!sLog->IsOutDebug()) // optimize disabled debug output return; - sLog->outDebug(LOG_FILTER_UNITS, "HP is: \t\t\t%u\t\tMP is: \t\t\t%u",GetMaxHealth(), GetMaxPower(POWER_MANA)); - sLog->outDebug(LOG_FILTER_UNITS, "AGILITY is: \t\t%f\t\tSTRENGTH is: \t\t%f",GetStat(STAT_AGILITY), GetStat(STAT_STRENGTH)); - sLog->outDebug(LOG_FILTER_UNITS, "INTELLECT is: \t\t%f\t\tSPIRIT is: \t\t%f",GetStat(STAT_INTELLECT), GetStat(STAT_SPIRIT)); - sLog->outDebug(LOG_FILTER_UNITS, "STAMINA is: \t\t%f",GetStat(STAT_STAMINA)); - sLog->outDebug(LOG_FILTER_UNITS, "Armor is: \t\t%u\t\tBlock is: \t\t%f",GetArmor(), GetFloatValue(PLAYER_BLOCK_PERCENTAGE)); - sLog->outDebug(LOG_FILTER_UNITS, "HolyRes is: \t\t%u\t\tFireRes is: \t\t%u",GetResistance(SPELL_SCHOOL_HOLY), GetResistance(SPELL_SCHOOL_FIRE)); - sLog->outDebug(LOG_FILTER_UNITS, "NatureRes is: \t\t%u\t\tFrostRes is: \t\t%u",GetResistance(SPELL_SCHOOL_NATURE), GetResistance(SPELL_SCHOOL_FROST)); - sLog->outDebug(LOG_FILTER_UNITS, "ShadowRes is: \t\t%u\t\tArcaneRes is: \t\t%u",GetResistance(SPELL_SCHOOL_SHADOW), GetResistance(SPELL_SCHOOL_ARCANE)); - sLog->outDebug(LOG_FILTER_UNITS, "MIN_DAMAGE is: \t\t%f\tMAX_DAMAGE is: \t\t%f",GetFloatValue(UNIT_FIELD_MINDAMAGE), GetFloatValue(UNIT_FIELD_MAXDAMAGE)); - sLog->outDebug(LOG_FILTER_UNITS, "MIN_OFFHAND_DAMAGE is: \t%f\tMAX_OFFHAND_DAMAGE is: \t%f",GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE), GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE)); - sLog->outDebug(LOG_FILTER_UNITS, "MIN_RANGED_DAMAGE is: \t%f\tMAX_RANGED_DAMAGE is: \t%f",GetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE), GetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE)); - sLog->outDebug(LOG_FILTER_UNITS, "ATTACK_TIME is: \t%u\t\tRANGE_ATTACK_TIME is: \t%u",GetAttackTime(BASE_ATTACK), GetAttackTime(RANGED_ATTACK)); + sLog->outDebug(LOG_FILTER_UNITS, "HP is: \t\t\t%u\t\tMP is: \t\t\t%u", GetMaxHealth(), GetMaxPower(POWER_MANA)); + sLog->outDebug(LOG_FILTER_UNITS, "AGILITY is: \t\t%f\t\tSTRENGTH is: \t\t%f", GetStat(STAT_AGILITY), GetStat(STAT_STRENGTH)); + sLog->outDebug(LOG_FILTER_UNITS, "INTELLECT is: \t\t%f\t\tSPIRIT is: \t\t%f", GetStat(STAT_INTELLECT), GetStat(STAT_SPIRIT)); + sLog->outDebug(LOG_FILTER_UNITS, "STAMINA is: \t\t%f", GetStat(STAT_STAMINA)); + sLog->outDebug(LOG_FILTER_UNITS, "Armor is: \t\t%u\t\tBlock is: \t\t%f", GetArmor(), GetFloatValue(PLAYER_BLOCK_PERCENTAGE)); + sLog->outDebug(LOG_FILTER_UNITS, "HolyRes is: \t\t%u\t\tFireRes is: \t\t%u", GetResistance(SPELL_SCHOOL_HOLY), GetResistance(SPELL_SCHOOL_FIRE)); + sLog->outDebug(LOG_FILTER_UNITS, "NatureRes is: \t\t%u\t\tFrostRes is: \t\t%u", GetResistance(SPELL_SCHOOL_NATURE), GetResistance(SPELL_SCHOOL_FROST)); + sLog->outDebug(LOG_FILTER_UNITS, "ShadowRes is: \t\t%u\t\tArcaneRes is: \t\t%u", GetResistance(SPELL_SCHOOL_SHADOW), GetResistance(SPELL_SCHOOL_ARCANE)); + sLog->outDebug(LOG_FILTER_UNITS, "MIN_DAMAGE is: \t\t%f\tMAX_DAMAGE is: \t\t%f", GetFloatValue(UNIT_FIELD_MINDAMAGE), GetFloatValue(UNIT_FIELD_MAXDAMAGE)); + sLog->outDebug(LOG_FILTER_UNITS, "MIN_OFFHAND_DAMAGE is: \t%f\tMAX_OFFHAND_DAMAGE is: \t%f", GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE), GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE)); + sLog->outDebug(LOG_FILTER_UNITS, "MIN_RANGED_DAMAGE is: \t%f\tMAX_RANGED_DAMAGE is: \t%f", GetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE), GetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE)); + sLog->outDebug(LOG_FILTER_UNITS, "ATTACK_TIME is: \t%u\t\tRANGE_ATTACK_TIME is: \t%u", GetAttackTime(BASE_ATTACK), GetAttackTime(RANGED_ATTACK)); } /*********************************************************/ @@ -18830,21 +18830,21 @@ void Player::SendAttackSwingNotInRange() GetSession()->SendPacket(&data); } -void Player::SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint32 zone,uint64 guid) +void Player::SavePositionInDB(uint32 mapid, float x, float y, float z, float o, uint32 zone, uint64 guid) { std::ostringstream ss; - ss << "UPDATE characters SET position_x='"<<x<<"',position_y='"<<y - << "',position_z='"<<z<<"',orientation='"<<o<<"',map='"<<mapid - << "',zone='"<<zone<<"',trans_x='0',trans_y='0',trans_z='0'," - << "transguid='0',taxi_path='' WHERE guid='"<< GUID_LOPART(guid) <<"'"; + ss << "UPDATE characters SET position_x='"<<x<<"', position_y='"<<y + << "', position_z='"<<z<<"', orientation='"<<o<<"', map='"<<mapid + << "', zone='"<<zone<<"', trans_x='0', trans_y='0', trans_z='0', " + << "transguid='0', taxi_path='' WHERE guid='"<< GUID_LOPART(guid) <<"'"; sLog->outDebug(LOG_FILTER_UNITS, "%s", ss.str().c_str()); CharacterDatabase.Execute(ss.str().c_str()); } -void Player::SetUInt32ValueInArray(Tokens& tokens,uint16 index, uint32 value) +void Player::SetUInt32ValueInArray(Tokens& tokens, uint16 index, uint32 value) { char buf[11]; - snprintf(buf,11,"%u",value); + snprintf(buf, 11, "%u", value); if (index >= tokens.size()) return; @@ -19067,7 +19067,7 @@ Pet* Player::GetPet() const return pet; //there may be a guardian in slot - //sLog->outError("Player::GetPet: Pet %u not exist.",GUID_LOPART(pet_guid)); + //sLog->outError("Player::GetPet: Pet %u not exist.", GUID_LOPART(pet_guid)); //const_cast<Player*>(this)->SetPetGUID(0); } @@ -19081,7 +19081,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) if (pet) { - sLog->outDebug(LOG_FILTER_PETS,"RemovePet %u, %u, %u", pet->GetEntry(), mode, returnreagent); + sLog->outDebug(LOG_FILTER_PETS, "RemovePet %u, %u, %u", pet->GetEntry(), mode, returnreagent); if (pet->m_removed) return; @@ -19105,7 +19105,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) { Item* item = StoreNewItem(dest, spellInfo->Reagent[i], true); if (IsInWorld()) - SendNewItem(item,spellInfo->ReagentCount[i],true,false); + SendNewItem(item, spellInfo->ReagentCount[i], true, false); } } } @@ -19273,7 +19273,7 @@ void Player::PetSpellInitialize() if (!pet) return; - sLog->outDebug(LOG_FILTER_PETS,"Pet Spells Groups"); + sLog->outDebug(LOG_FILTER_PETS, "Pet Spells Groups"); CharmInfo *charmInfo = pet->GetCharmInfo(); @@ -19300,7 +19300,7 @@ void Player::PetSpellInitialize() if (itr->second.state == PETSPELL_REMOVED) continue; - data << uint32(MAKE_UNIT_ACTION_BUTTON(itr->first,itr->second.active)); + data << uint32(MAKE_UNIT_ACTION_BUTTON(itr->first, itr->second.active)); ++addlist; } } @@ -19403,7 +19403,7 @@ void Player::VehicleSpellInitialize() data << uint16(0) << uint8(0) << uint8(i+8); } else - data << uint32(MAKE_UNIT_ACTION_BUTTON(spellId,i+8)); + data << uint32(MAKE_UNIT_ACTION_BUTTON(spellId, i+8)); } for (uint32 i = CREATURE_MAX_SPELLS; i < MAX_SPELL_CONTROL_BAR; ++i) @@ -19646,9 +19646,9 @@ void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type) { QueryResult result = QueryResult(NULL); if (type == 10) - result = CharacterDatabase.PQuery("SELECT ownerguid,petitionguid FROM petition_sign WHERE playerguid = '%u'", GUID_LOPART(guid)); + result = CharacterDatabase.PQuery("SELECT ownerguid, petitionguid FROM petition_sign WHERE playerguid = '%u'", GUID_LOPART(guid)); else - result = CharacterDatabase.PQuery("SELECT ownerguid,petitionguid FROM petition_sign WHERE playerguid = '%u' AND type = '%u'", GUID_LOPART(guid), type); + result = CharacterDatabase.PQuery("SELECT ownerguid, petitionguid FROM petition_sign WHERE playerguid = '%u' AND type = '%u'", GUID_LOPART(guid), type); if (result) { do // this part effectively does nothing, since the deletion / modification only takes place _after_ the PetitionQuery. Though I don't know if the result remains intact if I execute the delete query beforehand. @@ -19789,13 +19789,13 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc if (Spell* spell = GetCurrentSpell(CURRENT_GENERIC_SPELL)) if (spell->m_spellInfo->Id != spellid) - InterruptSpell(CURRENT_GENERIC_SPELL,false); + InterruptSpell(CURRENT_GENERIC_SPELL, false); - InterruptSpell(CURRENT_AUTOREPEAT_SPELL,false); + InterruptSpell(CURRENT_AUTOREPEAT_SPELL, false); if (Spell* spell = GetCurrentSpell(CURRENT_CHANNELED_SPELL)) if (spell->m_spellInfo->Id != spellid) - InterruptSpell(CURRENT_CHANNELED_SPELL,true); + InterruptSpell(CURRENT_CHANNELED_SPELL, true); } uint32 sourcenode = nodes[0]; @@ -19952,7 +19952,7 @@ bool Player::ActivateTaxiPathTo(uint32 taxi_path_id, uint32 spellid /*= 0*/) nodes[0] = entry->from; nodes[1] = entry->to; - return ActivateTaxiPathTo(nodes,NULL,spellid); + return ActivateTaxiPathTo(nodes, NULL, spellid); } void Player::CleanupAfterTaxiFlight() @@ -19971,7 +19971,7 @@ void Player::ContinueTaxiFlight() sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Restart character %u taxi flight", GetGUIDLow()); - uint32 mountDisplayId = sObjectMgr->GetTaxiMountDisplayId(sourceNode, GetTeam(),true); + uint32 mountDisplayId = sObjectMgr->GetTaxiMountDisplayId(sourceNode, GetTeam(), true); uint32 path = m_taxi.GetCurrentTaxiPath(); // search appropriate start path node @@ -20059,8 +20059,8 @@ void Player::InitDataForForm(bool reapplyMods) SpellShapeshiftEntry const* ssEntry = sSpellShapeshiftStore.LookupEntry(form); if (ssEntry && ssEntry->attackSpeed) { - SetAttackTime(BASE_ATTACK,ssEntry->attackSpeed); - SetAttackTime(OFF_ATTACK,ssEntry->attackSpeed); + SetAttackTime(BASE_ATTACK, ssEntry->attackSpeed); + SetAttackTime(OFF_ATTACK, ssEntry->attackSpeed); SetAttackTime(RANGED_ATTACK, BASE_ATTACK_TIME); } else @@ -20120,7 +20120,7 @@ void Player::InitDisplayIds() SetNativeDisplayId(info->displayId_m); break; default: - sLog->outError("Invalid gender %u for player",gender); + sLog->outError("Invalid gender %u for player", gender); return; } } @@ -20161,7 +20161,7 @@ inline bool Player::_StoreOrEquipNewItem(uint32 vendorslot, uint32 item, uint8 c EquipNewItem(uiDest, item, true); if (it) { - uint32 new_count = pVendor->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count); + uint32 new_count = pVendor->UpdateVendorItemCurrentCount(crItem, pProto->BuyCount * count); WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4)); data << uint64(pVendor->GetGUID()); @@ -20207,7 +20207,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 return false; } - Creature *pCreature = GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR); + Creature *pCreature = GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: BuyItemFromVendor - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(vendorguid))); @@ -20289,7 +20289,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 if (GetMaxPersonalArenaRatingRequirement(iece->reqarenaslot) < iece->reqpersonalarenarating) { // probably not the proper equip err - SendEquipError(EQUIP_ERR_CANT_EQUIP_RANK,NULL,NULL); + SendEquipError(EQUIP_ERR_CANT_EQUIP_RANK, NULL, NULL); return false; } } @@ -20385,7 +20385,7 @@ void Player::UpdateHomebindTime(uint32 time) data << uint32(m_HomebindTimer); data << uint32(1); GetSession()->SendPacket(&data); - sLog->outDebug(LOG_FILTER_MAPS, "PLAYER: Player '%s' (GUID: %u) will be teleported to homebind in 60 seconds", GetName(),GetGUIDLow()); + sLog->outDebug(LOG_FILTER_MAPS, "PLAYER: Player '%s' (GUID: %u) will be teleported to homebind in 60 seconds", GetName(), GetGUIDLow()); } } @@ -20419,7 +20419,7 @@ void Player::UpdatePvPState(bool onlyFFA) } else // in friendly area { - if (IsPvP() && !HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_IN_PVP) && pvpInfo.endTimer == 0) + if (IsPvP() && !HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP) && pvpInfo.endTimer == 0) pvpInfo.endTimer = time(0); // start toggle-off } } @@ -20568,11 +20568,11 @@ void Player::UpdatePotionCooldown(Spell* spell) for (uint8 idx = 0; idx < MAX_ITEM_SPELLS; ++idx) if (proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE) if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(proto->Spells[idx].SpellId)) - SendCooldownEvent(spellInfo,m_lastPotionId); + SendCooldownEvent(spellInfo, m_lastPotionId); } // from spell cases (m_lastPotionId set in Spell::SendSpellCooldown) else - SendCooldownEvent(spell->m_spellInfo,m_lastPotionId,spell); + SendCooldownEvent(spell->m_spellInfo, m_lastPotionId, spell); m_lastPotionId = 0; } @@ -20696,7 +20696,7 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply) { // ignore item gem conditions //if state changed, (dis)apply enchant - ApplyEnchantment(pItem,EnchantmentSlot(enchant_slot),!wasactive,true,true); + ApplyEnchantment(pItem, EnchantmentSlot(enchant_slot), !wasactive, true, true); } } } @@ -20732,7 +20732,7 @@ void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply) //only metagems to be (de)activated, so only enchants with condition uint32 condition = enchantEntry->EnchantmentCondition; if (condition) - ApplyEnchantment(pItem,EnchantmentSlot(enchant_slot), apply); + ApplyEnchantment(pItem, EnchantmentSlot(enchant_slot), apply); } } } @@ -20969,13 +20969,13 @@ void Player::UpdateVisibilityOf(WorldObject* target) if (!canSeeOrDetect(target, false, true)) { if (target->GetTypeId() == TYPEID_UNIT) - BeforeVisibilityDestroy<Creature>(target->ToCreature(),this); + BeforeVisibilityDestroy<Creature>(target->ToCreature(), this); target->DestroyForPlayer(this); m_clientGUIDs.erase(target->GetGUID()); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u) out of range for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),GetGUIDLow(),GetDistance(target)); + sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u) out of range for player %u. Distance = %f", target->GetGUIDLow(), target->GetTypeId(), GetGUIDLow(), GetDistance(target)); #endif } } @@ -20990,7 +20990,7 @@ void Player::UpdateVisibilityOf(WorldObject* target) m_clientGUIDs.insert(target->GetGUID()); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u) is visible now for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),GetGUIDLow(),GetDistance(target)); + sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u) is visible now for player %u. Distance = %f", target->GetGUIDLow(), target->GetTypeId(), GetGUIDLow(), GetDistance(target)); #endif // target aura duration for caster show only if target exist at caster client @@ -21016,7 +21016,7 @@ void Player::UpdateTriggerVisibility() if (!obj || !obj->isTrigger()) continue; - obj->BuildCreateUpdateBlockForPlayer(&udata,this); + obj->BuildCreateUpdateBlockForPlayer(&udata, this); } } udata.BuildPacket(&packet); @@ -21042,13 +21042,13 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<Unit*>& vi { if (!canSeeOrDetect(target, false, true)) { - BeforeVisibilityDestroy<T>(target,this); + BeforeVisibilityDestroy<T>(target, this); target->BuildOutOfRangeUpdateBlock(&data); m_clientGUIDs.erase(target->GetGUID()); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u, Entry: %u) is out of range for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),target->GetEntry(),GetGUIDLow(),GetDistance(target)); + sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u, Entry: %u) is out of range for player %u. Distance = %f", target->GetGUIDLow(), target->GetTypeId(), target->GetEntry(), GetGUIDLow(), GetDistance(target)); #endif } } @@ -21060,10 +21060,10 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<Unit*>& vi // UpdateVisibilityOf(((Unit*)target)->m_Vehicle, data, visibleNow); target->BuildCreateUpdateBlockForPlayer(&data, this); - UpdateVisibilityOf_helper(m_clientGUIDs,target,visibleNow); + UpdateVisibilityOf_helper(m_clientGUIDs, target, visibleNow); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u, Entry: %u) is visible now for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),target->GetEntry(),GetGUIDLow(),GetDistance(target)); + sLog->outDebug(LOG_FILTER_MAPS, "Object %u (Type: %u, Entry: %u) is visible now for player %u. Distance = %f", target->GetGUIDLow(), target->GetTypeId(), target->GetEntry(), GetGUIDLow(), GetDistance(target)); #endif } } @@ -21215,7 +21215,7 @@ void Player::ClearComboPoints() SendComboPoints(); - if (Unit* target = ObjectAccessor::GetUnit(*this,m_comboTarget)) + if (Unit* target = ObjectAccessor::GetUnit(*this, m_comboTarget)) target->RemoveComboPointHolder(GetGUIDLow()); m_comboTarget = 0; @@ -21296,8 +21296,8 @@ void Player::SendInitialPacketsAfterAddToMap() // update zone uint32 newzone, newarea; - GetZoneAndAreaId(newzone,newarea); - UpdateZone(newzone,newarea); // also call SendInitWorldStates(); + GetZoneAndAreaId(newzone, newarea); + UpdateZone(newzone, newarea); // also call SendInitWorldStates(); ResetTimeSync(); SendTimeSync(); @@ -21329,7 +21329,7 @@ void Player::SendInitialPacketsAfterAddToMap() WorldPacket data2(SMSG_FORCE_MOVE_ROOT, 10); data2.append(GetPackGUID()); data2 << (uint32)2; - SendMessageToSet(&data2,true); + SendMessageToSet(&data2, true); } SendAurasForTarget(this); @@ -21437,7 +21437,7 @@ void Player::resetSpells(bool myClassOnly) { // not need after this call if (HasAtLoginFlag(AT_LOGIN_RESET_SPELLS)) - RemoveAtLoginFlag(AT_LOGIN_RESET_SPELLS,true); + RemoveAtLoginFlag(AT_LOGIN_RESET_SPELLS, true); // make full copy of map (spells removed and marked as deleted at another spell remove // and we can't use original map for safe iterative with visit each spell at loop end @@ -21476,13 +21476,13 @@ void Player::resetSpells(bool myClassOnly) continue; // skip broken spells - if (!SpellMgr::IsSpellValid(spellInfo,this,false)) + if (!SpellMgr::IsSpellValid(spellInfo, this, false)) continue; } } else for (PlayerSpellMap::const_iterator iter = smap.begin(); iter != smap.end(); ++iter) - removeSpell(iter->first,false,false); // only iter->first can be accessed, object by iter->second can be deleted already + removeSpell(iter->first, false, false); // only iter->first can be accessed, object by iter->second can be deleted already learnDefaultSpells(); learnQuestRewardedSpells(); @@ -21491,13 +21491,13 @@ void Player::resetSpells(bool myClassOnly) void Player::learnDefaultSpells() { // learn default race/class spells - PlayerInfo const *info = sObjectMgr->GetPlayerInfo(getRace(),getClass()); + PlayerInfo const *info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); for (PlayerCreateInfoSpells::const_iterator itr = info->spell.begin(); itr != info->spell.end(); ++itr) { uint32 tspell = *itr; - sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "PLAYER (Class: %u Race: %u): Adding initial spell, id = %u",uint32(getClass()),uint32(getRace()), tspell); + sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "PLAYER (Class: %u Race: %u): Adding initial spell, id = %u", uint32(getClass()), uint32(getRace()), tspell); if (!IsInWorld()) // will send in INITIAL_SPELLS in list anyway at map add - addSpell(tspell,true,true,true,false); + addSpell(tspell, true, true, true, false); else // but send in normal spell in game learn case learnSpell(tspell, true); } @@ -21620,7 +21620,7 @@ void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value) removeSpell(pAbility->spellId); // need learn else if (!IsInWorld()) - addSpell(pAbility->spellId,true,true,true,false); + addSpell(pAbility->spellId, true, true, true, false); else learnSpell(pAbility->spellId, true); } @@ -21676,7 +21676,7 @@ void Player::SetDailyQuestStatus(uint32 quest_id) { if (!GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx)) { - SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,quest_id); + SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx, quest_id); m_lastDailyQuestTime = time(NULL); // last daily quest time m_DailyQuestChanged = true; break; @@ -21701,7 +21701,7 @@ void Player::SetWeeklyQuestStatus(uint32 quest_id) void Player::ResetDailyQuestStatus() { for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) - SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0); + SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx, 0); m_DFQuests.clear(); // Dungeon Finder Quests. @@ -21841,7 +21841,7 @@ void Player::UpdateForQuestWorldObjects() if (IS_GAMEOBJECT_GUID(*itr)) { if (GameObject *obj = HashMapHolder<GameObject>::Find(*itr)) - obj->BuildValuesUpdateBlockForPlayer(&udata,this); + obj->BuildValuesUpdateBlockForPlayer(&udata, this); } else if (IS_CRE_OR_VEH_GUID(*itr)) { @@ -21850,14 +21850,14 @@ void Player::UpdateForQuestWorldObjects() continue; // check if this unit requires quest specific flags - if (!obj->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK)) + if (!obj->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK)) continue; SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(obj->GetEntry()); for (SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr) if (_itr->second.questStart || _itr->second.questEnd) { - obj->BuildCreateUpdateBlockForPlayer(&udata,this); + obj->BuildCreateUpdateBlockForPlayer(&udata, this); break; } } @@ -21894,7 +21894,7 @@ void Player::SummonIfPossible(bool agree) GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS, 1); - TeleportTo(m_summon_mapid, m_summon_x, m_summon_y, m_summon_z,GetOrientation()); + TeleportTo(m_summon_mapid, m_summon_x, m_summon_y, m_summon_z, GetOrientation()); } void Player::RemoveItemDurations(Item *item) @@ -21996,7 +21996,7 @@ bool Player::HasItemFitToSpellRequirements(SpellEntry const* spellInfo, Item con break; } default: - sLog->outError("HasItemFitToSpellRequirements: Not handled spell requirement for item class %u",spellInfo->EquippedItemClass); + sLog->outError("HasItemFitToSpellRequirements: Not handled spell requirement for item class %u", spellInfo->EquippedItemClass); break; } @@ -22036,7 +22036,7 @@ void Player::RemoveItemDependentAurasAndCasts(Item * pItem) } // skip if not item dependent or have alternative item - if (HasItemFitToSpellRequirements(spellInfo,pItem)) + if (HasItemFitToSpellRequirements(spellInfo, pItem)) { ++itr; continue; @@ -22049,7 +22049,7 @@ void Player::RemoveItemDependentAurasAndCasts(Item * pItem) // currently casted spells can be dependent from item for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i) if (Spell* spell = GetCurrentSpell(CurrentSpellTypes(i))) - if (spell->getState() != SPELL_STATE_DELAYED && !HasItemFitToSpellRequirements(spell->m_spellInfo,pItem)) + if (spell->getState() != SPELL_STATE_DELAYED && !HasItemFitToSpellRequirements(spell->m_spellInfo, pItem)) InterruptSpell(CurrentSpellTypes(i)); } @@ -22074,7 +22074,7 @@ uint32 Player::GetResurrectionSpellId() case 27239: spell_id = 27240; break; // rank 6 case 47883: spell_id = 47882; break; // rank 7 default: - sLog->outError("Unhandled spell %u: S.Resurrection",(*itr)->GetId()); + sLog->outError("Unhandled spell %u: S.Resurrection", (*itr)->GetId()); continue; } @@ -22089,7 +22089,7 @@ uint32 Player::GetResurrectionSpellId() } // Reincarnation (passive spell) // prio: 1 // Glyph of Renewed Life - if (prio < 1 && HasSpell(20608) && !HasSpellCooldown(21169) && (HasAura(58059) || HasItemCount(17030,1))) + if (prio < 1 && HasSpell(20608) && !HasSpellCooldown(21169) && (HasAura(58059) || HasItemCount(17030, 1))) spell_id = 21169; return spell_id; @@ -22218,7 +22218,7 @@ bool Player::IsAtRecruitAFriendDistance(WorldObject const* pOther) const uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const { - Item* item = GetWeaponForAttack(attType,true); + Item* item = GetWeaponForAttack(attType, true); // unarmed only with base attack if (attType != BASE_ATTACK && !item) @@ -22243,7 +22243,7 @@ void Player::ResurectUsingRequestData() return; } - ResurrectPlayer(0.0f,false); + ResurrectPlayer(0.0f, false); if (GetMaxHealth() > m_resurrectHealth) SetHealth(m_resurrectHealth); @@ -22277,9 +22277,9 @@ void Player::UpdateZoneDependentAuras(uint32 newZone) // Some spells applied at enter into zone (with subzones), aura removed in UpdateAreaDependentAuras that called always at zone->area update SpellAreaForAreaMapBounds saBounds = sSpellMgr->GetSpellAreaForAreaMapBounds(newZone); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) - if (itr->second->autocast && itr->second->IsFitToRequirements(this,newZone,0)) + if (itr->second->autocast && itr->second->IsFitToRequirements(this, newZone, 0)) if (!HasAura(itr->second->spellId)) - CastSpell(this,itr->second->spellId,true); + CastSpell(this, itr->second->spellId, true); } void Player::UpdateAreaDependentAuras(uint32 newArea) @@ -22288,7 +22288,7 @@ void Player::UpdateAreaDependentAuras(uint32 newArea) for (AuraMap::iterator iter = m_ownedAuras.begin(); iter != m_ownedAuras.end();) { // use m_zoneUpdateId for speed: UpdateArea called from UpdateZone or instead UpdateZone in both cases m_zoneUpdateId up-to-date - if (sSpellMgr->GetSpellAllowedInLocationError(iter->second->GetSpellProto(),GetMapId(),m_zoneUpdateId,newArea,this) != SPELL_CAST_OK) + if (sSpellMgr->GetSpellAllowedInLocationError(iter->second->GetSpellProto(), GetMapId(), m_zoneUpdateId, newArea, this) != SPELL_CAST_OK) RemoveOwnedAura(iter); else ++iter; @@ -22297,9 +22297,9 @@ void Player::UpdateAreaDependentAuras(uint32 newArea) // some auras applied at subzone enter SpellAreaForAreaMapBounds saBounds = sSpellMgr->GetSpellAreaForAreaMapBounds(newArea); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) - if (itr->second->autocast && itr->second->IsFitToRequirements(this,m_zoneUpdateId,newArea)) + if (itr->second->autocast && itr->second->IsFitToRequirements(this, m_zoneUpdateId, newArea)) if (!HasAura(itr->second->spellId)) - CastSpell(this,itr->second->spellId,true); + CastSpell(this, itr->second->spellId, true); if (newArea == 4273 && GetVehicle() && GetPositionX() > 400) // Ulduar { @@ -22423,7 +22423,7 @@ Player* Player::GetNextRandomRaidMember(float radius) if (nearMembers.empty()) return NULL; - uint32 randTarget = urand(0,nearMembers.size()-1); + uint32 randTarget = urand(0, nearMembers.size()-1); return nearMembers[randTarget]; } @@ -22994,15 +22994,15 @@ bool Player::IsBaseRuneSlotsOnCooldown(RuneType runeType) const void Player::AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore const& store, bool broadcast) { Loot loot; - loot.FillLoot (loot_id,store,this,true); + loot.FillLoot (loot_id, store, this, true); uint32 max_slot = loot.GetMaxSlotInLootFor(this); for (uint32 i = 0; i < max_slot; ++i) { - LootItem* lootItem = loot.LootItemInSlot(i,this); + LootItem* lootItem = loot.LootItemInSlot(i, this); ItemPosCountVec dest; - InventoryResult msg = CanStoreNewItem(bag, slot, dest,lootItem->itemid, lootItem->count); + InventoryResult msg = CanStoreNewItem(bag, slot, dest, lootItem->itemid, lootItem->count); if (msg != EQUIP_ERR_OK && slot != NULL_SLOT) msg = CanStoreNewItem(bag, NULL_SLOT, dest, lootItem->itemid, lootItem->count); if (msg != EQUIP_ERR_OK && bag != NULL_BAG) @@ -23013,7 +23013,7 @@ void Player::AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore cons continue; } - Item* pItem = StoreNewItem(dest,lootItem->itemid, true, lootItem->randomPropertyId); + Item* pItem = StoreNewItem(dest, lootItem->itemid, true, lootItem->randomPropertyId); SendNewItem(pItem, lootItem->count, false, false, broadcast); } } @@ -23141,7 +23141,7 @@ void Player::_LoadSkills(PreparedQueryResult result) } // set fixed skill ranges - switch(GetSkillRangeType(pSkill,false)) + switch(GetSkillRangeType(pSkill, false)) { case SKILL_RANGE_LANGUAGE: // 300..300 value = max = 300; @@ -23161,12 +23161,12 @@ void Player::_LoadSkills(PreparedQueryResult result) // enable unlearn button for primary professions only if (pSkill->categoryId == SKILL_CATEGORY_PROFESSION) - SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill,1)); + SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill, 1)); else - SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill,0)); + SetUInt32Value(PLAYER_SKILL_INDEX(count), MAKE_PAIR32(skill, 0)); - SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count),MAKE_SKILL_VALUE(value, max)); - SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count),0); + SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count), MAKE_SKILL_VALUE(value, max)); + SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count), 0); mSkillStatus.insert(SkillStatusMap::value_type(skill, SkillStatusData(count, SKILL_UNCHANGED))); @@ -23186,14 +23186,14 @@ void Player::_LoadSkills(PreparedQueryResult result) for (; count < PLAYER_MAX_SKILLS; ++count) { SetUInt32Value(PLAYER_SKILL_INDEX(count), 0); - SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count),0); - SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count),0); + SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(count), 0); + SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(count), 0); } // special settings if (getClass() == CLASS_DEATH_KNIGHT) { - uint8 base_level = std::min(getLevel(),uint8(sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL))); + uint8 base_level = std::min(getLevel(), uint8(sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL))); if (base_level < 1) base_level = 1; uint16 base_skill = (base_level-1)*5; // 270 at starting level 55 @@ -23243,7 +23243,7 @@ InventoryResult Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limi ItemTemplate const* pProto = pItem->GetTemplate(); // proto based limitations - if (InventoryResult res = CanEquipUniqueItem(pProto,eslot,limit_count)) + if (InventoryResult res = CanEquipUniqueItem(pProto, eslot, limit_count)) return res; // check unique-equipped on gems @@ -23323,7 +23323,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) uint32 damage = (uint32)(damageperc * GetMaxHealth()*sWorld->getRate(RATE_DAMAGE_FALL)); float height = movementInfo.pos.m_positionZ; - UpdateGroundPositionZ(movementInfo.pos.m_positionX,movementInfo.pos.m_positionY,height); + UpdateGroundPositionZ(movementInfo.pos.m_positionX, movementInfo.pos.m_positionY, height); if (damage > 0) { @@ -23617,7 +23617,7 @@ void Player::AddKnownCurrency(uint32 itemId) SetFlag64(PLAYER_FIELD_KNOWN_CURRENCIES, (1LL << (ctEntry->BitIndex-1))); } -void Player::UpdateFallInformationIfNeed(MovementInfo const& minfo,uint16 opcode) +void Player::UpdateFallInformationIfNeed(MovementInfo const& minfo, uint16 opcode) { if (m_lastFallTime >= minfo.fallTime || m_lastFallZ <= minfo.pos.GetPositionZ() || opcode == MSG_MOVE_FALL_LAND) SetFallInformation(minfo.fallTime, minfo.pos.GetPositionZ()); @@ -23659,7 +23659,7 @@ void Player::ResummonPetTemporaryUnSummonedIfAny() bool Player::canSeeSpellClickOn(Creature const *c) const { - if (!c->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK)) + if (!c->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK)) return false; SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(c->GetEntry()); @@ -23998,7 +23998,7 @@ void Player::_SaveBGData(SQLTransaction& trans) stmt->setUInt16(7, m_bgData.joinPos.GetMapId()); stmt->setUInt16(8, m_bgData.taxiPath[0]); stmt->setUInt16(9, m_bgData.taxiPath[1]); - stmt->setUInt16(10,m_bgData.mountSpell); + stmt->setUInt16(10, m_bgData.mountSpell); trans->Append(stmt); } } @@ -24078,7 +24078,7 @@ void Player::_LoadGlyphs(PreparedQueryResult result) void Player::_SaveGlyphs(SQLTransaction& trans) { - trans->PAppend("DELETE FROM character_glyphs WHERE guid='%u'",GetGUIDLow()); + trans->PAppend("DELETE FROM character_glyphs WHERE guid='%u'", GetGUIDLow()); for (uint8 spec = 0; spec < m_specsCount; ++spec) { trans->PAppend("INSERT INTO character_glyphs VALUES('%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", @@ -24107,7 +24107,7 @@ void Player::_SaveTalents(SQLTransaction& trans) trans->PAppend("DELETE FROM character_talent WHERE guid = '%u' and spell = '%u' and spec = '%u'", GetGUIDLow(), itr->first, itr->second->spec); if (itr->second->state == PLAYERSPELL_NEW || itr->second->state == PLAYERSPELL_CHANGED) - trans->PAppend("INSERT INTO character_talent (guid,spell,spec) VALUES ('%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->spec); + trans->PAppend("INSERT INTO character_talent (guid, spell, spec) VALUES ('%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->spec); if (itr->second->state == PLAYERSPELL_REMOVED) { @@ -24139,7 +24139,7 @@ void Player::UpdateSpecCount(uint8 count) { _SaveActions(trans); // make sure the button list is cleaned up for (ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); ++itr) - trans->PAppend("INSERT INTO character_action (guid,button,action,type,spec) VALUES ('%u', '%u', '%u', '%u', '%u')", + trans->PAppend("INSERT INTO character_action (guid, button, action, type, spec) VALUES ('%u', '%u', '%u', '%u', '%u')", GetGUIDLow(), uint32(itr->first), uint32(itr->second.GetAction()), uint32(itr->second.GetType()), 1); } @@ -24147,7 +24147,7 @@ void Player::UpdateSpecCount(uint8 count) else if (count < curCount) { _SaveActions(trans); - trans->PAppend("DELETE FROM character_action WHERE spec<>'%u' AND guid='%u'",m_activeSpec, GetGUIDLow()); + trans->PAppend("DELETE FROM character_action WHERE spec<>'%u' AND guid='%u'", m_activeSpec, GetGUIDLow()); m_activeSpec = 0; } @@ -24321,7 +24321,7 @@ void Player::SendTimeSync() void Player::SetReputation(uint32 factionentry, uint32 value) { - GetReputationMgr().SetReputation(sFactionStore.LookupEntry(factionentry),value); + GetReputationMgr().SetReputation(sFactionStore.LookupEntry(factionentry), value); } uint32 Player::GetReputation(uint32 factionentry) { @@ -24411,7 +24411,7 @@ bool Player::AddItem(uint32 itemId, uint32 count) Item* item = StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId)); if(item) - SendNewItem(item,count,true,false); + SendNewItem(item, count, true, false); else return false; return true; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 3a74ba3d494..71fe07275a8 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -188,7 +188,7 @@ struct ActionButton #define MAX_ACTION_BUTTONS 144 //checked in 3.2.0 -typedef std::map<uint8,ActionButton> ActionButtonList; +typedef std::map<uint8, ActionButton> ActionButtonList; struct PlayerCreateInfoItem { @@ -238,7 +238,7 @@ typedef std::list<PlayerCreateInfoAction> PlayerCreateInfoActions; struct PlayerInfo { // existence checked by displayId != 0 - PlayerInfo() : displayId_m(0),displayId_f(0),levelInfo(NULL) + PlayerInfo() : displayId_m(0), displayId_f(0), levelInfo(NULL) { } @@ -687,8 +687,8 @@ enum TransferAbortReason TRANSFER_ABORT_NOT_FOUND = 0x03, // Transfer Aborted: instance not found TRANSFER_ABORT_TOO_MANY_INSTANCES = 0x04, // You have entered too many instances recently. TRANSFER_ABORT_ZONE_IN_COMBAT = 0x06, // Unable to zone in while an encounter is in progress. - TRANSFER_ABORT_INSUF_EXPAN_LVL = 0x07, // You must have <TBC,WotLK> expansion installed to access this area. - TRANSFER_ABORT_DIFFICULTY = 0x08, // <Normal,Heroic,Epic> difficulty mode is not available for %s. + TRANSFER_ABORT_INSUF_EXPAN_LVL = 0x07, // You must have <TBC, WotLK> expansion installed to access this area. + TRANSFER_ABORT_DIFFICULTY = 0x08, // <Normal, Heroic, Epic> difficulty mode is not available for %s. TRANSFER_ABORT_UNIQUE_MESSAGE = 0x09, // Until you've escaped TLK's grasp, you cannot leave this place! TRANSFER_ABORT_TOO_MANY_REALM_INSTANCES = 0x0A, // Additional instances cannot be launched, please try again later. TRANSFER_ABORT_NEED_GROUP = 0x0B, // 3.1 @@ -890,7 +890,7 @@ class PlayerTaxi else return false; } - void AppendTaximaskTo(ByteBuffer& data,bool all); + void AppendTaximaskTo(ByteBuffer& data, bool all); // Destinations bool LoadTaxiDestinationsFromString(const std::string& values, uint32 team); @@ -1086,8 +1086,8 @@ class Player : public Unit, public GridObject<Player> bool ToggleAFK(); bool ToggleDND(); - bool isAFK() const { return HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_AFK); } - bool isDND() const { return HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_DND); } + bool isAFK() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK); } + bool isDND() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND); } uint8 chatTag() const; std::string afkMsg; std::string dndMsg; @@ -1131,7 +1131,7 @@ class Player : public Unit, public GridObject<Player> void setDeathState(DeathState s); // overwrite Unit::setDeathState - void InnEnter (time_t time,uint32 mapid, float x,float y,float z) + void InnEnter (time_t time, uint32 mapid, float x, float y, float z) { inn_pos_mapid = mapid; inn_pos_x = x; @@ -1162,7 +1162,7 @@ class Player : public Unit, public GridObject<Player> void Say(const std::string& text, const uint32 language); void Yell(const std::string& text, const uint32 language); void TextEmote(const std::string& text); - void Whisper(const std::string& text, const uint32 language,uint64 receiver); + void Whisper(const std::string& text, const uint32 language, uint64 receiver); void BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string& text, uint32 language) const; /*********************************************************/ @@ -1189,12 +1189,12 @@ class Player : public Unit, public GridObject<Player> Item* GetShield(bool useable = false) const; static uint8 GetAttackBySlot(uint8 slot); // MAX_ATTACK if not weapon slot std::vector<Item *> &GetItemUpdateQueue() { return m_itemUpdateQueue; } - static bool IsInventoryPos(uint16 pos) { return IsInventoryPos(pos >> 8,pos & 255); } + static bool IsInventoryPos(uint16 pos) { return IsInventoryPos(pos >> 8, pos & 255); } static bool IsInventoryPos(uint8 bag, uint8 slot); - static bool IsEquipmentPos(uint16 pos) { return IsEquipmentPos(pos >> 8,pos & 255); } + static bool IsEquipmentPos(uint16 pos) { return IsEquipmentPos(pos >> 8, pos & 255); } static bool IsEquipmentPos(uint8 bag, uint8 slot); static bool IsBagPos(uint16 pos); - static bool IsBankPos(uint16 pos) { return IsBankPos(pos >> 8,pos & 255); } + static bool IsBankPos(uint16 pos) { return IsBankPos(pos >> 8, pos & 255); } static bool IsBankPos(uint8 bag, uint8 slot); bool IsValidPos(uint16 pos, bool explicit_pos) { return IsValidPos(pos >> 8, pos & 255, explicit_pos); } bool IsValidPos(uint8 bag, uint8 slot, bool explicit_pos); @@ -1205,8 +1205,8 @@ class Player : public Unit, public GridObject<Player> bool CanNoReagentCast(SpellEntry const* spellInfo) const; bool HasItemOrGemWithIdEquipped(uint32 item, uint32 count, uint8 except_slot = NULL_SLOT) const; bool HasItemOrGemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, uint8 except_slot = NULL_SLOT) const; - InventoryResult CanTakeMoreSimilarItems(Item* pItem) const { return _CanTakeMoreSimilarItems(pItem->GetEntry(),pItem->GetCount(),pItem); } - InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count) const { return _CanTakeMoreSimilarItems(entry,count,NULL); } + InventoryResult CanTakeMoreSimilarItems(Item* pItem) const { return _CanTakeMoreSimilarItems(pItem->GetEntry(), pItem->GetCount(), pItem); } + InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count) const { return _CanTakeMoreSimilarItems(entry, count, NULL); } InventoryResult CanStoreNewItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 item, uint32 count, uint32* no_space_count = NULL) const { return _CanStoreItem(bag, slot, dest, item, count, NULL, false, no_space_count); @@ -1219,7 +1219,7 @@ class Player : public Unit, public GridObject<Player> return _CanStoreItem(bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL); } - InventoryResult CanStoreItems(Item** pItem,int count) const; + InventoryResult CanStoreItems(Item** pItem, int count) const; InventoryResult CanEquipNewItem(uint8 slot, uint16& dest, uint32 item, bool swap) const; InventoryResult CanEquipItem(uint8 slot, uint16& dest, Item *pItem, bool swap, bool not_loading = true) const; @@ -1240,7 +1240,7 @@ class Player : public Unit, public GridObject<Player> void AutoUnequipOffhandIfNeed(bool force = false); bool StoreNewItemInBestSlots(uint32 item_id, uint32 item_count); void AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore const& store, bool broadcast = false); - void AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast = false) { AutoStoreLoot(NULL_BAG,NULL_SLOT,loot_id,store,broadcast); } + void AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast = false) { AutoStoreLoot(NULL_BAG, NULL_SLOT, loot_id, store, broadcast); } void StoreLootItem(uint8 lootSlot, Loot* loot); InventoryResult _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const; @@ -1289,7 +1289,7 @@ class Player : public Unit, public GridObject<Player> bool IsUseEquipedWeapon(bool mainhand) const { // disarm applied only to mainhand weapon - return !IsInFeralForm() && (!mainhand || !HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISARMED)); + return !IsInFeralForm() && (!mainhand || !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED)); } bool IsTwoHandUsed() const { @@ -1473,7 +1473,7 @@ class Player : public Unit, public GridObject<Player> static float GetFloatValueFromArray(Tokens const& data, uint16 index); static uint32 GetZoneIdFromDB(uint64 guid); static uint32 GetLevelFromDB(uint64 guid); - static bool LoadPositionFromDB(uint32& mapid, float& x,float& y,float& z,float& o, bool& in_flight, uint64 guid); + static bool LoadPositionFromDB(uint32& mapid, float& x, float& y, float& z, float& o, bool& in_flight, uint64 guid); static bool IsValidGender(uint8 Gender) { return Gender <= GENDER_FEMALE ; } @@ -1485,10 +1485,10 @@ class Player : public Unit, public GridObject<Player> void SaveInventoryAndGoldToDB(SQLTransaction& trans); // fast save function for item/money cheating preventing void SaveGoldToDB(SQLTransaction& trans); - static void SetUInt32ValueInArray(Tokens& data,uint16 index, uint32 value); - static void SetFloatValueInArray(Tokens& data,uint16 index, float value); + static void SetUInt32ValueInArray(Tokens& data, uint16 index, uint32 value); + static void SetFloatValueInArray(Tokens& data, uint16 index, float value); static void Customize(uint64 guid, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair); - static void SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint32 zone,uint64 guid); + static void SavePositionInDB(uint32 mapid, float x, float y, float z, float o, uint32 zone, uint64 guid); static void DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmChars = true, bool deleteFinally = false); static void DeleteOldCharacters(); @@ -1500,7 +1500,7 @@ class Player : public Unit, public GridObject<Player> void SetBindPoint(uint64 guid); void SendTalentWipeConfirm(uint64 guid); void ResetPetTalents(); - void CalcRage(uint32 damage,bool attacker); + void CalcRage(uint32 damage, bool attacker); void RegenerateAll(); void Regenerate(Powers power); void RegenerateHealth(); @@ -1707,7 +1707,7 @@ class Player : public Unit, public GridObject<Player> m_resurrectHealth = health; m_resurrectMana = mana; } - void clearResurrectRequestData() { setResurrectRequestData(0,0,0.0f,0.0f,0.0f,0,0); } + void clearResurrectRequestData() { setResurrectRequestData(0, 0, 0.0f, 0.0f, 0.0f, 0, 0); } bool isRessurectRequestedBy(uint64 guid) const { return m_resurrectGUID == guid; } bool isRessurectRequested() const { return m_resurrectGUID != 0; } void ResurectUsingRequestData(); @@ -1737,7 +1737,7 @@ class Player : public Unit, public GridObject<Player> (*itr)->SetPvP(state); } void UpdatePvP(bool state, bool override=false); - void UpdateZone(uint32 newZone,uint32 newArea); + void UpdateZone(uint32 newZone, uint32 newArea); void UpdateArea(uint32 newArea); void UpdateZoneDependentAuras(uint32 zone_id); // zones @@ -1766,7 +1766,7 @@ class Player : public Unit, public GridObject<Player> bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); } void UninviteFromGroup(); static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0 , const char* reason = NULL); - void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(),GetGUID(), method); } + void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(), GetGUID(), method); } void SendUpdateToOutOfRangeGroupMembers(); void SetInGuild(uint32 GuildId) { SetUInt32Value(PLAYER_GUILDID, GuildId); } @@ -1992,7 +1992,7 @@ class Player : public Unit, public GridObject<Player> void UpdateSkillsForLevel(); void UpdateSkillsToMaxSkillsForLevel(); // for .levelup - void ModifySkillBonus(uint32 skillid,int32 val, bool talent); + void ModifySkillBonus(uint32 skillid, int32 val, bool talent); /*********************************************************/ /*** PVP SYSTEM ***/ @@ -2044,11 +2044,11 @@ class Player : public Unit, public GridObject<Player> void _ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect const * aura, bool apply); void _ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect const * aura, bool apply); - void _ApplyItemMods(Item *item,uint8 slot,bool apply); + void _ApplyItemMods(Item *item, uint8 slot, bool apply); void _RemoveAllItemMods(); void _ApplyAllItemMods(); void _ApplyAllLevelScaleItemMods(bool apply); - void _ApplyItemBonuses(ItemTemplate const *proto,uint8 slot,bool apply, bool only_level_scale = false); + void _ApplyItemBonuses(ItemTemplate const *proto, uint8 slot, bool apply, bool only_level_scale = false); void _ApplyWeaponDamage(uint8 slot, ItemTemplate const *proto, ScalingStatValuesEntry const *ssv, bool apply); void _ApplyAmmoBonuses(); bool EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot); @@ -2060,7 +2060,7 @@ class Player : public Unit, public GridObject<Player> void ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply, bool form_change = false); void UpdateEquipSpellsAtFormChange(); void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); - void CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex); + void CastItemUseSpell(Item *item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex); void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const * proto); void SendEquipmentSetList(); @@ -2225,7 +2225,7 @@ class Player : public Unit, public GridObject<Player> /*********************************************************/ /*** VARIOUS SYSTEMS ***/ /*********************************************************/ - void UpdateFallInformationIfNeed(MovementInfo const& minfo,uint16 opcode); + void UpdateFallInformationIfNeed(MovementInfo const& minfo, uint16 opcode); Unit *m_mover; WorldObject *m_seer; void SetFallInformation(uint32 time, float z) @@ -2759,8 +2759,8 @@ class Player : public Unit, public GridObject<Player> uint32 _pendingBindTimer; }; -void AddItemsSetItem(Player*player,Item *item); -void RemoveItemsSetItem(Player*player,ItemTemplate const *proto); +void AddItemsSetItem(Player*player, Item *item); +void RemoveItemsSetItem(Player*player, ItemTemplate const *proto); // "the bodies of template functions must be made available in a header file" template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell* spell) diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index dbf9e29f87a..b85bee3e864 100755 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -106,7 +106,7 @@ void PlayerSocial::SetFriendNote(uint32 friend_guid, std::string note) if (itr == m_playerSocialMap.end()) // not exist return; - utf8truncate(note,48); // DB and client size limitation + utf8truncate(note, 48); // DB and client size limitation CharacterDatabase.escape_string(note); CharacterDatabase.PExecute("UPDATE character_social SET note = '%s' WHERE guid = '%u' AND friend = '%u'", note.c_str(), GetPlayerGUID(), friend_guid); diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 2c799ca13b4..6aace74f90a 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -77,7 +77,7 @@ void MapManager::LoadTransports() if (!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed)) // skip transports with empty waypoints list { - sLog->outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId); + sLog->outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.", goinfo->moTransport.taxiPathId); delete t; continue; } @@ -109,7 +109,7 @@ void MapManager::LoadTransports() while (result->NextRow()); // check transport data DB integrity - result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry"); + result = WorldDatabase.Query("SELECT gameobject.guid, gameobject.id, transports.name FROM gameobject, transports WHERE gameobject.id = transports.entry"); if (result) // wrong data found { do @@ -119,7 +119,7 @@ void MapManager::LoadTransports() uint32 guid = fields[0].GetUInt32(); uint32 entry = fields[1].GetUInt32(); std::string name = fields[2].GetString(); - sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid); + sLog->outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.", entry, name.c_str(), guid); } while (result->NextRow()); } @@ -195,13 +195,13 @@ Transport::~Transport() bool Transport::Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags) { - Relocate(x,y,z,ang); + Relocate(x, y, z, ang); // instance id and phaseMask isn't set to values different from std. if (!IsPositionValid()) { sLog->outError("Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", - guidlow,x,y); + guidlow, x, y); return false; } @@ -211,7 +211,7 @@ bool Transport::Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, floa if (!goinfo) { - sLog->outErrorDb("Transport not created: entry in `gameobject_template` not found, guidlow: %u map: %u (X: %f Y: %f Z: %f) ang: %f",guidlow, mapid, x, y, z, ang); + sLog->outErrorDb("Transport not created: entry in `gameobject_template` not found, guidlow: %u map: %u (X: %f Y: %f Z: %f) ang: %f", guidlow, mapid, x, y, z, ang); return false; } @@ -559,7 +559,7 @@ void Transport::Update(uint32 p_diff) m_curr = GetNextWayPoint(); m_next = GetNextWayPoint(); - DoEventIfAny(*m_curr,false); + DoEventIfAny(*m_curr, false); // first check help in case client-server transport coordinates de-synchronization if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport) @@ -568,7 +568,7 @@ void Transport::Update(uint32 p_diff) } else { - Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z, GetAngle(m_next->second.x,m_next->second.y) + float(M_PI)); + Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z, GetAngle(m_next->second.x, m_next->second.y) + float(M_PI)); UpdateNPCPositions(); // COME BACK MARKER } @@ -577,7 +577,7 @@ void Transport::Update(uint32 p_diff) m_nextNodeTime = m_curr->first; if (m_curr == m_WayPoints.begin()) - sLog->outDebug(LOG_FILTER_TRANSPORTS," ************ BEGIN ************** %s", m_name.c_str()); + sLog->outDebug(LOG_FILTER_TRANSPORTS, " ************ BEGIN ************** %s", m_name.c_str()); sLog->outDebug(LOG_FILTER_TRANSPORTS, "%s moved to %d %f %f %f %d", m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid); } @@ -671,7 +671,7 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, if(!pCreature->IsPositionValid()) { - sLog->outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); + sLog->outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", pCreature->GetGUIDLow(), pCreature->GetEntry(), pCreature->GetPositionX(), pCreature->GetPositionY()); delete pCreature; return 0; } @@ -700,7 +700,7 @@ void Transport::UpdatePosition(MovementInfo* mi) float transport_y = mi->pos.m_positionY - (mi->t_pos.m_positionY * cos(transport_o) + mi->t_pos.m_positionX*sin(transport_o)); float transport_z = mi->pos.m_positionZ - mi->t_pos.m_positionZ; - Relocate(transport_x,transport_y,transport_z,transport_o); + Relocate(transport_x, transport_y, transport_z, transport_o); UpdateNPCPositions(); } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 91be2af73b9..9e8ba3770ba 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -449,7 +449,7 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo break; } - float att_speed = GetAPMultiplier(attType,normalized); + float att_speed = GetAPMultiplier(attType, normalized); float base_value = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed; float base_pct = GetModifierValue(unitMod, BASE_PCT); @@ -501,16 +501,16 @@ void Player::UpdateDamagePhysical(WeaponAttackType attType) { case BASE_ATTACK: default: - SetStatFloatValue(UNIT_FIELD_MINDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage); break; case OFF_ATTACK: - SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, maxdamage); break; case RANGED_ATTACK: - SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, maxdamage); break; } } @@ -901,16 +901,16 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) { case BASE_ATTACK: default: - SetStatFloatValue(UNIT_FIELD_MINDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage); break; case OFF_ATTACK: - SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, maxdamage); break; case RANGED_ATTACK: - SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,mindamage); - SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,maxdamage); + SetStatFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, mindamage); + SetStatFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, maxdamage); break; } } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0c78294b645..445488d7d82 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -298,7 +298,7 @@ void Unit::Update(uint32 p_time) bool Unit::haveOffhandWeapon() const { if (GetTypeId() == TYPEID_PLAYER) - return this->ToPlayer()->GetWeaponForAttack(OFF_ATTACK,true); + return this->ToPlayer()->GetWeaponForAttack(OFF_ATTACK, true); else return m_canDualWield; } @@ -317,12 +317,12 @@ void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTim if (GetTypeId() == TYPEID_PLAYER) { Traveller<Player> traveller(*(Player*)this); - transitTime = traveller.GetTotalTrevelTimeTo(x,y,z); + transitTime = traveller.GetTotalTrevelTimeTo(x, y, z); } else { Traveller<Creature> traveller(*this->ToCreature()); - transitTime = traveller.GetTotalTrevelTimeTo(x,y,z); + transitTime = traveller.GetTotalTrevelTimeTo(x, y, z); } } //float orientation = (float)atan2((double)dy, (double)dx); @@ -516,7 +516,7 @@ void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, float combat_reach = GetCombatReach(); if (combat_reach < 0.1) // sometimes bugged for players { - //sLog->outError("Unit %u (Type: %u) has invalid combat_reach %f",GetGUIDLow(),GetTypeId(),combat_reach); + //sLog->outError("Unit %u (Type: %u) has invalid combat_reach %f", GetGUIDLow(), GetTypeId(), combat_reach); //if (GetTypeId() == TYPEID_UNIT) // sLog->outError("Creature entry %u has invalid combat_reach", this->ToCreature()->GetEntry()); combat_reach = DEFAULT_COMBAT_REACH; @@ -524,7 +524,7 @@ void Unit::GetRandomContactPoint(const Unit* obj, float &x, float &y, float &z, uint32 attacker_number = getAttackers().size(); if (attacker_number > 0) --attacker_number; - GetNearPoint(obj,x,y,z,obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin)*(float)rand_norm() + GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin)*(float)rand_norm() , GetAngle(obj) + (attacker_number ? (static_cast<float>(M_PI/2) - static_cast<float>(M_PI) * (float)rand_norm()) * float(attacker_number) / combat_reach * 0.3f : 0)); } @@ -666,7 +666,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa sLog->outStaticDebug("DealDamageStart"); uint32 health = pVictim->GetHealth(); - sLog->outDetail("deal dmg:%d to health:%d ",damage,health); + sLog->outDetail("deal dmg:%d to health:%d ", damage, health); // duel ends when player has 1 or less hp bool duel_hasEnded = false; @@ -742,7 +742,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa // random durability for items (HIT TAKEN) if (roll_chance_f(sWorld->getRate(RATE_DURABILITY_LOSS_DAMAGE))) { - EquipmentSlots slot = EquipmentSlots(urand(0,EQUIPMENT_SLOT_END-1)); + EquipmentSlots slot = EquipmentSlots(urand(0, EQUIPMENT_SLOT_END-1)); pVictim->ToPlayer()->DurabilityPointLossForEquipSlot(slot); } } @@ -759,7 +759,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa // random durability for items (HIT DONE) if (roll_chance_f(sWorld->getRate(RATE_DURABILITY_LOSS_DAMAGE))) { - EquipmentSlots slot = EquipmentSlots(urand(0,EQUIPMENT_SLOT_END-1)); + EquipmentSlots slot = EquipmentSlots(urand(0, EQUIPMENT_SLOT_END-1)); this->ToPlayer()->DurabilityPointLossForEquipSlot(slot); } } @@ -822,7 +822,7 @@ void Unit::CastStop(uint32 except_spellid) { for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++) if (m_currentSpells[i] && m_currentSpells[i]->m_spellInfo->Id != except_spellid) - InterruptSpell(CurrentSpellTypes(i),false); + InterruptSpell(CurrentSpellTypes(i), false); } void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) @@ -831,18 +831,18 @@ void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castIte if (!spellInfo) { - sLog->outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId,(GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId, (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } - CastSpell(Victim,spellInfo,triggered,castItem,triggeredByAura, originalCaster); + CastSpell(Victim, spellInfo, triggered, castItem, triggeredByAura, originalCaster); } -void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) +void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem, AuraEffect const * triggeredByAura, uint64 originalCaster) { if (!spellInfo) { - sLog->outError("CastSpell: unknown spell by caster: %s %u)", (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell: unknown spell by caster: %s %u)", (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } @@ -889,7 +889,7 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); if (!spellInfo) { - sLog->outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId,(GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId, (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } @@ -920,7 +920,7 @@ void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, if (!spellInfo) { - sLog->outError("CastSpell(x,y,z): unknown spell id %i by caster: %s %u)", spellId,(GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell(x, y, z): unknown spell id %i by caster: %s %u)", spellId, (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } @@ -950,13 +950,13 @@ void Unit::CastSpell(GameObject *go, uint32 spellId, bool triggered, Item *castI if (!spellInfo) { - sLog->outError("CastSpell(x,y,z): unknown spell id %i by caster: %s %u)", spellId,(GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell(x, y, z): unknown spell id %i by caster: %s %u)", spellId, (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } if (!(spellInfo->Targets & (TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_CASTER))) { - sLog->outError("CastSpell: spell id %i by caster: %s %u) is not gameobject spell", spellId,(GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); + sLog->outError("CastSpell: spell id %i by caster: %s %u) is not gameobject spell", spellId, (GetTypeId() == TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"), (GetTypeId() == TYPEID_PLAYER ? GetGUIDLow() : GetEntry())); return; } @@ -981,7 +981,7 @@ uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage SpellNonMeleeDamage damageInfo(this, pVictim, spellInfo->Id, spellInfo->SchoolMask); damage = SpellDamageBonus(pVictim, spellInfo, damage, SPELL_DIRECT_DAMAGE); CalculateSpellDamageTaken(&damageInfo, damage, spellInfo); - DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb); + DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); SendSpellNonMeleeDamageLog(&damageInfo); DealSpellDamage(&damageInfo, true); return damageInfo.damage; @@ -1394,7 +1394,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) } // Call default DealDamage - CleanDamage cleanDamage(damageInfo->cleanDamage,damageInfo->absorb,damageInfo->attackType,damageInfo->hitOutCome); + CleanDamage cleanDamage(damageInfo->cleanDamage, damageInfo->absorb, damageInfo->attackType, damageInfo->hitOutCome); DealDamage(pVictim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, SpellSchoolMask(damageInfo->damageSchoolMask), NULL, durabilityLoss); // If this is a creature and it attacks from behind it has a probability to daze it's victim @@ -1435,7 +1435,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) { SpellEntry const *i_spellProto = (*dmgShieldItr)->GetSpellProto(); // Damage shield can be resisted... - if (SpellMissInfo missInfo = pVictim->SpellHitResult(this, i_spellProto ,false)) + if (SpellMissInfo missInfo = pVictim->SpellHitResult(this, i_spellProto , false)) { pVictim->SendSpellMiss(this, i_spellProto->Id, missInfo); continue; @@ -1451,10 +1451,10 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) uint32 damage = (*dmgShieldItr)->GetAmount(); // No Unit::CalcAbsorbResist here - opcode doesn't send that data - this damage is probably not affected by that - pVictim->DealDamageMods(this,damage,NULL); + pVictim->DealDamageMods(this, damage, NULL); // TODO: Move this to a packet handler - WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4)); + WorldPacket data(SMSG_SPELLDAMAGESHIELD, (8+8+4+4+4+4)); data << uint64(pVictim->GetGUID()); data << uint64(GetGUID()); data << uint32(i_spellProto->Id); @@ -1960,7 +1960,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex SendAttackStateUpdate(&damageInfo); ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType); - DealMeleeDamage(&damageInfo,true); + DealMeleeDamage(&damageInfo, true); if (GetTypeId() == TYPEID_PLAYER) sLog->outStaticDebug("AttackerStateUpdate: (Player) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.", @@ -1987,7 +1987,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit *pVictim, WeaponAttackT // Miss chance based on melee //float miss_chance = MeleeMissChanceCalc(pVictim, attType); - float miss_chance = MeleeSpellMissChance(pVictim, attType, int32(GetWeaponSkillValue(attType,pVictim)) - int32(pVictim->GetDefenseSkillValue(this)), 0); + float miss_chance = MeleeSpellMissChance(pVictim, attType, int32(GetWeaponSkillValue(attType, pVictim)) - int32(pVictim->GetDefenseSkillValue(this)), 0); // Critical hit chance float crit_chance = GetUnitCriticalChance(attType, pVictim); @@ -1998,9 +1998,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit *pVictim, WeaponAttackT float parry_chance = pVictim->GetUnitParryChance(); // Useful if want to specify crit & miss chances for melee, else it could be removed - sLog->outStaticDebug("MELEE OUTCOME: miss %f crit %f dodge %f parry %f block %f", miss_chance,crit_chance,dodge_chance,parry_chance,block_chance); + sLog->outStaticDebug("MELEE OUTCOME: miss %f crit %f dodge %f parry %f block %f", miss_chance, crit_chance, dodge_chance, parry_chance, block_chance); - return RollMeleeOutcomeAgainst(pVictim, attType, int32(crit_chance*100), int32(miss_chance*100), int32(dodge_chance*100),int32(parry_chance*100),int32(block_chance*100)); + return RollMeleeOutcomeAgainst(pVictim, attType, int32(crit_chance*100), int32(miss_chance*100), int32(dodge_chance*100), int32(parry_chance*100), int32(block_chance*100)); } MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const @@ -2011,7 +2011,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack int32 attackerMaxSkillValueForLevel = GetMaxSkillValueForLevel(pVictim); int32 victimMaxSkillValueForLevel = pVictim->GetMaxSkillValueForLevel(this); - int32 attackerWeaponSkill = GetWeaponSkillValue(attType,pVictim); + int32 attackerWeaponSkill = GetWeaponSkillValue(attType, pVictim); int32 victimDefenseSkill = pVictim->GetDefenseSkillValue(this); // bonus from skills is 0.04% @@ -2041,7 +2041,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack // Dodge chance // only players can't dodge if attacker is behind - if (pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->HasInArc(M_PI,this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) + if (pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->HasInArc(M_PI, this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { sLog->outStaticDebug ("RollMeleeOutcomeAgainst: attack came from behind and victim was a player."); } @@ -2171,7 +2171,7 @@ uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized, bool add float min_damage, max_damage; if (GetTypeId() == TYPEID_PLAYER && (normalized || !addTotalPct)) - this->ToPlayer()->CalculateMinMaxDamage(attType,normalized,addTotalPct,min_damage, max_damage); + this->ToPlayer()->CalculateMinMaxDamage(attType, normalized, addTotalPct, min_damage, max_damage); else { switch (attType) @@ -2197,7 +2197,7 @@ uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized, bool add } if (min_damage > max_damage) - std::swap(min_damage,max_damage); + std::swap(min_damage, max_damage); if (max_damage == 0.0f) max_damage = 5.0f; @@ -2241,12 +2241,12 @@ void Unit::SendMeleeAttackStop(Unit* victim) data.append(victim->GetPackGUID()); // can be 0x00... data << uint32(0); // can be 0x1 SendMessageToSet(&data, true); - sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"),victim->GetGUIDLow()); + sLog->outDetail("%s %u stopped attacking %s %u", (GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), GetGUIDLow(), (victim->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), victim->GetGUIDLow()); } bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, WeaponAttackType attackType) { - if (pVictim->HasInArc(M_PI,this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) + if (pVictim->HasInArc(M_PI, this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { // Check creatures flags_extra for disable block if (pVictim->GetTypeId() == TYPEID_UNIT && @@ -2304,7 +2304,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) attackerWeaponSkill = getLevel() * 5; // bonus from skills is 0.04% per skill Diff else - attackerWeaponSkill = int32(GetWeaponSkillValue(attType,pVictim)); + attackerWeaponSkill = int32(GetWeaponSkillValue(attType, pVictim)); int32 skillDiff = attackerWeaponSkill - int32(pVictim->GetMaxSkillValueForLevel(this)); int32 fullSkillDiff = attackerWeaponSkill - int32(pVictim->GetDefenseSkillValue(this)); @@ -2353,7 +2353,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) if (attType == RANGED_ATTACK) { // only if in front - if (pVictim->HasInArc(M_PI,this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) + if (pVictim->HasInArc(M_PI, this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { int32 deflect_chance = pVictim->GetTotalAuraModifier(SPELL_AURA_DEFLECT_SPELLS)*100; tmp+=deflect_chance; @@ -2364,7 +2364,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) } // Check for attack from behind - if (!pVictim->HasInArc(M_PI,this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) + if (!pVictim->HasInArc(M_PI, this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION)) { // Can`t dodge from behind in PvP (but its possible in PvE) if (pVictim->GetTypeId() == TYPEID_PLAYER) @@ -2646,9 +2646,9 @@ float Unit::GetUnitParryChance() const Player const* player = (Player const*)this; if (player->CanParry()) { - Item *tmpitem = player->GetWeaponForAttack(BASE_ATTACK,true); + Item *tmpitem = player->GetWeaponForAttack(BASE_ATTACK, true); if (!tmpitem) - tmpitem = player->GetWeaponForAttack(OFF_ATTACK,true); + tmpitem = player->GetWeaponForAttack(OFF_ATTACK, true); if (tmpitem) chance = GetFloatValue(PLAYER_PARRY_PERCENTAGE); @@ -2758,7 +2758,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target) uint32 value = 0; if (GetTypeId() == TYPEID_PLAYER) { - Item* item = this->ToPlayer()->GetWeaponForAttack(attType,true); + Item* item = this->ToPlayer()->GetWeaponForAttack(attType, true); // feral or unarmed skill only for base attack if (attType != BASE_ATTACK && !item) @@ -2861,7 +2861,7 @@ void Unit::_UpdateSpells(uint32 time) void Unit::_UpdateAutoRepeatSpell() { //check "realtime" interrupts - if ((GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false,false,true,m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) + if ((GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false, false, true, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) { // cancel wand shoot if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75) @@ -2872,7 +2872,7 @@ void Unit::_UpdateAutoRepeatSpell() //apply delay (Auto Shot (spellID 75) not affected) if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500 && m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75) - setAttackTimer(RANGED_ATTACK,500); + setAttackTimer(RANGED_ATTACK, 500); m_AutoRepeatFirstCast = false; //castroutine @@ -2903,7 +2903,7 @@ void Unit::SetCurrentCastedSpell(Spell * pSpell) if (pSpell == m_currentSpells[CSpellType]) return; // avoid breaking self // break same type spell if it is not delayed - InterruptSpell(CSpellType,false); + InterruptSpell(CSpellType, false); // special breakage effects: switch (CSpellType) @@ -2911,7 +2911,7 @@ void Unit::SetCurrentCastedSpell(Spell * pSpell) case CURRENT_GENERIC_SPELL: { // generic spells always break channeled not delayed spells - InterruptSpell(CURRENT_CHANNELED_SPELL,false); + InterruptSpell(CURRENT_CHANNELED_SPELL, false); // autorepeat breaking if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]) @@ -2927,7 +2927,7 @@ void Unit::SetCurrentCastedSpell(Spell * pSpell) case CURRENT_CHANNELED_SPELL: { // channel spells always break generic non-delayed and any channeled spells - InterruptSpell(CURRENT_GENERIC_SPELL,false); + InterruptSpell(CURRENT_GENERIC_SPELL, false); InterruptSpell(CURRENT_CHANNELED_SPELL); // it also does break autorepeat if not Auto Shot @@ -2943,8 +2943,8 @@ void Unit::SetCurrentCastedSpell(Spell * pSpell) if (pSpell->m_spellInfo->Id != 75) { // generic autorepeats break generic non-delayed and channeled non-delayed spells - InterruptSpell(CURRENT_GENERIC_SPELL,false); - InterruptSpell(CURRENT_CHANNELED_SPELL,false); + InterruptSpell(CURRENT_GENERIC_SPELL, false); + InterruptSpell(CURRENT_CHANNELED_SPELL, false); } // special action: set first cast flag m_AutoRepeatFirstCast = true; @@ -3041,15 +3041,15 @@ void Unit::InterruptNonMeleeSpells(bool withDelayed, uint32 spell_id, bool withI { // generic spells are interrupted if they are not finished or delayed if (m_currentSpells[CURRENT_GENERIC_SPELL] && (!spell_id || m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == spell_id)) - InterruptSpell(CURRENT_GENERIC_SPELL,withDelayed,withInstant); + InterruptSpell(CURRENT_GENERIC_SPELL, withDelayed, withInstant); // autorepeat spells are interrupted if they are not finished or delayed if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL] && (!spell_id || m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == spell_id)) - InterruptSpell(CURRENT_AUTOREPEAT_SPELL,withDelayed,withInstant); + InterruptSpell(CURRENT_AUTOREPEAT_SPELL, withDelayed, withInstant); // channeled spells are interrupted if they are not finished, even if they are delayed if (m_currentSpells[CURRENT_CHANNELED_SPELL] && (!spell_id || m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->Id == spell_id)) - InterruptSpell(CURRENT_CHANNELED_SPELL,true,true); + InterruptSpell(CURRENT_CHANNELED_SPELL, true, true); } Spell* Unit::FindCurrentSpellBySpellId(uint32 spell_id) const @@ -3098,12 +3098,12 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const bool Unit::IsInWater() const { - return GetBaseMap()->IsInWater(GetPositionX(),GetPositionY(), GetPositionZ()); + return GetBaseMap()->IsInWater(GetPositionX(), GetPositionY(), GetPositionZ()); } bool Unit::IsUnderWater() const { - return GetBaseMap()->IsUnderWater(GetPositionX(),GetPositionY(),GetPositionZ()); + return GetBaseMap()->IsUnderWater(GetPositionX(), GetPositionY(), GetPositionZ()); } void Unit::DeMorph() @@ -3263,7 +3263,7 @@ void Unit::_UnapplyAura(AuraApplicationMap::iterator &i, AuraRemoveMode removeMo ASSERT(aurApp->GetTarget() == this); aurApp->SetRemoveMode(removeMode); Aura * aura = aurApp->GetBase(); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS,"Aura %u now is remove mode %d", aura->GetId(), removeMode); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u now is remove mode %d", aura->GetId(), removeMode); // dead loop is killing the server probably ASSERT(m_removedAurasCount < 0xFFFFFFFF); @@ -3745,7 +3745,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit } } -void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId) +void Unit::RemoveAurasDueToItemSpell(Item* castItem, uint32 spellId) { for (AuraApplicationMap::iterator iter = m_appliedAuras.lower_bound(spellId); iter != m_appliedAuras.upper_bound(spellId);) { @@ -4045,7 +4045,7 @@ void Unit::DelayOwnedAuras(uint32 spellId, uint64 caster, int32 delaytime) // update for out of range group members (on 1 slot use) aura->SetNeedClientUpdateForTargets(); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms",aura->GetId() , GetGUIDLow(), aura->GetDuration()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u partially interrupted on unit %u, new duration: %u ms", aura->GetId() , GetGUIDLow(), aura->GetDuration()); } } } @@ -4592,7 +4592,7 @@ void Unit::AddGameObject(GameObject* gameObj) // Need disable spell use for owner if (createBySpell && createBySpell->Attributes & SPELL_ATTR0_DISABLED_WHILE_ACTIVE) // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existed cases) - this->ToPlayer()->AddSpellAndCategoryCooldowns(createBySpell,0,NULL,true); + this->ToPlayer()->AddSpellAndCategoryCooldowns(createBySpell, 0, NULL, true); } } @@ -4709,7 +4709,7 @@ void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVic { // Not much to do if no flags are set. if (procAttacker) - ProcDamageAndSpellFor(false, pVictim, procAttacker, procExtra,attType, procSpell, amount, procAura); + ProcDamageAndSpellFor(false, pVictim, procAttacker, procExtra, attType, procSpell, amount, procAura); // Now go on with a victim's events'n'auras // Not much to do if no flags are set or there is no victim if (pVictim && pVictim->isAlive() && procVictim) @@ -4783,7 +4783,7 @@ void Unit::SendSpellDamageImmune(Unit * target, uint32 spellId) data << uint64(target->GetGUID()); data << uint32(spellId); data << uint8(0); // bool - log format: 0-default, 1-debug - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) @@ -4905,7 +4905,7 @@ bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (!triggerEntry) { - sLog->outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",hasteSpell->Id,triggered_spell_id); + sLog->outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u", hasteSpell->Id, triggered_spell_id); return false; } @@ -4917,12 +4917,12 @@ bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; if (basepoints0) - CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); else - CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura); + CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } @@ -4967,7 +4967,7 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraE if (!triggerEntry) { - sLog->outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",triggeredByAuraSpell->Id,triggered_spell_id); + sLog->outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u", triggeredByAuraSpell->Id, triggered_spell_id); return false; } @@ -4979,12 +4979,12 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraE return false; if (basepoints0) - CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); else - CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura); + CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } @@ -5166,25 +5166,25 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // Select class defined buff switch (getClass()) { - case CLASS_PALADIN: // 39511,40997,40998,40999,41002,41005,41009,41011,41409 - case CLASS_DRUID: // 39511,40997,40998,40999,41002,41005,41009,41011,41409 - triggered_spell_id = RAND(39511,40997,40998,40999,41002,41005,41009,41011,41409); + case CLASS_PALADIN: // 39511, 40997, 40998, 40999, 41002, 41005, 41009, 41011, 41409 + case CLASS_DRUID: // 39511, 40997, 40998, 40999, 41002, 41005, 41009, 41011, 41409 + triggered_spell_id = RAND(39511, 40997, 40998, 40999, 41002, 41005, 41009, 41011, 41409); cooldown_spell_id = 39511; break; - case CLASS_ROGUE: // 39511,40997,40998,41002,41005,41011 - case CLASS_WARRIOR: // 39511,40997,40998,41002,41005,41011 - triggered_spell_id = RAND(39511,40997,40998,41002,41005,41011); + case CLASS_ROGUE: // 39511, 40997, 40998, 41002, 41005, 41011 + case CLASS_WARRIOR: // 39511, 40997, 40998, 41002, 41005, 41011 + triggered_spell_id = RAND(39511, 40997, 40998, 41002, 41005, 41011); cooldown_spell_id = 39511; break; - case CLASS_PRIEST: // 40999,41002,41005,41009,41011,41406,41409 - case CLASS_SHAMAN: // 40999,41002,41005,41009,41011,41406,41409 - case CLASS_MAGE: // 40999,41002,41005,41009,41011,41406,41409 - case CLASS_WARLOCK: // 40999,41002,41005,41009,41011,41406,41409 - triggered_spell_id = RAND(40999,41002,41005,41009,41011,41406,41409); + case CLASS_PRIEST: // 40999, 41002, 41005, 41009, 41011, 41406, 41409 + case CLASS_SHAMAN: // 40999, 41002, 41005, 41009, 41011, 41406, 41409 + case CLASS_MAGE: // 40999, 41002, 41005, 41009, 41011, 41406, 41409 + case CLASS_WARLOCK: // 40999, 41002, 41005, 41009, 41011, 41406, 41409 + triggered_spell_id = RAND(40999, 41002, 41005, 41009, 41011, 41406, 41409); cooldown_spell_id = 40999; break; - case CLASS_HUNTER: // 40997,40999,41002,41005,41009,41011,41406,41409 - triggered_spell_id = RAND(40997,40999,41002,41005,41009,41011,41406,41409); + case CLASS_HUNTER: // 40997, 40999, 41002, 41005, 41009, 41011, 41406, 41409 + triggered_spell_id = RAND(40997, 40999, 41002, 41005, 41009, 41011, 41406, 41409); cooldown_spell_id = 40997; break; default: @@ -5226,7 +5226,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (!target) { uint64 selected_guid = ToPlayer()->GetSelection(); - target = ObjectAccessor::GetUnit(*this,selected_guid); + target = ObjectAccessor::GetUnit(*this, selected_guid); if (!target) return false; } @@ -5345,7 +5345,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (!owner || owner->GetTypeId() != TYPEID_PLAYER) return false; // Glyph of Shadowfiend (need cast as self cast for owner, no hidden cooldown) - owner->CastSpell(owner,58227,true,castItem,triggeredByAura); + owner->CastSpell(owner, 58227, true, castItem, triggeredByAura); return true; } // Divine purpose @@ -5403,12 +5403,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (RandomSpells.empty()) //shouldn't happen return false; - uint8 rand_spell = irand(0,(RandomSpells.size() - 1)); - CastSpell(target,RandomSpells[rand_spell],true,castItem,triggeredByAura, originalCaster); + uint8 rand_spell = irand(0, (RandomSpells.size() - 1)); + CastSpell(target, RandomSpells[rand_spell], true, castItem, triggeredByAura, originalCaster); for (std::vector<uint32>::iterator itr = RandomSpells.begin(); itr != RandomSpells.end(); ++itr) { if (!ToPlayer()->HasSpellCooldown(*itr)) - ToPlayer()->AddSpellCooldown(*itr,0,time(NULL) + cooldown); + ToPlayer()->AddSpellCooldown(*itr, 0, time(NULL) + cooldown); } break; } @@ -5449,12 +5449,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (RandomSpells.empty()) //shouldn't happen return false; - uint8 rand_spell = irand(0,(RandomSpells.size() - 1)); - CastSpell(target,RandomSpells[rand_spell],true,castItem,triggeredByAura, originalCaster); + uint8 rand_spell = irand(0, (RandomSpells.size() - 1)); + CastSpell(target, RandomSpells[rand_spell], true, castItem, triggeredByAura, originalCaster); for (std::vector<uint32>::iterator itr = RandomSpells.begin(); itr != RandomSpells.end(); ++itr) { if (!ToPlayer()->HasSpellCooldown(*itr)) - ToPlayer()->AddSpellCooldown(*itr,0,time(NULL) + cooldown); + ToPlayer()->AddSpellCooldown(*itr, 0, time(NULL) + cooldown); } break; } @@ -5573,7 +5573,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 31571: triggered_spell_id = 57529; break; case 31572: triggered_spell_id = 57531; break; default: - sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u",dummySpell->Id); + sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u", dummySpell->Id); return false; } break; @@ -5655,7 +5655,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 12847: basepoints0 = int32(0.16f*damage); break; case 12848: basepoints0 = int32(0.20f*damage); break; default: - sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u (IG)",dummySpell->Id); + sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u (IG)", dummySpell->Id); return false; } @@ -5687,7 +5687,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger basepoints0 = int32(CalculatePctN(damage, 15)); if (AuraEffect* aurEff = pVictim->GetAuraEffect(64413, 0, GetGUID())) { - // The shield can grow to a maximum size of 20,000 damage absorbtion + // The shield can grow to a maximum size of 20, 000 damage absorbtion aurEff->SetAmount(std::max<int32>(aurEff->GetAmount() + basepoints0, 20000)); // Refresh and return to prevent replacing the aura @@ -5751,7 +5751,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger case 29834: triggered_spell_id=29841; break; case 42770: triggered_spell_id=42771; break; default: - sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u (SW)",dummySpell->Id); + sLog->outError("Unit::HandleDummyAuraProc: non handled spell id: %u (SW)", dummySpell->Id); return false; } @@ -5891,17 +5891,17 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (target) { // regen mana for pet - CastCustomSpell(target,54607,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, 54607, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); } // regen mana for caster - CastCustomSpell(this,59117,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(this, 59117, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); // Get second aura of spell for replenishment effect on party if (AuraEffect const * aurEff = (*i)->GetBase()->GetEffect(1)) { // Replenishment - roll chance if (roll_chance_i(aurEff->GetAmount())) { - CastSpell(this,57669,true, castItem, triggeredByAura); + CastSpell(this, 57669, true, castItem, triggeredByAura); } } break; @@ -5956,7 +5956,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; // Energize 0.25% of max. mana - pVictim->CastSpell(pVictim,57669,true,castItem,triggeredByAura); + pVictim->CastSpell(pVictim, 57669, true, castItem, triggeredByAura); return true; // no hidden cooldown } // Divine Aegis @@ -6182,7 +6182,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // Improved Leader of the Pack // Check cooldown of heal spell cooldown if (GetTypeId() == TYPEID_PLAYER && !ToPlayer()->HasSpellCooldown(34299)) - CastCustomSpell(this,60889,&basepoints1,0,0,true,0,triggeredByAura); + CastCustomSpell(this, 60889, &basepoints1, 0, 0, true, 0, triggeredByAura); break; } // Healing Touch (Dreamwalker Raiment set) @@ -6527,7 +6527,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger target = this; triggered_spell_id = 31930; // replenishment - CastSpell(this,57669,true, castItem, triggeredByAura); + CastSpell(this, 57669, true, castItem, triggeredByAura); break; } // Sanctified Wrath @@ -6536,7 +6536,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger triggered_spell_id = 57318; target = this; basepoints0 = triggerAmount; - CastCustomSpell(target,triggered_spell_id,&basepoints0,&basepoints0,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, triggered_spell_id, &basepoints0, &basepoints0, NULL, true, castItem, triggeredByAura); return true; } // Sacred Shield @@ -6659,7 +6659,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // Seal of Vengeance (damage calc on apply aura) case 31801: { - if (effIndex != 0) // effect 1,2 used by seal unleashing code + if (effIndex != 0) // effect 1, 2 used by seal unleashing code return false; // At melee attack or Hammer of the Righteous spell damage considered as melee attack @@ -6684,7 +6684,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // Seal of Corruption case 53736: { - if (effIndex != 0) // effect 1,2 used by seal unleashing code + if (effIndex != 0) // effect 1, 2 used by seal unleashing code return false; // At melee attack or Hammer of the Righteous spell damage considered as melee attack @@ -6953,7 +6953,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // Now compute real proc chance... uint32 chance = 20; - this->ToPlayer()->ApplySpellMod(dummySpell->Id,SPELLMOD_CHANCE_OF_SUCCESS,chance); + this->ToPlayer()->ApplySpellMod(dummySpell->Id, SPELLMOD_CHANCE_OF_SUCCESS, chance); Item* addWeapon = this->ToPlayer()->GetWeaponForAttack(attType == BASE_ATTACK ? OFF_ATTACK : BASE_ATTACK, true); uint32 enchant_id_add = addWeapon ? addWeapon->GetEnchantmentId(EnchantmentSlot(TEMP_ENCHANTMENT_SLOT)) : 0; @@ -6980,7 +6980,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger default: { sLog->outError("Unit::HandleDummyAuraProc: non handled item enchantment (rank?) %u for spell id: %u (Windfury)", - castItem->GetEnchantmentId(EnchantmentSlot(TEMP_ENCHANTMENT_SLOT)),dummySpell->Id); + castItem->GetEnchantmentId(EnchantmentSlot(TEMP_ENCHANTMENT_SLOT)), dummySpell->Id); return false; } } @@ -6988,7 +6988,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger SpellEntry const* windfurySpellEntry = sSpellStore.LookupEntry(spellId); if (!windfurySpellEntry) { - sLog->outError("Unit::HandleDummyAuraProc: non existed spell id: %u (Windfury)",spellId); + sLog->outError("Unit::HandleDummyAuraProc: non existed spell id: %u (Windfury)", spellId); return false; } @@ -7000,11 +7000,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger // apply cooldown before cast to prevent processing itself if (cooldown) - ToPlayer()->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown); + ToPlayer()->AddSpellCooldown(dummySpell->Id, 0, time(NULL) + cooldown); // Attack Twice for (uint32 i = 0; i<2; ++i) - CastCustomSpell(pVictim,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(pVictim, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); return true; } @@ -7109,7 +7109,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger newCooldownDelay = 0; else newCooldownDelay -= 2; - ToPlayer()->AddSpellCooldown(16166,0, uint32(time(NULL) + newCooldownDelay)); + ToPlayer()->AddSpellCooldown(16166, 0, uint32(time(NULL) + newCooldownDelay)); WorldPacket data(SMSG_MODIFY_COOLDOWN, 4+8+4); data << uint32(16166); // Spell ID @@ -7197,7 +7197,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger basepoints0 = triggerAmount; // Glyph of Earth Shield - if (AuraEffect* aur = GetAuraEffect(63279,0)) + if (AuraEffect* aur = GetAuraEffect(63279, 0)) AddPctN(basepoints0, aur->GetAmount()); triggered_spell_id = 379; break; @@ -7240,7 +7240,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger else return false; - CastCustomSpell(pVictim,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(pVictim, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); return true; } // Improved Water Shield @@ -7397,8 +7397,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if (pPet && pPet->getVictim() && damage && procSpell) { uint32 procDmg = damage / 2; - pPet->SendSpellNonMeleeDamageLog(pPet->getVictim(),procSpell->Id,procDmg,GetSpellSchoolMask(procSpell),0,0,false,0,false); - pPet->DealDamage(pPet->getVictim(),procDmg,NULL,SPELL_DIRECT_DAMAGE,GetSpellSchoolMask(procSpell),procSpell,true); + pPet->SendSpellNonMeleeDamageLog(pPet->getVictim(), procSpell->Id, procDmg, GetSpellSchoolMask(procSpell), 0, 0, false, 0, false); + pPet->DealDamage(pPet->getVictim(), procDmg, NULL, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(procSpell), procSpell, true); break; } else @@ -7416,7 +7416,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger { basepoints0 = CalculatePctN(int32(damage), triggerAmount); // Glyph of Unholy Blight - if (AuraEffect *glyph=GetAuraEffect(63332,0)) + if (AuraEffect *glyph=GetAuraEffect(63332, 0)) AddPctN(basepoints0, glyph->GetAmount()); // Find replaced aura to use it's remaining amount AuraEffectList const& DoTAuras = target->GetAuraEffectsByType(SPELL_AURA_PERIODIC_DAMAGE); @@ -7592,8 +7592,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger else continue; - basepoints0 = int32(CalculateSpellDamage(this, procSpell,i) * 0.4f); - CastCustomSpell(this,triggered_spell_id,&basepoints0,NULL,NULL,true,NULL,triggeredByAura); + basepoints0 = int32(CalculateSpellDamage(this, procSpell, i) * 0.4f); + CastCustomSpell(this, triggered_spell_id, &basepoints0, NULL, NULL, true, NULL, triggeredByAura); } return true; } @@ -7636,7 +7636,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id); if (!triggerEntry) { - sLog->outError("Unit::HandleDummyAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id); + sLog->outError("Unit::HandleDummyAuraProc: Spell %u have not existed triggered spell %u", dummySpell->Id, triggered_spell_id); return false; } @@ -7651,12 +7651,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; if (basepoints0) - CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura, originalCaster); + CastCustomSpell(target, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura, originalCaster); else - CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura, originalCaster); + CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster); if (cooldown && GetTypeId() == TYPEID_PLAYER) - ToPlayer()->AddSpellCooldown(cooldown_spell_id,0,time(NULL) + cooldown); + ToPlayer()->AddSpellCooldown(cooldown_spell_id, 0, time(NULL) + cooldown); return true; } @@ -7698,7 +7698,7 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffe // Try handle unknown trigger spells if (!triggerEntry) { - sLog->outError("Unit::HandleObsModEnergyAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id); + sLog->outError("Unit::HandleObsModEnergyAuraProc: Spell %u have not existed triggered spell %u", dummySpell->Id, triggered_spell_id); return false; } @@ -7709,12 +7709,12 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffe if (cooldown && GetTypeId() == TYPEID_PLAYER && this->ToPlayer()->HasSpellCooldown(triggered_spell_id)) return false; if (basepoints0) - CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); else - CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura); + CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown) @@ -7755,7 +7755,7 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, Aur if (!triggerEntry) { - sLog->outError("Unit::HandleModDamagePctTakenAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id); + sLog->outError("Unit::HandleModDamagePctTakenAuraProc: Spell %u have not existed triggered spell %u", dummySpell->Id, triggered_spell_id); return false; } @@ -7767,12 +7767,12 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, Aur return false; if (basepoints0) - CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, triggered_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); else - CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura); + CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } @@ -8058,7 +8058,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig trigger_spell_id = 31643; break; default: - sLog->outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Blazing Speed",auraSpellInfo->Id); + sLog->outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Blazing Speed", auraSpellInfo->Id); return false; } } @@ -8078,7 +8078,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig { if ((*i)->GetMiscValue() == SPELLMOD_CHANCE_OF_SUCCESS && (*i)->GetSpellProto()->SpellIconID == 113) { - int32 value2 = CalculateSpellDamage(this, (*i)->GetSpellProto(),2); + int32 value2 = CalculateSpellDamage(this, (*i)->GetSpellProto(), 2); basepoints0 = int32(CalculatePctN(GetMaxPower(POWER_MANA), value2)); // Drain Soul CastCustomSpell(this, 18371, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); @@ -8175,7 +8175,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig trigger_spell_id = 63468; break; default: - sLog->outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Piercing Shots",auraSpellInfo->Id); + sLog->outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Piercing Shots", auraSpellInfo->Id); return false; } SpellEntry const *TriggerPS = sSpellStore.LookupEntry(trigger_spell_id); @@ -8300,14 +8300,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig case 48820: originalSpellId = 48824; break; case 48821: originalSpellId = 48825; break; default: - sLog->outError("Unit::HandleProcTriggerSpell: Spell %u not handled in HShock",procSpell->Id); + sLog->outError("Unit::HandleProcTriggerSpell: Spell %u not handled in HShock", procSpell->Id); return false; } } SpellEntry const *originalSpell = sSpellStore.LookupEntry(originalSpellId); if (!originalSpell) { - sLog->outError("Unit::HandleProcTriggerSpell: Spell %u unknown but selected as original in Illu",originalSpellId); + sLog->outError("Unit::HandleProcTriggerSpell: Spell %u unknown but selected as original in Illu", originalSpellId); return false; } // percent stored in effect 1 (class scripts) base points @@ -8362,7 +8362,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig return false; if (pVictim && pVictim->isAlive()) - pVictim->getThreatManager().modifyThreatPercent(this,-10); + pVictim->getThreatManager().modifyThreatPercent(this, -10); basepoints0 = int32(CountPctFromMaxHealth(triggerAmount)); trigger_spell_id = 31616; @@ -8414,7 +8414,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig if (triggerEntry == NULL) { // Not cast unknown spell - // sLog->outError("Unit::HandleProcTriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",auraSpellInfo->Id,triggeredByAura->GetEffIndex()); + // sLog->outError("Unit::HandleProcTriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?", auraSpellInfo->Id, triggeredByAura->GetEffIndex()); return false; } @@ -8583,10 +8583,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig if (cooldown && target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->HasSpellCooldown(trigger_spell_id)) return false; - target->CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura); + target->CastSpell(target, trigger_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(trigger_spell_id, 0, time(NULL) + cooldown); return true; } // Cast positive spell on enemy target @@ -8791,12 +8791,12 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig return false; if (basepoints0) - CastCustomSpell(target,trigger_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + CastCustomSpell(target, trigger_spell_id, &basepoints0, NULL, NULL, true, castItem, triggeredByAura); else - CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura); + CastSpell(target, trigger_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - ToPlayer()->AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown); + ToPlayer()->AddSpellCooldown(trigger_spell_id, 0, time(NULL) + cooldown); return true; } @@ -8888,7 +8888,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 /*damage*/, A if (!triggerEntry) { - sLog->outError("Unit::HandleOverrideClassScriptAuraProc: Spell %u triggering for class script id %u",triggered_spell_id,scriptId); + sLog->outError("Unit::HandleOverrideClassScriptAuraProc: Spell %u triggering for class script id %u", triggered_spell_id, scriptId); return false; } @@ -8898,7 +8898,7 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 /*damage*/, A CastSpell(pVictim, triggered_spell_id, true, castItem, triggeredByAura); if (cooldown && GetTypeId() == TYPEID_PLAYER) - this->ToPlayer()->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown); + this->ToPlayer()->AddSpellCooldown(triggered_spell_id, 0, time(NULL) + cooldown); return true; } @@ -9081,7 +9081,7 @@ bool Unit::IsHostileTo(Unit const* unit) const } } - // common faction based case (CvC,PvC,CvP) + // common faction based case (CvC, PvC, CvP) return tester_faction->IsHostileTo(*target_faction); } @@ -9196,7 +9196,7 @@ bool Unit::IsFriendlyTo(Unit const* unit) const } } - // common faction based case (CvC,PvC,CvP) + // common faction based case (CvC, PvC, CvP) return tester_faction->IsFriendlyTo(*target_faction); } @@ -9442,7 +9442,7 @@ void Unit::ModifyAuraState(AuraState flag, bool apply) } else { - if (HasFlag(UNIT_FIELD_AURASTATE,1<<(flag-1))) + if (HasFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1))) { RemoveFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1)); @@ -9531,7 +9531,7 @@ Minion *Unit::GetFirstMinion() const if (pet->HasUnitTypeMask(UNIT_MASK_MINION)) return (Minion*)pet; - sLog->outError("Unit::GetFirstMinion: Minion %u not exist.",GUID_LOPART(pet_guid)); + sLog->outError("Unit::GetFirstMinion: Minion %u not exist.", GUID_LOPART(pet_guid)); const_cast<Unit*>(this)->SetMinionGUID(0); } @@ -9560,7 +9560,7 @@ Unit* Unit::GetCharm() const if (Unit* pet = ObjectAccessor::GetUnit(*this, charm_guid)) return pet; - sLog->outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid)); + sLog->outError("Unit::GetCharm: Charmed creature %u not exist.", GUID_LOPART(charm_guid)); const_cast<Unit*>(this)->SetUInt64Value(UNIT_FIELD_CHARM, 0); } @@ -9977,7 +9977,7 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) if (nearMembers.empty()) return NULL; - uint32 randTarget = urand(0,nearMembers.size()-1); + uint32 randTarget = urand(0, nearMembers.size()-1); return nearMembers[randTarget]; } @@ -10225,7 +10225,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // Rage of Rivendare case 7293: { - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, 0,0x02000000,0)) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, 0, 0x02000000, 0)) { if (SpellChainNode const *chain = sSpellMgr->GetSpellChainNode((*i)->GetId())) AddPctF(DoneTotalMod, chain->rank * 2.0f); @@ -10235,7 +10235,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // Twisted Faith case 7377: { - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, GetGUID())) AddPctN(DoneTotalMod, (*i)->GetAmount()); break; } @@ -10290,13 +10290,13 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 // Glyph of Shadow Word: Pain if (AuraEffect * aurEff = GetAuraEffect(55687, 0)) // Increase Mind Flay damage if Shadow Word: Pain present on target - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, GetGUID())) AddPctN(DoneTotalMod, aurEff->GetAmount()); // Twisted Faith - Mind Flay part if (AuraEffect * aurEff = GetAuraEffect(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS, SPELLFAMILY_PRIEST, 2848, 1)) // Increase Mind Flay damage if Shadow Word: Pain present on target - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, GetGUID())) AddPctN(DoneTotalMod, aurEff->GetAmount()); } // Smite @@ -10741,7 +10741,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM if (spellProto->SpellFamilyFlags[0] & 0x40000000) { // Sacred Shield - AuraEffect const* aura = pVictim->GetAuraEffect(58597,1); + AuraEffect const* aura = pVictim->GetAuraEffect(58597, 1); if (aura && aura->GetCasterGUID() == GetGUID()) crit_chance+=aura->GetAmount(); break; @@ -10758,7 +10758,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM // Lava Burst if (spellProto->SpellFamilyFlags[1] & 0x00001000) { - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 0x10000000, 0,0, GetGUID())) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 0x10000000, 0, 0, GetGUID())) if (pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE) > -100) return true; break; @@ -11404,7 +11404,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att normalized = true; break; } - DoneFlatBenefit += int32(APbonus/14.0f * GetAPMultiplier(attType,normalized)); + DoneFlatBenefit += int32(APbonus/14.0f * GetAPMultiplier(attType, normalized)); } // ..taken @@ -11510,7 +11510,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att // Rage of Rivendare case 7293: { - if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, 0,0x02000000,0)) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DEATHKNIGHT, 0, 0x02000000, 0)) if (SpellChainNode const *chain = sSpellMgr->GetSpellChainNode((*i)->GetId())) AddPctF(DoneTotalMod, chain->rank * 2.0f); break; @@ -11621,7 +11621,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att AuraEffect* eff0 = (*i)->GetBase()->GetEffect(0); if (!eff0 || (*i)->GetEffIndex() != 1) { - sLog->outError("Spell structure of DD (%u) changed.",(*i)->GetId()); + sLog->outError("Spell structure of DD (%u) changed.", (*i)->GetId()); continue; } @@ -11692,7 +11692,7 @@ void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply) void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply) { - ApplySpellImmune(spellProto->Id,IMMUNITY_DISPEL, type, apply); + ApplySpellImmune(spellProto->Id, IMMUNITY_DISPEL, type, apply); if (apply && spellProto->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY) { @@ -11732,7 +11732,7 @@ float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellEntry * s // Apply chance modifer aura if (spellProto) if (Player* modOwner = GetSpellModOwner()) - modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_PROC_PER_MINUTE,PPM); + modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_PROC_PER_MINUTE, PPM); return floor((WeaponSpeed * PPM) / 600.0f); // result is chance in percents (probability = Speed_in_sec * (PPM / 60)) } @@ -11770,7 +11770,7 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry) WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size()+4); data.appendPackGUID(GetGUID()); data << uint32(VehicleId); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); data.Initialize(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA, 0); plr->GetSession()->SendPacket(&data); @@ -11827,7 +11827,7 @@ void Unit::SetInCombatWith(Unit* enemy) Unit* eOwner = enemy->GetCharmerOrOwnerOrSelf(); if (eOwner->IsPvP()) { - SetInCombatState(true,enemy); + SetInCombatState(true, enemy); return; } @@ -11837,11 +11837,11 @@ void Unit::SetInCombatWith(Unit* enemy) Unit const* myOwner = GetCharmerOrOwnerOrSelf(); if (((Player const*)eOwner)->duel->opponent == myOwner) { - SetInCombatState(true,enemy); + SetInCombatState(true, enemy); return; } } - SetInCombatState(false,enemy); + SetInCombatState(false, enemy); } void Unit::CombatStart(Unit* target, bool initialAggro) @@ -12097,7 +12097,7 @@ int32 Unit::ModifyPower(Powers power, int32 dVal) int32 val = dVal + curPower; if (val <= 0) { - SetPower(power,0); + SetPower(power, 0); return -curPower; } @@ -12105,12 +12105,12 @@ int32 Unit::ModifyPower(Powers power, int32 dVal) if (val < maxPower) { - SetPower(power,val); + SetPower(power, val); gain = val - curPower; } else if (curPower != maxPower) { - SetPower(power,maxPower); + SetPower(power, maxPower); gain = maxPower - curPower; } @@ -12325,7 +12325,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) data.Initialize(MSG_MOVE_SET_PITCH_RATE, 8+4+2+4+4+4+4+4+4+4); break; default: - sLog->outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.",mtype); + sLog->outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.", mtype); return; } @@ -12384,7 +12384,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced) data.Initialize(SMSG_FORCE_PITCH_RATE_CHANGE, 16); break; default: - sLog->outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.",mtype); + sLog->outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.", mtype); return; } data.append(GetPackGUID()); @@ -12439,7 +12439,7 @@ void Unit::setDeathState(DeathState s) //without this when removing IncreaseMaxHealth aura player may stuck with 1 hp //do not why since in IncreaseMaxHealth currenthealth is checked SetHealth(0); - SetPower(getPowerType(),0); + SetPower(getPowerType(), 0); } else if (s == JUST_ALIVED) RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); // clear skinnable for creature and player (at battleground) @@ -12878,7 +12878,7 @@ DiminishingLevels Unit::GetDiminishing(DiminishingGroup group) return DIMINISHING_LEVEL_1; // If last spell was casted more than 15 seconds ago - reset the count. - if (i->stack == 0 && getMSTimeDiff(i->hitTime,getMSTime()) > 15000) + if (i->stack == 0 && getMSTimeDiff(i->hitTime, getMSTime()) > 15000) { i->hitCount = DIMINISHING_LEVEL_1; return DIMINISHING_LEVEL_1; @@ -12901,7 +12901,7 @@ void Unit::IncrDiminishing(DiminishingGroup group) i->hitCount += 1; return; } - m_Diminishing.push_back(DiminishingReturn(group,getMSTime(),DIMINISHING_LEVEL_2)); + m_Diminishing.push_back(DiminishingReturn(group, getMSTime(), DIMINISHING_LEVEL_2)); } float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, Unit *caster, DiminishingLevels Level, int32 limitduration) @@ -12985,7 +12985,7 @@ void Unit::ApplyDiminishingAura(DiminishingGroup group, bool apply) } } -uint32 Unit::GetSpellMaxRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry) +uint32 Unit::GetSpellMaxRangeForTarget(Unit* target, const SpellRangeEntry * rangeEntry) { if (!rangeEntry) return 0; @@ -12995,7 +12995,7 @@ uint32 Unit::GetSpellMaxRangeForTarget(Unit* target,const SpellRangeEntry * rang return uint32(rangeEntry->maxRangeHostile); return uint32(rangeEntry->maxRangeFriend); }; -uint32 Unit::GetSpellMinRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry) +uint32 Unit::GetSpellMinRangeForTarget(Unit* target, const SpellRangeEntry * rangeEntry) { if (!rangeEntry) return 0; @@ -13005,7 +13005,7 @@ uint32 Unit::GetSpellMinRangeForTarget(Unit* target,const SpellRangeEntry * rang return uint32(rangeEntry->minRangeHostile); return uint32(rangeEntry->minRangeFriend); }; -uint32 Unit::GetSpellRadiusForTarget(Unit* target,const SpellRadiusEntry * radiusEntry) +uint32 Unit::GetSpellRadiusForTarget(Unit* target, const SpellRadiusEntry * radiusEntry) { if (!radiusEntry) return 0; @@ -13018,12 +13018,12 @@ uint32 Unit::GetSpellRadiusForTarget(Unit* target,const SpellRadiusEntry * radiu Unit* Unit::GetUnit(WorldObject& object, uint64 guid) { - return ObjectAccessor::GetUnit(object,guid); + return ObjectAccessor::GetUnit(object, guid); } Player* Unit::GetPlayer(WorldObject& object, uint64 guid) { - return ObjectAccessor::GetPlayer(object,guid); + return ObjectAccessor::GetPlayer(object, guid); } Creature* Unit::GetCreature(WorldObject& object, uint64 guid) @@ -13238,7 +13238,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType) const } } -float Unit::GetWeaponDamageRange(WeaponAttackType attType ,WeaponDamageRange type) const +float Unit::GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const { if (attType == OFF_ATTACK && !haveOffhandWeapon()) return 0.0f; @@ -13534,7 +13534,7 @@ CharmInfo::CharmInfo(Unit* unit) m_isCommandAttack(false), m_isAtStay(false), m_isFollowing(false), m_isReturning(false) { for (uint8 i = 0; i < MAX_SPELL_CHARM; ++i) - m_charmspells[i].SetActionAndType(0,ACT_DISABLED); + m_charmspells[i].SetActionAndType(0, ACT_DISABLED); if (m_unit->GetTypeId() == TYPEID_UNIT) { @@ -13558,25 +13558,25 @@ void CharmInfo::InitPetActionBar() { // the first 3 SpellOrActions are attack, follow and stay for (uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_START - ACTION_BAR_INDEX_START; ++i) - SetActionBar(ACTION_BAR_INDEX_START + i,COMMAND_ATTACK - i,ACT_COMMAND); + SetActionBar(ACTION_BAR_INDEX_START + i, COMMAND_ATTACK - i, ACT_COMMAND); // middle 4 SpellOrActions are spells/special attacks/abilities for (uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_END-ACTION_BAR_INDEX_PET_SPELL_START; ++i) - SetActionBar(ACTION_BAR_INDEX_PET_SPELL_START + i,0,ACT_PASSIVE); + SetActionBar(ACTION_BAR_INDEX_PET_SPELL_START + i, 0, ACT_PASSIVE); // last 3 SpellOrActions are reactions for (uint32 i = 0; i < ACTION_BAR_INDEX_END - ACTION_BAR_INDEX_PET_SPELL_END; ++i) - SetActionBar(ACTION_BAR_INDEX_PET_SPELL_END + i,COMMAND_ATTACK - i,ACT_REACTION); + SetActionBar(ACTION_BAR_INDEX_PET_SPELL_END + i, COMMAND_ATTACK - i, ACT_REACTION); } void CharmInfo::InitEmptyActionBar(bool withAttack) { if (withAttack) - SetActionBar(ACTION_BAR_INDEX_START,COMMAND_ATTACK,ACT_COMMAND); + SetActionBar(ACTION_BAR_INDEX_START, COMMAND_ATTACK, ACT_COMMAND); else - SetActionBar(ACTION_BAR_INDEX_START,0,ACT_PASSIVE); + SetActionBar(ACTION_BAR_INDEX_START, 0, ACT_PASSIVE); for (uint32 x = ACTION_BAR_INDEX_START+1; x < ACTION_BAR_INDEX_END; ++x) - SetActionBar(x,0,ACT_PASSIVE); + SetActionBar(x, 0, ACT_PASSIVE); } void CharmInfo::InitPossessCreateSpells() @@ -13617,18 +13617,18 @@ void CharmInfo::InitCharmCreateSpells() if (!spellId) { - m_charmspells[x].SetActionAndType(spellId,ACT_DISABLED); + m_charmspells[x].SetActionAndType(spellId, ACT_DISABLED); continue; } if (IsPassiveSpell(spellId)) { m_unit->CastSpell(m_unit, spellId, true); - m_charmspells[x].SetActionAndType(spellId,ACT_PASSIVE); + m_charmspells[x].SetActionAndType(spellId, ACT_PASSIVE); } else { - m_charmspells[x].SetActionAndType(spellId,ACT_DISABLED); + m_charmspells[x].SetActionAndType(spellId, ACT_DISABLED); ActiveStates newstate = ACT_PASSIVE; if (spellInfo) @@ -13679,7 +13679,7 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate) { if (!PetActionBar[i].GetAction() && PetActionBar[i].IsActionBarForSpell()) { - SetActionBar(i,spell_id,newstate == ACT_DECIDE ? IsAutocastableSpell(spell_id) ? ACT_DISABLED : ACT_PASSIVE : newstate); + SetActionBar(i, spell_id, newstate == ACT_DECIDE ? IsAutocastableSpell(spell_id) ? ACT_DISABLED : ACT_PASSIVE : newstate); return true; } } @@ -13696,7 +13696,7 @@ bool CharmInfo::RemoveSpellFromActionBar(uint32 spell_id) { if (PetActionBar[i].IsActionBarForSpell() && sSpellMgr->GetFirstSpellInChain(action) == first_id) { - SetActionBar(i,0,ACT_PASSIVE); + SetActionBar(i, 0, ACT_PASSIVE); return true; } } @@ -13950,7 +13950,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, // if and victim block attack if (procExtra & PROC_EX_BLOCK) { - ModifyAuraState(AURA_STATE_DEFENSE,true); + ModifyAuraState(AURA_STATE_DEFENSE, true); StartReactiveTimer(REACTIVE_DEFENSE); } } @@ -14037,7 +14037,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, bool handled = false; if (HandleAuraProc(pTarget, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled)) { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), Id); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), Id); takeCharges = true; } @@ -14054,7 +14054,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, { case SPELL_AURA_PROC_TRIGGER_SPELL: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); // Don`t drop charge or add cooldown for not started trigger if (HandleProcTriggerSpell(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; @@ -14066,7 +14066,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, SpellNonMeleeDamage damageInfo(this, pTarget, spellInfo->Id, spellInfo->SchoolMask); uint32 damage = SpellDamageBonus(pTarget, spellInfo, triggeredByAura->GetAmount(), SPELL_DIRECT_DAMAGE); CalculateSpellDamageTaken(&damageInfo, damage, spellInfo); - DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb); + DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); SendSpellNonMeleeDamageLog(&damageInfo); DealSpellDamage(&damageInfo, true); takeCharges = true; @@ -14075,31 +14075,31 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, case SPELL_AURA_MANA_SHIELD: case SPELL_AURA_DUMMY: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleDummyAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } case SPELL_AURA_OBS_MOD_POWER: - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleObsModEnergyAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; case SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN: - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleModDamagePctTakenAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; case SPELL_AURA_MOD_MELEE_HASTE: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s haste aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s haste aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleHasteAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; } case SPELL_AURA_OVERRIDE_CLASS_SCRIPTS: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleOverrideClassScriptAuraProc(pTarget, damage, triggeredByAura, procSpell, cooldown)) takeCharges = true; break; @@ -14107,7 +14107,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, case SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)", - (isVictim?"a victim's":"an attacker's"),triggeredByAura->GetId()); + (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); HandleAuraRaidProcFromChargeWithValue(triggeredByAura); takeCharges = true; @@ -14116,7 +14116,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, case SPELL_AURA_RAID_PROC_FROM_CHARGE: { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)", - (isVictim?"a victim's":"an attacker's"),triggeredByAura->GetId()); + (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); HandleAuraRaidProcFromCharge(triggeredByAura); takeCharges = true; @@ -14124,7 +14124,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, } case SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE: { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (HandleProcTriggerSpell(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; @@ -14164,7 +14164,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, takeCharges = true; break; case SPELL_AURA_MOD_SPELL_CRIT_CHANCE: - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s spell crit chance aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting spell id %u (triggered by %s spell crit chance aura of spell %u)", spellInfo->Id, (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId()); if (procSpell && HandleSpellCritChanceAuraProc(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown)) takeCharges = true; break; @@ -14304,7 +14304,7 @@ void Unit::StopMoving() //float z = sMapMgr->GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true); //if (fabs(GetPositionZ() - z) < 2.0f) // Relocate(GetPositionX(), GetPositionY(), z); - //Relocate(GetPositionX(), GetPositionY(),GetPositionZ()); + //Relocate(GetPositionX(), GetPositionY(), GetPositionZ()); if (!(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT)) SendMonsterStop(); @@ -14504,18 +14504,18 @@ Unit* Unit::SelectNearbyTarget(float dist) const return *tcIter; } -void Unit::ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply) +void Unit::ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply) { float remainingTimePct = (float)m_attackTimer[att] / (GetAttackTime(att) * m_modAttackSpeedPct[att]); if (val > 0) { ApplyPercentModFloatVar(m_modAttackSpeedPct[att], val, !apply); - ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val,!apply); + ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att, val, !apply); } else { ApplyPercentModFloatVar(m_modAttackSpeedPct[att], -val, apply); - ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att,-val,apply); + ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att, -val, apply); } m_attackTimer[att] = uint32(GetAttackTime(att) * m_modAttackSpeedPct[att] * remainingTimePct); } @@ -14523,9 +14523,9 @@ void Unit::ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply) void Unit::ApplyCastTimePercentMod(float val, bool apply) { if (val > 0) - ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED,val,!apply); + ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, val, !apply); else - ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED,-val,apply); + ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, -val, apply); } uint32 Unit::GetCastingTimeForBonus(SpellEntry const *spellProto, DamageEffectType damagetype, uint32 CastingTime) @@ -14673,7 +14673,7 @@ float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized) bool Unit::IsUnderLastManaUseEffect() const { - return getMSTimeDiff(m_lastManaUse,getMSTime()) < 5000; + return getMSTimeDiff(m_lastManaUse, getMSTime()) < 5000; } void Unit::SetContestedPvP(Player *attackedPlayer) @@ -14719,7 +14719,7 @@ void Unit::RemovePetAura(PetAura const* petSpell) pet->RemoveAurasDueToSpell(petSpell->GetAura(pet->GetEntry())); } -Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id) +Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id) { if (GetTypeId() != TYPEID_PLAYER) return NULL; @@ -14770,7 +14770,7 @@ bool Unit::InitTamedPet(Pet * pet, uint8 level, uint32 spell_id) if (!pet->InitStatsForLevel(level)) { - sLog->outError("Pet::InitStatsForLevel() failed for creature (Entry: %u)!",pet->GetEntry()); + sLog->outError("Pet::InitStatsForLevel() failed for creature (Entry: %u)!", pet->GetEntry()); return false; } @@ -14878,7 +14878,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co // Apply chance modifer aura if (Player* modOwner = GetSpellModOwner()) { - modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_CHANCE_OF_SUCCESS,chance); + modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CHANCE_OF_SUCCESS, chance); } return roll_chance_f(chance); } @@ -14971,7 +14971,7 @@ bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura) if (spellProto->EffectRadiusIndex[effIdx]) radius = (float)GetSpellRadiusForTarget(triggeredByAura->GetCaster(), sSpellRadiusStore.LookupEntry(spellProto->EffectRadiusIndex[effIdx])); else - radius = (float)GetSpellMaxRangeForTarget(triggeredByAura->GetCaster() ,sSpellRangeStore.LookupEntry(spellProto->rangeIndex)); + radius = (float)GetSpellMaxRangeForTarget(triggeredByAura->GetCaster() , sSpellRangeStore.LookupEntry(spellProto->rangeIndex)); if (Unit * caster = triggeredByAura->GetCaster()) { @@ -14980,14 +14980,14 @@ bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura) if (Unit* target= GetNextRandomRaidMemberOrPet(radius)) { - CastSpell(target, spellProto, true,NULL,triggeredByAura,caster_guid); + CastSpell(target, spellProto, true, NULL, triggeredByAura, caster_guid); if (Aura * aura = target->GetAura(spellProto->Id, caster->GetGUID())) aura->SetCharges(jumps); } } } - CastSpell(this, damageSpellId, true,NULL,triggeredByAura,caster_guid); + CastSpell(this, damageSpellId, true, NULL, triggeredByAura, caster_guid); return true; } @@ -15079,7 +15079,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) if (uint32 lootid = creature->GetCreatureInfo()->lootid) loot->FillLoot(lootid, LootTemplates_Creature, pLooter, false, false, creature->GetLootMode()); - loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold); + loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold, creature->GetCreatureInfo()->maxgold); } player->RewardPlayerAndGroupAtKill(pVictim, false); @@ -15113,10 +15113,10 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) //Remove all expected to remove at death auras (most important negative case like DoT or periodic triggers) pVictim->RemoveAllAurasOnDeath(); // restore for use at real death - pVictim->SetUInt32Value(PLAYER_SELF_RES_SPELL,ressSpellId); + pVictim->SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId); // FORM_SPIRITOFREDEMPTION and related auras - pVictim->CastSpell(pVictim,27827,true,NULL,aurEff); + pVictim->CastSpell(pVictim, 27827, true, NULL, aurEff); SpiritOfRedemption = true; break; } @@ -15141,7 +15141,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss) if ((durabilityLoss && !player && !pVictim->ToPlayer()->InBattleground()) || (player && sWorld->getBoolConfig(CONFIG_DURABILITY_LOSS_IN_PVP))) { sLog->outStaticDebug("We are dead, losing %f percent durability", sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH)); - pVictim->ToPlayer()->DurabilityLossAll(sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH),false); + pVictim->ToPlayer()->DurabilityLossAll(sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH), false); // durability lost message WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 0); pVictim->ToPlayer()->GetSession()->SendPacket(&data); @@ -15360,7 +15360,7 @@ void Unit::SetStunned(bool apply) WorldPacket data(SMSG_FORCE_MOVE_ROOT, 8); data.append(GetPackGUID()); data << uint32(0); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } else { @@ -15377,7 +15377,7 @@ void Unit::SetStunned(bool apply) WorldPacket data(SMSG_FORCE_MOVE_UNROOT, 8+4); data.append(GetPackGUID()); data << uint32(0); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); // RemoveUnitMovementFlag(MOVEMENTFLAG_ROOT); } @@ -15398,13 +15398,13 @@ void Unit::SetRooted(bool apply) WorldPacket data(SMSG_FORCE_MOVE_ROOT, 10); data.append(GetPackGUID()); data << m_rootTimes; - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } else { WorldPacket data(SMSG_SPLINE_MOVE_ROOT, 8); data.append(GetPackGUID()); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); ToCreature()->StopMoving(); } } @@ -15417,13 +15417,13 @@ void Unit::SetRooted(bool apply) WorldPacket data(SMSG_FORCE_MOVE_UNROOT, 10); data.append(GetPackGUID()); data << ++m_rootTimes; - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } else { WorldPacket data(SMSG_SPLINE_MOVE_UNROOT, 8); data.append(GetPackGUID()); - SendMessageToSet(&data,true); + SendMessageToSet(&data, true); } // RemoveUnitMovementFlag(MOVEMENTFLAG_ROOT); @@ -16114,19 +16114,19 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if (IsInWorld()) RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target - WorldObject::SetPhaseMask(newPhaseMask,update); + WorldObject::SetPhaseMask(newPhaseMask, update); if (!IsInWorld()) return; for (ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) if ((*itr)->GetTypeId() == TYPEID_UNIT) - (*itr)->SetPhaseMask(newPhaseMask,true); + (*itr)->SetPhaseMask(newPhaseMask, true); for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) if (m_SummonSlot[i]) if (Creature *summon = GetMap()->GetCreature(m_SummonSlot[i])) - summon->SetPhaseMask(newPhaseMask,true); + summon->SetPhaseMask(newPhaseMask, true); } void Unit::UpdateObjectVisibility(bool forced) @@ -16510,7 +16510,7 @@ bool Unit::CheckPlayerCondition(Player* pPlayer) { case 35644: //Argent Warhorse case 36558: //Argent Battleworg - if (!pPlayer->HasItemOrGemWithIdEquipped(46106,1)) //Check item Argent Lance + if (!pPlayer->HasItemOrGemWithIdEquipped(46106, 1)) //Check item Argent Lance return false; default: return true; @@ -16820,9 +16820,9 @@ void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool cas bool Unit::SetPosition(float x, float y, float z, float orientation, bool teleport) { // prevent crash when a bad coord is sent by the client - if (!Trinity::IsValidMapCoord(x,y,z,orientation)) + if (!Trinity::IsValidMapCoord(x, y, z, orientation)) { - sLog->outDebug(LOG_FILTER_UNITS, "Unit::SetPosition(%f, %f, %f) .. bad coordinates!",x,y,z); + sLog->outDebug(LOG_FILTER_UNITS, "Unit::SetPosition(%f, %f, %f) .. bad coordinates!", x, y, z); return false; } @@ -16846,7 +16846,7 @@ bool Unit::SetPosition(float x, float y, float z, float orientation, bool telepo SetOrientation(orientation); if ((relocated || turn) && IsVehicle()) - GetVehicleKit()->RelocatePassengers(x,y,z,orientation); + GetVehicleKit()->RelocatePassengers(x, y, z, orientation); return (relocated || turn); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index faa3527d501..1d1b34e1520 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -152,7 +152,7 @@ enum SpellFacingFlags #define BASE_MAXDAMAGE 2.0f #define BASE_ATTACK_TIME 2000 -// byte value (UNIT_FIELD_BYTES_1,0) +// byte value (UNIT_FIELD_BYTES_1, 0) enum UnitStandStateType { UNIT_STAND_STATE_STAND = 0, @@ -167,7 +167,7 @@ enum UnitStandStateType UNIT_STAND_STATE_SUBMERGED = 9 }; -// byte flag value (UNIT_FIELD_BYTES_1,2) +// byte flag value (UNIT_FIELD_BYTES_1, 2) enum UnitStandFlags { UNIT_STAND_FLAGS_UNK1 = 0x01, @@ -178,7 +178,7 @@ enum UnitStandFlags UNIT_STAND_FLAGS_ALL = 0xFF }; -// byte flags value (UNIT_FIELD_BYTES_1,3) +// byte flags value (UNIT_FIELD_BYTES_1, 3) enum UnitBytes1_Flags { UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01, @@ -982,7 +982,7 @@ enum CommandStates #define UNIT_ACTION_BUTTON_ACTION(X) (uint32(X) & 0x00FFFFFF) #define UNIT_ACTION_BUTTON_TYPE(X) ((uint32(X) & 0xFF000000) >> 24) -#define MAKE_UNIT_ACTION_BUTTON(A,T) (uint32(A) | (uint32(T) << 24)) +#define MAKE_UNIT_ACTION_BUTTON(A, T) (uint32(A) | (uint32(T) << 24)) struct UnitActionBarEntry { @@ -1001,12 +1001,12 @@ struct UnitActionBarEntry void SetActionAndType(uint32 action, ActiveStates type) { - packedData = MAKE_UNIT_ACTION_BUTTON(action,type); + packedData = MAKE_UNIT_ACTION_BUTTON(action, type); } void SetType(ActiveStates type) { - packedData = MAKE_UNIT_ACTION_BUTTON(UNIT_ACTION_BUTTON_ACTION(packedData),type); + packedData = MAKE_UNIT_ACTION_BUTTON(UNIT_ACTION_BUTTON_ACTION(packedData), type); } void SetAction(uint32 action) @@ -1061,9 +1061,9 @@ struct CharmInfo void LoadPetActionBar(const std::string& data); void BuildActionBar(WorldPacket* data); void SetSpellAutocast(uint32 spell_id, bool state); - void SetActionBar(uint8 index, uint32 spellOrAction,ActiveStates type) + void SetActionBar(uint8 index, uint32 spellOrAction, ActiveStates type) { - PetActionBar[index].SetActionAndType(spellOrAction,type); + PetActionBar[index].SetActionAndType(spellOrAction, type); } UnitActionBarEntry const* GetActionBarEntry(uint8 index) const { return &(PetActionBar[index]); } @@ -1168,14 +1168,14 @@ class Unit : public WorldObject DiminishingLevels GetDiminishing(DiminishingGroup group); void IncrDiminishing(DiminishingGroup group); - float ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Unit* caster, DiminishingLevels Level, int32 limitduration); + float ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration, Unit* caster, DiminishingLevels Level, int32 limitduration); void ApplyDiminishingAura(DiminishingGroup group, bool apply); void ClearDiminishings() { m_Diminishing.clear(); } //target dependent range checks - uint32 GetSpellMaxRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry); - uint32 GetSpellMinRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry); - uint32 GetSpellRadiusForTarget(Unit* target,const SpellRadiusEntry * radiusEntry); + uint32 GetSpellMaxRangeForTarget(Unit* target, const SpellRangeEntry * rangeEntry); + uint32 GetSpellMinRangeForTarget(Unit* target, const SpellRangeEntry * rangeEntry); + uint32 GetSpellRadiusForTarget(Unit* target, const SpellRadiusEntry * radiusEntry); virtual void Update(uint32 time); @@ -1260,7 +1260,7 @@ class Unit : public WorldObject void SetArmor(int32 val) { SetResistance(SPELL_SCHOOL_NORMAL, val); } uint32 GetResistance(SpellSchools school) const { return GetUInt32Value(UNIT_FIELD_RESISTANCES+school); } - void SetResistance(SpellSchools school, int32 val) { SetStatInt32Value(UNIT_FIELD_RESISTANCES+school,val); } + void SetResistance(SpellSchools school, int32 val) { SetStatInt32Value(UNIT_FIELD_RESISTANCES+school, val); } uint32 GetHealth() const { return GetUInt32Value(UNIT_FIELD_HEALTH); } uint32 GetMaxHealth() const { return GetUInt32Value(UNIT_FIELD_MAXHEALTH); } @@ -1294,8 +1294,8 @@ class Unit : public WorldObject return (uint32)f_BaseAttackTime; } - void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val*m_modAttackSpeedPct[att]); } - void ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply); + void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att, val*m_modAttackSpeedPct[att]); } + void ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply); void ApplyCastTimePercentMod(float val, bool apply); SheathState GetSheath() const { return SheathState(GetByteValue(UNIT_FIELD_BYTES_2, 0)); } @@ -1341,8 +1341,8 @@ class Unit : public WorldObject bool IsStandState() const; void SetStandState(uint8 state); - void SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, 2,flags); } - void RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, 2,flags); } + void SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, 2, flags); } + void RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, 2, flags); } bool IsMounted() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT); } uint32 GetMountID() const { return GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID); } @@ -1398,9 +1398,9 @@ class Unit : public WorldObject { switch(attacktype) { - case BASE_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISARMED); - case OFF_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2,UNIT_FLAG2_DISARM_OFFHAND); - case RANGED_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2,UNIT_FLAG2_DISARM_RANGED); + case BASE_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED); + case OFF_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_OFFHAND); + case RANGED_ATTACK: return !HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISARM_RANGED); } return true; } @@ -1468,7 +1468,7 @@ class Unit : public WorldObject void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical = false); int32 HealBySpell(Unit * pVictim, SpellEntry const * spellInfo, uint32 addHealth, bool critical = false); - void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype); + void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype); void EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype); uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage); void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect const * triggeredByAura = NULL, uint64 originalCaster = 0); @@ -1489,7 +1489,7 @@ class Unit : public WorldObject void SendAttackStateUpdate(CalcDamageInfo *damageInfo); void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount); void SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log); - void SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false); + void SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false); void SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo); void SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo); void SendSpellDamageImmune(Unit *target, uint32 spellId); @@ -1515,7 +1515,7 @@ class Unit : public WorldObject void SendMovementFlagUpdate(); template<typename PathElem, typename PathNode> - void SendMonsterMoveByPath(Path<PathElem,PathNode> const& path, uint32 start, uint32 end); + void SendMonsterMoveByPath(Path<PathElem, PathNode> const& path, uint32 start, uint32 end); void SendChangeCurrentVictimOpcode(HostileReference* pHostileReference); void SendClearThreatListOpcode(); @@ -1610,8 +1610,8 @@ class Unit : public WorldObject void RemoveBindSightAuras(); void RemoveCharmAuras(); - Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0); - Pet* CreateTamedPetFrom(uint32 creatureEntry,uint32 spell_id = 0); + Pet* CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id = 0); + Pet* CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id = 0); bool InitTamedPet(Pet * pet, uint8 level, uint32 spell_id); // aura apply/remove helpers - you should better not use these @@ -1647,10 +1647,10 @@ class Unit : public WorldObject void RemoveAurasDueToSpell(uint32 spellId, uint64 caster = 0, uint8 reqEffMask = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); void RemoveAuraFromStack(uint32 spellId, uint64 caster = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); - inline void RemoveAuraFromStack(AuraMap::iterator &iter,AuraRemoveMode removeMode); + inline void RemoveAuraFromStack(AuraMap::iterator &iter, AuraRemoveMode removeMode); void RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeller); void RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer); - void RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId); + void RemoveAurasDueToItemSpell(Item* castItem, uint32 spellId); void RemoveAurasByType(AuraType auraType, uint64 casterGUID = 0, Aura * except = NULL, bool negative = true, bool positive = true); void RemoveNotOwnSingleTargetAuras(uint32 newPhase = 0x0); void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = 0); @@ -1722,7 +1722,7 @@ class Unit : public WorldObject int32 GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellEntry const * affectedSpell) const; float GetResistanceBuffMods(SpellSchools school, bool positive) const { return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school); } - void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school,val); } + void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val); } void ApplyResistanceBuffModsMod(SpellSchools school, bool positive, float val, bool apply) { ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); } void ApplyResistanceBuffModsPercentMod(SpellSchools school, bool positive, float val, bool apply) { ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); } void InitStatBuffMods() @@ -1824,10 +1824,10 @@ class Unit : public WorldObject virtual void UpdateAttackPowerAndDamage(bool ranged = false) = 0; virtual void UpdateDamagePhysical(WeaponAttackType attType) = 0; float GetTotalAttackPowerValue(WeaponAttackType attType) const; - float GetWeaponDamageRange(WeaponAttackType attType ,WeaponDamageRange type) const; - void SetBaseWeaponDamage(WeaponAttackType attType ,WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } + float GetWeaponDamageRange(WeaponAttackType attType , WeaponDamageRange type) const; + void SetBaseWeaponDamage(WeaponAttackType attType , WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; } - bool isInFrontInMap(Unit const* target,float distance, float arc = M_PI) const; + bool isInFrontInMap(Unit const* target, float distance, float arc = M_PI) const; void SetInFront(Unit const* target) { if (!HasUnitState(UNIT_STAT_CANNOT_TURN)) @@ -2235,7 +2235,7 @@ namespace Trinity } template<typename Elem, typename Node> -inline void Unit::SendMonsterMoveByPath(Path<Elem,Node> const& path, uint32 start, uint32 end) +inline void Unit::SendMonsterMoveByPath(Path<Elem, Node> const& path, uint32 start, uint32 end) { uint32 traveltime = uint32(path.GetTotalLength(start, end) * 32); uint32 pathSize = end - start; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index d4d6bccfe67..004dd9d5e2d 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -203,7 +203,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT eventEntry,UNIX_TIMESTAMP(start_time),UNIX_TIMESTAMP(end_time),occurence,length,holiday,description,world_event FROM game_event"); + QueryResult result = WorldDatabase.Query("SELECT eventEntry, UNIX_TIMESTAMP(start_time), UNIX_TIMESTAMP(end_time), occurence, length, holiday, description, world_event FROM game_event"); if (!result) { mGameEvent.clear(); @@ -238,7 +238,7 @@ void GameEventMgr::LoadFromDB() if (pGameEvent.length == 0 && pGameEvent.state == GAMEEVENT_NORMAL) // length>0 is validity check { - sLog->outErrorDb("`game_event` game event id (%i) isn't a world event and has length = 0, thus it can't be used.",event_id); + sLog->outErrorDb("`game_event` game event id (%i) isn't a world event and has length = 0, thus it can't be used.", event_id); continue; } @@ -246,7 +246,7 @@ void GameEventMgr::LoadFromDB() { if (!sHolidaysStore.LookupEntry(pGameEvent.holiday_id)) { - sLog->outErrorDb("`game_event` game event id (%i) have not existed holiday id %u.",event_id,pGameEvent.holiday_id); + sLog->outErrorDb("`game_event` game event id (%i) have not existed holiday id %u.", event_id, pGameEvent.holiday_id); pGameEvent.holiday_id = HOLIDAY_NONE; } } @@ -385,7 +385,7 @@ void GameEventMgr::LoadFromDB() if (internal_event_id < 0 || internal_event_id >= int32(mGameEventCreatureGuids.size())) { - sLog->outErrorDb("`game_event_creature` game event id (%i) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_creature` game event id (%i) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -428,7 +428,7 @@ void GameEventMgr::LoadFromDB() if (internal_event_id < 0 || internal_event_id >= int32(mGameEventGameobjectGuids.size())) { - sLog->outErrorDb("`game_event_gameobject` game event id (%i) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_gameobject` game event id (%i) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -469,7 +469,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEventModelEquip.size()) { - sLog->outErrorDb("`game_event_model_equip` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_model_equip` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -526,7 +526,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEventCreatureQuests.size()) { - sLog->outErrorDb("`game_event_creature_quest` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_creature_quest` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -567,7 +567,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEventGameObjectQuests.size()) { - sLog->outErrorDb("`game_event_gameobject_quest` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_gameobject_quest` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -609,7 +609,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEvent.size()) { - sLog->outErrorDb("`game_event_quest_condition` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_quest_condition` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -650,7 +650,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEvent.size()) { - sLog->outErrorDb("`game_event_condition` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_condition` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -692,7 +692,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEvent.size()) { - sLog->outErrorDb("`game_event_condition_save` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_condition_save` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -703,7 +703,7 @@ void GameEventMgr::LoadFromDB() } else { - sLog->outErrorDb("game_event_condition_save contains not present condition evt id %u cond id %u",event_id, condition); + sLog->outErrorDb("game_event_condition_save contains not present condition evt id %u cond id %u", event_id, condition); continue; } @@ -741,11 +741,11 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEvent.size()) { - sLog->outErrorDb("`game_event_npcflag` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_npcflag` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } - mGameEventNPCFlags[event_id].push_back(GuidNPCFlagPair(guid,npcflag)); + mGameEventNPCFlags[event_id].push_back(GuidNPCFlagPair(guid, npcflag)); ++count; } @@ -779,7 +779,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEventVendors.size()) { - sLog->outErrorDb("`game_event_npc_vendor` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_npc_vendor` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -845,7 +845,7 @@ void GameEventMgr::LoadFromDB() if (event_id >= mGameEvent.size()) { - sLog->outErrorDb("`game_event_battleground_holiday` game event id (%u) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_battleground_holiday` game event id (%u) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -887,7 +887,7 @@ void GameEventMgr::LoadFromDB() if (internal_event_id < 0 || internal_event_id >= int32(mGameEventPoolIds.size())) { - sLog->outErrorDb("`game_event_pool` game event id (%i) is out of range compared to max event id in `game_event`",event_id); + sLog->outErrorDb("`game_event_pool` game event id (%i) is out of range compared to max event id in `game_event`", event_id); continue; } @@ -962,11 +962,11 @@ uint32 GameEventMgr::StartSystem() // return the next void GameEventMgr::StartArenaSeason() { - QueryResult result = WorldDatabase.PQuery("SELECT eventEntry FROM game_event_arena_seasons WHERE season = '%i'",sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); + QueryResult result = WorldDatabase.PQuery("SELECT eventEntry FROM game_event_arena_seasons WHERE season = '%i'", sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); if (!result) { - sLog->outError("ArenaSeason (%i) must be an existant Arena Season",sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); + sLog->outError("ArenaSeason (%i) must be an existant Arena Season", sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); return; } @@ -974,8 +974,8 @@ void GameEventMgr::StartArenaSeason() uint16 eventId = fields[0].GetUInt16(); - StartEvent(eventId,true); - sLog->outString("Arena Season %i started...",sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); + StartEvent(eventId, true); + sLog->outString("Arena Season %i started...", sWorld->getIntConfig(CONFIG_ARENA_SEASON_ID)); sLog->outString(); } @@ -989,7 +989,7 @@ uint32 GameEventMgr::Update() // return the next e { // must do the activating first, and after that the deactivating // so first queue it - //sLog->outErrorDb("Checking event %u",itr); + //sLog->outErrorDb("Checking event %u", itr); if (CheckOneGameEvent(itr)) { // if the world event is in NEXTPHASE state, and the time has passed to finish this event, then do so @@ -1010,14 +1010,14 @@ uint32 GameEventMgr::Update() // return the next e // changed, save to DB the gameevent state, will be updated in next update cycle SaveWorldEventStateToDB(itr); - //sLog->outDebug("GameEvent %u is active",itr->first); + //sLog->outDebug("GameEvent %u is active", itr->first); // queue for activation if (!IsActiveEvent(itr)) activate.insert(itr); } else { - //sLog->outDebug("GameEvent %u is not active",itr->first); + //sLog->outDebug("GameEvent %u is not active", itr->first); if (IsActiveEvent(itr)) deactivate.insert(itr); else @@ -1109,14 +1109,14 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) // get the creature data from the low guid to get the entry, to be able to find out the whole guid if (CreatureData const* data = sObjectMgr->GetCreatureData(itr->first)) { - Creature * cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first,data->id,HIGHGUID_UNIT)); + Creature * cr = HashMapHolder<Creature>::Find(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT)); // if we found the creature, modify its npcflag if (cr) { uint32 npcflag = GetNPCFlag(cr); if (const CreatureTemplate * ci = cr->GetCreatureInfo()) npcflag |= ci->npcflag; - cr->SetUInt32Value(UNIT_NPC_FLAGS,npcflag); + cr->SetUInt32Value(UNIT_NPC_FLAGS, npcflag); // reset gossip options, since the flag change might have added / removed some //cr->ResetGossipOptions(); } @@ -1168,7 +1168,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) { Creature* pCreature = new Creature; - //sLog->outDebug("Spawning creature %u",*itr); + //sLog->outDebug("Spawning creature %u", *itr); if (!pCreature->LoadFromDB(*itr, map)) delete pCreature; else @@ -1234,7 +1234,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin(); itr != mGameEventCreatureGuids[internal_event_id].end(); ++itr) { // check if it's needed by another event, if so, don't remove - if (event_id > 0 && hasCreatureActiveEventExcept(*itr,event_id)) + if (event_id > 0 && hasCreatureActiveEventExcept(*itr, event_id)) continue; // Remove the creature from grid if (CreatureData const* data = sObjectMgr->GetCreatureData(*itr)) @@ -1256,7 +1256,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin(); itr != mGameEventGameobjectGuids[internal_event_id].end(); ++itr) { // check if it's needed by another event, if so, don't remove - if (event_id >0 && hasGameObjectActiveEventExcept(*itr,event_id)) + if (event_id >0 && hasGameObjectActiveEventExcept(*itr, event_id)) continue; // Remove the gameobject from grid if (GameObjectData const* data = sObjectMgr->GetGOData(*itr)) @@ -1269,7 +1269,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) } if (internal_event_id < 0 || internal_event_id >= int32(mGameEventPoolIds.size())) { - sLog->outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size()); + sLog->outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")", internal_event_id, mGameEventPoolIds.size()); return; } @@ -1289,7 +1289,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) continue; // Update if spawned - Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL); + Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id, HIGHGUID_UNIT), (Creature*)NULL); if (pCreature) { if (activate) @@ -1304,8 +1304,8 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) { pCreature->SetDisplayId(itr->second.modelid); pCreature->SetNativeDisplayId(itr->second.modelid); - pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS,minfo->bounding_radius); - pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH,minfo->combat_reach); + pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); + pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); } } } @@ -1319,8 +1319,8 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) { pCreature->SetDisplayId(itr->second.modelid_prev); pCreature->SetNativeDisplayId(itr->second.modelid_prev); - pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS,minfo->bounding_radius); - pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH,minfo->combat_reach); + pCreature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, minfo->bounding_radius); + pCreature->SetFloatValue(UNIT_FIELD_COMBATREACH, minfo->combat_reach); } } } @@ -1331,7 +1331,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) if (data2 && activate) { CreatureTemplate const *cinfo = sObjectMgr->GetCreatureTemplate(data2->id); - uint32 displayID = sObjectMgr->ChooseDisplayId(0,cinfo,data2); + uint32 displayID = sObjectMgr->ChooseDisplayId(0, cinfo, data2); CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID); if (data2->equipmentId == 0) @@ -1423,13 +1423,13 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate) for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr) { QuestRelations* CreatureQuestMap = sObjectMgr->GetCreatureQuestRelationMap(); - if (activate) // Add the pair(id,quest) to the multimap + if (activate) // Add the pair(id, quest) to the multimap CreatureQuestMap->insert(QuestRelations::value_type(itr->first, itr->second)); else { - if (!hasCreatureQuestActiveEventExcept(itr->second,event_id)) + if (!hasCreatureQuestActiveEventExcept(itr->second, event_id)) { - // Remove the pair(id,quest) from the multimap + // Remove the pair(id, quest) from the multimap QuestRelations::iterator qitr = CreatureQuestMap->find(itr->first); if (qitr == CreatureQuestMap->end()) continue; @@ -1448,13 +1448,13 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate) for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr) { QuestRelations* GameObjectQuestMap = sObjectMgr->GetGOQuestRelationMap(); - if (activate) // Add the pair(id,quest) to the multimap + if (activate) // Add the pair(id, quest) to the multimap GameObjectQuestMap->insert(QuestRelations::value_type(itr->first, itr->second)); else { - if (!hasGameObjectQuestActiveEventExcept(itr->second,event_id)) + if (!hasGameObjectQuestActiveEventExcept(itr->second, event_id)) { - // Remove the pair(id,quest) from the multimap + // Remove the pair(id, quest) from the multimap QuestRelations::iterator qitr = GameObjectQuestMap->find(itr->first); if (qitr == GameObjectQuestMap->end()) continue; @@ -1512,7 +1512,7 @@ void GameEventMgr::HandleQuestComplete(uint32 quest_id) // not in correct phase, return if (mGameEvent[event_id].state != GAMEEVENT_WORLD_CONDITIONS) return; - std::map<uint32,GameEventFinishCondition>::iterator citr = mGameEvent[event_id].conditions.find(condition); + std::map<uint32, GameEventFinishCondition>::iterator citr = mGameEvent[event_id].conditions.find(condition); // condition is registered if (citr != mGameEvent[event_id].conditions.end()) { @@ -1552,7 +1552,7 @@ void GameEventMgr::HandleQuestComplete(uint32 quest_id) bool GameEventMgr::CheckOneGameEventConditions(uint16 event_id) { - for (std::map<uint32,GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) + for (std::map<uint32, GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr) if (itr->second.done < itr->second.reqNum) // return false if a condition doesn't match return false; @@ -1585,7 +1585,7 @@ void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id) void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id) { - std::map<uint32,GameEventFinishCondition>::iterator itr; + std::map<uint32, GameEventFinishCondition>::iterator itr; for (itr = mGameEvent[event_id].conditions.begin(); itr !=mGameEvent[event_id].conditions.end(); ++itr) { if (itr->second.done_world_state) diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 2405d6c2b40..7810ad458d6 100755 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -59,7 +59,7 @@ WorldObject* ObjectAccessor::GetWorldObject(WorldObject const& p, uint64 guid) case HIGHGUID_UNIT: return GetCreature(p, guid); case HIGHGUID_PET: return GetPet(p, guid); case HIGHGUID_DYNAMICOBJECT: return GetDynamicObject(p, guid); - case HIGHGUID_CORPSE: return GetCorpse(p,guid); + case HIGHGUID_CORPSE: return GetCorpse(p, guid); default: return NULL; } } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 6c0f08939a6..f1225706d50 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -146,14 +146,14 @@ bool normalizePlayerName(std::string& name) wchar_t wstr_buf[MAX_INTERNAL_PLAYER_NAME+1]; size_t wstr_len = MAX_INTERNAL_PLAYER_NAME; - if (!Utf8toWStr(name,&wstr_buf[0],wstr_len)) + if (!Utf8toWStr(name, &wstr_buf[0], wstr_len)) return false; wstr_buf[0] = wcharToUpper(wstr_buf[0]); for (size_t i = 1; i < wstr_len; ++i) wstr_buf[i] = wcharToLower(wstr_buf[i]); - if (!WStrToUtf8(wstr_buf,wstr_len,name)) + if (!WStrToUtf8(wstr_buf, wstr_len, name)) return false; return true; @@ -434,7 +434,7 @@ void ObjectMgr::LoadCreatureLocales() mCreatureLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,name_loc1,subname_loc1,name_loc2,subname_loc2,name_loc3,subname_loc3,name_loc4,subname_loc4,name_loc5,subname_loc5,name_loc6,subname_loc6,name_loc7,subname_loc7,name_loc8,subname_loc8 FROM locales_creature"); + QueryResult result = WorldDatabase.Query("SELECT entry, name_loc1, subname_loc1, name_loc2, subname_loc2, name_loc3, subname_loc3, name_loc4, subname_loc4, name_loc5, subname_loc5, name_loc6, subname_loc6, name_loc7, subname_loc7, name_loc8, subname_loc8 FROM locales_creature"); if (!result) return; @@ -468,11 +468,11 @@ void ObjectMgr::LoadGossipMenuItemsLocales() mGossipMenuItemsLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT menu_id,id," - "option_text_loc1,box_text_loc1,option_text_loc2,box_text_loc2," - "option_text_loc3,box_text_loc3,option_text_loc4,box_text_loc4," - "option_text_loc5,box_text_loc5,option_text_loc6,box_text_loc6," - "option_text_loc7,box_text_loc7,option_text_loc8,box_text_loc8 " + QueryResult result = WorldDatabase.Query("SELECT menu_id, id, " + "option_text_loc1, box_text_loc1, option_text_loc2, box_text_loc2, " + "option_text_loc3, box_text_loc3, option_text_loc4, box_text_loc4, " + "option_text_loc5, box_text_loc5, option_text_loc6, box_text_loc6, " + "option_text_loc7, box_text_loc7, option_text_loc8, box_text_loc8 " "FROM locales_gossip_menu_option"); if (!result) @@ -485,7 +485,7 @@ void ObjectMgr::LoadGossipMenuItemsLocales() uint16 menuId = fields[0].GetUInt16(); uint16 id = fields[1].GetUInt16(); - GossipMenuItemsLocale& data = mGossipMenuItemsLocaleMap[MAKE_PAIR32(menuId,id)]; + GossipMenuItemsLocale& data = mGossipMenuItemsLocaleMap[MAKE_PAIR32(menuId, id)]; for (uint8 i = 1; i < TOTAL_LOCALES; ++i) { @@ -508,7 +508,7 @@ void ObjectMgr::LoadPointOfInterestLocales() mPointOfInterestLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,icon_name_loc1,icon_name_loc2,icon_name_loc3,icon_name_loc4,icon_name_loc5,icon_name_loc6,icon_name_loc7,icon_name_loc8 FROM locales_points_of_interest"); + QueryResult result = WorldDatabase.Query("SELECT entry, icon_name_loc1, icon_name_loc2, icon_name_loc3, icon_name_loc4, icon_name_loc5, icon_name_loc6, icon_name_loc7, icon_name_loc8 FROM locales_points_of_interest"); if (!result) return; @@ -1252,7 +1252,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 &display return NULL; // If a model for another gender exists, 50% chance to use it - if (minfo->modelid_other_gender != 0 && urand(0,1) == 0) + if (minfo->modelid_other_gender != 0 && urand(0, 1) == 0) { CreatureModelInfo const *minfo_tmp = GetCreatureModelInfo(minfo->modelid_other_gender); if (!minfo_tmp) @@ -1585,11 +1585,11 @@ void ObjectMgr::LoadCreatures() difficultyCreatures[diff].insert(itr->second.DifficultyEntry[diff]); // Build single time for check spawnmask - std::map<uint32,uint32> spawnMasks; + std::map<uint32, uint32> spawnMasks; for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) if (sMapStore.LookupEntry(i)) for (int k = 0; k < MAX_DIFFICULTY; ++k) - if (GetMapDifficultyData(i,Difficulty(k))) + if (GetMapDifficultyData(i, Difficulty(k))) spawnMasks[i] |= (1 << k); uint32 count = 0; @@ -1635,12 +1635,12 @@ void ObjectMgr::LoadCreatures() MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid); if (!mapEntry) { - sLog->outErrorDb("Table `creature` have creature (GUID: %u) that spawned at not existed map (Id: %u), skipped.",guid, data.mapid); + sLog->outErrorDb("Table `creature` have creature (GUID: %u) that spawned at not existed map (Id: %u), skipped.", guid, data.mapid); continue; } if (data.spawnMask & ~spawnMasks[data.mapid]) - sLog->outErrorDb("Table `creature` have creature (GUID: %u) that have wrong spawn mask %u including not supported difficulty modes for map (Id: %u).",guid, data.spawnMask, data.mapid); + sLog->outErrorDb("Table `creature` have creature (GUID: %u) that have wrong spawn mask %u including not supported difficulty modes for map (Id: %u).", guid, data.spawnMask, data.mapid); bool ok = true; for (uint32 diff = 0; diff < MAX_DIFFICULTY - 1 && ok; ++diff) @@ -1729,7 +1729,7 @@ void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data) CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid, i)][cell_id]; cell_guids.creatures.insert(guid); } } @@ -1745,7 +1745,7 @@ void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data) CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid, i)][cell_id]; cell_guids.creatures.erase(guid); } } @@ -1898,7 +1898,7 @@ void ObjectMgr::LoadGameobjects() uint32 count = 0; // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT gameobject.guid, id, map, position_x, position_y, position_z, orientation," + QueryResult result = WorldDatabase.Query("SELECT gameobject.guid, id, map, position_x, position_y, position_z, orientation, " // 7 8 9 10 11 12 13 14 15 16 17 "rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state, spawnMask, phaseMask, eventEntry, pool_entry " "FROM gameobject LEFT OUTER JOIN game_event_gameobject ON gameobject.guid = game_event_gameobject.guid " @@ -1912,11 +1912,11 @@ void ObjectMgr::LoadGameobjects() } // build single time for check spawnmask - std::map<uint32,uint32> spawnMasks; + std::map<uint32, uint32> spawnMasks; for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) if (sMapStore.LookupEntry(i)) for (int k = 0; k < MAX_DIFFICULTY; ++k) - if (GetMapDifficultyData(i,Difficulty(k))) + if (GetMapDifficultyData(i, Difficulty(k))) spawnMasks[i] |= (1 << k); do @@ -1948,7 +1948,7 @@ void ObjectMgr::LoadGameobjects() if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) { - sLog->outErrorDb("Gameobject (GUID: %u Entry %u GoType: %u) has an invalid displayId (%u), not loaded.",guid, entry, gInfo->type, gInfo->displayId); + sLog->outErrorDb("Gameobject (GUID: %u Entry %u GoType: %u) has an invalid displayId (%u), not loaded.", guid, entry, gInfo->type, gInfo->displayId); continue; } @@ -1975,7 +1975,7 @@ void ObjectMgr::LoadGameobjects() if (data.spawntimesecs == 0 && gInfo->IsDespawnAtAction()) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with `spawntimesecs` (0) value, but the gameobejct is marked as despawnable at action.",guid,data.id); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with `spawntimesecs` (0) value, but the gameobejct is marked as despawnable at action.", guid, data.id); } data.animprogress = fields[12].GetUInt32(); @@ -1984,7 +1984,7 @@ void ObjectMgr::LoadGameobjects() uint32 go_state = fields[13].GetUInt32(); if (go_state >= MAX_GO_STATE) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid `state` (%u) value, skip",guid,data.id,go_state); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid `state` (%u) value, skip", guid, data.id, go_state); continue; } data.go_state = GOState(go_state); @@ -2000,25 +2000,25 @@ void ObjectMgr::LoadGameobjects() if (data.rotation2 < -1.0f || data.rotation2 > 1.0f) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid rotation2 (%f) value, skip",guid,data.id,data.rotation2); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid rotation2 (%f) value, skip", guid, data.id, data.rotation2); continue; } if (data.rotation3 < -1.0f || data.rotation3 > 1.0f) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid rotation3 (%f) value, skip",guid,data.id,data.rotation3); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid rotation3 (%f) value, skip", guid, data.id, data.rotation3); continue; } - if (!MapManager::IsValidMapCoord(data.mapid,data.posX,data.posY,data.posZ,data.orientation)) + if (!MapManager::IsValidMapCoord(data.mapid, data.posX, data.posY, data.posZ, data.orientation)) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid coordinates, skip",guid,data.id); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid coordinates, skip", guid, data.id); continue; } if (data.phaseMask == 0) { - sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.",guid,data.id); + sLog->outErrorDb("Table `gameobject` has gameobject (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.", guid, data.id); data.phaseMask = 1; } @@ -2042,7 +2042,7 @@ void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data) CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid, i)][cell_id]; cell_guids.gameobjects.insert(guid); } } @@ -2058,7 +2058,7 @@ void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid, i)][cell_id]; cell_guids.gameobjects.erase(guid); } } @@ -2086,7 +2086,7 @@ void ObjectMgr::LoadCreatureRespawnTimes() uint32 respawn_time = fields[1].GetUInt32(); uint32 instance = fields[2].GetUInt32(); - mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)] = time_t(respawn_time); + mCreatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time); ++count; } while (result->NextRow()); @@ -2120,7 +2120,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes() uint32 respawn_time = fields[1].GetUInt32(); uint32 instance = fields[2].GetUInt32(); - mGORespawnTimes[MAKE_PAIR64(loguid,instance)] = time_t(respawn_time); + mGORespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time); ++count; } while (result->NextRow()); @@ -2225,7 +2225,7 @@ void ObjectMgr::LoadItemLocales() mItemLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,name_loc1,description_loc1,name_loc2,description_loc2,name_loc3,description_loc3,name_loc4,description_loc4,name_loc5,description_loc5,name_loc6,description_loc6,name_loc7,description_loc7,name_loc8,description_loc8 FROM locales_item"); + QueryResult result = WorldDatabase.Query("SELECT entry, name_loc1, description_loc1, name_loc2, description_loc2, name_loc3, description_loc3, name_loc4, description_loc4, name_loc5, description_loc5, name_loc6, description_loc6, name_loc7, description_loc7, name_loc8, description_loc8 FROM locales_item"); if (!result) return; @@ -2469,13 +2469,13 @@ void ObjectMgr::LoadItemTemplates() if (itemTemplate.SubClass >= MaxItemSubclassValues[itemTemplate.Class]) { - sLog->outErrorDb("Item (Entry: %u) has wrong Subclass value (%u) for class %u",entry,itemTemplate.SubClass,itemTemplate.Class); + sLog->outErrorDb("Item (Entry: %u) has wrong Subclass value (%u) for class %u", entry, itemTemplate.SubClass, itemTemplate.Class); itemTemplate.SubClass = 0;// exist for all item classes } if (itemTemplate.Quality >= MAX_ITEM_QUALITY) { - sLog->outErrorDb("Item (Entry: %u) has wrong Quality value (%u)",entry,itemTemplate.Quality); + sLog->outErrorDb("Item (Entry: %u) has wrong Quality value (%u)", entry, itemTemplate.Quality); itemTemplate.Quality = ITEM_QUALITY_NORMAL; } @@ -2500,19 +2500,19 @@ void ObjectMgr::LoadItemTemplates() if (itemTemplate.BuyCount <= 0) { - sLog->outErrorDb("Item (Entry: %u) has wrong BuyCount value (%u), set to default(1).",entry,itemTemplate.BuyCount); + sLog->outErrorDb("Item (Entry: %u) has wrong BuyCount value (%u), set to default(1).", entry, itemTemplate.BuyCount); itemTemplate.BuyCount = 1; } if (itemTemplate.InventoryType >= MAX_INVTYPE) { - sLog->outErrorDb("Item (Entry: %u) has wrong InventoryType value (%u)",entry,itemTemplate.InventoryType); + sLog->outErrorDb("Item (Entry: %u) has wrong InventoryType value (%u)", entry, itemTemplate.InventoryType); itemTemplate.InventoryType = INVTYPE_NON_EQUIP; } if (itemTemplate.RequiredSkill >= MAX_SKILL_TYPE) { - sLog->outErrorDb("Item (Entry: %u) has wrong RequiredSkill value (%u)",entry,itemTemplate.RequiredSkill); + sLog->outErrorDb("Item (Entry: %u) has wrong RequiredSkill value (%u)", entry, itemTemplate.RequiredSkill); itemTemplate.RequiredSkill = 0; } @@ -2532,21 +2532,21 @@ void ObjectMgr::LoadItemTemplates() if (req) { if (!(itemTemplate.AllowableClass & CLASSMASK_ALL_PLAYABLE)) - sLog->outErrorDb("Item (Entry: %u) does not have any playable classes (%u) in `AllowableClass` and can't be equipped or used.",entry,itemTemplate.AllowableClass); + sLog->outErrorDb("Item (Entry: %u) does not have any playable classes (%u) in `AllowableClass` and can't be equipped or used.", entry, itemTemplate.AllowableClass); if (!(itemTemplate.AllowableRace & RACEMASK_ALL_PLAYABLE)) - sLog->outErrorDb("Item (Entry: %u) does not have any playable races (%u) in `AllowableRace` and can't be equipped or used.",entry,itemTemplate.AllowableRace); + sLog->outErrorDb("Item (Entry: %u) does not have any playable races (%u) in `AllowableRace` and can't be equipped or used.", entry, itemTemplate.AllowableRace); } } if (itemTemplate.RequiredSpell && !sSpellStore.LookupEntry(itemTemplate.RequiredSpell)) { - sLog->outErrorDb("Item (Entry: %u) has a wrong (non-existing) spell in RequiredSpell (%u)",entry,itemTemplate.RequiredSpell); + sLog->outErrorDb("Item (Entry: %u) has a wrong (non-existing) spell in RequiredSpell (%u)", entry, itemTemplate.RequiredSpell); itemTemplate.RequiredSpell = 0; } if (itemTemplate.RequiredReputationRank >= MAX_REPUTATION_RANK) - sLog->outErrorDb("Item (Entry: %u) has wrong reputation rank in RequiredReputationRank (%u), item can't be used.",entry,itemTemplate.RequiredReputationRank); + sLog->outErrorDb("Item (Entry: %u) has wrong reputation rank in RequiredReputationRank (%u), item can't be used.", entry, itemTemplate.RequiredReputationRank); if (itemTemplate.RequiredReputationFaction) { @@ -2562,30 +2562,30 @@ void ObjectMgr::LoadItemTemplates() if (itemTemplate.MaxCount < -1) { - sLog->outErrorDb("Item (Entry: %u) has too large negative in maxcount (%i), replace by value (-1) no storing limits.",entry,itemTemplate.MaxCount); + sLog->outErrorDb("Item (Entry: %u) has too large negative in maxcount (%i), replace by value (-1) no storing limits.", entry, itemTemplate.MaxCount); itemTemplate.MaxCount = -1; } if (itemTemplate.Stackable == 0) { - sLog->outErrorDb("Item (Entry: %u) has wrong value in stackable (%i), replace by default 1.",entry,itemTemplate.Stackable); + sLog->outErrorDb("Item (Entry: %u) has wrong value in stackable (%i), replace by default 1.", entry, itemTemplate.Stackable); itemTemplate.Stackable = 1; } else if (itemTemplate.Stackable < -1) { - sLog->outErrorDb("Item (Entry: %u) has too large negative in stackable (%i), replace by value (-1) no stacking limits.",entry,itemTemplate.Stackable); + sLog->outErrorDb("Item (Entry: %u) has too large negative in stackable (%i), replace by value (-1) no stacking limits.", entry, itemTemplate.Stackable); itemTemplate.Stackable = -1; } if (itemTemplate.ContainerSlots > MAX_BAG_SIZE) { - sLog->outErrorDb("Item (Entry: %u) has too large value in ContainerSlots (%u), replace by hardcoded limit (%u).",entry,itemTemplate.ContainerSlots,MAX_BAG_SIZE); + sLog->outErrorDb("Item (Entry: %u) has too large value in ContainerSlots (%u), replace by hardcoded limit (%u).", entry, itemTemplate.ContainerSlots, MAX_BAG_SIZE); itemTemplate.ContainerSlots = MAX_BAG_SIZE; } if (itemTemplate.StatsCount > MAX_ITEM_PROTO_STATS) { - sLog->outErrorDb("Item (Entry: %u) has too large value in statscount (%u), replace by hardcoded limit (%u).",entry,itemTemplate.StatsCount,MAX_ITEM_PROTO_STATS); + sLog->outErrorDb("Item (Entry: %u) has too large value in statscount (%u), replace by hardcoded limit (%u).", entry, itemTemplate.StatsCount, MAX_ITEM_PROTO_STATS); itemTemplate.StatsCount = MAX_ITEM_PROTO_STATS; } @@ -2594,7 +2594,7 @@ void ObjectMgr::LoadItemTemplates() // for ItemStatValue != 0 if (itemTemplate.ItemStat[j].ItemStatValue && itemTemplate.ItemStat[j].ItemStatType >= MAX_ITEM_MOD) { - sLog->outErrorDb("Item (Entry: %u) has wrong (non-existing?) stat_type%d (%u)",entry,j+1,itemTemplate.ItemStat[j].ItemStatType); + sLog->outErrorDb("Item (Entry: %u) has wrong (non-existing?) stat_type%d (%u)", entry, j+1, itemTemplate.ItemStat[j].ItemStatType); itemTemplate.ItemStat[j].ItemStatType = 0; } @@ -2602,7 +2602,7 @@ void ObjectMgr::LoadItemTemplates() { case ITEM_MOD_SPELL_HEALING_DONE: case ITEM_MOD_SPELL_DAMAGE_DONE: - sLog->outErrorDb("Item (Entry: %u) has deprecated stat_type%d (%u)",entry,j+1,itemTemplate.ItemStat[j].ItemStatType); + sLog->outErrorDb("Item (Entry: %u) has deprecated stat_type%d (%u)", entry, j+1, itemTemplate.ItemStat[j].ItemStatType); break; default: break; @@ -2613,7 +2613,7 @@ void ObjectMgr::LoadItemTemplates() { if (itemTemplate.Damage[j].DamageType >= MAX_SPELL_SCHOOL) { - sLog->outErrorDb("Item (Entry: %u) has wrong dmg_type%d (%u)",entry,j+1,itemTemplate.Damage[j].DamageType); + sLog->outErrorDb("Item (Entry: %u) has wrong dmg_type%d (%u)", entry, j+1, itemTemplate.Damage[j].DamageType); itemTemplate.Damage[j].DamageType = 0; } } @@ -2624,7 +2624,7 @@ void ObjectMgr::LoadItemTemplates() // spell_1 if (itemTemplate.Spells[0].SpellTrigger != ITEM_SPELLTRIGGER_ON_USE) { - sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u) for special learning format",entry,0+1,itemTemplate.Spells[0].SpellTrigger); + sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u) for special learning format", entry, 0+1, itemTemplate.Spells[0].SpellTrigger); itemTemplate.Spells[0].SpellId = 0; itemTemplate.Spells[0].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; itemTemplate.Spells[1].SpellId = 0; @@ -2634,14 +2634,14 @@ void ObjectMgr::LoadItemTemplates() // spell_2 have learning spell if (itemTemplate.Spells[1].SpellTrigger != ITEM_SPELLTRIGGER_LEARN_SPELL_ID) { - sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u) for special learning format.",entry,1+1,itemTemplate.Spells[1].SpellTrigger); + sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u) for special learning format.", entry, 1+1, itemTemplate.Spells[1].SpellTrigger); itemTemplate.Spells[0].SpellId = 0; itemTemplate.Spells[1].SpellId = 0; itemTemplate.Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } else if (!itemTemplate.Spells[1].SpellId) { - sLog->outErrorDb("Item (Entry: %u) does not have an expected spell in spellid_%d in special learning format.",entry,1+1); + sLog->outErrorDb("Item (Entry: %u) does not have an expected spell in spellid_%d in special learning format.", entry, 1+1); itemTemplate.Spells[0].SpellId = 0; itemTemplate.Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } @@ -2650,7 +2650,7 @@ void ObjectMgr::LoadItemTemplates() SpellEntry const* spellInfo = sSpellStore.LookupEntry(itemTemplate.Spells[1].SpellId); if (!spellInfo && !sDisableMgr->IsDisabledFor(DISABLE_TYPE_SPELL, itemTemplate.Spells[1].SpellId, NULL)) { - sLog->outErrorDb("Item (Entry: %u) has wrong (not existing) spell in spellid_%d (%d)",entry,1+1,itemTemplate.Spells[1].SpellId); + sLog->outErrorDb("Item (Entry: %u) has wrong (not existing) spell in spellid_%d (%d)", entry, 1+1, itemTemplate.Spells[1].SpellId); itemTemplate.Spells[0].SpellId = 0; itemTemplate.Spells[1].SpellId = 0; itemTemplate.Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; @@ -2658,25 +2658,25 @@ void ObjectMgr::LoadItemTemplates() // allowed only in special format else if ((itemTemplate.Spells[1].SpellId == 483) || (itemTemplate.Spells[1].SpellId == 55884)) { - sLog->outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%d)",entry,1+1,itemTemplate.Spells[1].SpellId); + sLog->outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%d)", entry, 1+1, itemTemplate.Spells[1].SpellId); itemTemplate.Spells[0].SpellId = 0; itemTemplate.Spells[1].SpellId = 0; itemTemplate.Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } } - // spell_3*,spell_4*,spell_5* is empty + // spell_3*, spell_4*, spell_5* is empty for (uint8 j = 2; j < MAX_ITEM_PROTO_SPELLS; ++j) { if (itemTemplate.Spells[j].SpellTrigger != ITEM_SPELLTRIGGER_ON_USE) { - sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u)",entry,j+1,itemTemplate.Spells[j].SpellTrigger); + sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u)", entry, j+1, itemTemplate.Spells[j].SpellTrigger); itemTemplate.Spells[j].SpellId = 0; itemTemplate.Spells[j].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } else if (itemTemplate.Spells[j].SpellId != 0) { - sLog->outErrorDb("Item (Entry: %u) has wrong spell in spellid_%d (%d) for learning special format",entry,j+1,itemTemplate.Spells[j].SpellId); + sLog->outErrorDb("Item (Entry: %u) has wrong spell in spellid_%d (%d) for learning special format", entry, j+1, itemTemplate.Spells[j].SpellId); itemTemplate.Spells[j].SpellId = 0; } } @@ -2688,7 +2688,7 @@ void ObjectMgr::LoadItemTemplates() { if (itemTemplate.Spells[j].SpellTrigger >= MAX_ITEM_SPELLTRIGGER || itemTemplate.Spells[j].SpellTrigger == ITEM_SPELLTRIGGER_LEARN_SPELL_ID) { - sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u)",entry,j+1,itemTemplate.Spells[j].SpellTrigger); + sLog->outErrorDb("Item (Entry: %u) has wrong item spell trigger value in spelltrigger_%d (%u)", entry, j+1, itemTemplate.Spells[j].SpellTrigger); itemTemplate.Spells[j].SpellId = 0; itemTemplate.Spells[j].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } @@ -2698,13 +2698,13 @@ void ObjectMgr::LoadItemTemplates() SpellEntry const* spellInfo = sSpellStore.LookupEntry(itemTemplate.Spells[j].SpellId); if (!spellInfo && !sDisableMgr->IsDisabledFor(DISABLE_TYPE_SPELL, itemTemplate.Spells[j].SpellId, NULL)) { - sLog->outErrorDb("Item (Entry: %u) has wrong (not existing) spell in spellid_%d (%d)",entry,j+1,itemTemplate.Spells[j].SpellId); + sLog->outErrorDb("Item (Entry: %u) has wrong (not existing) spell in spellid_%d (%d)", entry, j+1, itemTemplate.Spells[j].SpellId); itemTemplate.Spells[j].SpellId = 0; } // allowed only in special format else if ((itemTemplate.Spells[j].SpellId == 483) || (itemTemplate.Spells[j].SpellId == 55884)) { - sLog->outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%d)",entry,j+1,itemTemplate.Spells[j].SpellId); + sLog->outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%d)", entry, j+1, itemTemplate.Spells[j].SpellId); itemTemplate.Spells[j].SpellId = 0; } } @@ -2712,17 +2712,17 @@ void ObjectMgr::LoadItemTemplates() } if (itemTemplate.Bonding >= MAX_BIND_TYPE) - sLog->outErrorDb("Item (Entry: %u) has wrong Bonding value (%u)",entry,itemTemplate.Bonding); + sLog->outErrorDb("Item (Entry: %u) has wrong Bonding value (%u)", entry, itemTemplate.Bonding); if (itemTemplate.PageText && !GetPageText(itemTemplate.PageText)) - sLog->outErrorDb("Item (Entry: %u) has non existing first page (Id:%u)", entry,itemTemplate.PageText); + sLog->outErrorDb("Item (Entry: %u) has non existing first page (Id:%u)", entry, itemTemplate.PageText); if (itemTemplate.LockID && !sLockStore.LookupEntry(itemTemplate.LockID)) - sLog->outErrorDb("Item (Entry: %u) has wrong LockID (%u)",entry,itemTemplate.LockID); + sLog->outErrorDb("Item (Entry: %u) has wrong LockID (%u)", entry, itemTemplate.LockID); if (itemTemplate.Sheath >= MAX_SHEATHETYPE) { - sLog->outErrorDb("Item (Entry: %u) has wrong Sheath (%u)",entry,itemTemplate.Sheath); + sLog->outErrorDb("Item (Entry: %u) has wrong Sheath (%u)", entry, itemTemplate.Sheath); itemTemplate.Sheath = SHEATHETYPE_NONE; } @@ -2734,28 +2734,28 @@ void ObjectMgr::LoadItemTemplates() else if (!sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(itemTemplate.RandomProperty))) { - sLog->outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)",entry,itemTemplate.RandomProperty); + sLog->outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)", entry, itemTemplate.RandomProperty); itemTemplate.RandomProperty = 0; } } if (itemTemplate.RandomSuffix && !sItemRandomSuffixStore.LookupEntry(GetItemEnchantMod(itemTemplate.RandomSuffix))) { - sLog->outErrorDb("Item (Entry: %u) has wrong RandomSuffix (%u)",entry,itemTemplate.RandomSuffix); + sLog->outErrorDb("Item (Entry: %u) has wrong RandomSuffix (%u)", entry, itemTemplate.RandomSuffix); itemTemplate.RandomSuffix = 0; } if (itemTemplate.ItemSet && !sItemSetStore.LookupEntry(itemTemplate.ItemSet)) { - sLog->outErrorDb("Item (Entry: %u) have wrong ItemSet (%u)",entry,itemTemplate.ItemSet); + sLog->outErrorDb("Item (Entry: %u) have wrong ItemSet (%u)", entry, itemTemplate.ItemSet); itemTemplate.ItemSet = 0; } if (itemTemplate.Area && !GetAreaEntryByAreaID(itemTemplate.Area)) - sLog->outErrorDb("Item (Entry: %u) has wrong Area (%u)",entry,itemTemplate.Area); + sLog->outErrorDb("Item (Entry: %u) has wrong Area (%u)", entry, itemTemplate.Area); if (itemTemplate.Map && !sMapStore.LookupEntry(itemTemplate.Map)) - sLog->outErrorDb("Item (Entry: %u) has wrong Map (%u)",entry,itemTemplate.Map); + sLog->outErrorDb("Item (Entry: %u) has wrong Map (%u)", entry, itemTemplate.Map); if (itemTemplate.BagFamily) { @@ -2787,29 +2787,29 @@ void ObjectMgr::LoadItemTemplates() } if (itemTemplate.TotemCategory && !sTotemCategoryStore.LookupEntry(itemTemplate.TotemCategory)) - sLog->outErrorDb("Item (Entry: %u) has wrong TotemCategory (%u)",entry,itemTemplate.TotemCategory); + sLog->outErrorDb("Item (Entry: %u) has wrong TotemCategory (%u)", entry, itemTemplate.TotemCategory); for (uint8 j = 0; j < MAX_ITEM_PROTO_SOCKETS; ++j) { if (itemTemplate.Socket[j].Color && (itemTemplate.Socket[j].Color & SOCKET_COLOR_ALL) != itemTemplate.Socket[j].Color) { - sLog->outErrorDb("Item (Entry: %u) has wrong socketColor_%d (%u)",entry,j+1,itemTemplate.Socket[j].Color); + sLog->outErrorDb("Item (Entry: %u) has wrong socketColor_%d (%u)", entry, j+1, itemTemplate.Socket[j].Color); itemTemplate.Socket[j].Color = 0; } } if (itemTemplate.GemProperties && !sGemPropertiesStore.LookupEntry(itemTemplate.GemProperties)) - sLog->outErrorDb("Item (Entry: %u) has wrong GemProperties (%u)",entry,itemTemplate.GemProperties); + sLog->outErrorDb("Item (Entry: %u) has wrong GemProperties (%u)", entry, itemTemplate.GemProperties); if (itemTemplate.FoodType >= MAX_PET_DIET) { - sLog->outErrorDb("Item (Entry: %u) has wrong FoodType value (%u)",entry,itemTemplate.FoodType); + sLog->outErrorDb("Item (Entry: %u) has wrong FoodType value (%u)", entry, itemTemplate.FoodType); itemTemplate.FoodType = 0; } if (itemTemplate.ItemLimitCategory && !sItemLimitCategoryStore.LookupEntry(itemTemplate.ItemLimitCategory)) { - sLog->outErrorDb("Item (Entry: %u) has wrong LimitCategory value (%u)",entry,itemTemplate.ItemLimitCategory); + sLog->outErrorDb("Item (Entry: %u) has wrong LimitCategory value (%u)", entry, itemTemplate.ItemLimitCategory); itemTemplate.ItemLimitCategory = 0; } @@ -2865,7 +2865,7 @@ void ObjectMgr::LoadItemSetNameLocales() mItemSetNameLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT `entry`,`name_loc1`,`name_loc2`,`name_loc3`,`name_loc4`,`name_loc5`,`name_loc6`,`name_loc7`,`name_loc8` FROM `locales_item_set_names`"); + QueryResult result = WorldDatabase.Query("SELECT `entry`, `name_loc1`, `name_loc2`, `name_loc3`, `name_loc4`, `name_loc5`, `name_loc6`, `name_loc7`, `name_loc8` FROM `locales_item_set_names`"); if (!result) return; @@ -2909,7 +2909,7 @@ void ObjectMgr::LoadItemSetNames() itemSetItems.insert(setEntry->itemId[i]); } - QueryResult result = WorldDatabase.Query("SELECT `entry`,`name`,`InventoryType` FROM `item_set_names`"); + QueryResult result = WorldDatabase.Query("SELECT `entry`, `name`, `InventoryType` FROM `item_set_names`"); if (!result) { @@ -2979,7 +2979,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories() uint32 count = 0; - QueryResult result = WorldDatabase.Query("SELECT `entry`,`accessory_entry`,`seat_id`,`minion`,`summontype`,`summontimer` FROM `vehicle_template_accessory`"); + QueryResult result = WorldDatabase.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_template_accessory`"); if (!result) { @@ -3035,7 +3035,7 @@ void ObjectMgr::LoadVehicleAccessories() uint32 count = 0; - QueryResult result = WorldDatabase.Query("SELECT `guid`,`accessory_entry`,`seat_id`,`minion`,`summontype`,`summontimer` FROM `vehicle_accessory`"); + QueryResult result = WorldDatabase.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_accessory`"); if (!result) { @@ -3079,7 +3079,7 @@ void ObjectMgr::LoadVehicleScaling() uint32 count = 0; - QueryResult result = WorldDatabase.Query("SELECT `entry`,`baseItemLevel`,`scalingFactor` FROM `vehicle_scaling_info`"); + QueryResult result = WorldDatabase.Query("SELECT `entry`, `baseItemLevel`, `scalingFactor` FROM `vehicle_scaling_info`"); if (!result) { @@ -3136,7 +3136,7 @@ void ObjectMgr::LoadPetLevelInfo() uint32 creature_id = fields[0].GetUInt32(); if (!sObjectMgr->GetCreatureTemplate(creature_id)) { - sLog->outErrorDb("Wrong creature id %u in `pet_levelstats` table, ignoring.",creature_id); + sLog->outErrorDb("Wrong creature id %u in `pet_levelstats` table, ignoring.", creature_id); continue; } @@ -3144,17 +3144,17 @@ void ObjectMgr::LoadPetLevelInfo() if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { if (current_level > STRONG_MAX_LEVEL) // hardcoded level maximum - sLog->outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level); + sLog->outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { - sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.",current_level); + sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; } else if (current_level < 1) { - sLog->outErrorDb("Wrong (<1) level %u in `pet_levelstats` table, ignoring.",current_level); + sLog->outErrorDb("Wrong (<1) level %u in `pet_levelstats` table, ignoring.", current_level); continue; } @@ -3187,7 +3187,7 @@ void ObjectMgr::LoadPetLevelInfo() // fatal error if no level 1 data if (!pInfo || pInfo[0].health == 0) { - sLog->outErrorDb("Creature %u does not have pet stats data for Level 1!",itr->first); + sLog->outErrorDb("Creature %u does not have pet stats data for Level 1!", itr->first); exit(1); } @@ -3196,7 +3196,7 @@ void ObjectMgr::LoadPetLevelInfo() { if (pInfo[level].health == 0) { - sLog->outErrorDb("Creature %u has no data for Level %i pet stats data, using data of Level %i.",itr->first,level+1, level); + sLog->outErrorDb("Creature %u has no data for Level %i pet stats data, using data of Level %i.", itr->first, level+1, level); pInfo[level] = pInfo[level-1]; } } @@ -3292,39 +3292,39 @@ void ObjectMgr::LoadPlayerInfo() if (current_race >= MAX_RACES) { - sLog->outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.", current_race); continue; } ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(current_race); if (!rEntry) { - sLog->outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.", current_race); continue; } if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.", current_class); continue; } if (!sChrClassesStore.LookupEntry(current_class)) { - sLog->outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.", current_class); continue; } // accept DB data only for valid position (and non instanceable) - if (!MapManager::IsValidMapCoord(mapId,positionX,positionY,positionZ,orientation)) + if (!MapManager::IsValidMapCoord(mapId, positionX, positionY, positionZ, orientation)) { - sLog->outErrorDb("Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race); + sLog->outErrorDb("Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.", current_class, current_race); continue; } if (sMapStore.LookupEntry(mapId)->Instanceable()) { - sLog->outErrorDb("Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race); + sLog->outErrorDb("Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.", current_class, current_race); continue; } @@ -3372,14 +3372,14 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_race = fields[0].GetUInt32(); if (current_race >= MAX_RACES) { - sLog->outErrorDb("Wrong race %u in `playercreateinfo_item` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `playercreateinfo_item` table, ignoring.", current_race); continue; } uint32 current_class = fields[1].GetUInt32(); if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `playercreateinfo_item` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `playercreateinfo_item` table, ignoring.", current_class); continue; } @@ -3387,7 +3387,7 @@ void ObjectMgr::LoadPlayerInfo() if (!sObjectMgr->GetItemTemplate(item_id)) { - sLog->outErrorDb("Item id %u (race %u class %u) in `playercreateinfo_item` table but not listed in `item_template`, ignoring.",item_id,current_race,current_class); + sLog->outErrorDb("Item id %u (race %u class %u) in `playercreateinfo_item` table but not listed in `item_template`, ignoring.", item_id, current_race, current_class); continue; } @@ -3395,7 +3395,7 @@ void ObjectMgr::LoadPlayerInfo() if (!amount) { - sLog->outErrorDb("Item id %u (class %u race %u) have amount == 0 in `playercreateinfo_item` table, ignoring.",item_id,current_race,current_class); + sLog->outErrorDb("Item id %u (class %u race %u) have amount == 0 in `playercreateinfo_item` table, ignoring.", item_id, current_race, current_class); continue; } @@ -3448,14 +3448,14 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_race = fields[0].GetUInt32(); if (current_race >= MAX_RACES) { - sLog->outErrorDb("Wrong race %u in `playercreateinfo_spell` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `playercreateinfo_spell` table, ignoring.", current_race); continue; } uint32 current_class = fields[1].GetUInt32(); if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `playercreateinfo_spell` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `playercreateinfo_spell` table, ignoring.", current_class); continue; } @@ -3505,19 +3505,19 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_race = fields[0].GetUInt32(); if (current_race >= MAX_RACES) { - sLog->outErrorDb("Wrong race %u in `playercreateinfo_action` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `playercreateinfo_action` table, ignoring.", current_race); continue; } uint32 current_class = fields[1].GetUInt32(); if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `playercreateinfo_action` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `playercreateinfo_action` table, ignoring.", current_class); continue; } PlayerInfo* pInfo = &playerInfo[current_race][current_class]; - pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt8(),fields[3].GetUInt32(),fields[4].GetUInt8())); + pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt8(), fields[3].GetUInt32(), fields[4].GetUInt8())); ++count; } @@ -3552,14 +3552,14 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_class = fields[0].GetUInt32(); if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `player_classlevelstats` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `player_classlevelstats` table, ignoring.", current_class); continue; } uint8 current_level = fields[1].GetUInt8(); // Can't be > than STRONG_MAX_LEVEL (hardcoded level maximum) due to var type if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { - sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.",current_level); + sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. continue; } @@ -3590,7 +3590,7 @@ void ObjectMgr::LoadPlayerInfo() // fatal error if no level 1 data if (!pClassInfo->levelInfo || pClassInfo->levelInfo[0].basehealth == 0) { - sLog->outErrorDb("Class %i Level 1 does not have health/mana data!",class_); + sLog->outErrorDb("Class %i Level 1 does not have health/mana data!", class_); exit(1); } @@ -3599,7 +3599,7 @@ void ObjectMgr::LoadPlayerInfo() { if (pClassInfo->levelInfo[level].basehealth == 0) { - sLog->outErrorDb("Class %i Level %i does not have health/mana data. Using stats data of level %i.",class_,level+1, level); + sLog->outErrorDb("Class %i Level %i does not have health/mana data. Using stats data of level %i.", class_, level+1, level); pClassInfo->levelInfo[level] = pClassInfo->levelInfo[level-1]; } } @@ -3633,14 +3633,14 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_race = fields[0].GetUInt32(); if (current_race >= MAX_RACES) { - sLog->outErrorDb("Wrong race %u in `player_levelstats` table, ignoring.",current_race); + sLog->outErrorDb("Wrong race %u in `player_levelstats` table, ignoring.", current_race); continue; } uint32 current_class = fields[1].GetUInt32(); if (current_class >= MAX_CLASSES) { - sLog->outErrorDb("Wrong class %u in `player_levelstats` table, ignoring.",current_class); + sLog->outErrorDb("Wrong class %u in `player_levelstats` table, ignoring.", current_class); continue; } @@ -3648,10 +3648,10 @@ void ObjectMgr::LoadPlayerInfo() if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { if (current_level > STRONG_MAX_LEVEL) // hardcoded level maximum - sLog->outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level); + sLog->outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { - sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.",current_level); + sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -3703,7 +3703,7 @@ void ObjectMgr::LoadPlayerInfo() // fatal error if no level 1 data if (!pInfo->levelInfo || pInfo->levelInfo[0].stats[0] == 0) { - sLog->outErrorDb("Race %i Class %i Level 1 does not have stats data!",race,class_); + sLog->outErrorDb("Race %i Class %i Level 1 does not have stats data!", race, class_); exit(1); } @@ -3712,7 +3712,7 @@ void ObjectMgr::LoadPlayerInfo() { if (pInfo->levelInfo[level].stats[0] == 0) { - sLog->outErrorDb("Race %i Class %i Level %i does not have stats data. Using stats data of level %i.",race,class_,level+1, level); + sLog->outErrorDb("Race %i Class %i Level %i does not have stats data. Using stats data of level %i.", race, class_, level+1, level); pInfo->levelInfo[level] = pInfo->levelInfo[level-1]; } } @@ -3754,10 +3754,10 @@ void ObjectMgr::LoadPlayerInfo() if (current_level >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { if (current_level > STRONG_MAX_LEVEL) // hardcoded level maximum - sLog->outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL,current_level); + sLog->outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { - sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level); + sLog->outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -3773,7 +3773,7 @@ void ObjectMgr::LoadPlayerInfo() { if (mPlayerXPperLevel[level] == 0) { - sLog->outErrorDb("Level %i does not have XP for level data. Using data of level [%i] + 100.",level+1, level); + sLog->outErrorDb("Level %i does not have XP for level data. Using data of level [%i] + 100.", level+1, level); mPlayerXPperLevel[level] = mPlayerXPperLevel[level-1]+100; } } @@ -3808,7 +3808,7 @@ void ObjectMgr::GetPlayerLevelInfo(uint32 race, uint32 class_, uint8 level, Play if (level <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) *info = pInfo->levelInfo[level-1]; else - BuildPlayerLevelInfo(race,class_,level,info); + BuildPlayerLevelInfo(race, class_, level, info); } void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, PlayerLevelInfo* info) const @@ -4220,7 +4220,7 @@ void ObjectMgr::LoadArenaTeams() // 0 1 2 3 4 5 6 7 8 - QueryResult result = CharacterDatabase.Query("SELECT arena_team.arenaTeamId, name, captainGuid, type, backgroundColor, emblemStyle, emblemColor, borderStyle, borderColor," + QueryResult result = CharacterDatabase.Query("SELECT arena_team.arenaTeamId, name, captainGuid, type, backgroundColor, emblemStyle, emblemColor, borderStyle, borderColor, " // 9 10 11 12 13 14 "rating, weekGames, weekWins, seasonGames, seasonWins, rank FROM arena_team ORDER BY arena_team.arenaTeamId ASC"); @@ -4272,7 +4272,7 @@ void ObjectMgr::LoadGroups() // 0 1 2 3 4 5 6 7 8 9 QueryResult result = CharacterDatabase.PQuery("SELECT leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6" // 10 11 12 13 14 15 - ",icon7, icon8, groupType, difficulty, raiddifficulty, guid FROM groups ORDER BY guid ASC"); + ", icon7, icon8, groupType, difficulty, raiddifficulty, guid FROM groups ORDER BY guid ASC"); if (!result) { sLog->outString(">> Loaded 0 group definitions. DB table `groups` is empty!"); @@ -4405,39 +4405,39 @@ void ObjectMgr::LoadQuests() mExclusiveQuestGroups.clear(); // 0 1 2 3 4 5 6 7 8 9 - QueryResult result = WorldDatabase.Query("SELECT entry, Method, ZoneOrSort, SkillOrClassMask, MinLevel, MaxLevel, QuestLevel, Type, RequiredRaces, RequiredSkillValue," + QueryResult result = WorldDatabase.Query("SELECT entry, Method, ZoneOrSort, SkillOrClassMask, MinLevel, MaxLevel, QuestLevel, Type, RequiredRaces, RequiredSkillValue, " // 10 11 12 13 14 15 16 17 18 19 - "RepObjectiveFaction, RepObjectiveValue, RepObjectiveFaction2, RepObjectiveValue2, RequiredMinRepFaction, RequiredMinRepValue, RequiredMaxRepFaction, RequiredMaxRepValue, SuggestedPlayers, LimitTime," + "RepObjectiveFaction, RepObjectiveValue, RepObjectiveFaction2, RepObjectiveValue2, RequiredMinRepFaction, RequiredMinRepValue, RequiredMaxRepFaction, RequiredMaxRepValue, SuggestedPlayers, LimitTime, " // 20 21 22 23 24 25 26 27 28 29 30 31 32 33 - "QuestFlags, SpecialFlags, CharTitleId, PlayersSlain, BonusTalents, RewardArenaPoints, PrevQuestId, NextQuestId, ExclusiveGroup, NextQuestInChain, RewXPId, SrcItemId, SrcItemCount, SrcSpell," + "QuestFlags, SpecialFlags, CharTitleId, PlayersSlain, BonusTalents, RewardArenaPoints, PrevQuestId, NextQuestId, ExclusiveGroup, NextQuestInChain, RewXPId, SrcItemId, SrcItemCount, SrcSpell, " // 34 35 36 37 38 39 40 41 42 43 44 - "Title, Details, Objectives, OfferRewardText, RequestItemsText, EndText, CompletedText, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4," + "Title, Details, Objectives, OfferRewardText, RequestItemsText, EndText, CompletedText, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4, " // 45 46 47 48 49 50 51 52 53 54 55 56 - "ReqItemId1, ReqItemId2, ReqItemId3, ReqItemId4, ReqItemId5, ReqItemId6, ReqItemCount1, ReqItemCount2, ReqItemCount3, ReqItemCount4, ReqItemCount5, ReqItemCount6," + "ReqItemId1, ReqItemId2, ReqItemId3, ReqItemId4, ReqItemId5, ReqItemId6, ReqItemCount1, ReqItemCount2, ReqItemCount3, ReqItemCount4, ReqItemCount5, ReqItemCount6, " // 57 58 59 60 61 62 63 64 - "ReqSourceId1, ReqSourceId2, ReqSourceId3, ReqSourceId4, ReqSourceCount1, ReqSourceCount2, ReqSourceCount3, ReqSourceCount4," + "ReqSourceId1, ReqSourceId2, ReqSourceId3, ReqSourceId4, ReqSourceCount1, ReqSourceCount2, ReqSourceCount3, ReqSourceCount4, " // 65 66 67 68 69 70 71 72 - "ReqCreatureOrGOId1, ReqCreatureOrGOId2, ReqCreatureOrGOId3, ReqCreatureOrGOId4, ReqCreatureOrGOCount1, ReqCreatureOrGOCount2, ReqCreatureOrGOCount3, ReqCreatureOrGOCount4," + "ReqCreatureOrGOId1, ReqCreatureOrGOId2, ReqCreatureOrGOId3, ReqCreatureOrGOId4, ReqCreatureOrGOCount1, ReqCreatureOrGOCount2, ReqCreatureOrGOCount3, ReqCreatureOrGOCount4, " // 73 74 75 76 - "ReqSpellCast1, ReqSpellCast2, ReqSpellCast3, ReqSpellCast4," + "ReqSpellCast1, ReqSpellCast2, ReqSpellCast3, ReqSpellCast4, " // 77 78 79 80 81 82 - "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6," + "RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6, " // 83 84 85 86 87 88 - "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6," + "RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6, " // 89 90 91 92 93 94 95 96 - "RewItemId1, RewItemId2, RewItemId3, RewItemId4, RewItemCount1, RewItemCount2, RewItemCount3, RewItemCount4," + "RewItemId1, RewItemId2, RewItemId3, RewItemId4, RewItemCount1, RewItemCount2, RewItemCount3, RewItemCount4, " // 97 98 99 100 101 102 103 104 105 106 - "RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValueId1, RewRepValueId2, RewRepValueId3, RewRepValueId4, RewRepValueId5," + "RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValueId1, RewRepValueId2, RewRepValueId3, RewRepValueId4, RewRepValueId5, " // 107 108 109 110 111 - "RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5," + "RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5, " // 112 113 114 115 116 117 118 119 120 121 122 123 - "RewHonorAddition, RewHonorMultiplier, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt," + "RewHonorAddition, RewHonorMultiplier, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt, " // 124 125 126 127 128 129 130 131 - "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4," + "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4, " // 132 133 134 135 136 137 - "IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4," + "IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4, " // 138 139 140 141 - "OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4," + "OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4, " // 142 143 "StartScript, CompleteScript" " FROM quest_template"); @@ -4459,7 +4459,7 @@ void ObjectMgr::LoadQuests() mQuestTemplates[newQuest->GetQuestId()] = newQuest; } while (result->NextRow()); - std::map<uint32,uint32> usedMailTemplates; + std::map<uint32, uint32> usedMailTemplates; // Post processing for (QuestMap::iterator iter = mQuestTemplates.begin(); iter != mQuestTemplates.end(); ++iter) @@ -4474,19 +4474,19 @@ void ObjectMgr::LoadQuests() if (qinfo->GetQuestMethod() >= 3) { - sLog->outErrorDb("Quest %u has `Method` = %u, expected values are 0, 1 or 2.",qinfo->GetQuestId(),qinfo->GetQuestMethod()); + sLog->outErrorDb("Quest %u has `Method` = %u, expected values are 0, 1 or 2.", qinfo->GetQuestId(), qinfo->GetQuestMethod()); } if (qinfo->QuestFlags & ~QUEST_TRINITY_FLAGS_DB_ALLOWED) { sLog->outErrorDb("Quest %u has `SpecialFlags` = %u > max allowed value. Correct `SpecialFlags` to value <= %u", - qinfo->GetQuestId(),qinfo->QuestFlags >> 20, QUEST_TRINITY_FLAGS_DB_ALLOWED >> 20); + qinfo->GetQuestId(), qinfo->QuestFlags >> 20, QUEST_TRINITY_FLAGS_DB_ALLOWED >> 20); qinfo->QuestFlags &= QUEST_TRINITY_FLAGS_DB_ALLOWED; } if (qinfo->QuestFlags & QUEST_FLAGS_DAILY && qinfo->QuestFlags & QUEST_FLAGS_WEEKLY) { - sLog->outErrorDb("Weekly Quest %u is marked as daily quest in `QuestFlags`, removed daily flag.",qinfo->GetQuestId()); + sLog->outErrorDb("Weekly Quest %u is marked as daily quest in `QuestFlags`, removed daily flag.", qinfo->GetQuestId()); qinfo->QuestFlags &= ~QUEST_FLAGS_DAILY; } @@ -4494,7 +4494,7 @@ void ObjectMgr::LoadQuests() { if (!(qinfo->QuestFlags & QUEST_TRINITY_FLAGS_REPEATABLE)) { - sLog->outErrorDb("Daily Quest %u not marked as repeatable in `SpecialFlags`, added.",qinfo->GetQuestId()); + sLog->outErrorDb("Daily Quest %u not marked as repeatable in `SpecialFlags`, added.", qinfo->GetQuestId()); qinfo->QuestFlags |= QUEST_TRINITY_FLAGS_REPEATABLE; } } @@ -4503,7 +4503,7 @@ void ObjectMgr::LoadQuests() { if (!(qinfo->QuestFlags & QUEST_TRINITY_FLAGS_REPEATABLE)) { - sLog->outErrorDb("Weekly Quest %u not marked as repeatable in `SpecialFlags`, added.",qinfo->GetQuestId()); + sLog->outErrorDb("Weekly Quest %u not marked as repeatable in `SpecialFlags`, added.", qinfo->GetQuestId()); qinfo->QuestFlags |= QUEST_TRINITY_FLAGS_REPEATABLE; } } @@ -4516,7 +4516,7 @@ void ObjectMgr::LoadQuests() if (uint32 id = qinfo->RewChoiceItemId[j]) { sLog->outErrorDb("Quest %u has `RewChoiceItemId%d` = %u but item from `RewChoiceItemId%d` can't be rewarded with quest flag QUEST_FLAGS_AUTO_REWARDED.", - qinfo->GetQuestId(),j+1,id,j+1); + qinfo->GetQuestId(), j+1, id, j+1); // no changes, quest ignore this data } } @@ -4528,7 +4528,7 @@ void ObjectMgr::LoadQuests() if (!GetAreaEntryByAreaID(qinfo->ZoneOrSort)) { sLog->outErrorDb("Quest %u has `ZoneOrSort` = %u (zone case) but zone with this id does not exist.", - qinfo->GetQuestId(),qinfo->ZoneOrSort); + qinfo->GetQuestId(), qinfo->ZoneOrSort); // no changes, quest not dependent from this value but can have problems at client } } @@ -4539,7 +4539,7 @@ void ObjectMgr::LoadQuests() if (!qSort) { sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i (sort case) but quest sort with this id does not exist.", - qinfo->GetQuestId(),qinfo->ZoneOrSort); + qinfo->GetQuestId(), qinfo->ZoneOrSort); // no changes, quest not dependent from this value but can have problems at client (note some may be 0, we must allow this so no check) } //check SkillOrClass value (class case). @@ -4549,7 +4549,7 @@ void ObjectMgr::LoadQuests() if (qinfo->SkillOrClassMask < 0) { sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i (class sort case) and `SkillOrClassMask` = %i (class case), redundant.", - qinfo->GetQuestId(),qinfo->ZoneOrSort,qinfo->SkillOrClassMask); + qinfo->GetQuestId(), qinfo->ZoneOrSort, qinfo->SkillOrClassMask); } } //check for proper SkillOrClass value (skill case) @@ -4559,7 +4559,7 @@ void ObjectMgr::LoadQuests() if (qinfo->SkillOrClassMask != skill_id) { sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i (skill sort case) but `SkillOrClassMask` does not have a corresponding value (%i).", - qinfo->GetQuestId(),qinfo->ZoneOrSort,skill_id); + qinfo->GetQuestId(), qinfo->ZoneOrSort, skill_id); //override, and force proper value here? } } @@ -4571,7 +4571,7 @@ void ObjectMgr::LoadQuests() if (!(-int32(qinfo->SkillOrClassMask) & CLASSMASK_ALL_PLAYABLE)) { sLog->outErrorDb("Quest %u has `SkillOrClassMask` = %i (class case) but classmask does not have valid class", - qinfo->GetQuestId(),qinfo->SkillOrClassMask); + qinfo->GetQuestId(), qinfo->SkillOrClassMask); } } // SkillOrClassMask (skill case) @@ -4580,7 +4580,7 @@ void ObjectMgr::LoadQuests() if (!sSkillLineStore.LookupEntry(qinfo->SkillOrClassMask)) { sLog->outErrorDb("Quest %u has `SkillOrClass` = %u (skill case) but skill (%i) does not exist", - qinfo->GetQuestId(),qinfo->SkillOrClassMask,qinfo->SkillOrClassMask); + qinfo->GetQuestId(), qinfo->SkillOrClassMask, qinfo->SkillOrClassMask); } } @@ -4589,14 +4589,14 @@ void ObjectMgr::LoadQuests() if (qinfo->RequiredSkillValue > sWorld->GetConfigMaxSkillValue()) { sLog->outErrorDb("Quest %u has `RequiredSkillValue` = %u but max possible skill is %u, quest can't be done.", - qinfo->GetQuestId(),qinfo->RequiredSkillValue,sWorld->GetConfigMaxSkillValue()); + qinfo->GetQuestId(), qinfo->RequiredSkillValue, sWorld->GetConfigMaxSkillValue()); // no changes, quest can't be done for this requirement } if (qinfo->SkillOrClassMask <= 0) { sLog->outErrorDb("Quest %u has `RequiredSkillValue` = %u but `SkillOrClass` = %i (class case), value ignored.", - qinfo->GetQuestId(),qinfo->RequiredSkillValue,qinfo->SkillOrClassMask); + qinfo->GetQuestId(), qinfo->RequiredSkillValue, qinfo->SkillOrClassMask); // no changes, quest can't be done for this requirement (fail at wrong skill id) } } @@ -4605,77 +4605,77 @@ void ObjectMgr::LoadQuests() if (qinfo->RepObjectiveFaction2 && !sFactionStore.LookupEntry(qinfo->RepObjectiveFaction2)) { sLog->outErrorDb("Quest %u has `RepObjectiveFaction2` = %u but faction template %u does not exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->RepObjectiveFaction2,qinfo->RepObjectiveFaction2); + qinfo->GetQuestId(), qinfo->RepObjectiveFaction2, qinfo->RepObjectiveFaction2); // no changes, quest can't be done for this requirement } if (qinfo->RepObjectiveFaction && !sFactionStore.LookupEntry(qinfo->RepObjectiveFaction)) { sLog->outErrorDb("Quest %u has `RepObjectiveFaction` = %u but faction template %u does not exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->RepObjectiveFaction,qinfo->RepObjectiveFaction); + qinfo->GetQuestId(), qinfo->RepObjectiveFaction, qinfo->RepObjectiveFaction); // no changes, quest can't be done for this requirement } if (qinfo->RequiredMinRepFaction && !sFactionStore.LookupEntry(qinfo->RequiredMinRepFaction)) { sLog->outErrorDb("Quest %u has `RequiredMinRepFaction` = %u but faction template %u does not exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->RequiredMinRepFaction,qinfo->RequiredMinRepFaction); + qinfo->GetQuestId(), qinfo->RequiredMinRepFaction, qinfo->RequiredMinRepFaction); // no changes, quest can't be done for this requirement } if (qinfo->RequiredMaxRepFaction && !sFactionStore.LookupEntry(qinfo->RequiredMaxRepFaction)) { sLog->outErrorDb("Quest %u has `RequiredMaxRepFaction` = %u but faction template %u does not exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->RequiredMaxRepFaction,qinfo->RequiredMaxRepFaction); + qinfo->GetQuestId(), qinfo->RequiredMaxRepFaction, qinfo->RequiredMaxRepFaction); // no changes, quest can't be done for this requirement } if (qinfo->RequiredMinRepValue && qinfo->RequiredMinRepValue > ReputationMgr::Reputation_Cap) { sLog->outErrorDb("Quest %u has `RequiredMinRepValue` = %d but max reputation is %u, quest can't be done.", - qinfo->GetQuestId(),qinfo->RequiredMinRepValue,ReputationMgr::Reputation_Cap); + qinfo->GetQuestId(), qinfo->RequiredMinRepValue, ReputationMgr::Reputation_Cap); // no changes, quest can't be done for this requirement } if (qinfo->RequiredMinRepValue && qinfo->RequiredMaxRepValue && qinfo->RequiredMaxRepValue <= qinfo->RequiredMinRepValue) { sLog->outErrorDb("Quest %u has `RequiredMaxRepValue` = %d and `RequiredMinRepValue` = %d, quest can't be done.", - qinfo->GetQuestId(),qinfo->RequiredMaxRepValue,qinfo->RequiredMinRepValue); + qinfo->GetQuestId(), qinfo->RequiredMaxRepValue, qinfo->RequiredMinRepValue); // no changes, quest can't be done for this requirement } if (!qinfo->RepObjectiveFaction && qinfo->RepObjectiveValue > 0) { sLog->outErrorDb("Quest %u has `RepObjectiveValue` = %d but `RepObjectiveFaction` is 0, value has no effect", - qinfo->GetQuestId(),qinfo->RepObjectiveValue); + qinfo->GetQuestId(), qinfo->RepObjectiveValue); // warning } if (!qinfo->RepObjectiveFaction2 && qinfo->RepObjectiveValue2 > 0) { sLog->outErrorDb("Quest %u has `RepObjectiveValue2` = %d but `RepObjectiveFaction2` is 0, value has no effect", - qinfo->GetQuestId(),qinfo->RepObjectiveValue2); + qinfo->GetQuestId(), qinfo->RepObjectiveValue2); // warning } if (!qinfo->RequiredMinRepFaction && qinfo->RequiredMinRepValue > 0) { sLog->outErrorDb("Quest %u has `RequiredMinRepValue` = %d but `RequiredMinRepFaction` is 0, value has no effect", - qinfo->GetQuestId(),qinfo->RequiredMinRepValue); + qinfo->GetQuestId(), qinfo->RequiredMinRepValue); // warning } if (!qinfo->RequiredMaxRepFaction && qinfo->RequiredMaxRepValue > 0) { sLog->outErrorDb("Quest %u has `RequiredMaxRepValue` = %d but `RequiredMaxRepFaction` is 0, value has no effect", - qinfo->GetQuestId(),qinfo->RequiredMaxRepValue); + qinfo->GetQuestId(), qinfo->RequiredMaxRepValue); // warning } if (qinfo->CharTitleId && !sCharTitlesStore.LookupEntry(qinfo->CharTitleId)) { sLog->outErrorDb("Quest %u has `CharTitleId` = %u but CharTitle Id %u does not exist, quest can't be rewarded with title.", - qinfo->GetQuestId(),qinfo->GetCharTitleId(),qinfo->GetCharTitleId()); + qinfo->GetQuestId(), qinfo->GetCharTitleId(), qinfo->GetCharTitleId()); qinfo->CharTitleId = 0; // quest can't reward this title } @@ -4685,20 +4685,20 @@ void ObjectMgr::LoadQuests() if (!sObjectMgr->GetItemTemplate(qinfo->SrcItemId)) { sLog->outErrorDb("Quest %u has `SrcItemId` = %u but item with entry %u does not exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->SrcItemId,qinfo->SrcItemId); + qinfo->GetQuestId(), qinfo->SrcItemId, qinfo->SrcItemId); qinfo->SrcItemId = 0; // quest can't be done for this requirement } else if (qinfo->SrcItemCount == 0) { sLog->outErrorDb("Quest %u has `SrcItemId` = %u but `SrcItemCount` = 0, set to 1 but need fix in DB.", - qinfo->GetQuestId(),qinfo->SrcItemId); + qinfo->GetQuestId(), qinfo->SrcItemId); qinfo->SrcItemCount = 1; // update to 1 for allow quest work for backward compatibility with DB } } else if (qinfo->SrcItemCount>0) { sLog->outErrorDb("Quest %u has `SrcItemId` = 0 but `SrcItemCount` = %u, useless value.", - qinfo->GetQuestId(),qinfo->SrcItemCount); + qinfo->GetQuestId(), qinfo->SrcItemCount); qinfo->SrcItemCount=0; // no quest work changes in fact } @@ -4708,13 +4708,13 @@ void ObjectMgr::LoadQuests() if (!spellInfo) { sLog->outErrorDb("Quest %u has `SrcSpell` = %u but spell %u doesn't exist, quest can't be done.", - qinfo->GetQuestId(),qinfo->SrcSpell,qinfo->SrcSpell); + qinfo->GetQuestId(), qinfo->SrcSpell, qinfo->SrcSpell); qinfo->SrcSpell = 0; // quest can't be done for this requirement } else if (!SpellMgr::IsSpellValid(spellInfo)) { sLog->outErrorDb("Quest %u has `SrcSpell` = %u but spell %u is broken, quest can't be done.", - qinfo->GetQuestId(),qinfo->SrcSpell,qinfo->SrcSpell); + qinfo->GetQuestId(), qinfo->SrcSpell, qinfo->SrcSpell); qinfo->SrcSpell = 0; // quest can't be done for this requirement } } @@ -4727,7 +4727,7 @@ void ObjectMgr::LoadQuests() if (qinfo->ReqItemCount[j] == 0) { sLog->outErrorDb("Quest %u has `ReqItemId%d` = %u but `ReqItemCount%d` = 0, quest can't be done.", - qinfo->GetQuestId(),j+1,id,j+1); + qinfo->GetQuestId(), j+1, id, j+1); // no changes, quest can't be done for this requirement } @@ -4736,14 +4736,14 @@ void ObjectMgr::LoadQuests() if (!sObjectMgr->GetItemTemplate(id)) { sLog->outErrorDb("Quest %u has `ReqItemId%d` = %u but item with entry %u does not exist, quest can't be done.", - qinfo->GetQuestId(),j+1,id,id); + qinfo->GetQuestId(), j+1, id, id); qinfo->ReqItemCount[j] = 0; // prevent incorrect work of quest } } else if (qinfo->ReqItemCount[j]>0) { sLog->outErrorDb("Quest %u has `ReqItemId%d` = 0 but `ReqItemCount%d` = %u, quest can't be done.", - qinfo->GetQuestId(),j+1,j+1,qinfo->ReqItemCount[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->ReqItemCount[j]); qinfo->ReqItemCount[j] = 0; // prevent incorrect work of quest } } @@ -4756,7 +4756,7 @@ void ObjectMgr::LoadQuests() if (!sObjectMgr->GetItemTemplate(id)) { sLog->outErrorDb("Quest %u has `ReqSourceId%d` = %u but item with entry %u does not exist, quest can't be done.", - qinfo->GetQuestId(),j+1,id,id); + qinfo->GetQuestId(), j+1, id, id); // no changes, quest can't be done for this requirement } } @@ -4765,7 +4765,7 @@ void ObjectMgr::LoadQuests() if (qinfo->ReqSourceCount[j]>0) { sLog->outErrorDb("Quest %u has `ReqSourceId%d` = 0 but `ReqSourceCount%d` = %u.", - qinfo->GetQuestId(),j+1,j+1,qinfo->ReqSourceCount[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->ReqSourceCount[j]); // no changes, quest ignore this data } } @@ -4780,7 +4780,7 @@ void ObjectMgr::LoadQuests() if (!spellInfo) { sLog->outErrorDb("Quest %u has `ReqSpellCast%d` = %u but spell %u does not exist, quest can't be done.", - qinfo->GetQuestId(),j+1,id,id); + qinfo->GetQuestId(), j+1, id, id); continue; } @@ -4801,7 +4801,7 @@ void ObjectMgr::LoadQuests() { if (!qinfo->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) { - sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE or SPELL_EFFECT_SEND_EVENT for quest %u and ReqCreatureOrGOId%d = 0, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags or ReqCreatureOrGOId%d must be fixed, quest modified to enable objective.",spellInfo->Id,qinfo->QuestId,j+1,j+1); + sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE or SPELL_EFFECT_SEND_EVENT for quest %u and ReqCreatureOrGOId%d = 0, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags or ReqCreatureOrGOId%d must be fixed, quest modified to enable objective.", spellInfo->Id, qinfo->QuestId, j+1, j+1); // this will prevent quest completing without objective const_cast<Quest*>(qinfo)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); @@ -4810,7 +4810,7 @@ void ObjectMgr::LoadQuests() else { sLog->outErrorDb("Quest %u has `ReqSpellCast%d` = %u and ReqCreatureOrGOId%d = 0 but spell %u does not have SPELL_EFFECT_QUEST_COMPLETE or SPELL_EFFECT_SEND_EVENT effect for this quest, quest can't be done.", - qinfo->GetQuestId(),j+1,id,j+1,id); + qinfo->GetQuestId(), j+1, id, j+1, id); // no changes, quest can't be done for this requirement } } @@ -4823,14 +4823,14 @@ void ObjectMgr::LoadQuests() if (id < 0 && !sObjectMgr->GetGameObjectTemplate(-id)) { sLog->outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = %i but gameobject %u does not exist, quest can't be done.", - qinfo->GetQuestId(),j+1,id,uint32(-id)); + qinfo->GetQuestId(), j+1, id, uint32(-id)); qinfo->ReqCreatureOrGOId[j] = 0; // quest can't be done for this requirement } if (id > 0 && !sObjectMgr->GetCreatureTemplate(id)) { sLog->outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = %i but creature with entry %u does not exist, quest can't be done.", - qinfo->GetQuestId(),j+1,id,uint32(id)); + qinfo->GetQuestId(), j+1, id, uint32(id)); qinfo->ReqCreatureOrGOId[j] = 0; // quest can't be done for this requirement } @@ -4843,14 +4843,14 @@ void ObjectMgr::LoadQuests() if (!qinfo->ReqCreatureOrGOCount[j]) { sLog->outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = %u but `ReqCreatureOrGOCount%d` = 0, quest can't be done.", - qinfo->GetQuestId(),j+1,id,j+1); + qinfo->GetQuestId(), j+1, id, j+1); // no changes, quest can be incorrectly done, but we already report this } } else if (qinfo->ReqCreatureOrGOCount[j]>0) { sLog->outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = 0 but `ReqCreatureOrGOCount%d` = %u.", - qinfo->GetQuestId(),j+1,j+1,qinfo->ReqCreatureOrGOCount[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->ReqCreatureOrGOCount[j]); // no changes, quest ignore this data } } @@ -4863,21 +4863,21 @@ void ObjectMgr::LoadQuests() if (!sObjectMgr->GetItemTemplate(id)) { sLog->outErrorDb("Quest %u has `RewChoiceItemId%d` = %u but item with entry %u does not exist, quest will not reward this item.", - qinfo->GetQuestId(),j+1,id,id); + qinfo->GetQuestId(), j+1, id, id); qinfo->RewChoiceItemId[j] = 0; // no changes, quest will not reward this } if (!qinfo->RewChoiceItemCount[j]) { sLog->outErrorDb("Quest %u has `RewChoiceItemId%d` = %u but `RewChoiceItemCount%d` = 0, quest can't be done.", - qinfo->GetQuestId(),j+1,id,j+1); + qinfo->GetQuestId(), j+1, id, j+1); // no changes, quest can't be done } } else if (qinfo->RewChoiceItemCount[j]>0) { sLog->outErrorDb("Quest %u has `RewChoiceItemId%d` = 0 but `RewChoiceItemCount%d` = %u.", - qinfo->GetQuestId(),j+1,j+1,qinfo->RewChoiceItemCount[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->RewChoiceItemCount[j]); // no changes, quest ignore this data } } @@ -4890,21 +4890,21 @@ void ObjectMgr::LoadQuests() if (!sObjectMgr->GetItemTemplate(id)) { sLog->outErrorDb("Quest %u has `RewItemId%d` = %u but item with entry %u does not exist, quest will not reward this item.", - qinfo->GetQuestId(),j+1,id,id); + qinfo->GetQuestId(), j+1, id, id); qinfo->RewItemId[j] = 0; // no changes, quest will not reward this item } if (!qinfo->RewItemCount[j]) { sLog->outErrorDb("Quest %u has `RewItemId%d` = %u but `RewItemCount%d` = 0, quest will not reward this item.", - qinfo->GetQuestId(),j+1,id,j+1); + qinfo->GetQuestId(), j+1, id, j+1); // no changes } } else if (qinfo->RewItemCount[j]>0) { sLog->outErrorDb("Quest %u has `RewItemId%d` = 0 but `RewItemCount%d` = %u.", - qinfo->GetQuestId(),j+1,j+1,qinfo->RewItemCount[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->RewItemCount[j]); // no changes, quest ignore this data } } @@ -4919,7 +4919,7 @@ void ObjectMgr::LoadQuests() } if (!sFactionStore.LookupEntry(qinfo->RewRepFaction[j])) { - sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(),j+1,qinfo->RewRepFaction[j] ,qinfo->RewRepFaction[j]); + sLog->outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.", qinfo->GetQuestId(), j+1, qinfo->RewRepFaction[j] , qinfo->RewRepFaction[j]); qinfo->RewRepFaction[j] = 0; // quest will not reward this } } @@ -4927,7 +4927,7 @@ void ObjectMgr::LoadQuests() else if (qinfo->RewRepValue[j] != 0) { sLog->outErrorDb("Quest %u has `RewRepFaction%d` = 0 but `RewRepValue%d` = %i.", - qinfo->GetQuestId(),j+1,j+1,qinfo->RewRepValue[j]); + qinfo->GetQuestId(), j+1, j+1, qinfo->RewRepValue[j]); // no changes, quest ignore this data } } @@ -4939,21 +4939,21 @@ void ObjectMgr::LoadQuests() if (!spellInfo) { sLog->outErrorDb("Quest %u has `RewSpell` = %u but spell %u does not exist, spell removed as display reward.", - qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); + qinfo->GetQuestId(), qinfo->RewSpell, qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest } else if (!SpellMgr::IsSpellValid(spellInfo)) { sLog->outErrorDb("Quest %u has `RewSpell` = %u but spell %u is broken, quest will not have a spell reward.", - qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); + qinfo->GetQuestId(), qinfo->RewSpell, qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest } else if (GetTalentSpellCost(qinfo->RewSpell)) { sLog->outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.", - qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); + qinfo->GetQuestId(), qinfo->RewSpell, qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest } } @@ -4965,21 +4965,21 @@ void ObjectMgr::LoadQuests() if (!spellInfo) { sLog->outErrorDb("Quest %u has `RewSpellCast` = %u but spell %u does not exist, quest will not have a spell reward.", - qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); + qinfo->GetQuestId(), qinfo->RewSpellCast, qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player } else if (!SpellMgr::IsSpellValid(spellInfo)) { sLog->outErrorDb("Quest %u has `RewSpellCast` = %u but spell %u is broken, quest will not have a spell reward.", - qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); + qinfo->GetQuestId(), qinfo->RewSpellCast, qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player } else if (GetTalentSpellCost(qinfo->RewSpellCast)) { sLog->outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.", - qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); + qinfo->GetQuestId(), qinfo->RewSpellCast, qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player } } @@ -4989,15 +4989,15 @@ void ObjectMgr::LoadQuests() if (!sMailTemplateStore.LookupEntry(qinfo->RewMailTemplateId)) { sLog->outErrorDb("Quest %u has `RewMailTemplateId` = %u but mail template %u does not exist, quest will not have a mail reward.", - qinfo->GetQuestId(),qinfo->RewMailTemplateId,qinfo->RewMailTemplateId); + qinfo->GetQuestId(), qinfo->RewMailTemplateId, qinfo->RewMailTemplateId); qinfo->RewMailTemplateId = 0; // no mail will send to player qinfo->RewMailDelaySecs = 0; // no mail will send to player } else if (usedMailTemplates.find(qinfo->RewMailTemplateId) != usedMailTemplates.end()) { - std::map<uint32,uint32>::const_iterator used_mt_itr = usedMailTemplates.find(qinfo->RewMailTemplateId); + std::map<uint32, uint32>::const_iterator used_mt_itr = usedMailTemplates.find(qinfo->RewMailTemplateId); sLog->outErrorDb("Quest %u has `RewMailTemplateId` = %u but mail template %u already used for quest %u, quest will not have a mail reward.", - qinfo->GetQuestId(),qinfo->RewMailTemplateId,qinfo->RewMailTemplateId,used_mt_itr->second); + qinfo->GetQuestId(), qinfo->RewMailTemplateId, qinfo->RewMailTemplateId, used_mt_itr->second); qinfo->RewMailTemplateId = 0; // no mail will send to player qinfo->RewMailDelaySecs = 0; // no mail will send to player } @@ -5011,7 +5011,7 @@ void ObjectMgr::LoadQuests() if (qNextItr == mQuestTemplates.end()) { sLog->outErrorDb("Quest %u has `NextQuestInChain` = %u but quest %u does not exist, quest chain will not work.", - qinfo->GetQuestId(),qinfo->NextQuestInChain ,qinfo->NextQuestInChain); + qinfo->GetQuestId(), qinfo->NextQuestInChain , qinfo->NextQuestInChain); qinfo->NextQuestInChain = 0; } else @@ -5073,7 +5073,7 @@ void ObjectMgr::LoadQuests() if (!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) { - sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.",spellInfo->Id,quest_id); + sLog->outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.", spellInfo->Id, quest_id); // this will prevent quest completing without objective const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); @@ -5091,15 +5091,15 @@ void ObjectMgr::LoadQuestLocales() mQuestLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry," - "Title_loc1,Details_loc1,Objectives_loc1,OfferRewardText_loc1,RequestItemsText_loc1,EndText_loc1,CompletedText_loc1,ObjectiveText1_loc1,ObjectiveText2_loc1,ObjectiveText3_loc1,ObjectiveText4_loc1," - "Title_loc2,Details_loc2,Objectives_loc2,OfferRewardText_loc2,RequestItemsText_loc2,EndText_loc2,CompletedText_loc2,ObjectiveText1_loc2,ObjectiveText2_loc2,ObjectiveText3_loc2,ObjectiveText4_loc2," - "Title_loc3,Details_loc3,Objectives_loc3,OfferRewardText_loc3,RequestItemsText_loc3,EndText_loc3,CompletedText_loc3,ObjectiveText1_loc3,ObjectiveText2_loc3,ObjectiveText3_loc3,ObjectiveText4_loc3," - "Title_loc4,Details_loc4,Objectives_loc4,OfferRewardText_loc4,RequestItemsText_loc4,EndText_loc4,CompletedText_loc4,ObjectiveText1_loc4,ObjectiveText2_loc4,ObjectiveText3_loc4,ObjectiveText4_loc4," - "Title_loc5,Details_loc5,Objectives_loc5,OfferRewardText_loc5,RequestItemsText_loc5,EndText_loc5,CompletedText_loc5,ObjectiveText1_loc5,ObjectiveText2_loc5,ObjectiveText3_loc5,ObjectiveText4_loc5," - "Title_loc6,Details_loc6,Objectives_loc6,OfferRewardText_loc6,RequestItemsText_loc6,EndText_loc6,CompletedText_loc6,ObjectiveText1_loc6,ObjectiveText2_loc6,ObjectiveText3_loc6,ObjectiveText4_loc6," - "Title_loc7,Details_loc7,Objectives_loc7,OfferRewardText_loc7,RequestItemsText_loc7,EndText_loc7,CompletedText_loc7,ObjectiveText1_loc7,ObjectiveText2_loc7,ObjectiveText3_loc7,ObjectiveText4_loc7," - "Title_loc8,Details_loc8,Objectives_loc8,OfferRewardText_loc8,RequestItemsText_loc8,EndText_loc8,CompletedText_loc8,ObjectiveText1_loc8,ObjectiveText2_loc8,ObjectiveText3_loc8,ObjectiveText4_loc8" + QueryResult result = WorldDatabase.Query("SELECT entry, " + "Title_loc1, Details_loc1, Objectives_loc1, OfferRewardText_loc1, RequestItemsText_loc1, EndText_loc1, CompletedText_loc1, ObjectiveText1_loc1, ObjectiveText2_loc1, ObjectiveText3_loc1, ObjectiveText4_loc1, " + "Title_loc2, Details_loc2, Objectives_loc2, OfferRewardText_loc2, RequestItemsText_loc2, EndText_loc2, CompletedText_loc2, ObjectiveText1_loc2, ObjectiveText2_loc2, ObjectiveText3_loc2, ObjectiveText4_loc2, " + "Title_loc3, Details_loc3, Objectives_loc3, OfferRewardText_loc3, RequestItemsText_loc3, EndText_loc3, CompletedText_loc3, ObjectiveText1_loc3, ObjectiveText2_loc3, ObjectiveText3_loc3, ObjectiveText4_loc3, " + "Title_loc4, Details_loc4, Objectives_loc4, OfferRewardText_loc4, RequestItemsText_loc4, EndText_loc4, CompletedText_loc4, ObjectiveText1_loc4, ObjectiveText2_loc4, ObjectiveText3_loc4, ObjectiveText4_loc4, " + "Title_loc5, Details_loc5, Objectives_loc5, OfferRewardText_loc5, RequestItemsText_loc5, EndText_loc5, CompletedText_loc5, ObjectiveText1_loc5, ObjectiveText2_loc5, ObjectiveText3_loc5, ObjectiveText4_loc5, " + "Title_loc6, Details_loc6, Objectives_loc6, OfferRewardText_loc6, RequestItemsText_loc6, EndText_loc6, CompletedText_loc6, ObjectiveText1_loc6, ObjectiveText2_loc6, ObjectiveText3_loc6, ObjectiveText4_loc6, " + "Title_loc7, Details_loc7, Objectives_loc7, OfferRewardText_loc7, RequestItemsText_loc7, EndText_loc7, CompletedText_loc7, ObjectiveText1_loc7, ObjectiveText2_loc7, ObjectiveText3_loc7, ObjectiveText4_loc7, " + "Title_loc8, Details_loc8, Objectives_loc8, OfferRewardText_loc8, RequestItemsText_loc8, EndText_loc8, CompletedText_loc8, ObjectiveText1_loc8, ObjectiveText2_loc8, ObjectiveText3_loc8, ObjectiveText4_loc8" " FROM locales_quest"); if (!result) @@ -5170,7 +5170,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) bool isSpellScriptTable = (type == SCRIPTS_SPELL); char buff[125]; - sprintf(buff, "SELECT id,delay,command,datalong,datalong2,dataint,x,y,z,o%s FROM %s", isSpellScriptTable ? ",effIndex" : "", tableName.c_str()); + sprintf(buff, "SELECT id, delay, command, datalong, datalong2, dataint, x, y, z, o%s FROM %s", isSpellScriptTable ? ", effIndex" : "", tableName.c_str()); QueryResult result = WorldDatabase.Query(buff); if (!result) @@ -5399,7 +5399,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) tableName.c_str(), tmp.RemoveAura.SpellID, tmp.id); continue; } - if (tmp.RemoveAura.Flags & ~0x1) // 1 bits (0,1) + if (tmp.RemoveAura.Flags & ~0x1) // 1 bits (0, 1) { sLog->outErrorDb("Table `%s` using unknown flags in datalong2 (%u) in SCRIPT_COMMAND_REMOVE_AURA for script id %u", tableName.c_str(), tmp.RemoveAura.Flags, tmp.id); @@ -5422,7 +5422,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) tableName.c_str(), tmp.CastSpell.Flags, tmp.id); continue; } - if (tmp.CastSpell.Flags != 4 && tmp.CastSpell.CreatureEntry & ~0x1) // 1 bit (0,1) + if (tmp.CastSpell.Flags != 4 && tmp.CastSpell.CreatureEntry & ~0x1) // 1 bit (0, 1) { sLog->outErrorDb("Table `%s` using unknown flags in dataint (%u) in SCRIPT_COMMAND_CAST_SPELL for script id %u", tableName.c_str(), tmp.CastSpell.CreatureEntry, tmp.id); @@ -5480,7 +5480,7 @@ void ObjectMgr::LoadGameObjectScripts() for (ScriptMapMap::const_iterator itr = sGameObjectScripts.begin(); itr != sGameObjectScripts.end(); ++itr) { if (!GetGOData(itr->first)) - sLog->outErrorDb("Table `gameobject_scripts` has not existing gameobject (GUID: %u) as script id",itr->first); + sLog->outErrorDb("Table `gameobject_scripts` has not existing gameobject (GUID: %u) as script id", itr->first); } } @@ -5492,7 +5492,7 @@ void ObjectMgr::LoadQuestEndScripts() for (ScriptMapMap::const_iterator itr = sQuestEndScripts.begin(); itr != sQuestEndScripts.end(); ++itr) { if (!GetQuestTemplate(itr->first)) - sLog->outErrorDb("Table `quest_end_scripts` has not existing quest (Id: %u) as script id",itr->first); + sLog->outErrorDb("Table `quest_end_scripts` has not existing quest (Id: %u) as script id", itr->first); } } @@ -5504,7 +5504,7 @@ void ObjectMgr::LoadQuestStartScripts() for (ScriptMapMap::const_iterator itr = sQuestStartScripts.begin(); itr != sQuestStartScripts.end(); ++itr) { if (!GetQuestTemplate(itr->first)) - sLog->outErrorDb("Table `quest_start_scripts` has not existing quest (Id: %u) as script id",itr->first); + sLog->outErrorDb("Table `quest_start_scripts` has not existing quest (Id: %u) as script id", itr->first); } } @@ -5645,7 +5645,7 @@ void ObjectMgr::LoadSpellScriptNames() SpellEntry const* spellEntry = sSpellStore.LookupEntry(spellId); if (!spellEntry) { - sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) does not exist in `Spell.dbc`.",scriptName,fields[0].GetInt32()); + sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) does not exist in `Spell.dbc`.", scriptName, fields[0].GetInt32()); continue; } @@ -5653,7 +5653,7 @@ void ObjectMgr::LoadSpellScriptNames() { if (sSpellMgr->GetFirstSpellInChain(spellId) != uint32(spellId)) { - sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) is not first rank of spell.",scriptName,fields[0].GetInt32()); + sLog->outErrorDb("Scriptname:`%s` spell (spell_id:%d) is not first rank of spell.", scriptName, fields[0].GetInt32()); continue; } while(spellId) @@ -5794,7 +5794,7 @@ void ObjectMgr::LoadPageTextLocales() mPageTextLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,text_loc1,text_loc2,text_loc3,text_loc4,text_loc5,text_loc6,text_loc7,text_loc8 FROM locales_page_text"); + QueryResult result = WorldDatabase.Query("SELECT entry, text_loc1, text_loc2, text_loc3, text_loc4, text_loc5, text_loc6, text_loc7, text_loc8 FROM locales_page_text"); if (!result) return; @@ -6017,15 +6017,15 @@ void ObjectMgr::LoadNpcTextLocales() mNpcTextLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry," - "Text0_0_loc1,Text0_1_loc1,Text1_0_loc1,Text1_1_loc1,Text2_0_loc1,Text2_1_loc1,Text3_0_loc1,Text3_1_loc1,Text4_0_loc1,Text4_1_loc1,Text5_0_loc1,Text5_1_loc1,Text6_0_loc1,Text6_1_loc1,Text7_0_loc1,Text7_1_loc1," - "Text0_0_loc2,Text0_1_loc2,Text1_0_loc2,Text1_1_loc2,Text2_0_loc2,Text2_1_loc2,Text3_0_loc2,Text3_1_loc1,Text4_0_loc2,Text4_1_loc2,Text5_0_loc2,Text5_1_loc2,Text6_0_loc2,Text6_1_loc2,Text7_0_loc2,Text7_1_loc2," - "Text0_0_loc3,Text0_1_loc3,Text1_0_loc3,Text1_1_loc3,Text2_0_loc3,Text2_1_loc3,Text3_0_loc3,Text3_1_loc1,Text4_0_loc3,Text4_1_loc3,Text5_0_loc3,Text5_1_loc3,Text6_0_loc3,Text6_1_loc3,Text7_0_loc3,Text7_1_loc3," - "Text0_0_loc4,Text0_1_loc4,Text1_0_loc4,Text1_1_loc4,Text2_0_loc4,Text2_1_loc4,Text3_0_loc4,Text3_1_loc1,Text4_0_loc4,Text4_1_loc4,Text5_0_loc4,Text5_1_loc4,Text6_0_loc4,Text6_1_loc4,Text7_0_loc4,Text7_1_loc4," - "Text0_0_loc5,Text0_1_loc5,Text1_0_loc5,Text1_1_loc5,Text2_0_loc5,Text2_1_loc5,Text3_0_loc5,Text3_1_loc1,Text4_0_loc5,Text4_1_loc5,Text5_0_loc5,Text5_1_loc5,Text6_0_loc5,Text6_1_loc5,Text7_0_loc5,Text7_1_loc5," - "Text0_0_loc6,Text0_1_loc6,Text1_0_loc6,Text1_1_loc6,Text2_0_loc6,Text2_1_loc6,Text3_0_loc6,Text3_1_loc1,Text4_0_loc6,Text4_1_loc6,Text5_0_loc6,Text5_1_loc6,Text6_0_loc6,Text6_1_loc6,Text7_0_loc6,Text7_1_loc6," - "Text0_0_loc7,Text0_1_loc7,Text1_0_loc7,Text1_1_loc7,Text2_0_loc7,Text2_1_loc7,Text3_0_loc7,Text3_1_loc1,Text4_0_loc7,Text4_1_loc7,Text5_0_loc7,Text5_1_loc7,Text6_0_loc7,Text6_1_loc7,Text7_0_loc7,Text7_1_loc7, " - "Text0_0_loc8,Text0_1_loc8,Text1_0_loc8,Text1_1_loc8,Text2_0_loc8,Text2_1_loc8,Text3_0_loc8,Text3_1_loc1,Text4_0_loc8,Text4_1_loc8,Text5_0_loc8,Text5_1_loc8,Text6_0_loc8,Text6_1_loc8,Text7_0_loc8,Text7_1_loc8 " + QueryResult result = WorldDatabase.Query("SELECT entry, " + "Text0_0_loc1, Text0_1_loc1, Text1_0_loc1, Text1_1_loc1, Text2_0_loc1, Text2_1_loc1, Text3_0_loc1, Text3_1_loc1, Text4_0_loc1, Text4_1_loc1, Text5_0_loc1, Text5_1_loc1, Text6_0_loc1, Text6_1_loc1, Text7_0_loc1, Text7_1_loc1, " + "Text0_0_loc2, Text0_1_loc2, Text1_0_loc2, Text1_1_loc2, Text2_0_loc2, Text2_1_loc2, Text3_0_loc2, Text3_1_loc1, Text4_0_loc2, Text4_1_loc2, Text5_0_loc2, Text5_1_loc2, Text6_0_loc2, Text6_1_loc2, Text7_0_loc2, Text7_1_loc2, " + "Text0_0_loc3, Text0_1_loc3, Text1_0_loc3, Text1_1_loc3, Text2_0_loc3, Text2_1_loc3, Text3_0_loc3, Text3_1_loc1, Text4_0_loc3, Text4_1_loc3, Text5_0_loc3, Text5_1_loc3, Text6_0_loc3, Text6_1_loc3, Text7_0_loc3, Text7_1_loc3, " + "Text0_0_loc4, Text0_1_loc4, Text1_0_loc4, Text1_1_loc4, Text2_0_loc4, Text2_1_loc4, Text3_0_loc4, Text3_1_loc1, Text4_0_loc4, Text4_1_loc4, Text5_0_loc4, Text5_1_loc4, Text6_0_loc4, Text6_1_loc4, Text7_0_loc4, Text7_1_loc4, " + "Text0_0_loc5, Text0_1_loc5, Text1_0_loc5, Text1_1_loc5, Text2_0_loc5, Text2_1_loc5, Text3_0_loc5, Text3_1_loc1, Text4_0_loc5, Text4_1_loc5, Text5_0_loc5, Text5_1_loc5, Text6_0_loc5, Text6_1_loc5, Text7_0_loc5, Text7_1_loc5, " + "Text0_0_loc6, Text0_1_loc6, Text1_0_loc6, Text1_1_loc6, Text2_0_loc6, Text2_1_loc6, Text3_0_loc6, Text3_1_loc1, Text4_0_loc6, Text4_1_loc6, Text5_0_loc6, Text5_1_loc6, Text6_0_loc6, Text6_1_loc6, Text7_0_loc6, Text7_1_loc6, " + "Text0_0_loc7, Text0_1_loc7, Text1_0_loc7, Text1_1_loc7, Text2_0_loc7, Text2_1_loc7, Text3_0_loc7, Text3_1_loc1, Text4_0_loc7, Text4_1_loc7, Text5_0_loc7, Text5_1_loc7, Text6_0_loc7, Text6_1_loc7, Text7_0_loc7, Text7_1_loc7, " + "Text0_0_loc8, Text0_1_loc8, Text1_0_loc8, Text1_1_loc8, Text2_0_loc8, Text2_1_loc8, Text3_0_loc8, Text3_1_loc1, Text4_0_loc8, Text4_1_loc8, Text5_0_loc8, Text5_1_loc8, Text6_0_loc8, Text6_1_loc8, Text7_0_loc8, Text7_1_loc8 " " FROM locales_npc_text"); if (!result) @@ -6188,7 +6188,7 @@ void ObjectMgr::LoadQuestAreaTriggers() mQuestAreaTriggerMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT id,quest FROM areatrigger_involvedrelation"); + QueryResult result = WorldDatabase.Query("SELECT id, quest FROM areatrigger_involvedrelation"); if (!result) { @@ -6211,7 +6211,7 @@ void ObjectMgr::LoadQuestAreaTriggers() AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(trigger_ID); if (!atEntry) { - sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",trigger_ID); + sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.", trigger_ID); continue; } @@ -6219,13 +6219,13 @@ void ObjectMgr::LoadQuestAreaTriggers() if (!quest) { - sLog->outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not existing quest %u",trigger_ID,quest_ID); + sLog->outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not existing quest %u", trigger_ID, quest_ID); continue; } if (!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) { - sLog->outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not quest %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Trigger or quest flags must be fixed, quest modified to require objective.",trigger_ID,quest_ID); + sLog->outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not quest %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Trigger or quest flags must be fixed, quest modified to require objective.", trigger_ID, quest_ID); // this will prevent quest completing without objective const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); @@ -6269,7 +6269,7 @@ void ObjectMgr::LoadTavernAreaTriggers() AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if (!atEntry) { - sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID); + sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.", Trigger_ID); continue; } @@ -6308,7 +6308,7 @@ void ObjectMgr::LoadAreaTriggerScripts() AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if (!atEntry) { - sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID); + sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.", Trigger_ID); continue; } mAreaTriggerScripts[Trigger_ID] = GetScriptId(scriptName); @@ -6428,7 +6428,7 @@ void ObjectMgr::LoadGraveyardZones() mGraveYardMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT id,ghost_zone,faction FROM game_graveyard_zone"); + QueryResult result = WorldDatabase.Query("SELECT id, ghost_zone, faction FROM game_graveyard_zone"); if (!result) { @@ -6452,31 +6452,31 @@ void ObjectMgr::LoadGraveyardZones() WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(safeLocId); if (!entry) { - sLog->outErrorDb("Table `game_graveyard_zone` has a record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.",safeLocId); + sLog->outErrorDb("Table `game_graveyard_zone` has a record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.", safeLocId); continue; } AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId); if (!areaEntry) { - sLog->outErrorDb("Table `game_graveyard_zone` has a record for not existing zone id (%u), skipped.",zoneId); + sLog->outErrorDb("Table `game_graveyard_zone` has a record for not existing zone id (%u), skipped.", zoneId); continue; } if (areaEntry->zone != 0) { - sLog->outErrorDb("Table `game_graveyard_zone` has a record for subzone id (%u) instead of zone, skipped.",zoneId); + sLog->outErrorDb("Table `game_graveyard_zone` has a record for subzone id (%u) instead of zone, skipped.", zoneId); continue; } if (team != 0 && team != HORDE && team != ALLIANCE) { - sLog->outErrorDb("Table `game_graveyard_zone` has a record for non player faction (%u), skipped.",team); + sLog->outErrorDb("Table `game_graveyard_zone` has a record for non player faction (%u), skipped.", team); continue; } - if (!AddGraveYardLink(safeLocId,zoneId,team,false)) - sLog->outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId); + if (!AddGraveYardLink(safeLocId, zoneId, team, false)) + sLog->outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.", safeLocId, zoneId); } while (result->NextRow()); sLog->outString(">> Loaded %u graveyard-zone links in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -6486,7 +6486,7 @@ void ObjectMgr::LoadGraveyardZones() WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team) { // search for zone associated closest graveyard - uint32 zoneId = sMapMgr->GetZoneId(MapId,x,y,z); + uint32 zoneId = sMapMgr->GetZoneId(MapId, x, y, z); if (!zoneId) { @@ -6496,7 +6496,7 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float } // Simulate std. algorithm: - // found some graveyard associated to (ghost_zone,ghost_map) + // found some graveyard associated to (ghost_zone, ghost_map) // // if mapId == graveyard.mapId (ghost in plain zone or city or battleground) and search graveyard at same map // then check faction @@ -6509,7 +6509,7 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float if (graveLow == graveUp && !map->IsBattleArena()) { - sLog->outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team); + sLog->outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.", zoneId, team); return NULL; } @@ -6535,7 +6535,7 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(data.safeLocId); if (!entry) { - sLog->outErrorDb("Table `game_graveyard_zone` has record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.",data.safeLocId); + sLog->outErrorDb("Table `game_graveyard_zone` has record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.", data.safeLocId); continue; } @@ -6622,7 +6622,7 @@ GraveYardData const* ObjectMgr::FindGraveYardData(uint32 id, uint32 zoneId) bool ObjectMgr::AddGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool inDB) { - if (FindGraveYardData(id,zoneId)) + if (FindGraveYardData(id, zoneId)) return false; // add link to loaded data @@ -6630,13 +6630,13 @@ bool ObjectMgr::AddGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool inD data.safeLocId = id; data.team = team; - mGraveYardMap.insert(GraveYardMap::value_type(zoneId,data)); + mGraveYardMap.insert(GraveYardMap::value_type(zoneId, data)); // add link to DB if (inDB) { - WorldDatabase.PExecute("INSERT INTO game_graveyard_zone (id,ghost_zone,faction) " - "VALUES ('%u', '%u','%u')",id,zoneId,team); + WorldDatabase.PExecute("INSERT INTO game_graveyard_zone (id, ghost_zone, faction) " + "VALUES ('%u', '%u', '%u')", id, zoneId, team); } return true; @@ -6648,7 +6648,7 @@ void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool GraveYardMap::iterator graveUp = mGraveYardMap.upper_bound(zoneId); if (graveLow == graveUp) { - //sLog->outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team); + //sLog->outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.", zoneId, team); return; } @@ -6683,7 +6683,7 @@ void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool // remove link from DB if (inDB) { - WorldDatabase.PExecute("DELETE FROM game_graveyard_zone WHERE id = '%u' AND ghost_zone = '%u' AND faction = '%u'",id,zoneId,team); + WorldDatabase.PExecute("DELETE FROM game_graveyard_zone WHERE id = '%u' AND ghost_zone = '%u' AND faction = '%u'", id, zoneId, team); } return; @@ -6725,20 +6725,20 @@ void ObjectMgr::LoadAreaTriggerTeleports() AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if (!atEntry) { - sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID); + sLog->outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.", Trigger_ID); continue; } MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId); if (!mapEntry) { - sLog->outErrorDb("Area trigger (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Trigger_ID,at.target_mapId); + sLog->outErrorDb("Area trigger (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.", Trigger_ID, at.target_mapId); continue; } if (at.target_X == 0 && at.target_Y == 0 && at.target_Z == 0) { - sLog->outErrorDb("Area trigger (ID:%u) target coordinates not provided.",Trigger_ID); + sLog->outErrorDb("Area trigger (ID:%u) target coordinates not provided.", Trigger_ID); continue; } @@ -6775,7 +6775,7 @@ void ObjectMgr::LoadAccessRequirements() uint32 mapid = fields[0].GetUInt32(); uint8 difficulty = fields[1].GetUInt8(); - uint32 requirement_ID = MAKE_PAIR32(mapid,difficulty); + uint32 requirement_ID = MAKE_PAIR32(mapid, difficulty); AccessRequirement ar; @@ -7087,10 +7087,10 @@ void ObjectMgr::LoadGameObjectLocales() mGameObjectLocaleMap.clear(); // need for reload case - QueryResult result = WorldDatabase.Query("SELECT entry," - "name_loc1,name_loc2,name_loc3,name_loc4,name_loc5,name_loc6,name_loc7,name_loc8," - "castbarcaption_loc1,castbarcaption_loc2,castbarcaption_loc3,castbarcaption_loc4," - "castbarcaption_loc5,castbarcaption_loc6,castbarcaption_loc7,castbarcaption_loc8 FROM locales_gameobject"); + QueryResult result = WorldDatabase.Query("SELECT entry, " + "name_loc1, name_loc2, name_loc3, name_loc4, name_loc5, name_loc6, name_loc7, name_loc8, " + "castbarcaption_loc1, castbarcaption_loc2, castbarcaption_loc3, castbarcaption_loc4, " + "castbarcaption_loc5, castbarcaption_loc6, castbarcaption_loc7, castbarcaption_loc8 FROM locales_gameobject"); if (!result) return; @@ -7121,41 +7121,41 @@ void ObjectMgr::LoadGameObjectLocales() sLog->outString(); } -inline void CheckGOLockId(GameObjectTemplate* goInfo,uint32 dataN,uint32 N) +inline void CheckGOLockId(GameObjectTemplate* goInfo, uint32 dataN, uint32 N) { if (sLockStore.LookupEntry(dataN)) return; sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but lock (Id: %u) not found.", - goInfo->entry,goInfo->type,N,goInfo->door.lockId,goInfo->door.lockId); + goInfo->entry, goInfo->type, N, goInfo->door.lockId, goInfo->door.lockId); } -inline void CheckGOLinkedTrapId(GameObjectTemplate const* goInfo,uint32 dataN,uint32 N) +inline void CheckGOLinkedTrapId(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N) { if (GameObjectTemplate const* trapInfo = sObjectMgr->GetGameObjectTemplate(dataN)) { if (trapInfo->type != GAMEOBJECT_TYPE_TRAP) sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but GO (Entry %u) have not GAMEOBJECT_TYPE_TRAP (%u) type.", - goInfo->entry,goInfo->type,N,dataN,dataN,GAMEOBJECT_TYPE_TRAP); + goInfo->entry, goInfo->type, N, dataN, dataN, GAMEOBJECT_TYPE_TRAP); } } -inline void CheckGOSpellId(GameObjectTemplate const* goInfo,uint32 dataN,uint32 N) +inline void CheckGOSpellId(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N) { if (sSpellStore.LookupEntry(dataN)) return; sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but Spell (Entry %u) not exist.", - goInfo->entry,goInfo->type,N,dataN,dataN); + goInfo->entry, goInfo->type, N, dataN, dataN); } -inline void CheckAndFixGOChairHeightId(GameObjectTemplate const* goInfo,uint32 const& dataN,uint32 N) +inline void CheckAndFixGOChairHeightId(GameObjectTemplate const* goInfo, uint32 const& dataN, uint32 N) { if (dataN <= (UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR)) return; sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but correct chair height in range 0..%i.", - goInfo->entry,goInfo->type,N,dataN,UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR); + goInfo->entry, goInfo->type, N, dataN, UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR); // prevent client and server unexpected work const_cast<uint32&>(dataN) = 0; @@ -7170,14 +7170,14 @@ inline void CheckGONoDamageImmuneId(GameObjectTemplate* goTemplate, uint32 dataN sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but expected boolean (0/1) noDamageImmune field value.", goTemplate->entry, goTemplate->type, N, dataN); } -inline void CheckGOConsumable(GameObjectTemplate const* goInfo,uint32 dataN,uint32 N) +inline void CheckGOConsumable(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N) { // 0/1 correct values if (dataN <= 1) return; sLog->outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but expected boolean (0/1) consumable field value.", - goInfo->entry,goInfo->type,N,dataN); + goInfo->entry, goInfo->type, N, dataN); } void ObjectMgr::LoadGameObjectTemplate() @@ -7417,7 +7417,7 @@ void ObjectMgr::LoadPetNames() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT word,entry,half FROM pet_name_generation"); + QueryResult result = WorldDatabase.Query("SELECT word, entry, half FROM pet_name_generation"); if (!result) { @@ -7593,7 +7593,7 @@ void ObjectMgr::LoadReputationOnKill() uint32 count = 0; // 0 1 2 - QueryResult result = WorldDatabase.Query("SELECT creature_id, RewOnKillRepFaction1, RewOnKillRepFaction2," + QueryResult result = WorldDatabase.Query("SELECT creature_id, RewOnKillRepFaction1, RewOnKillRepFaction2, " // 3 4 5 6 7 8 9 "IsTeamAward1, MaxStanding1, RewOnKillRepValue1, IsTeamAward2, MaxStanding2, RewOnKillRepValue2, TeamDependent " "FROM creature_onkill_reputation"); @@ -7802,9 +7802,9 @@ void ObjectMgr::LoadPointsOfInterest() POI.data = fields[5].GetUInt32(); POI.icon_name = fields[6].GetString(); - if (!Trinity::IsValidMapCoord(POI.x,POI.y)) + if (!Trinity::IsValidMapCoord(POI.x, POI.y)) { - sLog->outErrorDb("Table `points_of_interest` (Entry: %u) have invalid coordinates (X: %f Y: %f), ignored.",point_id,POI.x,POI.y); + sLog->outErrorDb("Table `points_of_interest` (Entry: %u) have invalid coordinates (X: %f Y: %f), ignored.", point_id, POI.x, POI.y); continue; } @@ -8146,14 +8146,14 @@ void ObjectMgr::DeleteGOData(uint32 guid) void ObjectMgr::AddCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid, uint32 instance) { // corpses are always added to spawn mode 0 and they are spawned by their instance id - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid,0)][cellid]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid, 0)][cellid]; cell_guids.corpses[player_guid] = instance; } void ObjectMgr::DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid) { // corpses are always added to spawn mode 0 and they are spawned by their instance id - CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid,0)][cellid]; + CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid, 0)][cellid]; cell_guids.corpses.erase(player_guid); } @@ -8211,9 +8211,9 @@ void ObjectMgr::LoadGameobjectQuestRelations() { GameObjectTemplate const* goInfo = GetGameObjectTemplate(itr->first); if (!goInfo) - sLog->outErrorDb("Table `gameobject_questrelation` have data for not existed gameobject entry (%u) and existed quest %u",itr->first,itr->second); + sLog->outErrorDb("Table `gameobject_questrelation` have data for not existed gameobject entry (%u) and existed quest %u", itr->first, itr->second); else if (goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER) - sLog->outErrorDb("Table `gameobject_questrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second); + sLog->outErrorDb("Table `gameobject_questrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER", itr->first, itr->second); } } @@ -8225,9 +8225,9 @@ void ObjectMgr::LoadGameobjectInvolvedRelations() { GameObjectTemplate const* goInfo = GetGameObjectTemplate(itr->first); if (!goInfo) - sLog->outErrorDb("Table `gameobject_involvedrelation` have data for not existed gameobject entry (%u) and existed quest %u",itr->first,itr->second); + sLog->outErrorDb("Table `gameobject_involvedrelation` have data for not existed gameobject entry (%u) and existed quest %u", itr->first, itr->second); else if (goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER) - sLog->outErrorDb("Table `gameobject_involvedrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second); + sLog->outErrorDb("Table `gameobject_involvedrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER", itr->first, itr->second); } } @@ -8239,9 +8239,9 @@ void ObjectMgr::LoadCreatureQuestRelations() { CreatureTemplate const* cInfo = GetCreatureTemplate(itr->first); if (!cInfo) - sLog->outErrorDb("Table `creature_questrelation` have data for not existed creature entry (%u) and existed quest %u",itr->first,itr->second); + sLog->outErrorDb("Table `creature_questrelation` have data for not existed creature entry (%u) and existed quest %u", itr->first, itr->second); else if (!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER)) - sLog->outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second); + sLog->outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER", itr->first, itr->second); } } @@ -8253,9 +8253,9 @@ void ObjectMgr::LoadCreatureInvolvedRelations() { CreatureTemplate const* cInfo = GetCreatureTemplate(itr->first); if (!cInfo) - sLog->outErrorDb("Table `creature_involvedrelation` have data for not existed creature entry (%u) and existed quest %u",itr->first,itr->second); + sLog->outErrorDb("Table `creature_involvedrelation` have data for not existed creature entry (%u) and existed quest %u", itr->first, itr->second); else if (!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER)) - sLog->outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second); + sLog->outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER", itr->first, itr->second); } } @@ -8283,7 +8283,7 @@ void ObjectMgr::LoadReservedPlayersNames() std::string name= fields[0].GetString(); std::wstring wstr; - if (!Utf8toWStr (name,wstr)) + if (!Utf8toWStr (name, wstr)) { sLog->outError("Table `reserved_name` have invalid name: %s", name.c_str()); continue; @@ -8303,7 +8303,7 @@ void ObjectMgr::LoadReservedPlayersNames() bool ObjectMgr::IsReservedName(const std::string& name) const { std::wstring wstr; - if (!Utf8toWStr (name,wstr)) + if (!Utf8toWStr (name, wstr)) return false; wstrToLower(wstr); @@ -8352,11 +8352,11 @@ bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bo { if (strictMask == 0) // any language, ignore realm { - if (isExtendedLatinString(wstr,numericOrSpace)) + if (isExtendedLatinString(wstr, numericOrSpace)) return true; - if (isCyrillicString(wstr,numericOrSpace)) + if (isCyrillicString(wstr, numericOrSpace)) return true; - if (isEastAsianString(wstr,numericOrSpace)) + if (isEastAsianString(wstr, numericOrSpace)) return true; return false; } @@ -8365,19 +8365,19 @@ bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bo { LanguageType lt = GetRealmLanguageType(create); if (lt & LT_EXTENDEN_LATIN) - if (isExtendedLatinString(wstr,numericOrSpace)) + if (isExtendedLatinString(wstr, numericOrSpace)) return true; if (lt & LT_CYRILLIC) - if (isCyrillicString(wstr,numericOrSpace)) + if (isCyrillicString(wstr, numericOrSpace)) return true; if (lt & LT_EAST_ASIA) - if (isEastAsianString(wstr,numericOrSpace)) + if (isEastAsianString(wstr, numericOrSpace)) return true; } if (strictMask & 0x1) // basic Latin { - if (isBasicLatinString(wstr,numericOrSpace)) + if (isBasicLatinString(wstr, numericOrSpace)) return true; } @@ -8387,7 +8387,7 @@ bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bo uint8 ObjectMgr::CheckPlayerName(const std::string& name, bool create) { std::wstring wname; - if (!Utf8toWStr(name,wname)) + if (!Utf8toWStr(name, wname)) return CHAR_NAME_INVALID_CHARACTER; if (wname.size() > MAX_PLAYER_NAME) @@ -8398,7 +8398,7 @@ uint8 ObjectMgr::CheckPlayerName(const std::string& name, bool create) return CHAR_NAME_TOO_SHORT; uint32 strictMask = sWorld->getIntConfig(CONFIG_STRICT_PLAYER_NAMES); - if (!isValidString(wname,strictMask,false,create)) + if (!isValidString(wname, strictMask, false, create)) return CHAR_NAME_MIXED_LANGUAGES; return CHAR_NAME_SUCCESS; @@ -8407,7 +8407,7 @@ uint8 ObjectMgr::CheckPlayerName(const std::string& name, bool create) bool ObjectMgr::IsValidCharterName(const std::string& name) { std::wstring wname; - if (!Utf8toWStr(name,wname)) + if (!Utf8toWStr(name, wname)) return false; if (wname.size() > MAX_CHARTER_NAME) @@ -8419,13 +8419,13 @@ bool ObjectMgr::IsValidCharterName(const std::string& name) uint32 strictMask = sWorld->getIntConfig(CONFIG_STRICT_CHARTER_NAMES); - return isValidString(wname,strictMask,true); + return isValidString(wname, strictMask, true); } PetNameInvalidReason ObjectMgr::CheckPetName(const std::string& name) { std::wstring wname; - if (!Utf8toWStr(name,wname)) + if (!Utf8toWStr(name, wname)) return PET_NAME_INVALID; if (wname.size() > MAX_PET_NAME) @@ -8436,7 +8436,7 @@ PetNameInvalidReason ObjectMgr::CheckPetName(const std::string& name) return PET_NAME_TOO_SHORT; uint32 strictMask = sWorld->getIntConfig(CONFIG_STRICT_PET_NAMES); - if (!isValidString(wname,strictMask,false)) + if (!isValidString(wname, strictMask, false)) return PET_NAME_MIXED_LANGUAGES; return PET_NAME_SUCCESS; @@ -8514,12 +8514,12 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max { if (end_value >= start_value) { - sLog->outErrorDb("Table '%s' attempt loaded with invalid range (%d - %d), strings not loaded.",table,min_value,max_value); + sLog->outErrorDb("Table '%s' attempt loaded with invalid range (%d - %d), strings not loaded.", table, min_value, max_value); return false; } - // real range (max+1,min+1) exaple: (-10,-1000) -> -999...-10+1 - std::swap(start_value,end_value); + // real range (max+1, min+1) exaple: (-10, -1000) -> -999...-10+1 + std::swap(start_value, end_value); ++start_value; ++end_value; } @@ -8527,7 +8527,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max { if (start_value >= end_value) { - sLog->outErrorDb("Table '%s' attempt loaded with invalid range (%d - %d), strings not loaded.",table,min_value,max_value); + sLog->outErrorDb("Table '%s' attempt loaded with invalid range (%d - %d), strings not loaded.", table, min_value, max_value); return false; } } @@ -8541,15 +8541,15 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max ++itr; } - QueryResult result = WorldDatabase.PQuery("SELECT entry,content_default,content_loc1,content_loc2,content_loc3,content_loc4,content_loc5,content_loc6,content_loc7,content_loc8 FROM %s",table); + QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8 FROM %s", table); if (!result) { if (min_value == MIN_TRINITY_STRING_ID) // error only in case internal strings - sLog->outErrorDb(">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.",table); + sLog->outErrorDb(">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.", table); else - sLog->outString(">> Loaded 0 string templates. DB table `%s` is empty.",table); + sLog->outString(">> Loaded 0 string templates. DB table `%s` is empty.", table); sLog->outString(); return false; } @@ -8564,12 +8564,12 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max if (entry == 0) { - sLog->outErrorDb("Table `%s` contain reserved entry 0, ignored.",table); + sLog->outErrorDb("Table `%s` contain reserved entry 0, ignored.", table); continue; } else if (entry < start_value || entry >= end_value) { - sLog->outErrorDb("Table `%s` contain entry %i out of allowed range (%d - %d), ignored.",table,entry,min_value,max_value); + sLog->outErrorDb("Table `%s` contain entry %i out of allowed range (%d - %d), ignored.", table, entry, min_value, max_value); continue; } @@ -8577,7 +8577,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max if (data.Content.size() > 0) { - sLog->outErrorDb("Table `%s` contain data for already loaded entry %i (from another table?), ignored.",table,entry); + sLog->outErrorDb("Table `%s` contain data for already loaded entry %i (from another table?), ignored.", table, entry); continue; } @@ -8611,9 +8611,9 @@ const char *ObjectMgr::GetTrinityString(int32 entry, LocaleConstant locale_idx) } if (entry > 0) - sLog->outErrorDb("Entry %i not found in `trinity_string` table.",entry); + sLog->outErrorDb("Entry %i not found in `trinity_string` table.", entry); else - sLog->outErrorDb("Trinity string entry %i not found in DB.",entry); + sLog->outErrorDb("Trinity string entry %i not found in DB.", entry); return "<error>"; } @@ -8623,7 +8623,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel() mFishingBaseForArea.clear(); // for reload case - QueryResult result = WorldDatabase.Query("SELECT entry,skill FROM skill_fishing_base_level"); + QueryResult result = WorldDatabase.Query("SELECT entry, skill FROM skill_fishing_base_level"); if (!result) { @@ -8644,7 +8644,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel() AreaTableEntry const* fArea = GetAreaEntryByAreaID(entry); if (!fArea) { - sLog->outErrorDb("AreaId %u defined in `skill_fishing_base_level` does not exist",entry); + sLog->outErrorDb("AreaId %u defined in `skill_fishing_base_level` does not exist", entry); continue; } @@ -8662,10 +8662,10 @@ bool ObjectMgr::CheckDeclinedNames(std::wstring mainpart, DeclinedName const& na for (uint8 i =0; i < MAX_DECLINED_NAME_CASES; ++i) { std::wstring wname; - if (!Utf8toWStr(names.name[i],wname)) + if (!Utf8toWStr(names.name[i], wname)) return false; - if (mainpart != GetMainPartOfName(wname,i+1)) + if (mainpart != GetMainPartOfName(wname, i+1)) return false; } return true; @@ -8681,7 +8681,7 @@ uint32 ObjectMgr::GetAreaTriggerScriptId(uint32 trigger_id) SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id) { - return SpellScriptsBounds(mSpellScripts.lower_bound(spell_id),mSpellScripts.upper_bound(spell_id)); + return SpellScriptsBounds(mSpellScripts.lower_bound(spell_id), mSpellScripts.upper_bound(spell_id)); } SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial) @@ -8749,15 +8749,15 @@ void ObjectMgr::LoadGameTele() gt.mapId = fields[5].GetUInt32(); gt.name = fields[6].GetString(); - if (!MapManager::IsValidMapCoord(gt.mapId,gt.position_x,gt.position_y,gt.position_z,gt.orientation)) + if (!MapManager::IsValidMapCoord(gt.mapId, gt.position_x, gt.position_y, gt.position_z, gt.orientation)) { - sLog->outErrorDb("Wrong position for id %u (name: %s) in `game_tele` table, ignoring.",id,gt.name.c_str()); + sLog->outErrorDb("Wrong position for id %u (name: %s) in `game_tele` table, ignoring.", id, gt.name.c_str()); continue; } - if (!Utf8toWStr(gt.name,gt.wnameLow)) + if (!Utf8toWStr(gt.name, gt.wnameLow)) { - sLog->outErrorDb("Wrong UTF8 name for id %u in `game_tele` table, ignoring.",id); + sLog->outErrorDb("Wrong UTF8 name for id %u in `game_tele` table, ignoring.", id); continue; } @@ -8777,7 +8777,7 @@ GameTele const* ObjectMgr::GetGameTele(const std::string& name) const { // explicit name case std::wstring wname; - if (!Utf8toWStr(name,wname)) + if (!Utf8toWStr(name, wname)) return false; // converting string that we try to find to lower case @@ -8807,15 +8807,15 @@ bool ObjectMgr::AddGameTele(GameTele& tele) // use next ++new_id; - if (!Utf8toWStr(tele.name,tele.wnameLow)) + if (!Utf8toWStr(tele.name, tele.wnameLow)) return false; wstrToLower(tele.wnameLow); m_GameTeleMap[new_id] = tele; - WorldDatabase.PExecute("INSERT INTO game_tele (id,position_x,position_y,position_z,orientation,map,name) VALUES (%u,%f,%f,%f,%f,%d,'%s')", - new_id,tele.position_x,tele.position_y,tele.position_z,tele.orientation,tele.mapId,tele.name.c_str()); + WorldDatabase.PExecute("INSERT INTO game_tele (id, position_x, position_y, position_z, orientation, map, name) VALUES (%u, %f, %f, %f, %f, %d, '%s')", + new_id, tele.position_x, tele.position_y, tele.position_z, tele.orientation, tele.mapId, tele.name.c_str()); return true; } @@ -8823,7 +8823,7 @@ bool ObjectMgr::DeleteGameTele(const std::string& name) { // explicit name case std::wstring wname; - if (!Utf8toWStr(name,wname)) + if (!Utf8toWStr(name, wname)) return false; // converting string that we try to find to lower case @@ -8833,7 +8833,7 @@ bool ObjectMgr::DeleteGameTele(const std::string& name) { if (itr->second.wnameLow == wname) { - WorldDatabase.PExecute("DELETE FROM game_tele WHERE name = '%s'",itr->second.name.c_str()); + WorldDatabase.PExecute("DELETE FROM game_tele WHERE name = '%s'", itr->second.name.c_str()); m_GameTeleMap.erase(itr); return true; } @@ -8871,29 +8871,29 @@ void ObjectMgr::LoadMailLevelRewards() if (level > MAX_LEVEL) { - sLog->outErrorDb("Table `mail_level_reward` have data for level %u that more supported by client (%u), ignoring.",level,MAX_LEVEL); + sLog->outErrorDb("Table `mail_level_reward` have data for level %u that more supported by client (%u), ignoring.", level, MAX_LEVEL); continue; } if (!(raceMask & RACEMASK_ALL_PLAYABLE)) { - sLog->outErrorDb("Table `mail_level_reward` have raceMask (%u) for level %u that not include any player races, ignoring.",raceMask,level); + sLog->outErrorDb("Table `mail_level_reward` have raceMask (%u) for level %u that not include any player races, ignoring.", raceMask, level); continue; } if (!sMailTemplateStore.LookupEntry(mailTemplateId)) { - sLog->outErrorDb("Table `mail_level_reward` have invalid mailTemplateId (%u) for level %u that invalid not include any player races, ignoring.",mailTemplateId,level); + sLog->outErrorDb("Table `mail_level_reward` have invalid mailTemplateId (%u) for level %u that invalid not include any player races, ignoring.", mailTemplateId, level); continue; } if (!GetCreatureTemplate(senderEntry)) { - sLog->outErrorDb("Table `mail_level_reward` have not existed sender creature entry (%u) for level %u that invalid not include any player races, ignoring.",senderEntry,level); + sLog->outErrorDb("Table `mail_level_reward` have not existed sender creature entry (%u) for level %u that invalid not include any player races, ignoring.", senderEntry, level); continue; } - m_mailLevelRewardMap[level].push_back(MailLevelReward(raceMask,mailTemplateId,senderEntry)); + m_mailLevelRewardMap[level].push_back(MailLevelReward(raceMask, mailTemplateId, senderEntry)); ++count; } @@ -9249,16 +9249,16 @@ void ObjectMgr::LoadGossipMenuItems() sLog->outString(); } -void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb) +void ObjectMgr::AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb) { VendorItemData& vList = m_mCacheVendorItemMap[entry]; vList.AddItem(item, maxcount, incrtime, extendedcost); if (savetodb) - WorldDatabase.PExecute("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')", entry, item, maxcount, incrtime, extendedcost); + WorldDatabase.PExecute("INSERT INTO npc_vendor (entry, item, maxcount, incrtime, extendedcost) VALUES('%u', '%u', '%u', '%u', '%u')", entry, item, maxcount, incrtime, extendedcost); } -bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb) +bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, bool savetodb) { CacheVendorItemMap::iterator iter = m_mCacheVendorItemMap.find(entry); if (iter == m_mCacheVendorItemMap.end()) @@ -9267,7 +9267,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb) if(!iter->second.RemoveItem(item)) return false; - if (savetodb) WorldDatabase.PExecute("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'",entry, item); + if (savetodb) WorldDatabase.PExecute("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'", entry, item); return true; } @@ -9469,7 +9469,7 @@ bool LoadTrinityStrings(char const* table, int32 start_value, int32 end_value) // start/end reversed for negative values if (start_value > MAX_DB_SCRIPT_STRING_ID || end_value >= start_value) { - sLog->outErrorDb("Table '%s' load attempted with range (%d - %d) reserved by Trinity, strings not loaded.",table,start_value,end_value+1); + sLog->outErrorDb("Table '%s' load attempted with range (%d - %d) reserved by Trinity, strings not loaded.", table, start_value, end_value+1); return false; } @@ -9483,7 +9483,7 @@ uint32 GetScriptId(const char *name) CreatureBaseStats const* ObjectMgr::GetCreatureBaseStats(uint8 level, uint8 unitClass) { - CreatureBaseStatsMap::const_iterator it = m_creatureBaseStatsMap.find(MAKE_PAIR16(level,unitClass)); + CreatureBaseStatsMap::const_iterator it = m_creatureBaseStatsMap.find(MAKE_PAIR16(level, unitClass)); if (it != m_creatureBaseStatsMap.end()) return &(it->second); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index c9f3e8eb11e..6a6848590e0 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -49,11 +49,11 @@ class Guild; class ArenaTeam; class Item; -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif struct PageText @@ -356,7 +356,7 @@ struct SpellClickInfo }; typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoMap; -typedef std::pair<SpellClickInfoMap::const_iterator,SpellClickInfoMap::const_iterator> SpellClickInfoMapBounds; +typedef std::pair<SpellClickInfoMap::const_iterator, SpellClickInfoMap::const_iterator> SpellClickInfoMapBounds; struct AreaTrigger { @@ -368,17 +368,17 @@ struct AreaTrigger }; typedef std::set<uint32> CellGuidSet; -typedef std::map<uint32/*player guid*/,uint32/*instance*/> CellCorpseSet; +typedef std::map<uint32/*player guid*/, uint32/*instance*/> CellCorpseSet; struct CellObjectGuids { CellGuidSet creatures; CellGuidSet gameobjects; CellCorpseSet corpses; }; -typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap; -typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids; +typedef UNORDERED_MAP<uint32/*cell_id*/, CellObjectGuids> CellObjectGuidsMap; +typedef UNORDERED_MAP<uint32/*(mapid, spawnMode) pair*/, CellObjectGuidsMap> MapObjectGuids; -typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes; +typedef UNORDERED_MAP<uint64/*(instance, guid) pair*/, time_t> RespawnTimes; // Trinity string ranges #define MIN_TRINITY_STRING_ID 1 // 'trinity_string' @@ -396,23 +396,23 @@ struct TrinityStringLocale StringVector Content; }; -typedef std::map<uint64,uint64> LinkedRespawnMap; -typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap; -typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap; -typedef UNORDERED_MAP<uint32,CreatureLocale> CreatureLocaleMap; -typedef UNORDERED_MAP<uint32,GameObjectLocale> GameObjectLocaleMap; -typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap; -typedef UNORDERED_MAP<uint32,ItemSetNameLocale> ItemSetNameLocaleMap; -typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap; -typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap; -typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap; -typedef UNORDERED_MAP<int32,TrinityStringLocale> TrinityStringLocaleMap; -typedef UNORDERED_MAP<uint32,GossipMenuItemsLocale> GossipMenuItemsLocaleMap; -typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap; - -typedef std::multimap<uint32,uint32> QuestRelations; +typedef std::map<uint64, uint64> LinkedRespawnMap; +typedef UNORDERED_MAP<uint32, CreatureData> CreatureDataMap; +typedef UNORDERED_MAP<uint32, GameObjectData> GameObjectDataMap; +typedef UNORDERED_MAP<uint32, CreatureLocale> CreatureLocaleMap; +typedef UNORDERED_MAP<uint32, GameObjectLocale> GameObjectLocaleMap; +typedef UNORDERED_MAP<uint32, ItemLocale> ItemLocaleMap; +typedef UNORDERED_MAP<uint32, ItemSetNameLocale> ItemSetNameLocaleMap; +typedef UNORDERED_MAP<uint32, QuestLocale> QuestLocaleMap; +typedef UNORDERED_MAP<uint32, NpcTextLocale> NpcTextLocaleMap; +typedef UNORDERED_MAP<uint32, PageTextLocale> PageTextLocaleMap; +typedef UNORDERED_MAP<int32, TrinityStringLocale> TrinityStringLocaleMap; +typedef UNORDERED_MAP<uint32, GossipMenuItemsLocale> GossipMenuItemsLocaleMap; +typedef UNORDERED_MAP<uint32, PointOfInterestLocale> PointOfInterestLocaleMap; + +typedef std::multimap<uint32, uint32> QuestRelations; typedef std::pair<QuestRelations::const_iterator, QuestRelations::const_iterator> QuestRelationBounds; -typedef std::multimap<uint32,ItemRequiredTarget> ItemRequiredTargetMap; +typedef std::multimap<uint32, ItemRequiredTarget> ItemRequiredTargetMap; typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap::const_iterator> ItemRequiredTargetMapBounds; struct PetLevelInfo @@ -436,7 +436,7 @@ struct MailLevelReward }; typedef std::list<MailLevelReward> MailLevelRewardList; -typedef UNORDERED_MAP<uint8,MailLevelRewardList> MailLevelRewardMap; +typedef UNORDERED_MAP<uint8, MailLevelRewardList> MailLevelRewardMap; // We assume the rate is in general the same for all three types below, but chose to keep three for scalability and customization struct RepRewardRate @@ -501,10 +501,10 @@ struct GossipMenus ConditionList conditions; }; -typedef std::multimap<uint32,GossipMenus> GossipMenusMap; +typedef std::multimap<uint32, GossipMenus> GossipMenusMap; typedef std::pair<GossipMenusMap::const_iterator, GossipMenusMap::const_iterator> GossipMenusMapBounds; typedef std::pair<GossipMenusMap::iterator, GossipMenusMap::iterator> GossipMenusMapBoundsNonConst; -typedef std::multimap<uint32,GossipMenuItems> GossipMenuItemsMap; +typedef std::multimap<uint32, GossipMenuItems> GossipMenuItemsMap; typedef std::pair<GossipMenuItemsMap::const_iterator, GossipMenuItemsMap::const_iterator> GossipMenuItemsMapBounds; typedef std::pair<GossipMenuItemsMap::iterator, GossipMenuItemsMap::iterator> GossipMenuItemsMapBoundsNonConst; @@ -540,7 +540,7 @@ struct GraveYardData uint32 safeLocId; uint32 team; }; -typedef std::multimap<uint32,GraveYardData> GraveYardMap; +typedef std::multimap<uint32, GraveYardData> GraveYardMap; // NPC gossip text id typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap; @@ -594,7 +594,7 @@ struct DungeonEncounter }; typedef std::list<DungeonEncounter const*> DungeonEncounterList; -typedef UNORDERED_MAP<uint32,DungeonEncounterList> DungeonEncounterMap; +typedef UNORDERED_MAP<uint32, DungeonEncounterList> DungeonEncounterMap; class PlayerDumpReader; @@ -698,7 +698,7 @@ class ObjectMgr if (class_ >= MAX_CLASSES) return NULL; return &playerClassInfo[class_]; } - void GetPlayerClassLevelInfo(uint32 class_,uint8 level, PlayerClassLevelInfo* info) const; + void GetPlayerClassLevelInfo(uint32 class_, uint8 level, PlayerClassLevelInfo* info) const; PlayerInfo const* GetPlayerInfo(uint32 race, uint32 class_) const { @@ -762,7 +762,7 @@ class ObjectMgr AccessRequirement const* GetAccessRequirement(uint32 mapid, Difficulty difficulty) const { - AccessRequirementMap::const_iterator itr = mAccessRequirements.find(MAKE_PAIR32(mapid,difficulty)); + AccessRequirementMap::const_iterator itr = mAccessRequirements.find(MAKE_PAIR32(mapid, difficulty)); if (itr != mAccessRequirements.end()) return &itr->second; return NULL; @@ -911,7 +911,7 @@ class ObjectMgr void ValidateSpellScripts(); bool LoadTrinityStrings(char const* table, int32 min_value, int32 max_value); - bool LoadTrinityStrings() { return LoadTrinityStrings("trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); } + bool LoadTrinityStrings() { return LoadTrinityStrings("trinity_string", MIN_TRINITY_STRING_ID, MAX_TRINITY_STRING_ID); } void LoadDbScriptStrings(); void LoadCreatureClassLevelStats(); void LoadCreatureLocales(); @@ -1008,7 +1008,7 @@ class ObjectMgr typedef std::multimap<int32, uint32> ExclusiveQuestGroups; ExclusiveQuestGroups mExclusiveQuestGroups; - MailLevelReward const* GetMailLevelReward(uint32 level,uint32 raceMask) + MailLevelReward const* GetMailLevelReward(uint32 level, uint32 raceMask) { MailLevelRewardMap::const_iterator map_itr = m_mailLevelRewardMap.find(level); if (map_itr == m_mailLevelRewardMap.end()) @@ -1023,7 +1023,7 @@ class ObjectMgr CellObjectGuids const& GetCellObjectGuids(uint16 mapid, uint8 spawnMode, uint32 cell_id) { - return mMapObjectGuids[MAKE_PAIR32(mapid,spawnMode)][cell_id]; + return mMapObjectGuids[MAKE_PAIR32(mapid, spawnMode)][cell_id]; } CreatureData const* GetCreatureData(uint32 guid) const @@ -1120,7 +1120,7 @@ class ObjectMgr return &itr->second; } const char *GetTrinityString(int32 entry, LocaleConstant locale_idx) const; - const char *GetTrinityStringForDBCLocale(int32 entry) const { return GetTrinityString(entry,DBCLocaleIndex); } + const char *GetTrinityStringForDBCLocale(int32 entry) const { return GetTrinityString(entry, DBCLocaleIndex); } LocaleConstant GetDBCLocaleIndex() const { return DBCLocaleIndex; } void SetDBCLocaleIndex(LocaleConstant locale) { DBCLocaleIndex = locale; } @@ -1144,14 +1144,14 @@ class ObjectMgr time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance) { ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_CreatureRespawnTimesMtx, 0); - return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)]; + return mCreatureRespawnTimes[MAKE_PAIR64(loguid, instance)]; } void SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t); void RemoveCreatureRespawnTime(uint32 loguid, uint32 instance); time_t GetGORespawnTime(uint32 loguid, uint32 instance) { ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_GORespawnTimesMtx, 0); - return mGORespawnTimes[MAKE_PAIR64(loguid,instance)]; + return mGORespawnTimes[MAKE_PAIR64(loguid, instance)]; } void SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t); void RemoveGORespawnTime(uint32 loguid, uint32 instance); @@ -1214,7 +1214,7 @@ class ObjectMgr return &iter->second; } - void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event + void AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event bool RemoveVendorItem(uint32 entry, uint32 item, bool savetodb = true); // for event bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0) const; @@ -1225,26 +1225,26 @@ class ObjectMgr SpellClickInfoMapBounds GetSpellClickInfoMapBounds(uint32 creature_id) const { - return SpellClickInfoMapBounds(mSpellClickInfoMap.lower_bound(creature_id),mSpellClickInfoMap.upper_bound(creature_id)); + return SpellClickInfoMapBounds(mSpellClickInfoMap.lower_bound(creature_id), mSpellClickInfoMap.upper_bound(creature_id)); } GossipMenusMapBounds GetGossipMenusMapBounds(uint32 uiMenuId) const { - return GossipMenusMapBounds(m_mGossipMenusMap.lower_bound(uiMenuId),m_mGossipMenusMap.upper_bound(uiMenuId)); + return GossipMenusMapBounds(m_mGossipMenusMap.lower_bound(uiMenuId), m_mGossipMenusMap.upper_bound(uiMenuId)); } GossipMenusMapBoundsNonConst GetGossipMenusMapBoundsNonConst(uint32 uiMenuId) { - return GossipMenusMapBoundsNonConst(m_mGossipMenusMap.lower_bound(uiMenuId),m_mGossipMenusMap.upper_bound(uiMenuId)); + return GossipMenusMapBoundsNonConst(m_mGossipMenusMap.lower_bound(uiMenuId), m_mGossipMenusMap.upper_bound(uiMenuId)); } GossipMenuItemsMapBounds GetGossipMenuItemsMapBounds(uint32 uiMenuId) const { - return GossipMenuItemsMapBounds(m_mGossipMenuItemsMap.lower_bound(uiMenuId),m_mGossipMenuItemsMap.upper_bound(uiMenuId)); + return GossipMenuItemsMapBounds(m_mGossipMenuItemsMap.lower_bound(uiMenuId), m_mGossipMenuItemsMap.upper_bound(uiMenuId)); } GossipMenuItemsMapBoundsNonConst GetGossipMenuItemsMapBoundsNonConst(uint32 uiMenuId) { - return GossipMenuItemsMapBoundsNonConst(m_mGossipMenuItemsMap.lower_bound(uiMenuId),m_mGossipMenuItemsMap.upper_bound(uiMenuId)); + return GossipMenuItemsMapBoundsNonConst(m_mGossipMenuItemsMap.lower_bound(uiMenuId), m_mGossipMenuItemsMap.upper_bound(uiMenuId)); } // for wintergrasp only @@ -1368,7 +1368,7 @@ class ObjectMgr CreatureBaseStatsMap m_creatureBaseStatsMap; - typedef std::map<uint32,PetLevelInfo*> PetLevelInfoMap; + typedef std::map<uint32, PetLevelInfo*> PetLevelInfoMap; // PetLevelInfoMap[creature_id][level] PetLevelInfoMap petInfo; // [creature_id][level] @@ -1381,10 +1381,10 @@ class ObjectMgr typedef std::vector<uint32> PlayerXPperLevel; // [level] PlayerXPperLevel mPlayerXPperLevel; - typedef std::map<uint32,uint32> BaseXPMap; // [area level][base xp] + typedef std::map<uint32, uint32> BaseXPMap; // [area level][base xp] BaseXPMap mBaseXPTable; - typedef std::map<uint32,int32> FishingBaseSkillMap; // [areaId][base skill level] + typedef std::map<uint32, int32> FishingBaseSkillMap; // [areaId][base skill level] FishingBaseSkillMap mFishingBaseForArea; typedef std::map<uint32, StringVector> HalfNameMap; @@ -1441,7 +1441,7 @@ class ObjectMgr #define sObjectMgr ACE_Singleton<ObjectMgr, ACE_Null_Mutex>::instance() // scripting access functions -bool LoadTrinityStrings(char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min()); +bool LoadTrinityStrings(char const* table, int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min()); uint32 GetScriptId(const char *name); #endif diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index 71a93891499..069362466a8 100755 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -120,7 +120,7 @@ Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER> &v { for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) { - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); Cell r_zone(cell_pair); r_zone.data.Part.nocreate = this->data.Part.nocreate; m.Visit(r_zone, visitor); @@ -218,7 +218,7 @@ Cell::Visit(const CellPair& standing_cell, TypeContainerVisitor<T, CONTAINER> &v { for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); //lets skip standing cell since we already visited it if (cell_pair != standing_cell) { @@ -254,7 +254,7 @@ Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const Cel { for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); Cell r_zone(cell_pair); r_zone.data.Part.nocreate = this->data.Part.nocreate; m.Visit(r_zone, visitor); diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 6163bef4296..a284e342ca9 100755 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -65,7 +65,7 @@ typedef GridRefManager<DynamicObject> DynamicObjectMapType; typedef GridRefManager<GameObject> GameObjectMapType; typedef GridRefManager<Player> PlayerMapType; -typedef Grid<Player, AllWorldObjectTypes,AllGridObjectTypes> GridType; +typedef Grid<Player, AllWorldObjectTypes, AllGridObjectTypes> GridType; typedef NGrid<MAX_NUMBER_OF_CELLS, Player, AllWorldObjectTypes, AllGridObjectTypes> NGridType; typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer; @@ -180,12 +180,12 @@ namespace Trinity inline bool IsValidMapCoord(float x, float y, float z) { - return IsValidMapCoord(x,y) && finite(z); + return IsValidMapCoord(x, y) && finite(z); } inline bool IsValidMapCoord(float x, float y, float z, float o) { - return IsValidMapCoord(x,y,z) && finite(o); + return IsValidMapCoord(x, y, z) && finite(o); } } #endif diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h index f2246d83878..0e762d3a07e 100755 --- a/src/server/game/Grids/GridLoader.h +++ b/src/server/game/Grids/GridLoader.h @@ -47,7 +47,7 @@ class GridLoader /** Loads the grid */ template<class LOADER> - void Load(Grid<ACTIVE_OBJECT,WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, LOADER &loader) + void Load(Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, LOADER &loader) { grid.LockGrid(); loader.Load(grid); @@ -57,7 +57,7 @@ class GridLoader /** Stop the grid */ template<class STOPER> - void Stop(Grid<ACTIVE_OBJECT,WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, STOPER &stoper) + void Stop(Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, STOPER &stoper) { grid.LockGrid(); stoper.Stop(grid); @@ -66,7 +66,7 @@ class GridLoader /** Unloads the grid */ template<class UNLOADER> - void Unload(Grid<ACTIVE_OBJECT,WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, UNLOADER &unloader) + void Unload(Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES> &grid, UNLOADER &unloader) { grid.LockGrid(); unloader.Unload(grid); diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp index b7f910b6059..a1abb66af1f 100755 --- a/src/server/game/Grids/GridStates.cpp +++ b/src/server/game/Grids/GridStates.cpp @@ -38,7 +38,7 @@ ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, c ObjectGridStoper stoper(grid); stoper.StopN(); grid.SetGridState(GRID_STATE_IDLE); - sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u,%u] on map %u moved to IDLE state", x, y, m.GetId()); + sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u, %u] on map %u moved to IDLE state", x, y, m.GetId()); } else { @@ -52,7 +52,7 @@ IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const ui { m.ResetGridExpiry(grid); grid.SetGridState(GRID_STATE_REMOVAL); - sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u,%u] on map %u moved to REMOVAL state", x, y, m.GetId()); + sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u, %u] on map %u moved to REMOVAL state", x, y, m.GetId()); } void @@ -65,7 +65,7 @@ RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, c { if (!m.UnloadGrid(x, y, false)) { - sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u,%u] for map %u differed unloading due to players or active objects nearby", x, y, m.GetId()); + sLog->outDebug(LOG_FILTER_MAPS, "Grid[%u, %u] for map %u differed unloading due to players or active objects nearby", x, y, m.GetId()); m.ResetGridExpiry(grid); } } diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index f7468e1bbb7..95aa6901871 100755 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -33,10 +33,10 @@ class GridInfo { public: GridInfo() - : i_timer(0), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)), + : i_timer(0), vis_Update(0, irand(0, DEFAULT_VISIBILITY_NOTIFY_PERIOD)), i_unloadActiveLockCount(0), i_unloadExplicitLock(false), i_unloadReferenceLock(false) {} GridInfo(time_t expiry, bool unload = true ) - : i_timer(expiry), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)), + : i_timer(expiry), vis_Update(0, irand(0, DEFAULT_VISIBILITY_NOTIFY_PERIOD)), i_unloadActiveLockCount(0), i_unloadExplicitLock(!unload), i_unloadReferenceLock(false) {} const TimeTracker& getTimeTracker() const { return i_timer; } bool getUnloadLock() const { return i_unloadActiveLockCount || i_unloadExplicitLock || i_unloadReferenceLock; } diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 439dd1c875f..9fa6c70cc96 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -129,7 +129,7 @@ void PlayerRelocationNotifier::Visit(PlayerMapType &m) vis_guids.erase(plr->GetGUID()); - i_player.UpdateVisibilityOf(plr,i_data,i_visibleNow); + i_player.UpdateVisibilityOf(plr, i_data, i_visibleNow); if (plr->m_seer->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) continue; @@ -148,7 +148,7 @@ void PlayerRelocationNotifier::Visit(CreatureMapType &m) vis_guids.erase(c->GetGUID()); - i_player.UpdateVisibilityOf(c,i_data,i_visibleNow); + i_player.UpdateVisibilityOf(c, i_data, i_visibleNow); if (relocated_for_ai && !c->isNeedNotify(NOTIFY_VISIBILITY_CHANGED)) CreatureUnitRelocationWorker(c, &i_player); diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index c71d9080b92..a575e3685ec 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -173,7 +173,7 @@ namespace Trinity Check &i_check; WorldObjectSearcher(WorldObject const* searcher, WorldObject* & result, Check& check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(GameObjectMapType &m); void Visit(PlayerMapType &m); @@ -192,7 +192,7 @@ namespace Trinity Check& i_check; WorldObjectListSearcher(WorldObject const* searcher, std::list<WorldObject*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} void Visit(PlayerMapType &m); void Visit(CreatureMapType &m); @@ -259,7 +259,7 @@ namespace Trinity Check &i_check; GameObjectSearcher(WorldObject const* searcher, GameObject* & result, Check& check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(GameObjectMapType &m); @@ -308,7 +308,7 @@ namespace Trinity Check & i_check; UnitSearcher(WorldObject const* searcher, Unit* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(CreatureMapType &m); void Visit(PlayerMapType &m); @@ -325,7 +325,7 @@ namespace Trinity Check & i_check; UnitLastSearcher(WorldObject const* searcher, Unit* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(CreatureMapType &m); void Visit(PlayerMapType &m); @@ -342,7 +342,7 @@ namespace Trinity Check& i_check; UnitListSearcher(WorldObject const* searcher, std::list<Unit*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} void Visit(PlayerMapType &m); void Visit(CreatureMapType &m); @@ -360,7 +360,7 @@ namespace Trinity Check & i_check; CreatureSearcher(WorldObject const* searcher, Creature* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(CreatureMapType &m); @@ -376,7 +376,7 @@ namespace Trinity Check & i_check; CreatureLastSearcher(WorldObject const* searcher, Creature* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(CreatureMapType &m); @@ -391,7 +391,7 @@ namespace Trinity Check& i_check; CreatureListSearcher(WorldObject const* searcher, std::list<Creature*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} void Visit(CreatureMapType &m); @@ -427,7 +427,7 @@ namespace Trinity Check & i_check; PlayerSearcher(WorldObject const* searcher, Player* & result, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {} void Visit(PlayerMapType &m); @@ -442,7 +442,7 @@ namespace Trinity Check& i_check; PlayerListSearcher(WorldObject const* searcher, std::list<Player*> &objects, Check & check) - : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {} + : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {} void Visit(PlayerMapType &m); @@ -481,7 +481,7 @@ namespace Trinity void Visit(PlayerMapType &m) { for (PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) - if (itr->getSource()->InSamePhase(i_searcher) && itr->getSource()->IsWithinDist(i_searcher,i_dist)) + if (itr->getSource()->InSamePhase(i_searcher) && itr->getSource()->IsWithinDist(i_searcher, i_dist)) i_do(itr->getSource()); } @@ -607,7 +607,7 @@ namespace Trinity class GameObjectFocusCheck { public: - GameObjectFocusCheck(Unit const* unit,uint32 focusId) : i_unit(unit), i_focusId(focusId) {} + GameObjectFocusCheck(Unit const* unit, uint32 focusId) : i_unit(unit), i_focusId(focusId) {} bool operator()(GameObject* go) const { if (go->GetGOInfo()->type != GAMEOBJECT_TYPE_SPELL_FOCUS) @@ -674,7 +674,7 @@ namespace Trinity class NearestGameObjectEntryInObjectRangeCheck { public: - NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj,uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) {} + NearestGameObjectEntryInObjectRangeCheck(WorldObject const& obj, uint32 entry, float range) : i_obj(obj), i_entry(entry), i_range(range) {} bool operator()(GameObject* go) { if (go->GetEntry() == i_entry && i_obj.IsWithinDistInMap(go, i_range)) @@ -697,7 +697,7 @@ namespace Trinity class GameObjectWithDbGUIDCheck { public: - GameObjectWithDbGUIDCheck(WorldObject const& obj,uint32 db_guid) : i_obj(obj), i_db_guid(db_guid) {} + GameObjectWithDbGUIDCheck(WorldObject const& obj, uint32 db_guid) : i_obj(obj), i_db_guid(db_guid) {} bool operator()(GameObject const* go) const { return go->GetDBTableGUIDLow() == i_db_guid; @@ -1074,7 +1074,7 @@ namespace Trinity { if (u == i_obj) return false; - if (!u->CanAssistTo(i_obj,i_enemy)) + if (!u->CanAssistTo(i_obj, i_enemy)) return false; if (!i_obj->IsWithinDistInMap(u, i_range)) @@ -1160,7 +1160,7 @@ namespace Trinity AllGameObjectsWithEntryInRange(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {} bool operator() (GameObject* pGo) { - if (pGo->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pGo,m_fRange,false)) + if (pGo->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pGo, m_fRange, false)) return true; return false; @@ -1177,7 +1177,7 @@ namespace Trinity AllCreaturesOfEntryInRange(const WorldObject* pObject, uint32 uiEntry, float fMaxRange) : m_pObject(pObject), m_uiEntry(uiEntry), m_fRange(fMaxRange) {} bool operator() (Unit* pUnit) { - if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit,m_fRange,false)) + if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit, m_fRange, false)) return true; return false; @@ -1196,7 +1196,7 @@ namespace Trinity bool operator() (Player* pPlayer) { //No threat list check, must be done explicit if expected to be in combat with creature - if (!pPlayer->isGameMaster() && pPlayer->isAlive() && !pUnit->IsWithinDist(pPlayer,fRange,false)) + if (!pPlayer->isGameMaster() && pPlayer->isAlive() && !pUnit->IsWithinDist(pPlayer, fRange, false)) return true; return false; diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 9c806063721..67bbddacec1 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -34,7 +34,7 @@ Trinity::VisibleNotifier::Visit(GridRefManager<T> &m) for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) { vis_guids.erase(iter->getSource()->GetGUID()); - i_player.UpdateVisibilityOf(iter->getSource(),i_data,i_visibleNow); + i_player.UpdateVisibilityOf(iter->getSource(), i_data, i_visibleNow); } } @@ -413,7 +413,7 @@ void Trinity::LocalizedPacketDo<Builder>::operator()(Player* p) data = new WorldPacket(SMSG_MESSAGECHAT, 200); - i_builder(*data,loc_idx); + i_builder(*data, loc_idx); i_data_cache[cache_idx] = data; } @@ -438,7 +438,7 @@ void Trinity::LocalizedPacketListDo<Builder>::operator()(Player* p) data_list = &i_data_cache[cache_idx]; - i_builder(*data_list,loc_idx); + i_builder(*data_list, loc_idx); } else data_list = &i_data_cache[cache_idx]; diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 4a9f11d892c..840408c0d7e 100755 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -109,7 +109,7 @@ template <class T> void AddObjectHelper(CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* map, T *obj) { obj->GetGridRef().link(&m, obj); - AddUnitState(obj,cell); + AddUnitState(obj, cell); obj->AddToWorld(); if (obj->isActiveObject()) map->AddToActive(obj); @@ -124,7 +124,7 @@ void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> & { T* obj = new T; uint32 guid = *i_guid; - //sLog->outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading",table,guid); + //sLog->outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading", table, guid); if (!obj->LoadFromDB(guid, map)) { delete obj; @@ -166,7 +166,7 @@ ObjectGridLoader::Visit(GameObjectMapType &m) { uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX(); uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY(); - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; CellObjectGuids const& cell_guids = sObjectMgr->GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id); @@ -179,7 +179,7 @@ ObjectGridLoader::Visit(CreatureMapType &m) { uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX(); uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY(); - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; CellObjectGuids const& cell_guids = sObjectMgr->GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id); @@ -192,7 +192,7 @@ ObjectWorldLoader::Visit(CorpseMapType &m) { uint32 x = (i_cell.GridX()*MAX_NUMBER_OF_CELLS) + i_cell.CellX(); uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY(); - CellPair cell_pair(x,y); + CellPair cell_pair(x, y); uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; // corpses are always added to spawn mode 0 and they are spawned by their instance id @@ -230,7 +230,7 @@ void ObjectGridLoader::LoadN(void) loader.Load(i_grid(x, y), *this); } } - sLog->outDebug(LOG_FILTER_MAPS, "%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses,i_grid.GetGridId(), i_map->GetId()); + sLog->outDebug(LOG_FILTER_MAPS, "%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses, i_grid.GetGridId(), i_map->GetId()); } void ObjectGridUnloader::MoveToRespawnN() diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 098f2c19c17..0eb65395e91 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -123,8 +123,8 @@ bool Group::Create(Player *leader) sObjectMgr->RegisterGroupStorageId(m_storageId, this); // store group in database - CharacterDatabase.PExecute("INSERT INTO groups (guid,leaderGuid,lootMethod,looterGuid,lootThreshold,icon1,icon2,icon3,icon4,icon5,icon6,icon7,icon8,groupType,difficulty,raiddifficulty) " - "VALUES ('%u','%u','%u','%u','%u','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','%u','%u','%u')", + CharacterDatabase.PExecute("INSERT INTO groups (guid, leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, groupType, difficulty, raiddifficulty) " + "VALUES ('%u', '%u', '%u', '%u', '%u', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '" UI64FMTD "', '%u', '%u', '%u')", m_storageId, GUID_LOPART(m_leaderGuid), uint32(m_lootMethod), GUID_LOPART(m_looterGuid), uint32(m_lootThreshold), m_targetIcons[0], m_targetIcons[1], m_targetIcons[2], m_targetIcons[3], m_targetIcons[4], m_targetIcons[5], m_targetIcons[6], m_targetIcons[7], uint8(m_groupType), uint32(m_dungeonDifficulty), m_raidDifficulty); @@ -355,8 +355,8 @@ bool Group::AddMember(Player *player) { // reset the new member's instances, unless he is currently in one of them // including raid/heroic instances that they are not permanently bound to! - player->ResetInstances(INSTANCE_RESET_GROUP_JOIN,false); - player->ResetInstances(INSTANCE_RESET_GROUP_JOIN,true); + player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, false); + player->ResetInstances(INSTANCE_RESET_GROUP_JOIN, true); if (player->getLevel() >= LEVELREQUIREMENT_HEROIC) { @@ -756,8 +756,8 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject) //roll for over-threshold item if it's one-player loot if (item->Quality >= uint32(m_lootThreshold)) { - uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM); - Roll* r = new Roll(newitemGUID,*i); + uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM), 0, HIGHGUID_ITEM); + Roll* r = new Roll(newitemGUID, *i); //a vector is filled with only near party members for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) @@ -767,7 +767,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject) continue; if (i->AllowedForPlayer(member)) { - if (member->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (member->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { r->totalPlayersRolling++; @@ -844,8 +844,8 @@ void Group::NeedBeforeGreed(Loot *loot, WorldObject* pLootedObject) //roll for over-threshold item if it's one-player loot if (item->Quality >= uint32(m_lootThreshold)) { - uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM); - Roll* r=new Roll(newitemGUID,*i); + uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM), 0, HIGHGUID_ITEM); + Roll* r=new Roll(newitemGUID, *i); for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { @@ -856,7 +856,7 @@ void Group::NeedBeforeGreed(Loot *loot, WorldObject* pLootedObject) bool allowedForPlayer = i->AllowedForPlayer(playerToRoll); if (playerToRoll->CanUseItem(item) == EQUIP_ERR_OK && allowedForPlayer) { - if (playerToRoll->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (playerToRoll->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { r->totalPlayersRolling++; @@ -931,19 +931,19 @@ void Group::MasterLoot(Loot* /*loot*/, WorldObject* pLootedObject) if (!looter->IsInWorld()) continue; - if (looter->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (looter->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { data << uint64(looter->GetGUID()); ++real_count; } } - data.put<uint8>(0,real_count); + data.put<uint8>(0, real_count); for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *looter = itr->getSource(); - if (looter->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (looter->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) looter->GetSession()->SendPacket(&data); } } @@ -1401,7 +1401,7 @@ void Group::UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed) { // not update if only update if need and ok Player* looter = ObjectAccessor::FindPlayer(guid_itr->guid); - if (looter && looter->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (looter && looter->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) return; } ++guid_itr; @@ -1412,7 +1412,7 @@ void Group::UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed) for (member_citerator itr = guid_itr; itr != m_memberSlots.end(); ++itr) { if (Player* pl = ObjectAccessor::FindPlayer(itr->guid)) - if (pl->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (pl->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { pNewLooter = pl; break; @@ -1425,7 +1425,7 @@ void Group::UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed) for (member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr) { if (Player* pl = ObjectAccessor::FindPlayer(itr->guid)) - if (pl->IsWithinDistInMap(pLootedObject,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (pl->IsWithinDistInMap(pLootedObject, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) { pNewLooter = pl; break; @@ -1470,7 +1470,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* if (!reference) return ERR_BATTLEGROUND_JOIN_FAILED; - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgOrTemplate->GetMapId(),reference->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bgOrTemplate->GetMapId(), reference->getLevel()); if (!bracketEntry) return ERR_BATTLEGROUND_JOIN_FAILED; @@ -1491,7 +1491,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* if (member->GetTeam() != team) return ERR_BATTLEGROUND_JOIN_TIMED_OUT; // not in the same battleground level braket, don't let join - PvPDifficultyEntry const* memberBracketEntry = GetBattlegroundBracketByLevel(bracketEntry->mapId,member->getLevel()); + PvPDifficultyEntry const* memberBracketEntry = GetBattlegroundBracketByLevel(bracketEntry->mapId, member->getLevel()); if (memberBracketEntry != bracketEntry) return ERR_BATTLEGROUND_JOIN_RANGE_INDEX; // don't let join rated matches if the arena team id doesn't match @@ -1663,7 +1663,7 @@ InstanceGroupBind* Group::GetBoundInstance(Map* aMap) Difficulty difficulty = GetDifficulty(aMap->IsRaid()); // some instances only have one difficulty - GetDownscaledMapDifficultyData(aMap->GetId(),difficulty); + GetDownscaledMapDifficultyData(aMap->GetId(), difficulty); BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(aMap->GetId()); if (itr != m_boundInstances[difficulty].end()) @@ -1680,7 +1680,7 @@ InstanceGroupBind* Group::GetBoundInstance(MapEntry const* mapEntry) Difficulty difficulty = GetDifficulty(mapEntry->IsRaid()); // some instances only have one difficulty - GetDownscaledMapDifficultyData(mapEntry->MapID,difficulty); + GetDownscaledMapDifficultyData(mapEntry->MapID, difficulty); BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapEntry->MapID); if (itr != m_boundInstances[difficulty].end()) @@ -1872,12 +1872,12 @@ bool Group::IsAssistant(uint64 guid) const return mslot->flags & MEMBER_FLAG_ASSISTANT; } -bool Group::SameSubGroup(uint64 guid1,const uint64& guid2) const +bool Group::SameSubGroup(uint64 guid1, const uint64& guid2) const { member_citerator mslot2 = _getMemberCSlot(guid2); if (mslot2 == m_memberSlots.end()) return false; - return SameSubGroup(guid1,&*mslot2); + return SameSubGroup(guid1, &*mslot2); } bool Group::SameSubGroup(uint64 guid1, MemberSlot const* slot2) const diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 636efd7ca86..1387b6eca35 100755 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -118,7 +118,7 @@ enum GroupUpdateFlags }; #define GROUP_UPDATE_FLAGS_COUNT 20 - // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19 + // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 static const uint8 GroupUpdateLength[GROUP_UPDATE_FLAGS_COUNT] = { 0, 2, 2, 2, 1, 2, 2, 2, 2, 4, 8, 8, 1, 2, 2, 2, 1, 2, 2, 8}; class Roll : public LootValidatorRef diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 1e0398f0a6d..ffb56e20cb7 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1971,7 +1971,7 @@ bool Guild::Validate() // Validate ranks data // GUILD RANKS represent a sequence starting from 0 = GUILD_MASTER (ALL PRIVILEGES) to max 9 (lowest privileges). // The lower rank id is considered higher rank - so promotion does rank-- and demotion does rank++ - // Between ranks in sequence cannot be gaps - so 0,1,2,4 is impossible + // Between ranks in sequence cannot be gaps - so 0, 1, 2, 4 is impossible // Min ranks count is 5 and max is 10. bool broken_ranks = false; if (_GetRanksSize() < GUILD_RANKS_MIN_COUNT || _GetRanksSize() > GUILD_RANKS_MAX_COUNT) @@ -2296,7 +2296,7 @@ void Guild::_CreateRank(const std::string& name, uint32 rights) if (_GetRanksSize() >= GUILD_RANKS_MAX_COUNT) return; - // Ranks represent sequence 0,1,2,... where 0 means guildmaster + // Ranks represent sequence 0, 1, 2, ... where 0 means guildmaster uint8 newRankId = _GetRanksSize(); RankInfo info(m_id, newRankId, name, rights, 0); diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index ddd27b273b0..9a322cc1681 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -96,7 +96,7 @@ InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instance // initialize reset time // for normal instances if no creatures are killed the instance will reset in two hours if (entry->map_type == MAP_RAID || difficulty > DUNGEON_DIFFICULTY_NORMAL) - resetTime = GetResetTimeFor(mapId,difficulty); + resetTime = GetResetTimeFor(mapId, difficulty); else { resetTime = time(NULL) + 2 * HOUR; @@ -227,9 +227,9 @@ bool InstanceSave::UnloadIfEmpty() return true; } -void InstanceSaveManager::_DelHelper(const char *fields, const char *table, const char *queryTail,...) +void InstanceSaveManager::_DelHelper(const char *fields, const char *table, const char *queryTail, ...) { - Tokens fieldTokens(fields, ','); + Tokens fieldTokens(fields, ', '); ASSERT(fieldTokens.size() != 0); va_list ap; @@ -297,12 +297,12 @@ void InstanceSaveManager::LoadResetTimes() // get the current reset times for normal instances (these may need to be updated) // these are only kept in memory for InstanceSaves that are loaded later // resettime = 0 in the DB for raid/heroic instances so those are skipped - typedef std::pair<uint32 /*PAIR32(map,difficulty)*/, time_t> ResetTimeMapDiffType; + typedef std::pair<uint32 /*PAIR32(map, difficulty)*/, time_t> ResetTimeMapDiffType; typedef std::map<uint32, ResetTimeMapDiffType> InstResetTimeMapDiffType; InstResetTimeMapDiffType instResetTime; // index instance ids by map/difficulty pairs for fast reset warning send - typedef std::multimap<uint32 /*PAIR32(map,difficulty)*/, uint32 /*instanceid*/ > ResetTimeMapDiffInstances; + typedef std::multimap<uint32 /*PAIR32(map, difficulty)*/, uint32 /*instanceid*/ > ResetTimeMapDiffInstances; ResetTimeMapDiffInstances mapDiffResetInstances; QueryResult result = CharacterDatabase.Query("SELECT id, map, difficulty, resettime FROM instance ORDER BY id ASC"); @@ -373,7 +373,7 @@ void InstanceSaveManager::LoadResetTimes() if (!mapDiff) { sLog->outError("InstanceSaveManager::LoadResetTimes: invalid mapid(%u)/difficulty(%u) pair in instance_reset!", mapid, difficulty); - CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u' AND difficulty = '%u'", mapid,difficulty); + CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u' AND difficulty = '%u'", mapid, difficulty); continue; } @@ -408,12 +408,12 @@ void InstanceSaveManager::LoadResetTimes() if (period < DAY) period = DAY; - time_t t = GetResetTimeFor(mapid,difficulty); + time_t t = GetResetTimeFor(mapid, difficulty); if (!t) { // initialize the reset time t = today + period + diff; - CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','%u','%u')", mapid, difficulty, (uint32)t); + CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u', '%u', '%u')", mapid, difficulty, (uint32)t); } if (t < now) @@ -425,7 +425,7 @@ void InstanceSaveManager::LoadResetTimes() CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty= '%u'", (uint64)t, mapid, difficulty); } - SetResetTimeFor(mapid,difficulty,t); + SetResetTimeFor(mapid, difficulty, t); // schedule the global reset/warning uint8 type; @@ -470,7 +470,7 @@ void InstanceSaveManager::ScheduleReset(bool add, time_t time, InstResetEvent ev } if (itr == m_resetTimeQueue.end()) - sLog->outError("InstanceSaveManager::ScheduleReset: cannot cancel the reset, the event(%d,%d,%d) was not found!", event.type, event.mapid, event.instanceId); + sLog->outError("InstanceSaveManager::ScheduleReset: cannot cancel the reset, the event(%d, %d, %d) was not found!", event.type, event.mapid, event.instanceId); } } else @@ -498,7 +498,7 @@ void InstanceSaveManager::Update() else { // global reset/warning for a certain map - time_t resetTime = GetResetTimeFor(event.mapid,event.difficulty); + time_t resetTime = GetResetTimeFor(event.mapid, event.difficulty); _ResetOrWarnAll(event.mapid, event.difficulty, event.type != 4, resetTime); if (event.type != 4) { diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 40759477899..810ff6efedb 100755 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -112,7 +112,7 @@ class InstanceSave bool m_canReset; }; -typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap; +typedef UNORDERED_MAP<uint32 /*PAIR32(map, difficulty)*/, time_t /*resetTime*/> ResetTimeByMapDifficultyMap; class InstanceSaveManager { @@ -145,12 +145,12 @@ class InstanceSaveManager void LoadResetTimes(); time_t GetResetTimeFor(uint32 mapid, Difficulty d) const { - ResetTimeByMapDifficultyMap::const_iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid,d)); + ResetTimeByMapDifficultyMap::const_iterator itr = m_resetTimeByMapDifficulty.find(MAKE_PAIR32(mapid, d)); return itr != m_resetTimeByMapDifficulty.end() ? itr->second : 0; } void SetResetTimeFor(uint32 mapid, Difficulty d, time_t t) { - m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid,d)] = t; + m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid, d)] = t; } ResetTimeByMapDifficultyMap const& GetResetTimeMap() const { @@ -179,7 +179,7 @@ class InstanceSaveManager void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime); void _ResetInstance(uint32 mapid, uint32 instanceId); void _ResetSave(InstanceSaveHashMap::iterator &itr); - void _DelHelper(const char *fields, const char *table, const char *queryTail,...); + void _DelHelper(const char *fields, const char *table, const char *queryTail, ...); // used during global instance resets bool lock_instLists; // fast lookup by instance id diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 5451b4a19c5..e468e29c70c 100755 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -263,12 +263,12 @@ void InstanceScript::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON) { if (pGo->getLootState() == GO_READY) - pGo->UseDoorOrButton(uiWithRestoreTime,bUseAlternativeState); + pGo->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState); else if (pGo->getLootState() == GO_ACTIVATED) pGo->ResetDoorOrButton(); } else - sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType()); + sLog->outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", pGo->GetEntry(), pGo->GetGoType()); } } @@ -398,7 +398,7 @@ void InstanceScript::DoCastSpellOnPlayers(uint32 spell) bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/) { sLog->outError("Achievement system call InstanceScript::CheckAchievementCriteriaMeet but instance script for map %u not have implementation for achievement criteria %u", - instance->GetId(),criteria_id); + instance->GetId(), criteria_id); return false; } diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index d099f9471af..3c90364bbfd 100755 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -28,8 +28,8 @@ #define OUT_SAVE_INST_DATA sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_SAVE_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_LOAD_INST_DATA(a) sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a) -#define OUT_LOAD_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) -#define OUT_LOAD_INST_DATA_FAIL sLog->outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_LOAD_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_LOAD_INST_DATA_FAIL sLog->outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) class Map; class Unit; diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 154e8929e38..a336e776ebb 100755 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -121,13 +121,13 @@ uint32 LootStore::LoadLootTable() if (maxcount > std::numeric_limits<uint8>::max()) { - sLog->outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount,std::numeric_limits<uint8>::max()); + sLog->outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount, std::numeric_limits<uint8>::max()); continue; // error already printed to log/console. } LootStoreItem storeitem = LootStoreItem(item, chanceOrQuestChance, lootmode, group, mincountOrRef, maxcount); - if (!storeitem.IsValid(*this,entry)) // Validity checks + if (!storeitem.IsValid(*this, entry)) // Validity checks continue; // Looking for the template of the entry @@ -167,7 +167,7 @@ bool LootStore::HaveQuestLootFor(uint32 loot_id) const return itr->second->HasQuestDrop(m_LootTemplates); } -bool LootStore::HaveQuestLootForPlayer(uint32 loot_id,Player* player) const +bool LootStore::HaveQuestLootForPlayer(uint32 loot_id, Player* player) const { LootTemplateMap::const_iterator tab = m_LootTemplates.find(loot_id); if (tab != m_LootTemplates.end()) @@ -219,19 +219,19 @@ uint32 LootStore::LoadAndCollectLootIds(LootIdSet& ids_set) void LootStore::CheckLootRefs(LootIdSet* ref_set) const { for (LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr) - ltItr->second->CheckLootRefs(m_LootTemplates,ref_set); + ltItr->second->CheckLootRefs(m_LootTemplates, ref_set); } void LootStore::ReportUnusedIds(LootIdSet const& ids_set) const { // all still listed ids isn't referenced for (LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr) - sLog->outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr,GetEntryName()); + sLog->outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr, GetEntryName()); } void LootStore::ReportNotExistedId(uint32 id) const { - sLog->outErrorDb("Table '%s' entry %d (%s) not exist but used as loot id in DB.", GetName(), id,GetEntryName()); + sLog->outErrorDb("Table '%s' entry %d (%s) not exist but used as loot id in DB.", GetName(), id, GetEntryName()); } // @@ -953,7 +953,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv) } //update number of items shown - b.put<uint8>(count_pos,itemsShown); + b.put<uint8>(count_pos, itemsShown); return b; } @@ -1333,7 +1333,7 @@ void LootTemplate::Verify(LootStore const& lootstore, uint32 id) const { // Checking group chances for (uint32 i=0; i < Groups.size(); ++i) - Groups[i].Verify(lootstore,id,i+1); + Groups[i].Verify(lootstore, id, i+1); // TODO: References validity checks } @@ -1352,7 +1352,7 @@ void LootTemplate::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_se } for (LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr) - grItr->CheckLootRefs(store,ref_set); + grItr->CheckLootRefs(store, ref_set); } bool LootTemplate::addConditionItem(Condition* cond) { diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index e0c46fe575a..7a9601030bd 100755 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -192,7 +192,7 @@ class LootStore bool HaveLootFor(uint32 loot_id) const { return m_LootTemplates.find(loot_id) != m_LootTemplates.end(); } bool HaveQuestLootFor(uint32 loot_id) const; - bool HaveQuestLootForPlayer(uint32 loot_id,Player* player) const; + bool HaveQuestLootForPlayer(uint32 loot_id, Player* player) const; LootTemplate const* GetLootFor(uint32 loot_id) const; void ResetConditions(); @@ -359,7 +359,7 @@ struct LootView Loot &loot; Player *viewer; PermissionTypes permission; - LootView(Loot &_loot, Player *_viewer,PermissionTypes _permission = ALL_PERMISSION) + LootView(Loot &_loot, Player *_viewer, PermissionTypes _permission = ALL_PERMISSION) : loot(_loot), viewer(_viewer), permission(_permission) {} }; diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 8653db0fa7b..a76b1020f46 100755 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -71,7 +71,7 @@ MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_ { } -MailReceiver::MailReceiver(Player* receiver,uint32 receiver_lowguid) : m_receiver(receiver), m_receiver_lowguid(receiver_lowguid) +MailReceiver::MailReceiver(Player* receiver, uint32 receiver_lowguid) : m_receiver(receiver), m_receiver_lowguid(receiver_lowguid) { ASSERT(!receiver || receiver->GetGUIDLow() == receiver_lowguid); } @@ -96,9 +96,9 @@ void MailDraft::prepareItems(Player* receiver, SQLTransaction& trans) uint32 max_slot = mailLoot.GetMaxSlotInLootFor(receiver); for (uint32 i = 0; m_items.size() < MAX_MAIL_ITEMS && i < max_slot; ++i) { - if (LootItem* lootitem = mailLoot.LootItemInSlot(i,receiver)) + if (LootItem* lootitem = mailLoot.LootItemInSlot(i, receiver)) { - if (Item* item = Item::CreateItem(lootitem->itemid,lootitem->count,receiver)) + if (Item* item = Item::CreateItem(lootitem->itemid, lootitem->count, receiver)) { item->SaveToDB(trans); // save for prevent lost at next mail load, if send fail then item will deleted AddItem(item); @@ -167,7 +167,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, uint32 sender_guid, uint32 uint32 deliver_delay = needItemDelay ? sWorld->getIntConfig(CONFIG_MAIL_DELIVERY_DELAY) : 0; // will delete item or place to receiver mail list - SendMailTo(trans,MailReceiver(receiver,receiver_guid), MailSender(MAIL_NORMAL, sender_guid), MAIL_CHECK_MASK_RETURNED, deliver_delay); + SendMailTo(trans, MailReceiver(receiver, receiver_guid), MailSender(MAIL_NORMAL, sender_guid), MAIL_CHECK_MASK_RETURNED, deliver_delay); CharacterDatabase.CommitTransaction(trans); } diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 67f92496a41..247743f46fc 100755 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -111,7 +111,7 @@ class MailReceiver public: // Constructors explicit MailReceiver(uint32 receiver_lowguid) : m_receiver(NULL), m_receiver_lowguid(receiver_lowguid) {} MailReceiver(Player* receiver); - MailReceiver(Player* receiver,uint32 receiver_lowguid); + MailReceiver(Player* receiver, uint32 receiver_lowguid); public: // Accessors Player* GetPlayer() const { return m_receiver; } uint32 GetPlayerGUIDLow() const { return m_receiver_lowguid; } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a7c2cbda158..51b03e85581 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -56,24 +56,24 @@ Map::~Map() sScriptMgr->DecreaseScheduledScriptCount(m_scriptSchedule.size()); } -bool Map::ExistMap(uint32 mapid,int gx,int gy) +bool Map::ExistMap(uint32 mapid, int gx, int gy) { int len = sWorld->GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1; char* tmp = new char[len]; - snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(),mapid,gx,gy); + snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(), mapid, gx, gy); bool ret = false; - FILE *pf=fopen(tmp,"rb"); + FILE *pf=fopen(tmp, "rb"); if (!pf) - sLog->outError("Map file '%s': does not exist!",tmp); + sLog->outError("Map file '%s': does not exist!", tmp); else { map_fileheader header; if (fread(&header, sizeof(header), 1, pf) == 1) { if (header.mapMagic != uint32(MAP_MAGIC) || header.versionMagic != uint32(MAP_VERSION_MAGIC)) - sLog->outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.",tmp); + sLog->outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.", tmp); else ret = true; } @@ -83,16 +83,16 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy) return ret; } -bool Map::ExistVMap(uint32 mapid,int gx,int gy) +bool Map::ExistVMap(uint32 mapid, int gx, int gy) { if (VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager()) { if (vmgr->isMapLoadingEnabled()) { - bool exists = vmgr->existsMap((sWorld->GetDataPath()+ "vmaps").c_str(), mapid, gx,gy); + bool exists = vmgr->existsMap((sWorld->GetDataPath()+ "vmaps").c_str(), mapid, gx, gy); if (!exists) { - std::string name = vmgr->getDirFileName(mapid,gx,gy); + std::string name = vmgr->getDirFileName(mapid, gx, gy); sLog->outError("VMap file '%s' is missing or points to wrong version of vmap file. Redo vmaps with latest version of vmap_assembler.exe.", (sWorld->GetDataPath()+"vmaps/"+name).c_str()); return false; } @@ -102,25 +102,25 @@ bool Map::ExistVMap(uint32 mapid,int gx,int gy) return true; } -void Map::LoadVMap(int gx,int gy) +void Map::LoadVMap(int gx, int gy) { // x and y are swapped !! - int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx,gy); + int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy); switch(vmapLoadResult) { case VMAP::VMAP_LOAD_RESULT_OK: - sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx,gy,gx,gy); + sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); break; case VMAP::VMAP_LOAD_RESULT_ERROR: - sLog->outDetail("Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx,gy,gx,gy); + sLog->outDetail("Could not load VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); break; case VMAP::VMAP_LOAD_RESULT_IGNORED: - sLog->outStaticDebug("Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx,gy,gx,gy); + sLog->outStaticDebug("Ignored VMAP name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy); break; } } -void Map::LoadMap(int gx,int gy, bool reload) +void Map::LoadMap(int gx, int gy, bool reload) { if (i_InstanceId != 0) { @@ -129,9 +129,9 @@ void Map::LoadMap(int gx,int gy, bool reload) // load grid map for base map if (!m_parentMap->GridMaps[gx][gy]) - m_parentMap->EnsureGridCreated(GridPair(63-gx,63-gy)); + m_parentMap->EnsureGridCreated(GridPair(63-gx, 63-gy)); - ((MapInstanced*)(m_parentMap))->AddGridMapReference(GridPair(gx,gy)); + ((MapInstanced*)(m_parentMap))->AddGridMapReference(GridPair(gx, gy)); GridMaps[gx][gy] = m_parentMap->GridMaps[gx][gy]; return; } @@ -142,7 +142,7 @@ void Map::LoadMap(int gx,int gy, bool reload) //map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?) if (GridMaps[gx][gy]) { - sLog->outDetail("Unloading previously loaded map %u before reloading.",GetId()); + sLog->outDetail("Unloading previously loaded map %u before reloading.", GetId()); sScriptMgr->OnUnloadGridMap(this, GridMaps[gx][gy], gx, gy); delete (GridMaps[gx][gy]); @@ -153,8 +153,8 @@ void Map::LoadMap(int gx,int gy, bool reload) char *tmp=NULL; int len = sWorld->GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1; tmp = new char[len]; - snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(),GetId(),gx,gy); - sLog->outDetail("Loading map %s",tmp); + snprintf(tmp, len, (char *)(sWorld->GetDataPath()+"maps/%03u%02u%02u.map").c_str(), GetId(), gx, gy); + sLog->outDetail("Loading map %s", tmp); // loading data GridMaps[gx][gy] = new GridMap(); if (!GridMaps[gx][gy]->loadData(tmp)) @@ -166,9 +166,9 @@ void Map::LoadMap(int gx,int gy, bool reload) sScriptMgr->OnLoadGridMap(this, GridMaps[gx][gy], gx, gy); } -void Map::LoadMapAndVMap(int gx,int gy) +void Map::LoadMapAndVMap(int gx, int gy) { - LoadMap(gx,gy); + LoadMap(gx, gy); if (i_InstanceId == 0) LoadVMap(gx, gy); // Only load the data for the base map } @@ -263,7 +263,7 @@ void Map::SwitchGridContainers(T* obj, bool on) if (!loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y))) return; - sLog->outStaticDebug("Switch object " UI64FMTD " from grid[%u,%u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on); + sLog->outStaticDebug("Switch object " UI64FMTD " from grid[%u, %u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on); NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY()); ASSERT(ngrid != NULL); @@ -317,7 +317,7 @@ Map::EnsureGridCreated(const GridPair &p) ACE_GUARD(ACE_Thread_Mutex, Guard, Lock); if (!getNGrid(p.x_coord, p.y_coord)) { - sLog->outDebug(LOG_FILTER_MAPS, "Creating grid[%u,%u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId); + sLog->outDebug(LOG_FILTER_MAPS, "Creating grid[%u, %u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId); setNGrid(new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld->getBoolConfig(CONFIG_GRID_UNLOAD)), p.x_coord, p.y_coord); @@ -332,7 +332,7 @@ Map::EnsureGridCreated(const GridPair &p) int gy = (MAX_NUMBER_OF_GRIDS - 1) - p.y_coord; if (!GridMaps[gx][gy]) - LoadMapAndVMap(gx,gy); + LoadMapAndVMap(gx, gy); } } } @@ -349,11 +349,11 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player) { if (player) { - sLog->outStaticDebug("Player %s enter cell[%u,%u] triggers loading of grid[%u,%u] on map %u", player->GetName(), cell.CellX(), cell.CellY(), cell.GridX(), cell.GridY(), GetId()); + sLog->outStaticDebug("Player %s enter cell[%u, %u] triggers loading of grid[%u, %u] on map %u", player->GetName(), cell.CellX(), cell.CellY(), cell.GridX(), cell.GridY(), GetId()); } else { - sLog->outStaticDebug("Active object nearby triggers loading of grid [%u,%u] on map %u", cell.GridX(), cell.GridY(), GetId()); + sLog->outStaticDebug("Active object nearby triggers loading of grid [%u, %u] on map %u", cell.GridX(), cell.GridY(), GetId()); } ResetGridExpiry(*grid, 0.1f); @@ -369,15 +369,15 @@ bool Map::EnsureGridLoaded(const Cell &cell) ASSERT(grid != NULL); if (!isGridObjectDataLoaded(cell.GridX(), cell.GridY())) { - sLog->outDebug(LOG_FILTER_MAPS, "Loading grid[%u,%u] for map %u instance %u", cell.GridX(), cell.GridY(), GetId(), i_InstanceId); + sLog->outDebug(LOG_FILTER_MAPS, "Loading grid[%u, %u] for map %u instance %u", cell.GridX(), cell.GridY(), GetId(), i_InstanceId); - setGridObjectDataLoaded(true,cell.GridX(), cell.GridY()); + setGridObjectDataLoaded(true, cell.GridX(), cell.GridY()); ObjectGridLoader loader(*grid, this, cell); loader.LoadN(); // Add resurrectable corpses to world object list in grid - sObjectAccessor->AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this); + sObjectAccessor->AddCorpsesToGrid(GridPair(cell.GridX(), cell.GridY()), (*grid)(cell.CellX(), cell.CellY()), this); return true; } @@ -448,14 +448,14 @@ Map::Add(T *obj) NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); ASSERT(grid != NULL); - AddToGrid(obj,grid,cell); + AddToGrid(obj, grid, cell); //obj->SetMap(this); obj->AddToWorld(); if (obj->isActiveObject()) AddToActive(obj); - sLog->outStaticDebug("Object %u enters grid[%u,%u]", GUID_LOPART(obj->GetGUID()), cell.GridX(), cell.GridY()); + sLog->outStaticDebug("Object %u enters grid[%u, %u]", GUID_LOPART(obj->GetGUID()), cell.GridX(), cell.GridY()); //something, such as vehicle, needs to be update immediately //also, trigger needs to cast spell, if not update, cannot see visual @@ -493,7 +493,7 @@ void Map::VisitNearbyCellsOf(WorldObject* obj, TypeContainerVisitor<Trinity::Obj continue; markCell(cell_id); - CellPair pair(x,y); + CellPair pair(x, y); Cell cell(pair); cell.data.Part.reserved = CENTER_DISTRICT; cell.Visit(pair, gridVisitor, *this); @@ -606,7 +606,7 @@ void Map::ProcessRelocationNotifies(const uint32 & diff) if (!isCellMarked(cell_id)) continue; - CellPair pair(x,y); + CellPair pair(x, y); Cell cell(pair); cell.SetNoCreate(); @@ -647,7 +647,7 @@ void Map::ProcessRelocationNotifies(const uint32 & diff) if (!isCellMarked(cell_id)) continue; - CellPair pair(x,y); + CellPair pair(x, y); Cell cell(pair); cell.SetNoCreate(); Visit(cell, grid_notifier); @@ -669,15 +669,15 @@ void Map::Remove(Player *player, bool remove) { Cell cell(p); if (!getNGrid(cell.data.Part.grid_x, cell.data.Part.grid_y)) - sLog->outError("Map::Remove() i_grids was NULL x:%d, y:%d",cell.data.Part.grid_x,cell.data.Part.grid_y); + sLog->outError("Map::Remove() i_grids was NULL x:%d, y:%d", cell.data.Part.grid_x, cell.data.Part.grid_y); else { - sLog->outStaticDebug("Remove player %s from grid[%u,%u]", player->GetName(), cell.GridX(), cell.GridY()); + sLog->outStaticDebug("Remove player %s from grid[%u, %u]", player->GetName(), cell.GridX(), cell.GridY()); NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); ASSERT(grid != NULL); player->UpdateObjectVisibility(true); - RemoveFromGrid(player,grid,cell); + RemoveFromGrid(player, grid, cell); } } @@ -703,12 +703,12 @@ Map::Remove(T *obj, bool remove) Cell cell(p); if (loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y))) { - sLog->outStaticDebug("Remove object " UI64FMTD " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y); + sLog->outStaticDebug("Remove object " UI64FMTD " from grid[%u, %u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y); NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); ASSERT(grid != NULL); obj->UpdateObjectVisibility(true); - RemoveFromGrid(obj,grid,cell); + RemoveFromGrid(obj, grid, cell); } } @@ -738,16 +738,16 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati if (old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell)) { - sLog->outStaticDebug("Player %s relocation grid[%u,%u]cell[%u,%u]->grid[%u,%u]cell[%u,%u]", player->GetName(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); + sLog->outStaticDebug("Player %s relocation grid[%u, %u]cell[%u, %u]->grid[%u, %u]cell[%u, %u]", player->GetName(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY()); - RemoveFromGrid(player, oldGrid,old_cell); + RemoveFromGrid(player, oldGrid, old_cell); if (old_cell.DiffGrid(new_cell)) EnsureGridLoadedAtEnter(new_cell, player); NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY()); - AddToGrid(player, newGrid,new_cell); + AddToGrid(player, newGrid, new_cell); } player->UpdateObjectVisibility(false); @@ -756,7 +756,7 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati void Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang, bool respawnRelocationOnFail) { - ASSERT(CheckGridIntegrity(creature,false)); + ASSERT(CheckGridIntegrity(creature, false)); Cell old_cell = creature->GetCurrentCell(); @@ -770,7 +770,7 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) added to moving list from grid[%u,%u]cell[%u,%u] to grid[%u,%u]cell[%u,%u].", creature->GetGUIDLow(), creature->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) added to moving list from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", creature->GetGUIDLow(), creature->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); #endif AddCreatureToMoveList(creature, x, y, z, ang); // in diffcell/diffgrid case notifiers called at finishing move creature in Map::MoveAllCreaturesInMoveList @@ -781,7 +781,7 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang creature->UpdateObjectVisibility(false); } - ASSERT(CheckGridIntegrity(creature,true)); + ASSERT(CheckGridIntegrity(creature, true)); } void Map::AddCreatureToMoveList(Creature *c, float x, float y, float z, float ang) @@ -807,11 +807,11 @@ void Map::MoveAllCreaturesInMoveList() Cell new_cell(new_val); // do move or do move to respawn or remove creature if previous all fail - if (CreatureCellRelocation(c,new_cell)) + if (CreatureCellRelocation(c, new_cell)) { // update pos c->Relocate(cm.x, cm.y, cm.z, cm.ang); - //CreatureRelocationNotify(c,new_cell,new_cell.cellPair()); + //CreatureRelocationNotify(c, new_cell, new_cell.cellPair()); c->UpdateObjectVisibility(false); } else @@ -822,7 +822,7 @@ void Map::MoveAllCreaturesInMoveList() { // ... or unload (if respawn grid also not loaded) #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) cannot be move to unloaded respawn grid.",c->GetGUIDLow(),c->GetEntry()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) cannot be move to unloaded respawn grid.", c->GetGUIDLow(), c->GetEntry()); #endif AddObjectToRemoveList(c); } @@ -839,16 +839,16 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell) if (old_cell.DiffCell(new_cell)) { #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "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()); + sLog->outDebug(LOG_FILTER_MAPS, "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 - RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); - AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),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 { #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved in same grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved in same grid[%u, %u]cell[%u, %u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); #endif } @@ -861,11 +861,11 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell) EnsureGridLoadedAtEnter(new_cell); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Active creature (GUID: %u Entry: %u) moved from grid[%u,%u]cell[%u,%u] to grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Active creature (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); #endif - RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); - AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); + RemoveFromGrid(c, getNGrid(old_cell.GridX(), old_cell.GridY()), old_cell); + AddToGrid(c, getNGrid(new_cell.GridX(), new_cell.GridY()), new_cell); return true; } @@ -874,19 +874,19 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell) if (loaded(GridPair(new_cell.GridX(), new_cell.GridY()))) { #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved from grid[%u,%u]cell[%u,%u] to grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); #endif - RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); + RemoveFromGrid(c, getNGrid(old_cell.GridX(), old_cell.GridY()), old_cell); EnsureGridCreated(GridPair(new_cell.GridX(), new_cell.GridY())); - AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); + AddToGrid(c, getNGrid(new_cell.GridX(), new_cell.GridY()), new_cell); return true; } // fail to move: normal creature attempt move to unloaded grid #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) attempted to move from grid[%u,%u]cell[%u,%u] to unloaded grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) attempted to move from grid[%u, %u]cell[%u, %u] to unloaded grid[%u, %u]cell[%u, %u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); #endif return false; } @@ -903,15 +903,15 @@ bool Map::CreatureRespawnRelocation(Creature *c) c->GetMotionMaster()->Clear(); #ifdef TRINITY_DEBUG - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved from grid[%u,%u]cell[%u,%u] to respawn grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), c->GetCurrentCell().GridX(), c->GetCurrentCell().GridY(), c->GetCurrentCell().CellX(), c->GetCurrentCell().CellY(), resp_cell.GridX(), resp_cell.GridY(), resp_cell.CellX(), resp_cell.CellY()); + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to respawn grid[%u, %u]cell[%u, %u].", c->GetGUIDLow(), c->GetEntry(), c->GetCurrentCell().GridX(), c->GetCurrentCell().GridY(), c->GetCurrentCell().CellX(), c->GetCurrentCell().CellY(), resp_cell.GridX(), resp_cell.GridY(), resp_cell.CellX(), resp_cell.CellY()); #endif // teleport it to respawn point (like normal respawn if player see) - if (CreatureCellRelocation(c,resp_cell)) + if (CreatureCellRelocation(c, resp_cell)) { c->Relocate(resp_x, resp_y, resp_z, resp_o); c->GetMotionMaster()->Initialize(); // prevent possible problems with default move generators - //CreatureRelocationNotify(c,resp_cell,resp_cell.cellPair()); + //CreatureRelocationNotify(c, resp_cell, resp_cell.cellPair()); c->UpdateObjectVisibility(false); return true; } @@ -928,7 +928,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll) if (!unloadAll && ActiveObjectsNearGrid(x, y)) return false; - sLog->outDebug(LOG_FILTER_MAPS, "Unloading grid[%u,%u] for map %u", x,y, GetId()); + sLog->outDebug(LOG_FILTER_MAPS, "Unloading grid[%u, %u] for map %u", x, y, GetId()); ObjectGridUnloader unloader(*grid); @@ -978,7 +978,7 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll) GridMaps[gx][gy] = NULL; } - sLog->outStaticDebug("Unloading grid[%u,%u] for map %u finished", x,y, GetId()); + sLog->outStaticDebug("Unloading grid[%u, %u] for map %u finished", x, y, GetId()); return true; } @@ -1053,7 +1053,7 @@ bool GridMap::loadData(char *filename) if (!in) return true; - if (fread(&header, sizeof(header),1,in) != 1) + if (fread(&header, sizeof(header), 1, in) != 1) { fclose(in); return false; @@ -1234,11 +1234,11 @@ float GridMap::getHeightFromFloat(float x, float y) const // Height stored as: h5 - its v8 grid, h1-h4 - its v9 grid // +--------------> X // | h1-------h2 Coordinates is: - // | | \ 1 / | h1 0,0 - // | | \ / | h2 0,1 - // | | 2 h5 3 | h3 1,0 - // | | / \ | h4 1,1 - // | | / 4 \ | h5 1/2,1/2 + // | | \ 1 / | h1 0, 0 + // | | \ / | h2 0, 1 + // | | 2 h5 3 | h3 1, 0 + // | | / \ | h4 1, 1 + // | | / 4 \ | h5 1/2, 1/2 // | h3-------h4 // V Y // For find height need @@ -1246,7 +1246,7 @@ float GridMap::getHeightFromFloat(float x, float y) const // 2 - solve linear equation from triangle points // Calculate coefficients for solve h = a*x + b*y + c - float a,b,c; + float a, b, c; // Select triangle: if (x+y < 1) { @@ -1533,7 +1533,7 @@ inline GridMap *Map::GetGrid(float x, float y) int gy=(int)(32-y/SIZE_OF_GRIDS); //grid y // ensure GridMap is loaded - EnsureGridCreated(GridPair(63-gx,63-gy)); + EnsureGridCreated(GridPair(63-gx, 63-gy)); return GridMaps[gx][gy]; } @@ -1544,7 +1544,7 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps, float maxSearchD float mapHeight; if (GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y)) { - float _mapheight = gmap->getHeight(x,y); + float _mapheight = gmap->getHeight(x, y); // look from a bit higher pos to find the floor, ignore under surface case if (z + 2.0f > _mapheight) @@ -1653,7 +1653,7 @@ bool Map::GetAreaInfo(float x, float y, float z, uint32 &flags, int32 &adtId, in // check if there's terrain between player height and object height if(GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y)) { - float _mapheight = gmap->getHeight(x,y); + float _mapheight = gmap->getHeight(x, y); // z + 2.0f condition taken from GetHeight(), not sure if it's such a great choice... if(z + 2.0f > _mapheight && _mapheight > vmap_z) return false; @@ -1767,9 +1767,9 @@ float Map::GetWaterLevel(float x, float y) const return 0; } -uint32 Map::GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id) +uint32 Map::GetAreaIdByAreaFlag(uint16 areaflag, uint32 map_id) { - AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id); + AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id); if (entry) return entry->ID; @@ -1777,9 +1777,9 @@ uint32 Map::GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id) return 0; } -uint32 Map::GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id) +uint32 Map::GetZoneIdByAreaFlag(uint16 areaflag, uint32 map_id) { - AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id); + AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id); if (entry) return (entry->zone != 0) ? entry->zone : entry->ID; @@ -1787,9 +1787,9 @@ uint32 Map::GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id) return 0; } -void Map::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag,uint32 map_id) +void Map::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag, uint32 map_id) { - AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id); + AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag, map_id); areaid = entry ? entry->ID : 0; zoneid = entry ? ((entry->zone != 0) ? entry->zone : entry->ID) : 0; @@ -1826,9 +1826,9 @@ bool Map::CheckGridIntegrity(Creature* c, bool moved) const Cell xy_cell(xy_val); if (xy_cell != cur_cell) { - sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u) X: %f Y: %f (%s) is in grid[%u,%u]cell[%u,%u] instead of grid[%u,%u]cell[%u,%u]", + sLog->outDebug(LOG_FILTER_MAPS, "Creature (GUID: %u) X: %f Y: %f (%s) is in grid[%u, %u]cell[%u, %u] instead of grid[%u, %u]cell[%u, %u]", c->GetGUIDLow(), - c->GetPositionX(),c->GetPositionY(),(moved ? "final" : "original"), + c->GetPositionX(), c->GetPositionY(), (moved ? "final" : "original"), cur_cell.GridX(), cur_cell.GridY(), cur_cell.CellX(), cur_cell.CellY(), xy_cell.GridX(), xy_cell.GridY(), xy_cell.CellX(), xy_cell.CellY()); return true; // not crash at error, just output error in debug mode @@ -1952,7 +1952,7 @@ inline void Map::setNGrid(NGridType *grid, uint32 x, uint32 y) { if (x >= MAX_NUMBER_OF_GRIDS || y >= MAX_NUMBER_OF_GRIDS) { - sLog->outError("map::setNGrid() Invalid grid coordinates found: %d, %d!",x,y); + sLog->outError("map::setNGrid() Invalid grid coordinates found: %d, %d!", x, y); ASSERT(false); } i_grids[x][y] = grid; @@ -1962,7 +1962,7 @@ void Map::DelayedUpdate(const uint32 t_diff) { RemoveAllObjectsInRemoveList(); - // Don't unload grids if it's battleground, since we may have manually added GOs,creatures, those doesn't load from DB at grid re-load ! + // Don't unload grids if it's battleground, since we may have manually added GOs, creatures, those doesn't load from DB at grid re-load ! // This isn't really bother us, since as soon as we have instanced BG-s, the whole map unloads as the BG gets ended if (!IsBattlegroundOrArena()) { @@ -1984,7 +1984,7 @@ void Map::AddObjectToRemoveList(WorldObject *obj) obj->CleanupsBeforeDelete(false); // remove or simplify at least cross referenced links i_objectsToRemove.insert(obj); - //sLog->outDebug(LOG_FILTER_MAPS, "Object (GUID: %u TypeId: %u) added to removing list.",obj->GetGUIDLow(),obj->GetTypeId()); + //sLog->outDebug(LOG_FILTER_MAPS, "Object (GUID: %u TypeId: %u) added to removing list.", obj->GetGUIDLow(), obj->GetTypeId()); } void Map::AddObjectToSwitchList(WorldObject *obj, bool on) @@ -2034,23 +2034,23 @@ void Map::RemoveAllObjectsInRemoveList() if (!corpse) sLog->outError("Tried to delete corpse/bones %u that is not in map.", obj->GetGUIDLow()); else - Remove(corpse,true); + Remove(corpse, true); break; } case TYPEID_DYNAMICOBJECT: - Remove((DynamicObject*)obj,true); + Remove((DynamicObject*)obj, true); break; case TYPEID_GAMEOBJECT: - Remove((GameObject*)obj,true); + Remove((GameObject*)obj, true); break; case TYPEID_UNIT: // in case triggered sequence some spell can continue casting after prev CleanupsBeforeDelete call // make sure that like sources auras/etc removed before destructor start obj->ToCreature()->CleanupsBeforeDelete(); - Remove(obj->ToCreature(),true); + Remove(obj->ToCreature(), true); break; default: - sLog->outError("Non-grid object (TypeId: %u) is in grid object remove list, ignored.",obj->GetTypeId()); + sLog->outError("Non-grid object (TypeId: %u) is in grid object remove list, ignored.", obj->GetTypeId()); break; } @@ -2122,15 +2122,15 @@ void Map::AddToActive(Creature* c) // also not allow unloading spawn grid to prevent creating creature clone at load if (!c->isPet() && c->GetDBTableGUIDLow()) { - float x,y,z; - c->GetRespawnCoord(x,y,z); + float x, y, z; + c->GetRespawnCoord(x, y, z); GridPair p = Trinity::ComputeGridPair(x, y); if (getNGrid(p.x_coord, p.y_coord)) getNGrid(p.x_coord, p.y_coord)->incUnloadActiveLock(); else { GridPair p2 = Trinity::ComputeGridPair(c->GetPositionX(), c->GetPositionY()); - sLog->outError("Active creature (GUID: %u Entry: %u) added to grid[%u,%u] but spawn grid[%u,%u] was not loaded.", + sLog->outError("Active creature (GUID: %u Entry: %u) added to grid[%u, %u] but spawn grid[%u, %u] was not loaded.", c->GetGUIDLow(), c->GetEntry(), p.x_coord, p.y_coord, p2.x_coord, p2.y_coord); } } @@ -2143,15 +2143,15 @@ void Map::RemoveFromActive(Creature* c) // also allow unloading spawn grid if (!c->isPet() && c->GetDBTableGUIDLow()) { - float x,y,z; - c->GetRespawnCoord(x,y,z); + float x, y, z; + c->GetRespawnCoord(x, y, z); GridPair p = Trinity::ComputeGridPair(x, y); if (getNGrid(p.x_coord, p.y_coord)) getNGrid(p.x_coord, p.y_coord)->decUnloadActiveLock(); else { GridPair p2 = Trinity::ComputeGridPair(c->GetPositionX(), c->GetPositionY()); - sLog->outError("Active creature (GUID: %u Entry: %u) removed from grid[%u,%u] but spawn grid[%u,%u] was not loaded.", + sLog->outError("Active creature (GUID: %u Entry: %u) removed from grid[%u, %u] but spawn grid[%u, %u] was not loaded.", c->GetGUIDLow(), c->GetEntry(), p.x_coord, p.y_coord, p2.x_coord, p2.y_coord); } } @@ -2162,8 +2162,8 @@ template void Map::Add(Creature *); template void Map::Add(GameObject *); template void Map::Add(DynamicObject *); -template void Map::Remove(Corpse *,bool); -template void Map::Remove(Creature *,bool); +template void Map::Remove(Corpse *, bool); +template void Map::Remove(Creature *, bool); template void Map::Remove(GameObject *, bool); template void Map::Remove(DynamicObject *, bool); @@ -2202,7 +2202,7 @@ bool InstanceMap::CanEnter(Player *player) { if (player->GetMapRef().getTarget() == this) { - sLog->outError("InstanceMap::CanEnter - player %s(%u) already in map %d,%d,%d!", player->GetName(), player->GetGUIDLow(), GetId(), GetInstanceId(), GetSpawnMode()); + sLog->outError("InstanceMap::CanEnter - player %s(%u) already in map %d, %d, %d!", player->GetName(), player->GetGUIDLow(), GetId(), GetInstanceId(), GetSpawnMode()); ASSERT(false); return false; } @@ -2296,7 +2296,7 @@ bool InstanceMap::Add(Player *player) // cannot enter other instances if bound permanently if (playerBind->save != mapSave) { - sLog->outError("InstanceMap::Add: player %s(%d) is permanently bound to instance %d,%d,%d,%d,%d,%d but he is being put into instance %d,%d,%d,%d,%d,%d", player->GetName(), player->GetGUIDLow(), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset()); + sLog->outError("InstanceMap::Add: player %s(%d) is permanently bound to instance %d, %d, %d, %d, %d, %d but he is being put into instance %d, %d, %d, %d, %d, %d", player->GetName(), player->GetGUIDLow(), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset()); return false; } } @@ -2308,9 +2308,9 @@ bool InstanceMap::Add(Player *player) InstanceGroupBind *groupBind = group->GetBoundInstance(this); if (playerBind) { - sLog->outError("InstanceMap::Add: player %s(%d) is being put into instance %d,%d,%d,%d,%d,%d but he is in group %d and is bound to instance %d,%d,%d,%d,%d,%d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset(), GUID_LOPART(group->GetLeaderGUID()), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset()); + sLog->outError("InstanceMap::Add: player %s(%d) is being put into instance %d, %d, %d, %d, %d, %d but he is in group %d and is bound to instance %d, %d, %d, %d, %d, %d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset(), GUID_LOPART(group->GetLeaderGUID()), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset()); if (groupBind) - sLog->outError("InstanceMap::Add: the group is bound to the instance %d,%d,%d,%d,%d,%d", groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty(), groupBind->save->GetPlayerCount(), groupBind->save->GetGroupCount(), groupBind->save->CanReset()); + sLog->outError("InstanceMap::Add: the group is bound to the instance %d, %d, %d, %d, %d, %d", groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty(), groupBind->save->GetPlayerCount(), groupBind->save->GetGroupCount(), groupBind->save->CanReset()); //ASSERT(false); return false; } @@ -2322,7 +2322,7 @@ bool InstanceMap::Add(Player *player) // cannot jump to a different instance without resetting it if (groupBind->save != mapSave) { - sLog->outError("InstanceMap::Add: player %s(%d) is being put into instance %d,%d,%d but he is in group %d which is bound to instance %d,%d,%d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), GUID_LOPART(group->GetLeaderGUID()), groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty()); + sLog->outError("InstanceMap::Add: player %s(%d) is being put into instance %d, %d, %d but he is in group %d which is bound to instance %d, %d, %d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), GUID_LOPART(group->GetLeaderGUID()), groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty()); if (mapSave) sLog->outError("MapSave players: %d, group count: %d", mapSave->GetPlayerCount(), mapSave->GetGroupCount()); else @@ -2538,7 +2538,7 @@ void InstanceMap::SetResetSchedule(bool on) MapDifficulty const* Map::GetMapDifficulty() const { - return GetMapDifficultyData(GetId(),GetDifficulty()); + return GetMapDifficultyData(GetId(), GetDifficulty()); } uint32 InstanceMap::GetMaxPlayers() const diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 0b245ecb347..bf4ba4aade9 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -207,11 +207,11 @@ struct CreatureMover float x, y, z, ang; }; -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform +// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif struct InstanceTemplate @@ -327,23 +327,23 @@ class Map : public GridRefManager<NGridType> bool IsInWater(float x, float y, float z, LiquidData *data = 0) const; bool IsUnderWater(float x, float y, float z) const; - static uint32 GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id); - static uint32 GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id); - static void GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag,uint32 map_id); + static uint32 GetAreaIdByAreaFlag(uint16 areaflag, uint32 map_id); + static uint32 GetZoneIdByAreaFlag(uint16 areaflag, uint32 map_id); + static void GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag, uint32 map_id); uint32 GetAreaId(float x, float y, float z) const { - return GetAreaIdByAreaFlag(GetAreaFlag(x,y,z),GetId()); + return GetAreaIdByAreaFlag(GetAreaFlag(x, y, z), GetId()); } uint32 GetZoneId(float x, float y, float z) const { - return GetZoneIdByAreaFlag(GetAreaFlag(x,y,z),GetId()); + return GetZoneIdByAreaFlag(GetAreaFlag(x, y, z), GetId()); } void GetZoneAndAreaId(uint32& zoneid, uint32& areaid, float x, float y, float z) const { - GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(x,y,z),GetId()); + GetZoneAndAreaIdByAreaFlag(zoneid, areaid, GetAreaFlag(x, y, z), GetId()); } void MoveAllCreaturesInMoveList(); @@ -441,7 +441,7 @@ class Map : public GridRefManager<NGridType> private: void LoadMapAndVMap(int gx, int gy); void LoadVMap(int gx, int gy); - void LoadMap(int gx,int gy, bool reload = false); + void LoadMap(int gx, int gy, bool reload = false); GridMap *GetGrid(float x, float y); void SetTimer(uint32 t) { i_gridExpiry = t < MIN_GRID_DELAY ? MIN_GRID_DELAY : t; } @@ -473,8 +473,8 @@ class Map : public GridRefManager<NGridType> return i_grids[x][y]; } - bool isGridObjectDataLoaded(uint32 x, uint32 y) const { return getNGrid(x,y)->isGridObjectDataLoaded(); } - void setGridObjectDataLoaded(bool pLoaded, uint32 x, uint32 y) { getNGrid(x,y)->setGridObjectDataLoaded(pLoaded); } + bool isGridObjectDataLoaded(uint32 x, uint32 y) const { return getNGrid(x, y)->isGridObjectDataLoaded(); } + void setGridObjectDataLoaded(bool pLoaded, uint32 x, uint32 y) { getNGrid(x, y)->setGridObjectDataLoaded(pLoaded); } void setNGrid(NGridType* grid, uint32 x, uint32 y); void ScriptsProcess(); @@ -644,7 +644,7 @@ Map::Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor) const uint32 cell_x = cell.CellX(); const uint32 cell_y = cell.CellY(); - if (!cell.NoCreate() || loaded(GridPair(x,y))) + if (!cell.NoCreate() || loaded(GridPair(x, y))) { EnsureGridLoaded(cell); getNGrid(x, y)->Visit(cell_x, cell_y, visitor); diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 12e484fbd11..b64f4a030f3 100755 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -187,7 +187,7 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save, } // some instances only have one difficulty - GetDownscaledMapDifficultyData(GetId(),difficulty); + GetDownscaledMapDifficultyData(GetId(), difficulty); sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal"); @@ -208,7 +208,7 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun sLog->outDebug(LOG_FILTER_MAPS, "MapInstanced::CreateBattleground: map bg %d for %d created.", InstanceId, GetId()); - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), bg->GetMinLevel()); uint8 spawnMode; diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index f34521aea46..c26454701ed 100755 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -288,14 +288,14 @@ void MapManager::DoDelayedMovesAndRemoves() { } -bool MapManager::ExistMapAndVMap(uint32 mapid, float x,float y) +bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) { - GridPair p = Trinity::ComputeGridPair(x,y); + GridPair p = Trinity::ComputeGridPair(x, y); int gx=63-p.x_coord; int gy=63-p.y_coord; - return Map::ExistMap(mapid,gx,gy) && Map::ExistVMap(mapid,gx,gy); + return Map::ExistMap(mapid, gx, gy) && Map::ExistVMap(mapid, gx, gy); } bool MapManager::IsValidMAP(uint32 mapid, bool startUp) diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 610d2626eda..8ca856cbd6f 100755 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -49,15 +49,15 @@ class MapManager } uint32 GetAreaId(uint32 mapid, float x, float y, float z) const { - return Map::GetAreaIdByAreaFlag(GetAreaFlag(mapid, x, y, z),mapid); + return Map::GetAreaIdByAreaFlag(GetAreaFlag(mapid, x, y, z), mapid); } uint32 GetZoneId(uint32 mapid, float x, float y, float z) const { - return Map::GetZoneIdByAreaFlag(GetAreaFlag(mapid, x, y, z),mapid); + return Map::GetZoneIdByAreaFlag(GetAreaFlag(mapid, x, y, z), mapid); } void GetZoneAndAreaId(uint32& zoneid, uint32& areaid, uint32 mapid, float x, float y, float z) { - Map::GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(mapid, x, y, z),mapid); + Map::GetZoneAndAreaIdByAreaFlag(zoneid, areaid, GetAreaFlag(mapid, x, y, z), mapid); } void Initialize(void); @@ -86,19 +86,19 @@ class MapManager static bool ExistMapAndVMap(uint32 mapid, float x, float y); static bool IsValidMAP(uint32 mapid, bool startUp); - static bool IsValidMapCoord(uint32 mapid, float x,float y) + static bool IsValidMapCoord(uint32 mapid, float x, float y) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y); + return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y); } - static bool IsValidMapCoord(uint32 mapid, float x,float y,float z) + static bool IsValidMapCoord(uint32 mapid, float x, float y, float z) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y,z); + return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z); } - static bool IsValidMapCoord(uint32 mapid, float x,float y,float z,float o) + static bool IsValidMapCoord(uint32 mapid, float x, float y, float z, float o) { - return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x,y,z,o); + return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z, o); } static bool IsValidMapCoord(WorldLocation const& loc) diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 0cd45b958c6..cf59106103f 100755 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -127,7 +127,7 @@ namespace Trinity nBaseExp = 580; break; default: - sLog->outError("BaseGain: Unsupported content level %u",content); + sLog->outError("BaseGain: Unsupported content level %u", content); nBaseExp = 45; break; } diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 56b9dfe2239..bff49fe385f 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1029,20 +1029,20 @@ enum TrinityStrings LANG_BG_SA_START_ONE_MINUTE = 10057, LANG_BG_SA_START_HALF_MINUTE = 10058, LANG_BG_SA_HAS_BEGUN = 10059, - LANG_BG_SA_IS_UNDER_ATTACK = 10060,//The %s is under attack! - LANG_BG_SA_WAS_DESTROYED = 10061,//The %s was destroyed! - LANG_BG_SA_ROUND_ONE_END = 10062,//Round 1 - finished! - LANG_BG_SA_ALLIANCE_CAPTURED_RELIC = 10063,//The Alliance captured the titan portal! - LANG_BG_SA_HORDE_CAPTURED_RELIC = 10064,//The Horde captured the titan portal! - LANG_BG_SA_ROUND_TWO_ONE_MINUTE = 10065,//Round 2 of the Battle for the Strand of the Ancients begins in 1 minute. - LANG_BG_SA_ROUND_TWO_START_HALF_MINUTE = 10066,//Round 2 begins in 30 seconds. Prepare yourselves! - LANG_BG_SA_CHAMBER_BREACHED = 10067,//The chamber has been breached! The titan relic is vulnerable! - LANG_BG_SA_A_GY_SOUTH = 10068,//The Alliance captured the South Graveyard! - LANG_BG_SA_A_GY_WEST = 10069,//The Alliance captured the West Graveyard! - LANG_BG_SA_A_GY_EAST = 10070,//The Alliance captured the East Graveyard! - LANG_BG_SA_H_GY_SOUTH = 10071,//The Horde captured the South Graveyard! - LANG_BG_SA_H_GY_WEST = 10072,//The Horde captured the West Graveyard! - LANG_BG_SA_H_GY_EAST = 10073,//The Horde captured the East Graveyard! + LANG_BG_SA_IS_UNDER_ATTACK = 10060, //The %s is under attack! + LANG_BG_SA_WAS_DESTROYED = 10061, //The %s was destroyed! + LANG_BG_SA_ROUND_ONE_END = 10062, //Round 1 - finished! + LANG_BG_SA_ALLIANCE_CAPTURED_RELIC = 10063, //The Alliance captured the titan portal! + LANG_BG_SA_HORDE_CAPTURED_RELIC = 10064, //The Horde captured the titan portal! + LANG_BG_SA_ROUND_TWO_ONE_MINUTE = 10065, //Round 2 of the Battle for the Strand of the Ancients begins in 1 minute. + LANG_BG_SA_ROUND_TWO_START_HALF_MINUTE = 10066, //Round 2 begins in 30 seconds. Prepare yourselves! + LANG_BG_SA_CHAMBER_BREACHED = 10067, //The chamber has been breached! The titan relic is vulnerable! + LANG_BG_SA_A_GY_SOUTH = 10068, //The Alliance captured the South Graveyard! + LANG_BG_SA_A_GY_WEST = 10069, //The Alliance captured the West Graveyard! + LANG_BG_SA_A_GY_EAST = 10070, //The Alliance captured the East Graveyard! + LANG_BG_SA_H_GY_SOUTH = 10071, //The Horde captured the South Graveyard! + LANG_BG_SA_H_GY_WEST = 10072, //The Horde captured the West Graveyard! + LANG_BG_SA_H_GY_EAST = 10073, //The Horde captured the East Graveyard! // Use for custom patches 11000-11999 LANG_AUTO_BROADCAST = 11000, diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index f9194b7b1d5..1683e43ee49 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -1228,7 +1228,7 @@ enum DispelType #define DISPEL_ALL_MASK ((1<<DISPEL_MAGIC) | (1<<DISPEL_CURSE) | (1<<DISPEL_DISEASE) | (1<<DISPEL_POISON)) -//To all Immune system,if target has immunes, +//To all Immune system, if target has immunes, //some spell that related to ImmuneToDispel or ImmuneToSchool or ImmuneToDamage type can't cast to it, //some spell_effects that related to ImmuneToEffect<effect>(only this effect in the spell) can't cast to it, //some aura(related to Mechanics or ImmuneToState<aura>) can't apply to it. diff --git a/src/server/game/Movement/DestinationHolderImp.h b/src/server/game/Movement/DestinationHolderImp.h index e43f8ad7600..fac415a27a5 100755 --- a/src/server/game/Movement/DestinationHolderImp.h +++ b/src/server/game/Movement/DestinationHolderImp.h @@ -28,7 +28,7 @@ template<typename TRAVELLER> void DestinationHolder<TRAVELLER>::_findOffSetPoint(float x1, float y1, float x2, float y2, float offset, float &x, float &y) { - /* given the point (x1, y1) and (x2, y2).. need to find the point (x,y) on the same line + /* given the point (x1, y1) and (x2, y2).. need to find the point (x, y) on the same line * such that the distance from (x, y) to (x2, y2) is offset. * Let the distance of p1 to p2 = d.. then the ratio of offset/d = (x2-x)/(x2-x1) * hence x = x2 - (offset/d)*(x2-x1) @@ -82,7 +82,7 @@ DestinationHolder<TRAVELLER>::StartTravel(TRAVELLER &traveller, bool sendMove) i_fromY = traveller.GetPositionY(); i_fromZ = traveller.GetPositionZ(); - i_totalTravelTime = traveller.GetTotalTrevelTimeTo(i_destX,i_destY,i_destZ); + i_totalTravelTime = traveller.GetTotalTrevelTimeTo(i_destX, i_destY, i_destZ); i_timeElapsed = 0; if (sendMove) traveller.MoveTo(i_destX, i_destY, i_destZ, i_totalTravelTime); @@ -113,7 +113,7 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, return true; if (traveller.GetTraveller().HasUnitState(UNIT_STAT_IN_FLIGHT)) - GetLocationNow(traveller.GetTraveller().GetBaseMap() ,x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation + GetLocationNow(traveller.GetTraveller().GetBaseMap() , x, y, z, true); // Should reposition Object with right Coord, so I can bypass some Grid Relocation else GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false); @@ -166,7 +166,7 @@ DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y else { //That part is good for mob Walking on the floor. But the floor is not always what we thought. - z = map->GetHeight(x,y,i_fromZ,false); // Disable cave check + z = map->GetHeight(x, y, i_fromZ, false); // Disable cave check const float groundDist = sqrt(distanceX*distanceX + distanceY*distanceY); const float zDist = fabs(i_fromZ - z) + 0.000001f; const float slope = groundDist / zDist; @@ -180,8 +180,8 @@ template<typename TRAVELLER> float DestinationHolder<TRAVELLER>::GetDistance3dFromDestSq(const WorldObject &obj) const { - float x,y,z; - obj.GetPosition(x,y,z); + float x, y, z; + obj.GetPosition(x, y, z); return (i_destX-x)*(i_destX-x)+(i_destY-y)*(i_destY-y)+(i_destZ-z)*(i_destZ-z); } diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 9aaae6035a9..6ef2e71d907 100755 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -243,7 +243,7 @@ MotionMaster::MoveChase(Unit* target, float dist, float angle) i_owner->GetGUIDLow(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); - Mutate(new TargetedMovementGenerator<Player>(*target,dist,angle), MOTION_SLOT_ACTIVE); + Mutate(new TargetedMovementGenerator<Player>(*target, dist, angle), MOTION_SLOT_ACTIVE); } else { @@ -251,7 +251,7 @@ MotionMaster::MoveChase(Unit* target, float dist, float angle) i_owner->GetEntry(), i_owner->GetGUIDLow(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); - Mutate(new TargetedMovementGenerator<Creature>(*target,dist,angle), MOTION_SLOT_ACTIVE); + Mutate(new TargetedMovementGenerator<Creature>(*target, dist, angle), MOTION_SLOT_ACTIVE); } } @@ -268,7 +268,7 @@ MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slo sLog->outStaticDebug("Player (GUID: %u) follow to %s (GUID: %u)", i_owner->GetGUIDLow(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); - Mutate(new TargetedMovementGenerator<Player>(*target,dist,angle), slot); + Mutate(new TargetedMovementGenerator<Player>(*target, dist, angle), slot); } else { @@ -276,7 +276,7 @@ MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slo i_owner->GetEntry(), i_owner->GetGUIDLow(), target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature", target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow()); - Mutate(new TargetedMovementGenerator<Creature>(*target,dist,angle), slot); + Mutate(new TargetedMovementGenerator<Creature>(*target, dist, angle), slot); } } @@ -286,13 +286,13 @@ MotionMaster::MovePoint(uint32 id, float x, float y, float z) if (i_owner->GetTypeId() == TYPEID_PLAYER) { sLog->outStaticDebug("Player (GUID: %u) targeted point (Id: %u X: %f Y: %f Z: %f)", i_owner->GetGUIDLow(), id, x, y, z); - Mutate(new PointMovementGenerator<Player>(id,x,y,z), MOTION_SLOT_ACTIVE); + Mutate(new PointMovementGenerator<Player>(id, x, y, z), MOTION_SLOT_ACTIVE); } else { sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)", i_owner->GetEntry(), i_owner->GetGUIDLow(), id, x, y, z); - Mutate(new PointMovementGenerator<Creature>(id,x,y,z), MOTION_SLOT_ACTIVE); + Mutate(new PointMovementGenerator<Creature>(id, x, y, z), MOTION_SLOT_ACTIVE); } } @@ -334,13 +334,13 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee if (i_owner->GetTypeId() == TYPEID_PLAYER) { sLog->outStaticDebug("Player (GUID: %u) jump to point (X: %f Y: %f Z: %f)", i_owner->GetGUIDLow(), x, y, z); - Mutate(new PointMovementGenerator<Player>(0,x,y,z), MOTION_SLOT_CONTROLLED); + Mutate(new PointMovementGenerator<Player>(0, x, y, z), MOTION_SLOT_CONTROLLED); } else { sLog->outStaticDebug("Creature (Entry: %u GUID: %u) jump to point (X: %f Y: %f Z: %f)", i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z); - Mutate(new PointMovementGenerator<Creature>(0,x,y,z), MOTION_SLOT_CONTROLLED); + Mutate(new PointMovementGenerator<Creature>(0, x, y, z), MOTION_SLOT_CONTROLLED); } i_owner->SendMonsterMove(x, y, z, moveFlag, time, speedZ); @@ -357,13 +357,13 @@ MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id) if (i_owner->GetTypeId() == TYPEID_PLAYER) { sLog->outStaticDebug("Player (GUID: %u) charge point (X: %f Y: %f Z: %f)", i_owner->GetGUIDLow(), x, y, z); - Mutate(new PointMovementGenerator<Player>(id,x,y,z), MOTION_SLOT_CONTROLLED); + Mutate(new PointMovementGenerator<Player>(id, x, y, z), MOTION_SLOT_CONTROLLED); } else { sLog->outStaticDebug("Creature (Entry: %u GUID: %u) charge point (X: %f Y: %f Z: %f)", i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z); - Mutate(new PointMovementGenerator<Creature>(id,x,y,z), MOTION_SLOT_CONTROLLED); + Mutate(new PointMovementGenerator<Creature>(id, x, y, z), MOTION_SLOT_CONTROLLED); } } @@ -380,7 +380,7 @@ MotionMaster::MoveSeekAssistance(float x, float y, float z) { if (i_owner->GetTypeId() == TYPEID_PLAYER) { - sLog->outError("Player (GUID: %u) attempt to seek assistance",i_owner->GetGUIDLow()); + sLog->outError("Player (GUID: %u) attempt to seek assistance", i_owner->GetGUIDLow()); } else { @@ -388,7 +388,7 @@ MotionMaster::MoveSeekAssistance(float x, float y, float z) i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z); i_owner->AttackStop(); i_owner->ToCreature()->SetReactState(REACT_PASSIVE); - Mutate(new AssistanceMovementGenerator(x,y,z), MOTION_SLOT_ACTIVE); + Mutate(new AssistanceMovementGenerator(x, y, z), MOTION_SLOT_ACTIVE); } } @@ -397,7 +397,7 @@ MotionMaster::MoveSeekAssistanceDistract(uint32 time) { if (i_owner->GetTypeId() == TYPEID_PLAYER) { - sLog->outError("Player (GUID: %u) attempt to call distract after assistance",i_owner->GetGUIDLow()); + sLog->outError("Player (GUID: %u) attempt to call distract after assistance", i_owner->GetGUIDLow()); } else { @@ -445,7 +445,7 @@ MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode) if (path < sTaxiPathNodesByPath.size()) { sLog->outStaticDebug("%s taxi to (Path %u node %u)", i_owner->GetName(), path, pathnode); - FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(sTaxiPathNodesByPath[path],pathnode); + FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(sTaxiPathNodesByPath[path], pathnode); Mutate(mgen, MOTION_SLOT_CONTROLLED); } else @@ -597,5 +597,5 @@ bool MotionMaster::GetDestination(float &x, float &y, float &z) if (empty()) return false; - return top()->GetDestination(x,y,z); + return top()->GetDestination(x, y, z); } diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 4c140d010c7..8ea450283e6 100755 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -151,13 +151,13 @@ class MotionMaster //: private std::stack<MovementGenerator *> void MoveFleeing(Unit* enemy, uint32 time = 0); void MovePoint(uint32 id, const Position &pos) { MovePoint(id, pos.m_positionX, pos.m_positionY, pos.m_positionZ); } - void MovePoint(uint32 id, float x,float y,float z); + void MovePoint(uint32 id, float x, float y, float z); void MoveCharge(float x, float y, float z, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE); void MoveFall(float z, uint32 id = 0); void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ); void MoveJumpTo(float angle, float speedXY, float speedZ); void MoveJump(float x, float y, float z, float speedXY, float speedZ); - void MoveSeekAssistance(float x,float y,float z); + void MoveSeekAssistance(float x, float y, float z); void MoveSeekAssistanceDistract(uint32 timer); void MoveTaxiFlight(uint32 path, uint32 pathnode); void MoveDistract(uint32 time); diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 5934a14d9be..ca9605c8d08 100755 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -79,9 +79,9 @@ class MovementGeneratorMedium : public MovementGenerator bool Update(T &u, const uint32 &time_diff); }; -struct SelectableMovement : public FactoryHolder<MovementGenerator,MovementGeneratorType> +struct SelectableMovement : public FactoryHolder<MovementGenerator, MovementGeneratorType> { - SelectableMovement(MovementGeneratorType mgt) : FactoryHolder<MovementGenerator,MovementGeneratorType>(mgt) {} + SelectableMovement(MovementGeneratorType mgt) : FactoryHolder<MovementGenerator, MovementGeneratorType>(mgt) {} }; template<class REAL_MOVEMENT> @@ -92,8 +92,8 @@ struct MovementGeneratorFactory : public SelectableMovement MovementGenerator* Create(void *) const; }; -typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGeneratorCreator; -typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; -typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; +typedef FactoryHolder<MovementGenerator, MovementGeneratorType> MovementGeneratorCreator; +typedef FactoryHolder<MovementGenerator, MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; +typedef FactoryHolder<MovementGenerator, MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; #endif diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 9b4cf3f1231..59c624519e2 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -25,7 +25,7 @@ #ifdef MAP_BASED_RAND_GEN #define rand_norm() unit.rand_norm() -#define urand(a,b) unit.urand(a,b) +#define urand(a, b) unit.urand(a, b) #endif template<class T> @@ -33,7 +33,7 @@ void ConfusedMovementGenerator<T>::Initialize(T &unit) { const float wander_distance = 11; - float x,y,z; + float x, y, z; x = unit.GetPositionX(); y = unit.GetPositionY(); z = unit.GetPositionZ(); @@ -140,7 +140,7 @@ ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff) // arrived, stop and wait a bit unit.ClearUnitState(UNIT_STAT_MOVE); - i_nextMove = urand(1,MAX_CONF_WAYPOINTS); + i_nextMove = urand(1, MAX_CONF_WAYPOINTS); i_nextMoveTime.Reset(urand(0, 1500-1)); // TODO: check the minimum reset time, should be probably higher } } diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h index 597a85af530..f85453bc040 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -40,7 +40,7 @@ class ConfusedMovementGenerator bool GetDestination(float &x, float &y, float &z) const { if (i_destinationHolder.HasArrived()) return false; - i_destinationHolder.GetDestination(x,y,z); + i_destinationHolder.GetDestination(x, y, z); return true; } diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 11dcd826fd2..ae091289299 100755 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -159,30 +159,30 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) temp_y = y + distance * sin(angle); Trinity::NormalizeMapCoord(temp_x); Trinity::NormalizeMapCoord(temp_y); - if (owner.IsWithinLOS(temp_x,temp_y,z)) + if (owner.IsWithinLOS(temp_x, temp_y, z)) { - bool is_water_now = _map->IsInWater(x,y,z); + bool is_water_now = _map->IsInWater(x, y, z); - if (is_water_now && _map->IsInWater(temp_x,temp_y,z)) + if (is_water_now && _map->IsInWater(temp_x, temp_y, z)) { x = temp_x; y = temp_y; return true; } - float new_z = _map->GetHeight(temp_x,temp_y,z,true); + float new_z = _map->GetHeight(temp_x, temp_y, z, true); if (new_z <= INVALID_HEIGHT) continue; - bool is_water_next = _map->IsInWater(temp_x,temp_y,new_z); + bool is_water_next = _map->IsInWater(temp_x, temp_y, new_z); if ((is_water_now && !is_water_next && !is_land_ok) || (!is_water_now && is_water_next && !is_water_ok)) continue; if (!(new_z - z) || distance / fabs(new_z - z) > 1.0f) { - float new_z_left = _map->GetHeight(temp_x + (float)(cos(angle+M_PI/2)),temp_y + (float)(sin(angle+M_PI/2)),z,true); - float new_z_right = _map->GetHeight(temp_x + (float)(cos(angle-M_PI/2)),temp_y + (float)(sin(angle-M_PI/2)),z,true); + float new_z_left = _map->GetHeight(temp_x + (float)(cos(angle+M_PI/2)), temp_y + (float)(sin(angle+M_PI/2)), z, true); + float new_z_right = _map->GetHeight(temp_x + (float)(cos(angle-M_PI/2)), temp_y + (float)(sin(angle-M_PI/2)), z, true); if (fabs(new_z_left - new_z) < 1.2f && fabs(new_z_right - new_z) < 1.2f) { x = temp_x; @@ -194,7 +194,7 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) } } i_to_distance_from_caster = 0.0f; - i_nextCheckTime.Reset(urand(500,1000)); + i_nextCheckTime.Reset(urand(500, 1000)); return false; } @@ -218,7 +218,7 @@ FleeingMovementGenerator<T>::_setMoveData(T &owner) { // we are very far or too close, stopping i_to_distance_from_caster = 0.0f; - i_nextCheckTime.Reset(urand(500,1000)); + i_nextCheckTime.Reset(urand(500, 1000)); return false; } else diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 461d27461fb..e8cb46e2a1d 100755 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -76,7 +76,7 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff // restore orientation of not moving creature at returning to home if (owner.GetDefaultMovementType() == IDLE_MOTION_TYPE) { - //sLog->outDebug("Entering HomeMovement::GetDestination(z,y,z)"); + //sLog->outDebug("Entering HomeMovement::GetDestination(z, y, z)"); owner.SetOrientation(ori); WorldPacket packet; owner.BuildHeartBeatMsg(&packet); diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h index 82284bee0ce..2b50d380fb8 100755 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h @@ -44,7 +44,7 @@ class HomeMovementGenerator<Creature> void modifyTravelTime(uint32 travel_time) { i_travel_timer = travel_time; } MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; } - bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } + bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x, y, z); return true; } private: void _setTargetLocation(Creature &); diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 9aa2088cbe8..a75a5b64f10 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -29,8 +29,8 @@ void PointMovementGenerator<T>::Initialize(T &unit) { unit.StopMoving(); Traveller<T> traveller(unit); - // knockback effect has UNIT_STAT_JUMPING set,so if here we disable sentmonstermove there will be creature position sync problem between client and server - i_destinationHolder.SetDestination(traveller,i_x,i_y,i_z, true /* !unit.HasUnitState(UNIT_STAT_JUMPING)*/); + // knockback effect has UNIT_STAT_JUMPING set, so if here we disable sentmonstermove there will be creature position sync problem between client and server + i_destinationHolder.SetDestination(traveller, i_x, i_y, i_z, true /* !unit.HasUnitState(UNIT_STAT_JUMPING)*/); } template<class T> diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 03c547b5cdc..47853b37325 100755 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -44,7 +44,7 @@ class PointMovementGenerator bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; } private: uint32 id; - float i_x,i_y,i_z; + float i_x, i_y, i_z; TimeTracker i_nextMoveTime; DestinationHolder< Traveller<T> > i_destinationHolder; bool arrived; diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 9918ad579b0..c165831027a 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -47,7 +47,7 @@ template<> void RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) { - float X,Y,Z,z,nx,ny,nz,ori,dist; + float X, Y, Z, z, nx, ny, nz, ori, dist; creature.GetHomePosition(X, Y, Z, ori); @@ -97,13 +97,13 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) // The fastest way to get an accurate result 90% of the time. // Better result can be obtained like 99% accuracy with a ray light, but the cost is too high and the code is too long. - nz = map->GetHeight(nx,ny,Z+dist-2.0f,false); // Map check + nz = map->GetHeight(nx, ny, Z+dist-2.0f, false); // Map check if (fabs(nz-Z)>dist) { - nz = map->GetHeight(nx,ny,Z-2.0f,true); // Vmap Horizontal or above + nz = map->GetHeight(nx, ny, Z-2.0f, true); // Vmap Horizontal or above if (fabs(nz-Z)>dist) { - nz = map->GetHeight(nx,ny,Z+dist-2.0f,true); // Vmap Higher + nz = map->GetHeight(nx, ny, Z+dist-2.0f, true); // Vmap Higher if (fabs(nz-Z)>dist) continue; // let's forget this bad coords where a z cannot be find and retry at next tick } @@ -113,7 +113,7 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) } Traveller<Creature> traveller(creature); - creature.SetOrientation(creature.GetAngle(nx,ny)); + creature.SetOrientation(creature.GetAngle(nx, ny)); i_destinationHolder.SetDestination(traveller, nx, ny, nz); creature.AddUnitState(UNIT_STAT_ROAMING); if (is_air_ok) @@ -123,7 +123,7 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) //else if (is_water_ok) // Swimming mode to be done with more than this check else { - i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(),5000+i_destinationHolder.GetTotalTravelTime())); + i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(), 5000+i_destinationHolder.GetTotalTravelTime())); creature.AddUnitMovementFlag(MOVEMENTFLAG_WALKING); } @@ -144,7 +144,7 @@ RandomMovementGenerator<Creature>::Initialize(Creature &creature) if (!wander_distance) wander_distance = creature.GetRespawnRadius(); - if (irand(0,RUNNING_CHANCE_RANDOMMV) > 0) + if (irand(0, RUNNING_CHANCE_RANDOMMV) > 0) creature.AddUnitMovementFlag(MOVEMENTFLAG_WALKING); _setRandomLocation(creature); } @@ -185,11 +185,11 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff { if (i_nextMoveTime.Passed()) { - if (irand(0,RUNNING_CHANCE_RANDOMMV) > 0) + if (irand(0, RUNNING_CHANCE_RANDOMMV) > 0) creature.AddUnitMovementFlag(MOVEMENTFLAG_WALKING); _setRandomLocation(creature); } - else if (creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(),PET_FOLLOW_DIST+2.5f)) + else if (creature.isPet() && creature.GetOwner() && !creature.IsWithinDist(creature.GetOwner(), PET_FOLLOW_DIST+2.5f)) { creature.RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); _setRandomLocation(creature); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h index b7d7c7196d6..63d006c12b7 100755 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -37,9 +37,9 @@ class RandomMovementGenerator void Reset(T &); bool Update(T &, const uint32 &); bool GetDestination(float &x, float &y, float &z) const; - void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z) + void UpdateMapPosition(uint32 mapid, float &x , float &y, float &z) { - i_destinationHolder.GetLocationNow(mapid, x,y,z); + i_destinationHolder.GetLocationNow(mapid, x, y, z); } MovementGeneratorType GetMovementGeneratorType() { return RANDOM_MOTION_TYPE; } private: diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 8080b842e52..c796fd6a355 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -122,7 +122,7 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) else { // to at i_offset distance from target and i_angle from target facing - i_target->GetClosePoint(x,y,z,owner.GetObjectSize(),i_offset,i_angle); + i_target->GetClosePoint(x, y, z, owner.GetObjectSize(), i_offset, i_angle); } /* @@ -138,7 +138,7 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) //We don't update Mob Movement, if the difference between New destination and last destination is < BothObjectSize float bothObjectSize = i_target->GetObjectSize() + owner.GetObjectSize() + CONTACT_DISTANCE; - if (i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x,y,z) < bothObjectSize) + if (i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x, y, z) < bothObjectSize) return; */ i_destinationHolder.SetDestination(traveller, x, y, z); @@ -230,7 +230,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff) owner.StopMoving(); if (owner.IsWithinMeleeRange(i_target.getTarget()) && !owner.HasUnitState(UNIT_STAT_FOLLOW)) - owner.Attack(i_target.getTarget(),true); + owner.Attack(i_target.getTarget(), true); } } diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index 60ced2e8e41..fc7dc50622f 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -54,7 +54,7 @@ class TargetedMovementGenerator bool GetDestination(float &x, float &y, float &z) const { if (i_destinationHolder.HasArrived() || !i_destinationHolder.HasDestination()) return false; - i_destinationHolder.GetDestination(x,y,z); + i_destinationHolder.GetDestination(x, y, z); return true; } diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index e3599b73cbd..74e67642891 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -199,7 +199,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) i_nextMoveTime.Reset(node->delay); //note: disable "start" for mtmap - if (node->event_id && urand(0,99) < node->event_chance) + if (node->event_id && urand(0, 99) < node->event_chance) unit.GetMap()->ScriptsStart(sWaypointScripts, node->event_id, &unit, NULL/*, false*/); i_destinationHolder.ResetTravelTime(); @@ -280,13 +280,13 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff) i_destinationHolder.ResetUpdate(FLIGHT_TRAVEL_UPDATE); if (i_destinationHolder.HasArrived()) { - DoEventIfAny(player,(*i_path)[i_currentNode], false); + DoEventIfAny(player, (*i_path)[i_currentNode], false); uint32 curMap = (*i_path)[i_currentNode].mapid; ++i_currentNode; if (MovementInProgress()) { - DoEventIfAny(player,(*i_path)[i_currentNode], true); + DoEventIfAny(player, (*i_path)[i_currentNode], true); sLog->outStaticDebug("loading node %u for player %s", i_currentNode, player.GetName()); if ((*i_path)[i_currentNode].mapid == curMap) diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 3139f8cf104..c7821a847fd 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -53,8 +53,8 @@ class PathMovementBase void ReloadPath(T &); uint32 GetCurrentNode() const { return i_currentNode; } - bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; } - bool GetPosition(float& x, float& y, float& z) const { i_destinationHolder.GetLocationNowNoMicroMovement(x,y,z); return true; } + bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x, y, z); return true; } + bool GetPosition(float& x, float& y, float& z) const { i_destinationHolder.GetLocationNowNoMicroMovement(x, y, z); return true; } protected: uint32 i_currentNode; @@ -94,7 +94,7 @@ class WaypointMovementGenerator */ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, FlightPathMovementGenerator >, -public PathMovementBase<Player,TaxiPathNodeList const*> +public PathMovementBase<Player, TaxiPathNodeList const*> { public: explicit FlightPathMovementGenerator(TaxiPathNodeList const& pathnodes, uint32 startNode = 0) @@ -115,7 +115,7 @@ public PathMovementBase<Player,TaxiPathNodeList const*> void SkipCurrentNode() { ++i_currentNode; } void DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure); - bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase<Player,TaxiPathNodeList const*>::GetDestination(x,y,z); } + bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase<Player, TaxiPathNodeList const*>::GetDestination(x, y, z); } void PreloadEndGrid(); void InitEndGridInfo(); diff --git a/src/server/game/Movement/Traveller.h b/src/server/game/Movement/Traveller.h index 51fff4a8df3..17fb44edcaf 100755 --- a/src/server/game/Movement/Traveller.h +++ b/src/server/game/Movement/Traveller.h @@ -60,7 +60,7 @@ struct Traveller template<class T> inline uint32 Traveller<T>::GetTotalTrevelTimeTo(float x, float y, float z) { - float dist = GetMoveDestinationTo(x,y,z); + float dist = GetMoveDestinationTo(x, y, z); float speed = Speed(); if (speed < 0.0f) return 0xfffffffe; // almost infinity-unit should stop diff --git a/src/server/game/Movement/Waypoints/Path.h b/src/server/game/Movement/Waypoints/Path.h index bf25dc4b856..bb874d67413 100755 --- a/src/server/game/Movement/Waypoints/Path.h +++ b/src/server/game/Movement/Waypoints/Path.h @@ -52,11 +52,11 @@ class Path return len; } - float GetTotalLength() const { return GetTotalLength(0,size()); } + float GetTotalLength() const { return GetTotalLength(0, size()); } float GetPassedLength(uint32 curnode, float x, float y, float z) { - float len = GetTotalLength(0,curnode); + float len = GetTotalLength(0, curnode); if (curnode > 0) { diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index 58db32882c8..67c1f9edb8a 100755 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -37,7 +37,7 @@ void WaypointStore::Load() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point"); + QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, move_flag, delay, action, action_chance FROM waypoint_data ORDER BY id, point"); if (!result) { @@ -61,7 +61,7 @@ void WaypointStore::Load() if (last_id != id) path_data = new WaypointPath; - float x,y,z; + float x, y, z; x = fields[2].GetFloat(); y = fields[3].GetFloat(); z = fields[4].GetFloat(); @@ -99,7 +99,7 @@ void WaypointStore::UpdatePath(uint32 id) QueryResult result; - result = WorldDatabase.PQuery("SELECT point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id); + result = WorldDatabase.PQuery("SELECT point, position_x, position_y, position_z, move_flag, delay, action, action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id); if (!result) return; @@ -114,7 +114,7 @@ void WaypointStore::UpdatePath(uint32 id) WaypointData *wp = new WaypointData; - float x,y,z; + float x, y, z; x = fields[1].GetFloat(); y = fields[2].GetFloat(); z = fields[3].GetFloat(); diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h index d62dee653b1..d14133ea844 100755 --- a/src/server/game/Movement/Waypoints/WaypointManager.h +++ b/src/server/game/Movement/Waypoints/WaypointManager.h @@ -26,7 +26,7 @@ struct WaypointData { uint32 id; - float x,y,z; + float x, y, z; bool run; uint32 delay; uint32 event_id; diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 8002c990281..ff0f7af71d1 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -144,7 +144,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type) { if (!m_Creatures[type]) { - sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted",type); + sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted", type); return false; } @@ -155,7 +155,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type) m_Creatures[type] = 0; return false; } - sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u",type); + sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u", type); uint32 guid = cr->GetDBTableGUIDLow(); // Don't save respawn time cr->SetRespawnTime(0); @@ -164,7 +164,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type) // beats me why this is needed, but with the recent removal "cleanup" some creatures stay in the map if "properly" deleted // so this is a big fat workaround, if AddObjectToRemoveList and DoDelayedMovesAndRemoves worked correctly, this wouldn't be needed //if (Map * map = sMapMgr->FindMap(cr->GetMapId())) - // map->Remove(cr,false); + // map->Remove(cr, false); // delete respawn time for this creature PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_GUID); stmt->setUInt32(0, guid); @@ -213,9 +213,9 @@ bool OPvPCapturePoint::DelCapturePoint() void OPvPCapturePoint::DeleteSpawns() { - for (std::map<uint32,uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i) + for (std::map<uint32, uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i) DelObject(i->first); - for (std::map<uint32,uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i) + for (std::map<uint32, uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i) DelCreature(i->first); DelCapturePoint(); } @@ -405,12 +405,12 @@ void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value) // send to all players present in the area for (PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) { - (*itr)->SendUpdateWorldState(field,value); + (*itr)->SendUpdateWorldState(field, value); } } } -void OPvPCapturePoint::SendObjectiveComplete(uint32 id,uint64 guid) +void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid) { uint32 team; switch(m_State) @@ -480,7 +480,7 @@ bool OPvPCapturePoint::IsInsideObjective(Player *plr) const bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) - if (itr->second->HandleCustomSpell(plr,spellId,go)) + if (itr->second->HandleCustomSpell(plr, spellId, go)) return true; return false; @@ -496,7 +496,7 @@ bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameOb bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid) { for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr) - if (itr->second->HandleOpenGo(plr,guid) >= 0) + if (itr->second->HandleOpenGo(plr, guid) >= 0) return true; return false; @@ -546,7 +546,7 @@ bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/) int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid) { - std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid); + std::map<uint64, uint32>::iterator itr = m_ObjectTypes.find(guid); if (itr != m_ObjectTypes.end()) { return itr->second; diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 2a8927d1bb5..362217b1575 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -179,10 +179,10 @@ class OPvPCapturePoint // map to store the various gameobjects and creatures spawned by the objective // type , guid - std::map<uint32,uint64> m_Objects; - std::map<uint32,uint64> m_Creatures; - std::map<uint64,uint32> m_ObjectTypes; - std::map<uint64,uint32> m_CreatureTypes; + std::map<uint32, uint64> m_Objects; + std::map<uint32, uint64> m_Creatures; + std::map<uint64, uint32> m_ObjectTypes; + std::map<uint64, uint32> m_CreatureTypes; }; // base class for specific outdoor pvp handlers diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index ac79831a1da..dc03129c34e 100755 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -139,7 +139,7 @@ void OutdoorPvPMgr::HandlePlayerLeaveZone(Player *plr, uint32 zoneid) return; itr->second->HandlePlayerLeaveZone(plr, zoneid); - sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u",plr->GetGUIDLow(), itr->second->GetTypeId()); + sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u", plr->GetGUIDLow(), itr->second->GetTypeId()); } OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid) @@ -168,7 +168,7 @@ bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->HandleCustomSpell(plr,spellId,go)) + if ((*itr)->HandleCustomSpell(plr, spellId, go)) return true; } return false; @@ -187,7 +187,7 @@ bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid) { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->HandleOpenGo(plr,guid)) + if ((*itr)->HandleOpenGo(plr, guid)) return true; } return false; @@ -197,7 +197,7 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->HandleGossipOption(plr,guid,gossipid)) + if ((*itr)->HandleGossipOption(plr, guid, gossipid)) return; } } @@ -206,7 +206,7 @@ bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso) { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->CanTalkTo(plr,c,gso)) + if ((*itr)->CanTalkTo(plr, c, gso)) return true; } return false; @@ -216,7 +216,7 @@ void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId) { for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) { - if ((*itr)->HandleDropFlag(plr,spellId)) + if ((*itr)->HandleDropFlag(plr, spellId)) return; } } diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 9aead213ea4..e2a5bdfef91 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -193,7 +193,7 @@ void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint32 guid) if (!guid || EqualChanced[i].guid == guid) { Despawn1Object(EqualChanced[i].guid); - spawns.RemoveObject<T>(EqualChanced[i].guid,poolId); + spawns.RemoveObject<T>(EqualChanced[i].guid, poolId); } } } @@ -206,7 +206,7 @@ void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint32 guid) if (!guid || ExplicitlyChanced[i].guid == guid) { Despawn1Object(ExplicitlyChanced[i].guid); - spawns.RemoveObject<T>(ExplicitlyChanced[i].guid,poolId); + spawns.RemoveObject<T>(ExplicitlyChanced[i].guid, poolId); } } } @@ -364,7 +364,7 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj) if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) { Creature* pCreature = new Creature; - //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning creature %u",guid); + //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning creature %u", guid); if (!pCreature->LoadFromDB(obj->guid, map)) { delete pCreature; @@ -566,7 +566,7 @@ void PoolMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT entry,max_limit FROM pool_template"); + QueryResult result = WorldDatabase.Query("SELECT entry, max_limit FROM pool_template"); if (!result) { mPoolTemplate.clear(); @@ -626,7 +626,7 @@ void PoolMgr::LoadFromDB() } if (pool_id > max_pool_id) { - sLog->outErrorDb("`pool_creature` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.",pool_id); + sLog->outErrorDb("`pool_creature` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id); continue; } if (chance < 0 || chance > 100) @@ -694,7 +694,7 @@ void PoolMgr::LoadFromDB() if (pool_id > max_pool_id) { - sLog->outErrorDb("`pool_gameobject` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.",pool_id); + sLog->outErrorDb("`pool_gameobject` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id); continue; } @@ -748,17 +748,17 @@ void PoolMgr::LoadFromDB() if (mother_pool_id > max_pool_id) { - sLog->outErrorDb("`pool_pool` mother_pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.",mother_pool_id); + sLog->outErrorDb("`pool_pool` mother_pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", mother_pool_id); continue; } if (child_pool_id > max_pool_id) { - sLog->outErrorDb("`pool_pool` included pool_id (%u) is out of range compared to max pool id in `pool_template`, skipped.",child_pool_id); + sLog->outErrorDb("`pool_pool` included pool_id (%u) is out of range compared to max pool id in `pool_template`, skipped.", child_pool_id); continue; } if (mother_pool_id == child_pool_id) { - sLog->outErrorDb("`pool_pool` pool_id (%u) includes itself, dead-lock detected, skipped.",child_pool_id); + sLog->outErrorDb("`pool_pool` pool_id (%u) includes itself, dead-lock detected, skipped.", child_pool_id); continue; } if (chance < 0 || chance > 100) @@ -849,7 +849,7 @@ void PoolMgr::LoadFromDB() if (pool_id > max_pool_id) { - sLog->outErrorDb("`pool_quest` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.",pool_id); + sLog->outErrorDb("`pool_quest` pool id (%u) is out of range compared to max pool id in `pool_template`, skipped.", pool_id); continue; } diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 3f8fa81d488..96f4632769c 100755 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -42,7 +42,7 @@ class Pool // for Pool of Pool }; typedef std::set<uint32> ActivePoolObjects; -typedef std::map<uint32,uint32> ActivePoolPools; +typedef std::map<uint32, uint32> ActivePoolPools; class ActivePoolData { diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index e175ebcb48c..e285f5e1589 100755 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -45,7 +45,7 @@ int32 ReputationMgr::GetReputation(uint32 faction_id) const if (!factionEntry) { - sLog->outError("ReputationMgr::GetReputation: Can't get reputation of %s for unknown faction (faction id) #%u.",m_player->GetName(), faction_id); + sLog->outError("ReputationMgr::GetReputation: Can't get reputation of %s for unknown faction (faction id) #%u.", m_player->GetName(), faction_id); return 0; } @@ -98,7 +98,7 @@ ReputationRank ReputationMgr::GetBaseRank(FactionEntry const* factionEntry) cons return ReputationToRank(reputation); } -void ReputationMgr::ApplyForceReaction(uint32 faction_id,ReputationRank rank,bool apply) +void ReputationMgr::ApplyForceReaction(uint32 faction_id, ReputationRank rank, bool apply) { if (apply) m_forcedReactions[faction_id] = rank; @@ -248,7 +248,7 @@ void ReputationMgr::Initialize() if (newFaction.Flags & FACTION_FLAG_VISIBLE) ++m_visibleFactionCount; - UpdateRankCounters(REP_HOSTILE,GetBaseRank(factionEntry)); + UpdateRankCounters(REP_HOSTILE, GetBaseRank(factionEntry)); m_factions[newFaction.ReputationListID] = newFaction; } @@ -354,16 +354,16 @@ bool ReputationMgr::SetOneFactionReputation(FactionEntry const* factionEntry, in SetVisible(&itr->second); if (new_rank <= REP_HOSTILE) - SetAtWar(&itr->second,true); + SetAtWar(&itr->second, true); UpdateRankCounters(old_rank, new_rank); m_player->ReputationChanged(factionEntry); m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KNOWN_FACTIONS, factionEntry->ID); m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REPUTATION, factionEntry->ID); - m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION,factionEntry->ID); - m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION,factionEntry->ID); - m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_HONORED_REPUTATION,factionEntry->ID); + m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION, factionEntry->ID); + m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION, factionEntry->ID); + m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_HONORED_REPUTATION, factionEntry->ID); return true; } @@ -423,7 +423,7 @@ void ReputationMgr::SetAtWar(RepListID repListID, bool on) if (itr->second.Flags & (FACTION_FLAG_INVISIBLE_FORCED|FACTION_FLAG_HIDDEN)) return; - SetAtWar(&itr->second,on); + SetAtWar(&itr->second, on); } void ReputationMgr::SetAtWar(FactionState* faction, bool atWar) const @@ -451,7 +451,7 @@ void ReputationMgr::SetInactive(RepListID repListID, bool on) if (itr == m_factions.end()) return; - SetInactive(&itr->second,on); + SetInactive(&itr->second, on); } void ReputationMgr::SetInactive(FactionState* faction, bool inactive) const @@ -478,7 +478,7 @@ void ReputationMgr::LoadFromDB(PreparedQueryResult result) // Set initial reputations (so everything is nifty before DB data load) Initialize(); - //QueryResult *result = CharacterDatabase.PQuery("SELECT faction,standing,flags FROM character_reputation WHERE guid = '%u'",GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT faction, standing, flags FROM character_reputation WHERE guid = '%u'", GetGUIDLow()); if (result) { @@ -506,20 +506,20 @@ void ReputationMgr::LoadFromDB(PreparedQueryResult result) SetVisible(faction); // have internal checks for forced invisibility if (dbFactionFlags & FACTION_FLAG_INACTIVE) - SetInactive(faction,true); // have internal checks for visibility requirement + SetInactive(faction, true); // have internal checks for visibility requirement if (dbFactionFlags & FACTION_FLAG_AT_WAR) // DB at war - SetAtWar(faction,true); // have internal checks for FACTION_FLAG_PEACE_FORCED + SetAtWar(faction, true); // have internal checks for FACTION_FLAG_PEACE_FORCED else // DB not at war { // allow remove if visible (and then not FACTION_FLAG_INVISIBLE_FORCED or FACTION_FLAG_HIDDEN) if (faction->Flags & FACTION_FLAG_VISIBLE) - SetAtWar(faction,false); // have internal checks for FACTION_FLAG_PEACE_FORCED + SetAtWar(faction, false); // have internal checks for FACTION_FLAG_PEACE_FORCED } // set atWar for hostile if (GetRank(factionEntry) <= REP_HOSTILE) - SetAtWar(faction,true); + SetAtWar(faction, true); // reset changed flag if values similar to saved in DB if (faction->Flags == dbFactionFlags) @@ -540,7 +540,7 @@ void ReputationMgr::SaveToDB(SQLTransaction& trans) if (itr->second.needSave) { trans->PAppend("DELETE FROM character_reputation WHERE guid = '%u' AND faction='%u'", m_player->GetGUIDLow(), itr->second.ID); - trans->PAppend("INSERT INTO character_reputation (guid,faction,standing,flags) VALUES ('%u', '%u', '%i', '%u')", m_player->GetGUIDLow(), itr->second.ID, itr->second.Standing, itr->second.Flags); + trans->PAppend("INSERT INTO character_reputation (guid, faction, standing, flags) VALUES ('%u', '%u', '%i', '%u')", m_player->GetGUIDLow(), itr->second.ID, itr->second.Standing, itr->second.Flags); itr->second.needSave = false; } } diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 28181e8ecb1..4a6c60456eb 100755 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -56,8 +56,8 @@ struct FactionState bool needSave; }; -typedef std::map<RepListID,FactionState> FactionStateList; -typedef std::map<uint32,ReputationRank> ForcedReactions; +typedef std::map<RepListID, FactionState> FactionStateList; +typedef std::map<uint32, ReputationRank> ForcedReactions; class Player; @@ -127,7 +127,7 @@ class ReputationMgr void SetAtWar(RepListID repListID, bool on); void SetInactive(RepListID repListID, bool on); - void ApplyForceReaction(uint32 faction_id,ReputationRank rank,bool apply); + void ApplyForceReaction(uint32 faction_id, ReputationRank rank, bool apply); public: // senders void SendInitialReputations(); diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 7430f04f7fc..e6426051d96 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -32,12 +32,12 @@ #define SCR_REG_LST(T) ScriptRegistry<T>::ScriptPointerList // Utility macros for looping over scripts. -#define FOR_SCRIPTS(T,C,E) \ +#define FOR_SCRIPTS(T, C, E) \ if (SCR_REG_LST(T).empty()) \ return; \ for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ C != SCR_REG_LST(T).end(); ++C) -#define FOR_SCRIPTS_RET(T,C,E,R) \ +#define FOR_SCRIPTS_RET(T, C, E, R) \ if (SCR_REG_LST(T).empty()) \ return R; \ for (SCR_REG_ITR(T) C = SCR_REG_LST(T).begin(); \ @@ -47,11 +47,11 @@ itr->second // Utility macros for finding specific scripts. -#define GET_SCRIPT(T,I,V) \ +#define GET_SCRIPT(T, I, V) \ T* V = ScriptRegistry<T>::GetScriptById(I); \ if (!V) \ return; -#define GET_SCRIPT_RET(T,I,V,R) \ +#define GET_SCRIPT_RET(T, I, V, R) \ T* V = ScriptRegistry<T>::GetScriptById(I); \ if (!V) \ return R; @@ -463,7 +463,7 @@ void ScriptMgr::OnGroupRateCalculation(float& rate, uint32 count, bool isRaid) FOREACH_SCRIPT(FormulaScript)->OnGroupRateCalculation(rate, count, isRaid); } -#define SCR_MAP_BGN(M,V,I,E,C,T) \ +#define SCR_MAP_BGN(M, V, I, E, C, T) \ if (V->GetEntry()->T()) \ { \ FOR_SCRIPTS(M, I, E) \ diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 53e42784f84..40e5e64af1a 100755 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -43,7 +43,7 @@ void SystemMgr::LoadVersion() void SystemMgr::LoadScriptTexts() { sLog->outString("TSCR: Loading Script Texts..."); - LoadTrinityStrings("script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2)); + LoadTrinityStrings("script_texts", TEXT_SOURCE_RANGE, 1+(TEXT_SOURCE_RANGE*2)); sLog->outString("TSCR: Loading Script Texts additional data..."); uint32 oldMSTime = getMSTime(); @@ -105,7 +105,7 @@ void SystemMgr::LoadScriptTexts() void SystemMgr::LoadScriptTextsCustom() { sLog->outString("TSCR: Loading Custom Texts..."); - LoadTrinityStrings("custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3)); + LoadTrinityStrings("custom_texts", TEXT_SOURCE_RANGE*2, 1+(TEXT_SOURCE_RANGE*3)); sLog->outString("TSCR: Loading Custom Texts additional data..."); diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp index 7886b9e45cc..8fd112d81c2 100755 --- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp @@ -33,7 +33,7 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) uint64 guid; recvData >> guid; - sLog->outDebug(LOG_FILTER_NETWORKIO, "Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid))); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); if (Player* player = sObjectMgr->GetPlayer(guid)) { @@ -176,7 +176,7 @@ void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/) // Add player to team if (!arenaTeam->AddMember(_player->GetGUID())) { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_INTERNAL); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_INTERNAL); return; } @@ -354,7 +354,7 @@ void WorldSession::SendNotInArenaTeamPacket(uint8 type) uint32 unk = 0; data << uint32(unk); // unk(0) if (!unk) - data << uint8(type); // team type (2=2v2,3=3v3,5=5v5), can be used for custom types... + data << uint8(type); // team type (2=2v2, 3=3v3, 5=5v5), can be used for custom types... SendPacket(&data); } diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp index 4f4e7bf0a42..4d2445cba26 100755 --- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp @@ -37,7 +37,7 @@ void WorldSession::HandleAuctionHelloOpcode(WorldPacket & recv_data) uint64 guid; //NPC guid recv_data >> guid; - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); @@ -129,7 +129,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) if (!item || !bid || !etime) return; //check for cheaters - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); @@ -206,8 +206,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) if (GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", - GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1.c_str(),it->GetEntry(),count); + sLog->outCommand(GetAccountId(), "GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", + GetPlayerName(), GetAccountId(), it->GetTemplate()->Name1.c_str(), it->GetEntry(), count); } pl->ModifyMoney(-int32(deposit)); @@ -334,7 +334,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data) auction->bid = price; GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID, price); - trans->PAppend("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id); + trans->PAppend("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); } @@ -379,7 +379,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data) recv_data >> auctionId; //sLog->outDebug("Cancel AUCTION AuctionID: %u", auctionId); - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer))); @@ -460,11 +460,11 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data) recv_data >> outbiddedCount; if (recv_data.size() != (16 + outbiddedCount * 4)) { - sLog->outError("Client sent bad opcode!!! with count: %u and size : %lu (must be: %u)", outbiddedCount, (unsigned long)recv_data.size(),(16 + outbiddedCount * 4)); + sLog->outError("Client sent bad opcode!!! with count: %u and size : %lu (must be: %u)", outbiddedCount, (unsigned long)recv_data.size(), (16 + outbiddedCount * 4)); outbiddedCount = 0; } - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); @@ -495,7 +495,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data) } } - auctionHouse->BuildListBidderItems(data,pl,count,totalcount); + auctionHouse->BuildListBidderItems(data, pl, count, totalcount); data.put<uint32>(0, count); // add count to placeholder data << totalcount; data << (uint32)300; //unk 2.3.0 @@ -511,7 +511,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data) recv_data >> guid; recv_data >> listfrom; // not used in fact (this list not have page control in client) - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); @@ -530,7 +530,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data) uint32 count = 0; uint32 totalcount = 0; - auctionHouse->BuildListOwnerItems(data,_player,count,totalcount); + auctionHouse->BuildListOwnerItems(data, _player, count, totalcount); data.put<uint32>(0, count); data << (uint32) totalcount; data << (uint32) 0; @@ -564,7 +564,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) recv_data.read_skip<uint8>(); } - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); @@ -578,7 +578,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(pCreature->getFaction()); //sLog->outDebug("Auctionhouse search (GUID: %u TypeId: %u)", , list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", - // GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); + // GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4+4+4)); uint32 count = 0; @@ -587,15 +587,15 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data) // converting string that we try to find to lower case std::wstring wsearchedname; - if (!Utf8toWStr(searchedname,wsearchedname)) + if (!Utf8toWStr(searchedname, wsearchedname)) return; wstrToLower(wsearchedname); - auctionHouse->BuildListAuctionItems(data,_player, + auctionHouse->BuildListAuctionItems(data, _player, wsearchedname, listfrom, levelmin, levelmax, usable, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, - count,totalcount); + count, totalcount); data.put<uint32>(0, count); data << (uint32) totalcount; diff --git a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp index 51ca4d9d959..89ce740a228 100755 --- a/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp @@ -39,7 +39,7 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recv_data) { uint64 guid; recv_data >> guid; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid))); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); Creature *unit = GetPlayer()->GetMap()->GetCreature(guid); if (!unit) @@ -86,7 +86,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) if (!sBattlemasterListStore.LookupEntry(bgTypeId_)) { - sLog->outError("Battleground: invalid bgtype (%u) received. possible cheater? player guid %u",bgTypeId_,_player->GetGUIDLow()); + sLog->outError("Battleground: invalid bgtype (%u) received. possible cheater? player guid %u", bgTypeId_, _player->GetGUIDLow()); return; } @@ -119,7 +119,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) return; // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); if (!bracketEntry) return; @@ -189,7 +189,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) // send status packet (in queue) sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->ArenaType); SendPacket(&data); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, _player->GetGUIDLow(), _player->GetName()); } else { @@ -208,7 +208,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) if (err > 0) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: the following players are joining as group:"); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: the following players are joining as group:"); ginfo = bgQueue.AddGroup(_player, grp, bgTypeId, bracketEntry, 0, false, isPremade, 0, 0); avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry->GetBracketId()); } @@ -235,9 +235,9 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recv_data) member->GetSession()->SendPacket(&data); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); member->GetSession()->SendPacket(&data); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,member->GetGUIDLow(), member->GetName()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName()); } - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: group end"); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: group end"); } sBattlegroundMgr->ScheduleQueueUpdate(0, 0, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); @@ -404,7 +404,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) } // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); if (!bracketEntry) return; @@ -419,7 +419,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data2, ERR_GROUP_JOIN_BATTLEGROUND_DESERTERS); _player->GetSession()->SendPacket(&data2); action = 0; - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player %s (%u) has a deserter debuff, do not port him to battleground!", _player->GetName(), _player->GetGUIDLow()); } //if player don't match battleground max level, then do not allow him to enter! (this might happen when player leveled up during his waiting in queue if (_player->getLevel() > bg->GetMaxLevel()) @@ -469,8 +469,8 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) // bg->HandleBeforeTeleportToBattleground(_player); sBattlegroundMgr->SendToBattleground(_player, ginfo.IsInvitedToBGInstanceGUID, bgTypeId); // add only in HandleMoveWorldPortAck() - // bg->AddPlayer(_player,team); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player %s (%u) joined battle for bg %u, bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetInstanceID(), bg->GetTypeID(), bgQueueTypeId); + // bg->AddPlayer(_player, team); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player %s (%u) joined battle for bg %u, bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetInstanceID(), bg->GetTypeID(), bgQueueTypeId); break; case 0: // leave queue // if player leaves rated arena match before match start, it is counted as he played but he lost @@ -479,7 +479,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) ArenaTeam * at = sObjectMgr->GetArenaTeamById(ginfo.Team); if (at) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"UPDATING memberLost's personal arena rating for %u by opponents rating: %u, because he has left queue!", GUID_LOPART(_player->GetGUID()), ginfo.OpponentsTeamRating); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "UPDATING memberLost's personal arena rating for %u by opponents rating: %u, because he has left queue!", GUID_LOPART(_player->GetGUID()), ginfo.OpponentsTeamRating); at->MemberLost(_player, ginfo.OpponentsMatchmakerRating); at->SaveToDB(); } @@ -491,7 +491,7 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recv_data) if (!ginfo.ArenaType) sBattlegroundMgr->ScheduleQueueUpdate(ginfo.ArenaMatchmakerRating, ginfo.ArenaType, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); SendPacket(&data); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player %s (%u) left queue for bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetTypeID(), bgQueueTypeId); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player %s (%u) left queue for bgtype %u, queue type %u.", _player->GetName(), _player->GetGUIDLow(), bg->GetTypeID(), bgQueueTypeId); break; default: sLog->outError("Battleground port: unknown action %u", action); @@ -569,7 +569,7 @@ void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket & /*recv_data*/) continue; // expected bracket entry - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); if (!bracketEntry) continue; @@ -681,7 +681,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) BattlegroundTypeId bgTypeId = bg->GetTypeID(); BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(bgTypeId, arenatype); - PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),_player->getLevel()); + PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(), _player->getLevel()); if (!bracketEntry) return; @@ -736,10 +736,10 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) if (err > 0) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: arena join as group start"); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: arena join as group start"); if (isRated) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: arena team id %u, leader %s queued with matchmaker rating %u for type %u",_player->GetArenaTeamId(arenaslot),_player->GetName(),matchmakerRating,arenatype); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: arena team id %u, leader %s queued with matchmaker rating %u for type %u", _player->GetArenaTeamId(arenaslot), _player->GetName(), matchmakerRating, arenatype); bg->SetRated(true); } else @@ -772,7 +772,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) member->GetSession()->SendPacket(&data); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); member->GetSession()->SendPacket(&data); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player joined queue for arena as group bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,member->GetGUIDLow(), member->GetName()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player joined queue for arena as group bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, member->GetGUIDLow(), member->GetName()); } } else @@ -785,7 +785,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data) // send status packet (in queue) sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype); SendPacket(&data); - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"Battleground: player joined queue for arena, skirmish, bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Battleground: player joined queue for arena, skirmish, bg queue type %u bg type %u: GUID %u, NAME %s", bgQueueTypeId, bgTypeId, _player->GetGUIDLow(), _player->GetName()); } sBattlegroundMgr->ScheduleQueueUpdate(matchmakerRating, arenatype, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); } @@ -798,11 +798,11 @@ void WorldSession::HandleReportPvPAFK(WorldPacket & recv_data) if (!reportedPlayer) { - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"WorldSession::HandleReportPvPAFK: player not found"); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: player not found"); return; } - sLog->outDebug(LOG_FILTER_BATTLEGROUND,"WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName(), reportedPlayer->GetName()); + sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName(), reportedPlayer->GetName()); reportedPlayer->ReportedAfkBy(_player); } diff --git a/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp b/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp index 6553f2b3f93..1dd87a39986 100755 --- a/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CalendarHandler.cpp @@ -31,7 +31,7 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket & /*recv_data*/) time_t cur_time = time(NULL); - WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR,4+4*0+4+4*0+4+4); + WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR, 4+4*0+4+4*0+4+4); data << uint32(0); // invite count /* @@ -178,7 +178,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data) // recv_data >> (uint32)count; // if (count) // { - // uint8 unk12,unk13; + // uint8 unk12, unk13; // uint64 guid; // for (int i=0; i<count; i++) // { diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index f117d3306fe..145a9e88443 100755 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -207,7 +207,7 @@ void WorldSession::HandleCharEnum(QueryResult result) do { uint32 guidlow = (*result)[0].GetUInt32(); - sLog->outDetail("Loading char guid %u from account %u.",guidlow,GetAccountId()); + sLog->outDetail("Loading char guid %u from account %u.", guidlow, GetAccountId()); if (Player::BuildEnumData(result, &data)) { _allowedCharsToLogin.insert(guidlow); @@ -263,7 +263,7 @@ void WorldSession::HandleCharEnumOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) { std::string name; - uint8 race_,class_; + uint8 race_, class_; recv_data >> name; @@ -321,7 +321,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) if (raceEntry->expansion > Expansion()) { data << (uint8)CHAR_CREATE_EXPANSION; - sLog->outError("Expansion %u account:[%d] tried to Create character with expansion %u race (%u)",Expansion(),GetAccountId(),raceEntry->expansion,race_); + sLog->outError("Expansion %u account:[%d] tried to Create character with expansion %u race (%u)", Expansion(), GetAccountId(), raceEntry->expansion, race_); SendPacket(&data); return; } @@ -330,7 +330,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) if (classEntry->expansion > Expansion()) { data << (uint8)CHAR_CREATE_EXPANSION_CLASS; - sLog->outError("Expansion %u account:[%d] tried to Create character with expansion %u class (%u)",Expansion(),GetAccountId(),classEntry->expansion,class_); + sLog->outError("Expansion %u account:[%d] tried to Create character with expansion %u class (%u)", Expansion(), GetAccountId(), classEntry->expansion, class_); SendPacket(&data); return; } @@ -359,12 +359,12 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) { data << (uint8)CHAR_NAME_NO_NAME; SendPacket(&data); - sLog->outError("Account:[%d] but tried to Create character with empty [name] ",GetAccountId()); + sLog->outError("Account:[%d] but tried to Create character with empty [name] ", GetAccountId()); return; } // check name limitations - uint8 res = ObjectMgr::CheckPlayerName(name,true); + uint8 res = ObjectMgr::CheckPlayerName(name, true); if (res != CHAR_NAME_SUCCESS) { data << uint8(res); @@ -443,7 +443,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket & recv_data) if (!AllowTwoSideAccounts || skipCinematics == 1 || class_ == CLASS_DEATH_KNIGHT) { - QueryResult result2 = CharacterDatabase.PQuery("SELECT level,race,class FROM characters WHERE account = '%u' %s", + QueryResult result2 = CharacterDatabase.PQuery("SELECT level, race, class FROM characters WHERE account = '%u' %s", GetAccountId(), (skipCinematics == 1 || class_ == CLASS_DEATH_KNIGHT) ? "" : "LIMIT 1"); if (result2) { @@ -614,7 +614,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket & recv_data) return; } - QueryResult result = CharacterDatabase.PQuery("SELECT account,name FROM characters WHERE guid='%u'", GUID_LOPART(guid)); + QueryResult result = CharacterDatabase.PQuery("SELECT account, name FROM characters WHERE guid='%u'", GUID_LOPART(guid)); if (result) { Field *fields = result->Fetch(); @@ -627,15 +627,15 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket & recv_data) return; std::string IP_str = GetRemoteAddress(); - sLog->outDetail("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)",GetAccountId(),IP_str.c_str(),name.c_str(),GUID_LOPART(guid)); - sLog->outChar("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)",GetAccountId(),IP_str.c_str(),name.c_str(),GUID_LOPART(guid)); + sLog->outDetail("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); + sLog->outChar("Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); sScriptMgr->OnPlayerDelete(guid); if (sLog->IsOutCharDump()) // optimize GetPlayerDump call { std::string dump; if (PlayerDumpWriter().GetDump(GUID_LOPART(guid), dump)) - sLog->outCharDump(dump.c_str(),GetAccountId(),GUID_LOPART(guid),name.c_str()); + sLog->outCharDump(dump.c_str(), GetAccountId(), GUID_LOPART(guid), name.c_str()); } Player::DeleteFromDB(guid, GetAccountId()); @@ -649,7 +649,7 @@ void WorldSession::HandlePlayerLoginOpcode(WorldPacket & recv_data) { if (PlayerLoading() || GetPlayer() != NULL) { - sLog->outError("Player tryes to login again, AccountId = %d",GetAccountId()); + sLog->outError("Player tryes to login again, AccountId = %d", GetAccountId()); return; } @@ -729,11 +729,11 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) std::string::size_type pos, nextpos; pos = 0; - while ((nextpos= str_motd.find('@',pos)) != std::string::npos) + while ((nextpos= str_motd.find('@', pos)) != std::string::npos) { if (nextpos != pos) { - data << str_motd.substr(pos,nextpos-pos); + data << str_motd.substr(pos, nextpos-pos); ++linecount; } pos = nextpos+1; @@ -757,7 +757,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) sLog->outStaticDebug("WORLD: Sent server info"); } - //QueryResult *result = CharacterDatabase.PQuery("SELECT guildid,rank FROM guild_member WHERE guid = '%u'",pCurrChar->GetGUIDLow()); + //QueryResult *result = CharacterDatabase.PQuery("SELECT guildid, rank FROM guild_member WHERE guid = '%u'", pCurrChar->GetGUIDLow()); if (PreparedQueryResult resultGuild = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADGUILD)) { Field* fields = resultGuild->Fetch(); @@ -777,7 +777,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) else { // remove wrong guild data - sLog->outError("Player %s (GUID: %u) marked as member of not existing guild (id: %u), removing guild membership for player.",pCurrChar->GetName(),pCurrChar->GetGUIDLow(),pCurrChar->GetGuildId()); + sLog->outError("Player %s (GUID: %u) marked as member of not existing guild (id: %u), removing guild membership for player.", pCurrChar->GetName(), pCurrChar->GetGUIDLow(), pCurrChar->GetGuildId()); pCurrChar->SetInGuild(0); } } @@ -817,7 +817,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) } sObjectAccessor->AddObject(pCurrChar); - //sLog->outDebug("Player %s added to Map.",pCurrChar->GetName()); + //sLog->outDebug("Player %s added to Map.", pCurrChar->GetName()); pCurrChar->SendInitialPacketsAfterAddToMap(); @@ -860,7 +860,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) pCurrChar->LoadPet(); // Set FFA PvP for non GM in non-rest mode - if (sWorld->IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_RESTING)) + if (sWorld->IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING)) pCurrChar->SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); if (pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP)) @@ -885,7 +885,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) // show time before shutdown if shutdown planned. if (sWorld->IsShutdowning()) - sWorld->ShutdownMsg(true,pCurrChar); + sWorld->ShutdownMsg(true, pCurrChar); if (sWorld->getBoolConfig(CONFIG_ALL_TAXI_PATHS)) pCurrChar->SetTaxiCheater(true); @@ -895,7 +895,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder) std::string IP_str = GetRemoteAddress(); sLog->outChar("Account: %d (IP: %s) Login Character:[%s] (GUID: %u)", - GetAccountId(),IP_str.c_str(),pCurrChar->GetName() ,pCurrChar->GetGUIDLow()); + GetAccountId(), IP_str.c_str(), pCurrChar->GetName() , pCurrChar->GetGUIDLow()); if (!pCurrChar->IsStandState() && !pCurrChar->HasUnitState(UNIT_STAT_STUNNED)) pCurrChar->SetStandState(UNIT_STAND_STATE_STAND); @@ -916,7 +916,7 @@ void WorldSession::HandleSetFactionAtWar(WorldPacket & recv_data) recv_data >> repListID; recv_data >> flag; - GetPlayer()->GetReputationMgr().SetAtWar(repListID,flag); + GetPlayer()->GetReputationMgr().SetAtWar(repListID, flag); } //I think this function is never used :/ I dunno, but i guess this opcode not exists @@ -1027,7 +1027,7 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data) return; } - uint8 res = ObjectMgr::CheckPlayerName(newname,true); + uint8 res = ObjectMgr::CheckPlayerName(newname, true); if (res != CHAR_NAME_SUCCESS) { WorldPacket data(SMSG_CHAR_RENAME, 1); @@ -1162,7 +1162,7 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data) SQLTransaction trans = CharacterDatabase.BeginTransaction(); trans->PAppend("DELETE FROM character_declinedname WHERE guid = '%u'", GUID_LOPART(guid)); - trans->PAppend("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%s','%s','%s','%s','%s')", + trans->PAppend("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u', '%s', '%s', '%s', '%s', '%s')", GUID_LOPART(guid), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str()); CharacterDatabase.CommitTransaction(trans); @@ -1197,7 +1197,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recv_data) uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id, bs_skinColor); // 0 - ok - // 1,3 - not enough money + // 1, 3 - not enough money // 2 - you have to seat on barber chair if (!_player->HasEnoughMoney(Cost)) { @@ -1289,7 +1289,7 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data) return; } - uint8 res = ObjectMgr::CheckPlayerName(newname,true); + uint8 res = ObjectMgr::CheckPlayerName(newname, true); if (res != CHAR_NAME_SUCCESS) { WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1); @@ -1509,7 +1509,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) return; } - uint8 res = ObjectMgr::CheckPlayerName(newname,true); + uint8 res = ObjectMgr::CheckPlayerName(newname, true); if (res != CHAR_NAME_SUCCESS) { WorldPacket data(SMSG_CHAR_FACTION_CHANGE, 1); @@ -1654,7 +1654,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) } // Delete all current quests - trans->PAppend("DELETE FROM `character_queststatus` WHERE guid ='%u'",GUID_LOPART(guid)); + trans->PAppend("DELETE FROM `character_queststatus` WHERE guid ='%u'", GUID_LOPART(guid)); // Delete record of the faction old completed quests { @@ -1669,7 +1669,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) if (requiredRaces & RACEMASK_ALLIANCE) { quests << uint32(qinfo->GetQuestId()); - quests << ","; + quests << ", "; } } else // if (team == BG_TEAM_HORDE) @@ -1677,7 +1677,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) if (requiredRaces & RACEMASK_HORDE) { quests << uint32(qinfo->GetQuestId()); - quests << ","; + quests << ", "; } } } diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp index ebaef36fe30..e4db813fe62 100755 --- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp @@ -163,7 +163,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data) if (!_player->CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - time(NULL)); - SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING),timeStr.c_str()); + SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); return; } @@ -519,7 +519,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket & recv_data) if (!GetPlayer()->CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - time(NULL)); - SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING),timeStr.c_str()); + SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); return; } diff --git a/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp b/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp index 6ef0671b679..f2840d4c73f 100755 --- a/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CombatHandler.cpp @@ -36,9 +36,9 @@ void WorldSession::HandleAttackSwingOpcode(WorldPacket & recv_data) if (!pEnemy) { if (!IS_UNIT_GUID(guid)) - sLog->outError("WORLD: Object %u (TypeID: %u) isn't player, pet or creature",GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid))); + sLog->outError("WORLD: Object %u (TypeID: %u) isn't player, pet or creature", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); else - sLog->outError("WORLD: Enemy %s %u not found",GetLogNameForGuid(guid),GUID_LOPART(guid)); + sLog->outError("WORLD: Enemy %s %u not found", GetLogNameForGuid(guid), GUID_LOPART(guid)); // stop attack state at client SendAttackStop(NULL); @@ -52,7 +52,7 @@ void WorldSession::HandleAttackSwingOpcode(WorldPacket & recv_data) return; } - _player->Attack(pEnemy,true); + _player->Attack(pEnemy, true); } void WorldSession::HandleAttackStopOpcode(WorldPacket & /*recv_data*/) @@ -69,7 +69,7 @@ void WorldSession::HandleSetSheathedOpcode(WorldPacket & recv_data) if (sheathed >= MAX_SHEATH_STATE) { - sLog->outError("Unknown sheath state %u ??",sheathed); + sLog->outError("Unknown sheath state %u ??", sheathed); return; } diff --git a/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp b/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp index 9703c3716a9..ded520d84f0 100755 --- a/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp @@ -42,8 +42,8 @@ void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) return; //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: Received CMSG_DUEL_ACCEPTED"); - sLog->outStaticDebug("Player 1 is: %u (%s)", pl->GetGUIDLow(),pl->GetName()); - sLog->outStaticDebug("Player 2 is: %u (%s)", plTarget->GetGUIDLow(),plTarget->GetName()); + sLog->outStaticDebug("Player 1 is: %u (%s)", pl->GetGUIDLow(), pl->GetName()); + sLog->outStaticDebug("Player 2 is: %u (%s)", plTarget->GetGUIDLow(), plTarget->GetName()); time_t now = time(NULL); pl->duel->startTimer = now; diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp index 6feda854699..c66ea546cb7 100755 --- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp @@ -930,7 +930,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recv_data) data << (uint8) 1; } } - data.put<uint64>(maskPos,auramask); // GROUP_UPDATE_FLAG_AURAS + data.put<uint64>(maskPos, auramask); // GROUP_UPDATE_FLAG_AURAS if (pet) { @@ -956,7 +956,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recv_data) data << (uint8) 1; } } - data.put<uint64>(petMaskPos,petauramask); // GROUP_UPDATE_FLAG_PET_AURAS + data.put<uint64>(petMaskPos, petauramask); // GROUP_UPDATE_FLAG_PET_AURAS } else { diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp index 52177bd0c24..db2c76b422a 100755 --- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp @@ -493,7 +493,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) if (!itemguid) return; - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleSellItemOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); @@ -604,7 +604,7 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data) recv_data >> vendorguid >> slot; - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBuybackItem - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); @@ -683,7 +683,7 @@ void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recv_data) if (bag == NULL_BAG) return; - GetPlayer()->BuyItemFromVendorSlot(vendorguid,slot,item,count,bag,bagslot); + GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, bag, bagslot); } void WorldSession::HandleBuyItemOpcode(WorldPacket & recv_data) @@ -701,7 +701,7 @@ void WorldSession::HandleBuyItemOpcode(WorldPacket & recv_data) else return; // cheating - GetPlayer()->BuyItemFromVendorSlot(vendorguid,slot,item,count,NULL_BAG,NULL_SLOT); + GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, NULL_BAG, NULL_SLOT); } void WorldSession::HandleListInventoryOpcode(WorldPacket & recv_data) @@ -722,7 +722,7 @@ void WorldSession::SendListInventory(uint64 vendorguid) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_LIST_INVENTORY"); - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid, UNIT_NPC_FLAG_VENDOR); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendListInventory - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(vendorguid))); @@ -993,7 +993,7 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data) GetPlayer()->SetAmmo(item); } -void WorldSession::SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID,uint32 SpellID) +void WorldSession::SendEnchantmentLog(uint64 Target, uint64 Caster, uint32 ItemID, uint32 SpellID) { WorldPacket data(SMSG_ENCHANTMENTLOG, (8+8+4+4+1)); // last check 2.0.10 data << uint64(Target); @@ -1004,7 +1004,7 @@ void WorldSession::SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID SendPacket(&data); } -void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,uint32 slot,uint32 Duration) +void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid, uint32 slot, uint32 Duration) { // last check 2.0.10 WorldPacket data(SMSG_ITEM_ENCHANT_TIME_UPDATE, (8+4+4+8)); @@ -1315,21 +1315,21 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) { if (GemEnchants[i]) { - itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i), GemEnchants[i],0,0); + itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i), GemEnchants[i], 0, 0); if (Item* guidItem = _player->GetItemByGuid(gem_guids[i])) _player->DestroyItem(guidItem->GetBagSlot(), guidItem->GetSlot(), true); } } for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) - _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),true); + _player->ApplyEnchantment(itemTarget, EnchantmentSlot(enchant_slot), true); bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();//current socketbonus state if (SocketBonusActivated ^ SocketBonusToBeActivated) //if there was a change... { - _player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT,false); + _player->ApplyEnchantment(itemTarget, BONUS_ENCHANTMENT_SLOT, false); itemTarget->SetEnchantment(BONUS_ENCHANTMENT_SLOT, (SocketBonusToBeActivated ? itemTarget->GetTemplate()->socketBonus : 0), 0, 0); - _player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT,true); + _player->ApplyEnchantment(itemTarget, BONUS_ENCHANTMENT_SLOT, true); //it is not displayed, client has an inbuilt system to determine if the bonus is activated } @@ -1347,7 +1347,7 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data) recv_data >> eslot; // apply only to equipped item - if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0,eslot)) + if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, eslot)) return; Item* item = GetPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, eslot); @@ -1358,7 +1358,7 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data) if (!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT)) return; - GetPlayer()->ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false); + GetPlayer()->ApplyEnchantment(item, TEMP_ENCHANTMENT_SLOT, false); item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT); } diff --git a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp index 748b9a08589..c19045f55ce 100755 --- a/src/server/game/Server/Protocol/Handlers/LootHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LootHandler.cpp @@ -45,7 +45,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recv_data) GameObject *go = player->GetMap()->GetGameObject(lguid); // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO - if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE))) + if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player, INTERACTION_DISTANCE))) { player->SendLootRelease(lguid); return; @@ -82,7 +82,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recv_data) bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); - if (!ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) { player->SendLootRelease(lguid); return; @@ -112,7 +112,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) GameObject *pGameObject = GetPlayer()->GetMap()->GetGameObject(guid); // not check distance for GO in case owned GO (fishing bobber case, for example) - if (pGameObject && ((pGameObject->GetOwnerGUID() == _player->GetGUID() || pGameObject->IsWithinDistInMap(_player,INTERACTION_DISTANCE)))) + if (pGameObject && ((pGameObject->GetOwnerGUID() == _player->GetGUID() || pGameObject->IsWithinDistInMap(_player, INTERACTION_DISTANCE)))) pLoot = &pGameObject->loot; break; @@ -121,7 +121,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) { Corpse *bones = ObjectAccessor::GetCorpse(*GetPlayer(), guid); - if (bones && bones->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (bones && bones->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) pLoot = &bones->loot; break; @@ -138,7 +138,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); - if (ok_loot && pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (ok_loot && pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) pLoot = &pCreature->loot ; break; @@ -159,7 +159,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/) Player* playerGroup = itr->getSource(); if (!playerGroup) continue; - if (player->IsWithinDistInMap(playerGroup,sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE),false)) + if (player->IsWithinDistInMap(playerGroup, sWorld->getFloatConfig(CONFIG_GROUP_XP_DISTANCE), false)) playersNear.push_back(playerGroup); } @@ -233,7 +233,7 @@ void WorldSession::DoLootRelease(uint64 lguid) GameObject *go = GetPlayer()->GetMap()->GetGameObject(lguid); // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO - if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE))) + if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player, INTERACTION_DISTANCE))) return; loot = &go->loot; @@ -272,7 +272,7 @@ void WorldSession::DoLootRelease(uint64 lguid) if (lockInfo) ReqValue = lockInfo->Skill[0]; float skill = float(player->GetSkillValue(SKILL_MINING))/(ReqValue+25); - double chance = pow(0.8*chance_rate,4*(1/double(max_amount))*double(uses)); + double chance = pow(0.8*chance_rate, 4*(1/double(max_amount))*double(uses)); if (roll_chance_f((float)(100*chance+skill))) { go->SetLootState(GO_READY); @@ -327,7 +327,7 @@ void WorldSession::DoLootRelease(uint64 lguid) else if (IS_CORPSE_GUID(lguid)) // ONLY remove insignia at BG { Corpse *corpse = ObjectAccessor::GetCorpse(*player, lguid); - if (!corpse || !corpse->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (!corpse || !corpse->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; loot = &corpse->loot; @@ -362,7 +362,7 @@ void WorldSession::DoLootRelease(uint64 lguid) } else // FIXME: item must not be deleted in case not fully looted state. But this pre-request implement loot saving in DB at item save. Or cheating possible. - player->DestroyItem(pItem->GetBagSlot(),pItem->GetSlot(), true); + player->DestroyItem(pItem->GetBagSlot(), pItem->GetSlot(), true); return; // item can be looted only single player } else @@ -370,7 +370,7 @@ void WorldSession::DoLootRelease(uint64 lguid) Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid); bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); - if (!ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (!ok_loot || !pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; loot = &pCreature->loot; @@ -455,7 +455,7 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket & recv_data) if (slotid > pLoot->items.size()) { - sLog->outDebug(LOG_FILTER_LOOT, "MasterLootItem: Player %s might be using a hack! (slot %d, size %lu)",GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size()); + sLog->outDebug(LOG_FILTER_LOOT, "MasterLootItem: Player %s might be using a hack! (slot %d, size %lu)", GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size()); return; } diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp index b94d7e43c5d..a6bbb182fdf 100755 --- a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp @@ -272,7 +272,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data) if (money > 0 && GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(GetAccountId(),"GM %s (Account: %u) mail money: %u to player: %s (Account: %u)", + sLog->outCommand(GetAccountId(), "GM %s (Account: %u) mail money: %u to player: %s (Account: %u)", GetPlayerName(), GetAccountId(), money, receiver.c_str(), rc_account); } } @@ -456,11 +456,11 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data) // can be calculated early sender_accId = sObjectMgr->GetPlayerAccountIdByGUID(sender_guid); - if (!sObjectMgr->GetPlayerNameByGUID(sender_guid,sender_name)) + if (!sObjectMgr->GetPlayerNameByGUID(sender_guid, sender_name)) sender_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); } - sLog->outCommand(GetAccountId(),"GM %s (Account: %u) receive mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)", - GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1.c_str(), it->GetEntry(),it->GetCount(),m->COD,sender_name.c_str(),sender_accId); + sLog->outCommand(GetAccountId(), "GM %s (Account: %u) receive mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)", + GetPlayerName(), GetAccountId(), it->GetTemplate()->Name1.c_str(), it->GetEntry(), it->GetCount(), m->COD, sender_name.c_str(), sender_accId); } else if (!receive) sender_accId = sObjectMgr->GetPlayerAccountIdByGUID(sender_guid); @@ -481,7 +481,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data) pl->RemoveMItem(it->GetGUIDLow()); uint32 count = it->GetCount(); // save counts before store and possible merge with deleting - pl->MoveItemToInventory(dest,it,true); + pl->MoveItemToInventory(dest, it, true); pl->SaveInventoryAndGoldToDB(trans); pl->_SaveMail(trans); @@ -694,7 +694,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data) bodyItem->SetUInt32Value(ITEM_FIELD_CREATOR, m->sender); bodyItem->SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_MAIL_TEXT_MASK); - sLog->outDetail("HandleMailCreateTextItem mailid=%u",mailId); + sLog->outDetail("HandleMailCreateTextItem mailid=%u", mailId); ItemPosCountVec dest; uint8 msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, dest, bodyItem, false); diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index 34f8c1046d3..ae51b2335ed 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -71,7 +71,7 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data) } //this is spirit release confirm? - GetPlayer()->RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true); + GetPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); GetPlayer()->BuildPlayerRepop(); GetPlayer()->RepopAtGraveyard(); } @@ -205,7 +205,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data) std::string temp; recv_data >> temp; // user entered string, it used as universal search pattern(guild+player name)? - if (!Utf8toWStr(temp,str[i])) + if (!Utf8toWStr(temp, str[i])) continue; wstrToLower(str[i]); @@ -292,7 +292,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data) std::string pname = itr->second->GetName(); std::wstring wpname; - if (!Utf8toWStr(pname,wpname)) + if (!Utf8toWStr(pname, wpname)) continue; wstrToLower(wpname); @@ -301,7 +301,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data) std::string gname = sObjectMgr->GetGuildNameById(itr->second->GetGuildId()); std::wstring wgname; - if (!Utf8toWStr(gname,wgname)) + if (!Utf8toWStr(gname, wgname)) continue; wstrToLower(wgname); @@ -483,9 +483,9 @@ void WorldSession::HandleZoneUpdateOpcode(WorldPacket & recv_data) // use server size data uint32 newzone, newarea; - GetPlayer()->GetZoneAndAreaId(newzone,newarea); - GetPlayer()->UpdateZone(newzone,newarea); - //GetPlayer()->SendInitWorldStates(true,newZone); + GetPlayer()->GetZoneAndAreaId(newzone, newarea); + GetPlayer()->UpdateZone(newzone, newarea); + //GetPlayer()->SendInitWorldStates(true, newZone); } void WorldSession::HandleSetTargetOpcode(WorldPacket & recv_data) @@ -729,7 +729,7 @@ void WorldSession::HandleBugOpcode(WorldPacket & recv_data) CharacterDatabase.escape_string(type); CharacterDatabase.escape_string(content); - CharacterDatabase.PExecute ("INSERT INTO bugreport (type,content) VALUES('%s', '%s')", type.c_str(), content.c_str()); + CharacterDatabase.PExecute ("INSERT INTO bugreport (type, content) VALUES('%s', '%s')", type.c_str(), content.c_str()); } void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data) @@ -817,18 +817,18 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) uint32 Trigger_ID; recv_data >> Trigger_ID; - sLog->outDebug(LOG_FILTER_NETWORKIO, "Trigger ID:%u",Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Trigger ID:%u", Trigger_ID); if (GetPlayer()->isInFlight()) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); return; } AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); if (!atEntry) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); return; } @@ -846,7 +846,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) if (atEntry->radius > 0) { // if we have radius check it - float dist = pl->GetDistance(atEntry->x,atEntry->y,atEntry->z); + float dist = pl->GetDistance(atEntry->x, atEntry->y, atEntry->z); if (dist > atEntry->radius + delta) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (radius: %f distance: %f), ignore Area Trigger ID: %u", @@ -946,7 +946,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) if (GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->isLFGGroup() && GetPlayer()->GetMap()->IsDungeon() && at->target_mapId != GetPlayer()->GetMapId()) GetPlayer()->TeleportToBGEntryPoint(); else - GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT); + GetPlayer()->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT); } void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data) @@ -1183,7 +1183,7 @@ void WorldSession::HandleSetActionBarToggles(WorldPacket& recv_data) if (!GetPlayer()) // ignore until not logged (check needed because STATUS_AUTHED) { if (ActionBar != 0) - sLog->outError("WorldSession::HandleSetActionBarToggles in not logged state with value: %u, ignored",uint32(ActionBar)); + sLog->outError("WorldSession::HandleSetActionBarToggles in not logged state with value: %u, ignored", uint32(ActionBar)); return; } @@ -1196,7 +1196,7 @@ void WorldSession::HandleWardenDataOpcode(WorldPacket& recv_data) /* uint8 tmp; recv_data >> tmp; - sLog->outDebug("Received opcode CMSG_WARDEN_DATA, not resolve.uint8 = %u",tmp); + sLog->outDebug("Received opcode CMSG_WARDEN_DATA, not resolve.uint8 = %u", tmp); */ } @@ -1290,14 +1290,14 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recv_data) //sLog->outDebug("Received opcode CMSG_WORLD_TELEPORT"); if (GetPlayer()->isInFlight()) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore worldport command.", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow()); return; } sLog->outStaticDebug("Time %u sec, map=%u, x=%f, y=%f, z=%f, orient=%f", time/1000, mapid, PositionX, PositionY, PositionZ, Orientation); if (GetSecurity() >= SEC_ADMINISTRATOR) - GetPlayer()->TeleportTo(mapid,PositionX,PositionY,PositionZ,Orientation); + GetPlayer()->TeleportTo(mapid, PositionX, PositionY, PositionZ, Orientation); else SendNotification(LANG_YOU_NOT_HAVE_PERMISSION); sLog->outDebug(LOG_FILTER_NETWORKIO, "Received worldport command from player %s", GetPlayer()->GetName()); @@ -1331,7 +1331,7 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data) uint32 accid = plr->GetSession()->GetAccountId(); - QueryResult result = LoginDatabase.PQuery("SELECT username,email,last_ip FROM account WHERE id=%u", accid); + QueryResult result = LoginDatabase.PQuery("SELECT username, email, last_ip FROM account WHERE id=%u", accid); if (!result) { SendNotification(LANG_ACCOUNT_FOR_PLAYER_NOT_FOUND, charname.c_str()); @@ -1496,7 +1496,7 @@ void WorldSession::HandleResetInstancesOpcode(WorldPacket & /*recv_data*/) if (pGroup->IsLeader(_player->GetGUID())) { pGroup->ResetInstances(INSTANCE_RESET_ALL, false, _player); - pGroup->ResetInstances(INSTANCE_RESET_ALL, true,_player); + pGroup->ResetInstances(INSTANCE_RESET_ALL, true, _player); } } else diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index 9d877441f94..30b1dc78280 100755 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -141,7 +141,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() { if (mEntry->IsDungeon()) { - GetPlayer()->ResurrectPlayer(0.5f,false); + GetPlayer()->ResurrectPlayer(0.5f, false); GetPlayer()->SpawnCorpseBones(); } } @@ -178,7 +178,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() GetPlayer()->CastSpell(GetPlayer(), 2479, true); // in friendly area - else if (GetPlayer()->IsPvP() && !GetPlayer()->HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_IN_PVP)) + else if (GetPlayer()->IsPvP() && !GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP)) GetPlayer()->UpdatePvP(false, false); // resummon pet @@ -215,7 +215,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data) WorldLocation const& dest = plMover->GetTeleportDest(); - plMover->SetPosition(dest,true); + plMover->SetPosition(dest, true); uint32 newzone, newarea; plMover->GetZoneAndAreaId(newzone, newarea); @@ -229,7 +229,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data) plMover->CastSpell(plMover, 2479, true); // in friendly area - else if (plMover->IsPvP() && !plMover->HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_IN_PVP)) + else if (plMover->IsPvP() && !plMover->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP)) plMover->UpdatePvP(false, false); } @@ -459,12 +459,12 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data) { sLog->outError("%sSpeedChange player %s is NOT correct (must be %f instead %f), force set to correct value", move_type_name[move_type], _player->GetName(), _player->GetSpeed(move_type), newspeed); - _player->SetSpeed(move_type,_player->GetSpeedRate(move_type),true); + _player->SetSpeed(move_type, _player->GetSpeedRate(move_type), true); } else // must be lesser - cheating { sLog->outBasic("Player %s from account id %u kicked for incorrect speed (must be %f instead %f)", - _player->GetName(),_player->GetSession()->GetAccountId(),_player->GetSpeed(move_type), newspeed); + _player->GetName(), _player->GetSession()->GetAccountId(), _player->GetSpeed(move_type), newspeed); _player->GetSession()->KickPlayer(); } } diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp index cf4b0ac1896..7118170390d 100755 --- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp @@ -51,7 +51,7 @@ void WorldSession::HandleTabardVendorActivateOpcode(WorldPacket & recv_data) uint64 guid; recv_data >> guid; - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TABARDDESIGNER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TABARDDESIGNER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTabardVendorActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); @@ -80,7 +80,7 @@ void WorldSession::HandleBankerActivateOpcode(WorldPacket & recv_data) recv_data >> guid; - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_BANKER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBankerActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); @@ -119,7 +119,7 @@ void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList"); - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TRAINER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(guid))); @@ -131,14 +131,14 @@ void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); // trainer list loaded at check; - if (!unit->isCanTrainingOf(_player,true)) + if (!unit->isCanTrainingOf(_player, true)) return; CreatureTemplate const *ci = unit->GetCreatureInfo(); if (!ci) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - (GUID: %u) NO CREATUREINFO!",GUID_LOPART(guid)); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: SendTrainerList - (GUID: %u) NO CREATUREINFO!", GUID_LOPART(guid)); return; } @@ -231,7 +231,7 @@ void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle) data << strTitle; - data.put<uint32>(count_pos,count); + data.put<uint32>(count_pos, count); SendPacket(&data); } @@ -241,7 +241,7 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recv_data) uint32 spellId = 0; recv_data >> guid >> spellId; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TRAINER_BUY_SPELL NpcGUID=%u, learn spell id is: %u",uint32(GUID_LOPART(guid)), spellId); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TRAINER_BUY_SPELL NpcGUID=%u, learn spell id is: %u", uint32(GUID_LOPART(guid)), spellId); Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); if (!unit) @@ -254,7 +254,7 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recv_data) if (GetPlayer()->HasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH); - if (!unit->isCanTrainingOf(_player,true)) + if (!unit->isCanTrainingOf(_player, true)) return; // check present spell in trainer spell list @@ -292,7 +292,7 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recv_data) // learn explicitly or cast explicitly if (trainer_spell->IsCastable()) - _player->CastSpell(_player,trainer_spell->spell,true); + _player->CastSpell(_player, trainer_spell->spell, true); else _player->learnSpell(spellId, false); @@ -414,7 +414,7 @@ void WorldSession::SendSpiritResurrect() { _player->ResurrectPlayer(0.5f, true); - _player->DurabilityLossAll(0.25f,true); + _player->DurabilityLossAll(0.25f, true); // get corpse nearest graveyard WorldSafeLocsEntry const *corpseGrave = NULL; @@ -451,7 +451,7 @@ void WorldSession::HandleBinderActivateOpcode(WorldPacket & recv_data) if (!GetPlayer()->IsInWorld() || !GetPlayer()->isAlive()) return; - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID,UNIT_NPC_FLAG_INNKEEPER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_INNKEEPER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleBinderActivateOpcode - Unit (GUID: %u) not found or you can not interact with him.", uint32(GUID_LOPART(npcGUID))); @@ -557,7 +557,7 @@ void WorldSession::SendStablePetCallback(QueryResult result, uint64 guid) data << uint32(pet->GetEntry()); data << uint32(pet->getLevel()); data << pet->GetName(); // petname - data << uint8(1); // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show) + data << uint8(1); // 1 = current, 2/3 = in stable (any from 4, 5, ... create problems with proper show) ++num; } @@ -571,7 +571,7 @@ void WorldSession::SendStablePetCallback(QueryResult result, uint64 guid) data << uint32(fields[2].GetUInt32()); // creature entry data << uint32(fields[3].GetUInt16()); // level data << fields[4].GetString(); // name - data << uint8(2); // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show) + data << uint8(2); // 1 = current, 2/3 = in stable (any from 4, 5, ... create problems with proper show) ++num; } @@ -622,8 +622,8 @@ void WorldSession::HandleStablePet(WorldPacket & recv_data) return; } - m_stablePetCallback = CharacterDatabase.AsyncPQuery("SELECT owner,slot,id FROM character_pet WHERE owner = '%u' AND slot >= '%u' AND slot <= '%u' ORDER BY slot ", - _player->GetGUIDLow(),PET_SAVE_FIRST_STABLE_SLOT,PET_SAVE_LAST_STABLE_SLOT); + m_stablePetCallback = CharacterDatabase.AsyncPQuery("SELECT owner, slot, id FROM character_pet WHERE owner = '%u' AND slot >= '%u' AND slot <= '%u' ORDER BY slot ", + _player->GetGUIDLow(), PET_SAVE_FIRST_STABLE_SLOT, PET_SAVE_LAST_STABLE_SLOT); } @@ -724,10 +724,10 @@ void WorldSession::HandleUnstablePetCallback(QueryResult result, uint32 petnumbe // delete dead pet if (pet) - _player->RemovePet(pet,PET_SAVE_AS_DELETED); + _player->RemovePet(pet, PET_SAVE_AS_DELETED); Pet *newpet = new Pet(_player, HUNTER_PET); - if (!newpet->LoadPetFromDB(_player,creature_id,petnumber)) + if (!newpet->LoadPetFromDB(_player, creature_id, petnumber)) { delete newpet; newpet = NULL; @@ -805,7 +805,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket & recv_data) // find swapped pet slot in stable m_stableSwapCallback.SetParam(pet_number); m_stableSwapCallback.SetFutureResult( - CharacterDatabase.PQuery("SELECT slot,entry FROM character_pet WHERE owner = '%u' AND id = '%u'", + CharacterDatabase.PQuery("SELECT slot, entry FROM character_pet WHERE owner = '%u' AND id = '%u'", _player->GetGUIDLow(), pet_number) ); } @@ -850,7 +850,7 @@ void WorldSession::HandleStableSwapPetCallback(QueryResult result, uint32 petnum // summon unstabled pet Pet *newpet = new Pet(_player); - if (!newpet->LoadPetFromDB(_player,creature_id, petnumber)) + if (!newpet->LoadPetFromDB(_player, creature_id, petnumber)) { delete newpet; SendStableResult(STABLE_ERR_STABLE); diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 5ad3889ba2d..fde83d0ffeb 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -166,7 +166,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid case COMMAND_FOLLOW: //spellid=1792 //FOLLOW pet->AttackStop(); pet->InterruptNonMeleeSpells(false); - pet->GetMotionMaster()->MoveFollow(_player,PET_FOLLOW_DIST,pet->GetFollowAngle()); + pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST, pet->GetFollowAngle()); charmInfo->SetCommandState(COMMAND_FOLLOW); charmInfo->SetIsCommandAttack(false); @@ -235,7 +235,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid charmInfo->SetIsFollowing(false); charmInfo->SetIsReturning(false); - pet->Attack(TargetUnit,true); + pet->Attack(TargetUnit, true); pet->SendPetAIReaction(guid1); } } @@ -285,7 +285,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid Unit* unit_target = NULL; if (guid2) - unit_target = ObjectAccessor::GetUnit(*_player,guid2); + unit_target = ObjectAccessor::GetUnit(*_player, guid2); // do not cast unknown spells SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid); @@ -377,7 +377,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid else { if (pet->isPossessed() || pet->IsVehicle()) - Spell::SendCastResult(GetPlayer(),spellInfo,0,result); + Spell::SendCastResult(GetPlayer(), spellInfo, 0, result); else pet->SendPetCastFail(spellid, result); @@ -408,7 +408,7 @@ void WorldSession::HandlePetNameQuery(WorldPacket & recv_data) recv_data >> petnumber; recv_data >> petguid; - SendPetNameQuery(petguid,petnumber); + SendPetNameQuery(petguid, petnumber); } void WorldSession::SendPetNameQuery(uint64 petguid, uint32 petnumber) @@ -572,7 +572,7 @@ void WorldSession::HandlePetSetAction(WorldPacket & recv_data) } - charmInfo->SetActionBar(position[i],spell_id,ActiveStates(act_state)); + charmInfo->SetActionBar(position[i], spell_id, ActiveStates(act_state)); } } } @@ -628,7 +628,7 @@ void WorldSession::HandlePetRename(WorldPacket & recv_data) std::wstring wname; Utf8toWStr(name, wname); - if (!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname,0),declinedname)) + if (!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname, 0), declinedname)) { SendPetNameInvalid(PET_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME, name, &declinedname); return; @@ -641,7 +641,7 @@ void WorldSession::HandlePetRename(WorldPacket & recv_data) for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) CharacterDatabase.escape_string(declinedname.name[i]); trans->PAppend("DELETE FROM character_pet_declinedname WHERE owner = '%u' AND id = '%u'", _player->GetGUIDLow(), pet->GetCharmInfo()->GetPetNumber()); - trans->PAppend("INSERT INTO character_pet_declinedname (id, owner, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%u','%s','%s','%s','%s','%s')", + trans->PAppend("INSERT INTO character_pet_declinedname (id, owner, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u', '%u', '%s', '%s', '%s', '%s', '%s')", pet->GetCharmInfo()->GetPetNumber(), _player->GetGUIDLow(), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str()); } @@ -670,10 +670,10 @@ void WorldSession::HandlePetAbandon(WorldPacket & recv_data) if (pet->GetGUID() == _player->GetPetGUID()) { uint32 feelty = pet->GetPower(POWER_HAPPINESS); - pet->SetPower(POWER_HAPPINESS ,(feelty-50000) > 0 ?(feelty-50000) : 0); + pet->SetPower(POWER_HAPPINESS , (feelty-50000) > 0 ?(feelty-50000) : 0); } - _player->RemovePet((Pet*)pet,PET_SAVE_AS_DELETED); + _player->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); } else if (pet->GetGUID() == _player->GetCharmGUID()) _player->StopCastingCharm(); @@ -694,11 +694,11 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) if (ObjectAccessor::FindPlayer(guid)) return; - Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player,guid); + Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); if (!pet || (pet != _player->GetGuardianPet() && pet != _player->GetCharm())) { - sLog->outError("HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName()); + sLog->outError("HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)), GetPlayer()->GetName()); return; } @@ -718,7 +718,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) else pet->GetCharmInfo()->ToggleCreatureAutocast(spellid, state); - charmInfo->SetSpellAutocast(spellid,state); + charmInfo->SetSpellAutocast(spellid, state); } void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) @@ -742,7 +742,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) if (!caster || (caster != _player->GetGuardianPet() && caster != _player->GetCharm())) { - sLog->outError("HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName()); + sLog->outError("HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)), GetPlayer()->GetName()); return; } diff --git a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp index eb301660c0a..882bd487132 100755 --- a/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp @@ -89,7 +89,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "Petitioner with GUID %u tried sell petition: name %s", GUID_LOPART(guidNPC), name.c_str()); // prevent cheating - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC,UNIT_NPC_FLAG_PETITIONER); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC, UNIT_NPC_FLAG_PETITIONER); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandlePetitionBuyOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guidNPC)); @@ -544,9 +544,9 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data) return; } - CharacterDatabase.PExecute("INSERT INTO petition_sign (ownerguid,petitionguid, playerguid, player_account) VALUES ('%u', '%u', '%u','%u')", GUID_LOPART(ownerguid),GUID_LOPART(petitionguid), plguidlo,GetAccountId()); + CharacterDatabase.PExecute("INSERT INTO petition_sign (ownerguid, petitionguid, playerguid, player_account) VALUES ('%u', '%u', '%u', '%u')", GUID_LOPART(ownerguid), GUID_LOPART(petitionguid), plguidlo, GetAccountId()); - sLog->outDebug(LOG_FILTER_NETWORKIO, "PETITION SIGN: GUID %u by player: %s (GUID: %u Account: %u)", GUID_LOPART(petitionguid), _player->GetName(),plguidlo,GetAccountId()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "PETITION SIGN: GUID %u by player: %s (GUID: %u Account: %u)", GUID_LOPART(petitionguid), _player->GetName(), plguidlo, GetAccountId()); WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4)); data << uint64(petitionguid); @@ -807,7 +807,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data) // Proceed with guild/arena team creation // Delete charter item - _player->DestroyItem(item->GetBagSlot(),item->GetSlot(), true); + _player->DestroyItem(item->GetBagSlot(), item->GetSlot(), true); if (type == GUILD_CHARTER_TYPE) { diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp index 85b64679764..24cfea3949d 100755 --- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp @@ -43,10 +43,10 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data) uint8 questStatus = DIALOG_STATUS_NONE; uint8 defstatus = DIALOG_STATUS_NONE; - Object* questgiver = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + Object* questgiver = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!questgiver) { - sLog->outDetail("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)",GuidHigh2TypeId(GUID_HIPART(guid)),GUID_LOPART(guid)); + sLog->outDetail("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)", GuidHigh2TypeId(GUID_HIPART(guid)), GUID_LOPART(guid)); return; } @@ -54,7 +54,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data) { case TYPEID_UNIT: { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u",uint32(GUID_LOPART(guid))); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u", uint32(GUID_LOPART(guid))); Creature* cr_questgiver=questgiver->ToCreature(); if (!cr_questgiver->IsHostileTo(_player)) // not show quest status to enemies { @@ -66,7 +66,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recv_data) } case TYPEID_GAMEOBJECT: { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u",uint32(GUID_LOPART(guid))); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid))); GameObject* go_questgiver=(GameObject*)questgiver; questStatus = sScriptMgr->GetDialogStatus(_player, go_questgiver); if (questStatus > 6) @@ -89,7 +89,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid)); - Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_NONE); + Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE); if (!pCreature) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleQuestgiverHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", @@ -124,7 +124,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1); - Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER); + Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER); // no or incorrect quest giver if (!pObject || (pObject->GetTypeId() != TYPEID_PLAYER && !pObject->hasQuest(quest)) || @@ -139,7 +139,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) if (qInfo) { // prevent cheating - if (!GetPlayer()->CanTakeQuest(qInfo,true)) + if (!GetPlayer()->CanTakeQuest(qInfo, true)) { _player->PlayerTalkClass->CloseGossip(); _player->SetDivider(0); @@ -210,7 +210,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) } if (destroyItem) - _player->DestroyItem(((Item*)pObject)->GetBagSlot(), ((Item*)pObject)->GetSlot(),true); + _player->DestroyItem(((Item*)pObject)->GetBagSlot(), ((Item*)pObject)->GetSlot(), true); break; } @@ -242,7 +242,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1); // Verify that the guid is valid and is a questgiver or involved in the requested quest - Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM); + Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM); if (!pObject || (!pObject->hasQuest(quest) && !pObject->hasInvolvedQuest(quest))) { _player->PlayerTalkClass->CloseGossip(); @@ -273,7 +273,7 @@ void WorldSession::HandleQuestQueryOpcode(WorldPacket & recv_data) uint32 quest; recv_data >> quest; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_QUERY quest = %u",quest); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUEST_QUERY quest = %u", quest); Quest const *pQuest = sObjectMgr->GetQuestTemplate(quest); if (pQuest) @@ -297,9 +297,9 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!GetPlayer()->isAlive()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CHOOSE_REWARD npc = %u, quest = %u, reward = %u",uint32(GUID_LOPART(guid)),quest,reward); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_CHOOSE_REWARD npc = %u, quest = %u, reward = %u", uint32(GUID_LOPART(guid)), quest, reward); - Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!pObject) return; @@ -319,8 +319,8 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!(sScriptMgr->OnQuestReward(_player, (pObject->ToCreature()), pQuest, reward))) { // Send next quest - if (Quest const* nextquest = _player->GetNextQuest(guid ,pQuest)) - _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest,guid,true); + if (Quest const* nextquest = _player->GetNextQuest(guid , pQuest)) + _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest, guid, true); (pObject->ToCreature())->AI()->sQuestReward(_player, pQuest, reward); } @@ -329,8 +329,8 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data) if (!sScriptMgr->OnQuestReward(_player, ((GameObject*)pObject), pQuest, reward)) { // Send next quest - if (Quest const* nextquest = _player->GetNextQuest(guid ,pQuest)) - _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest,guid,true); + if (Quest const* nextquest = _player->GetNextQuest(guid , pQuest)) + _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest, guid, true); pObject->ToGameObject()->AI()->QuestReward(_player, pQuest, reward); } break; @@ -352,9 +352,9 @@ void WorldSession::HandleQuestgiverRequestRewardOpcode(WorldPacket & recv_data) if (!GetPlayer()->isAlive()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_REQUEST_REWARD npc = %u, quest = %u",uint32(GUID_LOPART(guid)),quest); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_REQUEST_REWARD npc = %u, quest = %u", uint32(GUID_LOPART(guid)), quest); - Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!pObject||!pObject->hasInvolvedQuest(quest)) return; @@ -385,7 +385,7 @@ void WorldSession::HandleQuestLogSwapQuest(WorldPacket& recv_data) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_SWAP_QUEST slot 1 = %u, slot 2 = %u", slot1, slot2); - GetPlayer()->SwapQuestSlot(slot1,slot2); + GetPlayer()->SwapQuestSlot(slot1, slot2); } void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recv_data) @@ -393,7 +393,7 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recv_data) uint8 slot; recv_data >> slot; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u",slot); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u", slot); if (slot < MAX_QUEST_LOG_SIZE) { @@ -465,7 +465,7 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data) if (!_player->isAlive()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_COMPLETE_QUEST npc = %u, quest = %u",uint32(GUID_LOPART(guid)),quest); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUESTGIVER_COMPLETE_QUEST npc = %u, quest = %u", uint32(GUID_LOPART(guid)), quest); Quest const *pQuest = sObjectMgr->GetQuestTemplate(quest); if (pQuest) @@ -487,12 +487,12 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data) if (pQuest->IsRepeatable()) _player->PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, _player->CanCompleteRepeatableQuest(pQuest), false); else - _player->PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, _player->CanRewardQuest(pQuest,false), false); + _player->PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, _player->CanRewardQuest(pQuest, false), false); } else { if (pQuest->GetReqItemsCount()) // some items required - _player->PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, _player->CanRewardQuest(pQuest,false), false); + _player->PlayerTalkClass->SendQuestGiverRequestItems(pQuest, guid, _player->CanRewardQuest(pQuest, false), false); else // no items required _player->PlayerTalkClass->SendQuestGiverOfferReward(pQuest, guid, true); } @@ -697,7 +697,7 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket if (IS_CRE_OR_VEH_OR_PET_GUID(*itr)) { // need also pet quests case support - Creature *questgiver = ObjectAccessor::GetCreatureOrPetOrVehicle(*GetPlayer(),*itr); + Creature *questgiver = ObjectAccessor::GetCreatureOrPetOrVehicle(*GetPlayer(), *itr); if (!questgiver || questgiver->IsHostileTo(_player)) continue; if (!questgiver->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER)) diff --git a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp index ac98830dd2b..457f6d8ac53 100755 --- a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp @@ -60,7 +60,7 @@ void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket & recv_data) uint64 guid; recv_data >> guid; - Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TRAINER); + Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER); if (!unit) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: HandleTalentWipeConfirmOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid))); diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp index 3b5e6871632..1d47275929a 100755 --- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp @@ -138,7 +138,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) { if (IsNonCombatSpell(spellInfo)) { - pUser->SendEquipError(EQUIP_ERR_NOT_IN_COMBAT,pItem,NULL); + pUser->SendEquipError(EQUIP_ERR_NOT_IN_COMBAT, pItem, NULL); return; } } @@ -169,19 +169,19 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) { // for implicit area/coord target spells if (!targets.getUnitTarget()) - Spell::SendCastResult(_player,spellInfo,castCount,SPELL_FAILED_NO_VALID_TARGETS); + Spell::SendCastResult(_player, spellInfo, castCount, SPELL_FAILED_NO_VALID_TARGETS); // for explicit target spells else - Spell::SendCastResult(_player,spellInfo,castCount,SPELL_FAILED_BAD_TARGETS); + Spell::SendCastResult(_player, spellInfo, castCount, SPELL_FAILED_BAD_TARGETS); } return; } // Note: If script stop casting it must send appropriate data to client to prevent stuck item in gray state. - if (!sScriptMgr->OnItemUse(pUser,pItem,targets)) + if (!sScriptMgr->OnItemUse(pUser, pItem, targets)) { // no script or script not process request by self - pUser->CastItemUseSpell(pItem,targets,castCount,glyphIndex); + pUser->CastItemUseSpell(pItem, targets, castCount, glyphIndex); } } @@ -193,7 +193,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) { - sLog->outDetail("WORLD: CMSG_OPEN_ITEM packet, data length = %i",(uint32)recvPacket.size()); + sLog->outDetail("WORLD: CMSG_OPEN_ITEM packet, data length = %i", (uint32)recvPacket.size()); Player* pUser = _player; @@ -205,7 +205,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) recvPacket >> bagIndex >> slot; - sLog->outDetail("bagIndex: %u, slot: %u",bagIndex,slot); + sLog->outDetail("bagIndex: %u, slot: %u", bagIndex, slot); Item *pItem = pUser->GetItemByPos(bagIndex, slot); if (!pItem) @@ -274,7 +274,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE item_guid = '%u'", pItem->GetGUIDLow()); } else - pUser->SendLoot(pItem->GetGUID(),LOOT_CORPSE); + pUser->SendLoot(pItem->GetGUID(), LOOT_CORPSE); } void WorldSession::HandleGameObjectUseOpcode(WorldPacket & recv_data) @@ -312,7 +312,7 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket) if (!go) return; - if (!go->IsWithinDistInMap(_player,INTERACTION_DISTANCE)) + if (!go->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; go->AI()->GossipHello(_player); @@ -390,7 +390,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) // auto-selection buff level base at target level (in spellInfo) if (targets.getUnitTarget()) { - SpellEntry const *actualSpellInfo = sSpellMgr->SelectAuraRankForPlayerLevel(spellInfo,targets.getUnitTarget()->getLevel()); + SpellEntry const *actualSpellInfo = sSpellMgr->SelectAuraRankForPlayerLevel(spellInfo, targets.getUnitTarget()->getLevel()); // if rank not found then function return NULL but in explicit cast case original spell can be casted and later failed with appropriate error message if (actualSpellInfo) @@ -410,7 +410,7 @@ void WorldSession::HandleCancelCastOpcode(WorldPacket& recvPacket) recvPacket >> spellId; if (_player->IsNonMeleeSpellCasted(false)) - _player->InterruptNonMeleeSpells(false,spellId,false); + _player->InterruptNonMeleeSpells(false, spellId, false); } void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket) @@ -459,7 +459,7 @@ void WorldSession::HandlePetCancelAuraOpcode(WorldPacket& recvPacket) return; } - Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player,guid); + Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); if (!pet) { @@ -538,7 +538,7 @@ void WorldSession::HandleSelfResOpcode(WorldPacket & /*recv_data*/) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL)); if (spellInfo) - _player->CastSpell(_player,spellInfo,false,0); + _player->CastSpell(_player, spellInfo, false, 0); _player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0); } @@ -574,7 +574,7 @@ void WorldSession::HandleMirrrorImageDataRequest(WorldPacket & recv_data) return; // Get creator of the unit - Unit *creator = ObjectAccessor::GetObjectInWorld(unit->GetCreatorGUID(),(Unit*)NULL); + Unit *creator = ObjectAccessor::GetObjectInWorld(unit->GetCreatorGUID(), (Unit*)NULL); if (!creator) return; diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp index a7bc65143be..eb63cfa8eb0 100755 --- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp @@ -49,13 +49,13 @@ void WorldSession::SendTaxiStatus(uint64 guid) return; } - uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer()->GetTeam()); + uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), unit->GetMapId(), GetPlayer()->GetTeam()); // not found nearest if (curloc == 0) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: current location %u ",curloc); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: current location %u ", curloc); WorldPacket data(SMSG_TAXINODE_STATUS, 9); data << guid; @@ -94,7 +94,7 @@ void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket & recv_data) void WorldSession::SendTaxiMenu(Creature* unit) { // find current node - uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer()->GetTeam()); + uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), unit->GetMapId(), GetPlayer()->GetTeam()); if (curloc == 0) return; @@ -102,13 +102,13 @@ void WorldSession::SendTaxiMenu(Creature* unit) bool lastTaxiCheaterState = GetPlayer()->isTaxiCheater(); if (unit->GetEntry() == 29480) GetPlayer()->SetTaxiCheater(true); // Grimwing in Ebon Hold, special case. NOTE: Not perfect, Zul'Aman should not be included according to WoWhead, and I think taxicheat includes it. - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ",curloc); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ", curloc); WorldPacket data(SMSG_SHOWTAXINODES, (4+8+4+8*4)); data << uint32(1); data << uint64(unit->GetGUID()); data << uint32(curloc); - GetPlayer()->m_taxi.AppendTaximaskTo(data,GetPlayer()->isTaxiCheater()); + GetPlayer()->m_taxi.AppendTaximaskTo(data, GetPlayer()->isTaxiCheater()); SendPacket(&data); sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SHOWTAXINODES"); @@ -128,13 +128,13 @@ void WorldSession::SendDoFlight(uint32 mountDisplayId, uint32 path, uint32 pathN if (mountDisplayId) GetPlayer()->Mount(mountDisplayId); - GetPlayer()->GetMotionMaster()->MoveTaxiFlight(path,pathNode); + GetPlayer()->GetMotionMaster()->MoveTaxiFlight(path, pathNode); } bool WorldSession::SendLearnNewTaxiNode(Creature* unit) { // find current node - uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer()->GetTeam()); + uint32 curloc = sObjectMgr->GetNearestTaxiNode(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), unit->GetMapId(), GetPlayer()->GetTeam()); if (curloc == 0) return true; // `true` send to avoid WorldSession::SendTaxiMenu call with one more curlock seartch with same false result. @@ -191,7 +191,7 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recv_data) if (nodes.empty()) return; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" ,nodes.front(),nodes.back()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" , nodes.front(), nodes.back()); GetPlayer()->ActivateTaxiPathTo(nodes, npc); } @@ -231,7 +231,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data) TaxiPathNodeEntry const& node = flight->GetPath()[flight->GetCurrentNode()]; flight->SkipCurrentNode(); - GetPlayer()->TeleportTo(curDestNode->map_id,node.x,node.y,node.z,GetPlayer()->GetOrientation()); + GetPlayer()->TeleportTo(curDestNode->map_id, node.x, node.y, node.z, GetPlayer()->GetOrientation()); } return; } @@ -283,7 +283,7 @@ void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recv_data) nodes.resize(2); recv_data >> guid >> nodes[0] >> nodes[1]; - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d" ,nodes[0],nodes[1]); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI from %d to %d" , nodes[0], nodes[1]); Creature *npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER); if (!npc) { diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp index 98656d539ec..17b63f80d89 100755 --- a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp @@ -69,13 +69,13 @@ void WorldSession::SendTradeStatus(TradeStatus status) void WorldSession::HandleIgnoreTradeOpcode(WorldPacket& /*recvPacket*/) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Ignore Trade %u",_player->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Ignore Trade %u", _player->GetGUIDLow()); // recvPacket.print_storage(); } void WorldSession::HandleBusyTradeOpcode(WorldPacket& /*recvPacket*/) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Busy Trade %u",_player->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Busy Trade %u", _player->GetGUIDLow()); // recvPacket.print_storage(); } @@ -150,7 +150,7 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) if (myItems[i]) { // logging - sLog->outDebug(LOG_FILTER_NETWORKIO, "partner storing: %u",myItems[i]->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "partner storing: %u", myItems[i]->GetGUIDLow()); if (_player->GetSession()->GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { sLog->outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)", @@ -168,10 +168,10 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) if (hisItems[i]) { // logging - sLog->outDebug(LOG_FILTER_NETWORKIO, "player storing: %u",hisItems[i]->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_NETWORKIO, "player storing: %u", hisItems[i]->GetGUIDLow()); if (trader->GetSession()->GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(trader->GetSession()->GetAccountId(),"GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)", + sLog->outCommand(trader->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)", trader->GetName(), trader->GetSession()->GetAccountId(), hisItems[i]->GetTemplate()->Name1.c_str(), hisItems[i]->GetEntry(), hisItems[i]->GetCount(), _player->GetName(), _player->GetSession()->GetAccountId()); @@ -191,21 +191,21 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) if (myItems[i]) { if (!traderCanTrade) - sLog->outError("trader can't store item: %u",myItems[i]->GetGUIDLow()); + sLog->outError("trader can't store item: %u", myItems[i]->GetGUIDLow()); if (_player->CanStoreItem(NULL_BAG, NULL_SLOT, playerDst, myItems[i], false) == EQUIP_ERR_OK) _player->MoveItemToInventory(playerDst, myItems[i], true, true); else - sLog->outError("player can't take item back: %u",myItems[i]->GetGUIDLow()); + sLog->outError("player can't take item back: %u", myItems[i]->GetGUIDLow()); } // return the already removed items to the original owner if (hisItems[i]) { if (!playerCanTrade) - sLog->outError("player can't store item: %u",hisItems[i]->GetGUIDLow()); + sLog->outError("player can't store item: %u", hisItems[i]->GetGUIDLow()); if (trader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, hisItems[i], false) == EQUIP_ERR_OK) trader->MoveItemToInventory(traderDst, hisItems[i], true, true); else - sLog->outError("trader can't take item back: %u",hisItems[i]->GetGUIDLow()); + sLog->outError("trader can't take item back: %u", hisItems[i]->GetGUIDLow()); } } } @@ -461,14 +461,14 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) { if (_player->GetSession()->GetSecurity() > SEC_PLAYER && my_trade->GetMoney() > 0) { - sLog->outCommand(_player->GetSession()->GetAccountId(),"GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", + sLog->outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", _player->GetName(), _player->GetSession()->GetAccountId(), my_trade->GetMoney(), trader->GetName(), trader->GetSession()->GetAccountId()); } if (trader->GetSession()->GetSecurity() > SEC_PLAYER && his_trade->GetMoney() > 0) { - sLog->outCommand(trader->GetSession()->GetAccountId(),"GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", + sLog->outCommand(trader->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", trader->GetName(), trader->GetSession()->GetAccountId(), his_trade->GetMoney(), _player->GetName(), _player->GetSession()->GetAccountId()); @@ -632,7 +632,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (!pOther->IsWithinDistInMap(_player,10.0f,false)) + if (!pOther->IsWithinDistInMap(_player, 10.0f, false)) { SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR); return; diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 27bd2872f7e..6920f157ec7 100755 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -666,7 +666,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x27D*/ { "CMSG_ENABLE_DAMAGE_LOG", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x27E*/ { "CMSG_GROUP_CHANGE_SUB_GROUP", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupChangeSubGroupOpcode }, /*0x27F*/ { "CMSG_REQUEST_PARTY_MEMBER_STATS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestPartyMemberStatsOpcode}, - /*0x280*/ { "CMSG_GROUP_SWAP_SUB_GROUP", STATUS_UNHANDLED,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x280*/ { "CMSG_GROUP_SWAP_SUB_GROUP", STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x281*/ { "CMSG_RESET_FACTION_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x282*/ { "CMSG_AUTOSTORE_BANK_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoStoreBankItemOpcode }, /*0x283*/ { "CMSG_AUTOBANK_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoBankItemOpcode }, @@ -684,7 +684,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x28F*/ { "CMSG_GROUP_ASSISTANT_LEADER", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAssistantLeaderOpcode}, /*0x290*/ { "CMSG_BUYBACK_ITEM", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBuybackItem }, /*0x291*/ { "SMSG_SERVER_MESSAGE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x292*/ { "CMSG_SET_SAVED_INSTANCE_EXTEND", STATUS_UNHANDLED,PROCESS_INPLACE, &WorldSession::Handle_NULL }, + /*0x292*/ { "CMSG_SET_SAVED_INSTANCE_EXTEND", STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x293*/ { "SMSG_LFG_OFFER_CONTINUE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x294*/ { "CMSG_MEETINGSTONE_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x295*/ { "SMSG_MEETINGSTONE_SETQUEUE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, @@ -950,7 +950,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x399*/ { "CMSG_ACTIVE_PVP_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x39A*/ { "CMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, /*0x39B*/ { "SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x39C*/ { "SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE",STATUS_NEVER,PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x39C*/ { "SMSG_CHEAT_DUMP_ITEMS_DEBUG_ONLY_RESPONSE_WRITE_FILE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x39D*/ { "SMSG_UPDATE_COMBO_POINTS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x39E*/ { "SMSG_VOICE_SESSION_ROSTER_UPDATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x39F*/ { "SMSG_VOICE_SESSION_LEAVE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, @@ -959,7 +959,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x3A2*/ { "SMSG_VOICE_SET_TALKER_MUTED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x3A3*/ { "SMSG_INIT_EXTRA_AURA_INFO_OBSOLETE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x3A4*/ { "SMSG_SET_EXTRA_AURA_INFO_OBSOLETE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x3A5*/ { "SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE",STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, + /*0x3A5*/ { "SMSG_SET_EXTRA_AURA_INFO_NEED_UPDATE_OBSOLETE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x3A6*/ { "SMSG_CLEAR_EXTRA_AURA_INFO_OBSOLETE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x3A7*/ { "MSG_MOVE_START_DESCEND", STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes }, /*0x3A8*/ { "CMSG_IGNORE_REQUIREMENTS_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 0596fb64d9c..1ee0cee1eed 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -545,8 +545,8 @@ enum Opcodes SMSG_ENVIRONMENTALDAMAGELOG = 0x1FC, CMSG_PLAYER_DIFFICULTY_CHANGE = 0x1FD, SMSG_RWHOIS = 0x1FE, - SMSG_LFG_PLAYER_REWARD = 0x1FF, // uint32, uint8, uint32, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32,uint32,uint32} - SMSG_LFG_TELEPORT_DENIED = 0x200, // uint32 (1,2,4,6;0,5,7) + SMSG_LFG_PLAYER_REWARD = 0x1FF, // uint32, uint8, uint32, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32, uint32, uint32} + SMSG_LFG_TELEPORT_DENIED = 0x200, // uint32 (1, 2, 4, 6;0, 5, 7) CMSG_UNLEARN_SPELL = 0x201, CMSG_UNLEARN_SKILL = 0x202, SMSG_REMOVED_SPELL = 0x203, @@ -699,7 +699,7 @@ enum Opcodes CMSG_MEETINGSTONE_INFO = 0x296, // EVENT_LFG_UPDATE SMSG_MEETINGSTONE_COMPLETE = 0x297, // EVENT_MAIL_SHOW SMSG_MEETINGSTONE_IN_PROGRESS = 0x298, // uint32, some UPDATE_COOLDOWN events - SMSG_MEETINGSTONE_MEMBER_ADDED = 0x299, // uint32, errors: ERR_NOT_IN_GROUP (2,51) and ERR_NOT_IN_RAID (3,39,40) + SMSG_MEETINGSTONE_MEMBER_ADDED = 0x299, // uint32, errors: ERR_NOT_IN_GROUP (2, 51) and ERR_NOT_IN_RAID (3, 39, 40) CMSG_GMTICKETSYSTEM_TOGGLE = 0x29A, CMSG_CANCEL_GROWTH_AURA = 0x29B, SMSG_CANCEL_AUTO_REPEAT = 0x29C, @@ -899,7 +899,7 @@ enum Opcodes CMSG_SEARCH_LFG_JOIN = 0x35E, // CMSG SearchLFGJoin CMSG_SEARCH_LFG_LEAVE = 0x35F, // CMSG SearchLFGLeave SMSG_UPDATE_LFG_LIST = 0x360, // SMSG uint32, uint32, if (uint8) { uint32 count, for (count) { uint64} }, uint32 count2, uint32, for (count2) { uint64, uint32 flags, if (flags & 0x2) {string}, if (flags & 0x10) {for (3) uint8}, if (flags & 0x80) {uint64, uint32}}, uint32 count3, uint32, for (count3) {uint64, uint32 flags, if (flags & 0x1) {uint8, uint8, uint8, for (3) uint8, uint32, uint32, uint32, uint32, uint32, uint32, float, float, uint32, uint32, uint32, uint32, uint32, float, uint32, uint32, uint32, uint32, uint32, uint32}, if (flags&0x2) string, if (flags&0x4) uint8, if (flags&0x8) uint64, if (flags&0x10) uint8, if (flags&0x20) uint32, if (flags&0x40) uint8, if (flags& 0x80) {uint64, uint32}} - SMSG_LFG_PROPOSAL_UPDATE = 0x361, // SMSG uint32, uint8, uint32, uint32, uint8, for (uint8) {uint32,uint8,uint8,uint8,uint8} + SMSG_LFG_PROPOSAL_UPDATE = 0x361, // SMSG uint32, uint8, uint32, uint32, uint8, for (uint8) {uint32, uint8, uint8, uint8, uint8} CMSG_LFG_PROPOSAL_RESULT = 0x362, // CMSG AcceptProposal, RejectProposal SMSG_LFG_ROLE_CHECK_UPDATE = 0x363, // SMSG uint32, uint8, for (uint8) uint32, uint8, for (uint8) { uint64, uint8, uint32, uint8, } SMSG_LFG_JOIN_RESULT = 0x364, // SMSG uint32 unk, uint32, if (unk == 6) { uint8 count, for (count) uint64 } @@ -913,7 +913,7 @@ enum Opcodes CMSG_LFG_SET_BOOT_VOTE = 0x36C, // CMSG SetLFGBootVote SMSG_LFG_BOOT_PLAYER = 0x36D, // SMSG uint8, uint8, uint8, uint64, uint32, uint32, uint32, uint32 CMSG_LFD_PLAYER_LOCK_INFO_REQUEST = 0x36E, // CMSG RequestLFDPlayerLockInfo - SMSG_LFG_PLAYER_INFO = 0x36F, // SMSG uint8, for (uint8) { uint32, uint8, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32,uint32, uint32}}, uint32, for (uint32) {uint32,uint32} + SMSG_LFG_PLAYER_INFO = 0x36F, // SMSG uint8, for (uint8) { uint32, uint8, uint32, uint32, uint32, uint32, uint8, for (uint8) {uint32, uint32, uint32}}, uint32, for (uint32) {uint32, uint32} CMSG_LFG_TELEPORT = 0x370, // CMSG LFGTeleport CMSG_LFD_PARTY_LOCK_INFO_REQUEST = 0x371, // CMSG RequestLFDPartyLockInfo SMSG_LFG_PARTY_INFO = 0x372, // SMSG uint8, for (uint8) uint64 diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp index ceaf6fa196e..1a11a1efb88 100755 --- a/src/server/game/Server/Protocol/WorldLog.cpp +++ b/src/server/game/Server/Protocol/WorldLog.cpp @@ -40,7 +40,7 @@ WorldLog::~WorldLog() /// Open the log file (if specified so in the configuration file) void WorldLog::Initialize() { - std::string logsDir = sConfig->GetStringDefault("LogsDir",""); + std::string logsDir = sConfig->GetStringDefault("LogsDir", ""); if (!logsDir.empty()) { diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 4a42ae695ea..0e767cb00f8 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -169,8 +169,8 @@ void WorldSession::SendPacket(WorldPacket const *packet) { uint64 minTime = uint64(cur_time - lastTime); uint64 fullTime = uint64(lastTime - firstTime); - sLog->outDetail("Send all time packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f time: %u",sendPacketCount,sendPacketBytes,float(sendPacketCount)/fullTime,float(sendPacketBytes)/fullTime,uint32(fullTime)); - sLog->outDetail("Send last min packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f",sendLastPacketCount,sendLastPacketBytes,float(sendLastPacketCount)/minTime,float(sendLastPacketBytes)/minTime); + sLog->outDetail("Send all time packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f time: %u", sendPacketCount, sendPacketBytes, float(sendPacketCount)/fullTime, float(sendPacketBytes)/fullTime, uint32(fullTime)); + sLog->outDetail("Send last min packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f", sendLastPacketCount, sendLastPacketBytes, float(sendLastPacketCount)/minTime, float(sendLastPacketBytes)/minTime); lastTime = cur_time; sendLastPacketCount = 1; @@ -420,7 +420,7 @@ void WorldSession::LogoutPlayer(bool Save) if (!_player->m_InstanceValid && !_player->isGameMaster()) _player->TeleportTo(_player->m_homebindMapId, _player->m_homebindX, _player->m_homebindY, _player->m_homebindZ, _player->GetOrientation()); - sOutdoorPvPMgr->HandlePlayerLeaveZone(_player,_player->GetZoneId()); + sOutdoorPvPMgr->HandlePlayerLeaveZone(_player, _player->GetZoneId()); for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { @@ -441,7 +441,7 @@ void WorldSession::LogoutPlayer(bool Save) pGuild->HandleMemberLogout(this); ///- Remove pet - _player->RemovePet(NULL,PET_SAVE_AS_CURRENT, true); + _player->RemovePet(NULL, PET_SAVE_AS_CURRENT, true); ///- empty buyback items and save the player in the database // some save parts only correctly work in case player present in map/player_lists (pets, etc) @@ -488,7 +488,7 @@ void WorldSession::LogoutPlayer(bool Save) // e.g if he got disconnected during a transfer to another map // calls to GetMap in this case may cause crashes _player->CleanupsBeforeDelete(); - sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName() ,_player->GetGUIDLow()); + sLog->outChar("Account: %d (IP: %s) Logout Character:[%s] (GUID: %u)", GetAccountId(), GetRemoteAddress().c_str(), _player->GetName() , _player->GetGUIDLow()); Map *_map = _player->GetMap(); _map->Remove(_player, true); SetPlayer(NULL); // deleted in Remove call @@ -516,7 +516,7 @@ void WorldSession::KickPlayer() m_Socket->CloseSocket(); } -void WorldSession::SendNotification(const char *format,...) +void WorldSession::SendNotification(const char *format, ...) { if (format) { @@ -533,7 +533,7 @@ void WorldSession::SendNotification(const char *format,...) } } -void WorldSession::SendNotification(uint32 string_id,...) +void WorldSession::SendNotification(uint32 string_id, ...) { char const *format = GetTrinityString(string_id); if (format) diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index ffc82198abc..69b8006ee6f 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -195,11 +195,11 @@ class WorldSession void WriteMovementInfo(WorldPacket *data, MovementInfo *mi); void SendPacket(WorldPacket const* packet); - void SendNotification(const char *format,...) ATTR_PRINTF(2,3); - void SendNotification(uint32 string_id,...); + void SendNotification(const char *format, ...) ATTR_PRINTF(2, 3); + void SendNotification(uint32 string_id, ...); void SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName); void SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res, uint32 val = 0); - void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2,3); + void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2, 3); void SendSetPhaseShift(uint32 phaseShift); void SendQueryTimeResponse(); @@ -303,8 +303,8 @@ class WorldSession void SendAuctionOwnerNotification(AuctionEntry * auction); //Item Enchantment - void SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID,uint32 SpellID); - void SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,uint32 slot,uint32 Duration); + void SendEnchantmentLog(uint64 Target, uint64 Caster, uint32 ItemID, uint32 SpellID); + void SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid, uint32 slot, uint32 Duration); //Taxi void SendTaxiStatus(uint64 guid); diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index f1ea340cd4b..b2c8164d6f5 100755 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -48,7 +48,7 @@ #if defined(__GNUC__) #pragma pack(1) #else -#pragma pack(push,1) +#pragma pack(push, 1) #endif struct ServerPktHeader @@ -206,7 +206,7 @@ int WorldSocket::SendPacket (const WorldPacket& pct) if (!pct.empty()) mb->copy((const char*)pct.contents(), pct.size()); - if (msg_queue()->enqueue_tail(mb,(ACE_Time_Value*)&ACE_Time_Value::zero) == -1) + if (msg_queue()->enqueue_tail(mb, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1) { sLog->outError("WorldSocket::SendPacket enqueue_tail failed"); mb->release(); @@ -309,7 +309,7 @@ int WorldSocket::handle_input (ACE_HANDLE) if ((errno == EWOULDBLOCK) || (errno == EAGAIN)) { - return Update(); // interesting line ,isn't it ? + return Update(); // interesting line , isn't it ? } sLog->outStaticDebug("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno)); @@ -598,7 +598,7 @@ int WorldSocket::handle_input_missing_data (void) // Its possible on some error situations that this happens // for example on closing when epoll receives more chunked data and stuff - // hope this is not hack ,as proper m_RecvWPct is asserted around + // hope this is not hack , as proper m_RecvWPct is asserted around if (!m_RecvWPct) { sLog->outError ("Forcing close on input m_RecvWPct = NULL"); @@ -721,7 +721,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return HandleAuthSession (*new_pct); case CMSG_KEEP_ALIVE: - sLog->outStaticDebug ("CMSG_KEEP_ALIVE ,size: " UI64FMTD, uint64(new_pct->size())); + sLog->outStaticDebug ("CMSG_KEEP_ALIVE , size: " UI64FMTD, uint64(new_pct->size())); sScriptMgr->OnPacketReceive(this, WorldPacket(*new_pct)); return 0; default: @@ -734,7 +734,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) // Catches people idling on the login screen and any lingering ingame connections. m_Session->ResetTimeOutTime(); - // OK ,give the packet to WorldSession + // OK , give the packet to WorldSession aptr.release(); // WARNINIG here we call it with locks held. // Its possible to cause deadlock if QueuePacket calls back @@ -860,7 +860,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) const char* sStr = s.AsHexStr(); //Must be freed by OPENSSL_free() const char* vStr = v.AsHexStr(); //Must be freed by OPENSSL_free() - sLog->outStaticDebug ("WorldSocket::HandleAuthSession: (s,v) check s: %s v: %s", + sLog->outStaticDebug ("WorldSocket::HandleAuthSession: (s, v) check s: %s v: %s", sStr, vStr); @@ -1058,7 +1058,7 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket) else { sLog->outError ("WorldSocket::HandlePing: peer sent CMSG_PING, " - "but is not authenticated or got recently kicked," + "but is not authenticated or got recently kicked, " " address = %s", GetRemoteAddress().c_str()); return -1; diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 85dd29f89ec..7e87b38f737 100755 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -74,7 +74,7 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> WorldHandler; * The calls to Update() method are managed by WorldSocketMgr * and ReactorRunnable. * - * For input ,the class uses one 1024 bytes buffer on stack + * For input , the class uses one 1024 bytes buffer on stack * to which it does recv() calls. And then received data is * distributed where its needed. 1024 matches pretty well the * traffic generated by client for now. @@ -126,7 +126,7 @@ class WorldSocket : protected WorldHandler WorldSocket (void); virtual ~WorldSocket (void); - /// Called on open ,the void* is the acceptor. + /// Called on open , the void* is the acceptor. virtual int open (void *); /// Called on failures inside of the acceptor, don't call from your code. @@ -160,7 +160,7 @@ class WorldSocket : protected WorldHandler int handle_output_queue (GuardType& g); /// process one incoming packet. - /// @param new_pct received packet ,note that you need to delete it. + /// @param new_pct received packet , note that you need to delete it. int ProcessIncoming (WorldPacket* new_pct); /// Called by ProcessIncoming() on CMSG_AUTH_SESSION. @@ -173,7 +173,7 @@ class WorldSocket : protected WorldHandler /// Time in which the last ping was received ACE_Time_Value m_LastPingTime; - /// Keep track of over-speed pings ,to prevent ping flood. + /// Keep track of over-speed pings , to prevent ping flood. uint32 m_OverSpeedPings; /// Address of the remote peer diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 91586137853..2454f6df5d0 100755 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -46,7 +46,7 @@ #include "ScriptMgr.h" /** -* This is a helper class to WorldSocketMgr ,that manages +* This is a helper class to WorldSocketMgr , that manages * network threads, and assigning connections from acceptor thread * to other network threads */ @@ -263,7 +263,7 @@ WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) if (acc->open(listen_addr, m_NetThreads[0].GetReactor(), ACE_NONBLOCK) == -1) { - sLog->outError ("Failed to open acceptor ,check if the port is free"); + sLog->outError ("Failed to open acceptor , check if the port is free"); return -1; } diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h index 0a6c517b5db..eb6ee9efbe6 100755 --- a/src/server/game/Server/WorldSocketMgr.h +++ b/src/server/game/Server/WorldSocketMgr.h @@ -68,7 +68,7 @@ private: ACE_Event_Handler* m_Acceptor; }; -#define sWorldSocketMgr ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>::instance() +#define sWorldSocketMgr ACE_Singleton<WorldSocketMgr, ACE_Thread_Mutex>::instance() #endif /// @} diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index 973d37b90cc..bdd635eb192 100755 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -88,7 +88,7 @@ void LoadSkillDiscoveryTable() { if (reportedReqSpells.find(absReqSkillOrSpell) == reportedReqSpells.end()) { - sLog->outErrorDb("Spell (ID: %u) have not existed spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell); + sLog->outErrorDb("Spell (ID: %u) have not existed spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table", spellId, reqSkillOrSpell); reportedReqSpells.insert(absReqSkillOrSpell); } continue; @@ -117,7 +117,7 @@ void LoadSkillDiscoveryTable() if (bounds.first == bounds.second) { - sLog->outErrorDb("Spell (ID: %u) not listed in `SkillLineAbility.dbc` but listed with `reqSpell`=0 in `skill_discovery_template` table",spellId); + sLog->outErrorDb("Spell (ID: %u) not listed in `SkillLineAbility.dbc` but listed with `reqSpell`=0 in `skill_discovery_template` table", spellId); continue; } @@ -126,7 +126,7 @@ void LoadSkillDiscoveryTable() } else { - sLog->outErrorDb("Spell (ID: %u) have negative value in `reqSpell` field in `skill_discovery_template` table",spellId); + sLog->outErrorDb("Spell (ID: %u) have negative value in `reqSpell` field in `skill_discovery_template` table", spellId); continue; } @@ -134,7 +134,7 @@ void LoadSkillDiscoveryTable() } while (result->NextRow()); if (!ssNonDiscoverableEntries.str().empty()) - sLog->outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str()); + sLog->outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s", ssNonDiscoverableEntries.str().c_str()); // report about empty data for explicit discovery spells for (uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id) @@ -148,7 +148,7 @@ void LoadSkillDiscoveryTable() continue; if (SkillDiscoveryStore.find(int32(spell_id)) == SkillDiscoveryStore.end()) - sLog->outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table",spell_id); + sLog->outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table", spell_id); } sLog->outString(">> Loaded %u skill discovery definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index 5aa6561adee..f4aaa26a251 100755 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -44,7 +44,7 @@ struct SkillExtraItemEntry }; // map to store the extra item creation info, the key is the spellId of the creation spell, the mapped value is the assigned SkillExtraItemEntry -typedef std::map<uint32,SkillExtraItemEntry> SkillExtraItemMap; +typedef std::map<uint32, SkillExtraItemEntry> SkillExtraItemMap; SkillExtraItemMap SkillExtraItemStore; @@ -82,7 +82,7 @@ void LoadSkillExtraItemTable() uint32 requiredSpecialization = fields[1].GetUInt32(); if (!sSpellStore.LookupEntry(requiredSpecialization)) { - sLog->outError("Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization); + sLog->outError("Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId, requiredSpecialization); continue; } diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index f597ce35ffe..9e9f965d96c 100755 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -74,7 +74,7 @@ enum AuraType SPELL_AURA_MOD_STEALTH_DETECT = 17, SPELL_AURA_MOD_INVISIBILITY = 18, SPELL_AURA_MOD_INVISIBILITY_DETECT = 19, - SPELL_AURA_OBS_MOD_HEALTH = 20, //20,21 unofficial + SPELL_AURA_OBS_MOD_HEALTH = 20, //20, 21 unofficial SPELL_AURA_OBS_MOD_POWER = 21, SPELL_AURA_MOD_RESISTANCE = 22, SPELL_AURA_PERIODIC_TRIGGER_SPELL = 23, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 5a9977ff2b6..8fd24da80a8 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -632,7 +632,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster) uint8 cp = caster->ToPlayer()->GetComboPoints(); // Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs - if (AuraEffect const * aurEff = caster->GetAuraEffect(34241,0)) + if (AuraEffect const * aurEff = caster->GetAuraEffect(34241, 0)) amount += cp * aurEff->GetAmount(); amount += uint32(CalculatePctU(caster->GetTotalAttackPowerValue(BASE_ATTACK), cp)); @@ -644,8 +644,8 @@ int32 AuraEffect::CalculateAmount(Unit * caster) // $0.2 * (($MWB + $mwb) / 2 + $AP / 14 * $MWS) bonus per tick float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK); int32 mws = caster->GetAttackTime(BASE_ATTACK); - float mwb_min = caster->GetWeaponDamageRange(BASE_ATTACK,MINDAMAGE); - float mwb_max = caster->GetWeaponDamageRange(BASE_ATTACK,MAXDAMAGE); + float mwb_min = caster->GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE); + float mwb_max = caster->GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE); float mwb = ((mwb_min + mwb_max) / 2 + ap * mws / 14000) * 0.2f; amount += int32(caster->ApplyEffectModifiers(m_spellProto, m_effIndex, mwb)); // "If used while your target is above 75% health, Rend does 35% more damage." @@ -1269,7 +1269,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const // Consecrate ticks can miss and will not show up in the combat log if (GetSpellProto()->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA && - caster->SpellHitResult(target,GetSpellProto(),false) != SPELL_MISS_NONE) + caster->SpellHitResult(target, GetSpellProto(), false) != SPELL_MISS_NONE) break; // Check for immune (not use charges) @@ -1296,7 +1296,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const { uint32 percent = GetEffIndex() < 2 && GetSpellProto()->Effect[GetEffIndex()] == SPELL_EFFECT_DUMMY ? - caster->CalculateSpellDamage(target, GetSpellProto(),GetEffIndex()+1) : + caster->CalculateSpellDamage(target, GetSpellProto(), GetEffIndex()+1) : 100; if (!target->HealthBelowPct(percent)) { @@ -1383,9 +1383,9 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const caster->CalcAbsorbResist(target, GetSpellSchoolMask(GetSpellProto()), DOT, damage, &absorb, &resist, m_spellProto); sLog->outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(),absorb); + GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb); - caster->DealDamageMods(target,damage,&absorb); + caster->DealDamageMods(target, damage, &absorb); // Set trigger flag uint32 procAttacker = PROC_FLAG_DONE_PERIODIC; @@ -1425,7 +1425,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const } if (GetSpellProto()->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA && - caster->SpellHitResult(target,GetSpellProto(),false) != SPELL_MISS_NONE) + caster->SpellHitResult(target, GetSpellProto(), false) != SPELL_MISS_NONE) return; // Check for immune @@ -1465,7 +1465,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const damage = uint32(target->GetHealth()); sLog->outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(),absorb); + GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb); caster->SendSpellNonMeleeDamageLog(target, GetId(), damage, GetSpellSchoolMask(GetSpellProto()), absorb, resist, false, 0, crit); @@ -1620,7 +1620,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const if ((int32)damage > gain) damage = gain; uint32 absorb = 0; - caster->DealDamageMods(caster,damage,&absorb); + caster->DealDamageMods(caster, damage, &absorb); caster->SendSpellNonMeleeDamageLog(caster, GetId(), damage, GetSpellSchoolMask(GetSpellProto()), absorb, 0, false, 0, false); CleanDamage cleanDamage = CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL); @@ -1659,7 +1659,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const break; if (GetSpellProto()->Effect[GetEffIndex()] == SPELL_EFFECT_PERSISTENT_AREA_AURA && - caster->SpellHitResult(target,GetSpellProto(),false) != SPELL_MISS_NONE) + caster->SpellHitResult(target, GetSpellProto(), false) != SPELL_MISS_NONE) break; // Check for immune (not use charges) @@ -1781,7 +1781,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false); target->SendPeriodicAuraLog(&pInfo); - int32 gain = target->ModifyPower(power,amount); + int32 gain = target->ModifyPower(power, amount); if (caster) target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, GetSpellProto()); @@ -1818,7 +1818,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u", GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId()); - int32 gain = target->ModifyPower(power,amount); + int32 gain = target->ModifyPower(power, amount); if (caster) target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, GetSpellProto()); @@ -1866,7 +1866,7 @@ void AuraEffect::PeriodicTick(AuraApplication * aurApp, Unit * caster) const //no SpellDamageBonus for burn mana caster->CalculateSpellDamageTaken(&damageInfo, int32(gain * dmgMultiplier), spellProto); - caster->DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb); + caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); caster->SendSpellNonMeleeDamageLog(&damageInfo); @@ -2048,12 +2048,12 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const // eff_radius == 0 float radius = GetSpellMaxRange(GetSpellProto(), false); - CellPair p(Trinity::ComputeCellPair(caster->GetPositionX(),caster->GetPositionY())); + CellPair p(Trinity::ComputeCellPair(caster->GetPositionX(), caster->GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; Trinity::AnyUnfriendlyVisibleUnitInObjectRangeCheck u_check(caster, caster, radius); - Trinity::UnitListSearcher<Trinity::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(caster,targets, u_check); + Trinity::UnitListSearcher<Trinity::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(caster, targets, u_check); TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker); TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, WorldTypeMapContainer > world_object_checker(checker); @@ -2251,7 +2251,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const if (!creature->GetCreatureInfo()->SkinLootId) return; - player->AutoStoreLoot(creature->GetCreatureInfo()->SkinLootId,LootTemplates_Skinning,true); + player->AutoStoreLoot(creature->GetCreatureInfo()->SkinLootId, LootTemplates_Skinning, true); creature->DespawnOrUnsummon(); } @@ -2264,7 +2264,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const // so instakill will be naturally done before trigger spell case 31347: { - target->CastSpell(target,31350,true, NULL, this); + target->CastSpell(target, 31350, true, NULL, this); target->Kill(target); return; } @@ -2280,9 +2280,9 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const { // cast 24 spells 34269-34289, 34314-34316 for (uint32 spell_id = 34269; spell_id != 34290; ++spell_id) - caster->CastSpell(target,spell_id,true, NULL, this); + caster->CastSpell(target, spell_id, true, NULL, this); for (uint32 spell_id = 34314; spell_id != 34317; ++spell_id) - caster->CastSpell(target,spell_id,true, NULL, this); + caster->CastSpell(target, spell_id, true, NULL, this); return; } // Remote Toy @@ -2306,7 +2306,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const creatureTarget->DespawnOrUnsummon(); return; } - // Tear of Azzinoth Summon Channel - it's not really supposed to do anything,and this only prevents the console spam + // Tear of Azzinoth Summon Channel - it's not really supposed to do anything, and this only prevents the console spam case 39857: triggerSpellId = 39856; break; @@ -2356,7 +2356,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const case 28820: { // Need remove self if Lightning Shield not active - if (!target->GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN,0x400)) + if (!target->GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_SHAMAN, 0x400)) target->RemoveAurasDueToSpell(28820); return; } @@ -2374,7 +2374,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const } if (all) - caster->CastSpell(target,38437,true, NULL, this); + caster->CastSpell(target, 38437, true, NULL, this); else target->RemoveAurasDueToSpell(38437); return; @@ -2460,7 +2460,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const Creature* c = triggerTarget->ToCreature(); if (!c || (c && !sScriptMgr->OnDummyEffect(caster, GetId(), SpellEffIndex(GetEffIndex()), triggerTarget->ToCreature())) || (c && !c->AI()->sOnDummyEffect(caster, GetId(), SpellEffIndex(GetEffIndex())))) - sLog->outError("AuraEffect::TriggerSpell: Spell %u has value 0 in EffectTriggered[%d] and is therefor not handled. Define as custom case?",GetId(),GetEffIndex()); + sLog->outError("AuraEffect::TriggerSpell: Spell %u has value 0 in EffectTriggered[%d] and is therefor not handled. Define as custom case?", GetId(), GetEffIndex()); } } @@ -2482,7 +2482,7 @@ void AuraEffect::TriggerSpellWithValue(Unit * target, Unit * caster) const triggerCaster->CastCustomSpell(triggerTarget, triggerSpellId, &basepoints0, 0, 0, true, 0, this); } else - sLog->outError("AuraEffect::TriggerSpellWithValue: Spell %u has value 0 in EffectTriggered[%d] and is therefor not handled. Define as custom case?",GetId(),GetEffIndex()); + sLog->outError("AuraEffect::TriggerSpellWithValue: Spell %u has value 0 in EffectTriggered[%d] and is therefor not handled. Define as custom case?", GetId(), GetEffIndex()); } bool AuraEffect::IsAffectedOnSpell(SpellEntry const *spell) const @@ -2733,7 +2733,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const if (pl->HasSpell(63410) || pl->HasSpell(63411)) { target->RemoveAurasDueToSpell(66530); - target->CastSpell(target,66530,true); + target->CastSpell(target, 66530, true); } } @@ -3145,7 +3145,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m break; case FORM_BEAR: case FORM_DIREBEAR: - if (urand(0,99) < FurorChance) + if (urand(0, 99) < FurorChance) target->CastSpell(target, 17057, true); default: { @@ -3206,7 +3206,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m // Defensive Tactics if (form == FORM_DEFENSIVESTANCE) { - if (AuraEffect const * aurEff = target->IsScriptOverriden(m_spellProto,831)) + if (AuraEffect const * aurEff = target->IsScriptOverriden(m_spellProto, 831)) Rage_val += aurEff->GetAmount() * 10; } // Stance mastery + Tactical mastery (both passive, and last have aura only in defense stance, but need apply at any stance switch) @@ -3218,11 +3218,11 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) continue; SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); if (spellInfo && spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && spellInfo->SpellIconID == 139) - Rage_val += target->CalculateSpellDamage(target,spellInfo,0) * 10; + Rage_val += target->CalculateSpellDamage(target, spellInfo, 0) * 10; } } if (target->GetPower(POWER_RAGE) > Rage_val) - target->SetPower(POWER_RAGE,Rage_val); + target->SetPower(POWER_RAGE, Rage_val); break; } default: @@ -3374,7 +3374,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode, // Dragonmaw Illusion (set mount model also) if (GetId() == 42016 && target->GetMountID() && !target->GetAuraEffectsByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED).empty()) - target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314); + target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 16314); } } } @@ -3416,11 +3416,11 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode, if (target->GetTypeId() == TYPEID_PLAYER) team = target->ToPlayer()->GetTeam(); - uint32 displayID = sObjectMgr->ChooseDisplayId(team,ci); + uint32 displayID = sObjectMgr->ChooseDisplayId(team, ci); CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID); - target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,displayID); + target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, displayID); } } } @@ -3434,7 +3434,7 @@ void AuraEffect::HandleAuraModScale(AuraApplication const * aurApp, uint8 mode, Unit * target = aurApp->GetTarget(); - target->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X,(float)GetAmount(),apply); + target->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X, (float)GetAmount(), apply); } void AuraEffect::HandleAuraCloneCaster(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -3483,7 +3483,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const * aurApp, uint8 mode, bo WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9); data<<target->GetGUID(); data<<uint8(0); - target->SendMessageToSet(&data,true); + target->SendMessageToSet(&data, true); */ UnitList targets; @@ -3531,7 +3531,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const * aurApp, uint8 mode, bo WorldPacket data(SMSG_FEIGN_DEATH_RESISTED, 9); data<<target->GetGUID(); data<<uint8(1); - target->SendMessageToSet(&data,true); + target->SendMessageToSet(&data, true); */ // blizz like 2.0.x target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29); @@ -3767,7 +3767,7 @@ void AuraEffect::HandleAuraTrackStealthed(AuraApplication const * aurApp, uint8 if (target->HasAuraType(GetAuraType())) return; } - target->ApplyModFlag(PLAYER_FIELD_BYTES,PLAYER_FIELD_BYTE_TRACK_STEALTHED,apply); + target->ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_TRACK_STEALTHED, apply); } void AuraEffect::HandleAuraModStalked(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -3837,7 +3837,7 @@ void AuraEffect::HandleAuraModSkill(AuraApplication const * aurApp, uint8 /*mode uint32 prot = GetMiscValue(); int32 points = GetAmount(); - target->ToPlayer()->ModifySkillBonus(prot,((apply) ? points: -points),GetAuraType() == SPELL_AURA_MOD_SKILL_TALENT); + target->ToPlayer()->ModifySkillBonus(prot, ((apply) ? points: -points), GetAuraType() == SPELL_AURA_MOD_SKILL_TALENT); if (prot == SKILL_DEFENSE) target->ToPlayer()->UpdateDefenseBonusesMod(); } @@ -3869,7 +3869,7 @@ void AuraEffect::HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, b CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(creatureEntry); if (!ci) { - sLog->outErrorDb("AuraMounted: `creature_template`='%u' not found in database (only need its modelid)",GetMiscValue()); + sLog->outErrorDb("AuraMounted: `creature_template`='%u' not found in database (only need its modelid)", GetMiscValue()); return; } @@ -3877,7 +3877,7 @@ void AuraEffect::HandleAuraMounted(AuraApplication const * aurApp, uint8 mode, b if (target->GetTypeId() == TYPEID_PLAYER) team = target->ToPlayer()->GetTeam(); - uint32 displayID = sObjectMgr->ChooseDisplayId(team,ci); + uint32 displayID = sObjectMgr->ChooseDisplayId(team, ci); CreatureModelInfo const *minfo = sObjectMgr->GetCreatureModelRandomGender(displayID); //some spell has one aura of mount and one of vehicle @@ -3951,7 +3951,7 @@ void AuraEffect::HandleAuraWaterWalk(AuraApplication const * aurApp, uint8 mode, data.Initialize(SMSG_MOVE_LAND_WALK, 8+4); data.append(target->GetPackGUID()); data << uint32(0); - target->SendMessageToSet(&data,true); + target->SendMessageToSet(&data, true); } void AuraEffect::HandleAuraFeatherFall(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -4003,7 +4003,7 @@ void AuraEffect::HandleAuraHover(AuraApplication const * aurApp, uint8 mode, boo data.Initialize(SMSG_MOVE_UNSET_HOVER, 8+4); data.append(target->GetPackGUID()); data << uint32(0); - target->SendMessageToSet(&data,true); + target->SendMessageToSet(&data, true); } void AuraEffect::HandleWaterBreathing(AuraApplication const * aurApp, uint8 mode, bool /*apply*/) const @@ -4334,11 +4334,11 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const * aurApp { //Players on flying mounts must be immune to polymorph if (target->GetTypeId() == TYPEID_PLAYER) - target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,MECHANIC_POLYMORPH,apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_POLYMORPH, apply); // Dragonmaw Illusion (overwrite mount model, mounted aura already applied) - if (apply && target->HasAuraEffect(42016,0) && target->GetMountID()) - target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314); + if (apply && target->HasAuraEffect(42016, 0) && target->GetMountID()) + target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 16314); } } @@ -4504,14 +4504,14 @@ void AuraEffect::HandleAuraModEffectImmunity(AuraApplication const * aurApp, uin bg->EventPlayerDroppedFlag(target->ToPlayer()); } else - sOutdoorPvPMgr->HandleDropFlag((Player*)target,GetSpellProto()->Id); + sOutdoorPvPMgr->HandleDropFlag((Player*)target, GetSpellProto()->Id); } } // stop handling the effect if it was removed by linked event if (apply && aurApp->GetRemoveMode()) return; - target->ApplySpellImmune(GetId(),IMMUNITY_EFFECT,GetMiscValue(),apply); + target->ApplySpellImmune(GetId(), IMMUNITY_EFFECT, GetMiscValue(), apply); } void AuraEffect::HandleAuraModStateImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -4545,7 +4545,7 @@ void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const * aurApp, uin if (apply && aurApp->GetRemoveMode()) return; - target->ApplySpellImmune(GetId(),IMMUNITY_SCHOOL,GetMiscValue(),(apply)); + target->ApplySpellImmune(GetId(), IMMUNITY_SCHOOL, GetMiscValue(), (apply)); // remove all flag auras (they are positive, but they must be removed when you are immune) if (GetSpellProto()->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY @@ -4563,7 +4563,7 @@ void AuraEffect::HandleAuraModSchoolImmunity(AuraApplication const * aurApp, uin { SpellEntry const *spell = iter->second->GetBase()->GetSpellProto(); if ((GetSpellSchoolMask(spell) & school_mask)//Check for school mask - && CanSpellDispelAura(GetSpellProto(),spell) + && CanSpellDispelAura(GetSpellProto(), spell) && !iter->second->IsPositive() //Don't remove positive spells && spell->Id != GetId()) //Don't remove self { @@ -4605,7 +4605,7 @@ void AuraEffect::HandleAuraModDmgImmunity(AuraApplication const * aurApp, uint8 Unit * target = aurApp->GetTarget(); - target->ApplySpellImmune(GetId(),IMMUNITY_DAMAGE,GetMiscValue(), apply); + target->ApplySpellImmune(GetId(), IMMUNITY_DAMAGE, GetMiscValue(), apply); } void AuraEffect::HandleAuraModDispelImmunity(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -4661,7 +4661,7 @@ void AuraEffect::HandleAuraModResistance(AuraApplication const * aurApp, uint8 m { target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), TOTAL_VALUE, float(GetAmount()), apply); if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) - target->ApplyResistanceBuffModsMod(SpellSchools(x),GetAmount() > 0,(float)GetAmount(), apply); + target->ApplyResistanceBuffModsMod(SpellSchools(x), GetAmount() > 0, (float)GetAmount(), apply); } } } @@ -4704,8 +4704,8 @@ void AuraEffect::HandleModResistancePercent(AuraApplication const * aurApp, uint target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_PCT, float(GetAmount()), apply); if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) { - target->ApplyResistanceBuffModsPercentMod(SpellSchools(i),true,(float)GetAmount(), apply); - target->ApplyResistanceBuffModsPercentMod(SpellSchools(i),false,(float)GetAmount(), apply); + target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), true, (float)GetAmount(), apply); + target->ApplyResistanceBuffModsPercentMod(SpellSchools(i), false, (float)GetAmount(), apply); } } } @@ -4744,11 +4744,11 @@ void AuraEffect::HandleModTargetResistance(AuraApplication const * aurApp, uint8 // show armor penetration if (target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)) - target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,GetAmount(), apply); + target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE, GetAmount(), apply); // show as spell penetration only full spell penetration bonuses (all resistances except armor and holy if (target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_SPELL) == SPELL_SCHOOL_MASK_SPELL) - target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,GetAmount(), apply); + target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE, GetAmount(), apply); } /********************************/ @@ -4764,7 +4764,7 @@ void AuraEffect::HandleAuraModStat(AuraApplication const * aurApp, uint8 mode, b if (GetMiscValue() < -2 || GetMiscValue() > 4) { - sLog->outError("WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_STAT ",GetId(),GetEffIndex(),GetMiscValue()); + sLog->outError("WARNING: Spell %u effect %u has an unsupported misc value (%i) for SPELL_AURA_MOD_STAT ", GetId(), GetEffIndex(), GetMiscValue()); return; } @@ -4773,10 +4773,10 @@ void AuraEffect::HandleAuraModStat(AuraApplication const * aurApp, uint8 mode, b // -1 or -2 is all stats (misc < -2 checked in function beginning) if (GetMiscValue() < 0 || GetMiscValue() == i) { - //target->ApplyStatMod(Stats(i), m_amount,apply); + //target->ApplyStatMod(Stats(i), m_amount, apply); target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_VALUE, float(GetAmount()), apply); if (target->GetTypeId() == TYPEID_PLAYER || target->ToCreature()->isPet()) - target->ApplyStatBuffMod(Stats(i),(float)GetAmount(),apply); + target->ApplyStatBuffMod(Stats(i), (float)GetAmount(), apply); } } } @@ -5162,7 +5162,7 @@ void AuraEffect::HandleAuraModWeaponCritPercent(AuraApplication const * aurApp, for (int i = 0; i < MAX_ATTACK; ++i) if (Item* pItem = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), true)) - target->ToPlayer()->_ApplyWeaponDependentAuraCritMod(pItem,WeaponAttackType(i),this,apply); + target->ToPlayer()->_ApplyWeaponDependentAuraCritMod(pItem, WeaponAttackType(i), this, apply); // mods must be applied base at equipped weapon class and subclass comparison // with spell->EquippedItemClass and EquippedItemSubClassMask and EquippedItemInventoryTypeMask @@ -5272,7 +5272,7 @@ void AuraEffect::HandleModCastingSpeed(AuraApplication const * aurApp, uint8 mod Unit * target = aurApp->GetTarget(); - target->ApplyCastTimePercentMod((float)GetAmount(),apply); + target->ApplyCastTimePercentMod((float)GetAmount(), apply); } void AuraEffect::HandleModMeleeRangedSpeedPct(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -5282,8 +5282,8 @@ void AuraEffect::HandleModMeleeRangedSpeedPct(AuraApplication const * aurApp, ui Unit * target = aurApp->GetTarget(); - target->ApplyAttackTimePercentMod(BASE_ATTACK,(float)GetAmount(),apply); - target->ApplyAttackTimePercentMod(OFF_ATTACK,(float)GetAmount(),apply); + target->ApplyAttackTimePercentMod(BASE_ATTACK, (float)GetAmount(), apply); + target->ApplyAttackTimePercentMod(OFF_ATTACK, (float)GetAmount(), apply); target->ApplyAttackTimePercentMod(RANGED_ATTACK, (float)GetAmount(), apply); } @@ -5294,9 +5294,9 @@ void AuraEffect::HandleModCombatSpeedPct(AuraApplication const * aurApp, uint8 m Unit * target = aurApp->GetTarget(); - target->ApplyCastTimePercentMod(float(m_amount),apply); - target->ApplyAttackTimePercentMod(BASE_ATTACK,float(GetAmount()),apply); - target->ApplyAttackTimePercentMod(OFF_ATTACK,float(GetAmount()),apply); + target->ApplyCastTimePercentMod(float(m_amount), apply); + target->ApplyAttackTimePercentMod(BASE_ATTACK, float(GetAmount()), apply); + target->ApplyAttackTimePercentMod(OFF_ATTACK, float(GetAmount()), apply); target->ApplyAttackTimePercentMod(RANGED_ATTACK, float(GetAmount()), apply); } @@ -5475,7 +5475,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, { for (int i = 0; i < MAX_ATTACK; ++i) if (Item* pItem = target->ToPlayer()->GetWeaponForAttack(WeaponAttackType(i), true)) - target->ToPlayer()->_ApplyWeaponDependentAuraDamageMod(pItem,WeaponAttackType(i),this,apply); + target->ToPlayer()->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply); } // GetMiscValue() is bitmask of spell schools @@ -5499,9 +5499,9 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, if (target->GetTypeId() == TYPEID_PLAYER) { if (GetAmount() > 0) - target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS,GetAmount(),apply); + target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, GetAmount(), apply); else - target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG,GetAmount(),apply); + target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG, GetAmount(), apply); } } else @@ -5532,7 +5532,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) { if ((GetMiscValue() & (1<<i)) != 0) - target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i,GetAmount(),apply); + target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, GetAmount(), apply); } } else @@ -5540,7 +5540,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode, for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; i++) { if ((GetMiscValue() & (1<<i)) != 0) - target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+i,GetAmount(),apply); + target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG+i, GetAmount(), apply); } } if (Guardian* pet = target->ToPlayer()->GetGuardianPet()) @@ -5612,7 +5612,7 @@ void AuraEffect::HandleModPowerCost(AuraApplication const * aurApp, uint8 mode, for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) if (GetMiscValue() & (1<<i)) - target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,GetAmount(),apply); + target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i, GetAmount(), apply); } void AuraEffect::HandleArenaPreparation(AuraApplication const * aurApp, uint8 mode, bool apply) const @@ -5666,7 +5666,7 @@ void AuraEffect::HandleAuraRetainComboPoints(AuraApplication const * aurApp, uin // combo points was added in SPELL_EFFECT_ADD_COMBO_POINTS handler // remove only if aura expire by time (in case combo points amount change aura removed without combo points lost) if (!(apply) && GetBase()->GetDuration() == 0 && target->ToPlayer()->GetComboTarget()) - if (Unit* unit = ObjectAccessor::GetUnit(*target,target->ToPlayer()->GetComboTarget())) + if (Unit* unit = ObjectAccessor::GetUnit(*target, target->ToPlayer()->GetComboTarget())) target->ToPlayer()->AddComboPoints(unit, -GetAmount()); } @@ -5702,11 +5702,11 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo { // Unrelenting Assault, rank 1 case 46859: - target->CastSpell(target,64849,true,NULL,aurEff); + target->CastSpell(target, 64849, true, NULL, aurEff); break; // Unrelenting Assault, rank 2 case 46860: - target->CastSpell(target,64850,true,NULL,aurEff); + target->CastSpell(target, 64850, true, NULL, aurEff); break; } } @@ -5720,7 +5720,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo case 13139: // net-o-matic // root to self part of (root_target->charge->root_self sequence if (caster) - caster->CastSpell(caster,13138,true,NULL,this); + caster->CastSpell(caster, 13138, true, NULL, this); break; case 34026: // kill command { @@ -5728,10 +5728,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo if (!pet) break; - target->CastSpell(target,34027,true,NULL,this); + target->CastSpell(target, 34027, true, NULL, this); // set 3 stacks and 3 charges (to make all auras not disappear at once) - Aura * owner_aura = target->GetAura(34027,GetCasterGUID()); + Aura * owner_aura = target->GetAura(34027, GetCasterGUID()); Aura * pet_aura = pet->GetAura(58914, GetCasterGUID()); if (owner_aura) { @@ -5751,10 +5751,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo switch(caster->getGender()) { case GENDER_FEMALE: - caster->CastSpell(target,37095,true,NULL,this); // Blood Elf Disguise + caster->CastSpell(target, 37095, true, NULL, this); // Blood Elf Disguise break; case GENDER_MALE: - caster->CastSpell(target,37093,true,NULL,this); + caster->CastSpell(target, 37093, true, NULL, this); break; default: break; @@ -5764,9 +5764,9 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo } case 55198: // Tidal Force { - target->CastSpell(target,55166,true,NULL,this); + target->CastSpell(target, 55166, true, NULL, this); // set 3 stacks and 3 charges (to make all auras not disappear at once) - Aura * owner_aura = target->GetAura(55166,GetCasterGUID()); + Aura * owner_aura = target->GetAura(55166, GetCasterGUID()); if (owner_aura) { // This aura lasts 2 sec, need this hack to properly proc spells @@ -5791,10 +5791,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo switch(caster->getGender()) { case GENDER_FEMALE: - caster->CastSpell(target,46356,true,NULL,this); + caster->CastSpell(target, 46356, true, NULL, this); break; case GENDER_MALE: - caster->CastSpell(target,46355,true,NULL,this); + caster->CastSpell(target, 46355, true, NULL, this); break; } } @@ -5818,7 +5818,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo break; case 52916: // Honor Among Thieves if (target->GetTypeId() == TYPEID_PLAYER) - if (Unit * spellTarget = ObjectAccessor::GetUnit(*target,target->ToPlayer()->GetComboTarget())) + if (Unit * spellTarget = ObjectAccessor::GetUnit(*target, target->ToPlayer()->GetComboTarget())) target->CastSpell(spellTarget, 51699, true); break; case 28832: // Mark of Korth'azz @@ -5914,10 +5914,10 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo break; } case 42783: // Wrath of the Astromancer - target->CastSpell(target,GetAmount(),true,NULL,this); + target->CastSpell(target, GetAmount(), true, NULL, this); break; case 46308: // Burning Winds casted only at creatures at spawn - target->CastSpell(target,47287,true,NULL,this); + target->CastSpell(target, 47287, true, NULL, this); break; case 52172: // Coyote Spirit Despawn Aura case 60244: // Blood Parrot Despawn Aura @@ -5974,7 +5974,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo { int32 damage = aurEff->GetAmount()*4; // backfire damage - target->CastCustomSpell(target, 64085, &damage, NULL, NULL, true, NULL, NULL,GetCasterGUID()); + target->CastCustomSpell(target, 64085, &damage, NULL, NULL, true, NULL, NULL, GetCasterGUID()); } } break; @@ -5986,7 +5986,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo case SPELLFAMILY_DEATHKNIGHT: // Summon Gargoyle (will start feeding gargoyle) if (GetId() == 61777) - target->CastSpell(target,m_spellProto->EffectTriggerSpell[m_effIndex],true); + target->CastSpell(target, m_spellProto->EffectTriggerSpell[m_effIndex], true); break; default: break; @@ -6054,7 +6054,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo if (owner && owner->GetTypeId() == TYPEID_PLAYER) { if (apply) - owner->CastSpell(owner,8985,true); + owner->CastSpell(owner, 8985, true); else owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } @@ -6070,7 +6070,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo if (owner && owner->GetTypeId() == TYPEID_PLAYER) { if (apply) - owner->CastSpell(owner,19704,true); + owner->CastSpell(owner, 19704, true); else owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } @@ -6364,7 +6364,7 @@ void AuraEffect::HandleForceReaction(AuraApplication const * aurApp, uint8 mode, uint32 faction_id = GetMiscValue(); ReputationRank faction_rank = ReputationRank(m_amount); - player->GetReputationMgr().ApplyForceReaction(faction_id,faction_rank,apply); + player->GetReputationMgr().ApplyForceReaction(faction_id, faction_rank, apply); player->GetReputationMgr().SendForceReactions(); // stop fighting if at apply forced rank friendly or at remove real rank friendly @@ -6484,7 +6484,7 @@ void AuraEffect::HandleAuraLinked(AuraApplication const * aurApp, uint8 mode, bo if (GetAmount()) caster->CastCustomSpell(target, m_spellProto->EffectTriggerSpell[m_effIndex], &m_amount, NULL, NULL, true, NULL, this); else - caster->CastSpell(target, m_spellProto->EffectTriggerSpell[m_effIndex],true, NULL, this); + caster->CastSpell(target, m_spellProto->EffectTriggerSpell[m_effIndex], true, NULL, this); } else target->RemoveAura(m_spellProto->EffectTriggerSpell[m_effIndex], GetCasterGUID(), 0, AuraRemoveMode(aurApp->GetRemoveMode())); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index ccfa848811f..b8967aa1845 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -190,7 +190,7 @@ void AuraApplication::ClientUpdate(bool remove) { ASSERT(!m_target->GetVisibleAura(m_slot)); data << uint32(0); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u removed slot %u",GetBase()->GetId(), m_slot); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Aura %u removed slot %u", GetBase()->GetId(), m_slot); m_target->SendMessageToSet(&data, true); return; } @@ -245,7 +245,7 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, uint8 tryEffMask, WorldObje break; } if (uint8 realMask = effMask & tryEffMask) - return Create(spellproto,realMask,owner,caster,baseAmount,castItem,casterGUID); + return Create(spellproto, realMask, owner, caster, baseAmount, castItem, casterGUID); return NULL; } @@ -276,7 +276,7 @@ Aura * Aura::TryCreate(SpellEntry const* spellproto, WorldObject * owner, Unit * break; } if (effMask) - return Create(spellproto,effMask,owner,caster,baseAmount,castItem,casterGUID); + return Create(spellproto, effMask, owner, caster, baseAmount, castItem, casterGUID); return NULL; } @@ -424,7 +424,7 @@ void Aura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * auraA if (m_spellProto->Attributes & SPELL_ATTR0_DISABLED_WHILE_ACTIVE) { Item* castItem = m_castItemGuid ? caster->ToPlayer()->GetItemByGuid(m_castItemGuid) : NULL; - caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0, NULL,true); + caster->ToPlayer()->AddSpellAndCategoryCooldowns(m_spellProto, castItem ? castItem->GetEntry() : 0, NULL, true); } } } @@ -902,18 +902,18 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (saBounds.first != saBounds.second) { uint32 zone, area; - target->GetZoneAndAreaId(zone,area); + target->GetZoneAndAreaId(zone, area); for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) { // some auras remove at aura remove - if (!itr->second->IsFitToRequirements((Player*)target,zone,area)) + if (!itr->second->IsFitToRequirements((Player*)target, zone, area)) target->RemoveAurasDueToSpell(itr->second->spellId); // some auras applied at aura apply else if (itr->second->autocast) { if (!target->HasAura(itr->second->spellId)) - target->CastSpell(target,itr->second->spellId,true); + target->CastSpell(target, itr->second->spellId, true); } } } @@ -978,9 +978,9 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, { // Glyph of the Penguin if (caster->HasAura(52648)) - caster->CastSpell(target,61635,true); + caster->CastSpell(target, 61635, true); else - caster->CastSpell(target,61634,true); + caster->CastSpell(target, 61634, true); } } switch(GetId()) @@ -1026,7 +1026,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (target->GetTypeId() == TYPEID_PLAYER) if (GameObject* obj = target->GetGameObject(48018)) { - target->ToPlayer()->TeleportTo(obj->GetMapId(),obj->GetPositionX(),obj->GetPositionY(),obj->GetPositionZ(),obj->GetOrientation()); + target->ToPlayer()->TeleportTo(obj->GetMapId(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation()); target->ToPlayer()->RemoveMovementImpairingAuras(); } break; @@ -1059,7 +1059,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, else if (m_spellProto->SpellFamilyFlags[0] & 0x1 && m_spellProto->SpellFamilyFlags[2] & 0x400 && GetEffect(0)) { // Glyph of Power Word: Shield - if (AuraEffect* glyph = caster->GetAuraEffect(55672,0)) + if (AuraEffect* glyph = caster->GetAuraEffect(55672, 0)) { // instantly heal m_amount% of the absorb-value int32 heal = glyph->GetAmount() * GetEffect(0)->GetAmount()/100; @@ -1217,7 +1217,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (removeMode != AURA_REMOVE_BY_DEFAULT) { // Improved Spell Reflection - if (caster->GetDummyAuraEffect(SPELLFAMILY_WARRIOR,1935, 1)) + if (caster->GetDummyAuraEffect(SPELLFAMILY_WARRIOR, 1935, 1)) { // aura remove - remove auras from all party members std::list<Unit*> PartyMembers; @@ -1413,7 +1413,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (apply) target->CastSpell(caster, 59665, true, 0, 0, caster->GetGUID()); else - target->SetReducedThreatPercent(0,0); + target->SetReducedThreatPercent(0, 0); break; } break; @@ -1425,20 +1425,20 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (AuraEffect const * aurEff = target->GetAuraEffectOfRankedSpell(31221, 0)) { if (!apply) - target->CastSpell(target,31666,true); + target->CastSpell(target, 31666, true); else { int32 basepoints0 = aurEff->GetAmount(); - target->CastCustomSpell(target,31665, &basepoints0, NULL, NULL ,true); + target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL , true); } } // Overkill if (target->HasAura(58426)) { if (!apply) - target->CastSpell(target,58428,true); + target->CastSpell(target, 58428, true); else - target->CastSpell(target,58427,true); + target->CastSpell(target, 58427, true); } break; } @@ -1477,7 +1477,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (apply) { if ((GetSpellProto()->Id == 31821 && target->HasAura(19746, GetCasterGUID())) || (GetSpellProto()->Id == 19746 && target->HasAura(31821))) - target->CastSpell(target,64364,true); + target->CastSpell(target, 64364, true); } else target->RemoveAurasDueToSpell(64364, GetCasterGUID()); @@ -1530,7 +1530,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, else if (bloodPresenceAura) { int32 basePoints1=bloodPresenceAura->GetAmount(); - target->CastCustomSpell(target,63611,NULL,&basePoints1,NULL,true,0,bloodPresenceAura); + target->CastCustomSpell(target, 63611, NULL, &basePoints1, NULL, true, 0, bloodPresenceAura); } // Frost Presence bonus if (presence == 48263) @@ -1538,7 +1538,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, else if (frostPresenceAura) { int32 basePoints0=frostPresenceAura->GetAmount(); - target->CastCustomSpell(target,61261,&basePoints0,NULL,NULL,true,0,frostPresenceAura); + target->CastCustomSpell(target, 61261, &basePoints0, NULL, NULL, true, 0, frostPresenceAura); } // Unholy Presence bonus if (presence == 48265) @@ -1547,15 +1547,15 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, { // Not listed as any effect, only base points set int32 basePoints0 = SpellMgr::CalculateSpellEffectAmount(unholyPresenceAura->GetSpellProto(), 1); - target->CastCustomSpell(target,63622,&basePoints0 ,&basePoints0,&basePoints0,true,0,unholyPresenceAura); - target->CastCustomSpell(target,65095,&basePoints0 ,NULL,NULL,true,0,unholyPresenceAura); + target->CastCustomSpell(target, 63622, &basePoints0 , &basePoints0, &basePoints0, true, 0, unholyPresenceAura); + target->CastCustomSpell(target, 65095, &basePoints0 , NULL, NULL, true, 0, unholyPresenceAura); } - target->CastSpell(target,49772, true); + target->CastSpell(target, 49772, true); } else if (unholyPresenceAura) { int32 basePoints0=unholyPresenceAura->GetAmount(); - target->CastCustomSpell(target,49772,&basePoints0,NULL,NULL,true,0,unholyPresenceAura); + target->CastCustomSpell(target, 49772, &basePoints0, NULL, NULL, true, 0, unholyPresenceAura); } } else @@ -1880,7 +1880,7 @@ void UnitAura::_ApplyForTarget(Unit * target, Unit * caster, AuraApplication * a // register aura diminishing on apply if (DiminishingGroup group = GetDiminishGroup()) - target->ApplyDiminishingAura(group,true); + target->ApplyDiminishingAura(group, true); } void UnitAura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aurApp) @@ -1889,7 +1889,7 @@ void UnitAura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * // unregister aura diminishing (and store last time) if (DiminishingGroup group = GetDiminishGroup()) - target->ApplyDiminishingAura(group,false); + target->ApplyDiminishingAura(group, false); } void UnitAura::Remove(AuraRemoveMode removeMode) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 0b4de8fab74..79b671c9202 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -770,7 +770,7 @@ void Spell::SelectSpellTargets() AddUnitTarget(m_targets.getUnitTarget(), i); else if (m_targets.getCorpseTargetGUID()) { - Corpse *corpse = ObjectAccessor::GetCorpse(*m_caster,m_targets.getCorpseTargetGUID()); + Corpse *corpse = ObjectAccessor::GetCorpse(*m_caster, m_targets.getCorpseTargetGUID()); if (corpse) { Player* owner = ObjectAccessor::FindPlayer(corpse->GetOwnerGUID()); @@ -1111,7 +1111,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Get mask of effects for target uint8 mask = target->effectMask; - Unit* unit = m_caster->GetGUID() == target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster,target->targetGUID); + Unit* unit = m_caster->GetGUID() == target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, target->targetGUID); if (!unit) { uint8 farMask = 0; @@ -1133,7 +1133,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (farMask & (1<<i)) - HandleEffects(unit,NULL,NULL,i); + HandleEffects(unit, NULL, NULL, i); } return; } @@ -1286,7 +1286,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Add bonuses and fill damageInfo struct caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit); - caster->DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb); + caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); // Send log damage message to client caster->SendSpellNonMeleeDamageLog(&damageInfo); @@ -1354,7 +1354,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // ignore pets or autorepeat/melee casts for speed (not exist quest for spells (hm...) if (m_originalCaster && m_originalCaster->IsControlledByPlayer() && !spellHitTarget->ToCreature()->isPet() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive()) if (Player* p = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself()) - p->CastedCreatureOrGO(spellHitTarget->GetEntry(),spellHitTarget->GetGUID(),m_spellInfo->Id); + p->CastedCreatureOrGO(spellHitTarget->GetEntry(), spellHitTarget->GetGUID(), m_spellInfo->Id); } if (m_caster && m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsAIEnabled) @@ -1441,7 +1441,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool } // Get Data Needed for Diminishing Returns, some effects may have multiple auras, so this must be done on spell hit, not aura add - m_diminishGroup = GetDiminishingReturnsGroupForSpell(m_spellInfo,m_triggeredByAuraSpell); + m_diminishGroup = GetDiminishingReturnsGroupForSpell(m_spellInfo, m_triggeredByAuraSpell); if (m_diminishGroup) { m_diminishLevel = unit->GetDiminishing(m_diminishGroup); @@ -1464,7 +1464,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool int32 basePoints[3]; if (scaleAura) { - aurSpellInfo = sSpellMgr->SelectAuraRankForPlayerLevel(m_spellInfo,unitTarget->getLevel()); + aurSpellInfo = sSpellMgr->SelectAuraRankForPlayerLevel(m_spellInfo, unitTarget->getLevel()); ASSERT(aurSpellInfo); for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { @@ -1480,13 +1480,13 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool if (m_originalCaster) { m_spellAura = Aura::TryCreate(aurSpellInfo, effectMask, unit, - m_originalCaster,(aurSpellInfo == m_spellInfo)? &m_spellValue->EffectBasePoints[0] : &basePoints[0], m_CastItem); + m_originalCaster, (aurSpellInfo == m_spellInfo)? &m_spellValue->EffectBasePoints[0] : &basePoints[0], m_CastItem); if (m_spellAura) { // Now Reduce spell duration using data received at spell hit int32 duration = m_spellAura->GetMaxDuration(); - int32 limitduration = GetDiminishingReturnsLimitDuration(m_diminishGroup,aurSpellInfo); - float diminishMod = unit->ApplyDiminishingToDuration(m_diminishGroup, duration, m_originalCaster, m_diminishLevel,limitduration); + int32 limitduration = GetDiminishingReturnsLimitDuration(m_diminishGroup, aurSpellInfo); + float diminishMod = unit->ApplyDiminishingToDuration(m_diminishGroup, duration, m_originalCaster, m_diminishLevel, limitduration); // unit is immune to aura if it was diminished to 0 duration if (diminishMod == 0.0f) @@ -1525,7 +1525,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber) { if (effectMask & (1<<effectNumber)) - HandleEffects(unit,NULL,NULL,effectNumber); + HandleEffects(unit, NULL, NULL, effectNumber); } return SPELL_MISS_NONE; @@ -1623,7 +1623,7 @@ void Spell::DoAllEffectOnTarget(GOTargetInfo *target) if (m_originalCaster && m_originalCaster->IsControlledByPlayer() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive()) { if (Player* p = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself()) - p->CastedCreatureOrGO(go->GetEntry(),go->GetGUID(),m_spellInfo->Id); + p->CastedCreatureOrGO(go->GetEntry(), go->GetGUID(), m_spellInfo->Id); } CallScriptAfterHitHandlers(); } @@ -1683,7 +1683,7 @@ bool Spell::UpdateChanneledTargetList() { if (AuraApplication * aurApp = unit->GetAuraApplication(m_spellInfo->Id, m_originalCasterGUID)) { - if (m_caster != unit && !m_caster->IsWithinDistInMap(unit,range)) + if (m_caster != unit && !m_caster->IsWithinDistInMap(unit, range)) { ihit->effectMask &= ~aurApp->GetEffectMask(); unit->RemoveAura(aurApp); @@ -2307,7 +2307,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) break; case TARGET_DST_HOME: if (m_caster->GetTypeId() == TYPEID_PLAYER) - m_targets.setDst(m_caster->ToPlayer()->m_homebindX,m_caster->ToPlayer()->m_homebindY,m_caster->ToPlayer()->m_homebindZ, m_caster->ToPlayer()->GetOrientation(), m_caster->ToPlayer()->m_homebindMapId); + m_targets.setDst(m_caster->ToPlayer()->m_homebindX, m_caster->ToPlayer()->m_homebindY, m_caster->ToPlayer()->m_homebindZ, m_caster->ToPlayer()->GetOrientation(), m_caster->ToPlayer()->m_homebindMapId); break; case TARGET_DST_NEARBY_ENTRY: { @@ -2559,7 +2559,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) else { if (m_caster->GetTypeId() == TYPEID_PLAYER) - m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id,true); + m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); SendCastResult(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW); finish(false); } @@ -3057,7 +3057,7 @@ void Spell::cancel() m_caster->ToPlayer()->RemoveGlobalCooldown(m_spellInfo); m_caster->RemoveDynObject(m_spellInfo->Id); - m_caster->RemoveGameObject(m_spellInfo->Id,true); + m_caster->RemoveGameObject(m_spellInfo->Id, true); //set state back so finish will be processed m_spellState = oldState; @@ -3265,7 +3265,7 @@ void Spell::cast(bool skipCheck) case SPELL_EFFECT_JUMP_DEST: case SPELL_EFFECT_LEAP_BACK: case SPELL_EFFECT_ACTIVATE_RUNE: - HandleEffects(NULL,NULL,NULL,i); + HandleEffects(NULL, NULL, NULL, i); m_effectMask |= (1<<i); break; } @@ -3544,7 +3544,7 @@ void Spell::SendSpellCooldown() if (m_spellInfo->Attributes & (SPELL_ATTR0_DISABLED_WHILE_ACTIVE | SPELL_ATTR0_PASSIVE) || m_IsTriggeredSpell) return; - _player->AddSpellAndCategoryCooldowns(m_spellInfo,m_CastItem ? m_CastItem->GetEntry() : 0, this); + _player->AddSpellAndCategoryCooldowns(m_spellInfo, m_CastItem ? m_CastItem->GetEntry() : 0, this); } void Spell::update(uint32 difftime) @@ -4313,7 +4313,7 @@ void Spell::TakeCastItem() { // This code is to avoid a crash // I'm not sure, if this is really an error, but I guess every item needs a prototype - sLog->outError("Cast item has no item prototype highId=%d, lowId=%d",m_CastItem->GetGUIDHigh(), m_CastItem->GetGUIDLow()); + sLog->outError("Cast item has no item prototype highId=%d, lowId=%d", m_CastItem->GetGUIDHigh(), m_CastItem->GetGUIDLow()); return; } @@ -4641,7 +4641,7 @@ void Spell::HandleThreatSpells(uint32 spellId) sLog->outStaticDebug("Spell %u, rank %u, added an additional %i threat", spellId, sSpellMgr->GetSpellRank(spellId), threat); } -void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,uint32 i) +void Spell::HandleEffects(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGOTarget, uint32 i) { //effect has been handled, skip it if (m_effectMask & (1<<i)) @@ -4904,7 +4904,7 @@ SpellCastResult Spell::CheckCast(bool strict) } // who can give me an example to show what is the use of this - // even if we need check, check by effect rather than whole spell, otherwise 57108,57143 are broken + // even if we need check, check by effect rather than whole spell, otherwise 57108, 57143 are broken /* // TODO: this check can be applied and for player to prevent cheating when IsPositiveSpell will return always correct result. // check target for pet/charmed casts (not self targeted), self targeted cast used for area effects and etc @@ -4933,7 +4933,7 @@ SpellCastResult Spell::CheckCast(bool strict) //Must be behind the target. if (m_spellInfo->AttributesEx2 == SPELL_ATTR2_UNK20 && m_spellInfo->AttributesEx & SPELL_ATTR1_UNK9 && target->HasInArc(static_cast<float>(M_PI), m_caster) //Exclusion for Pounce: Facing Limitation was removed in 2.0.1, but it still uses the same, old Ex-Flags - && (!(m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags.IsEqual(0x20000,0,0))) + && (!(m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags.IsEqual(0x20000, 0, 0))) //Mutilate no longer requires you be behind the target as of patch 3.0.3 && (!(m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && m_spellInfo->SpellFamilyFlags[1] & 0x200000)) //Exclusion for Throw: Facing limitation was added in 3.2.x, but that shouldn't be @@ -4973,9 +4973,9 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_caster->GetTypeId() == TYPEID_UNIT || !m_caster->ToPlayer()->isGameMaster()) { uint32 zone, area; - m_caster->GetZoneAndAreaId(zone,area); + m_caster->GetZoneAndAreaId(zone, area); - SpellCastResult locRes= sSpellMgr->GetSpellAllowedInLocationError(m_spellInfo,m_caster->GetMapId(),zone,area, + SpellCastResult locRes= sSpellMgr->GetSpellAllowedInLocationError(m_spellInfo, m_caster->GetMapId(), zone, area, m_caster->GetTypeId() == TYPEID_PLAYER ? m_caster->ToPlayer() : NULL); if (locRes != SPELL_CAST_OK) return locRes; @@ -5061,7 +5061,7 @@ SpellCastResult Spell::CheckCast(bool strict) } else if (m_spellInfo->Id == 52264) // Deliver Stolen Horse { - if (!m_caster->FindNearestCreature(28653,5)) + if (!m_caster->FindNearestCreature(28653, 5)) return SPELL_FAILED_OUT_OF_RANGE; } else if (m_spellInfo->Id == 31789) // Righteous Defense @@ -5989,7 +5989,7 @@ SpellCastResult Spell::CheckItems() cell.data.Part.reserved = ALL_DISTRICT; GameObject* ok = NULL; - Trinity::GameObjectFocusCheck go_check(m_caster,m_spellInfo->RequiresSpellFocus); + Trinity::GameObjectFocusCheck go_check(m_caster, m_spellInfo->RequiresSpellFocus); Trinity::GameObjectSearcher<Trinity::GameObjectFocusCheck> checker(m_caster, ok, go_check); TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectFocusCheck>, GridTypeMapContainer > object_checker(checker); @@ -6051,7 +6051,7 @@ SpellCastResult Spell::CheckItems() { if (m_spellInfo->Totem[i] != 0) { - if (p_caster->HasItemCount(m_spellInfo->Totem[i],1)) + if (p_caster->HasItemCount(m_spellInfo->Totem[i], 1)) { totems -= 1; continue; @@ -6106,10 +6106,10 @@ SpellCastResult Spell::CheckItems() { if (!(m_spellInfo->SpellFamilyName == SPELLFAMILY_MAGE && (m_spellInfo->SpellFamilyFlags[0] & 0x40000000))) return SPELL_FAILED_TOO_MANY_OF_ITEM; - else if (!(p_caster->HasItemCount(m_spellInfo->EffectItemType[i],1))) + else if (!(p_caster->HasItemCount(m_spellInfo->EffectItemType[i], 1))) return SPELL_FAILED_TOO_MANY_OF_ITEM; else - p_caster->CastSpell(m_caster,SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1),false); // move this to anywhere + p_caster->CastSpell(m_caster, SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1), false); // move this to anywhere return SPELL_FAILED_DONT_REPORT; } } @@ -6479,7 +6479,7 @@ void Spell::UpdatePointers() m_originalCaster = m_caster; else { - m_originalCaster = ObjectAccessor::GetUnit(*m_caster,m_originalCasterGUID); + m_originalCaster = ObjectAccessor::GetUnit(*m_caster, m_originalCasterGUID); if (m_originalCaster && !m_originalCaster->IsInWorld()) m_originalCaster = NULL; } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 8bcbf656474..9b6d48624dd 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -492,7 +492,7 @@ class Spell void SendResurrectRequest(Player* target); void SendPlaySpellVisual(uint32 SpellID); - void HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,uint32 i); + void HandleEffects(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGOTarget, uint32 i); void HandleThreatSpells(uint32 spellId); const SpellEntry * const m_spellInfo; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9ac7521dd28..fb78807d15f 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -577,7 +577,7 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) // We are in Shadow Form if (m_caster->GetShapeshiftForm() == FORM_SHADOW) // We have Improved Mind Blast - if (AuraEffect * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST,95,0)) + if (AuraEffect * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST, 95, 0)) // Chance has been successfully rolled if (roll_chance_i(aurEff->GetAmount())) m_caster->CastSpell(unitTarget, 48301, true); @@ -809,7 +809,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) case 12850: damage *= 0.32f; break; // Rank 2 case 12868: damage *= 0.48f; break; // Rank 3 default: - sLog->outError("Spell::EffectDummy: Spell %u not handled in DW",m_spellInfo->Id); + sLog->outError("Spell::EffectDummy: Spell %u not handled in DW", m_spellInfo->Id); return; }; @@ -838,7 +838,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) m_caster->CastCustomSpell(unitTarget, 26470, &damage, NULL, NULL, true); break; default: - sLog->outError("EffectDummy: Non-handled case for spell 13567 for triggered aura %u",m_triggeredByAuraSpell->Id); + sLog->outError("EffectDummy: Non-handled case for spell 13567 for triggered aura %u", m_triggeredByAuraSpell->Id); break; } return; @@ -942,13 +942,13 @@ void Spell::EffectDummy(SpellEffIndex effIndex) ? 29277 // Summon Purified Helboar Meat : 29278; // Summon Toxic Helboar Meat - m_caster->CastSpell(m_caster,spell_id,true,NULL); + m_caster->CastSpell(m_caster, spell_id, true, NULL); return; } case 29858: // Soulshatter if (unitTarget && unitTarget->CanHaveThreatList() && unitTarget->getThreatManager().getThreat(m_caster) > 0.0f) - m_caster->CastSpell(unitTarget,32835,true); + m_caster->CastSpell(unitTarget, 32835, true); return; case 30458: // Nigh Invulnerability if (!m_CastItem) return; @@ -1196,10 +1196,10 @@ void Spell::EffectDummy(SpellEffIndex effIndex) } case 64385: // Unusual Compass { - m_caster->SetOrientation(float(urand(0,62832)) / 10000.0f); + m_caster->SetOrientation(float(urand(0, 62832)) / 10000.0f); WorldPacket data; m_caster->BuildHeartBeatMsg(&data); - m_caster->SendMessageToSet(&data,true); + m_caster->SendMessageToSet(&data, true); return; } case 53808: // Pygmy Oil @@ -1542,7 +1542,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) } // pet auras - if (PetAura const* petSpell = sSpellMgr->GetPetAura(m_spellInfo->Id,effIndex)) + if (PetAura const* petSpell = sSpellMgr->GetPetAura(m_spellInfo->Id, effIndex)) { m_caster->AddPetAura(petSpell); return; @@ -1571,14 +1571,14 @@ void Spell::EffectTriggerSpellWithValue(SpellEffIndex effIndex) if (!spellInfo) { - sLog->outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id); + sLog->outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id); return; } int32 bp = damage; Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); - caster->CastCustomSpell(unitTarget,triggered_spell_id,&bp,&bp,&bp,true); + caster->CastCustomSpell(unitTarget, triggered_spell_id, &bp, &bp, &bp, true); } void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex) @@ -1588,13 +1588,13 @@ void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex) if (!spellInfo) { - sLog->outError("EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id); + sLog->outError("EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id); return; } finish(); - m_caster->CastSpell(unitTarget,spellInfo,false); + m_caster->CastSpell(unitTarget, spellInfo, false); } void Spell::EffectForceCast(SpellEffIndex effIndex) @@ -1609,7 +1609,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) if (!spellInfo) { - sLog->outError("EffectForceCast of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id); + sLog->outError("EffectForceCast of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id); return; } @@ -1649,7 +1649,7 @@ void Spell::EffectForceCastWithValue(SpellEffIndex effIndex) if (!spellInfo) { - sLog->outError("EffectForceCastWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id); + sLog->outError("EffectForceCastWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id); return; } int32 bp = damage; @@ -1664,7 +1664,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) if (!unitTarget) { if (gameObjTarget || itemTarget) - sLog->outError("Spell::EffectTriggerSpell (Spell: %u): Unsupported non-unit case!",m_spellInfo->Id); + sLog->outError("Spell::EffectTriggerSpell (Spell: %u): Unsupported non-unit case!", m_spellInfo->Id); return; } @@ -1793,7 +1793,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) SpellEntry const *spellInfo = sSpellStore.LookupEntry(triggered_spell_id); if (!spellInfo) { - sLog->outError("EffectTriggerSpell of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id); + sLog->outError("EffectTriggerSpell of spell %u: triggering unknown spell id %i", m_spellInfo->Id, triggered_spell_id); return; } @@ -1807,7 +1807,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) // so this just for speedup places in else Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); - caster->CastSpell(unitTarget,spellInfo,true, 0, 0, (originalCaster ? originalCaster->GetGUID() : 0)); + caster->CastSpell(unitTarget, spellInfo, true, 0, 0, (originalCaster ? originalCaster->GetGUID() : 0)); } void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex) @@ -1820,7 +1820,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex) if (!spellInfo) { sLog->outError("EffectTriggerMissileSpell of spell %u (eff: %u): triggering unknown spell id %u", - m_spellInfo->Id,effIndex,triggered_spell_id); + m_spellInfo->Id, effIndex, triggered_spell_id); return; } @@ -1843,15 +1843,15 @@ void Spell::EffectJump(SpellEffIndex effIndex) if (m_caster->isInFlight()) return; - float x,y,z,o; + float x, y, z, o; if (m_targets.getUnitTarget()) { - m_targets.getUnitTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE); + m_targets.getUnitTarget()->GetContactPoint(m_caster, x, y, z, CONTACT_DISTANCE); o = m_caster->GetOrientation(); } else if (m_targets.getGOTarget()) { - m_targets.getGOTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE); + m_targets.getGOTarget()->GetContactPoint(m_caster, x, y, z, CONTACT_DISTANCE); o = m_caster->GetOrientation(); } else @@ -1871,7 +1871,7 @@ void Spell::EffectJumpDest(SpellEffIndex effIndex) return; // Init dest coordinates - float x,y,z,o; + float x, y, z, o; if (m_targets.HasDst()) { m_targets.m_dstPos.GetPosition(x, y, z); @@ -1935,7 +1935,7 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (unitTarget->getLevel() > uiMaxSafeLevel) { - unitTarget->AddAura(60444,unitTarget); //Apply Lost! Aura + unitTarget->AddAura(60444, unitTarget); //Apply Lost! Aura return; } break; @@ -1943,18 +1943,18 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (Player* pTarget = unitTarget->ToPlayer()) { if (pTarget->GetTeamId() == TEAM_ALLIANCE) - m_targets.setDst(442.24f,-835.25f,44.30f,0.06f,628); + m_targets.setDst(442.24f, -835.25f, 44.30f, 0.06f, 628); else - m_targets.setDst(1120.43f,-762.11f,47.92f,2.94f,628); + m_targets.setDst(1120.43f, -762.11f, 47.92f, 2.94f, 628); } break; case 66551: // teleports inside (Isle of Conquest) if (Player* pTarget = unitTarget->ToPlayer()) { if (pTarget->GetTeamId() == TEAM_ALLIANCE) - m_targets.setDst(389.57f,-832.38f,48.65f,3.00f,628); + m_targets.setDst(389.57f, -832.38f, 48.65f, 3.00f, 628); else - m_targets.setDst(1174.85f,-763.24f,48.72f,6.26f,628); + m_targets.setDst(1174.85f, -763.24f, 48.72f, 6.26f, 628); } break; } @@ -2276,7 +2276,7 @@ void Spell::SpellDamageHeal(SpellEffIndex /*effIndex*/) unitTarget->RemoveAura(targetAura->GetId(), targetAura->GetCasterGUID()); //addhealth += tickheal * tickcount; - //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth,HEAL, unitTarget); + //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth, HEAL, unitTarget); } // Glyph of Nourish else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x2000000) @@ -2482,7 +2482,7 @@ void Spell::DoCreateItem(uint32 /*i*/, uint32 itemtype) void Spell::EffectCreateItem(SpellEffIndex effIndex) { - DoCreateItem(effIndex,m_spellInfo->EffectItemType[effIndex]); + DoCreateItem(effIndex, m_spellInfo->EffectItemType[effIndex]); ExecuteLogEffectCreateItem(effIndex, m_spellInfo->EffectItemType[effIndex]); } @@ -2660,10 +2660,10 @@ void Spell::EffectEnergize(SpellEffIndex effIndex) if (!avalibleElixirs.empty()) { // cast random elixir on target - uint32 rand_spell = urand(0,avalibleElixirs.size()-1); + uint32 rand_spell = urand(0, avalibleElixirs.size()-1); std::set<uint32>::iterator itr = avalibleElixirs.begin(); std::advance(itr, rand_spell); - m_caster->CastSpell(unitTarget,*itr,true,m_CastItem); + m_caster->CastSpell(unitTarget, *itr, true, m_CastItem); } } } @@ -2732,20 +2732,20 @@ void Spell::SendLoot(uint64 guid, LootType loottype) case GAMEOBJECT_TYPE_SPELL_FOCUS: // triggering linked GO if (uint32 trapEntry = gameObjTarget->GetGOInfo()->spellFocus.linkedTrapId) - gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster); + gameObjTarget->TriggeringLinkedGameObject(trapEntry, m_caster); return; case GAMEOBJECT_TYPE_CHEST: // TODO: possible must be moved to loot release (in different from linked triggering) if (gameObjTarget->GetGOInfo()->chest.eventId) { - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Chest ScriptStart id %u for GO %u", gameObjTarget->GetGOInfo()->chest.eventId,gameObjTarget->GetDBTableGUIDLow()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "Chest ScriptStart id %u for GO %u", gameObjTarget->GetGOInfo()->chest.eventId, gameObjTarget->GetDBTableGUIDLow()); player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->chest.eventId, player, gameObjTarget); } // triggering linked GO if (uint32 trapEntry = gameObjTarget->GetGOInfo()->chest.linkedTrapId) - gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster); + gameObjTarget->TriggeringLinkedGameObject(trapEntry, m_caster); // Don't return, let loots been taken default: @@ -3351,7 +3351,7 @@ void Spell::EffectPickPocket(SpellEffIndex /*effIndex*/) // victim have to be alive and humanoid or undead if (unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() &CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0) - m_caster->ToPlayer()->SendLoot(unitTarget->GetGUID(),LOOT_PICKPOCKETING); + m_caster->ToPlayer()->SendLoot(unitTarget->GetGUID(), LOOT_PICKPOCKETING); } void Spell::EffectAddFarsight(SpellEffIndex effIndex) @@ -3398,10 +3398,10 @@ void Spell::EffectTeleUnitsFaceCaster(SpellEffIndex effIndex) float dis = (float)m_caster->GetSpellRadiusForTarget(unitTarget, sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[effIndex])); - float fx,fy,fz; - m_caster->GetClosePoint(fx,fy,fz,unitTarget->GetObjectSize(),dis); + float fx, fy, fz; + m_caster->GetClosePoint(fx, fy, fz, unitTarget->GetObjectSize(), dis); - unitTarget->NearTeleportTo(fx,fy,fz,-m_caster->GetOrientation(),unitTarget == m_caster); + unitTarget->NearTeleportTo(fx, fy, fz, -m_caster->GetOrientation(), unitTarget == m_caster); } void Spell::EffectLearnSkill(SpellEffIndex effIndex) @@ -3426,7 +3426,7 @@ void Spell::EffectAddHonor(SpellEffIndex /*effIndex*/) if (m_CastItem) { unitTarget->ToPlayer()->RewardHonor(NULL, 1, damage/10); - sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(),unitTarget->ToPlayer()->GetGUIDLow()); + sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(), unitTarget->ToPlayer()->GetGUIDLow()); return; } @@ -3451,7 +3451,7 @@ void Spell::EffectTradeSkill(SpellEffIndex /*effIndex*/) return; // uint32 skillid = m_spellInfo->EffectMiscValue[i]; // uint16 skillmax = unitTarget->ToPlayer()->(skillid); - // unitTarget->ToPlayer()->SetSkill(skillid,skillval?skillval:1,skillmax+75); + // unitTarget->ToPlayer()->SetSkill(skillid, skillval?skillval:1, skillmax+75); } void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex) @@ -3468,10 +3468,10 @@ void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex) { // destroy one vellum from stack uint32 count = 1; - p_caster->DestroyItemCount(itemTarget,count,true); + p_caster->DestroyItemCount(itemTarget, count, true); unitTarget=p_caster; // and add a scroll - DoCreateItem(effIndex,m_spellInfo->EffectItemType[effIndex]); + DoCreateItem(effIndex, m_spellInfo->EffectItemType[effIndex]); itemTarget=NULL; m_targets.setItemTarget(NULL); } @@ -3496,19 +3496,19 @@ void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex) if (item_owner != p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", - p_caster->GetName(),p_caster->GetSession()->GetAccountId(), + sLog->outCommand(p_caster->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", + p_caster->GetName(), p_caster->GetSession()->GetAccountId(), itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), - item_owner->GetName(),item_owner->GetSession()->GetAccountId()); + item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped - item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,false); + item_owner->ApplyEnchantment(itemTarget, PERM_ENCHANTMENT_SLOT, false); itemTarget->SetEnchantment(PERM_ENCHANTMENT_SLOT, enchant_id, 0, 0); // add new enchanting if equipped - item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,true); + item_owner->ApplyEnchantment(itemTarget, PERM_ENCHANTMENT_SLOT, true); itemTarget->SetSoulboundTradeable(NULL, item_owner, false); } @@ -3545,7 +3545,7 @@ void Spell::EffectEnchantItemPrismatic(SpellEffIndex effIndex) if (!add_socket) { sLog->outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (%u), not suppoted yet.", - m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET); + m_spellInfo->Id, SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC, ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET); return; } } @@ -3557,19 +3557,19 @@ void Spell::EffectEnchantItemPrismatic(SpellEffIndex effIndex) if (item_owner != p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", - p_caster->GetName(),p_caster->GetSession()->GetAccountId(), + sLog->outCommand(p_caster->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", + p_caster->GetName(), p_caster->GetSession()->GetAccountId(), itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), - item_owner->GetName(),item_owner->GetSession()->GetAccountId()); + item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped - item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,false); + item_owner->ApplyEnchantment(itemTarget, PRISMATIC_ENCHANTMENT_SLOT, false); itemTarget->SetEnchantment(PRISMATIC_ENCHANTMENT_SLOT, enchant_id, 0, 0); // add new enchanting if equipped - item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,true); + item_owner->ApplyEnchantment(itemTarget, PRISMATIC_ENCHANTMENT_SLOT, true); itemTarget->SetSoulboundTradeable(NULL, item_owner, false); } @@ -3606,7 +3606,7 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) case 10: spell_id = 36758; break; // 14% case 11: spell_id = 36760; break; // 20% default: - sLog->outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW",damage); + sLog->outError("Spell::EffectEnchantItemTmp: Damage %u not handled in S'RW", damage); return; } @@ -3640,14 +3640,14 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) if (!enchant_id) { - sLog->outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,effIndex); + sLog->outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id", m_spellInfo->Id, effIndex); return; } SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); if (!pEnchant) { - sLog->outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have not existed enchanting id %u ",m_spellInfo->Id,effIndex,enchant_id); + sLog->outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have not existed enchanting id %u ", m_spellInfo->Id, effIndex, enchant_id); return; } @@ -3687,14 +3687,14 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) if (item_owner != p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE)) { - sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)", + sLog->outCommand(p_caster->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)", p_caster->GetName(), p_caster->GetSession()->GetAccountId(), itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped - item_owner->ApplyEnchantment(itemTarget,TEMP_ENCHANTMENT_SLOT, false); + item_owner->ApplyEnchantment(itemTarget, TEMP_ENCHANTMENT_SLOT, false); itemTarget->SetEnchantment(TEMP_ENCHANTMENT_SLOT, enchant_id, duration * 1000, 0); @@ -3725,7 +3725,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) //SendChannelUpdate(0); finish(); - Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id); + Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget, m_spellInfo->Id); if (!pet) // in very specific state like near world end/etc. return; @@ -3789,7 +3789,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) ASSERT(OldSummon->GetMap() == owner->GetMap()); - //OldSummon->GetMap()->Remove(OldSummon->ToCreature(),false); + //OldSummon->GetMap()->Remove(OldSummon->ToCreature(), false); float px, py, pz; owner->GetClosePoint(px, py, pz, OldSummon->GetObjectSize()); @@ -3806,7 +3806,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) } if (owner->GetTypeId() == TYPEID_PLAYER) - owner->ToPlayer()->RemovePet(OldSummon,(OldSummon->getPetType() == HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT),false); + owner->ToPlayer()->RemovePet(OldSummon, (OldSummon->getPetType() == HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT), false); else return; } @@ -4318,7 +4318,7 @@ void Spell::EffectSummonObjectWild(SpellEffIndex effIndex) if (pl->GetTeam() == team) team = HORDE; - ((BattlegroundWS*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID(),team); + ((BattlegroundWS*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID(), team); } break; } @@ -4369,7 +4369,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // Glyph of Backstab case 63975: { - if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE,SPELLFAMILY_ROGUE,0x00100000,0,0,m_caster->GetGUID())) + if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x00100000, 0, 0, m_caster->GetGUID())) { uint32 countMin = aurEff->GetBase()->GetMaxDuration(); uint32 countMax = 12000; @@ -4399,11 +4399,11 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // check presence for (uint8 j = 0; j < 4; ++j) - if (unitTarget->HasAuraEffect(spells[j],0)) + if (unitTarget->HasAuraEffect(spells[j], 0)) return; // select spell - uint32 iTmpSpellId = spells[urand(0,3)]; + uint32 iTmpSpellId = spells[urand(0, 3)]; // cast unitTarget->CastSpell(unitTarget, iTmpSpellId, true); @@ -4422,7 +4422,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) default: spell_id = 8855; break; } - m_caster->CastSpell(m_caster,spell_id,true,NULL); + m_caster->CastSpell(m_caster, spell_id, true, NULL); return; } // Brittle Armor - need remove one 24575 Brittle Armor aura @@ -4498,7 +4498,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) item = 23586; break; // Aerie Peak Pale Ale } if (item) - DoCreateItem(effIndex,item); + DoCreateItem(effIndex, item); break; } // Improved Sprint @@ -4642,8 +4642,8 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } if (bag) { - if (m_caster->ToPlayer()->GetItemByPos(bag,slot)->GetCount() == 1) m_caster->ToPlayer()->RemoveItem(bag,slot,true); - else m_caster->ToPlayer()->GetItemByPos(bag,slot)->SetCount(m_caster->ToPlayer()->GetItemByPos(bag,slot)->GetCount()-1); + if (m_caster->ToPlayer()->GetItemByPos(bag, slot)->GetCount() == 1) m_caster->ToPlayer()->RemoveItem(bag, slot, true); + else m_caster->ToPlayer()->GetItemByPos(bag, slot)->SetCount(m_caster->ToPlayer()->GetItemByPos(bag, slot)->GetCount()-1); // Spell 42518 (Braufest - Gratisprobe des Braufest herstellen) m_caster->CastSpell(m_caster, 42518, true); return; @@ -4678,7 +4678,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) unitTarget->CastSpell(unitTarget, spellId, true); break; } - // 5,000 Gold + // 5, 000 Gold case 46642: { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) @@ -4695,7 +4695,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) const char *gender = "his"; if (m_caster->getGender() > 0) gender = "her"; - sprintf(buf, "%s rubs %s [Decahedral Dwarven Dice] between %s hands and rolls. One %u and one %u.", m_caster->GetName(), gender, gender, urand(1,10), urand(1,10)); + sprintf(buf, "%s rubs %s [Decahedral Dwarven Dice] between %s hands and rolls. One %u and one %u.", m_caster->GetName(), gender, gender, urand(1, 10), urand(1, 10)); m_caster->MonsterTextEmote(buf, 0); break; } @@ -4706,7 +4706,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) const char *gender = "his"; if (m_caster->getGender() > 0) gender = "her"; - sprintf(buf, "%s causually tosses %s [Worn Troll Dice]. One %u and one %u.", m_caster->GetName(), gender, urand(1,6), urand(1,6)); + sprintf(buf, "%s causually tosses %s [Worn Troll Dice]. One %u and one %u.", m_caster->GetName(), gender, urand(1, 6), urand(1, 6)); m_caster->MonsterTextEmote(buf, 0); break; } @@ -5187,10 +5187,10 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case 66545: //Summon Memory { - uint8 uiRandom = urand(0,25); - uint32 uiSpells[26] = {66704,66705,66706,66707,66709,66710,66711,66712,66713,66714,66715,66708,66708,66691,66692,66694,66695,66696,66697,66698,66699,66700,66701,66702,66703,66543}; + uint8 uiRandom = urand(0, 25); + uint32 uiSpells[26] = {66704, 66705, 66706, 66707, 66709, 66710, 66711, 66712, 66713, 66714, 66715, 66708, 66708, 66691, 66692, 66694, 66695, 66696, 66697, 66698, 66699, 66700, 66701, 66702, 66703, 66543}; - m_caster->CastSpell(m_caster,uiSpells[uiRandom],true); + m_caster->CastSpell(m_caster, uiSpells[uiRandom], true); break; } case 45668: // Ultra-Advanced Proto-Typical Shortening Blaster @@ -5218,8 +5218,8 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) 45683 // Polymorph }; - m_caster->CastSpell(m_caster, spellPlayer[urand(0,4)], true); - unitTarget->CastSpell(unitTarget, spellTarget[urand(0,4)], true); + m_caster->CastSpell(m_caster, spellPlayer[urand(0, 4)], true); + unitTarget->CastSpell(unitTarget, spellTarget[urand(0, 4)], true); break; } case 64142: // Upper Deck - Create Foam Sword @@ -5231,7 +5231,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) for (uint32 const *itr = &itemId[0]; *itr; ++itr) if (plr->HasItemCount(*itr, 1, true)) return; - DoCreateItem(effIndex, itemId[urand(0,4)]); + DoCreateItem(effIndex, itemId[urand(0, 4)]); return; } break; @@ -5255,7 +5255,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) case 57774: spellId1 = 20185; break; // Judgement of Light case 53408: spellId1 = 20186; break; // Judgement of Wisdom default: - sLog->outError("Unsupported Judgement (seal trigger) spell (Id: %u) in Spell::EffectScriptEffect",m_spellInfo->Id); + sLog->outError("Unsupported Judgement (seal trigger) spell (Id: %u) in Spell::EffectScriptEffect", m_spellInfo->Id); return; } // all seals have aura dummy in 2 effect @@ -5544,7 +5544,7 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) pTarget->TeleportTo(pTarget->GetStartPosition(), unitTarget == m_caster ? TELE_TO_SPELL : 0); // homebind location is loaded always - // pTarget->TeleportTo(pTarget->m_homebindMapId,pTarget->m_homebindX,pTarget->m_homebindY,pTarget->m_homebindZ,pTarget->GetOrientation(), (unitTarget == m_caster ? TELE_TO_SPELL : 0)); + // pTarget->TeleportTo(pTarget->m_homebindMapId, pTarget->m_homebindX, pTarget->m_homebindY, pTarget->m_homebindZ, pTarget->GetOrientation(), (unitTarget == m_caster ? TELE_TO_SPELL : 0)); // Stuck spell trigger Hearthstone cooldown SpellEntry const *spellInfo = sSpellStore.LookupEntry(8690); @@ -5566,7 +5566,7 @@ void Spell::EffectSummonPlayer(SpellEffIndex /*effIndex*/) float x, y, z; m_caster->GetClosePoint(x, y, z, unitTarget->GetObjectSize()); - unitTarget->ToPlayer()->SetSummonPoint(m_caster->GetMapId(),x,y,z); + unitTarget->ToPlayer()->SetSummonPoint(m_caster->GetMapId(), x, y, z); WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4); data << uint64(m_caster->GetGUID()); // summoner guid @@ -5702,7 +5702,7 @@ void Spell::EffectDisEnchant(SpellEffIndex /*effIndex*/) p_caster->UpdateCraftSkill(m_spellInfo->Id); - m_caster->ToPlayer()->SendLoot(itemTarget->GetGUID(),LOOT_DISENCHANTING); + m_caster->ToPlayer()->SendLoot(itemTarget->GetGUID(), LOOT_DISENCHANTING); // item will be removed at disenchanting end } @@ -5817,7 +5817,7 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) 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/IN_MILLISECONDS : 0); pGameObj->SetSpellId(m_spellInfo->Id); @@ -6023,7 +6023,7 @@ void Spell::EffectSkinning(SpellEffIndex /*effIndex*/) uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill(); - m_caster->ToPlayer()->SendLoot(creature->GetGUID(),LOOT_SKINNING); + m_caster->ToPlayer()->SendLoot(creature->GetGUID(), LOOT_SKINNING); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); int32 reqValue = targetLevel < 10 ? 0 : targetLevel < 20 ? (targetLevel-10)*10 : targetLevel*5; @@ -6170,7 +6170,7 @@ void Spell::EffectSendTaxi(SpellEffIndex effIndex) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - unitTarget->ToPlayer()->ActivateTaxiPathTo(m_spellInfo->EffectMiscValue[effIndex],m_spellInfo->Id); + unitTarget->ToPlayer()->ActivateTaxiPathTo(m_spellInfo->EffectMiscValue[effIndex], m_spellInfo->Id); } void Spell::EffectPullTowards(SpellEffIndex effIndex) @@ -6236,7 +6236,7 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/) if (damage < 0) return; - float x,y,z; + float x, y, z; _player->GetPosition(x, y, z); _player->GetMap()->CreatureRelocation(pet, x, y, z, _player->GetOrientation()); @@ -6344,7 +6344,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) if (!goinfo) { - sLog->outErrorDb("Gameobject (Entry: %u) not exist and not created at spell (ID: %u) cast",name_id, m_spellInfo->Id); + sLog->outErrorDb("Gameobject (Entry: %u) not exist and not created at spell (ID: %u) cast", name_id, m_spellInfo->Id); return; } @@ -6404,7 +6404,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex) { case GAMEOBJECT_TYPE_FISHINGNODE: { - m_caster->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT,pGameObj->GetGUID()); + m_caster->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pGameObj->GetGUID()); m_caster->AddGameObject(pGameObj); // will removed at spell cancel // end time of range when possible catch fish (FISHING_BOBBER_READY_TIME..GetDuration(m_spellInfo)) @@ -6967,7 +6967,7 @@ void Spell::GetSummonPosition(uint32 i, Position &pos, float radius, uint32 coun else { float x, y, z; - m_caster->GetClosePoint(x,y,z,3.0f); + m_caster->GetClosePoint(x, y, z, 3.0f); pos.Relocate(x, y, z); } } @@ -6990,7 +6990,7 @@ void Spell::EffectPlayMusic(SpellEffIndex effIndex) if (!sSoundEntriesStore.LookupEntry(soundid)) { - sLog->outError("EffectPlayMusic: Sound (Id: %u) not exist in spell %u.",soundid,m_spellInfo->Id); + sLog->outError("EffectPlayMusic: Sound (Id: %u) not exist in spell %u.", soundid, m_spellInfo->Id); return; } @@ -7105,8 +7105,8 @@ void Spell::EffectRechargeManaGem(SpellEffIndex /*effIndex*/) if (Item* pItem = player->GetItemByEntry(item_id)) { for (int x = 0; x < MAX_ITEM_PROTO_SPELLS; ++x) - pItem->SetSpellCharges(x,pProto->Spells[x].SpellCharges); - pItem->SetState(ITEM_CHANGED,player); + pItem->SetSpellCharges(x, pProto->Spells[x].SpellCharges); + pItem->SetState(ITEM_CHANGED, player); } } diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 7997ae0c05c..a144bd7b491 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -668,7 +668,7 @@ SpellSpecific GetSpellSpecific(SpellEntry const * spellInfo) } // target not allow have more one spell specific from same caster -bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1,SpellSpecific spellSpec2) +bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1, SpellSpecific spellSpec2) { switch(spellSpec1) { @@ -872,7 +872,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con continue; // if non-positive trigger cast targeted to positive target this main cast is non-positive // this will place this spell auras as debuffs - if (IsPositiveTarget(spellTriggeredProto->EffectImplicitTargetA[effIndex],spellTriggeredProto->EffectImplicitTargetB[effIndex]) && !_isPositiveEffect(spellTriggeredId,i, true)) + if (IsPositiveTarget(spellTriggeredProto->EffectImplicitTargetA[effIndex], spellTriggeredProto->EffectImplicitTargetB[effIndex]) && !_isPositiveEffect(spellTriggeredId, i, true)) return false; } } @@ -963,7 +963,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con } // non-positive targets - if (!IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex],spellproto->EffectImplicitTargetB[effIndex])) + if (!IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex], spellproto->EffectImplicitTargetB[effIndex])) return false; // AttributesEx check @@ -972,7 +972,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con if (!deep && spellproto->EffectTriggerSpell[effIndex] && !spellproto->EffectApplyAuraName[effIndex] - && IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex],spellproto->EffectImplicitTargetB[effIndex]) + && IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex], spellproto->EffectImplicitTargetB[effIndex]) && !_isPositiveSpell(spellproto->EffectTriggerSpell[effIndex], true)) return false; @@ -1144,20 +1144,20 @@ void SpellMgr::LoadSpellTargetPositions() MapEntry const* mapEntry = sMapStore.LookupEntry(st.target_mapId); if (!mapEntry) { - sLog->outErrorDb("Spell (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Spell_ID,st.target_mapId); + sLog->outErrorDb("Spell (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.", Spell_ID, st.target_mapId); continue; } if (st.target_X==0 && st.target_Y==0 && st.target_Z==0) { - sLog->outErrorDb("Spell (ID:%u) target coordinates not provided.",Spell_ID); + sLog->outErrorDb("Spell (ID:%u) target coordinates not provided.", Spell_ID); continue; } SpellEntry const* spellInfo = sSpellStore.LookupEntry(Spell_ID); if (!spellInfo) { - sLog->outErrorDb("Spell (ID:%u) listed in `spell_target_position` does not exist.",Spell_ID); + sLog->outErrorDb("Spell (ID:%u) listed in `spell_target_position` does not exist.", Spell_ID); continue; } @@ -1172,7 +1172,7 @@ void SpellMgr::LoadSpellTargetPositions() uint32 area_id = sMapMgr->GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z); if (area_id != uint32(spellInfo->EffectMiscValue[i])) { - sLog->outErrorDb("Spell (Id: %u) listed in `spell_target_position` expected point to zone %u bit point to zone %u.",Spell_ID, spellInfo->EffectMiscValue[i], area_id); + sLog->outErrorDb("Spell (Id: %u) listed in `spell_target_position` expected point to zone %u bit point to zone %u.", Spell_ID, spellInfo->EffectMiscValue[i], area_id); break; } } @@ -1183,7 +1183,7 @@ void SpellMgr::LoadSpellTargetPositions() } if (!found) { - sLog->outErrorDb("Spell (Id: %u) listed in `spell_target_position` does not have target TARGET_DST_DB (17).",Spell_ID); + sLog->outErrorDb("Spell (Id: %u) listed in `spell_target_position` does not have target TARGET_DST_DB (17).", Spell_ID); continue; } @@ -1658,7 +1658,7 @@ void SpellMgr::LoadSpellThreats() sLog->outString(); } -bool SpellMgr::IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellId_2) const +bool SpellMgr::IsRankSpellDueToSpell(SpellEntry const *spellInfo_1, uint32 spellId_2) const { SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2); if (!spellInfo_1 || !spellInfo_2) return false; @@ -2016,7 +2016,7 @@ void SpellMgr::LoadSpellLearnSpells() continue; } - mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell_id,node)); + mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell_id, node)); ++count; } while (result->NextRow()); @@ -2045,7 +2045,7 @@ void SpellMgr::LoadSpellLearnSpells() // talent or passive spells or skill-step spells auto-casted and not need dependent learning, // pet teaching spells don't must be dependent learning (casted) // other required explicit dependent learning - dbc_node.autoLearned = entry->EffectImplicitTargetA[i] == TARGET_UNIT_PET || GetTalentSpellCost(spell) > 0 || IsPassiveSpell(spell) || IsSpellHaveEffect(entry,SPELL_EFFECT_SKILL_STEP); + dbc_node.autoLearned = entry->EffectImplicitTargetA[i] == TARGET_UNIT_PET || GetTalentSpellCost(spell) > 0 || IsPassiveSpell(spell) || IsSpellHaveEffect(entry, SPELL_EFFECT_SKILL_STEP); SpellLearnSpellMapBounds db_node_bounds = GetSpellLearnSpellMapBounds(spell); @@ -2055,7 +2055,7 @@ void SpellMgr::LoadSpellLearnSpells() if (itr->second.spell == dbc_node.spell) { sLog->outErrorDb("Spell %u auto-learn spell %u in spell.dbc then the record in `spell_learn_spell` is redundant, please fix DB.", - spell,dbc_node.spell); + spell, dbc_node.spell); found = true; break; } @@ -2063,7 +2063,7 @@ void SpellMgr::LoadSpellLearnSpells() if (!found) // add new spell-spell pair if not found { - mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell,dbc_node)); + mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell, dbc_node)); ++dbc_count; } } @@ -2185,7 +2185,7 @@ void SpellMgr::LoadPetLevelupSpellMap() if (spellSet.empty()) ++family_count; - spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id)); + spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel, spell->Id)); ++count; } } @@ -2354,9 +2354,9 @@ bool SpellMgr::IsSpellValid(SpellEntry const *spellInfo, Player *pl, bool msg) if (msg) { if (pl) - ChatHandler(pl).PSendSysMessage("Craft spell %u not have create item entry.",spellInfo->Id); + ChatHandler(pl).PSendSysMessage("Craft spell %u not have create item entry.", spellInfo->Id); else - sLog->outErrorDb("Craft spell %u not have create item entry.",spellInfo->Id); + sLog->outErrorDb("Craft spell %u not have create item entry.", spellInfo->Id); } return false; } @@ -2368,9 +2368,9 @@ bool SpellMgr::IsSpellValid(SpellEntry const *spellInfo, Player *pl, bool msg) if (msg) { if (pl) - ChatHandler(pl).PSendSysMessage("Craft spell %u create not-exist in DB item (Entry: %u) and then...",spellInfo->Id,spellInfo->EffectItemType[i]); + ChatHandler(pl).PSendSysMessage("Craft spell %u create not-exist in DB item (Entry: %u) and then...", spellInfo->Id, spellInfo->EffectItemType[i]); else - sLog->outErrorDb("Craft spell %u create not-exist in DB item (Entry: %u) and then...",spellInfo->Id,spellInfo->EffectItemType[i]); + sLog->outErrorDb("Craft spell %u create not-exist in DB item (Entry: %u) and then...", spellInfo->Id, spellInfo->EffectItemType[i]); } return false; } @@ -2381,14 +2381,14 @@ bool SpellMgr::IsSpellValid(SpellEntry const *spellInfo, Player *pl, bool msg) case SPELL_EFFECT_LEARN_SPELL: { SpellEntry const *spellInfo2 = sSpellStore.LookupEntry(spellInfo->EffectTriggerSpell[i]); - if (!IsSpellValid(spellInfo2,pl,msg)) + if (!IsSpellValid(spellInfo2, pl, msg)) { if (msg) { if (pl) - ChatHandler(pl).PSendSysMessage("Spell %u learn to broken spell %u, and then...",spellInfo->Id,spellInfo->EffectTriggerSpell[i]); + ChatHandler(pl).PSendSysMessage("Spell %u learn to broken spell %u, and then...", spellInfo->Id, spellInfo->EffectTriggerSpell[i]); else - sLog->outErrorDb("Spell %u learn to invalid spell %u, and then...",spellInfo->Id,spellInfo->EffectTriggerSpell[i]); + sLog->outErrorDb("Spell %u learn to invalid spell %u, and then...", spellInfo->Id, spellInfo->EffectTriggerSpell[i]); } return false; } @@ -2406,9 +2406,9 @@ bool SpellMgr::IsSpellValid(SpellEntry const *spellInfo, Player *pl, bool msg) if (msg) { if (pl) - ChatHandler(pl).PSendSysMessage("Craft spell %u have not-exist reagent in DB item (Entry: %u) and then...",spellInfo->Id,spellInfo->Reagent[j]); + ChatHandler(pl).PSendSysMessage("Craft spell %u have not-exist reagent in DB item (Entry: %u) and then...", spellInfo->Id, spellInfo->Reagent[j]); else - sLog->outErrorDb("Craft spell %u have not-exist reagent in DB item (Entry: %u) and then...",spellInfo->Id,spellInfo->Reagent[j]); + sLog->outErrorDb("Craft spell %u have not-exist reagent in DB item (Entry: %u) and then...", spellInfo->Id, spellInfo->Reagent[j]); } return false; } @@ -2499,13 +2499,13 @@ void SpellMgr::LoadSpellAreas() if (spellArea.areaId && !GetAreaEntryByAreaID(spellArea.areaId)) { - sLog->outErrorDb("Spell %u listed in `spell_area` have wrong area (%u) requirement", spell,spellArea.areaId); + sLog->outErrorDb("Spell %u listed in `spell_area` have wrong area (%u) requirement", spell, spellArea.areaId); continue; } if (spellArea.questStart && !sObjectMgr->GetQuestTemplate(spellArea.questStart)) { - sLog->outErrorDb("Spell %u listed in `spell_area` have wrong start quest (%u) requirement", spell,spellArea.questStart); + sLog->outErrorDb("Spell %u listed in `spell_area` have wrong start quest (%u) requirement", spell, spellArea.questStart); continue; } @@ -2513,13 +2513,13 @@ void SpellMgr::LoadSpellAreas() { if (!sObjectMgr->GetQuestTemplate(spellArea.questEnd)) { - sLog->outErrorDb("Spell %u listed in `spell_area` have wrong end quest (%u) requirement", spell,spellArea.questEnd); + sLog->outErrorDb("Spell %u listed in `spell_area` have wrong end quest (%u) requirement", spell, spellArea.questEnd); continue; } if (spellArea.questEnd == spellArea.questStart && !spellArea.questStartCanActive) { - sLog->outErrorDb("Spell %u listed in `spell_area` have quest (%u) requirement for start and end in same time", spell,spellArea.questEnd); + sLog->outErrorDb("Spell %u listed in `spell_area` have quest (%u) requirement for start and end in same time", spell, spellArea.questEnd); continue; } } @@ -2529,13 +2529,13 @@ void SpellMgr::LoadSpellAreas() SpellEntry const* spellInfo = sSpellStore.LookupEntry(abs(spellArea.auraSpell)); if (!spellInfo) { - sLog->outErrorDb("Spell %u listed in `spell_area` have wrong aura spell (%u) requirement", spell,abs(spellArea.auraSpell)); + sLog->outErrorDb("Spell %u listed in `spell_area` have wrong aura spell (%u) requirement", spell, abs(spellArea.auraSpell)); continue; } if (uint32(abs(spellArea.auraSpell)) == spellArea.spellId) { - sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement for itself", spell,abs(spellArea.auraSpell)); + sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement for itself", spell, abs(spellArea.auraSpell)); continue; } @@ -2555,7 +2555,7 @@ void SpellMgr::LoadSpellAreas() if (chain) { - sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell,spellArea.auraSpell); + sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell, spellArea.auraSpell); continue; } @@ -2571,7 +2571,7 @@ void SpellMgr::LoadSpellAreas() if (chain) { - sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell,spellArea.auraSpell); + sLog->outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell, spellArea.auraSpell); continue; } } @@ -2579,7 +2579,7 @@ void SpellMgr::LoadSpellAreas() if (spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE) == 0) { - sLog->outErrorDb("Spell %u listed in `spell_area` have wrong race mask (%u) requirement", spell,spellArea.raceMask); + sLog->outErrorDb("Spell %u listed in `spell_area` have wrong race mask (%u) requirement", spell, spellArea.raceMask); continue; } @@ -2589,28 +2589,28 @@ void SpellMgr::LoadSpellAreas() continue; } - SpellArea const* sa = &mSpellAreaMap.insert(SpellAreaMap::value_type(spell,spellArea))->second; + SpellArea const* sa = &mSpellAreaMap.insert(SpellAreaMap::value_type(spell, spellArea))->second; // for search by current zone/subzone at zone/subzone change if (spellArea.areaId) - mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(spellArea.areaId,sa)); + mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(spellArea.areaId, sa)); // for search at quest start/reward if (spellArea.questStart) { if (spellArea.questStartCanActive) - mSpellAreaForActiveQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart,sa)); + mSpellAreaForActiveQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart, sa)); else - mSpellAreaForQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart,sa)); + mSpellAreaForQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart, sa)); } // for search at quest start/reward if (spellArea.questEnd) - mSpellAreaForQuestEndMap.insert(SpellAreaForQuestMap::value_type(spellArea.questEnd,sa)); + mSpellAreaForQuestEndMap.insert(SpellAreaForQuestMap::value_type(spellArea.questEnd, sa)); // for search at aura apply if (spellArea.auraSpell) - mSpellAreaForAuraMap.insert(SpellAreaForAuraMap::value_type(abs(spellArea.auraSpell),sa)); + mSpellAreaForAuraMap.insert(SpellAreaForAuraMap::value_type(abs(spellArea.auraSpell), sa)); ++count; } while (result->NextRow()); @@ -2664,7 +2664,7 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell { for (SpellAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr) { - if (itr->second.IsFitToRequirements(player,zone_id,area_id)) + if (itr->second.IsFitToRequirements(player, zone_id, area_id)) return SPELL_CAST_OK; } return SPELL_FAILED_INCORRECT_AREA; @@ -2766,7 +2766,7 @@ void SpellMgr::LoadSkillLineAbilityMap() if (!SkillInfo) continue; - mSkillLineAbilityMap.insert(SkillLineAbilityMap::value_type(SkillInfo->spellId,SkillInfo)); + mSkillLineAbilityMap.insert(SkillLineAbilityMap::value_type(SkillInfo->spellId, SkillInfo)); ++count; } diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 51361c99700..ac6fcc1789a 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -288,7 +288,7 @@ inline bool IsLootCraftingSpell(SpellEntry const *spellInfo) (spellInfo->TotemCategory[0] != 0 || spellInfo->EffectItemType[0]==0))); } -bool IsHigherHankOfSpell(uint32 spellId_1,uint32 spellId_2); +bool IsHigherHankOfSpell(uint32 spellId_1, uint32 spellId_2); bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1, SpellSpecific spellSpec2); bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific spellSpec2); bool IsPassiveSpell(uint32 spellId); @@ -302,7 +302,7 @@ inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto) if (!IsPassiveSpell(spellProto->Id)) return false; - return !IsSpellHaveEffect(spellProto,SPELL_EFFECT_APPLY_AURA); + return !IsSpellHaveEffect(spellProto, SPELL_EFFECT_APPLY_AURA); } inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo) @@ -679,11 +679,11 @@ enum SpellGroup // spell_id, group_id typedef std::multimap<uint32, SpellGroup > SpellSpellGroupMap; -typedef std::pair<SpellSpellGroupMap::const_iterator,SpellSpellGroupMap::const_iterator> SpellSpellGroupMapBounds; +typedef std::pair<SpellSpellGroupMap::const_iterator, SpellSpellGroupMap::const_iterator> SpellSpellGroupMapBounds; // group_id, spell_id typedef std::multimap<SpellGroup, int32> SpellGroupSpellMap; -typedef std::pair<SpellGroupSpellMap::const_iterator,SpellGroupSpellMap::const_iterator> SpellGroupSpellMapBounds; +typedef std::pair<SpellGroupSpellMap::const_iterator, SpellGroupSpellMap::const_iterator> SpellGroupSpellMapBounds; enum SpellGroupStackRule { @@ -784,12 +784,12 @@ struct SpellArea bool IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const; }; -typedef std::multimap<uint32,SpellArea> SpellAreaMap; -typedef std::multimap<uint32,SpellArea const*> SpellAreaForQuestMap; -typedef std::multimap<uint32,SpellArea const*> SpellAreaForAuraMap; -typedef std::multimap<uint32,SpellArea const*> SpellAreaForAreaMap; -typedef std::pair<SpellAreaMap::const_iterator,SpellAreaMap::const_iterator> SpellAreaMapBounds; -typedef std::pair<SpellAreaForQuestMap::const_iterator,SpellAreaForQuestMap::const_iterator> SpellAreaForQuestMapBounds; +typedef std::multimap<uint32, SpellArea> SpellAreaMap; +typedef std::multimap<uint32, SpellArea const*> SpellAreaForQuestMap; +typedef std::multimap<uint32, SpellArea const*> SpellAreaForAuraMap; +typedef std::multimap<uint32, SpellArea const*> SpellAreaForAreaMap; +typedef std::pair<SpellAreaMap::const_iterator, SpellAreaMap::const_iterator> SpellAreaMapBounds; +typedef std::pair<SpellAreaForQuestMap::const_iterator, SpellAreaForQuestMap::const_iterator> SpellAreaForQuestMapBounds; typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator> SpellAreaForAuraMapBounds; typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator> SpellAreaForAreaMapBounds; @@ -807,11 +807,11 @@ typedef UNORDERED_MAP<uint32, SpellChainNode> SpellChainMap; // spell_id req_spell typedef std::multimap<uint32, uint32> SpellRequiredMap; -typedef std::pair<SpellRequiredMap::const_iterator,SpellRequiredMap::const_iterator> SpellRequiredMapBounds; +typedef std::pair<SpellRequiredMap::const_iterator, SpellRequiredMap::const_iterator> SpellRequiredMapBounds; // req_spell spell_id typedef std::multimap<uint32, uint32> SpellsRequiringSpellMap; -typedef std::pair<SpellsRequiringSpellMap::const_iterator,SpellsRequiringSpellMap::const_iterator> SpellsRequiringSpellMapBounds; +typedef std::pair<SpellsRequiringSpellMap::const_iterator, SpellsRequiringSpellMap::const_iterator> SpellsRequiringSpellMapBounds; // Spell learning properties (accessed using SpellMgr functions) struct SpellLearnSkillNode @@ -832,10 +832,10 @@ struct SpellLearnSpellNode }; typedef std::multimap<uint32, SpellLearnSpellNode> SpellLearnSpellMap; -typedef std::pair<SpellLearnSpellMap::const_iterator,SpellLearnSpellMap::const_iterator> SpellLearnSpellMapBounds; +typedef std::pair<SpellLearnSpellMap::const_iterator, SpellLearnSpellMap::const_iterator> SpellLearnSpellMapBounds; typedef std::multimap<uint32, SkillLineAbilityEntry const*> SkillLineAbilityMap; -typedef std::pair<SkillLineAbilityMap::const_iterator,SkillLineAbilityMap::const_iterator> SkillLineAbilityMapBounds; +typedef std::pair<SkillLineAbilityMap::const_iterator, SkillLineAbilityMap::const_iterator> SkillLineAbilityMapBounds; typedef std::multimap<uint32, uint32> PetLevelupSpellSet; typedef std::map<uint32, PetLevelupSpellSet> PetLevelupSpellMap; @@ -918,7 +918,7 @@ class SpellMgr SpellSpellGroupMapBounds GetSpellSpellGroupMapBounds(uint32 spell_id) const { spell_id = GetFirstSpellInChain(spell_id); - return SpellSpellGroupMapBounds(mSpellSpellGroup.lower_bound(spell_id),mSpellSpellGroup.upper_bound(spell_id)); + return SpellSpellGroupMapBounds(mSpellSpellGroup.lower_bound(spell_id), mSpellSpellGroup.upper_bound(spell_id)); } uint32 IsSpellMemberOfSpellGroup(uint32 spellid, SpellGroup groupid) const { @@ -933,7 +933,7 @@ class SpellMgr SpellGroupSpellMapBounds GetSpellGroupSpellMapBounds(SpellGroup group_id) const { - return SpellGroupSpellMapBounds(mSpellGroupSpell.lower_bound(group_id),mSpellGroupSpell.upper_bound(group_id)); + return SpellGroupSpellMapBounds(mSpellGroupSpell.lower_bound(group_id), mSpellGroupSpell.upper_bound(group_id)); } void GetSetOfSpellsInSpellGroup(SpellGroup group_id, std::set<uint32>& foundSpells) const { @@ -1152,12 +1152,12 @@ class SpellMgr SpellRequiredMapBounds GetSpellsRequiredForSpellBounds(uint32 spell_id) const { - return SpellRequiredMapBounds(mSpellReq.lower_bound(spell_id),mSpellReq.upper_bound(spell_id)); + return SpellRequiredMapBounds(mSpellReq.lower_bound(spell_id), mSpellReq.upper_bound(spell_id)); } SpellsRequiringSpellMapBounds GetSpellsRequiringSpellBounds(uint32 spell_id) const { - return SpellsRequiringSpellMapBounds(mSpellsReqSpell.lower_bound(spell_id),mSpellsReqSpell.upper_bound(spell_id)); + return SpellsRequiringSpellMapBounds(mSpellsReqSpell.lower_bound(spell_id), mSpellsReqSpell.upper_bound(spell_id)); } bool IsSpellRequiringSpell(uint32 spellid, uint32 req_spellid) const { @@ -1191,7 +1191,7 @@ class SpellMgr return mEnchantCustomAttr[ench_id]; } - uint8 IsHighRankOfSpell(uint32 spell1,uint32 spell2) const + uint8 IsHighRankOfSpell(uint32 spell1, uint32 spell2) const { SpellChainMap::const_iterator itr1 = mSpellChains.find(spell1); SpellChainMap::const_iterator itr2 = mSpellChains.find(spell2); @@ -1204,7 +1204,7 @@ class SpellMgr return false; } - bool IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellId_2) const; + bool IsRankSpellDueToSpell(SpellEntry const *spellInfo_1, uint32 spellId_2) const; static bool canStackSpellRanks(SpellEntry const *spellInfo); bool CanAurasStack(Aura const *aura1, Aura const *aura2, bool sameCaster) const; @@ -1227,10 +1227,10 @@ class SpellMgr SpellLearnSpellMapBounds GetSpellLearnSpellMapBounds(uint32 spell_id) const { - return SpellLearnSpellMapBounds(mSpellLearnSpells.lower_bound(spell_id),mSpellLearnSpells.upper_bound(spell_id)); + return SpellLearnSpellMapBounds(mSpellLearnSpells.lower_bound(spell_id), mSpellLearnSpells.upper_bound(spell_id)); } - bool IsSpellLearnToSpell(uint32 spell_id1,uint32 spell_id2) const + bool IsSpellLearnToSpell(uint32 spell_id1, uint32 spell_id2) const { SpellLearnSpellMapBounds bounds = GetSpellLearnSpellMapBounds(spell_id1); for (SpellLearnSpellMap::const_iterator i = bounds.first; i != bounds.second; ++i) @@ -1256,7 +1256,7 @@ class SpellMgr SkillLineAbilityMapBounds GetSkillLineAbilityMapBounds(uint32 spell_id) const { - return SkillLineAbilityMapBounds(mSkillLineAbilityMap.lower_bound(spell_id),mSkillLineAbilityMap.upper_bound(spell_id)); + return SkillLineAbilityMapBounds(mSkillLineAbilityMap.lower_bound(spell_id), mSkillLineAbilityMap.upper_bound(spell_id)); } PetAura const* GetPetAura(uint32 spell_id, uint8 eff) @@ -1304,30 +1304,30 @@ class SpellMgr SpellAreaMapBounds GetSpellAreaMapBounds(uint32 spell_id) const { - return SpellAreaMapBounds(mSpellAreaMap.lower_bound(spell_id),mSpellAreaMap.upper_bound(spell_id)); + return SpellAreaMapBounds(mSpellAreaMap.lower_bound(spell_id), mSpellAreaMap.upper_bound(spell_id)); } SpellAreaForQuestMapBounds GetSpellAreaForQuestMapBounds(uint32 quest_id, bool active) const { if (active) - return SpellAreaForQuestMapBounds(mSpellAreaForActiveQuestMap.lower_bound(quest_id),mSpellAreaForActiveQuestMap.upper_bound(quest_id)); + return SpellAreaForQuestMapBounds(mSpellAreaForActiveQuestMap.lower_bound(quest_id), mSpellAreaForActiveQuestMap.upper_bound(quest_id)); else - return SpellAreaForQuestMapBounds(mSpellAreaForQuestMap.lower_bound(quest_id),mSpellAreaForQuestMap.upper_bound(quest_id)); + return SpellAreaForQuestMapBounds(mSpellAreaForQuestMap.lower_bound(quest_id), mSpellAreaForQuestMap.upper_bound(quest_id)); } SpellAreaForQuestMapBounds GetSpellAreaForQuestEndMapBounds(uint32 quest_id) const { - return SpellAreaForQuestMapBounds(mSpellAreaForQuestEndMap.lower_bound(quest_id),mSpellAreaForQuestEndMap.upper_bound(quest_id)); + return SpellAreaForQuestMapBounds(mSpellAreaForQuestEndMap.lower_bound(quest_id), mSpellAreaForQuestEndMap.upper_bound(quest_id)); } SpellAreaForAuraMapBounds GetSpellAreaForAuraMapBounds(uint32 spell_id) const { - return SpellAreaForAuraMapBounds(mSpellAreaForAuraMap.lower_bound(spell_id),mSpellAreaForAuraMap.upper_bound(spell_id)); + return SpellAreaForAuraMapBounds(mSpellAreaForAuraMap.lower_bound(spell_id), mSpellAreaForAuraMap.upper_bound(spell_id)); } SpellAreaForAreaMapBounds GetSpellAreaForAreaMapBounds(uint32 area_id) const { - return SpellAreaForAreaMapBounds(mSpellAreaForAreaMap.lower_bound(area_id),mSpellAreaForAreaMap.upper_bound(area_id)); + return SpellAreaForAreaMapBounds(mSpellAreaForAreaMap.lower_bound(area_id), mSpellAreaForAreaMap.upper_bound(area_id)); } bool IsSrcTargetSpell(SpellEntry const *spellInfo) const; diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 8844dc3db32..2e9cf6ab6f4 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -119,7 +119,7 @@ std::string _SpellScript::EffectNameCheck::ToString() return "SPELL_EFFECT_ANY"; default: char num[10]; - sprintf (num,"%u",effName); + sprintf (num, "%u", effName); return num; } } @@ -141,7 +141,7 @@ std::string _SpellScript::EffectAuraNameCheck::ToString() return "SPELL_AURA_ANY"; default: char num[10]; - sprintf (num,"%u",effAurName); + sprintf (num, "%u", effAurName); return num; } } @@ -156,7 +156,7 @@ SpellCastResult SpellScript::CheckCastHandler::Call(SpellScript* spellScript) return (spellScript->*_checkCastHandlerScript)(); } -SpellScript::EffectHandler::EffectHandler(SpellEffectFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) +SpellScript::EffectHandler::EffectHandler(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : _SpellScript::EffectNameCheck(_effName), _SpellScript::EffectHook(_effIndex) { pEffectHandlerScript = _pEffectHandlerScript; @@ -530,7 +530,7 @@ std::string AuraScript::EffectBase::ToString() return "Index: " + EffIndexToString() + " AuraName: " +_SpellScript::EffectAuraNameCheck::ToString(); } -AuraScript::EffectPeriodicHandler::EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) +AuraScript::EffectPeriodicHandler::EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectBase(_effIndex, _effName) { pEffectHandlerScript = _pEffectHandlerScript; @@ -541,7 +541,7 @@ void AuraScript::EffectPeriodicHandler::Call(AuraScript* auraScript, AuraEffect (auraScript->*pEffectHandlerScript)(_aurEff); } -AuraScript::EffectUpdatePeriodicHandler::EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) +AuraScript::EffectUpdatePeriodicHandler::EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectBase(_effIndex, _effName) { pEffectHandlerScript = _pEffectHandlerScript; @@ -552,7 +552,7 @@ void AuraScript::EffectUpdatePeriodicHandler::Call(AuraScript* auraScript, AuraE (auraScript->*pEffectHandlerScript)(aurEff); } -AuraScript::EffectCalcAmountHandler::EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) +AuraScript::EffectCalcAmountHandler::EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectBase(_effIndex, _effName) { pEffectHandlerScript = _pEffectHandlerScript; @@ -598,7 +598,7 @@ void AuraScript::EffectApplyHandler::Call(AuraScript* auraScript, AuraEffect con (auraScript->*pEffectHandlerScript)(_aurEff, _mode); } -AuraScript::EffectAbsorbHandler::EffectAbsorbHandler(AuraEffectAbsorbFnType _pEffectHandlerScript,uint8 _effIndex) +AuraScript::EffectAbsorbHandler::EffectAbsorbHandler(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectBase(_effIndex, SPELL_AURA_SCHOOL_ABSORB) { pEffectHandlerScript = _pEffectHandlerScript; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index b7020bf7d53..188a7cde4ec 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -159,7 +159,7 @@ class SpellScript : public _SpellScript class EffectHandler : public _SpellScript::EffectNameCheck, public _SpellScript::EffectHook { public: - EffectHandler(SpellEffectFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectHandler(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); std::string ToString(); bool CheckEffect(SpellEntry const* spellEntry, uint8 effIndex); void Call(SpellScript* spellScript, SpellEffIndex effIndex); @@ -190,7 +190,7 @@ class SpellScript : public _SpellScript #define SPELLSCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ class CheckCastHandlerFunction : public SpellScript::CheckCastHandler { public: CheckCastHandlerFunction(SpellCheckCastFnType _checkCastHandlerScript) : SpellScript::CheckCastHandler((SpellScript::SpellCheckCastFnType)_checkCastHandlerScript) {} }; \ - class EffectHandlerFunction : public SpellScript::EffectHandler { public: EffectHandlerFunction(SpellEffectFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : SpellScript::EffectHandler((SpellScript::SpellEffectFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectHandlerFunction : public SpellScript::EffectHandler { public: EffectHandlerFunction(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : SpellScript::EffectHandler((SpellScript::SpellEffectFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ class HitHandlerFunction : public SpellScript::HitHandler { public: HitHandlerFunction(SpellHitFnType _pHitHandlerScript) : SpellScript::HitHandler((SpellScript::SpellHitFnType)_pHitHandlerScript) {} }; \ class UnitTargetHandlerFunction : public SpellScript::UnitTargetHandler { public: UnitTargetHandlerFunction(SpellUnitTargetFnType _pUnitTargetHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::UnitTargetHandler((SpellScript::SpellUnitTargetFnType)_pUnitTargetHandlerScript, _effIndex, _targetType) {} }; \ @@ -337,7 +337,7 @@ enum AuraScriptHookType AURA_SCRIPT_HOOK_EFFECT_MANASHIELD, AURA_SCRIPT_HOOK_EFFECT_AFTER_MANASHIELD, /*AURA_SCRIPT_HOOK_APPLY, - AURA_SCRIPT_HOOK_REMOVE,*/ + AURA_SCRIPT_HOOK_REMOVE, */ }; #define HOOK_AURA_EFFECT_START HOOK_AURA_EFFECT_APPLY #define HOOK_AURA_EFFECT_END HOOK_AURA_EFFECT_CALC_SPELLMOD + 1 @@ -370,7 +370,7 @@ class AuraScript : public _SpellScript class EffectPeriodicHandler : public EffectBase { public: - EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); void Call(AuraScript * auraScript, AuraEffect const * _aurEff); private: AuraEffectPeriodicFnType pEffectHandlerScript; @@ -378,7 +378,7 @@ class AuraScript : public _SpellScript class EffectUpdatePeriodicHandler : public EffectBase { public: - EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); void Call(AuraScript * auraScript, AuraEffect * aurEff); private: AuraEffectUpdatePeriodicFnType pEffectHandlerScript; @@ -386,7 +386,7 @@ class AuraScript : public _SpellScript class EffectCalcAmountHandler : public EffectBase { public: - EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); void Call(AuraScript * auraScript, AuraEffect const* aurEff, int32 & amount, bool & canBeRecalculated); private: AuraEffectCalcAmountFnType pEffectHandlerScript; @@ -394,7 +394,7 @@ class AuraScript : public _SpellScript class EffectCalcPeriodicHandler : public EffectBase { public: - EffectCalcPeriodicHandler(AuraEffectCalcPeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectCalcPeriodicHandler(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); void Call(AuraScript * auraScript, AuraEffect const* aurEff, bool & isPeriodic, int32 & periodicTimer); private: AuraEffectCalcPeriodicFnType pEffectHandlerScript; @@ -402,7 +402,7 @@ class AuraScript : public _SpellScript class EffectCalcSpellModHandler : public EffectBase { public: - EffectCalcSpellModHandler(AuraEffectCalcSpellModFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName); + EffectCalcSpellModHandler(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); void Call(AuraScript * auraScript, AuraEffect const* aurEff, SpellModifier *& spellMod); private: AuraEffectCalcSpellModFnType pEffectHandlerScript; @@ -410,7 +410,7 @@ class AuraScript : public _SpellScript class EffectApplyHandler : public EffectBase { public: - EffectApplyHandler(AuraEffectApplicationModeFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode); + EffectApplyHandler(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode); void Call(AuraScript * auraScript, AuraEffect const * _aurEff, AuraEffectHandleModes _mode); private: AuraEffectApplicationModeFnType pEffectHandlerScript; @@ -434,14 +434,14 @@ class AuraScript : public _SpellScript }; #define AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ - class EffectPeriodicHandlerFunction : public AuraScript::EffectPeriodicHandler { public: EffectPeriodicHandlerFunction(AuraEffectPeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : AuraScript::EffectPeriodicHandler((AuraScript::AuraEffectPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectUpdatePeriodicHandlerFunction : public AuraScript::EffectUpdatePeriodicHandler { public: EffectUpdatePeriodicHandlerFunction(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : AuraScript::EffectUpdatePeriodicHandler((AuraScript::AuraEffectUpdatePeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcAmountHandlerFunction : public AuraScript::EffectCalcAmountHandler { public: EffectCalcAmountHandlerFunction(AuraEffectCalcAmountFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcAmountHandler((AuraScript::AuraEffectCalcAmountFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcPeriodicHandlerFunction : public AuraScript::EffectCalcPeriodicHandler { public: EffectCalcPeriodicHandlerFunction(AuraEffectCalcPeriodicFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcPeriodicHandler((AuraScript::AuraEffectCalcPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectCalcSpellModHandlerFunction : public AuraScript::EffectCalcSpellModHandler { public: EffectCalcSpellModHandlerFunction(AuraEffectCalcSpellModFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcSpellModHandler((AuraScript::AuraEffectCalcSpellModFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ - class EffectApplyHandlerFunction : public AuraScript::EffectApplyHandler { public: EffectApplyHandlerFunction(AuraEffectApplicationModeFnType _pEffectHandlerScript,uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) : AuraScript::EffectApplyHandler((AuraScript::AuraEffectApplicationModeFnType)_pEffectHandlerScript, _effIndex, _effName, _mode) {} }; \ - class EffectAbsorbFunction : public AuraScript::EffectAbsorbHandler { public: EffectAbsorbFunction(AuraEffectAbsorbFnType _pEffectHandlerScript,uint8 _effIndex) : AuraScript::EffectAbsorbHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ - class EffectManaShieldFunction : public AuraScript::EffectManaShieldHandler { public: EffectManaShieldFunction(AuraEffectAbsorbFnType _pEffectHandlerScript,uint8 _effIndex) : AuraScript::EffectManaShieldHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ + class EffectPeriodicHandlerFunction : public AuraScript::EffectPeriodicHandler { public: EffectPeriodicHandlerFunction(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectPeriodicHandler((AuraScript::AuraEffectPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectUpdatePeriodicHandlerFunction : public AuraScript::EffectUpdatePeriodicHandler { public: EffectUpdatePeriodicHandlerFunction(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectUpdatePeriodicHandler((AuraScript::AuraEffectUpdatePeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectCalcAmountHandlerFunction : public AuraScript::EffectCalcAmountHandler { public: EffectCalcAmountHandlerFunction(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcAmountHandler((AuraScript::AuraEffectCalcAmountFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectCalcPeriodicHandlerFunction : public AuraScript::EffectCalcPeriodicHandler { public: EffectCalcPeriodicHandlerFunction(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcPeriodicHandler((AuraScript::AuraEffectCalcPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectCalcSpellModHandlerFunction : public AuraScript::EffectCalcSpellModHandler { public: EffectCalcSpellModHandlerFunction(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcSpellModHandler((AuraScript::AuraEffectCalcSpellModFnType)_pEffectHandlerScript, _effIndex, _effName) {} }; \ + class EffectApplyHandlerFunction : public AuraScript::EffectApplyHandler { public: EffectApplyHandlerFunction(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) : AuraScript::EffectApplyHandler((AuraScript::AuraEffectApplicationModeFnType)_pEffectHandlerScript, _effIndex, _effName, _mode) {} }; \ + class EffectAbsorbFunction : public AuraScript::EffectAbsorbHandler { public: EffectAbsorbFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectAbsorbHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ + class EffectManaShieldFunction : public AuraScript::EffectManaShieldHandler { public: EffectManaShieldFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectManaShieldHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) {} }; \ #define PrepareAuraScript(CLASSNAME) AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index daf68906249..4b813317ea1 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -111,18 +111,18 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisp CreatureTextMap::const_iterator sList = mTextMap.find(source->GetEntry()); if (sList == mTextMap.end()) { - sLog->outErrorDb("CreatureTextMgr: Could not find Text for Creature(%s) Entry %u in 'creature_text' table. Ignoring.",source->GetName(), source->GetEntry()); + sLog->outErrorDb("CreatureTextMgr: Could not find Text for Creature(%s) Entry %u in 'creature_text' table. Ignoring.", source->GetName(), source->GetEntry()); return 0; } CreatureTextHolder TextHolder = (*sList).second; CreatureTextHolder::const_iterator itr = TextHolder.find(textGroup); if (itr == TextHolder.end()) { - sLog->outErrorDb("CreatureTextMgr: Could not find TextGroup %u for Creature(%s) GuidLow %u Entry %u. Ignoring.",uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry()); + sLog->outErrorDb("CreatureTextMgr: Could not find TextGroup %u for Creature(%s) GuidLow %u Entry %u. Ignoring.", uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry()); return 0; } CreatureTextGroup TextGroup = (*itr).second;//has all texts in the group - CreatureTextRepeatIds repeatGroup = GetRepeatGroup(source,textGroup);//has all textIDs from the group that were already said + CreatureTextRepeatIds repeatGroup = GetRepeatGroup(source, textGroup);//has all textIDs from the group that were already said CreatureTextGroup tempGroup;//will use this to talk after sorting repeatGroup for (CreatureTextGroup::const_iterator giter = TextGroup.begin(); giter != TextGroup.end(); ++giter) @@ -169,7 +169,7 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisp } uint32 pos = 0; if (isEqualChanced || offset < 0) - pos = urand(0,count - 1); + pos = urand(0, count - 1); else if (offset >= 0) pos = offset; CreatureTextGroup::const_iterator iter = tempGroup.begin() + pos; @@ -191,7 +191,7 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisp return (*iter).duration; } -void CreatureTextMgr::SendSound(Creature* source,uint32 sound, ChatType msgtype, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) +void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatType msgtype, uint64 whisperGuid, TextRange range, Team team, bool gmOnly) { if (!sound || !source) return; @@ -225,7 +225,7 @@ void CreatureTextMgr::SetRepeatId(Creature* source, uint8 textGroup, uint8 id) mTextRepeatMap[source->GetGUID()][textGroup].push_back(id); } else - sLog->outErrorDb("CreatureTextMgr: TextGroup %u for Creature(%s) GuidLow %u Entry %u, id %u already added",uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry(), uint32(id)); + sLog->outErrorDb("CreatureTextMgr: TextGroup %u for Creature(%s) GuidLow %u Entry %u, id %u already added", uint32(textGroup), source->GetName(), source->GetGUIDLow(), source->GetEntry(), uint32(id)); } CreatureTextRepeatIds CreatureTextMgr::GetRepeatGroup(Creature* source, uint8 textGroup) @@ -277,7 +277,7 @@ void CreatureTextMgr::BuildMonsterChat(WorldPacket *data, WorldObject* source, C sendType = CHAT_MSG_MONSTER_WHISPER; else { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_WHISPER with targetGuid 0. Ignoring.",source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); + sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_WHISPER with targetGuid 0. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); return; } break; @@ -286,7 +286,7 @@ void CreatureTextMgr::BuildMonsterChat(WorldPacket *data, WorldObject* source, C sendType = CHAT_MSG_RAID_BOSS_WHISPER; else { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_BOSS_WHISPER with targetGuid 0. Ignoring.",source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); + sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent CHAT_TYPE_BOSS_WHISPER with targetGuid 0. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); return; } break; @@ -303,7 +303,7 @@ void CreatureTextMgr::BuildMonsterChat(WorldPacket *data, WorldObject* source, C *data << (uint64)whisperGuid; // Unit Target if (whisperGuid && !IS_PLAYER_GUID(whisperGuid)) //can only whisper players { - sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent WHISPER msg to Non-Player target. Ignoring.",source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); + sLog->outError("CreatureTextMgr: WorldObject(%s) TypeId %u GuidLow %u sent WHISPER msg to Non-Player target. Ignoring.", source->GetName(), uint32(source->GetTypeId()), source->GetGUIDLow()); return; // *data << (uint32)1; // target name length // *data << (uint8)0; // target name @@ -423,7 +423,7 @@ bool CreatureTextMgr::TextExist(uint32 sourceEntry, uint8 textGroup) CreatureTextHolder::const_iterator itr = TextHolder.find(textGroup); if (itr == TextHolder.end()) { - sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find TextGroup %u for Creature (entry %u).",uint32(textGroup), sourceEntry); + sLog->outDebug(LOG_FILTER_UNITS, "CreatureTextMgr::TextExist: Could not find TextGroup %u for Creature (entry %u).", uint32(textGroup), sourceEntry); return false; } return true; diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index caa3b3783f1..5267b4c4f53 100755 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -62,7 +62,7 @@ class CreatureTextMgr void LoadCreatureTexts(); CreatureTextMap const& GetTextMap() const { return mTextMap; } - void SendSound(Creature* source,uint32 sound, ChatType msgtype, uint64 whisperGuid, TextRange range, Team team, bool gmOnly); + void SendSound(Creature* source, uint32 sound, ChatType msgtype, uint64 whisperGuid, TextRange range, Team team, bool gmOnly); void SendEmote(Unit* source, uint32 emote); //if sent, returns the 'duration' of the text else 0 if error diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index f1682012c9c..69494e4b782 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -92,7 +92,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table found = true; } else - ss << ","; + ss << ", "; ss << id; } diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 9bb844a3ed3..7f4dc15c5c3 100755 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -91,7 +91,7 @@ bool findnth(std::string &str, int n, std::string::size_type &s, std::string::si do { - e = str.find("'",s); + e = str.find("'", s); if (e == std::string::npos) return false; } while (str[e-1] == '\\'); @@ -100,7 +100,7 @@ bool findnth(std::string &str, int n, std::string::size_type &s, std::string::si do { s = e+4; - e = str.find("'",s); + e = str.find("'", s); if (e == std::string::npos) return false; } while (str[e-1] == '\\'); } @@ -120,13 +120,13 @@ std::string gettablename(std::string &str) bool changenth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false) { std::string::size_type s, e; - if (!findnth(str,n,s,e)) + if (!findnth(str, n, s, e)) return false; - if (nonzero && str.substr(s,e-s) == "0") + if (nonzero && str.substr(s, e-s) == "0") return true; // not an error if (!insert) - str.replace(s,e-s, with); + str.replace(s, e-s, with); else str.insert(s, with); @@ -136,7 +136,7 @@ bool changenth(std::string &str, int n, const char *with, bool insert = false, b std::string getnth(std::string &str, int n) { std::string::size_type s, e; - if (!findnth(str,n,s,e)) + if (!findnth(str, n, s, e)) return ""; return str.substr(s, e-s); @@ -147,7 +147,7 @@ bool changetoknth(std::string &str, int n, const char *with, bool insert = false std::string::size_type s = 0, e = 0; if (!findtoknth(str, n, s, e)) return false; - if (nonzero && str.substr(s,e-s) == "0") + if (nonzero && str.substr(s, e-s) == "0") return true; // not an error if (!insert) str.replace(s, e-s, with); @@ -238,13 +238,13 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g GUIDs::const_iterator itr2 = itr; if (++itr2 != guids.end()) - wherestr << "','"; + wherestr << "', '"; } wherestr << "')"; return wherestr.str(); } -void StoreGUID(QueryResult result,uint32 field,std::set<uint32>& guids) +void StoreGUID(QueryResult result, uint32 field, std::set<uint32>& guids) { Field* fields = result->Fetch(); uint32 guid = fields[field].GetUInt32(); @@ -252,7 +252,7 @@ void StoreGUID(QueryResult result,uint32 field,std::set<uint32>& guids) guids.insert(guid); } -void StoreGUID(QueryResult result,uint32 data,uint32 field, std::set<uint32>& guids) +void StoreGUID(QueryResult result, uint32 data, uint32 field, std::set<uint32>& guids) { Field* fields = result->Fetch(); std::string dataStr = fields[data].GetString(); @@ -292,9 +292,9 @@ bool PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl std::string wherestr; if (guids) // set case, get next guids string - wherestr = GenerateWhereStr(fieldname,*guids,guids_itr); + wherestr = GenerateWhereStr(fieldname, *guids, guids_itr); else // not set case, get single guid string - wherestr = GenerateWhereStr(fieldname,guid); + wherestr = GenerateWhereStr(fieldname, guid); QueryResult result = CharacterDatabase.PQuery("SELECT * FROM %s WHERE %s", tableFrom, wherestr.c_str()); if (!result) @@ -306,13 +306,13 @@ bool PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl switch (type) { case DTT_INVENTORY: - StoreGUID(result,3,items); break; // item guid collection (character_inventory.item) + StoreGUID(result, 3, items); break; // item guid collection (character_inventory.item) case DTT_PET: - StoreGUID(result,0,pets); break; // pet petnumber collection (character_pet.id) + StoreGUID(result, 0, pets); break; // pet petnumber collection (character_pet.id) case DTT_MAIL: - StoreGUID(result,0,mails); // mail id collection (mail.id) + StoreGUID(result, 0, mails); // mail id collection (mail.id) case DTT_MAIL_ITEM: - StoreGUID(result,1,items); break; // item guid collection (mail_items.item_guid) + StoreGUID(result, 1, items); break; // item guid collection (mail_items.item_guid) case DTT_CHARACTER: { if (result->GetFieldCount() <= 67) // avoid crashes on next check @@ -409,7 +409,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s if (!normalizePlayerName(name)) name = ""; - if (ObjectMgr::CheckPlayerName(name,true) == CHAR_NAME_SUCCESS) + if (ObjectMgr::CheckPlayerName(name, true) == CHAR_NAME_SUCCESS) { CharacterDatabase.escape_string(name); // for safe, we use name only for sql quearies anyway result = CharacterDatabase.PQuery("SELECT 1 FROM characters WHERE name = '%s'", name.c_str()); @@ -426,8 +426,8 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s snprintf(newpetid, 20, "%d", sObjectMgr->GeneratePetNumber()); snprintf(lastpetid, 20, "%s", ""); - std::map<uint32,uint32> items; - std::map<uint32,uint32> mails; + std::map<uint32, uint32> items; + std::map<uint32, uint32> mails; char buf[32000] = ""; typedef std::map<uint32, uint32> PetIds; // old->new petid relation @@ -451,14 +451,14 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s continue; // skip logfile-side dump start notice, the important notes and dump end notices - if ((line.substr(nw_pos,16) == "== START DUMP ==") || - (line.substr(nw_pos,15) == "IMPORTANT NOTE:") || - (line.substr(nw_pos,14) == "== END DUMP ==")) + if ((line.substr(nw_pos, 16) == "== START DUMP ==") || + (line.substr(nw_pos, 15) == "IMPORTANT NOTE:") || + (line.substr(nw_pos, 14) == "== END DUMP ==")) continue; // add required_ check /* - if (line.substr(nw_pos,41) == "UPDATE character_db_version SET required_") + if (line.substr(nw_pos, 41) == "UPDATE character_db_version SET required_") { if (!CharacterDatabase.Execute(line.c_str())) ROLLBACK(DUMP_FILE_BROKEN); @@ -597,7 +597,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s snprintf(currpetid, 20, "%s", getnth(line, 1).c_str()); if (*lastpetid == '\0') snprintf(lastpetid, 20, "%s", currpetid); - if (strcmp(lastpetid,currpetid) != 0) + if (strcmp(lastpetid, currpetid) != 0) { snprintf(newpetid, 20, "%d", sObjectMgr->GeneratePetNumber()); snprintf(lastpetid, 20, "%s", currpetid); @@ -634,7 +634,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s break; } default: - sLog->outError("Unknown dump table type: %u",type); + sLog->outError("Unknown dump table type: %u", type); break; } diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index d21de1c1fad..c52cb0c2ec9 100755 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -134,7 +134,7 @@ bool Weather::ReGenerate() if (m_grade > 0.6666667f) { // Severe change, but how severe? - uint32 rnd = urand(0,99); + uint32 rnd = urand(0, 99); if (rnd < 50) { m_grade -= 0.6666667f; diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 79600b482df..2c1b7e5fc54 100755 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -66,7 +66,7 @@ Weather* WeatherMgr::AddWeather(uint32 zone_id) if (!weatherChances) return NULL; - Weather* w = new Weather(zone_id,weatherChances); + Weather* w = new Weather(zone_id, weatherChances); m_weathers[w->GetZone()] = w; w->ReGenerate(); w->UpdateWeather(); @@ -106,19 +106,19 @@ void WeatherMgr::LoadWeatherData() if (wzc.data[season].rainChance > 100) { wzc.data[season].rainChance = 25; - sLog->outErrorDb("Weather for zone %u season %u has wrong rain chance > 100%%",zone_id,season); + sLog->outErrorDb("Weather for zone %u season %u has wrong rain chance > 100%%", zone_id, season); } if (wzc.data[season].snowChance > 100) { wzc.data[season].snowChance = 25; - sLog->outErrorDb("Weather for zone %u season %u has wrong snow chance > 100%%",zone_id,season); + sLog->outErrorDb("Weather for zone %u season %u has wrong snow chance > 100%%", zone_id, season); } if (wzc.data[season].stormChance > 100) { wzc.data[season].stormChance = 25; - sLog->outErrorDb("Weather for zone %u season %u has wrong storm chance > 100%%",zone_id,season); + sLog->outErrorDb("Weather for zone %u season %u has wrong storm chance > 100%%", zone_id, season); } } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 7af625facc7..e2942495cb3 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -392,7 +392,7 @@ void World::LoadConfigSettings(bool reload) { if (!sConfig->Reload()) { - sLog->outError("World settings reload fail: can't read settings from %s.",sConfig->GetFilename().c_str()); + sLog->outError("World settings reload fail: can't read settings from %s.", sConfig->GetFilename().c_str()); return; } } @@ -414,27 +414,27 @@ void World::LoadConfigSettings(bool reload) rate_values[RATE_HEALTH] = sConfig->GetFloatDefault("Rate.Health", 1); if (rate_values[RATE_HEALTH] < 0) { - sLog->outError("Rate.Health (%f) must be > 0. Using 1 instead.",rate_values[RATE_HEALTH]); + sLog->outError("Rate.Health (%f) must be > 0. Using 1 instead.", rate_values[RATE_HEALTH]); rate_values[RATE_HEALTH] = 1; } rate_values[RATE_POWER_MANA] = sConfig->GetFloatDefault("Rate.Mana", 1); if (rate_values[RATE_POWER_MANA] < 0) { - sLog->outError("Rate.Mana (%f) must be > 0. Using 1 instead.",rate_values[RATE_POWER_MANA]); + sLog->outError("Rate.Mana (%f) must be > 0. Using 1 instead.", rate_values[RATE_POWER_MANA]); rate_values[RATE_POWER_MANA] = 1; } rate_values[RATE_POWER_RAGE_INCOME] = sConfig->GetFloatDefault("Rate.Rage.Income", 1); rate_values[RATE_POWER_RAGE_LOSS] = sConfig->GetFloatDefault("Rate.Rage.Loss", 1); if (rate_values[RATE_POWER_RAGE_LOSS] < 0) { - sLog->outError("Rate.Rage.Loss (%f) must be > 0. Using 1 instead.",rate_values[RATE_POWER_RAGE_LOSS]); + sLog->outError("Rate.Rage.Loss (%f) must be > 0. Using 1 instead.", rate_values[RATE_POWER_RAGE_LOSS]); rate_values[RATE_POWER_RAGE_LOSS] = 1; } rate_values[RATE_POWER_RUNICPOWER_INCOME] = sConfig->GetFloatDefault("Rate.RunicPower.Income", 1); rate_values[RATE_POWER_RUNICPOWER_LOSS] = sConfig->GetFloatDefault("Rate.RunicPower.Loss", 1); if (rate_values[RATE_POWER_RUNICPOWER_LOSS] < 0) { - sLog->outError("Rate.RunicPower.Loss (%f) must be > 0. Using 1 instead.",rate_values[RATE_POWER_RUNICPOWER_LOSS]); + sLog->outError("Rate.RunicPower.Loss (%f) must be > 0. Using 1 instead.", rate_values[RATE_POWER_RUNICPOWER_LOSS]); rate_values[RATE_POWER_RUNICPOWER_LOSS] = 1; } rate_values[RATE_POWER_FOCUS] = sConfig->GetFloatDefault("Rate.Focus", 1.0f); @@ -458,7 +458,7 @@ void World::LoadConfigSettings(bool reload) rate_values[RATE_REPAIRCOST] = sConfig->GetFloatDefault("Rate.RepairCost", 1.0f); if (rate_values[RATE_REPAIRCOST] < 0.0f) { - sLog->outError("Rate.RepairCost (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_REPAIRCOST]); + sLog->outError("Rate.RepairCost (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_REPAIRCOST]); rate_values[RATE_REPAIRCOST] = 0.0f; } rate_values[RATE_REPUTATION_GAIN] = sConfig->GetFloatDefault("Rate.Reputation.Gain", 1.0f); @@ -488,73 +488,73 @@ void World::LoadConfigSettings(bool reload) rate_values[RATE_AUCTION_TIME] = sConfig->GetFloatDefault("Rate.Auction.Time", 1.0f); rate_values[RATE_AUCTION_DEPOSIT] = sConfig->GetFloatDefault("Rate.Auction.Deposit", 1.0f); rate_values[RATE_AUCTION_CUT] = sConfig->GetFloatDefault("Rate.Auction.Cut", 1.0f); - rate_values[RATE_HONOR] = sConfig->GetFloatDefault("Rate.Honor",1.0f); - rate_values[RATE_MINING_AMOUNT] = sConfig->GetFloatDefault("Rate.Mining.Amount",1.0f); - rate_values[RATE_MINING_NEXT] = sConfig->GetFloatDefault("Rate.Mining.Next",1.0f); - rate_values[RATE_INSTANCE_RESET_TIME] = sConfig->GetFloatDefault("Rate.InstanceResetTime",1.0f); - rate_values[RATE_TALENT] = sConfig->GetFloatDefault("Rate.Talent",1.0f); + rate_values[RATE_HONOR] = sConfig->GetFloatDefault("Rate.Honor", 1.0f); + rate_values[RATE_MINING_AMOUNT] = sConfig->GetFloatDefault("Rate.Mining.Amount", 1.0f); + rate_values[RATE_MINING_NEXT] = sConfig->GetFloatDefault("Rate.Mining.Next", 1.0f); + rate_values[RATE_INSTANCE_RESET_TIME] = sConfig->GetFloatDefault("Rate.InstanceResetTime", 1.0f); + rate_values[RATE_TALENT] = sConfig->GetFloatDefault("Rate.Talent", 1.0f); if (rate_values[RATE_TALENT] < 0.0f) { - sLog->outError("Rate.Talent (%f) must be > 0. Using 1 instead.",rate_values[RATE_TALENT]); + sLog->outError("Rate.Talent (%f) must be > 0. Using 1 instead.", rate_values[RATE_TALENT]); rate_values[RATE_TALENT] = 1.0f; } - rate_values[RATE_MOVESPEED] = sConfig->GetFloatDefault("Rate.MoveSpeed",1.0f); + rate_values[RATE_MOVESPEED] = sConfig->GetFloatDefault("Rate.MoveSpeed", 1.0f); if (rate_values[RATE_MOVESPEED] < 0) { - sLog->outError("Rate.MoveSpeed (%f) must be > 0. Using 1 instead.",rate_values[RATE_MOVESPEED]); + sLog->outError("Rate.MoveSpeed (%f) must be > 0. Using 1 instead.", rate_values[RATE_MOVESPEED]); rate_values[RATE_MOVESPEED] = 1.0f; } for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) playerBaseMoveSpeed[i] = baseMoveSpeed[i] * rate_values[RATE_MOVESPEED]; - rate_values[RATE_CORPSE_DECAY_LOOTED] = sConfig->GetFloatDefault("Rate.Corpse.Decay.Looted",0.5f); + rate_values[RATE_CORPSE_DECAY_LOOTED] = sConfig->GetFloatDefault("Rate.Corpse.Decay.Looted", 0.5f); - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfig->GetFloatDefault("TargetPosRecalculateRange",1.5f); + rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfig->GetFloatDefault("TargetPosRecalculateRange", 1.5f); if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] < CONTACT_DISTANCE) { - sLog->outError("TargetPosRecalculateRange (%f) must be >= %f. Using %f instead.",rate_values[RATE_TARGET_POS_RECALCULATION_RANGE],CONTACT_DISTANCE,CONTACT_DISTANCE); + sLog->outError("TargetPosRecalculateRange (%f) must be >= %f. Using %f instead.", rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], CONTACT_DISTANCE, CONTACT_DISTANCE); rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = CONTACT_DISTANCE; } else if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] > NOMINAL_MELEE_RANGE) { sLog->outError("TargetPosRecalculateRange (%f) must be <= %f. Using %f instead.", - rate_values[RATE_TARGET_POS_RECALCULATION_RANGE],NOMINAL_MELEE_RANGE,NOMINAL_MELEE_RANGE); + rate_values[RATE_TARGET_POS_RECALCULATION_RANGE], NOMINAL_MELEE_RANGE, NOMINAL_MELEE_RANGE); rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = NOMINAL_MELEE_RANGE; } rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = sConfig->GetFloatDefault("DurabilityLoss.OnDeath", 10.0f); if (rate_values[RATE_DURABILITY_LOSS_ON_DEATH] < 0.0f) { - sLog->outError("DurabilityLoss.OnDeath (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_ON_DEATH]); + sLog->outError("DurabilityLoss.OnDeath (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_DURABILITY_LOSS_ON_DEATH]); rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = 0.0f; } if (rate_values[RATE_DURABILITY_LOSS_ON_DEATH] > 100.0f) { - sLog->outError("DurabilityLoss.OnDeath (%f) must be <= 100. Using 100.0 instead.",rate_values[RATE_DURABILITY_LOSS_ON_DEATH]); + sLog->outError("DurabilityLoss.OnDeath (%f) must be <= 100. Using 100.0 instead.", rate_values[RATE_DURABILITY_LOSS_ON_DEATH]); rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = 0.0f; } rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = rate_values[RATE_DURABILITY_LOSS_ON_DEATH] / 100.0f; - rate_values[RATE_DURABILITY_LOSS_DAMAGE] = sConfig->GetFloatDefault("DurabilityLossChance.Damage",0.5f); + rate_values[RATE_DURABILITY_LOSS_DAMAGE] = sConfig->GetFloatDefault("DurabilityLossChance.Damage", 0.5f); if (rate_values[RATE_DURABILITY_LOSS_DAMAGE] < 0.0f) { - sLog->outError("DurabilityLossChance.Damage (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_DAMAGE]); + sLog->outError("DurabilityLossChance.Damage (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_DURABILITY_LOSS_DAMAGE]); rate_values[RATE_DURABILITY_LOSS_DAMAGE] = 0.0f; } - rate_values[RATE_DURABILITY_LOSS_ABSORB] = sConfig->GetFloatDefault("DurabilityLossChance.Absorb",0.5f); + rate_values[RATE_DURABILITY_LOSS_ABSORB] = sConfig->GetFloatDefault("DurabilityLossChance.Absorb", 0.5f); if (rate_values[RATE_DURABILITY_LOSS_ABSORB] < 0.0f) { - sLog->outError("DurabilityLossChance.Absorb (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_ABSORB]); + sLog->outError("DurabilityLossChance.Absorb (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_DURABILITY_LOSS_ABSORB]); rate_values[RATE_DURABILITY_LOSS_ABSORB] = 0.0f; } - rate_values[RATE_DURABILITY_LOSS_PARRY] = sConfig->GetFloatDefault("DurabilityLossChance.Parry",0.05f); + rate_values[RATE_DURABILITY_LOSS_PARRY] = sConfig->GetFloatDefault("DurabilityLossChance.Parry", 0.05f); if (rate_values[RATE_DURABILITY_LOSS_PARRY] < 0.0f) { - sLog->outError("DurabilityLossChance.Parry (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_PARRY]); + sLog->outError("DurabilityLossChance.Parry (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_DURABILITY_LOSS_PARRY]); rate_values[RATE_DURABILITY_LOSS_PARRY] = 0.0f; } - rate_values[RATE_DURABILITY_LOSS_BLOCK] = sConfig->GetFloatDefault("DurabilityLossChance.Block",0.05f); + rate_values[RATE_DURABILITY_LOSS_BLOCK] = sConfig->GetFloatDefault("DurabilityLossChance.Block", 0.05f); if (rate_values[RATE_DURABILITY_LOSS_BLOCK] < 0.0f) { - sLog->outError("DurabilityLossChance.Block (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_BLOCK]); + sLog->outError("DurabilityLossChance.Block (%f) must be >=0. Using 0.0 instead.", rate_values[RATE_DURABILITY_LOSS_BLOCK]); rate_values[RATE_DURABILITY_LOSS_BLOCK] = 0.0f; } ///- Read other configuration items from the config file @@ -564,7 +564,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_COMPRESSION] = sConfig->GetIntDefault("Compression", 1); if (m_int_configs[CONFIG_COMPRESSION] < 1 || m_int_configs[CONFIG_COMPRESSION] > 9) { - sLog->outError("Compression level (%i) must be in range 1..9. Using default compression level (1).",m_int_configs[CONFIG_COMPRESSION]); + sLog->outError("Compression level (%i) must be in range 1..9. Using default compression level (1).", m_int_configs[CONFIG_COMPRESSION]); m_int_configs[CONFIG_COMPRESSION] = 1; } m_bool_configs[CONFIG_ADDON_CHANNEL] = sConfig->GetBoolDefault("AddonChannel", true); @@ -588,14 +588,14 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE] = sConfig->GetIntDefault("PlayerSave.Stats.MinLevel", 0); if (m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE] > MAX_LEVEL) { - sLog->outError("PlayerSave.Stats.MinLevel (%i) must be in range 0..80. Using default, do not save character stats (0).",m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE]); + sLog->outError("PlayerSave.Stats.MinLevel (%i) must be in range 0..80. Using default, do not save character stats (0).", m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE]); m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE] = 0; } m_int_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig->GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILLISECONDS); if (m_int_configs[CONFIG_INTERVAL_GRIDCLEAN] < MIN_GRID_DELAY) { - sLog->outError("GridCleanUpDelay (%i) must be greater %u. Use this minimal value.",m_int_configs[CONFIG_INTERVAL_GRIDCLEAN],MIN_GRID_DELAY); + sLog->outError("GridCleanUpDelay (%i) must be greater %u. Use this minimal value.", m_int_configs[CONFIG_INTERVAL_GRIDCLEAN], MIN_GRID_DELAY); m_int_configs[CONFIG_INTERVAL_GRIDCLEAN] = MIN_GRID_DELAY; } if (reload) @@ -604,7 +604,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_INTERVAL_MAPUPDATE] = sConfig->GetIntDefault("MapUpdateInterval", 100); if (m_int_configs[CONFIG_INTERVAL_MAPUPDATE] < MIN_MAP_UPDATE_DELAY) { - sLog->outError("MapUpdateInterval (%i) must be greater %u. Use this minimal value.",m_int_configs[CONFIG_INTERVAL_MAPUPDATE],MIN_MAP_UPDATE_DELAY); + sLog->outError("MapUpdateInterval (%i) must be greater %u. Use this minimal value.", m_int_configs[CONFIG_INTERVAL_MAPUPDATE], MIN_MAP_UPDATE_DELAY); m_int_configs[CONFIG_INTERVAL_MAPUPDATE] = MIN_MAP_UPDATE_DELAY; } if (reload) @@ -616,7 +616,7 @@ void World::LoadConfigSettings(bool reload) { uint32 val = sConfig->GetIntDefault("WorldServerPort", 8085); if (val != m_int_configs[CONFIG_PORT_WORLD]) - sLog->outError("WorldServerPort option can't be changed at worldserver.conf reload, using current value (%u).",m_int_configs[CONFIG_PORT_WORLD]); + sLog->outError("WorldServerPort option can't be changed at worldserver.conf reload, using current value (%u).", m_int_configs[CONFIG_PORT_WORLD]); } else m_int_configs[CONFIG_PORT_WORLD] = sConfig->GetIntDefault("WorldServerPort", 8085); @@ -635,7 +635,7 @@ void World::LoadConfigSettings(bool reload) { uint32 val = sConfig->GetIntDefault("GameType", 0); if (val != m_int_configs[CONFIG_GAME_TYPE]) - sLog->outError("GameType option can't be changed at worldserver.conf reload, using current value (%u).",m_int_configs[CONFIG_GAME_TYPE]); + sLog->outError("GameType option can't be changed at worldserver.conf reload, using current value (%u).", m_int_configs[CONFIG_GAME_TYPE]); } else m_int_configs[CONFIG_GAME_TYPE] = sConfig->GetIntDefault("GameType", 0); @@ -644,18 +644,18 @@ void World::LoadConfigSettings(bool reload) { uint32 val = sConfig->GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT); if (val != m_int_configs[CONFIG_REALM_ZONE]) - sLog->outError("RealmZone option can't be changed at worldserver.conf reload, using current value (%u).",m_int_configs[CONFIG_REALM_ZONE]); + sLog->outError("RealmZone option can't be changed at worldserver.conf reload, using current value (%u).", m_int_configs[CONFIG_REALM_ZONE]); } else m_int_configs[CONFIG_REALM_ZONE] = sConfig->GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT); m_bool_configs[CONFIG_ALLOW_TWO_SIDE_ACCOUNTS] = sConfig->GetBoolDefault("AllowTwoSide.Accounts", true); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Chat",false); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Channel",false); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Group",false); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Guild",false); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Auction",false); - m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_MAIL] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Mail",false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Chat", false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Channel", false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Group", false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Guild", false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Auction", false); + m_bool_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_MAIL] = sConfig->GetBoolDefault("AllowTwoSide.Interaction.Mail", false); m_bool_configs[CONFIG_ALLOW_TWO_SIDE_WHO_LIST] = sConfig->GetBoolDefault("AllowTwoSide.WhoList", false); m_bool_configs[CONFIG_ALLOW_TWO_SIDE_ADD_FRIEND] = sConfig->GetBoolDefault("AllowTwoSide.AddFriend", false); m_bool_configs[CONFIG_ALLOW_TWO_SIDE_TRADE] = sConfig->GetBoolDefault("AllowTwoSide.trade", false); @@ -666,21 +666,21 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_MIN_PLAYER_NAME] = sConfig->GetIntDefault ("MinPlayerName", 2); if (m_int_configs[CONFIG_MIN_PLAYER_NAME] < 1 || m_int_configs[CONFIG_MIN_PLAYER_NAME] > MAX_PLAYER_NAME) { - sLog->outError("MinPlayerName (%i) must be in range 1..%u. Set to 2.",m_int_configs[CONFIG_MIN_PLAYER_NAME],MAX_PLAYER_NAME); + sLog->outError("MinPlayerName (%i) must be in range 1..%u. Set to 2.", m_int_configs[CONFIG_MIN_PLAYER_NAME], MAX_PLAYER_NAME); m_int_configs[CONFIG_MIN_PLAYER_NAME] = 2; } m_int_configs[CONFIG_MIN_CHARTER_NAME] = sConfig->GetIntDefault ("MinCharterName", 2); if (m_int_configs[CONFIG_MIN_CHARTER_NAME] < 1 || m_int_configs[CONFIG_MIN_CHARTER_NAME] > MAX_CHARTER_NAME) { - sLog->outError("MinCharterName (%i) must be in range 1..%u. Set to 2.",m_int_configs[CONFIG_MIN_CHARTER_NAME],MAX_CHARTER_NAME); + sLog->outError("MinCharterName (%i) must be in range 1..%u. Set to 2.", m_int_configs[CONFIG_MIN_CHARTER_NAME], MAX_CHARTER_NAME); m_int_configs[CONFIG_MIN_CHARTER_NAME] = 2; } m_int_configs[CONFIG_MIN_PET_NAME] = sConfig->GetIntDefault ("MinPetName", 2); if (m_int_configs[CONFIG_MIN_PET_NAME] < 1 || m_int_configs[CONFIG_MIN_PET_NAME] > MAX_PET_NAME) { - sLog->outError("MinPetName (%i) must be in range 1..%u. Set to 2.",m_int_configs[CONFIG_MIN_PET_NAME],MAX_PET_NAME); + sLog->outError("MinPetName (%i) must be in range 1..%u. Set to 2.", m_int_configs[CONFIG_MIN_PET_NAME], MAX_PET_NAME); m_int_configs[CONFIG_MIN_PET_NAME] = 2; } @@ -691,7 +691,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CHARACTERS_PER_REALM] = sConfig->GetIntDefault("CharactersPerRealm", 10); if (m_int_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_int_configs[CONFIG_CHARACTERS_PER_REALM] > 10) { - sLog->outError("CharactersPerRealm (%i) must be in range 1..10. Set to 10.",m_int_configs[CONFIG_CHARACTERS_PER_REALM]); + sLog->outError("CharactersPerRealm (%i) must be in range 1..10. Set to 10.", m_int_configs[CONFIG_CHARACTERS_PER_REALM]); m_int_configs[CONFIG_CHARACTERS_PER_REALM] = 10; } @@ -699,14 +699,14 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CHARACTERS_PER_ACCOUNT] = sConfig->GetIntDefault("CharactersPerAccount", 50); if (m_int_configs[CONFIG_CHARACTERS_PER_ACCOUNT] < m_int_configs[CONFIG_CHARACTERS_PER_REALM]) { - sLog->outError("CharactersPerAccount (%i) can't be less than CharactersPerRealm (%i).",m_int_configs[CONFIG_CHARACTERS_PER_ACCOUNT],m_int_configs[CONFIG_CHARACTERS_PER_REALM]); + sLog->outError("CharactersPerAccount (%i) can't be less than CharactersPerRealm (%i).", m_int_configs[CONFIG_CHARACTERS_PER_ACCOUNT], m_int_configs[CONFIG_CHARACTERS_PER_REALM]); m_int_configs[CONFIG_CHARACTERS_PER_ACCOUNT] = m_int_configs[CONFIG_CHARACTERS_PER_REALM]; } m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = sConfig->GetIntDefault("HeroicCharactersPerRealm", 1); if (int32(m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]) < 0 || m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] > 10) { - sLog->outError("HeroicCharactersPerRealm (%i) must be in range 0..10. Set to 1.",m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]); + sLog->outError("HeroicCharactersPerRealm (%i) must be in range 0..10. Set to 1.", m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]); m_int_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = 1; } @@ -715,7 +715,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_SKIP_CINEMATICS] = sConfig->GetIntDefault("SkipCinematics", 0); if (int32(m_int_configs[CONFIG_SKIP_CINEMATICS]) < 0 || m_int_configs[CONFIG_SKIP_CINEMATICS] > 2) { - sLog->outError("SkipCinematics (%i) must be in range 0..2. Set to 0.",m_int_configs[CONFIG_SKIP_CINEMATICS]); + sLog->outError("SkipCinematics (%i) must be in range 0..2. Set to 0.", m_int_configs[CONFIG_SKIP_CINEMATICS]); m_int_configs[CONFIG_SKIP_CINEMATICS] = 0; } @@ -723,14 +723,14 @@ void World::LoadConfigSettings(bool reload) { uint32 val = sConfig->GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL); if (val != m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) - sLog->outError("MaxPlayerLevel option can't be changed at config reload, using current value (%u).",m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + sLog->outError("MaxPlayerLevel option can't be changed at config reload, using current value (%u).", m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); } else m_int_configs[CONFIG_MAX_PLAYER_LEVEL] = sConfig->GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL); if (m_int_configs[CONFIG_MAX_PLAYER_LEVEL] > MAX_LEVEL) { - sLog->outError("MaxPlayerLevel (%i) must be in range 1..%u. Set to %u.",m_int_configs[CONFIG_MAX_PLAYER_LEVEL],MAX_LEVEL,MAX_LEVEL); + sLog->outError("MaxPlayerLevel (%i) must be in range 1..%u. Set to %u.", m_int_configs[CONFIG_MAX_PLAYER_LEVEL], MAX_LEVEL, MAX_LEVEL); m_int_configs[CONFIG_MAX_PLAYER_LEVEL] = MAX_LEVEL; } @@ -739,12 +739,12 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_START_PLAYER_LEVEL] = sConfig->GetIntDefault("StartPlayerLevel", 1); if (m_int_configs[CONFIG_START_PLAYER_LEVEL] < 1) { - sLog->outError("StartPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to 1.",m_int_configs[CONFIG_START_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + sLog->outError("StartPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to 1.", m_int_configs[CONFIG_START_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); m_int_configs[CONFIG_START_PLAYER_LEVEL] = 1; } else if (m_int_configs[CONFIG_START_PLAYER_LEVEL] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) { - sLog->outError("StartPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to %u.",m_int_configs[CONFIG_START_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + sLog->outError("StartPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to %u.", m_int_configs[CONFIG_START_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); m_int_configs[CONFIG_START_PLAYER_LEVEL] = m_int_configs[CONFIG_MAX_PLAYER_LEVEL]; } @@ -752,33 +752,33 @@ void World::LoadConfigSettings(bool reload) if (m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] < 1) { sLog->outError("StartHeroicPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to 55.", - m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] = 55; } else if (m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) { sLog->outError("StartHeroicPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to %u.", - m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); m_int_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] = m_int_configs[CONFIG_MAX_PLAYER_LEVEL]; } m_int_configs[CONFIG_START_PLAYER_MONEY] = sConfig->GetIntDefault("StartPlayerMoney", 0); if (int32(m_int_configs[CONFIG_START_PLAYER_MONEY]) < 0) { - sLog->outError("StartPlayerMoney (%i) must be in range 0..%u. Set to %u.",m_int_configs[CONFIG_START_PLAYER_MONEY],MAX_MONEY_AMOUNT,0); + sLog->outError("StartPlayerMoney (%i) must be in range 0..%u. Set to %u.", m_int_configs[CONFIG_START_PLAYER_MONEY], MAX_MONEY_AMOUNT, 0); m_int_configs[CONFIG_START_PLAYER_MONEY] = 0; } else if (m_int_configs[CONFIG_START_PLAYER_MONEY] > MAX_MONEY_AMOUNT) { sLog->outError("StartPlayerMoney (%i) must be in range 0..%u. Set to %u.", - m_int_configs[CONFIG_START_PLAYER_MONEY],MAX_MONEY_AMOUNT,MAX_MONEY_AMOUNT); + m_int_configs[CONFIG_START_PLAYER_MONEY], MAX_MONEY_AMOUNT, MAX_MONEY_AMOUNT); m_int_configs[CONFIG_START_PLAYER_MONEY] = MAX_MONEY_AMOUNT; } m_int_configs[CONFIG_MAX_HONOR_POINTS] = sConfig->GetIntDefault("MaxHonorPoints", 75000); if (int32(m_int_configs[CONFIG_MAX_HONOR_POINTS]) < 0) { - sLog->outError("MaxHonorPoints (%i) can't be negative. Set to 0.",m_int_configs[CONFIG_MAX_HONOR_POINTS]); + sLog->outError("MaxHonorPoints (%i) can't be negative. Set to 0.", m_int_configs[CONFIG_MAX_HONOR_POINTS]); m_int_configs[CONFIG_MAX_HONOR_POINTS] = 0; } @@ -786,20 +786,20 @@ void World::LoadConfigSettings(bool reload) if (int32(m_int_configs[CONFIG_START_HONOR_POINTS]) < 0) { sLog->outError("StartHonorPoints (%i) must be in range 0..MaxHonorPoints(%u). Set to %u.", - m_int_configs[CONFIG_START_HONOR_POINTS],m_int_configs[CONFIG_MAX_HONOR_POINTS],0); + m_int_configs[CONFIG_START_HONOR_POINTS], m_int_configs[CONFIG_MAX_HONOR_POINTS], 0); m_int_configs[CONFIG_START_HONOR_POINTS] = 0; } else if (m_int_configs[CONFIG_START_HONOR_POINTS] > m_int_configs[CONFIG_MAX_HONOR_POINTS]) { sLog->outError("StartHonorPoints (%i) must be in range 0..MaxHonorPoints(%u). Set to %u.", - m_int_configs[CONFIG_START_HONOR_POINTS],m_int_configs[CONFIG_MAX_HONOR_POINTS],m_int_configs[CONFIG_MAX_HONOR_POINTS]); + m_int_configs[CONFIG_START_HONOR_POINTS], m_int_configs[CONFIG_MAX_HONOR_POINTS], m_int_configs[CONFIG_MAX_HONOR_POINTS]); m_int_configs[CONFIG_START_HONOR_POINTS] = m_int_configs[CONFIG_MAX_HONOR_POINTS]; } m_int_configs[CONFIG_MAX_ARENA_POINTS] = sConfig->GetIntDefault("MaxArenaPoints", 10000); if (int32(m_int_configs[CONFIG_MAX_ARENA_POINTS]) < 0) { - sLog->outError("MaxArenaPoints (%i) can't be negative. Set to 0.",m_int_configs[CONFIG_MAX_ARENA_POINTS]); + sLog->outError("MaxArenaPoints (%i) can't be negative. Set to 0.", m_int_configs[CONFIG_MAX_ARENA_POINTS]); m_int_configs[CONFIG_MAX_ARENA_POINTS] = 0; } @@ -807,13 +807,13 @@ void World::LoadConfigSettings(bool reload) if (int32(m_int_configs[CONFIG_START_ARENA_POINTS]) < 0) { sLog->outError("StartArenaPoints (%i) must be in range 0..MaxArenaPoints(%u). Set to %u.", - m_int_configs[CONFIG_START_ARENA_POINTS],m_int_configs[CONFIG_MAX_ARENA_POINTS],0); + m_int_configs[CONFIG_START_ARENA_POINTS], m_int_configs[CONFIG_MAX_ARENA_POINTS], 0); m_int_configs[CONFIG_START_ARENA_POINTS] = 0; } else if (m_int_configs[CONFIG_START_ARENA_POINTS] > m_int_configs[CONFIG_MAX_ARENA_POINTS]) { sLog->outError("StartArenaPoints (%i) must be in range 0..MaxArenaPoints(%u). Set to %u.", - m_int_configs[CONFIG_START_ARENA_POINTS],m_int_configs[CONFIG_MAX_ARENA_POINTS],m_int_configs[CONFIG_MAX_ARENA_POINTS]); + m_int_configs[CONFIG_START_ARENA_POINTS], m_int_configs[CONFIG_MAX_ARENA_POINTS], m_int_configs[CONFIG_MAX_ARENA_POINTS]); m_int_configs[CONFIG_START_ARENA_POINTS] = m_int_configs[CONFIG_MAX_ARENA_POINTS]; } @@ -821,7 +821,7 @@ void World::LoadConfigSettings(bool reload) if (m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) { sLog->outError("RecruitAFriend.MaxLevel (%i) must be in the range 0..MaxLevel(%u). Set to %u.", - m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL],m_int_configs[CONFIG_MAX_PLAYER_LEVEL],60); + m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL], 60); m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL] = 60; } @@ -856,7 +856,7 @@ void World::LoadConfigSettings(bool reload) if (m_int_configs[CONFIG_START_GM_LEVEL] < m_int_configs[CONFIG_START_PLAYER_LEVEL]) { sLog->outError("GM.StartLevel (%i) must be in range StartPlayerLevel(%u)..%u. Set to %u.", - m_int_configs[CONFIG_START_GM_LEVEL],m_int_configs[CONFIG_START_PLAYER_LEVEL], MAX_LEVEL, m_int_configs[CONFIG_START_PLAYER_LEVEL]); + m_int_configs[CONFIG_START_GM_LEVEL], m_int_configs[CONFIG_START_PLAYER_LEVEL], MAX_LEVEL, m_int_configs[CONFIG_START_PLAYER_LEVEL]); m_int_configs[CONFIG_START_GM_LEVEL] = m_int_configs[CONFIG_START_PLAYER_LEVEL]; } else if (m_int_configs[CONFIG_START_GM_LEVEL] > MAX_LEVEL) @@ -872,12 +872,12 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_GROUP_VISIBILITY] = sConfig->GetIntDefault("Visibility.GroupMode", 1); - m_int_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfig->GetIntDefault("MailDeliveryDelay",HOUR); + m_int_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfig->GetIntDefault("MailDeliveryDelay", HOUR); m_int_configs[CONFIG_UPTIME_UPDATE] = sConfig->GetIntDefault("UpdateUptimeInterval", 10); if (int32(m_int_configs[CONFIG_UPTIME_UPDATE]) <= 0) { - sLog->outError("UpdateUptimeInterval (%i) must be > 0, set to default 10.",m_int_configs[CONFIG_UPTIME_UPDATE]); + sLog->outError("UpdateUptimeInterval (%i) must be > 0, set to default 10.", m_int_configs[CONFIG_UPTIME_UPDATE]); m_int_configs[CONFIG_UPTIME_UPDATE] = 10; } if (reload) @@ -902,16 +902,16 @@ void World::LoadConfigSettings(bool reload) sLog->outString("Will clear `logs` table of entries older than %i seconds every %u minutes.", m_int_configs[CONFIG_LOGDB_CLEARTIME], m_int_configs[CONFIG_LOGDB_CLEARINTERVAL]); - m_int_configs[CONFIG_SKILL_CHANCE_ORANGE] = sConfig->GetIntDefault("SkillChance.Orange",100); - m_int_configs[CONFIG_SKILL_CHANCE_YELLOW] = sConfig->GetIntDefault("SkillChance.Yellow",75); - m_int_configs[CONFIG_SKILL_CHANCE_GREEN] = sConfig->GetIntDefault("SkillChance.Green",25); - m_int_configs[CONFIG_SKILL_CHANCE_GREY] = sConfig->GetIntDefault("SkillChance.Grey",0); + m_int_configs[CONFIG_SKILL_CHANCE_ORANGE] = sConfig->GetIntDefault("SkillChance.Orange", 100); + m_int_configs[CONFIG_SKILL_CHANCE_YELLOW] = sConfig->GetIntDefault("SkillChance.Yellow", 75); + m_int_configs[CONFIG_SKILL_CHANCE_GREEN] = sConfig->GetIntDefault("SkillChance.Green", 25); + m_int_configs[CONFIG_SKILL_CHANCE_GREY] = sConfig->GetIntDefault("SkillChance.Grey", 0); - m_int_configs[CONFIG_SKILL_CHANCE_MINING_STEPS] = sConfig->GetIntDefault("SkillChance.MiningSteps",75); - m_int_configs[CONFIG_SKILL_CHANCE_SKINNING_STEPS] = sConfig->GetIntDefault("SkillChance.SkinningSteps",75); + m_int_configs[CONFIG_SKILL_CHANCE_MINING_STEPS] = sConfig->GetIntDefault("SkillChance.MiningSteps", 75); + m_int_configs[CONFIG_SKILL_CHANCE_SKINNING_STEPS] = sConfig->GetIntDefault("SkillChance.SkinningSteps", 75); - m_bool_configs[CONFIG_SKILL_PROSPECTING] = sConfig->GetBoolDefault("SkillChance.Prospecting",false); - m_bool_configs[CONFIG_SKILL_MILLING] = sConfig->GetBoolDefault("SkillChance.Milling",false); + m_bool_configs[CONFIG_SKILL_PROSPECTING] = sConfig->GetBoolDefault("SkillChance.Prospecting", false); + m_bool_configs[CONFIG_SKILL_MILLING] = sConfig->GetBoolDefault("SkillChance.Milling", false); m_int_configs[CONFIG_SKILL_GAIN_CRAFTING] = sConfig->GetIntDefault("SkillGain.Crafting", 1); @@ -921,15 +921,15 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_SKILL_GAIN_WEAPON] = sConfig->GetIntDefault("SkillGain.Weapon", 1); - m_int_configs[CONFIG_MAX_OVERSPEED_PINGS] = sConfig->GetIntDefault("MaxOverspeedPings",2); + m_int_configs[CONFIG_MAX_OVERSPEED_PINGS] = sConfig->GetIntDefault("MaxOverspeedPings", 2); if (m_int_configs[CONFIG_MAX_OVERSPEED_PINGS] != 0 && m_int_configs[CONFIG_MAX_OVERSPEED_PINGS] < 2) { - sLog->outError("MaxOverspeedPings (%i) must be in range 2..infinity (or 0 to disable check). Set to 2.",m_int_configs[CONFIG_MAX_OVERSPEED_PINGS]); + sLog->outError("MaxOverspeedPings (%i) must be in range 2..infinity (or 0 to disable check). Set to 2.", m_int_configs[CONFIG_MAX_OVERSPEED_PINGS]); m_int_configs[CONFIG_MAX_OVERSPEED_PINGS] = 2; } - m_bool_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY] = sConfig->GetBoolDefault("SaveRespawnTimeImmediately",true); - m_bool_configs[CONFIG_WEATHER] = sConfig->GetBoolDefault("ActivateWeather",true); + m_bool_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY] = sConfig->GetBoolDefault("SaveRespawnTimeImmediately", true); + m_bool_configs[CONFIG_WEATHER] = sConfig->GetBoolDefault("ActivateWeather", true); m_int_configs[CONFIG_DISABLE_BREATHING] = sConfig->GetIntDefault("DisableWaterBreath", SEC_CONSOLE); @@ -937,25 +937,25 @@ void World::LoadConfigSettings(bool reload) if (reload) { - uint32 val = sConfig->GetIntDefault("Expansion",1); + uint32 val = sConfig->GetIntDefault("Expansion", 1); if (val != m_int_configs[CONFIG_EXPANSION]) - sLog->outError("Expansion option can't be changed at worldserver.conf reload, using current value (%u).",m_int_configs[CONFIG_EXPANSION]); + sLog->outError("Expansion option can't be changed at worldserver.conf reload, using current value (%u).", m_int_configs[CONFIG_EXPANSION]); } else - m_int_configs[CONFIG_EXPANSION] = sConfig->GetIntDefault("Expansion",1); + m_int_configs[CONFIG_EXPANSION] = sConfig->GetIntDefault("Expansion", 1); - m_int_configs[CONFIG_CHATFLOOD_MESSAGE_COUNT] = sConfig->GetIntDefault("ChatFlood.MessageCount",10); - m_int_configs[CONFIG_CHATFLOOD_MESSAGE_DELAY] = sConfig->GetIntDefault("ChatFlood.MessageDelay",1); - m_int_configs[CONFIG_CHATFLOOD_MUTE_TIME] = sConfig->GetIntDefault("ChatFlood.MuteTime",10); + m_int_configs[CONFIG_CHATFLOOD_MESSAGE_COUNT] = sConfig->GetIntDefault("ChatFlood.MessageCount", 10); + m_int_configs[CONFIG_CHATFLOOD_MESSAGE_DELAY] = sConfig->GetIntDefault("ChatFlood.MessageDelay", 1); + m_int_configs[CONFIG_CHATFLOOD_MUTE_TIME] = sConfig->GetIntDefault("ChatFlood.MuteTime", 10); - m_int_configs[CONFIG_EVENT_ANNOUNCE] = sConfig->GetIntDefault("Event.Announce",0); + m_int_configs[CONFIG_EVENT_ANNOUNCE] = sConfig->GetIntDefault("Event.Announce", 0); - m_float_configs[CONFIG_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS] = sConfig->GetFloatDefault("CreatureFamilyFleeAssistanceRadius",30.0f); - m_float_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS] = sConfig->GetFloatDefault("CreatureFamilyAssistanceRadius",10.0f); - m_int_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY] = sConfig->GetIntDefault("CreatureFamilyAssistanceDelay",1500); - m_int_configs[CONFIG_CREATURE_FAMILY_FLEE_DELAY] = sConfig->GetIntDefault("CreatureFamilyFleeDelay",7000); + m_float_configs[CONFIG_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS] = sConfig->GetFloatDefault("CreatureFamilyFleeAssistanceRadius", 30.0f); + m_float_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS] = sConfig->GetFloatDefault("CreatureFamilyAssistanceRadius", 10.0f); + m_int_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY] = sConfig->GetIntDefault("CreatureFamilyAssistanceDelay", 1500); + m_int_configs[CONFIG_CREATURE_FAMILY_FLEE_DELAY] = sConfig->GetIntDefault("CreatureFamilyFleeDelay", 7000); - m_int_configs[CONFIG_WORLD_BOSS_LEVEL_DIFF] = sConfig->GetIntDefault("WorldBossLevelDiff",3); + m_int_configs[CONFIG_WORLD_BOSS_LEVEL_DIFF] = sConfig->GetIntDefault("WorldBossLevelDiff", 3); // note: disable value (-1) will assigned as 0xFFFFFFF, to prevent overflow at calculations limit it to max possible player level MAX_LEVEL(100) m_int_configs[CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF] = sConfig->GetIntDefault("Quests.LowLevelHideDiff", 4); @@ -1059,7 +1059,7 @@ void World::LoadConfigSettings(bool reload) } else if (m_MaxVisibleDistanceOnContinents > MAX_VISIBILITY_DISTANCE) { - sLog->outError("Visibility.Distance.Continents can't be greater %f",MAX_VISIBILITY_DISTANCE); + sLog->outError("Visibility.Distance.Continents can't be greater %f", MAX_VISIBILITY_DISTANCE); m_MaxVisibleDistanceOnContinents = MAX_VISIBILITY_DISTANCE; } @@ -1067,12 +1067,12 @@ void World::LoadConfigSettings(bool reload) m_MaxVisibleDistanceInInstances = sConfig->GetFloatDefault("Visibility.Distance.Instances", DEFAULT_VISIBILITY_INSTANCE); if (m_MaxVisibleDistanceInInstances < 45*sWorld->getRate(RATE_CREATURE_AGGRO)) { - sLog->outError("Visibility.Distance.Instances can't be less max aggro radius %f",45*sWorld->getRate(RATE_CREATURE_AGGRO)); + sLog->outError("Visibility.Distance.Instances can't be less max aggro radius %f", 45*sWorld->getRate(RATE_CREATURE_AGGRO)); m_MaxVisibleDistanceInInstances = 45*sWorld->getRate(RATE_CREATURE_AGGRO); } else if (m_MaxVisibleDistanceInInstances > MAX_VISIBILITY_DISTANCE) { - sLog->outError("Visibility.Distance.Instances can't be greater %f",MAX_VISIBILITY_DISTANCE); + sLog->outError("Visibility.Distance.Instances can't be greater %f", MAX_VISIBILITY_DISTANCE); m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE; } @@ -1080,12 +1080,12 @@ void World::LoadConfigSettings(bool reload) m_MaxVisibleDistanceInBGArenas = sConfig->GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS); if (m_MaxVisibleDistanceInBGArenas < 45*sWorld->getRate(RATE_CREATURE_AGGRO)) { - sLog->outError("Visibility.Distance.BGArenas can't be less max aggro radius %f",45*sWorld->getRate(RATE_CREATURE_AGGRO)); + sLog->outError("Visibility.Distance.BGArenas can't be less max aggro radius %f", 45*sWorld->getRate(RATE_CREATURE_AGGRO)); m_MaxVisibleDistanceInBGArenas = 45*sWorld->getRate(RATE_CREATURE_AGGRO); } else if (m_MaxVisibleDistanceInBGArenas > MAX_VISIBILITY_DISTANCE) { - sLog->outError("Visibility.Distance.BGArenas can't be greater %f",MAX_VISIBILITY_DISTANCE); + sLog->outError("Visibility.Distance.BGArenas can't be greater %f", MAX_VISIBILITY_DISTANCE); m_MaxVisibleDistanceInBGArenas = MAX_VISIBILITY_DISTANCE; } @@ -1099,19 +1099,19 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CHARDELETE_KEEP_DAYS] = sConfig->GetIntDefault("CharDelete.KeepDays", 30); ///- Read the "Data" directory from the config file - std::string dataPath = sConfig->GetStringDefault("DataDir","./"); + std::string dataPath = sConfig->GetStringDefault("DataDir", "./"); if (dataPath.at(dataPath.length()-1) != '/' && dataPath.at(dataPath.length()-1) != '\\') dataPath.append("/"); if (reload) { if (dataPath != m_dataPath) - sLog->outError("DataDir option can't be changed at worldserver.conf reload, using current value (%s).",m_dataPath.c_str()); + sLog->outError("DataDir option can't be changed at worldserver.conf reload, using current value (%s).", m_dataPath.c_str()); } else { m_dataPath = dataPath; - sLog->outString("Using DataDir %s",m_dataPath.c_str()); + sLog->outString("Using DataDir %s", m_dataPath.c_str()); } m_bool_configs[CONFIG_VMAP_INDOOR_CHECK] = sConfig->GetBoolDefault("vmap.enableIndoorCheck", 0); @@ -1128,7 +1128,7 @@ void World::LoadConfigSettings(bool reload) VMAP::VMapFactory::createOrGetVMapManager()->setEnableHeightCalc(enableHeight); VMAP::VMapFactory::preventSpellsFromBeingTestedForLoS(ignoreSpellIds.c_str()); sLog->outString("WORLD: VMap support included. LineOfSight:%i, getHeight:%i, indoorCheck:%i PetLOS:%i", enableLOS, enableHeight, enableIndoor, enablePetLOS); - sLog->outString("WORLD: VMap data directory is: %svmaps",m_dataPath.c_str()); + sLog->outString("WORLD: VMap data directory is: %svmaps", m_dataPath.c_str()); m_int_configs[CONFIG_MAX_WHO] = sConfig->GetIntDefault("MaxWhoListReturns", 49); m_bool_configs[CONFIG_PET_LOS] = sConfig->GetBoolDefault("vmap.petLOS", true); @@ -1203,17 +1203,17 @@ void World::SetInitialWorldSettings() sObjectMgr->SetHighestGuids(); ///- Check the existence of the map files for all races' startup areas. - if (!MapManager::ExistMapAndVMap(0,-6240.32f, 331.033f) - || !MapManager::ExistMapAndVMap(0,-8949.95f,-132.493f) - || !MapManager::ExistMapAndVMap(1,-618.518f,-4251.67f) + if (!MapManager::ExistMapAndVMap(0, -6240.32f, 331.033f) + || !MapManager::ExistMapAndVMap(0, -8949.95f, -132.493f) + || !MapManager::ExistMapAndVMap(1, -618.518f, -4251.67f) || !MapManager::ExistMapAndVMap(0, 1676.35f, 1677.45f) || !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f) - || !MapManager::ExistMapAndVMap(1,-2917.58f,-257.98f) + || !MapManager::ExistMapAndVMap(1, -2917.58f, -257.98f) || (m_int_configs[CONFIG_EXPANSION] && ( - !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || - !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f)))) + !MapManager::ExistMapAndVMap(530, 10349.6f, -6357.29f) || + !MapManager::ExistMapAndVMap(530, -3961.64f, -13931.2f)))) { - sLog->outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.",m_dataPath.c_str(),m_dataPath.c_str()); + sLog->outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.", m_dataPath.c_str(), m_dataPath.c_str()); exit(1); } @@ -1767,7 +1767,7 @@ void World::DetectDBCLang() m_defaultDbcLocale = LocaleConstant(default_locale); - sLog->outString("Using %s DBC Locale as default. All available DBC locales: %s",localeNames[m_defaultDbcLocale],availableLocalsStr.empty() ? "<none>" : availableLocalsStr.c_str()); + sLog->outString("Using %s DBC Locale as default. All available DBC locales: %s", localeNames[m_defaultDbcLocale], availableLocalsStr.empty() ? "<none>" : availableLocalsStr.c_str()); sLog->outString(); } @@ -1925,7 +1925,7 @@ void World::Update(uint32 diff) } /// <li> Handle all other objects - ///- Update objects when the timer has passed (maps, transport, creatures,...) + ///- Update objects when the timer has passed (maps, transport, creatures, ...) sMapMgr->Update(diff); if (sWorld->getBoolConfig(CONFIG_AUTOBROADCAST)) @@ -2044,7 +2044,7 @@ namespace Trinity explicit WorldWorldTextBuilder(int32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) {} void operator()(WorldPacketList& data_list, LocaleConstant loc_idx) { - char const* text = sObjectMgr->GetTrinityString(i_textId,loc_idx); + char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); if (i_args) { @@ -2174,7 +2174,7 @@ void World::SendZoneText(uint32 zone, const char* text, WorldSession *self, uint { WorldPacket data; ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, NULL, 0, text, NULL); - SendZoneMessage(zone, &data, self,team); + SendZoneMessage(zone, &data, self, team); } /// Kick (and save) all players @@ -2451,8 +2451,8 @@ void World::ShutdownMsg(bool show, Player* player) ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME; - SendServerMessage(msgid,str.c_str(),player); - sLog->outStaticDebug("Server is %s in %s",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"),str.c_str()); + SendServerMessage(msgid, str.c_str(), player); + sLog->outStaticDebug("Server is %s in %s", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"), str.c_str()); } } @@ -2470,7 +2470,7 @@ void World::ShutdownCancel() m_ExitCode = SHUTDOWN_EXIT_CODE; // to default value SendServerMessage(msgid); - sLog->outStaticDebug("Server %s cancelled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown")); + sLog->outStaticDebug("Server %s cancelled.", (m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown")); sScriptMgr->OnShutdownCancel(); } @@ -2569,7 +2569,7 @@ void World::SendAutoBroadcast() sWorld->SendGlobalMessage(&data); } - sLog->outDetail("AutoBroadcast: '%s'",msg.c_str()); + sLog->outDetail("AutoBroadcast: '%s'", msg.c_str()); } void World::UpdateRealmCharCount(uint32 accountId) @@ -2725,8 +2725,8 @@ void World::ResetRandomBG() void World::UpdateMaxSessionCounters() { - m_maxActiveSessionCount = std::max(m_maxActiveSessionCount,uint32(m_sessions.size()-m_QueuedPlayer.size())); - m_maxQueuedSessionCount = std::max(m_maxQueuedSessionCount,uint32(m_QueuedPlayer.size())); + m_maxActiveSessionCount = std::max(m_maxActiveSessionCount, uint32(m_sessions.size()-m_QueuedPlayer.size())); + m_maxQueuedSessionCount = std::max(m_maxQueuedSessionCount, uint32(m_QueuedPlayer.size())); } void World::LoadDBVersion() @@ -2804,7 +2804,7 @@ void World::setWorldState(uint32 index, uint64 value) if (it != m_worldstates.end()) CharacterDatabase.PExecute("UPDATE worldstates SET value="UI64FMTD" where entry=%u", value, index); else - CharacterDatabase.PExecute("INSERT INTO worldstates (entry, value) VALUES (%u,"UI64FMTD")", index, value); + CharacterDatabase.PExecute("INSERT INTO worldstates (entry, value) VALUES (%u, "UI64FMTD")", index, value); m_worldstates[index] = value; } diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index b793325b17b..5a6f85a8b1e 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -637,7 +637,7 @@ class World void UpdateSessions(uint32 diff); /// Set a server rate (see #Rates) - void setRate(Rates rate,float value) { rate_values[rate]=value; } + void setRate(Rates rate, float value) { rate_values[rate]=value; } /// Get a server rate (see #Rates) float getRate(Rates rate) const { return rate_values[rate]; } @@ -668,7 +668,7 @@ class World } /// Set a server configuration element (see #WorldConfigs) - void setIntConfig(WorldIntConfigs index,uint32 value) + void setIntConfig(WorldIntConfigs index, uint32 value) { if (index < INT_CONFIG_VALUE_COUNT) m_int_configs[index] = value; @@ -776,7 +776,7 @@ class World uint32 m_int_configs[INT_CONFIG_VALUE_COUNT]; bool m_bool_configs[BOOL_CONFIG_VALUE_COUNT]; float m_float_configs[FLOAT_CONFIG_VALUE_COUNT]; - typedef std::map<uint32,uint64> WorldStatesMap; + typedef std::map<uint32, uint64> WorldStatesMap; WorldStatesMap m_worldstates; uint32 m_playerLimit; AccountTypes m_allowedSecurityLevel; @@ -797,7 +797,7 @@ class World static int32 m_visibility_notify_periodInBGArenas; // CLI command holder to be thread safe - ACE_Based::LockedQueue<CliCommandHolder*,ACE_Thread_Mutex> cliCmdQueue; + ACE_Based::LockedQueue<CliCommandHolder*, ACE_Thread_Mutex> cliCmdQueue; // next daily quests and random bg reset time time_t m_NextDailyQuestReset; diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 59abb8fa3a4..e5981b649be 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -107,7 +107,7 @@ public: switch(result) { case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_CREATED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); break; case AOR_NAME_TOO_LONG: handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG); @@ -118,11 +118,11 @@ public: handler->SetSentErrorMessage(true); return false; case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, account_name.c_str()); handler->SetSentErrorMessage(true); return false; default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -138,14 +138,14 @@ public: return false; ///- Get the account name from the command line - char *account_name_str=strtok ((char*)args," "); + char *account_name_str=strtok ((char*)args, " "); if (!account_name_str) return false; std::string account_name = account_name_str; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -153,7 +153,7 @@ public: uint32 account_id = sAccountMgr->GetId(account_name); if (!account_id) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -161,25 +161,25 @@ public: /// Commands not recommended call from chat, but support anyway /// can delete only for account with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL,account_id,true)) + if (handler->HasLowerSecurityAccount (NULL, account_id, true)) return false; AccountOpResult result = sAccountMgr->DeleteAccount(account_id); switch(result) { case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_DELETED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); break; case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, account_name.c_str()); handler->SetSentErrorMessage(true); return false; default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -191,7 +191,7 @@ public: static bool HandleAccountOnlineListCommand(ChatHandler* handler, const char* /*args*/) { ///- Get the list of accounts ID logged to the realm - QueryResult resultDB = CharacterDatabase.Query("SELECT name,account,map,zone FROM characters WHERE online > 0"); + QueryResult resultDB = CharacterDatabase.Query("SELECT name, account, map, zone FROM characters WHERE online > 0"); if (!resultDB) { handler->SendSysMessage(LANG_ACCOUNT_LIST_EMPTY); @@ -222,10 +222,10 @@ public: { Field *fieldsLogin = resultLogin->Fetch(); handler->PSendSysMessage(LANG_ACCOUNT_LIST_LINE, - fieldsLogin[0].GetCString(),name.c_str(),fieldsLogin[1].GetCString(),fieldsDB[2].GetUInt16(),fieldsDB[3].GetUInt16(),fieldsLogin[3].GetUInt32(),fieldsLogin[2].GetUInt32()); + fieldsLogin[0].GetCString(), name.c_str(), fieldsLogin[1].GetCString(), fieldsDB[2].GetUInt16(), fieldsDB[3].GetUInt16(), fieldsLogin[3].GetUInt32(), fieldsLogin[2].GetUInt32()); } else - handler->PSendSysMessage(LANG_ACCOUNT_LIST_ERROR,name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_LIST_ERROR, name.c_str()); }while (resultDB->NextRow()); @@ -245,14 +245,14 @@ public: std::string argstr = (char*)args; if (argstr == "on") { - LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%d'",handler->GetSession()->GetAccountId()); + LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED); return true; } if (argstr == "off") { - LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%d'",handler->GetSession()->GetAccountId()); + LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED); return true; } @@ -330,8 +330,8 @@ public: static bool HandleAccountSetAddonCommand(ChatHandler* handler, const char *args) { ///- Get the command line arguments - char *szAcc = strtok((char*)args," "); - char *szExp = strtok(NULL," "); + char *szAcc = strtok((char*)args, " "); + char *szExp = strtok(NULL, " "); if (!szAcc) return false; @@ -346,7 +346,7 @@ public: return false; account_id = player->GetSession()->GetAccountId(); - sAccountMgr->GetName(account_id,account_name); + sAccountMgr->GetName(account_id, account_name); szExp = szAcc; } else @@ -355,7 +355,7 @@ public: account_name = szAcc; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -363,7 +363,7 @@ public: account_id = sAccountMgr->GetId(account_name); if (!account_id) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -373,7 +373,7 @@ public: // Let set addon state only for lesser (strong) security level // or to self account if (handler->GetSession() && handler->GetSession()->GetAccountId () != account_id && - handler->HasLowerSecurityAccount (NULL,account_id,true)) + handler->HasLowerSecurityAccount (NULL, account_id, true)) return false; int expansion = atoi(szExp); //get int anyway (0 if error) @@ -381,8 +381,8 @@ public: return false; // No SQL injection - LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'",expansion,account_id); - handler->PSendSysMessage(LANG_ACCOUNT_SETADDON,account_name.c_str(),account_id,expansion); + LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id); + handler->PSendSysMessage(LANG_ACCOUNT_SETADDON, account_name.c_str(), account_id, expansion); return true; } @@ -417,7 +417,7 @@ public: targetAccountName = arg1; if (!AccountMgr::normalizeString(targetAccountName)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,targetAccountName.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, targetAccountName.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -478,7 +478,7 @@ public: LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u' AND (RealmID = '%d' OR RealmID = '-1')", targetAccountId, realmID); if (gm != 0) - LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u','%d','%d')", targetAccountId, gm, realmID); + LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', '%d')", targetAccountId, gm, realmID); handler->PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm); return true; } @@ -490,9 +490,9 @@ public: return false; ///- Get the command line arguments - char *szAccount = strtok ((char*)args," "); - char *szPassword1 = strtok (NULL," "); - char *szPassword2 = strtok (NULL," "); + char *szAccount = strtok ((char*)args, " "); + char *szPassword1 = strtok (NULL, " "); + char *szPassword2 = strtok (NULL, " "); if (!szAccount||!szPassword1 || !szPassword2) return false; @@ -500,7 +500,7 @@ public: std::string account_name = szAccount; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -508,17 +508,17 @@ public: uint32 targetAccountId = sAccountMgr->GetId(account_name); if (!targetAccountId) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } /// can set password only for target with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL,targetAccountId,true)) + if (handler->HasLowerSecurityAccount (NULL, targetAccountId, true)) return false; - if (strcmp(szPassword1,szPassword2)) + if (strcmp(szPassword1, szPassword2)) { handler->SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH); handler->SetSentErrorMessage (true); @@ -533,7 +533,7 @@ public: handler->SendSysMessage(LANG_COMMAND_PASSWORD); break; case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; case AOR_PASS_TOO_LONG: diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 237fa210933..94174e9cb82 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -58,7 +58,7 @@ public: { "opcode", SEC_ADMINISTRATOR, false, &HandleDebugSendOpcodeCommand, "", NULL }, { "poi", SEC_ADMINISTRATOR, false, &HandleDebugSendPoiCommand, "", NULL }, { "qpartymsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestPartyMsgCommand, "", NULL }, - { "qinvalidmsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestInvalidMsgCommand,"", NULL }, + { "qinvalidmsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestInvalidMsgCommand, "", NULL }, { "sellerror", SEC_ADMINISTRATOR, false, &HandleDebugSendSellErrorCommand, "", NULL }, { "setphaseshift", SEC_ADMINISTRATOR, false, &HandleDebugSendSetPhaseShiftCommand, "", NULL }, { "spellfail", SEC_ADMINISTRATOR, false, &HandleDebugSendSpellFailCommand, "", NULL }, @@ -73,7 +73,7 @@ public: { "arena", SEC_ADMINISTRATOR, false, &HandleDebugArenaCommand, "", NULL }, { "bg", SEC_ADMINISTRATOR, false, &HandleDebugBattlegroundCommand, "", NULL }, { "getitemstate", SEC_ADMINISTRATOR, false, &HandleDebugGetItemStateCommand, "", NULL }, - { "lootrecipient", SEC_GAMEMASTER, false, &HandleDebugGetLootRecipientCommand,"", NULL }, + { "lootrecipient", SEC_GAMEMASTER, false, &HandleDebugGetLootRecipientCommand, "", NULL }, { "getvalue", SEC_ADMINISTRATOR, false, &HandleDebugGetValueCommand, "", NULL }, { "getitemvalue", SEC_ADMINISTRATOR, false, &HandleDebugGetItemValueCommand, "", NULL }, { "Mod32Value", SEC_ADMINISTRATOR, false, &HandleDebugMod32ValueCommand, "", NULL }, @@ -85,7 +85,7 @@ public: { "spawnvehicle", SEC_ADMINISTRATOR, false, &HandleDebugSpawnVehicleCommand, "", NULL }, { "setvid", SEC_ADMINISTRATOR, false, &HandleDebugSetVehicleIdCommand, "", NULL }, { "entervehicle", SEC_ADMINISTRATOR, false, &HandleDebugEnterVehicleCommand, "", NULL }, - { "uws", SEC_ADMINISTRATOR, false, &HandleDebugUpdateWorldStateCommand,"", NULL }, + { "uws", SEC_ADMINISTRATOR, false, &HandleDebugUpdateWorldStateCommand, "", NULL }, { "update", SEC_ADMINISTRATOR, false, &HandleDebugUpdateCommand, "", NULL }, { "itemexpire", SEC_ADMINISTRATOR, false, &HandleDebugItemExpireCommand, "", NULL }, { "areatriggers", SEC_ADMINISTRATOR, false, &HandleDebugAreaTriggersCommand, "", NULL }, @@ -177,9 +177,9 @@ public: } if (handler->GetSession()->GetPlayer()->GetSelection()) - unit->PlayDistanceSound(dwSoundId,handler->GetSession()->GetPlayer()); + unit->PlayDistanceSound(dwSoundId, handler->GetSession()->GetPlayer()); else - unit->PlayDirectSound(dwSoundId,handler->GetSession()->GetPlayer()); + unit->PlayDirectSound(dwSoundId, handler->GetSession()->GetPlayer()); handler->PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId); return true; @@ -239,7 +239,7 @@ public: uint32 icon = atol(icon_text); uint32 flags = atol(flags_text); - sLog->outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); + sLog->outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon, flags); pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI"); return true; } @@ -736,14 +736,14 @@ public: std::list<HostileReference*>& tlist = target->getThreatManager().getThreatList(); std::list<HostileReference*>::iterator itr; uint32 cnt = 0; - handler->PSendSysMessage("Threat list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + handler->PSendSysMessage("Threat list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); for (itr = tlist.begin(); itr != tlist.end(); ++itr) { Unit* unit = (*itr)->getTarget(); if (!unit) continue; ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); } handler->SendSysMessage("End of threat list."); return true; @@ -756,13 +756,13 @@ public: target = handler->GetSession()->GetPlayer(); HostileReference* ref = target->getHostileRefManager().getFirst(); uint32 cnt = 0; - handler->PSendSysMessage("Hostil reference list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); while (ref) { if (Unit * unit = ref->getSource()->getOwner()) { ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); } ref = ref->next(); } @@ -1003,11 +1003,11 @@ public: { // reset all states for (int i = 1; i <= 32; ++i) - unit->ModifyAuraState(AuraState(i),false); + unit->ModifyAuraState(AuraState(i), false); return true; } - unit->ModifyAuraState(AuraState(abs(state)),state > 0); + unit->ModifyAuraState(AuraState(abs(state)), state > 0); return true; } @@ -1048,13 +1048,13 @@ public: { iValue = (uint32)atoi(py); target->SetUInt32Value(Opcode , iValue); - handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode,iValue); + handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { fValue = (float)atof(py); target->SetFloatValue(Opcode , fValue); - handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode,fValue); + handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } return true; @@ -1132,7 +1132,7 @@ public: CurrentValue += Value; handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode , (uint32)CurrentValue); - handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode,CurrentValue); + handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); return true; } @@ -1175,15 +1175,15 @@ public: { value=chr->GetUInt32Value(updateIndex); - handler->PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(),updateIndex,value); + handler->PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(), updateIndex, value); return true; } value=atoi(pvalue); - handler->PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(),updateIndex,value); + handler->PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(), updateIndex, value); - chr->SetUInt32Value(updateIndex,value); + chr->SetUInt32Value(updateIndex, value); return true; } diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 88feae9e561..20ade38d676 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -64,9 +64,9 @@ public: GameEventData const& eventData = events[event_id]; if (handler->GetSession()) - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,event_id,event_id,eventData.description.c_str(),active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, event_id, event_id, eventData.description.c_str(), active); else - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,event_id,eventData.description.c_str(),active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, event_id, eventData.description.c_str(), active); ++counter; } @@ -84,7 +84,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -121,8 +121,8 @@ public: std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE); std::string lengthStr = secsToTimeString(eventData.length * MINUTE); - handler->PSendSysMessage(LANG_EVENT_INFO,event_id,eventData.description.c_str(),activeStr, - startTimeStr.c_str(),endTimeStr.c_str(),occurenceStr.c_str(),lengthStr.c_str(), + handler->PSendSysMessage(LANG_EVENT_INFO, event_id, eventData.description.c_str(), activeStr, + startTimeStr.c_str(), endTimeStr.c_str(), occurenceStr.c_str(), lengthStr.c_str(), nextStr.c_str()); return true; } @@ -133,7 +133,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -159,12 +159,12 @@ public: GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); if (activeEvents.find(event_id) != activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id); + handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, event_id); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StartEvent(event_id,true); + sGameEventMgr->StartEvent(event_id, true); return true; } @@ -174,7 +174,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -201,12 +201,12 @@ public: if (activeEvents.find(event_id) == activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE,event_id); + handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, event_id); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StopEvent(event_id,true); + sGameEventMgr->StopEvent(event_id, true); return true; } }; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 1ed451ed50b..90fbe1d1549 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -153,7 +153,7 @@ public: static bool HandleGMListFullCommand(ChatHandler* handler, const char* /*args*/) { ///- Get the accounts with GM Level >0 - QueryResult result = LoginDatabase.Query("SELECT a.username,aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel > 0"); + QueryResult result = LoginDatabase.Query("SELECT a.username, aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel > 0"); if (result) { handler->SendSysMessage(LANG_GMLIST); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index b4ca8af6d92..1dbc4236bff 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -76,7 +76,7 @@ public: Player* _player = handler->GetSession()->GetPlayer(); // "id" or number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* pParam1 = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* pParam1 = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!pParam1) return false; @@ -89,10 +89,10 @@ public: // Get the "creature_template.entry" // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* tail = strtok(NULL,""); + char* tail = strtok(NULL, ""); if (!tail) return false; - char* cId = handler->extractKeyFromLink(tail,"Hcreature_entry"); + char* cId = handler->extractKeyFromLink(tail, "Hcreature_entry"); if (!cId) return false; @@ -123,7 +123,7 @@ public: } //sLog->outError("DEBUG: %s", whereClause.c_str()); - QueryResult result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map FROM creature %s", whereClause.str().c_str()); + QueryResult result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z, orientation, map FROM creature %s", whereClause.str().c_str()); if (!result) { handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND); @@ -140,9 +140,9 @@ public: float ort = fields[3].GetFloat(); int mapid = fields[4].GetUInt16(); - if (!MapManager::IsValidMapCoord(mapid,x,y,z,ort)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -179,14 +179,14 @@ public: WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(i_gyId); if (!gy) { - handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST,i_gyId); + handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, i_gyId); handler->SetSentErrorMessage(true); return false; } - if (!MapManager::IsValidMapCoord(gy->map_id,gy->x,gy->y,gy->z)) + if (!MapManager::IsValidMapCoord(gy->map_id, gy->x, gy->y, gy->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,gy->x,gy->y,gy->map_id); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->map_id); handler->SetSentErrorMessage(true); return false; } @@ -228,9 +228,9 @@ public: float x = (grid_x-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; float y = (grid_y-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; - if (!MapManager::IsValidMapCoord(mapid,x,y)) + if (!MapManager::IsValidMapCoord(mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -260,7 +260,7 @@ public: Player* _player = handler->GetSession()->GetPlayer(); // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -287,9 +287,9 @@ public: return false; } - if (!MapManager::IsValidMapCoord(mapid,x,y,z,ort)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -314,7 +314,7 @@ public: if (!*args) return false; - char* cNodeId = handler->extractKeyFromLink((char*)args,"Htaxinode"); + char* cNodeId = handler->extractKeyFromLink((char*)args, "Htaxinode"); if (!cNodeId) return false; @@ -325,15 +325,15 @@ public: TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i_nodeId); if (!node) { - handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND,i_nodeId); + handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, i_nodeId); handler->SetSentErrorMessage(true); return false; } if ((node->x == 0.0f && node->y == 0.0f && node->z == 0.0f) || - !MapManager::IsValidMapCoord(node->map_id,node->x,node->y,node->z)) + !MapManager::IsValidMapCoord(node->map_id, node->x, node->y, node->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,node->x,node->y,node->map_id); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, node->x, node->y, node->map_id); handler->SetSentErrorMessage(true); return false; } @@ -370,14 +370,14 @@ public: AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(i_atId); if (!at) { - handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND,i_atId); + handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, i_atId); handler->SetSentErrorMessage(true); return false; } - if (!MapManager::IsValidMapCoord(at->mapid,at->x,at->y,at->z)) + if (!MapManager::IsValidMapCoord(at->mapid, at->x, at->y, at->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,at->x,at->y,at->mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, at->x, at->y, at->mapid); handler->SetSentErrorMessage(true); return false; } @@ -405,9 +405,9 @@ public: char* px = strtok((char*)args, " "); char* py = strtok(NULL, " "); - char* tail = strtok(NULL,""); + char* tail = strtok(NULL, ""); - char* cAreaId = handler->extractKeyFromLink(tail,"Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r + char* cAreaId = handler->extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r if (!px || !py) return false; @@ -425,7 +425,7 @@ public: if (x < 0 || x > 100 || y < 0 || y > 100 || !areaEntry) { - handler->PSendSysMessage(LANG_INVALID_ZONE_COORD,x,y,areaid); + handler->PSendSysMessage(LANG_INVALID_ZONE_COORD, x, y, areaid); handler->SetSentErrorMessage(true); return false; } @@ -437,16 +437,16 @@ public: if (map->Instanceable()) { - handler->PSendSysMessage(LANG_INVALID_ZONE_MAP,areaEntry->ID,areaEntry->area_name[handler->GetSessionDbcLocale()],map->GetId(),map->GetMapName()); + handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[handler->GetSessionDbcLocale()], map->GetId(), map->GetMapName()); handler->SetSentErrorMessage(true); return false; } - Zone2MapCoordinates(x,y,zoneEntry->ID); + Zone2MapCoordinates(x, y, zoneEntry->ID); - if (!MapManager::IsValidMapCoord(zoneEntry->mapid,x,y)) + if (!MapManager::IsValidMapCoord(zoneEntry->mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,zoneEntry->mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid); handler->SetSentErrorMessage(true); return false; } @@ -489,9 +489,9 @@ public: else mapid = _player->GetMapId(); - if (!MapManager::IsValidMapCoord(mapid,x,y)) + if (!MapManager::IsValidMapCoord(mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -538,9 +538,9 @@ public: else mapid = _player->GetMapId(); - if (!MapManager::IsValidMapCoord(mapid,x,y,z)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 857ee0fec85..726b937cf95 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -74,7 +74,7 @@ public: if (!*args) return false; - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -86,7 +86,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -111,7 +111,7 @@ public: return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); if (!cId) return false; @@ -125,7 +125,7 @@ public: if (!gInfo) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); handler->SetSentErrorMessage(true); return false; } @@ -133,8 +133,8 @@ public: if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) { // report to DB errors log as in loading case - sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.",id, gInfo->type, gInfo->displayId); - handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA,id); + sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.", id, gInfo->type, gInfo->displayId); + handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, id); handler->SetSentErrorMessage(true); return false; } @@ -163,7 +163,7 @@ public: } // fill the gameobject data and save to the db - pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()),chr->GetPhaseMaskForSpawn()); + pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); // this will generate a new guid if the object is in an instance if (!pGameObj->LoadFromDB(db_lowGUID, map)) @@ -177,7 +177,7 @@ public: // TODO: is it really necessary to add both the real and DB table guid here ? sObjectMgr->AddGameobjectToGrid(db_lowGUID, sObjectMgr->GetGOData(db_lowGUID)); - handler->PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name.c_str(),db_lowGUID,x,y,z); + handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, id, gInfo->name.c_str(), db_lowGUID, x, y, z); return true; } @@ -208,7 +208,7 @@ public: uint32 id = atoi(charID); - chr->SummonGameObject(id,x,y,z,ang,0,0,rot2,rot3,spawntm); + chr->SummonGameObject(id, x, y, z, ang, 0, 0, rot2, rot3, spawntm); return true; } @@ -221,7 +221,7 @@ public: if (*args) { // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); if (!cId) return false; @@ -229,15 +229,15 @@ public: if (id) result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id); + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), id); else { std::string name = cId; WorldDatabase.escape_string(name); result = WorldDatabase.PQuery( "SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ " - "FROM gameobject,gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),name.c_str()); + "FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1", + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), name.c_str()); } } else @@ -254,7 +254,7 @@ public: initString =false; } else - eventFilter << "," << *itr; + eventFilter << ", " << *itr; } if (!initString) @@ -266,7 +266,7 @@ public: "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject " "LEFT OUTER JOIN game_event_gameobject on gameobject.guid = game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10", handler->GetSession()->GetPlayer()->GetPositionX(), handler->GetSession()->GetPlayer()->GetPositionY(), handler->GetSession()->GetPlayer()->GetPositionZ(), - handler->GetSession()->GetPlayer()->GetMapId(),eventFilter.str().c_str()); + handler->GetSession()->GetPlayer()->GetMapId(), eventFilter.str().c_str()); } if (!result) @@ -299,7 +299,7 @@ public: if (!found) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); return false; } @@ -307,11 +307,11 @@ public: if (!goI) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); return false; } - GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid,id,HIGHGUID_GAMEOBJECT)); + GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid, id, HIGHGUID_GAMEOBJECT)); handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name.c_str(), lowguid, id, x, y, z, mapid, o, phase); @@ -321,10 +321,10 @@ public: if (curRespawnDelay < 0) curRespawnDelay = 0; - std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true); - std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); + std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay, true); + std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true); - handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str()); + handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); } return true; } @@ -333,7 +333,7 @@ public: static bool HandleGameObjectDeleteCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -345,7 +345,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -357,7 +357,7 @@ public: uint64 owner_guid = obj->GetOwnerGUID(); if (owner_guid) { - Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(),owner_guid); + Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), owner_guid); if (!owner || !IS_PLAYER_GUID(owner_guid)) { handler->PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, GUID_LOPART(owner_guid), obj->GetGUIDLow()); @@ -365,7 +365,7 @@ public: return false; } - owner->RemoveGameObject(obj,false); + owner->RemoveGameObject(obj, false); } obj->SetRespawnTime(0); // not save respawn time @@ -381,7 +381,7 @@ public: static bool HandleGameObjectTurnCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -393,7 +393,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -432,7 +432,7 @@ public: static bool HandleGameObjectMoveCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -444,7 +444,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -473,9 +473,9 @@ public: float y = (float)atof(py); float z = (float)atof(pz); - if (!MapManager::IsValidMapCoord(obj->GetMapId(),x,y,z)) + if (!MapManager::IsValidMapCoord(obj->GetMapId(), x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,obj->GetMapId()); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, obj->GetMapId()); handler->SetSentErrorMessage(true); return false; } @@ -497,7 +497,7 @@ public: static bool HandleGameObjectSetPhaseCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -509,7 +509,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -527,7 +527,7 @@ public: return false; } - obj->SetPhaseMask(phasemask,true); + obj->SetPhaseMask(phasemask, true); obj->SaveToDB(); return true; } @@ -542,7 +542,7 @@ public: "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ " "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), - pl->GetMapId(),pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),distance*distance); + pl->GetMapId(), pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), distance*distance); if (result) { @@ -567,7 +567,7 @@ public: } while (result->NextRow()); } - handler->PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE,distance,count); + handler->PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE, distance, count); return true; } @@ -659,7 +659,7 @@ public: gobj->SetByteValue(GAMEOBJECT_BYTES_1, type, state); else if (type == 4) { - WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4); + WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM, 8+4); data << gobj->GetGUID(); data << (uint32)(state); gobj->SendMessageToSet(&data, true); diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 5b88e83371f..347a527bead 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -37,7 +37,7 @@ public: static ChatCommand learnAllMyCommandTable[] = { { "class", SEC_ADMINISTRATOR, false, &HandleLearnAllMyClassCommand, "", NULL }, - { "pettalents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyPetTalentsCommand,"", NULL }, + { "pettalents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyPetTalentsCommand, "", NULL }, { "spells", SEC_ADMINISTRATOR, false, &HandleLearnAllMySpellsCommand, "", NULL }, { "talents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyTalentsCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } @@ -83,13 +83,13 @@ public: if (!spell || !sSpellStore.LookupEntry(spell)) return false; - char const* allStr = strtok(NULL," "); + char const* allStr = strtok(NULL, " "); bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer())) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer())) { - handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); + handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell); handler->SetSentErrorMessage(true); return false; } @@ -99,7 +99,7 @@ public: if (targetPlayer == handler->GetSession()->GetPlayer()) handler->SendSysMessage(LANG_YOU_KNOWN_SPELL); else - handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL,handler->GetNameLink(targetPlayer).c_str()); + handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL, handler->GetNameLink(targetPlayer).c_str()); handler->SetSentErrorMessage(true); return false; } @@ -172,7 +172,7 @@ public: continue; // skip broken spells - if (!SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; handler->GetSession()->GetPlayer()->learnSpell(i, false); @@ -215,7 +215,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -294,7 +294,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -320,13 +320,13 @@ public: static bool HandleLearnAllDefaultCommand(ChatHandler* handler, const char* args) { Player* target; - if (!handler->extractPlayerTarget((char*)args,&target)) + if (!handler->extractPlayerTarget((char*)args, &target)) return false; target->learnDefaultSpells(); target->learnQuestRewardedSpells(); - handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,handler->GetNameLink(target).c_str()); + handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST, handler->GetNameLink(target).c_str()); return true; } @@ -342,7 +342,7 @@ public: if ((skillInfo->categoryId == SKILL_CATEGORY_PROFESSION || skillInfo->categoryId == SKILL_CATEGORY_SECONDARY) && skillInfo->canLink) // only prof. with recipes have { - HandleLearnSkillRecipesHelper(handler->GetSession()->GetPlayer(),skillInfo->id); + HandleLearnSkillRecipesHelper(handler->GetSession()->GetPlayer(), skillInfo->id); } } @@ -367,7 +367,7 @@ public: std::wstring wnamepart; - if (!Utf8toWStr(args,wnamepart)) + if (!Utf8toWStr(args, wnamepart)) return false; // converting string that we try to find to lower case @@ -419,14 +419,14 @@ public: if (!targetSkillInfo) return false; - HandleLearnSkillRecipesHelper(target,targetSkillInfo->id); + HandleLearnSkillRecipesHelper(target, targetSkillInfo->id); uint16 maxLevel = target->GetPureMaxSkillValue(targetSkillInfo->id); target->SetSkill(targetSkillInfo->id, target->GetSkillStep(targetSkillInfo->id), maxLevel, maxLevel); handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_RECIPES, name.c_str()); return true; } - static void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) + static void HandleLearnSkillRecipesHelper(Player* player, uint32 skill_id) { uint32 classmask = player->getClassMask(); @@ -453,7 +453,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, player, false)) continue; player->learnSpell(skillLine->spellId, false); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 60944575d68..697129f2135 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -139,7 +139,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_MANA_CHANGED, handler->GetNameLink().c_str(), mana, manam); - target->SetMaxPower(POWER_MANA,manam); + target->SetMaxPower(POWER_MANA, manam); target->SetPower(POWER_MANA, mana); return true; @@ -188,10 +188,10 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_ENERGY_CHANGED, handler->GetNameLink().c_str(), energy/10, energym/10); - target->SetMaxPower(POWER_ENERGY,energym); + target->SetMaxPower(POWER_ENERGY, energym); target->SetPower(POWER_ENERGY, energy); - sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY),target->GetMaxPower(POWER_ENERGY)); + sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY)); return true; } @@ -239,7 +239,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_RAGE_CHANGED, handler->GetNameLink().c_str(), rage/10, ragem/10); - target->SetMaxPower(POWER_RAGE,ragem); + target->SetMaxPower(POWER_RAGE, ragem); target->SetPower(POWER_RAGE, rage); return true; @@ -273,7 +273,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_RUNIC_POWER_CHANGED, handler->GetNameLink().c_str(), rune/10, runem/10); - target->SetMaxPower(POWER_RUNIC_POWER,runem); + target->SetMaxPower(POWER_RUNIC_POWER, runem); target->SetPower(POWER_RUNIC_POWER, rune); return true; @@ -285,7 +285,7 @@ public: if (!*args) return false; - char* pfactionid = handler->extractKeyFromLink((char*)args,"Hfaction"); + char* pfactionid = handler->extractKeyFromLink((char*)args, "Hfaction"); Creature* target = handler->getSelectedCreature(); if (!target) @@ -303,7 +303,7 @@ public: uint32 flag = target->GetUInt32Value(UNIT_FIELD_FLAGS); uint32 npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS); uint32 dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS); - handler->PSendSysMessage(LANG_CURRENT_FACTION,target->GetGUIDLow(),factionid,flag,npcflag,dyflag); + handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag); } return true; } @@ -347,12 +347,12 @@ public: return false; } - handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUIDLow(),factionid,flag,npcflag,dyflag); + handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag); target->setFaction(factionid); - target->SetUInt32Value(UNIT_FIELD_FLAGS,flag); - target->SetUInt32Value(UNIT_NPC_FLAGS,npcflag); - target->SetUInt32Value(UNIT_DYNAMIC_FLAGS,dyflag); + target->SetUInt32Value(UNIT_FIELD_FLAGS, flag); + target->SetUInt32Value(UNIT_NPC_FLAGS, npcflag); + target->SetUInt32Value(UNIT_DYNAMIC_FLAGS, dyflag); return true; } @@ -488,7 +488,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -497,11 +497,11 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_ASPEED_CHANGED, handler->GetNameLink().c_str(), ASpeed); - target->SetSpeed(MOVE_WALK, ASpeed,true); - target->SetSpeed(MOVE_RUN, ASpeed,true); - target->SetSpeed(MOVE_SWIM, ASpeed,true); - //target->SetSpeed(MOVE_TURN, ASpeed,true); - target->SetSpeed(MOVE_FLIGHT, ASpeed,true); + target->SetSpeed(MOVE_WALK, ASpeed, true); + target->SetSpeed(MOVE_RUN, ASpeed, true); + target->SetSpeed(MOVE_SWIM, ASpeed, true); + //target->SetSpeed(MOVE_TURN, ASpeed, true); + target->SetSpeed(MOVE_FLIGHT, ASpeed, true); return true; } @@ -536,7 +536,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -545,7 +545,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_SPEED_CHANGED, handler->GetNameLink().c_str(), Speed); - target->SetSpeed(MOVE_RUN,Speed,true); + target->SetSpeed(MOVE_RUN, Speed, true); return true; } @@ -581,7 +581,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -590,7 +590,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_SWIM_SPEED_CHANGED, handler->GetNameLink().c_str(), Swim); - target->SetSpeed(MOVE_SWIM,Swim,true); + target->SetSpeed(MOVE_SWIM, Swim, true); return true; } @@ -626,7 +626,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -635,7 +635,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_BACK_SPEED_CHANGED, handler->GetNameLink().c_str(), BSpeed); - target->SetSpeed(MOVE_RUN_BACK,BSpeed,true); + target->SetSpeed(MOVE_RUN_BACK, BSpeed, true); return true; } @@ -671,7 +671,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_FLY_SPEED_CHANGED, handler->GetNameLink().c_str(), FSpeed); - target->SetSpeed(MOVE_FLIGHT,FSpeed,true); + target->SetSpeed(MOVE_FLIGHT, FSpeed, true); return true; } @@ -1148,7 +1148,7 @@ public: if (handler->HasLowerSecurity(target, 0)) return false; - char* factionTxt = handler->extractKeyFromLink((char*)args,"Hfaction"); + char* factionTxt = handler->extractKeyFromLink((char*)args, "Hfaction"); if (!factionTxt) return false; @@ -1164,7 +1164,7 @@ public: { std::string rankStr = rankTxt; std::wstring wrankStr; - if (!Utf8toWStr(rankStr,wrankStr)) + if (!Utf8toWStr(rankStr, wrankStr)) return false; wstrToLower(wrankStr); @@ -1177,12 +1177,12 @@ public: continue; std::wstring wrank; - if (!Utf8toWStr(rank,wrank)) + if (!Utf8toWStr(rank, wrank)) continue; wstrToLower(wrank); - if (wrank.substr(0,wrankStr.size()) == wrankStr) + if (wrank.substr(0, wrankStr.size()) == wrankStr) { char *deltaTxt = strtok(NULL, " "); if (deltaTxt) @@ -1224,7 +1224,7 @@ public: return false; } - target->GetReputationMgr().SetReputation(factionEntry,amount); + target->GetReputationMgr().SetReputation(factionEntry, amount); handler->PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->name[handler->GetSessionDbcLocale()], factionId, handler->GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry)); return true; @@ -1267,7 +1267,7 @@ public: else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer(), 0)) return false; - target->SetPhaseMask(phasemask,true); + target->SetPhaseMask(phasemask, true); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 1309bc959f5..6e1ea1a6be8 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -109,7 +109,7 @@ public: { if (!*args) return false; - char* charID = handler->extractKeyFromLink((char*)args,"Hcreature_entry"); + char* charID = handler->extractKeyFromLink((char*)args, "Hcreature_entry"); if (!charID) return false; @@ -161,7 +161,7 @@ public: if (!*args) return false; - char* pitem = handler->extractKeyFromLink((char*)args,"Hitem"); + char* pitem = handler->extractKeyFromLink((char*)args, "Hitem"); if (!pitem) { handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -193,17 +193,17 @@ public: uint32 vendor_entry = vendor ? vendor->GetEntry() : 0; - if (!sObjectMgr->IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,handler->GetSession()->GetPlayer())) + if (!sObjectMgr->IsVendorItemValid(vendor_entry, itemId, maxcount, incrtime, extendedcost, handler->GetSession()->GetPlayer())) { handler->SetSentErrorMessage(true); return false; } - sObjectMgr->AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost); + sObjectMgr->AddVendorItem(vendor_entry, itemId, maxcount, incrtime, extendedcost); ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId); - handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,itemTemplate->Name1.c_str(), maxcount,incrtime,extendedcost); + handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST, itemId, itemTemplate->Name1.c_str(), maxcount, incrtime, extendedcost); return true; } @@ -222,7 +222,7 @@ public: /* FIXME: impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // attempt check creature existence by DB data @@ -252,7 +252,7 @@ public: //WaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), wait, 0); // update movement type - WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE,lowguid); + WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, lowguid); if (pCreature && pCreature->GetWaypointPath()) { pCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); @@ -358,7 +358,7 @@ public: if (*args) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* cId = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!cId) return false; @@ -403,7 +403,7 @@ public: return false; } - char* pitem = handler->extractKeyFromLink((char*)args,"Hitem"); + char* pitem = handler->extractKeyFromLink((char*)args, "Hitem"); if (!pitem) { handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -412,16 +412,16 @@ public: } uint32 itemId = atol(pitem); - if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(),itemId)) + if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(), itemId)) { - handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId); + handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId); handler->SetSentErrorMessage(true); return false; } ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId); - handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,itemTemplate->Name1.c_str()); + handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST, itemId, itemTemplate->Name1.c_str()); return true; } @@ -533,19 +533,19 @@ public: int64 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL); if (curRespawnDelay < 0) curRespawnDelay = 0; - std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay),true); - std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); + std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), true); + std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true); handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetDBTableGUIDLow(), target->GetGUIDLow(), faction, npcflags, Entry, displayid, nativeid); handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); - handler->PSendSysMessage(LANG_NPCINFO_HEALTH,target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); + handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction()); - handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str()); - handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId); + handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); + handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid, cInfo->pickpocketLootId, cInfo->SkinLootId); handler->PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId()); handler->PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask()); handler->PSendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor()); - handler->PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); + handler->PSendSysMessage(LANG_NPCINFO_POSITION, float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); if ((npcflags & UNIT_NPC_FLAG_VENDOR)) { @@ -569,7 +569,7 @@ public: if (!pCreature) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* cId = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!cId) return false; @@ -577,7 +577,7 @@ public: /* FIXME: impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // Attempting creature load from DB data @@ -624,7 +624,7 @@ public: const_cast<CreatureData*>(data)->posZ = z; const_cast<CreatureData*>(data)->orientation = o; } - pCreature->GetMap()->CreatureRelocation(pCreature,x, y, z,o); + pCreature->GetMap()->CreatureRelocation(pCreature, x, y, z, o); pCreature->GetMotionMaster()->Initialize(); if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { @@ -655,7 +655,7 @@ public: if (target->GetGUIDTransport()) WorldDatabase.PQuery("UPDATE creature_transport SET emote=%u WHERE transport_entry=%u AND guid=%u", emote, target->GetTransport()->GetEntry(), target->GetGUIDTransport()); - target->SetUInt32Value(UNIT_NPC_EMOTESTATE,emote); + target->SetUInt32Value(UNIT_NPC_EMOTESTATE, emote); return true; } @@ -764,7 +764,7 @@ public: /* impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // attempt check creature existence by DB data @@ -821,11 +821,11 @@ public: } if (doNotDelete == false) { - handler->PSendSysMessage(LANG_MOVE_TYPE_SET,type_str); + handler->PSendSysMessage(LANG_MOVE_TYPE_SET, type_str); } else { - handler->PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL,type_str); + handler->PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL, type_str); } return true; @@ -854,7 +854,7 @@ public: return false; } - pCreature->SetPhaseMask(phasemask,true); + pCreature->SetPhaseMask(phasemask, true); if (!pCreature->isPet()) pCreature->SaveToDB(); @@ -896,8 +896,8 @@ public: pCreature->Respawn(); } - WorldDatabase.PExecute("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u",option,mtype,u_guidlow); - handler->PSendSysMessage(LANG_COMMAND_SPAWNDIST,option); + WorldDatabase.PExecute("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u", option, mtype, u_guidlow); + handler->PSendSysMessage(LANG_COMMAND_SPAWNDIST, option); return true; } @@ -929,9 +929,9 @@ public: else return false; - WorldDatabase.PExecute("UPDATE creature SET spawntimesecs=%i WHERE guid=%u",i_stime,u_guidlow); + WorldDatabase.PExecute("UPDATE creature SET spawntimesecs=%i WHERE guid=%u", i_stime, u_guidlow); pCreature->SetRespawnDelay((uint32)i_stime); - handler->PSendSysMessage(LANG_COMMAND_SPAWNTIME,i_stime); + handler->PSendSysMessage(LANG_COMMAND_SPAWNTIME, i_stime); return true; } @@ -1044,7 +1044,7 @@ public: if (handler->HasLowerSecurity(sObjectMgr->GetPlayer(receiver_guid), 0)) return false; - pCreature->MonsterWhisper(text,receiver_guid); + pCreature->MonsterWhisper(text, receiver_guid); return true; } @@ -1114,7 +1114,7 @@ public: if (!cInfo->isTameable (player->CanTameExoticPets())) { - handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); + handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); return false; } @@ -1123,15 +1123,15 @@ public: Pet* pet = player->CreateTamedPetFrom (creatureTarget); if (!pet) { - handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); + handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); return false; } // place pet before player - float x,y,z; - player->GetClosePoint (x,y,z,creatureTarget->GetObjectSize (),CONTACT_DISTANCE); - pet->Relocate (x,y,z,M_PI-player->GetOrientation ()); + float x, y, z; + player->GetClosePoint (x, y, z, creatureTarget->GetObjectSize (), CONTACT_DISTANCE); + pet->Relocate (x, y, z, M_PI-player->GetOrientation ()); // set pet to defensive mode by default (some classes can't control controlled pets in fact). pet->SetReactState(REACT_DEFENSIVE); @@ -1218,14 +1218,14 @@ public: group_member = new FormationInfo; group_member->follow_angle = (pCreature->GetAngle(chr) - chr->GetOrientation()) * 180 / M_PI; - group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2))); + group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(), int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(), int(2))); group_member->leaderGUID = leaderGUID; group_member->groupAI = 0; CreatureGroupMap[lowguid] = group_member; pCreature->SearchFormation(); - WorldDatabase.PExecute("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u','%u','%f', '%f', '%u')", + WorldDatabase.PExecute("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u', '%u', '%f', '%f', '%u')", leaderGUID, lowguid, group_member->follow_dist, group_member->follow_angle, group_member->groupAI); handler->PSendSysMessage("Creature %u added to formation with leader %u", lowguid, leaderGUID); @@ -1319,17 +1319,17 @@ public: added = true; break; default: - handler->PSendSysMessage(LANG_ITEM_SLOT_NOT_EXIST,SlotID); + handler->PSendSysMessage(LANG_ITEM_SLOT_NOT_EXIST, SlotID); added = false; break; } if (added) - handler->PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT,ItemID,tmpItem->Name1,SlotID); + handler->PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT, ItemID, tmpItem->Name1, SlotID); } else { - handler->PSendSysMessage(LANG_ITEM_NOT_FOUND,ItemID); + handler->PSendSysMessage(LANG_ITEM_NOT_FOUND, ItemID); return true; } */ @@ -1420,7 +1420,7 @@ public: return true; } - uint32 idname = sObjectMgr->AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID)); + uint32 idname = sObjectMgr->AddCreatureSubName(pCreature->GetName(), args, pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID)); pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname); pCreature->SaveToDB(); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 9538221c3ba..381860e5f53 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -60,7 +60,7 @@ public: // .addquest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -70,7 +70,7 @@ public: if (!pQuest) { - handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND,entry); + handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); handler->SetSentErrorMessage(true); return false; } @@ -110,7 +110,7 @@ public: // .removequest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -131,7 +131,7 @@ public: uint32 quest = player->GetQuestSlotQuestId(slot); if (quest == entry) { - player->SetQuestSlot(slot,0); + player->SetQuestSlot(slot, 0); // we ignore unequippable quest items in this case, its' still be equipped player->TakeQuestSourceItem(quest, false); @@ -157,7 +157,7 @@ public: // .quest complete #entry // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -181,14 +181,14 @@ public: if (!id || !count) continue; - uint32 curItemCount = player->GetItemCount(id,true); + uint32 curItemCount = player->GetItemCount(id, true); ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, id, count-curItemCount); if (msg == EQUIP_ERR_OK) { Item* item = player->StoreNewItem(dest, id, true); - player->SendNewItem(item,count-curItemCount,true,false); + player->SendNewItem(item, count-curItemCount, true, false); } } @@ -201,18 +201,18 @@ public: if (uint32 spell_id = pQuest->ReqSpell[i]) { for (uint16 z = 0; z < creaturecount; ++z) - player->CastedCreatureOrGO(creature,0,spell_id); + player->CastedCreatureOrGO(creature, 0, spell_id); } else if (creature > 0) { if (CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(creature)) for (uint16 z = 0; z < creaturecount; ++z) - player->KilledMonster(cInfo,0); + player->KilledMonster(cInfo, 0); } else if (creature < 0) { for (uint16 z = 0; z < creaturecount; ++z) - player->CastedCreatureOrGO(creature,0,0); + player->CastedCreatureOrGO(creature, 0, 0); } } @@ -223,7 +223,7 @@ public: uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue) if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) - player->GetReputationMgr().SetReputation(factionEntry,repValue); + player->GetReputationMgr().SetReputation(factionEntry, repValue); } // If the quest requires a SECOND reputation to complete @@ -233,7 +233,7 @@ public: uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue2) if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) - player->GetReputationMgr().SetReputation(factionEntry,repValue2); + player->GetReputationMgr().SetReputation(factionEntry, repValue2); } // If the quest requires money diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 9fed2a2167a..44baf909a16 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -46,7 +46,7 @@ public: { static ChatCommand reloadAllCommandTable[] = { - { "achievement",SEC_ADMINISTRATOR, true, &HandleReloadAllAchievementCommand,"", NULL }, + { "achievement", SEC_ADMINISTRATOR, true, &HandleReloadAllAchievementCommand, "", NULL }, { "area", SEC_ADMINISTRATOR, true, &HandleReloadAllAreaCommand, "", NULL }, { "eventai", SEC_ADMINISTRATOR, true, &HandleReloadAllEventAICommand, "", NULL }, { "gossips", SEC_ADMINISTRATOR, true, &HandleReloadAllGossipsCommand, "", NULL }, @@ -78,7 +78,7 @@ public: { "creature_ai_scripts", SEC_ADMINISTRATOR, true, &HandleReloadEventAIScriptsCommand, "", NULL }, { "creature_ai_summons", SEC_ADMINISTRATOR, true, &HandleReloadEventAISummonsCommand, "", NULL }, { "creature_ai_texts", SEC_ADMINISTRATOR, true, &HandleReloadEventAITextsCommand, "", NULL }, - { "creature_involvedrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestInvRelationsCommand, "",NULL }, + { "creature_involvedrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestInvRelationsCommand, "", NULL }, { "creature_linked_respawn", SEC_GAMEMASTER, true, &HandleReloadLinkedRespawnCommand, "", NULL }, { "creature_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesCreatureCommand, "", NULL }, { "creature_onkill_reputation", SEC_ADMINISTRATOR, true, &HandleReloadOnKillReputationCommand, "", NULL }, @@ -116,11 +116,11 @@ public: { "mail_level_reward", SEC_ADMINISTRATOR, true, &HandleReloadMailLevelRewardCommand, "", NULL }, { "mail_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesMailCommand, "", NULL }, { "milling_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesMillingCommand, "", NULL }, - { "npc_spellclick_spells", SEC_ADMINISTRATOR, true, &HandleReloadSpellClickSpellsCommand, "",NULL}, + { "npc_spellclick_spells", SEC_ADMINISTRATOR, true, &HandleReloadSpellClickSpellsCommand, "", NULL}, { "npc_trainer", SEC_ADMINISTRATOR, true, &HandleReloadNpcTrainerCommand, "", NULL }, { "npc_vendor", SEC_ADMINISTRATOR, true, &HandleReloadNpcVendorCommand, "", NULL }, { "page_text", SEC_ADMINISTRATOR, true, &HandleReloadPageTextsCommand, "", NULL }, - { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesPickpocketingCommand, "",NULL}, + { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesPickpocketingCommand, "", NULL}, { "points_of_interest", SEC_ADMINISTRATOR, true, &HandleReloadPointsOfInterestCommand, "", NULL }, { "prospecting_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesProspectingCommand, "", NULL }, { "quest_end_scripts", SEC_ADMINISTRATOR, true, &HandleReloadQuestEndScriptsCommand, "", NULL }, @@ -130,7 +130,7 @@ public: { "reference_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesReferenceCommand, "", NULL }, { "reserved_name", SEC_ADMINISTRATOR, true, &HandleReloadReservedNameCommand, "", NULL }, { "reputation_reward_rate", SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, - { "reputation_spillover_template",SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, + { "reputation_spillover_template", SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, { "skill_discovery_template", SEC_ADMINISTRATOR, true, &HandleReloadSkillDiscoveryTemplateCommand, "", NULL }, { "skill_extra_item_template", SEC_ADMINISTRATOR, true, &HandleReloadSkillExtraItemTemplateCommand, "", NULL }, { "skill_fishing_base_level", SEC_ADMINISTRATOR, true, &HandleReloadSkillFishingBaseLevelCommand, "", NULL }, @@ -172,46 +172,46 @@ public: static bool HandleReloadAllCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadSkillFishingBaseLevelCommand(handler,""); - - HandleReloadAllAchievementCommand(handler,""); - HandleReloadAllAreaCommand(handler,""); - HandleReloadAllEventAICommand(handler,""); - HandleReloadAllLootCommand(handler,""); - HandleReloadAllNpcCommand(handler,""); - HandleReloadAllQuestCommand(handler,""); - HandleReloadAllSpellCommand(handler,""); - HandleReloadAllItemCommand(handler,""); - HandleReloadAllGossipsCommand(handler,""); - HandleReloadAllLocalesCommand(handler,""); - - HandleReloadAccessRequirementCommand(handler,""); - HandleReloadMailLevelRewardCommand(handler,""); - HandleReloadCommandCommand(handler,""); - HandleReloadReservedNameCommand(handler,""); - HandleReloadTrinityStringCommand(handler,""); - HandleReloadGameTeleCommand(handler,""); + HandleReloadSkillFishingBaseLevelCommand(handler, ""); + + HandleReloadAllAchievementCommand(handler, ""); + HandleReloadAllAreaCommand(handler, ""); + HandleReloadAllEventAICommand(handler, ""); + HandleReloadAllLootCommand(handler, ""); + HandleReloadAllNpcCommand(handler, ""); + HandleReloadAllQuestCommand(handler, ""); + HandleReloadAllSpellCommand(handler, ""); + HandleReloadAllItemCommand(handler, ""); + HandleReloadAllGossipsCommand(handler, ""); + HandleReloadAllLocalesCommand(handler, ""); + + HandleReloadAccessRequirementCommand(handler, ""); + HandleReloadMailLevelRewardCommand(handler, ""); + HandleReloadCommandCommand(handler, ""); + HandleReloadReservedNameCommand(handler, ""); + HandleReloadTrinityStringCommand(handler, ""); + HandleReloadGameTeleCommand(handler, ""); HandleReloadVehicleAccessoryCommand(handler, ""); HandleReloadVehicleTemplateAccessoryCommand(handler, ""); - HandleReloadAutobroadcastCommand(handler,""); + HandleReloadAutobroadcastCommand(handler, ""); return true; } static bool HandleReloadAllAchievementCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadAchievementCriteriaDataCommand(handler,""); - HandleReloadAchievementRewardCommand(handler,""); + HandleReloadAchievementCriteriaDataCommand(handler, ""); + HandleReloadAchievementRewardCommand(handler, ""); return true; } static bool HandleReloadAllAreaCommand(ChatHandler* handler, const char* /*args*/) { - //HandleReloadQuestAreaTriggersCommand(handler,""); -- reloaded in HandleReloadAllQuestCommand - HandleReloadAreaTriggerTeleportCommand(handler,""); - HandleReloadAreaTriggerTavernCommand(handler,""); - HandleReloadGameGraveyardZoneCommand(handler,""); + //HandleReloadQuestAreaTriggersCommand(handler, ""); -- reloaded in HandleReloadAllQuestCommand + HandleReloadAreaTriggerTeleportCommand(handler, ""); + HandleReloadAreaTriggerTavernCommand(handler, ""); + HandleReloadGameGraveyardZoneCommand(handler, ""); return true; } @@ -227,18 +227,18 @@ public: static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) { if(*args != 'a') // will be reloaded from all_gossips - HandleReloadNpcTrainerCommand(handler,"a"); - HandleReloadNpcVendorCommand(handler,"a"); - HandleReloadPointsOfInterestCommand(handler,"a"); - HandleReloadSpellClickSpellsCommand(handler,"a"); + HandleReloadNpcTrainerCommand(handler, "a"); + HandleReloadNpcVendorCommand(handler, "a"); + HandleReloadPointsOfInterestCommand(handler, "a"); + HandleReloadSpellClickSpellsCommand(handler, "a"); return true; } static bool HandleReloadAllQuestCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadQuestAreaTriggersCommand(handler,"a"); - HandleReloadQuestPOICommand(handler,"a"); - HandleReloadQuestTemplateCommand(handler,"a"); + HandleReloadQuestAreaTriggersCommand(handler, "a"); + HandleReloadQuestPOICommand(handler, "a"); + HandleReloadQuestTemplateCommand(handler, "a"); sLog->outString("Re-Loading Quests Relations..."); sObjectMgr->LoadQuestRelations(); @@ -256,72 +256,72 @@ public: } sLog->outString("Re-Loading Scripts..."); - HandleReloadGameObjectScriptsCommand(handler,"a"); - HandleReloadGossipScriptsCommand(handler,"a"); - HandleReloadEventScriptsCommand(handler,"a"); - HandleReloadQuestEndScriptsCommand(handler,"a"); - HandleReloadQuestStartScriptsCommand(handler,"a"); - HandleReloadSpellScriptsCommand(handler,"a"); + HandleReloadGameObjectScriptsCommand(handler, "a"); + HandleReloadGossipScriptsCommand(handler, "a"); + HandleReloadEventScriptsCommand(handler, "a"); + HandleReloadQuestEndScriptsCommand(handler, "a"); + HandleReloadQuestStartScriptsCommand(handler, "a"); + HandleReloadSpellScriptsCommand(handler, "a"); handler->SendGlobalGMSysMessage("DB tables `*_scripts` reloaded."); - HandleReloadDbScriptStringCommand(handler,"a"); - HandleReloadWpScriptsCommand(handler,"a"); + HandleReloadDbScriptStringCommand(handler, "a"); + HandleReloadWpScriptsCommand(handler, "a"); return true; } static bool HandleReloadAllEventAICommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadEventAITextsCommand(handler,"a"); - HandleReloadEventAISummonsCommand(handler,"a"); - HandleReloadEventAIScriptsCommand(handler,"a"); + HandleReloadEventAITextsCommand(handler, "a"); + HandleReloadEventAISummonsCommand(handler, "a"); + HandleReloadEventAIScriptsCommand(handler, "a"); return true; } static bool HandleReloadAllSpellCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadSkillDiscoveryTemplateCommand(handler,"a"); - HandleReloadSkillExtraItemTemplateCommand(handler,"a"); - HandleReloadSpellRequiredCommand(handler,"a"); - HandleReloadSpellAreaCommand(handler,"a"); - HandleReloadSpellGroupsCommand(handler,"a"); - HandleReloadSpellLearnSpellCommand(handler,"a"); - HandleReloadSpellLinkedSpellCommand(handler,"a"); - HandleReloadSpellProcEventCommand(handler,"a"); - HandleReloadSpellBonusesCommand(handler,"a"); - HandleReloadSpellTargetPositionCommand(handler,"a"); - HandleReloadSpellThreatsCommand(handler,"a"); - HandleReloadSpellGroupStackRulesCommand(handler,"a"); - HandleReloadSpellPetAurasCommand(handler,"a"); + HandleReloadSkillDiscoveryTemplateCommand(handler, "a"); + HandleReloadSkillExtraItemTemplateCommand(handler, "a"); + HandleReloadSpellRequiredCommand(handler, "a"); + HandleReloadSpellAreaCommand(handler, "a"); + HandleReloadSpellGroupsCommand(handler, "a"); + HandleReloadSpellLearnSpellCommand(handler, "a"); + HandleReloadSpellLinkedSpellCommand(handler, "a"); + HandleReloadSpellProcEventCommand(handler, "a"); + HandleReloadSpellBonusesCommand(handler, "a"); + HandleReloadSpellTargetPositionCommand(handler, "a"); + HandleReloadSpellThreatsCommand(handler, "a"); + HandleReloadSpellGroupStackRulesCommand(handler, "a"); + HandleReloadSpellPetAurasCommand(handler, "a"); return true; } static bool HandleReloadAllGossipsCommand(ChatHandler* handler, const char* args) { - HandleReloadGossipMenuCommand(handler,"a"); - HandleReloadGossipMenuOptionCommand(handler,"a"); + HandleReloadGossipMenuCommand(handler, "a"); + HandleReloadGossipMenuOptionCommand(handler, "a"); if(*args != 'a') // already reload from all_scripts - HandleReloadGossipScriptsCommand(handler,"a"); - HandleReloadPointsOfInterestCommand(handler,"a"); + HandleReloadGossipScriptsCommand(handler, "a"); + HandleReloadPointsOfInterestCommand(handler, "a"); return true; } static bool HandleReloadAllItemCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadPageTextsCommand(handler,"a"); - HandleReloadItemEnchantementsCommand(handler,"a"); + HandleReloadPageTextsCommand(handler, "a"); + HandleReloadItemEnchantementsCommand(handler, "a"); return true; } static bool HandleReloadAllLocalesCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadLocalesAchievementRewardCommand(handler,"a"); - HandleReloadLocalesCreatureCommand(handler,"a"); - HandleReloadLocalesGameobjectCommand(handler,"a"); - HandleReloadLocalesGossipMenuOptionCommand(handler,"a"); - HandleReloadLocalesItemCommand(handler,"a"); - HandleReloadLocalesNpcTextCommand(handler,"a"); - HandleReloadLocalesPageTextCommand(handler,"a"); - HandleReloadLocalesPointsOfInterestCommand(handler,"a"); - HandleReloadLocalesQuestCommand(handler,"a"); + HandleReloadLocalesAchievementRewardCommand(handler, "a"); + HandleReloadLocalesCreatureCommand(handler, "a"); + HandleReloadLocalesGameobjectCommand(handler, "a"); + HandleReloadLocalesGossipMenuOptionCommand(handler, "a"); + HandleReloadLocalesItemCommand(handler, "a"); + HandleReloadLocalesNpcTextCommand(handler, "a"); + HandleReloadLocalesPageTextCommand(handler, "a"); + HandleReloadLocalesPointsOfInterestCommand(handler, "a"); + HandleReloadLocalesQuestCommand(handler, "a"); return true; } @@ -403,7 +403,7 @@ public: return false; uint32 entry = (uint32) atoi((char*)args); - QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1,difficulty_entry_2,difficulty_entry_3,KillCredit1,KillCredit2,modelid1,modelid2,modelid3,modelid4,name,subname,IconName,gossip_menu_id,minlevel,maxlevel,exp,faction_A,faction_H,npcflag,speed_walk,speed_run,scale,rank,mindmg,maxdmg,dmgschool,attackpower,dmg_multiplier,baseattacktime,rangeattacktime,unit_class,unit_flags,dynamicflags,family,trainer_type,trainer_spell,trainer_class,trainer_race,minrangedmg,maxrangedmg,rangedattackpower,type,type_flags,lootid,pickpocketloot,skinloot,resistance1,resistance2,resistance3,resistance4,resistance5,resistance6,spell1,spell2,spell3,spell4,spell5,spell6,spell7,spell8,PetSpellDataId,VehicleId,mingold,maxgold,AIName,MovementType,InhabitType,Health_mod,Mana_mod,Armor_mod,RacialLeader,questItem1,questItem2,questItem3,questItem4,questItem5,questItem6,movementId,RegenHealth,equipment_id,mechanic_immune_mask,flags_extra,ScriptName FROM creature_template WHERE entry = %u", entry); + QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = %u", entry); if (!result) { handler->PSendSysMessage(LANG_COMMAND_CREATURETEMPLATE_NOTFOUND, entry); diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 8925ba0d250..eac6d29651b 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -115,14 +115,14 @@ public: { char* nameStr; char* teleStr; - handler->extractOptFirstArg((char*)args,&nameStr,&teleStr); + handler->extractOptFirstArg((char*)args, &nameStr, &teleStr); if (!teleStr) return false; Player* target; uint64 target_guid; std::string target_name; - if (!handler->extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!handler->extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r @@ -149,7 +149,7 @@ public: return false; } - handler->PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(),"", tele->name.c_str()); + handler->PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(), "", tele->name.c_str()); if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_TELEPORTED_TO_BY, handler->GetNameLink().c_str()); @@ -163,7 +163,7 @@ public: else target->SaveRecallPosition(); - target->TeleportTo(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation); + target->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation); } else { @@ -174,8 +174,8 @@ public: std::string nameLink = handler->playerLink(target_name); handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE), tele->name.c_str()); - Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation, - sMapMgr->GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid); + Player::SavePositionInDB(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation, + sMapMgr->GetZoneId(tele->mapId, tele->position_x, tele->position_y, tele->position_z), target_guid); } return true; @@ -221,7 +221,7 @@ public: Group *grp = player->GetGroup(); if (!grp) { - handler->PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str()); + handler->PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -245,7 +245,7 @@ public: continue; } - handler->PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(),"", tele->name.c_str()); + handler->PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(), "", tele->name.c_str()); if (handler->needReportToTarget(pl)) (ChatHandler(pl)).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str()); diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 644023f9ac1..b96b656e7d8 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -57,7 +57,7 @@ public: static bool HandleTitlesCurrentCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -92,7 +92,7 @@ public: std::string tNameLink = handler->GetNameLink(target); target->SetTitle(titleInfo); // to be sure that title now known - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,titleInfo->bit_index); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->bit_index); handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, titleInfo->name[handler->GetSessionDbcLocale()], tNameLink.c_str()); @@ -102,7 +102,7 @@ public: static bool HandleTitlesAddCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -138,7 +138,7 @@ public: char const* targetName = target->GetName(); char titleNameStr[80]; - snprintf(titleNameStr,80,titleInfo->name[handler->GetSessionDbcLocale()],targetName); + snprintf(titleNameStr, 80, titleInfo->name[handler->GetSessionDbcLocale()], targetName); target->SetTitle(titleInfo); handler->PSendSysMessage(LANG_TITLE_ADD_RES, id, titleNameStr, tNameLink.c_str()); @@ -149,7 +149,7 @@ public: static bool HandleTitlesRemoveCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -181,19 +181,19 @@ public: return false; } - target->SetTitle(titleInfo,true); + target->SetTitle(titleInfo, true); std::string tNameLink = handler->GetNameLink(target); char const* targetName = target->GetName(); char titleNameStr[80]; - snprintf(titleNameStr,80,titleInfo->name[handler->GetSessionDbcLocale()],targetName); + snprintf(titleNameStr, 80, titleInfo->name[handler->GetSessionDbcLocale()], targetName); handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, id, titleNameStr, tNameLink.c_str()); if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE))) { - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0); handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET, tNameLink.c_str()); } @@ -235,8 +235,8 @@ public: if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE))) { - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0); - handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET,handler->GetNameLink(target).c_str()); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0); + handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET, handler->GetNameLink(target).c_str()); } return true; diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index fcb15b4b6f3..12475f8d218 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -109,7 +109,7 @@ public: return true; } - QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'", pathid); if (result) point = (*result)[0].GetUInt32(); @@ -117,10 +117,10 @@ public: Player* player = handler->GetSession()->GetPlayer(); //Map *map = player->GetMap(); - WorldDatabase.PExecute("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u','%u','%f', '%f', '%f')", + WorldDatabase.PExecute("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u', '%u', '%f', '%f', '%f')", pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); - handler->PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point+1,"|r|cff00ff00 created. "); + handler->PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point+1, "|r|cff00ff00 created. "); return true; } // HandleWpAddCommand @@ -166,19 +166,19 @@ public: } guidlow = target->GetDBTableGUIDLow(); - QueryResult result = WorldDatabase.PQuery("SELECT guid FROM creature_addon WHERE guid = '%u'",guidlow); + QueryResult result = WorldDatabase.PQuery("SELECT guid FROM creature_addon WHERE guid = '%u'", guidlow); if (result) WorldDatabase.PExecute("UPDATE creature_addon SET path_id = '%u' WHERE guid = '%u'", pathid, guidlow); else - WorldDatabase.PExecute("INSERT INTO creature_addon(guid,path_id) VALUES ('%u','%u')", guidlow, pathid); + WorldDatabase.PExecute("INSERT INTO creature_addon(guid, path_id) VALUES ('%u', '%u')", guidlow, pathid); WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, guidlow); target->LoadPath(pathid); target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); target->GetMotionMaster()->Initialize(); - target->MonsterSay("Path loaded.",0,0); + target->MonsterSay("Path loaded.", 0, 0); return true; } @@ -219,7 +219,7 @@ public: target->SetDefaultMovementType(IDLE_MOTION_TYPE); target->GetMotionMaster()->MoveTargetedHome(); target->GetMotionMaster()->Initialize(); - target->MonsterSay("Path unloaded.",0,0); + target->MonsterSay("Path unloaded.", 0, 0); return true; } handler->PSendSysMessage("%s%s|r", "|cffff33ff", "Target have no loaded path."); @@ -263,7 +263,7 @@ public: QueryResult result = WorldDatabase.Query("SELECT MAX(guid) FROM waypoint_scripts"); id = result->Fetch()->GetUInt32(); WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id+1); - handler->PSendSysMessage("%s%s%u|r", "|cff00ff00","Wp Event: New waypoint event added: |r|cff00ffff", id+1); + handler->PSendSysMessage("%s%s%u|r", "|cff00ff00", "Wp Event: New waypoint event added: |r|cff00ffff", id+1); } return true; @@ -273,7 +273,7 @@ public: { if (!arg_id) { - handler->PSendSysMessage("%s%s|r", "|cff33ffff","Wp Event: You must provide waypoint script id."); + handler->PSendSysMessage("%s%s|r", "|cff33ffff", "Wp Event: You must provide waypoint script id."); return true; } @@ -321,7 +321,7 @@ public: if (result) { WorldDatabase.PExecute("DELETE FROM waypoint_scripts WHERE guid = %u", id); - handler->PSendSysMessage("%s%s%u|r","|cff00ff00","Wp Event: Waypoint script removed: ", id); + handler->PSendSysMessage("%s%s%u|r", "|cff00ff00", "Wp Event: Waypoint script removed: ", id); } else handler->PSendSysMessage("|cffff33ffWp Event: ERROR: you have selected a non existing script: %u|r", id); @@ -345,7 +345,7 @@ public: return true; } - char* arg_2 = strtok(NULL," "); + char* arg_2 = strtok(NULL, " "); if (!arg_2) { @@ -365,7 +365,7 @@ public: char* arg_3; std::string arg_str_2 = arg_2; - arg_3 = strtok(NULL," "); + arg_3 = strtok(NULL, " "); if (!arg_3) { @@ -378,13 +378,13 @@ public: if (arg_str_2 == "setid") { uint32 newid = atoi(arg_3); - handler->PSendSysMessage("%s%s|r|cff00ffff%u|r|cff00ff00%s|r|cff00ffff%u|r","|cff00ff00","Wp Event: Wypoint scipt guid: ", newid," id changed: ", id); + handler->PSendSysMessage("%s%s|r|cff00ffff%u|r|cff00ff00%s|r|cff00ffff%u|r", "|cff00ff00", "Wp Event: Wypoint scipt guid: ", newid, " id changed: ", id); WorldDatabase.PExecute("UPDATE waypoint_scripts SET id='%u' WHERE guid='%u'", newid, id); return true; } else { - QueryResult result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'",id); + QueryResult result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'", id); if (!result) { @@ -439,7 +439,7 @@ public: arg_2, arg_str_3.c_str(), id); } } - handler->PSendSysMessage("%s%s|r|cff00ffff%u:|r|cff00ff00 %s %s|r","|cff00ff00","Waypoint script:", id, arg_2,"updated."); + handler->PSendSysMessage("%s%s|r|cff00ffff%u:|r|cff00ff00 %s %s|r", "|cff00ff00", "Waypoint script:", id, arg_2, "updated."); } return true; } @@ -599,7 +599,7 @@ public: //sMapMgr->GetMap(npcCreature->GetMapId())->Add(wpCreature2); } - WorldDatabase.PExecute("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'", + WorldDatabase.PExecute("UPDATE waypoint_data SET position_x = '%f', position_y = '%f', position_z = '%f' where id = '%u' AND point='%u'", chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), pathid, point); handler->PSendSysMessage(LANG_WAYPOINT_CHANGED); @@ -719,7 +719,7 @@ public: if (show == "on") { - QueryResult result = WorldDatabase.PQuery("SELECT point, position_x,position_y,position_z FROM waypoint_data WHERE id = '%u'", pathid); + QueryResult result = WorldDatabase.PQuery("SELECT point, position_x, position_y, position_z FROM waypoint_data WHERE id = '%u'", pathid); if (!result) { @@ -740,7 +740,7 @@ public: { Field *fields = result2->Fetch(); uint32 wpguid = fields[0].GetUInt32(); - Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); + Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); if (!pCreature) { @@ -793,7 +793,7 @@ public: wpCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); - wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(),map); + wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(), map); map->Add(wpCreature); if (target) @@ -813,7 +813,7 @@ public: { handler->PSendSysMessage("|cff00ff00DEBUG: wp first, GUID: %u|r", pathid); - QueryResult result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM waypoint_data WHERE point='1' AND id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z FROM waypoint_data WHERE point='1' AND id = '%u'", pathid); if (!result) { handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUND, pathid); @@ -832,7 +832,7 @@ public: Map *map = chr->GetMap(); Creature* pCreature = new Creature; - if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) + if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) { handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id); delete pCreature; @@ -856,13 +856,13 @@ public: { handler->PSendSysMessage("|cff00ff00DEBUG: wp last, PathID: |r|cff00ffff%u|r", pathid); - QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'", pathid); if (result) Maxpoint = (*result)[0].GetUInt32(); else Maxpoint = 0; - result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM waypoint_data WHERE point ='%u' AND id = '%u'",Maxpoint, pathid); + result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z FROM waypoint_data WHERE point ='%u' AND id = '%u'", Maxpoint, pathid); if (!result) { handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUNDLAST, pathid); @@ -914,7 +914,7 @@ public: { Field *fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(guid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); + Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(guid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); if (!pCreature) { handler->PSendSysMessage(LANG_WAYPOINT_NOTREMOVED, guid); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index a249c31df28..261c15d3cca 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -72,12 +72,12 @@ class mob_av_marshal_or_warmaster : public CreatureScript void Reset() { - uiChargeTimer = urand(2*IN_MILLISECONDS,12*IN_MILLISECONDS); - uiCleaveTimer = urand(1*IN_MILLISECONDS,11*IN_MILLISECONDS); - uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS,2*IN_MILLISECONDS); - uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,12*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiEnrageTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiChargeTimer = urand(2*IN_MILLISECONDS, 12*IN_MILLISECONDS); + uiCleaveTimer = urand(1*IN_MILLISECONDS, 11*IN_MILLISECONDS); + uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS, 2*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(1*IN_MILLISECONDS, 12*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiEnrageTimer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiResetTimer = 5*IN_MILLISECONDS; bHasAura = false; @@ -95,28 +95,28 @@ class mob_av_marshal_or_warmaster : public CreatureScript switch(me->GetEntry()) { case NPC_NORTH_MARSHAL: - DoCast(me,SPELL_NORTH_MARSHAL); + DoCast(me, SPELL_NORTH_MARSHAL); break; case NPC_SOUTH_MARSHAL: - DoCast(me,SPELL_SOUTH_MARSHAL); + DoCast(me, SPELL_SOUTH_MARSHAL); break; case NPC_STONEHEARTH_MARSHAL: - DoCast(me,SPELL_STONEHEARTH_MARSHAL); + DoCast(me, SPELL_STONEHEARTH_MARSHAL); break; case NPC_ICEWING_MARSHAL: - DoCast(me,SPELL_ICEWING_MARSHAL); + DoCast(me, SPELL_ICEWING_MARSHAL); break; case NPC_EAST_FROSTWOLF_WARMASTER: - DoCast(me,SPELL_EAST_FROSTWOLF_WARMASTER); + DoCast(me, SPELL_EAST_FROSTWOLF_WARMASTER); break; case NPC_WEST_FROSTWOLF_WARMASTER: - DoCast(me,SPELL_WEST_FROSTWOLF_WARMASTER); + DoCast(me, SPELL_WEST_FROSTWOLF_WARMASTER); break; case NPC_ICEBLOOD_WARMASTER: - DoCast(me,SPELL_ICEBLOOD_WARMASTER); + DoCast(me, SPELL_ICEBLOOD_WARMASTER); break; case NPC_TOWER_POINT_WARMASTER: - DoCast(me,SPELL_TOWER_POINT_WARMASTER); + DoCast(me, SPELL_TOWER_POINT_WARMASTER); break; } @@ -129,37 +129,37 @@ class mob_av_marshal_or_warmaster : public CreatureScript if (uiChargeTimer <= diff) { DoCast(me->getVictim(), SPELL_CHARGE); - uiChargeTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiChargeTimer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiChargeTimer -= diff; if (uiCleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - uiCleaveTimer = urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS); + uiCleaveTimer = urand(10*IN_MILLISECONDS, 16*IN_MILLISECONDS); } else uiCleaveTimer -= diff; if (uiDemoralizingShoutTimer <= diff) { DoCast(me->getVictim(), SPELL_DEMORALIZING_SHOUT); - uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiDemoralizingShoutTimer -= diff; if (uiWhirlwind1Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND1); - uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(6*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiWhirlwind1Timer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiEnrageTimer <= diff) { DoCast(me->getVictim(), SPELL_ENRAGE); - uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiEnrageTimer = urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS); }else uiEnrageTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 3219b284c80..c3518115f54 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -110,7 +110,7 @@ public: void Reset() { - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); uiConeOfColdTimer = 8*IN_MILLISECONDS; uiFireBoltTimer = 1*IN_MILLISECONDS; uiFrostboltTimer = 4*IN_MILLISECONDS; @@ -133,7 +133,7 @@ public: void JustSummoned(Creature* summoned) { CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->uiBalindaGUID = me->GetGUID(); - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); summoned->setFaction(me->getFaction()); Summons.Summon(summoned); } @@ -158,25 +158,25 @@ public: if (uiArcaneExplosionTimer < diff) { DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiArcaneExplosionTimer -= diff; if (uiConeOfColdTimer < diff) { DoCast(me->getVictim(), SPELL_CONE_OF_COLD); - uiConeOfColdTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiConeOfColdTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiConeOfColdTimer -= diff; if (uiFireBoltTimer < diff) { DoCast(me->getVictim(), SPELL_FIREBALL); - uiFireBoltTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS); + uiFireBoltTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); } else uiFireBoltTimer -= diff; if (uiFrostboltTimer < diff) { DoCast(me->getVictim(), SPELL_FROSTBOLT); - uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiFrostboltTimer = urand(4*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiFrostboltTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index ad61e43bcd4..2639d2ab5c6 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -59,12 +59,12 @@ public: void Reset() { - uiWhirlwindTimer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiWhirlwindTimer = urand(1*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(1*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiKnockdownTimer = 12*IN_MILLISECONDS; uiFrenzyTimer = 6*IN_MILLISECONDS; uiResetTimer = 5*IN_MILLISECONDS; - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } void EnterCombat(Unit * /*who*/) @@ -86,31 +86,31 @@ public: if (uiWhirlwindTimer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND); - uiWhirlwindTimer = urand(8*IN_MILLISECONDS,18*IN_MILLISECONDS); + uiWhirlwindTimer = urand(8*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiWhirlwindTimer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(7*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiKnockdownTimer <= diff) { DoCast(me->getVictim(), SPELL_KNOCKDOWN); - uiKnockdownTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiKnockdownTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiKnockdownTimer -= diff; if (uiFrenzyTimer <= diff) { DoCast(me->getVictim(), SPELL_FRENZY); - uiFrenzyTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiFrenzyTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiFrenzyTimer -= diff; if (uiYellTimer <= diff) { - DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5), me); - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5), me); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } else uiYellTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 74c0365c041..7014bfde7c4 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -50,11 +50,11 @@ public: void Reset() { - uiCleaveTimer = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiFrighteningShoutTimer = urand(2*IN_MILLISECONDS,19*IN_MILLISECONDS); - uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,13*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiMortalStrikeTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiCleaveTimer = urand(1*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiFrighteningShoutTimer = urand(2*IN_MILLISECONDS, 19*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(1*IN_MILLISECONDS, 13*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiMortalStrikeTimer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiResetTimer = 5*IN_MILLISECONDS; } @@ -76,31 +76,31 @@ public: if (uiCleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - uiCleaveTimer = urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS); + uiCleaveTimer = urand(10*IN_MILLISECONDS, 16*IN_MILLISECONDS); } else uiCleaveTimer -= diff; if (uiFrighteningShoutTimer <= diff) { DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); - uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiFrighteningShoutTimer -= diff; if (uiWhirlwind1Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND1); - uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(6*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else uiWhirlwind1Timer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiMortalStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiMortalStrikeTimer = urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiMortalStrikeTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 65b7c39f241..a04cb1b55b5 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -60,7 +60,7 @@ public: uiThunderclapTimer = 4*IN_MILLISECONDS; uiStormboltTimer = 6*IN_MILLISECONDS; uiResetTimer = 5*IN_MILLISECONDS; - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } void EnterCombat(Unit * /*who*/) @@ -71,7 +71,7 @@ public: void JustRespawned() { Reset(); - DoScriptText(RAND(YELL_RESPAWN1,YELL_RESPAWN2), me); + DoScriptText(RAND(YELL_RESPAWN1, YELL_RESPAWN2), me); } void UpdateAI(const uint32 diff) @@ -82,25 +82,25 @@ public: if (uiAvatarTimer <= diff) { DoCast(me->getVictim(), SPELL_AVATAR); - uiAvatarTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiAvatarTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiAvatarTimer -= diff; if (uiThunderclapTimer <= diff) { DoCast(me->getVictim(), SPELL_THUNDERCLAP); - uiThunderclapTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiThunderclapTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiThunderclapTimer -= diff; if (uiStormboltTimer <= diff) { DoCast(me->getVictim(), SPELL_STORMBOLT); - uiStormboltTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiStormboltTimer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiStormboltTimer -= diff; if (uiYellTimer <= diff) { - DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5,YELL_RANDOM6,YELL_RANDOM7), me); - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5, YELL_RANDOM6, YELL_RANDOM7), me); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } else uiYellTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index e46ed6c0593..58480e9d4d3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -113,8 +113,8 @@ public: if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE) return false; - pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); - pPlayer->SummonCreature(NPC_GRIMSTONE,625.559f,-205.618f,-52.735f,2.609f,TEMPSUMMON_DEAD_DESPAWN,0); + pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS); + pPlayer->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0); return false; } @@ -191,7 +191,7 @@ public: //TODO: move them to center void SummonRingMob() { - if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960f,-235.322f,-53.907f,1.857f,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId], 608.960f, -235.322f, -53.907f, 1.857f, TEMPSUMMON_DEAD_DESPAWN, 0)) RingMobGUID[MobCount] = tmp->GetGUID(); ++MobCount; @@ -203,7 +203,7 @@ public: //TODO: move them to center void SummonRingBoss() { - if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300f,-175.989f,-53.739f,3.418f,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6], 644.300f, -175.989f, -53.739f, 3.418f, TEMPSUMMON_DEAD_DESPAWN, 0)) RingBossGUID = tmp->GetGUID(); MobDeath_Timer = 2500; @@ -238,7 +238,7 @@ public: if (pInstance) { pInstance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me); - pInstance->SetData(TYPE_RING_OF_LAW,DONE); + pInstance->SetData(TYPE_RING_OF_LAW, DONE); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_grimstone: event reached end and set complete."); } break; @@ -263,7 +263,7 @@ public: if (RingBossGUID) { - Creature *boss = Unit::GetCreature(*me,RingBossGUID); + Creature *boss = Unit::GetCreature(*me, RingBossGUID); if (boss && !boss->isAlive() && boss->isDead()) { RingBossGUID = 0; @@ -276,7 +276,7 @@ public: for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) { - Creature *mob = Unit::GetCreature(*me,RingMobGUID[i]); + Creature *mob = Unit::GetCreature(*me, RingMobGUID[i]); if (mob && !mob->isAlive() && mob->isDead()) { RingMobGUID[i] = 0; @@ -626,9 +626,9 @@ public: { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); - dughal_stormwingAI->AddWaypoint(0, 280.42f,-82.86f, -77.12f,0); - dughal_stormwingAI->AddWaypoint(1, 287.64f,-87.01f, -76.79f,0); - dughal_stormwingAI->AddWaypoint(2, 354.63f,-64.95f, -67.53f,0); + dughal_stormwingAI->AddWaypoint(0, 280.42f, -82.86f, -77.12f, 0); + dughal_stormwingAI->AddWaypoint(1, 287.64f, -87.01f, -76.79f, 0); + dughal_stormwingAI->AddWaypoint(2, 354.63f, -64.95f, -67.53f, 0); return dughal_stormwingAI; } @@ -641,7 +641,7 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); } return true; } @@ -665,12 +665,12 @@ public: switch(i) { case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break; - case 1:pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 2: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); break; } } @@ -685,7 +685,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); } } @@ -737,26 +737,26 @@ public: { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); - marshal_windsorAI->AddWaypoint(0, 316.336f,-225.528f, -77.7258f,7000); - marshal_windsorAI->AddWaypoint(1, 316.336f,-225.528f, -77.7258f,2000); - marshal_windsorAI->AddWaypoint(2, 322.96f,-207.13f, -77.87f,0); - marshal_windsorAI->AddWaypoint(3, 281.05f,-172.16f, -75.12f,0); - marshal_windsorAI->AddWaypoint(4, 272.19f,-139.14f, -70.61f,0); - marshal_windsorAI->AddWaypoint(5, 283.62f,-116.09f, -70.21f,0); - marshal_windsorAI->AddWaypoint(6, 296.18f,-94.30f, -74.08f,0); - marshal_windsorAI->AddWaypoint(7, 294.57f,-93.11f, -74.08f,0); - marshal_windsorAI->AddWaypoint(8, 314.31f,-74.31f, -76.09f,0); - marshal_windsorAI->AddWaypoint(9, 360.22f,-62.93f, -66.77f,0); - marshal_windsorAI->AddWaypoint(10, 383.38f,-69.40f, -63.25f,0); - marshal_windsorAI->AddWaypoint(11, 389.99f,-67.86f, -62.57f,0); - marshal_windsorAI->AddWaypoint(12, 400.98f,-72.01f, -62.31f,0); - marshal_windsorAI->AddWaypoint(13, 404.22f,-62.30f, -63.50f,2300); - marshal_windsorAI->AddWaypoint(14, 404.22f,-62.30f, -63.50f,1500); - marshal_windsorAI->AddWaypoint(15, 407.65f,-51.86f, -63.96f,0); - marshal_windsorAI->AddWaypoint(16, 403.61f,-51.71f, -63.92f,1000); - marshal_windsorAI->AddWaypoint(17, 403.61f,-51.71f, -63.92f,2000); - marshal_windsorAI->AddWaypoint(18, 403.61f,-51.71f, -63.92f,1000); - marshal_windsorAI->AddWaypoint(19, 403.61f,-51.71f, -63.92f,0); + marshal_windsorAI->AddWaypoint(0, 316.336f, -225.528f, -77.7258f, 7000); + marshal_windsorAI->AddWaypoint(1, 316.336f, -225.528f, -77.7258f, 2000); + marshal_windsorAI->AddWaypoint(2, 322.96f, -207.13f, -77.87f, 0); + marshal_windsorAI->AddWaypoint(3, 281.05f, -172.16f, -75.12f, 0); + marshal_windsorAI->AddWaypoint(4, 272.19f, -139.14f, -70.61f, 0); + marshal_windsorAI->AddWaypoint(5, 283.62f, -116.09f, -70.21f, 0); + marshal_windsorAI->AddWaypoint(6, 296.18f, -94.30f, -74.08f, 0); + marshal_windsorAI->AddWaypoint(7, 294.57f, -93.11f, -74.08f, 0); + marshal_windsorAI->AddWaypoint(8, 314.31f, -74.31f, -76.09f, 0); + marshal_windsorAI->AddWaypoint(9, 360.22f, -62.93f, -66.77f, 0); + marshal_windsorAI->AddWaypoint(10, 383.38f, -69.40f, -63.25f, 0); + marshal_windsorAI->AddWaypoint(11, 389.99f, -67.86f, -62.57f, 0); + marshal_windsorAI->AddWaypoint(12, 400.98f, -72.01f, -62.31f, 0); + marshal_windsorAI->AddWaypoint(13, 404.22f, -62.30f, -63.50f, 2300); + marshal_windsorAI->AddWaypoint(14, 404.22f, -62.30f, -63.50f, 1500); + marshal_windsorAI->AddWaypoint(15, 407.65f, -51.86f, -63.96f, 0); + marshal_windsorAI->AddWaypoint(16, 403.61f, -51.71f, -63.92f, 1000); + marshal_windsorAI->AddWaypoint(17, 403.61f, -51.71f, -63.92f, 2000); + marshal_windsorAI->AddWaypoint(18, 403.61f, -51.71f, -63.92f, 1000); + marshal_windsorAI->AddWaypoint(19, 403.61f, -51.71f, -63.92f, 0); return marshal_windsorAI; } @@ -768,7 +768,7 @@ public: if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) { CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); pCreature->setFaction(11); } @@ -806,7 +806,7 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 14: - pInstance->SetData(DATA_GATE_SR,0); + pInstance->SetData(DATA_GATE_SR, 0); me->setFaction(11); break; case 16: @@ -816,13 +816,13 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 18: - pInstance->SetData(DATA_GATE_SC,0); + pInstance->SetData(DATA_GATE_SC, 0); break; case 19: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR,403.61f,-51.71f,-63.92f,3.600434f,TEMPSUMMON_DEAD_DESPAWN ,0); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN , 0); pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -830,7 +830,7 @@ public: void EnterCombat(Unit* who) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->Say(SAY_WINDSOR_AGGRO1, LANG_UNIVERSAL, PlayerGUID); break; case 1: me->Say(SAY_WINDSOR_AGGRO2, LANG_UNIVERSAL, PlayerGUID); break; @@ -842,7 +842,7 @@ public: void JustDied(Unit *slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_FAILED); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) @@ -911,41 +911,41 @@ public: { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); - marshal_reginald_windsorAI->AddWaypoint(0, 403.61f,-52.71f, -63.92f,4000); - marshal_reginald_windsorAI->AddWaypoint(1, 403.61f,-52.71f, -63.92f,4000); - marshal_reginald_windsorAI->AddWaypoint(2, 406.33f,-54.87f, -63.95f,0); - marshal_reginald_windsorAI->AddWaypoint(3, 407.99f,-73.91f, -62.26f,0); - marshal_reginald_windsorAI->AddWaypoint(4, 557.03f,-119.71f, -61.83f,0); - marshal_reginald_windsorAI->AddWaypoint(5, 573.40f,-124.39f, -65.07f,0); - marshal_reginald_windsorAI->AddWaypoint(6, 593.91f,-130.29f, -69.25f,0); - marshal_reginald_windsorAI->AddWaypoint(7, 593.21f,-132.16f, -69.25f,0); - marshal_reginald_windsorAI->AddWaypoint(8, 593.21f,-132.16f, -69.25f,3000); - marshal_reginald_windsorAI->AddWaypoint(9, 622.81f,-135.55f, -71.92f,0); - marshal_reginald_windsorAI->AddWaypoint(10, 634.68f,-151.29f, -70.32f,0); - marshal_reginald_windsorAI->AddWaypoint(11, 635.06f,-153.25f, -70.32f,0); - marshal_reginald_windsorAI->AddWaypoint(12, 635.06f,-153.25f, -70.32f,3000); - marshal_reginald_windsorAI->AddWaypoint(13, 635.06f,-153.25f, -70.32f,1500); - marshal_reginald_windsorAI->AddWaypoint(14, 655.25f,-172.39f, -73.72f,0); - marshal_reginald_windsorAI->AddWaypoint(15, 654.79f,-226.30f, -83.06f,0); - marshal_reginald_windsorAI->AddWaypoint(16, 622.85f,-268.85f, -83.96f,0); - marshal_reginald_windsorAI->AddWaypoint(17, 579.45f,-275.56f, -80.44f,0); - marshal_reginald_windsorAI->AddWaypoint(18, 561.19f,-266.85f, -75.59f,0); - marshal_reginald_windsorAI->AddWaypoint(19, 547.91f,-253.92f, -70.34f,0); - marshal_reginald_windsorAI->AddWaypoint(20, 549.20f,-252.40f, -70.34f,0); - marshal_reginald_windsorAI->AddWaypoint(21, 549.20f,-252.40f, -70.34f,4000); - marshal_reginald_windsorAI->AddWaypoint(22, 555.33f,-269.16f, -74.40f,0); - marshal_reginald_windsorAI->AddWaypoint(23, 554.31f,-270.88f, -74.40f,0); - marshal_reginald_windsorAI->AddWaypoint(24, 554.31f,-270.88f, -74.40f,4000); - marshal_reginald_windsorAI->AddWaypoint(25, 536.10f,-249.60f, -67.47f,0); - marshal_reginald_windsorAI->AddWaypoint(26, 520.94f,-216.65f, -59.28f,0); - marshal_reginald_windsorAI->AddWaypoint(27, 505.99f,-148.74f, -62.17f,0); - marshal_reginald_windsorAI->AddWaypoint(28, 484.21f,-56.24f, -62.43f,0); - marshal_reginald_windsorAI->AddWaypoint(29, 470.39f,-6.01f, -70.10f,0); - marshal_reginald_windsorAI->AddWaypoint(30, 451.27f,30.85f, -70.07f,0); - marshal_reginald_windsorAI->AddWaypoint(31, 452.45f,29.85f, -70.37f,1500); - marshal_reginald_windsorAI->AddWaypoint(32, 452.45f,29.85f, -70.37f,7000); - marshal_reginald_windsorAI->AddWaypoint(33, 452.45f,29.85f, -70.37f,10000); - marshal_reginald_windsorAI->AddWaypoint(34, 451.27f,31.85f, -70.07f,0); + marshal_reginald_windsorAI->AddWaypoint(0, 403.61f, -52.71f, -63.92f, 4000); + marshal_reginald_windsorAI->AddWaypoint(1, 403.61f, -52.71f, -63.92f, 4000); + marshal_reginald_windsorAI->AddWaypoint(2, 406.33f, -54.87f, -63.95f, 0); + marshal_reginald_windsorAI->AddWaypoint(3, 407.99f, -73.91f, -62.26f, 0); + marshal_reginald_windsorAI->AddWaypoint(4, 557.03f, -119.71f, -61.83f, 0); + marshal_reginald_windsorAI->AddWaypoint(5, 573.40f, -124.39f, -65.07f, 0); + marshal_reginald_windsorAI->AddWaypoint(6, 593.91f, -130.29f, -69.25f, 0); + marshal_reginald_windsorAI->AddWaypoint(7, 593.21f, -132.16f, -69.25f, 0); + marshal_reginald_windsorAI->AddWaypoint(8, 593.21f, -132.16f, -69.25f, 3000); + marshal_reginald_windsorAI->AddWaypoint(9, 622.81f, -135.55f, -71.92f, 0); + marshal_reginald_windsorAI->AddWaypoint(10, 634.68f, -151.29f, -70.32f, 0); + marshal_reginald_windsorAI->AddWaypoint(11, 635.06f, -153.25f, -70.32f, 0); + marshal_reginald_windsorAI->AddWaypoint(12, 635.06f, -153.25f, -70.32f, 3000); + marshal_reginald_windsorAI->AddWaypoint(13, 635.06f, -153.25f, -70.32f, 1500); + marshal_reginald_windsorAI->AddWaypoint(14, 655.25f, -172.39f, -73.72f, 0); + marshal_reginald_windsorAI->AddWaypoint(15, 654.79f, -226.30f, -83.06f, 0); + marshal_reginald_windsorAI->AddWaypoint(16, 622.85f, -268.85f, -83.96f, 0); + marshal_reginald_windsorAI->AddWaypoint(17, 579.45f, -275.56f, -80.44f, 0); + marshal_reginald_windsorAI->AddWaypoint(18, 561.19f, -266.85f, -75.59f, 0); + marshal_reginald_windsorAI->AddWaypoint(19, 547.91f, -253.92f, -70.34f, 0); + marshal_reginald_windsorAI->AddWaypoint(20, 549.20f, -252.40f, -70.34f, 0); + marshal_reginald_windsorAI->AddWaypoint(21, 549.20f, -252.40f, -70.34f, 4000); + marshal_reginald_windsorAI->AddWaypoint(22, 555.33f, -269.16f, -74.40f, 0); + marshal_reginald_windsorAI->AddWaypoint(23, 554.31f, -270.88f, -74.40f, 0); + marshal_reginald_windsorAI->AddWaypoint(24, 554.31f, -270.88f, -74.40f, 4000); + marshal_reginald_windsorAI->AddWaypoint(25, 536.10f, -249.60f, -67.47f, 0); + marshal_reginald_windsorAI->AddWaypoint(26, 520.94f, -216.65f, -59.28f, 0); + marshal_reginald_windsorAI->AddWaypoint(27, 505.99f, -148.74f, -62.17f, 0); + marshal_reginald_windsorAI->AddWaypoint(28, 484.21f, -56.24f, -62.43f, 0); + marshal_reginald_windsorAI->AddWaypoint(29, 470.39f, -6.01f, -70.10f, 0); + marshal_reginald_windsorAI->AddWaypoint(30, 451.27f, 30.85f, -70.07f, 0); + marshal_reginald_windsorAI->AddWaypoint(31, 452.45f, 29.85f, -70.37f, 1500); + marshal_reginald_windsorAI->AddWaypoint(32, 452.45f, 29.85f, -70.37f, 7000); + marshal_reginald_windsorAI->AddWaypoint(33, 452.45f, 29.85f, -70.37f, 10000); + marshal_reginald_windsorAI->AddWaypoint(34, 451.27f, 31.85f, -70.07f, 0); return marshal_reginald_windsorAI; } @@ -1035,7 +1035,7 @@ public: void EnterCombat(Unit* who) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->Say(SAY_WINDSOR_AGGRO1, LANG_UNIVERSAL, PlayerGUID); break; case 1: me->Say(SAY_WINDSOR_AGGRO2, LANG_UNIVERSAL, PlayerGUID); break; @@ -1046,7 +1046,7 @@ public: void JustDied(Unit *slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_FAILED); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) @@ -1056,25 +1056,25 @@ public: { if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_JAZ,1); - pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREATURE_JAZ, 1); + pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); } } else if (wp == 11) { if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_SHILL,1); - pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREATURE_SHILL, 1); + pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) { - pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); SetEscortPaused(false); } } @@ -1082,14 +1082,14 @@ public: { if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_CREST,1); + pInstance->SetData(DATA_CREATURE_CREST, 1); me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); } } if (pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); @@ -1131,7 +1131,7 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); } return true; } @@ -1160,7 +1160,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); } } @@ -1170,12 +1170,12 @@ public: { case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 2: - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 4: me->SetVisibility(VISIBILITY_OFF); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); break; } } @@ -1323,7 +1323,7 @@ public: { if (BreakKeg_Timer <= diff) { - DoGo(DATA_GO_BAR_KEG,0); + DoGo(DATA_GO_BAR_KEG, 0); BreakKeg_Timer = 0; BreakDoor_Timer = 1000; } else BreakKeg_Timer -= diff; @@ -1333,16 +1333,16 @@ public: { if (BreakDoor_Timer <= diff) { - DoGo(DATA_GO_BAR_DOOR,2); - DoGo(DATA_GO_BAR_KEG_TRAP,0); //doesn't work very well, leaving code here for future + DoGo(DATA_GO_BAR_DOOR, 2); + DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future //spell by trap has effect61, this indicate the bar go hostile - if (Unit *tmp = Unit::GetUnit(*me,pInstance->GetData64(DATA_PHALANX))) + if (Unit *tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) tmp->setFaction(14); //for later, this event(s) has alot more to it. //optionally, DONE can trigger bar to go hostile. - pInstance->SetData(TYPE_BAR,DONE); + pInstance->SetData(TYPE_BAR, DONE); BreakDoor_Timer = 0; } else BreakDoor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 6c5850f4029..1e8e5e74750 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -57,7 +57,7 @@ public: void SummonSpirits(Unit* victim) { - if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Spirit->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index ab6a09a11d0..2b90ddbcd11 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -81,7 +81,7 @@ public: if (HandOfThaurissan_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index de95d503fd6..e067cd90221 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -67,13 +67,13 @@ public: void SummonAdds(Unit* victim) { - if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14,14)), float(irand(-14,14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedAdd->AI()->AttackStart(victim); } void SummonMedics(Unit* victim) { - if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMedic->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 02435e94473..149b5ffc192 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -74,7 +74,7 @@ public: if (InstanceScript* pInstance = pCreature->GetInstanceScript()) { //are 5 minutes expected? go template may have data to despawn when used at quest - pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE),MINUTE*5); + pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE), MINUTE*5); } break; } @@ -129,7 +129,7 @@ public: pCreature->AI()->AttackStart(pPlayer); InstanceScript* pInstance = pCreature->GetInstanceScript(); if (pInstance) - pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID()); + pInstance->SetData64(DATA_EVENSTARTER, pPlayer->GetGUID()); break; } return true; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 8b70079818c..92b0f216fff 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -386,8 +386,8 @@ public: void TombOfSevenReset() { - HandleGameObject(GoTombExitGUID,false);//event reseted, close exit door - HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door + HandleGameObject(GoTombExitGUID, false);//event reseted, close exit door + HandleGameObject(GoTombEnterGUID, true);//event reseted, open entrance door for (uint8 i = 0; i < 7; ++i) { if (Creature* boss = instance->GetCreature(TombBossGUIDs[i])) @@ -414,16 +414,16 @@ public: void TombOfSevenStart() { - HandleGameObject(GoTombExitGUID,false);//event started, close exit door - HandleGameObject(GoTombEnterGUID,false);//event started, close entrance door + HandleGameObject(GoTombExitGUID, false);//event started, close exit door + HandleGameObject(GoTombEnterGUID, false);//event started, close entrance door SetData(TYPE_TOMB_OF_SEVEN, IN_PROGRESS); } void TombOfSevenEnd() { - DoRespawnGameObject(GoChestGUID,DAY); - HandleGameObject(GoTombExitGUID,true);//event done, open exit door - HandleGameObject(GoTombEnterGUID,true);//event done, open entrance door + DoRespawnGameObject(GoChestGUID, DAY); + HandleGameObject(GoTombExitGUID, true);//event done, open exit door + HandleGameObject(GoTombEnterGUID, true);//event done, open entrance door TombEventStarterGUID = 0; SetData(TYPE_TOMB_OF_SEVEN, DONE); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp index 5c3c43f2566..3c467b1c7a8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp @@ -90,7 +90,7 @@ public: break; case EVENT_MOTHERS_MILK: DoCast(me, SPELL_MOTHERSMILK); - events.ScheduleEvent(EVENT_MOTHERS_MILK, urand(5*IN_MILLISECONDS,12500)); + events.ScheduleEvent(EVENT_MOTHERS_MILK, urand(5*IN_MILLISECONDS, 12500)); break; } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 5812779d3bb..4f71bdef129 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -89,11 +89,11 @@ public: if (!Summoned && HealthBelowPct(51)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN,300*IN_MILLISECONDS)) + if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN, 300*IN_MILLISECONDS)) warlord->AI()->AttackStart(target); - if (Creature* berserker = me->SummonCreature(NPC_SMOLDERTHORN_BERSERKER, SummonLocation2, TEMPSUMMON_TIMED_DESPAWN,300*IN_MILLISECONDS)) + if (Creature* berserker = me->SummonCreature(NPC_SMOLDERTHORN_BERSERKER, SummonLocation2, TEMPSUMMON_TIMED_DESPAWN, 300*IN_MILLISECONDS)) berserker->AI()->AttackStart(target); Summoned = true; } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 42cc415a84e..14870a81289 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -82,14 +82,14 @@ public: if (BlastWave_Timer <= diff) { DoCast(me->getVictim(), SPELL_BLASTWAVE); - BlastWave_Timer = urand(8000,16000); + BlastWave_Timer = urand(8000, 16000); } else BlastWave_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { DoCast(me->getVictim(), SPELL_MORTALSTRIKE); - MortalStrike_Timer = urand(25000,35000); + MortalStrike_Timer = urand(25000, 35000); } else MortalStrike_Timer -= diff; if (KnockBack_Timer <= diff) @@ -97,9 +97,9 @@ public: DoCast(me->getVictim(), SPELL_KNOCKBACK); //Drop 50% aggro if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); - KnockBack_Timer = urand(15000,30000); + KnockBack_Timer = urand(15000, 30000); } else KnockBack_Timer -= diff; if (EnterEvadeIfOutOfCombatArea(diff)) diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 337c39fbfa8..2202982e595 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -42,10 +42,10 @@ enum Spells SPELL_NATURE_VULNERABILITY = 22280, SPELL_ARCANE_VULNERABILITY = 22281, //Other spells - SPELL_INCINERATE = 23308, //Incinerate 23308,23309 + SPELL_INCINERATE = 23308, //Incinerate 23308, 23309 SPELL_TIMELAPSE = 23310, //Time lapse 23310, 23311(old threat mod that was removed in 2.01) SPELL_CORROSIVEACID = 23313, //Corrosive Acid 23313, 23314 - SPELL_IGNITEFLESH = 23315, //Ignite Flesh 23315,23316 + SPELL_IGNITEFLESH = 23315, //Ignite Flesh 23315, 23316 SPELL_FROSTBURN = 23187, //Frost burn 23187, 23189 //Brood Affliction 23173 - Scripted Spell that cycles through all targets within 100 yards and has a chance to cast one of the afflictions on them //Since Scripted spells arn't coded I'll just write a function that does the same thing @@ -77,7 +77,7 @@ public: //5 possiblities for the first breath, 4 for the second, 20 total possiblites //This way we don't end up casting 2 of the same breath //TL TL would be stupid - switch (urand(0,19)) + switch (urand(0, 19)) { //B1 - Incin case 0: @@ -284,7 +284,7 @@ public: { DoCast(me, SPELL_FRENZY); DoScriptText(EMOTE_FRENZY, me); - Frenzy_Timer = urand(10000,15000); + Frenzy_Timer = urand(10000, 15000); } else Frenzy_Timer -= diff; //Enrage if not already enraged and below 20% diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 304f4a23f66..73bea5bbc3c 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -71,7 +71,7 @@ public: if (ShadowFlame_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWFLAME); - ShadowFlame_Timer = urand(12000,15000); + ShadowFlame_Timer = urand(12000, 15000); } else ShadowFlame_Timer -= diff; //Wing Buffet Timer @@ -85,7 +85,7 @@ public: if (ShadowOfEbonroc_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWOFEBONROC); - ShadowOfEbonroc_Timer = urand(25000,350000); + ShadowOfEbonroc_Timer = urand(25000, 350000); } else ShadowOfEbonroc_Timer -= diff; if (me->getVictim()->HasAura(SPELL_SHADOWOFEBONROC)) @@ -93,7 +93,7 @@ public: if (Heal_Timer <= diff) { DoCast(me, SPELL_HEAL); - Heal_Timer = urand(1000,3000); + Heal_Timer = urand(1000, 3000); } else Heal_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 248a2a9a24c..8ae3b52d289 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -68,7 +68,7 @@ public: if (ShadowFlame_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWFLAME); - ShadowFlame_Timer = urand(15000,18000); + ShadowFlame_Timer = urand(15000, 18000); } else ShadowFlame_Timer -= diff; //WingBuffet_Timer @@ -76,7 +76,7 @@ public: { DoCast(me->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-75); + DoModifyThreatPercent(me->getVictim(), -75); WingBuffet_Timer = 25000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 5e846c44464..25e5306dae5 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -78,7 +78,7 @@ public: { DoCast(me->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-75); + DoModifyThreatPercent(me->getVictim(), -75); WingBuffet_Timer = 25000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index b57417f323a..0c975bdd171 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -112,7 +112,7 @@ public: void EnterCombat(Unit * who) { - DoScriptText(RAND(SAY_XHEALTH,SAY_AGGRO,SAY_SHADOWFLAME), me); + DoScriptText(RAND(SAY_XHEALTH, SAY_AGGRO, SAY_SHADOWFLAME), me); DoCast(who, SPELL_SHADOWFLAME_INITIAL); DoZoneInCombat(); @@ -174,7 +174,7 @@ public: //On official it is based on what classes are currently on the hostil list //but we can't do that yet so just randomly call one - switch (urand(0,8)) + switch (urand(0, 8)) { case 0: DoScriptText(SAY_MAGE, me); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 5c631f4b626..f97f081594e 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -83,21 +83,21 @@ public: if (Cleave_Timer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - Cleave_Timer = urand(7000,10000); + Cleave_Timer = urand(7000, 10000); } else Cleave_Timer -= diff; //WarStomp_Timer if (WarStomp_Timer <= diff) { DoCast(me->getVictim(), SPELL_WARSTOMP); - WarStomp_Timer = urand(15000,25000); + WarStomp_Timer = urand(15000, 25000); } else WarStomp_Timer -= diff; //FireballVolley_Timer if (FireballVolley_Timer <= diff) { DoCast(me->getVictim(), SPELL_FIREBALLVOLLEY); - FireballVolley_Timer = urand(12000,15000); + FireballVolley_Timer = urand(12000, 15000); } else FireballVolley_Timer -= diff; //Conflagration_Timer @@ -107,7 +107,7 @@ public: //We will remove this threat reduction and add an aura check. //if (DoGetThreat(me->getVictim())) - //DoModifyThreatPercent(me->getVictim(),-50); + //DoModifyThreatPercent(me->getVictim(), -50); Conflagration_Timer = 12000; } else Conflagration_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index c12b58a216c..c502828ab36 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -168,9 +168,9 @@ public: break; case 2: me->setFaction(103); - if (PlayerGUID && Unit::GetUnit((*me),PlayerGUID)) + if (PlayerGUID && Unit::GetUnit((*me), PlayerGUID)) { - AttackStart(Unit::GetUnit((*me),PlayerGUID)); + AttackStart(Unit::GetUnit((*me), PlayerGUID)); DoCast(me, SPELL_ESSENCEOFTHERED); } SpeechTimer = 0; @@ -202,7 +202,7 @@ public: if (FlameBreath_Timer <= diff) { DoCast(me->getVictim(), SPELL_FLAMEBREATH); - FlameBreath_Timer = urand(4000,8000); + FlameBreath_Timer = urand(4000, 8000); } else FlameBreath_Timer -= diff; //BurningAdrenalineCaster_Timer @@ -219,7 +219,7 @@ public: i = 3; } if (pTarget) // cast on self (see below) - pTarget->CastSpell(pTarget,SPELL_BURNINGADRENALINE,1); + pTarget->CastSpell(pTarget, SPELL_BURNINGADRENALINE, 1); BurningAdrenalineCaster_Timer = 15000; } else BurningAdrenalineCaster_Timer -= diff; @@ -229,7 +229,7 @@ public: { // have the victim cast the spell on himself otherwise the third effect aura will be applied // to Vael instead of the player - me->getVictim()->CastSpell(me->getVictim(),SPELL_BURNINGADRENALINE,1); + me->getVictim()->CastSpell(me->getVictim(), SPELL_BURNINGADRENALINE, 1); BurningAdrenalineTank_Timer = 45000; } else BurningAdrenalineTank_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index b077ba1d82a..a2165dbbd92 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -113,7 +113,7 @@ public: boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) { NefarianGUID = 0; - switch (urand(0,19)) + switch (urand(0, 19)) { case 0: DrakType1 = CREATURE_BRONZE_DRAKANOID; @@ -219,7 +219,7 @@ public: NefarianGUID = 0; NefCheckTime = 2000; - me->SetUInt32Value(UNIT_NPC_FLAGS,1); + me->SetUInt32Value(UNIT_NPC_FLAGS, 1); me->setFaction(35); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -237,7 +237,7 @@ public: AttackStart((*i)); } */ - me->SetUInt32Value(UNIT_NPC_FLAGS,0); + me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(103); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); AttackStart(pTarget); @@ -272,7 +272,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWBOLT); - ShadowBoltTimer = urand(3000,10000); + ShadowBoltTimer = urand(3000, 10000); } else ShadowBoltTimer -= diff; //FearTimer @@ -293,7 +293,7 @@ public: Unit *pTarget = NULL; //1 in 3 chance it will be a chromatic - if (urand(0,2) == 0) + if (urand(0, 2) == 0) CreatureID = CREATURE_CHROMATIC_DRAKANOID; else CreatureID = DrakType1; @@ -301,7 +301,7 @@ public: ++SpawnedAdds; //Spawn Creature and force it to start attacking a random target - Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID, ADD_X1, ADD_Y1, ADD_Z1, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -310,14 +310,14 @@ public: } //1 in 3 chance it will be a chromatic - if (urand(0,2) == 0) + if (urand(0, 2) == 0) CreatureID = CREATURE_CHROMATIC_DRAKANOID; else CreatureID = DrakType2; ++SpawnedAdds; - Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID, ADD_X2, ADD_Y2, ADD_Z2, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -329,7 +329,7 @@ public: if (SpawnedAdds >= 42) { //Teleport Victor Nefarius way out of the map - //sMapMgr->GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0); + //sMapMgr->GetMap(me->GetMapId(), me)->CreatureRelocation(me, 0, 0, -5000, 0); //Interrupt any spell casting me->InterruptNonMeleeSpells(false); @@ -341,11 +341,11 @@ public: DoCast(me, 8149); //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues) - DoTeleportTo(HIDE_X,HIDE_Y,HIDE_Z); + DoTeleportTo(HIDE_X, HIDE_Y, HIDE_Z); me->AddUnitState(UNIT_STAT_FLEEING); //Spawn nef and have him attack a random target - Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); + Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN, NEF_X, NEF_Y, NEF_Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Nefarian) { @@ -363,7 +363,7 @@ public: { if (NefCheckTime <= diff) { - Unit* Nefarian = Unit::GetCreature((*me),NefarianGUID); + Unit* Nefarian = Unit::GetCreature((*me), NefarianGUID); //If nef is dead then we die to so the players get out of combat //and cannot repeat the event diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index bba334a943e..2a7ca7ff872 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -67,9 +67,9 @@ public: void Reset() { - uiTrashTimer = urand(5000,9000); + uiTrashTimer = urand(5000, 9000); uiSlamTimer = 9000; - uiNimbleReflexesTimer = urand(15500,31600); + uiNimbleReflexesTimer = urand(15500, 31600); uiHealth = 0; @@ -86,7 +86,7 @@ public: bool bCheckChances() { - uint32 uiChances = urand(0,99); + uint32 uiChances = urand(0, 99); if (uiChances <= 15) return false; else @@ -103,7 +103,7 @@ public: { if (bCheckChances()) DoCast(me, SPELL_TRASH); - uiTrashTimer = urand(6000,15500); + uiTrashTimer = urand(6000, 15500); } else uiTrashTimer -= uiDiff; if (uiSlamTimer <= uiDiff) @@ -117,17 +117,17 @@ public: { if (bCheckChances()) DoCast(me, SPELL_NIMBLE_REFLEXES); - uiNimbleReflexesTimer = urand(27300,60100); + uiNimbleReflexesTimer = urand(27300, 60100); } else uiNimbleReflexesTimer -= uiDiff; /*END ACID-AI*/ if ((uiHealth == 0 && !HealthAbovePct(66)) || (uiHealth == 1 && !HealthAbovePct(33))) { ++uiHealth; - DoCastAOE(SPELL_SMITE_STOMP,false); + DoCastAOE(SPELL_SMITE_STOMP, false); SetCombatMovement(false); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_SMITE_CHEST))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_SMITE_CHEST))) { me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(1, pGo->GetPositionX() - 3.0f, pGo->GetPositionY(), pGo->GetPositionZ()); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index f976d1ae418..370bcfe13b9 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -128,9 +128,9 @@ class instance_deadmines : public InstanceMapScript { if (GameObject* pIronCladDoor = instance->GetGameObject(IronCladDoorGUID)) { - Creature* DefiasPirate1 = pIronCladDoor->SummonCreature(657,pIronCladDoor->GetPositionX() - 2,pIronCladDoor->GetPositionY()-7,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); - Creature* DefiasPirate2 = pIronCladDoor->SummonCreature(657,pIronCladDoor->GetPositionX() + 3,pIronCladDoor->GetPositionY()-6,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); - Creature* DefiasCompanion = pIronCladDoor->SummonCreature(3450,pIronCladDoor->GetPositionX() + 2,pIronCladDoor->GetPositionY()-6,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasPirate1 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() - 2, pIronCladDoor->GetPositionY()-7, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasPirate2 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() + 3, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasCompanion = pIronCladDoor->SummonCreature(3450, pIronCladDoor->GetPositionX() + 2, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); DefiasPirate1GUID = DefiasPirate1->GetGUID(); DefiasPirate2GUID = DefiasPirate2->GetGUID(); @@ -157,7 +157,7 @@ class instance_deadmines : public InstanceMapScript void MoveCreatureInside(Creature* creature) { creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - creature->GetMotionMaster()->MovePoint(0, -102.7f,-655.9f, creature->GetPositionZ()); + creature->GetMotionMaster()->MovePoint(0, -102.7f, -655.9f, creature->GetPositionZ()); } void ShootCannon() @@ -239,7 +239,7 @@ class instance_deadmines : public InstanceMapScript WorldPacket data(4); data.SetOpcode(SMSG_PLAY_SOUND); data << uint32(sound); - unit->SendMessageToSet(&data,false); + unit->SendMessageToSet(&data, false); } void DoPlaySoundCreature(Unit* unit, uint32 sound) @@ -247,7 +247,7 @@ class instance_deadmines : public InstanceMapScript WorldPacket data(4); data.SetOpcode(SMSG_PLAY_SOUND); data << uint32(sound); - unit->SendMessageToSet(&data,false); + unit->SendMessageToSet(&data, false); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 8b683215bed..2fc6c76caf8 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -66,23 +66,23 @@ enum eBlastmasterEmiShortfuse const Position SpawnPosition[] = { - {-557.630f,-114.514f,-152.209f,0.641f}, - {-555.263f,-113.802f,-152.737f,0.311f}, - {-552.154f,-112.476f,-153.349f,0.621f}, - {-548.692f,-111.089f,-154.090f,0.621f}, - {-546.905f,-108.340f,-154.877f,0.729f}, - {-547.736f,-105.154f,-155.176f,0.372f}, - {-547.274f,-114.109f,-153.952f,0.735f}, - {-552.534f,-110.012f,-153.577f,0.747f}, - {-550.708f,-116.436f,-153.103f,0.679f}, - {-554.030f,-115.983f,-152.635f,0.695f}, - {-494.595f,-87.516f,149.116f,3.344f}, - {-493.349f,-90.845f,-148.882f,3.717f}, - {-491.995f,-87.619f,-148.197f,3.230f}, - {-490.732f,-90.739f,-148.091f,3.230f}, - {-490.554f,-89.114f,-148.055f,3.230f}, - {-495.240f,-90.808f,-149.493f,3.238f}, - {-494.195f,-89.553f,-149.131f,3.254f} + {-557.630f, -114.514f, -152.209f, 0.641f}, + {-555.263f, -113.802f, -152.737f, 0.311f}, + {-552.154f, -112.476f, -153.349f, 0.621f}, + {-548.692f, -111.089f, -154.090f, 0.621f}, + {-546.905f, -108.340f, -154.877f, 0.729f}, + {-547.736f, -105.154f, -155.176f, 0.372f}, + {-547.274f, -114.109f, -153.952f, 0.735f}, + {-552.534f, -110.012f, -153.577f, 0.747f}, + {-550.708f, -116.436f, -153.103f, 0.679f}, + {-554.030f, -115.983f, -152.635f, 0.695f}, + {-494.595f, -87.516f, 149.116f, 3.344f}, + {-493.349f, -90.845f, -148.882f, 3.717f}, + {-491.995f, -87.619f, -148.197f, 3.230f}, + {-490.732f, -90.739f, -148.091f, 3.230f}, + {-490.554f, -89.114f, -148.055f, 3.230f}, + {-495.240f, -90.808f, -149.493f, 3.238f}, + {-494.195f, -89.553f, -149.131f, 3.254f} }; class npc_blastmaster_emi_shortfuse : public CreatureScript @@ -101,10 +101,10 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, pCreature->AI())) - pEscortAI->Start(true, false,pPlayer->GetGUID()); + pEscortAI->Start(true, false, pPlayer->GetGUID()); pCreature->setFaction(pPlayer->getFaction()); - pCreature->AI()->SetData(1,0); + pCreature->AI()->SetData(1, 0); pPlayer->CLOSE_GOSSIP_MENU(); } @@ -154,7 +154,7 @@ public: } } - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + void NextStep(uint32 uiTimerStep, bool bNextStep = true, uint8 uiPhaseStep = 0) { uiTimer = uiTimerStep; if (bNextStep) @@ -174,14 +174,14 @@ public: { if (pGo) { - if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(),pGo->GetPositionZ(), 0, 1)) + if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) { //visual effects are not working! ¬¬ - trigger->CastSpell(trigger,11542,true); - trigger->CastSpell(trigger,35470,true); + trigger->CastSpell(trigger, 11542, true); + trigger->CastSpell(trigger, 35470, true); } pGo->RemoveFromWorld(); - //pGo->CastSpell(me,12158); makes all die?! + //pGo->CastSpell(me, 12158); makes all die?! } } } @@ -189,12 +189,12 @@ public: if (bBool) { if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, false, pGo); }else if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, false, pGo); } void SetInFace(bool bBool) @@ -204,10 +204,10 @@ public: if (bBool) { - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) me->SetFacingToObject(pGo); }else - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) me->SetFacingToObject(pGo); } @@ -216,11 +216,11 @@ public: if (!pInstance) return; - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, false, pGo); - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, false, pGo); if (!GoSummonList.empty()) for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) @@ -277,47 +277,47 @@ public: { case 3: SetEscortPaused(true); - NextStep(2000,false,3); + NextStep(2000, false, 3); break; case 7: SetEscortPaused(true); - NextStep(2000,false,4); + NextStep(2000, false, 4); break; case 9: - NextStep(1000,false,8); + NextStep(1000, false, 8); break; case 10: - NextStep(25000,false,10); + NextStep(25000, false, 10); break; case 11: SetEscortPaused(true); SetInFace(true); - NextStep(1000,false,11); + NextStep(1000, false, 11); break; case 12: - NextStep(25000,false,18); + NextStep(25000, false, 18); break; case 13: Summon(7); - NextStep(25000,false,19); + NextStep(25000, false, 19); break; case 14: SetInFace(false); - DoScriptText(SAY_BLASTMASTER_26,me); + DoScriptText(SAY_BLASTMASTER_26, me); SetEscortPaused(true); - NextStep(5000,false,20); + NextStep(5000, false, 20); break; } } - void SetData(uint32 uiI,uint32 uiValue) + void SetData(uint32 uiI, uint32 uiValue) { switch(uiI) { case 1: SetEscortPaused(true); - DoScriptText(SAY_BLASTMASTER_0,me); - NextStep(1500,true); + DoScriptText(SAY_BLASTMASTER_0, me); + NextStep(1500, true); break; case 2: if (!pInstance) @@ -330,7 +330,7 @@ public: break; case 2: pInstance->SetData(TYPE_EVENT, DONE); - NextStep(5000,false,22); + NextStep(5000, false, 22); break; } break; @@ -354,10 +354,10 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 2: - if (GameObject* pGo = me->SummonGameObject(183410, -533.140f,-105.322f,-156.016f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! } Summon(3); break; @@ -366,20 +366,20 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); - DoScriptText(SAY_BLASTMASTER_19,me); + DoScriptText(SAY_BLASTMASTER_19, me); break; case 4: - if (GameObject* pGo = me->SummonGameObject(183410, -542.199f,-96.854f,-155.790f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case 5: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); - DoScriptText(SAY_BLASTMASTER_15,me); + DoScriptText(SAY_BLASTMASTER_15, me); break; case 6: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[10], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); @@ -389,23 +389,23 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 7: - if (GameObject* pGo = me->SummonGameObject(183410, -507.820f,-103.333f,-151.353f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! Summon(6); } break; case 8: - if (GameObject* pGo = me->SummonGameObject(183410, -511.829f,-86.249f,-151.431f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! } break; case 9: if (Creature* pGrubbis = me->SummonCreature(NPC_GRUBBIS, SpawnPosition[15], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000)) - DoScriptText(SAY_GRUBBIS,pGrubbis); + DoScriptText(SAY_GRUBBIS, pGrubbis); me->SummonCreature(NPC_CHOMPER, SpawnPosition[16], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; } @@ -420,109 +420,109 @@ public: switch(uiPhase) { case 1: - DoScriptText(SAY_BLASTMASTER_1,me); - NextStep(1500,true); + DoScriptText(SAY_BLASTMASTER_1, me); + NextStep(1500, true); break; case 2: SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 3: - DoScriptText(SAY_BLASTMASTER_2,me); + DoScriptText(SAY_BLASTMASTER_2, me); SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 4: - DoScriptText(SAY_BLASTMASTER_3,me); - NextStep(3000,true); + DoScriptText(SAY_BLASTMASTER_3, me); + NextStep(3000, true); break; case 5: - DoScriptText(SAY_BLASTMASTER_4,me); - NextStep(3000,true); + DoScriptText(SAY_BLASTMASTER_4, me); + NextStep(3000, true); break; case 6: SetInFace(true); - DoScriptText(SAY_BLASTMASTER_5,me); + DoScriptText(SAY_BLASTMASTER_5, me); Summon(1); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,true,pGo); - NextStep(3000,true); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, true, pGo); + NextStep(3000, true); break; case 7: - DoScriptText(SAY_BLASTMASTER_6,me); + DoScriptText(SAY_BLASTMASTER_6, me); SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 8: me->HandleEmoteCommand(EMOTE_STATE_WORK); - NextStep(25000,true); + NextStep(25000, true); break; case 9: Summon(2); - NextStep(0,false); + NextStep(0, false); break; case 10: Summon(4); - NextStep(0,false); + NextStep(0, false); break; case 11: - DoScriptText(SAY_BLASTMASTER_17,me); - NextStep(5000,true); + DoScriptText(SAY_BLASTMASTER_17, me); + NextStep(5000, true); break; case 12: - DoScriptText(SAY_BLASTMASTER_18,me); - NextStep(5000,true); + DoScriptText(SAY_BLASTMASTER_18, me); + NextStep(5000, true); break; case 13: - DoScriptText(SAY_BLASTMASTER_20,me); + DoScriptText(SAY_BLASTMASTER_20, me); CaveDestruction(true); - NextStep(8000,true); + NextStep(8000, true); break; case 14: - DoScriptText(SAY_BLASTMASTER_21,me); - NextStep(8500,true); + DoScriptText(SAY_BLASTMASTER_21, me); + NextStep(8500, true); break; case 15: - DoScriptText(SAY_BLASTMASTER_22,me); - NextStep(2000,true); + DoScriptText(SAY_BLASTMASTER_22, me); + NextStep(2000, true); break; case 16: - DoScriptText(SAY_BLASTMASTER_23,me); + DoScriptText(SAY_BLASTMASTER_23, me); SetInFace(false); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,true,pGo); - NextStep(2000,true); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, true, pGo); + NextStep(2000, true); break; case 17: SetEscortPaused(false); - DoScriptText(SAY_BLASTMASTER_24,me); + DoScriptText(SAY_BLASTMASTER_24, me); Summon(6); - NextStep(0,false); + NextStep(0, false); break; case 18: Summon(7); - NextStep(0,false); + NextStep(0, false); break; case 19: SetInFace(false); Summon(8); - DoScriptText(SAY_BLASTMASTER_25,me); - NextStep(0,false); + DoScriptText(SAY_BLASTMASTER_25, me); + NextStep(0, false); break; case 20: - DoScriptText(SAY_BLASTMASTER_27,me); - NextStep(2000,true); + DoScriptText(SAY_BLASTMASTER_27, me); + NextStep(2000, true); break; case 21: Summon(9); - NextStep(0,false); + NextStep(0, false); break; case 22: CaveDestruction(false); - DoScriptText(SAY_BLASTMASTER_20,me); - NextStep(0,false); + DoScriptText(SAY_BLASTMASTER_20, me); + NextStep(0, false); break; } } else uiTimer -= uiDiff; @@ -566,7 +566,7 @@ public: return; if (Unit* pSummon = CAST_SUM(me)->GetSummoner()) - CAST_CRE(pSummon)->AI()->SetData(2,1); + CAST_CRE(pSummon)->AI()->SetData(2, 1); } void UpdateAI(const uint32 /*diff*/) @@ -583,7 +583,7 @@ public: return; if (Unit* pSummon = CAST_SUM(me)->GetSummoner()) - CAST_CRE(pSummon)->AI()->SetData(2,2); + CAST_CRE(pSummon)->AI()->SetData(2, 2); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 884c9ecc731..8b42c7135e5 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -90,12 +90,12 @@ public: case GO_CAVE_IN_LEFT: uiCaveInLeftGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED) - HandleGameObject(0,false,go); + HandleGameObject(0, false, go); break; case GO_CAVE_IN_RIGHT: uiCaveInRightGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED) - HandleGameObject(0,false,go); + HandleGameObject(0, false, go); break; } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 612626909ef..94155f51f11 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -77,7 +77,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -159,9 +159,9 @@ public: } else { - if (urand(0,1) == 0) + if (urand(0, 1) == 0) { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); } } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index a550cff0df5..84dcf2d40b8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -74,8 +74,8 @@ public: void KilledUnit(Unit* /*Victim*/) { - if (urand(0,1) == 0) - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + if (urand(0, 1) == 0) + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -108,9 +108,9 @@ public: if (Repentance_Timer <= diff) { DoCast(me->getVictim(), SPELL_REPENTANCE); - DoScriptText(RAND(SAY_REPENTANCE1,SAY_REPENTANCE2), me); + DoScriptText(RAND(SAY_REPENTANCE1, SAY_REPENTANCE2), me); - Repentance_Timer = urand(25000,35000); //A little randomness on that spell + Repentance_Timer = urand(25000, 35000); //A little randomness on that spell } else Repentance_Timer -= diff; if (Holyfire_Timer <= diff) @@ -118,7 +118,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYFIRE); - Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! + Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! } else Holyfire_Timer -= diff; if (Holywrath_Timer <= diff) @@ -126,7 +126,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYWRATH); - Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice + Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice } else Holywrath_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 03721d01fb7..ba6908fd2e9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -62,9 +62,9 @@ public: { Phase = 1; - CleaveTimer = urand(10000,15000); + CleaveTimer = urand(10000, 15000); CurseTimer = 30000; - RandomYellTimer = urand(30000,60000); //Occasionally yell + RandomYellTimer = urand(30000, 60000); //Occasionally yell ChargeTimer = 20000; ResetTimer = 0; } @@ -86,7 +86,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -159,7 +159,7 @@ public: Attumen = pAttumen->GetGUID(); pAttumen->AI()->AttackStart(me->getVictim()); SetMidnight(pAttumen, me->GetGUID()); - DoScriptText(RAND(SAY_APPEAR1,SAY_APPEAR2,SAY_APPEAR3), pAttumen); + DoScriptText(RAND(SAY_APPEAR1, SAY_APPEAR2, SAY_APPEAR3), pAttumen); } } else if (Phase == 2 && HealthBelowPct(25)) @@ -185,7 +185,7 @@ public: pAttumen->GetMotionMaster()->MoveChase(pAttumen->getVictim()); pAttumen->SetUInt64Value(UNIT_FIELD_TARGET, pAttumen->getVictim()->GetGUID()); } - pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X,1); + pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X, 1); } } else Mount_Timer -= diff; } @@ -206,7 +206,7 @@ public: float newX = me->GetPositionX() + cos(angle)*(distance/2) ; float newY = me->GetPositionY() + sin(angle)*(distance/2) ; float newZ = 50; - //me->Relocate(newX,newY,newZ,angle); + //me->Relocate(newX, newY, newZ, angle); //me->SendMonsterMove(newX, newY, newZ, 0, true, 1000); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(0, newX, newY, newZ); @@ -215,7 +215,7 @@ public: newY = me->GetPositionY() + sin(angle)*(distance/2) ; pAttumen->GetMotionMaster()->Clear(); pAttumen->GetMotionMaster()->MovePoint(0, newX, newY, newZ); - //pAttumen->Relocate(newX,newY,newZ,-angle); + //pAttumen->Relocate(newX, newY, newZ, -angle); //pAttumen->SendMonsterMove(newX, newY, newZ, 0, true, 1000); Mount_Timer = 1000; } @@ -257,7 +257,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (CleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWCLEAVE); - CleaveTimer = urand(10000,15000); + CleaveTimer = urand(10000, 15000); } else CleaveTimer -= diff; if (CurseTimer <= diff) @@ -268,8 +268,8 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_RANDOM1,SAY_RANDOM2), me); - RandomYellTimer = urand(30000,60000); + DoScriptText(RAND(SAY_RANDOM1, SAY_RANDOM2), me); + RandomYellTimer = urand(30000, 60000); } else RandomYellTimer -= diff; if (me->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index c14b60eed41..80a86c62318 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -133,7 +133,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); } void JustDied(Unit* /*victim*/) @@ -207,7 +207,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Creature::GetCreature((*me),AddGUID[i]); + Temp = Creature::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) Temp->DisappearAndDie(); } @@ -221,7 +221,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Creature::GetCreature((*me),AddGUID[i]); + Temp = Creature::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) { Temp->AI()->AttackStart(me->getVictim()); @@ -256,7 +256,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Unit::GetCreature((*me),AddGUID[i]); + Temp = Unit::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) if (!Temp->getVictim()) Temp->AI()->AttackStart(me->getVictim()); @@ -300,10 +300,10 @@ public: { if (Wait_Timer <= diff) { - DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2), me); + DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget, SPELL_GARROTE,true); + pTarget->CastSpell(pTarget, SPELL_GARROTE, true); InVanish = false; } else Wait_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index a836a4fdf12..8a96f761798 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -52,11 +52,11 @@ enum Netherspite_Portal{ }; const uint32 PortalID[3] = {17369, 17367, 17368}; -const uint32 PortalVisual[3] = {30487,30490,30491}; -const uint32 PortalBeam[3] = {30465,30464,30463}; -const uint32 PlayerBuff[3] = {30421,30422,30423}; -const uint32 NetherBuff[3] = {30466,30467,30468}; -const uint32 PlayerDebuff[3] = {38637,38638,38639}; +const uint32 PortalVisual[3] = {30487, 30490, 30491}; +const uint32 PortalBeam[3] = {30465, 30464, 30463}; +const uint32 PlayerBuff[3] = {30421, 30422, 30423}; +const uint32 NetherBuff[3] = {30466, 30467, 30468}; +const uint32 PlayerDebuff[3] = {38637, 38638, 38639}; class boss_netherspite : public CreatureScript { @@ -110,10 +110,10 @@ public: yh = pTarget->GetPositionY(); // check if target is between (not checking distance from the beam yet) - if (dist(xn,yn,xh,yh) >= dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh) >= dist(xn,yn,xp,yp)) + if (dist(xn, yn, xh, yh) >= dist(xn, yn, xp, yp) || dist(xp, yp, xh, yh) >= dist(xn, yn, xp, yp)) return false; // check distance from the beam - return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn,yn,xp,yp) < 1.5f); + return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn, yn, xp, yp) < 1.5f); } float dist(float xa, float ya, float xb, float yb) // auxiliary method for distance @@ -141,7 +141,7 @@ public: pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0) for (int i=0; i<3; ++i) - if (Creature *portal = me->SummonCreature(PortalID[i],PortalCoord[pos[i]][0],PortalCoord[pos[i]][1],PortalCoord[pos[i]][2],0,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) { PortalGUID[i] = portal->GetGUID(); portal->AddAura(PortalVisual[i], portal); @@ -181,9 +181,9 @@ public: Player* p = i->getSource(); if (p && p->isAlive() // alive && (!pTarget || pTarget->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best - && !p->HasAura(PlayerDebuff[j],0) // not exhausted - && !p->HasAura(PlayerBuff[(j+1)%3],0) // not on another beam - && !p->HasAura(PlayerBuff[(j+2)%3],0) + && !p->HasAura(PlayerDebuff[j], 0) // not exhausted + && !p->HasAura(PlayerBuff[(j+1)%3], 0) // not on another beam + && !p->HasAura(PlayerBuff[(j+2)%3], 0) && IsBetween(me, p, portal)) // on the beam pTarget = p; } @@ -206,7 +206,7 @@ public: BeamerGUID[j] = 0; } // create new one and start beaming on the target - if (Creature *beamer = portal->SummonCreature(PortalID[j],portal->GetPositionX(),portal->GetPositionY(),portal->GetPositionZ(),portal->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) { beamer->CastSpell(pTarget, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); @@ -227,7 +227,7 @@ public: PortalPhase = true; PortalTimer = 10000; EmpowermentTimer = 10000; - DoScriptText(EMOTE_PHASE_PORTAL,me); + DoScriptText(EMOTE_PHASE_PORTAL, me); } void SwitchToBanishPhase() @@ -239,7 +239,7 @@ public: DestroyPortals(); PhaseTimer = 30000; PortalPhase = false; - DoScriptText(EMOTE_PHASE_BANISH,me); + DoScriptText(EMOTE_PHASE_BANISH, me); for (int i=0; i<3; ++i) me->RemoveAurasDueToSpell(NetherBuff[i]); @@ -271,7 +271,7 @@ public: // Void Zone if (VoidZoneTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,45,true),SPELL_VOIDZONE,true); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true); VoidZoneTimer = 15000; } else VoidZoneTimer -= diff; @@ -314,9 +314,9 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,40,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) DoCast(pTarget, SPELL_NETHERBREATH); - NetherbreathTimer = urand(5000,7000); + NetherbreathTimer = urand(5000, 7000); } else NetherbreathTimer -= diff; if (PhaseTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index d4d8b8d67d5..4c954c2dd51 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -48,14 +48,14 @@ EndScriptData */ float IntroWay[8][3] = { - {-11053.37f,-1794.48f,149.00f}, - {-11141.07f,-1841.40f,125.00f}, - {-11187.28f,-1890.23f,125.00f}, - {-11189.20f,-1931.25f,125.00f}, - {-11153.76f,-1948.93f,125.00f}, - {-11128.73f,-1929.75f,125.00f}, - {-11140.00f,-1915.00f,122.00f}, - {-11163.00f,-1903.00f,91.473f} + {-11053.37f, -1794.48f, 149.00f}, + {-11141.07f, -1841.40f, 125.00f}, + {-11187.28f, -1890.23f, 125.00f}, + {-11189.20f, -1931.25f, 125.00f}, + {-11153.76f, -1948.93f, 125.00f}, + {-11128.73f, -1929.75f, 125.00f}, + {-11140.00f, -1915.00f, 122.00f}, + {-11163.00f, -1903.00f, 91.473f} }; class boss_nightbane : public CreatureScript @@ -140,7 +140,7 @@ public: if (!Intro) { - me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0); + me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0); me->GetMotionMaster()->MoveTargetedHome(); } } @@ -193,7 +193,7 @@ public: if (id >= 8) { Intro = false; - me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0); + me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0); return; } @@ -242,11 +242,11 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); (*me).GetMotionMaster()->Clear(false); - (*me).GetMotionMaster()->MovePoint(0,IntroWay[2][0],IntroWay[2][1],IntroWay[2][2]); + (*me).GetMotionMaster()->MovePoint(0, IntroWay[2][0], IntroWay[2][1], IntroWay[2][2]); Flying = true; - FlyTimer = urand(45000,60000); //timer wrong between 45 and 60 seconds + FlyTimer = urand(45000, 60000); //timer wrong between 45 and 60 seconds ++FlyCount; RainofBonesTimer = 5000; //timer wrong (maybe) @@ -265,11 +265,11 @@ public: { me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); + me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]); } else { - me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); + me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]); ++MovePhase; } } @@ -279,11 +279,11 @@ public: { me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); + me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]); } else { - me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); + me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]); ++MovePhase; } } @@ -310,7 +310,7 @@ public: if (BellowingRoarTimer <= diff) { DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); - BellowingRoarTimer = urand(30000,40000); + BellowingRoarTimer = urand(30000, 40000); } else BellowingRoarTimer -= diff; if (SmolderingBreathTimer <= diff) @@ -402,10 +402,10 @@ public: if (FlyTimer <= diff) //landing { - me->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0); + me->MonsterYell(RAND(*YELL_LAND_PHASE_1, *YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0); me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]); + me->GetMotionMaster()->MovePoint(3, IntroWay[3][0], IntroWay[3][1], IntroWay[3][2]); Flying = true; } else FlyTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index ad33f9f9398..c016b232939 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -42,7 +42,7 @@ EndScriptData */ // 18 Coordinates for Infernal spawns struct InfernalPoint { - float x,y; + float x, y; }; #define INFERNAL_Z 275.5f @@ -230,8 +230,8 @@ public: Cleave_Timer = 8000; InfernalTimer = 45000; InfernalCleanupTimer = 47000; - AxesTargetSwitchTimer = urand(7500,20000); - SunderArmorTimer = urand(5000,10000); + AxesTargetSwitchTimer = urand(7500, 20000); + SunderArmorTimer = urand(5000, 10000); phase = 1; if (pInstance) @@ -240,7 +240,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -379,7 +379,7 @@ public: DoCast(Infernal, SPELL_INFERNAL_RELAY); } - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); } void UpdateAI(const uint32 diff) @@ -477,14 +477,14 @@ public: if (SunderArmorTimer <= diff) { DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); - SunderArmorTimer = urand(10000,18000); + SunderArmorTimer = urand(10000, 18000); } else SunderArmorTimer -= diff; if (Cleave_Timer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - Cleave_Timer = urand(6000,12000); + Cleave_Timer = urand(6000, 12000); } else Cleave_Timer -= diff; } @@ -492,7 +492,7 @@ public: { if (AxesTargetSwitchTimer <= diff) { - AxesTargetSwitchTimer = urand(7500,20000); + AxesTargetSwitchTimer = urand(7500, 20000); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -515,7 +515,7 @@ public: { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); - AmplifyDamageTimer = urand(20000,30000); + AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index cabc7426d81..6218b72bcdf 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -159,7 +159,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -175,7 +175,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) { @@ -345,7 +345,7 @@ public: if (SecondarySpellTimer <= diff) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(me, SPELL_AOE_CS); @@ -355,7 +355,7 @@ public: DoCast(pTarget, SPELL_CHAINSOFICE); break; } - SecondarySpellTimer = urand(5000,20000); + SecondarySpellTimer = urand(5000, 20000); } else SecondarySpellTimer -= diff; if (SuperCastTimer <= diff) @@ -378,12 +378,12 @@ public: break; } - LastSuperSpell = Available[urand(0,1)]; + LastSuperSpell = Available[urand(0, 1)]; switch (LastSuperSpell) { case SUPER_AE: - DoScriptText(RAND(SAY_EXPLOSION1,SAY_EXPLOSION2), me); + DoScriptText(RAND(SAY_EXPLOSION1, SAY_EXPLOSION2), me); DoCast(me, SPELL_BLINK_CENTER, true); DoCast(me, SPELL_PLAYERPULL, true); @@ -392,7 +392,7 @@ public: break; case SUPER_FLAME: - DoScriptText(RAND(SAY_FLAMEWREATH1,SAY_FLAMEWREATH2), me); + DoScriptText(RAND(SAY_FLAMEWREATH1, SAY_FLAMEWREATH2), me); FlameWreathTimer = 20000; FlameWreathCheckTime = 500; @@ -405,7 +405,7 @@ public: break; case SUPER_BLIZZARD: - DoScriptText(RAND(SAY_BLIZZARD1,SAY_BLIZZARD2), me); + DoScriptText(RAND(SAY_BLIZZARD1, SAY_BLIZZARD2), me); if (Creature* pSpawn = me->SummonCreature(CREATURE_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000)) { @@ -415,7 +415,7 @@ public: break; } - SuperCastTimer = urand(35000,40000); + SuperCastTimer = urand(35000, 40000); } else SuperCastTimer -= diff; if (!ElementalsSpawned && HealthBelowPct(40)) @@ -542,7 +542,7 @@ public: if (CastTimer <= diff) { DoCast(me->getVictim(), SPELL_WATERBOLT); - CastTimer = urand(2000,5000); + CastTimer = urand(2000, 5000); } else CastTimer -= diff; } }; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index a763e353860..9c60fafb5a3 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -119,7 +119,7 @@ public: me->InterruptNonMeleeSpells(false); DoCast(me->getVictim(), SPELL_AMPLIFY_FLAMES); - AmplifyTimer = urand(10000,20000); + AmplifyTimer = urand(10000, 20000); } else AmplifyTimer -= diff; DoMeleeAttackIfReady(); @@ -157,7 +157,7 @@ public: { if (SacrificeGUID) { - Unit* Sacrifice = Unit::GetUnit((*me),SacrificeGUID); + Unit* Sacrifice = Unit::GetUnit((*me), SacrificeGUID); if (Sacrifice) Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE); } @@ -178,7 +178,7 @@ public: struct mob_fiendish_portalAI : public PassiveAI { - mob_fiendish_portalAI(Creature *c) : PassiveAI(c),summons(me){} + mob_fiendish_portalAI(Creature *c) : PassiveAI(c), summons(me){} SummonList summons; @@ -333,7 +333,7 @@ public: if (pSummoned->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SPELL_FIENDISH_PORTAL_1) { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); SummonedPortals = true; } } @@ -341,7 +341,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*killer*/) @@ -380,7 +380,7 @@ public: { CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = pTarget->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); - DoScriptText(RAND(SAY_SACRIFICE1,SAY_SACRIFICE2), me); + DoScriptText(RAND(SAY_SACRIFICE1, SAY_SACRIFICE2), me); SacrificeTimer = 30000; } } @@ -402,7 +402,7 @@ public: if (PortalGUID[0] && PortalGUID[1]) { - if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0,1)])) + if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0, 1)])) pPortal->CastSpell(me->getVictim(), SPELL_SUMMON_FIENDISIMP, false); SummonTimer = 5000; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 4c354ad048a..ddb5970d155 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -345,7 +345,7 @@ public: if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10))) { /* - if (not direct damage(aoe,dot)) + if (not direct damage(aoe, dot)) return; */ @@ -597,19 +597,19 @@ public: if (MangleTimer <= diff) { DoCast(me->getVictim(), SPELL_MANGLE); - MangleTimer = urand(5000,8000); + MangleTimer = urand(5000, 8000); } else MangleTimer -= diff; if (ShredTimer <= diff) { DoCast(me->getVictim(), SPELL_SHRED); - ShredTimer = urand(10000,15000); + ShredTimer = urand(10000, 15000); } else ShredTimer -= diff; if (ScreamTimer <= diff) { DoCast(me->getVictim(), SPELL_FRIGHTENED_SCREAM); - ScreamTimer = urand(20000,30000); + ScreamTimer = urand(20000, 30000); } else ScreamTimer -= diff; DoMeleeAttackIfReady(); @@ -653,7 +653,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_CRONE_AGGRO,SAY_CRONE_AGGRO2), me); + DoScriptText(RAND(SAY_CRONE_AGGRO, SAY_CRONE_AGGRO2), me); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } @@ -683,7 +683,7 @@ public: if (CycloneTimer <= diff) { - if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0,9)), float(urand(0,9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) + if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0, 9)), float(urand(0, 9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true); CycloneTimer = 30000; } else CycloneTimer -= diff; @@ -737,7 +737,7 @@ public: Position pos; me->GetRandomNearPosition(pos, 10); me->GetMotionMaster()->MovePoint(0, pos); - MoveTimer = urand(5000,8000); + MoveTimer = urand(5000, 8000); } else MoveTimer -= diff; } }; @@ -905,13 +905,13 @@ public: if (FearTimer <= diff) { DoCast(me->getVictim(), SPELL_TERRIFYING_HOWL); - FearTimer = urand(25000,35000); + FearTimer = urand(25000, 35000); } else FearTimer -= diff; if (SwipeTimer <= diff) { DoCast(me->getVictim(), SPELL_WIDE_SWIPE); - SwipeTimer = urand(25000,30000); + SwipeTimer = urand(25000, 30000); } else SwipeTimer -= diff; } @@ -1293,27 +1293,27 @@ public: if (pTarget && !me->HasInArc(M_PI, pTarget)) { DoCast(pTarget, SPELL_BACKWARD_LUNGE); - BackwardLungeTimer = urand(15000,30000); + BackwardLungeTimer = urand(15000, 30000); } } else BackwardLungeTimer -= diff; if (DaringTimer <= diff) { DoCast(me, SPELL_DARING); - DaringTimer = urand(20000,40000); + DaringTimer = urand(20000, 40000); } else DaringTimer -= diff; if (DeadlySwatheTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DEADLY_SWATHE); - DeadlySwatheTimer = urand(15000,25000); + DeadlySwatheTimer = urand(15000, 25000); } else DeadlySwatheTimer -= diff; if (PoisonThrustTimer <= diff) { DoCast(me->getVictim(), SPELL_POISON_THRUST); - PoisonThrustTimer = urand(10000,20000); + PoisonThrustTimer = urand(10000, 20000); } else PoisonThrustTimer -= diff; DoMeleeAttackIfReady(); @@ -1412,31 +1412,31 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLINDING_PASSION); - BlindingPassionTimer = urand(30000,45000); + BlindingPassionTimer = urand(30000, 45000); } else BlindingPassionTimer -= diff; if (DevotionTimer <= diff) { DoCast(me, SPELL_DEVOTION); - DevotionTimer = urand(15000,45000); + DevotionTimer = urand(15000, 45000); } else DevotionTimer -= diff; if (PowerfulAttractionTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION); - PowerfulAttractionTimer = urand(5000,30000); + PowerfulAttractionTimer = urand(5000, 30000); } else PowerfulAttractionTimer -= diff; if (EternalAffectionTimer <= diff) { - if (urand(0,1) && SummonedRomulo) + if (urand(0, 1) && SummonedRomulo) { Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID)); if (Romulo && Romulo->isAlive() && !RomuloDead) DoCast(Romulo, SPELL_ETERNAL_AFFECTION); } else DoCast(me, SPELL_ETERNAL_AFFECTION); - EternalAffectionTimer = urand(45000,60000); + EternalAffectionTimer = urand(45000, 60000); } else EternalAffectionTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 93ce549c291..2b0806f9e5e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -84,7 +84,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); // 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered. - m_uiOperaEvent = urand(1,3); + m_uiOperaEvent = urand(1, 3); m_uiOzDeathCount = 0; m_uiCurtainGUID = 0; @@ -149,7 +149,7 @@ public: case TYPE_NETHERSPITE: m_auiEncounter[8] = uiData; break; case TYPE_CHESS: if (uiData == DONE) - DoRespawnGameObject(DustCoveredChest,DAY); + DoRespawnGameObject(DustCoveredChest, DAY); m_auiEncounter[9] = uiData; break; case TYPE_MALCHEZZAR: m_auiEncounter[10] = uiData; break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 92a63a37b3e..9d643667e7b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -342,17 +342,17 @@ public: case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_OZ; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", pPlayer->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_HOOD; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", pPlayer->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_RAJ; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", pPlayer->GetGUID()); break; } @@ -375,7 +375,7 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); } - if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI,pCreature->AI())) + if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI())) { if (!pBarnesAI->RaidWiped) pPlayer->SEND_GOSSIP_MENU(8970, pCreature->GetGUID()); @@ -459,8 +459,8 @@ public: #define SPELL_CONFLAGRATION_BLAST 30977 #define SPELL_MANA_SHIELD 31635 -static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f}; -static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f}; +static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; +static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; class npc_image_of_medivh : public CreatureScript { @@ -497,11 +497,11 @@ public: if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0) { pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID()); - (*me).GetMotionMaster()->MovePoint(1,MedivPos[0],MedivPos[1],MedivPos[2]); + (*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]); Step = 0; }else { - me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); } } @@ -523,12 +523,12 @@ public: { Step = 1; EventStarted = true; - Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (!Arcanagos) return; ArcanagosGUID = Arcanagos->GetGUID(); Arcanagos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - (*Arcanagos).GetMotionMaster()->MovePoint(0,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2]); + (*Arcanagos).GetMotionMaster()->MovePoint(0, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2]); Arcanagos->SetOrientation(ArcanagosPos[3]); me->SetOrientation(MedivPos[3]); YellTimer = 10000; @@ -536,7 +536,7 @@ public: uint32 NextStep(uint32 Step) { - Unit* arca = Unit::GetUnit((*me),ArcanagosGUID); + Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); Map* pMap = me->GetMap(); switch(Step) { @@ -581,7 +581,7 @@ public: CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, 0); return 5000; case 12: - arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f); + arca->GetMotionMaster()->MovePoint(0, -11010.82f, -1761.18f, 156.47f); arca->setActive(true); arca->InterruptNonMeleeSpells(true); arca->SetSpeed(MOVE_FLIGHT, 2.0f); @@ -607,7 +607,7 @@ public: } return 50000; case 15: - arca->DealDamage(arca,arca->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + arca->DealDamage(arca, arca->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return 5000; default : return 9999999; } @@ -625,7 +625,7 @@ public: if (Step >= 7 && Step <= 12) { - Unit* arca = Unit::GetUnit((*me),ArcanagosGUID); + Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); if (FireArcanagosTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 7c1815dec4f..9d0c540223d 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -296,15 +296,15 @@ public: if (FireballTimer <= diff) { DoCast(me->getVictim(), SPELL_FIREBALL_NORMAL); - FireballTimer = urand(2000,6000); + FireballTimer = urand(2000, 6000); } else FireballTimer -= diff; if (PhoenixTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - uint8 random = urand(1,2); + uint8 random = urand(1, 2); float x = KaelLocations[random][0]; float y = KaelLocations[random][1]; @@ -330,7 +330,7 @@ public: DoCast(pTarget, SPELL_FLAMESTRIKE3, true); DoScriptText(SAY_FLAMESTRIKE, me); } - FlameStrikeTimer = urand(15000,25000); + FlameStrikeTimer = urand(15000, 25000); } else FlameStrikeTimer -= diff; // Below 50% @@ -396,7 +396,7 @@ public: for (uint8 i = 0; i < 3; ++i) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Orb && pTarget) @@ -535,7 +535,7 @@ public: me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->ClearAllReactives(); - me->SetUInt64Value(UNIT_FIELD_TARGET,0); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -580,7 +580,7 @@ public: if (BurnTimer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. - uint16 dmg = urand(1650,2050); + uint16 dmg = urand(1650, 2050); me->DealDamage(me, dmg, 0, DOT, SPELL_SCHOOL_MASK_FIRE, NULL, false); BurnTimer += 2000; } BurnTimer -= diff; @@ -648,7 +648,7 @@ public: void Reset() { DespawnTimer = 30000; - ChangeTargetTimer = urand(6000,12000); + ChangeTargetTimer = urand(6000, 12000); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -678,7 +678,7 @@ public: AttackStart(pTarget); } - ChangeTargetTimer = urand(5000,15000); + ChangeTargetTimer = urand(5000, 15000); } else ChangeTargetTimer -= diff; } }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 5f9f850ceaf..cc17f4b15af 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -274,7 +274,7 @@ public: { Unit *pTarget = me; - if (urand(0,1)) + if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) pTarget = pAdd; @@ -287,7 +287,7 @@ public: { Unit *pTarget = me; - if (urand(0,1)) + if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD)) pTarget = pAdd; @@ -300,11 +300,11 @@ public: { Unit *pTarget = NULL; - if (urand(0,1)) + if (urand(0, 1)) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); else { - if (urand(0,1)) + if (urand(0, 1)) pTarget = me; else if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -362,7 +362,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI // For later development, some alternative threat system should be made // We do not know what this system is based upon, but one theory is class (healers=high threat, dps=medium, etc) // We reset their threat frequently as an alternative until such a system exist - ResetThreatTimer = urand(5000,20000); + ResetThreatTimer = urand(5000, 20000); // in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her) if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DELRISSA) : 0)) @@ -1025,7 +1025,7 @@ public: Wing_Clip_Timer = 4000; Freezing_Trap_Timer = 15000; - Unit* pPet = Unit::GetUnit(*me,m_uiPetGUID); + Unit* pPet = Unit::GetUnit(*me, m_uiPetGUID); if (!pPet) me->SummonCreature(NPC_SLIVER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -1155,7 +1155,7 @@ public: if (Totem_Timer <= diff) { - DoCast(me, RAND(SPELL_WINDFURY_TOTEM,SPELL_FIRE_NOVA_TOTEM,SPELL_EARTHBIND_TOTEM)); + DoCast(me, RAND(SPELL_WINDFURY_TOTEM, SPELL_FIRE_NOVA_TOTEM, SPELL_EARTHBIND_TOTEM)); ++Totem_Amount; Totem_Timer = Totem_Amount*2000; } else Totem_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 65ac5aff16a..384b4f6e664 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -203,7 +203,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void MovementInform(uint32 type, uint32 id) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 42c20299b38..cd7eb6e9015 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -118,10 +118,10 @@ public: void JustSummoned(Creature *summoned) { if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summoned->GetMotionMaster()->MoveFollow(temp,0,0); + summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); //spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok - summoned->CastSpell(summoned,SPELL_ENERGY_BOLT,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_ENERGY_BOLT, false, 0, 0, me->GetGUID()); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 309a1546ca3..a205b3e5ad8 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -209,7 +209,7 @@ class boss_ragnaros : public CreatureScript break; case EVENT_HAND_OF_RAGNAROS: DoCast(me, SPELL_HAND_OF_RAGNAROS); - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_HAND, me); events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20000); break; @@ -260,7 +260,7 @@ class boss_ragnaros : public CreatureScript // summon 8 elementals for (uint8 i = 0; i < 8; ++i) if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000)) + if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) pSummoned->AI()->AttackStart(pTarget); _hasSubmergedOnce = true; @@ -275,7 +275,7 @@ class boss_ragnaros : public CreatureScript for (uint8 i = 0; i < 8; ++i) if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000)) + if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) pSummoned->AI()->AttackStart(pTarget); _isBanished = true; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp index 70437b9e62e..d4f746b0cb3 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp @@ -56,8 +56,8 @@ public: ai->Spell[0].First_Cast = 10000; ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - uint32 RandDebuff = RAND(SPELL_GROUND_STOMP,SPELL_ANCIENT_DREAD,SPELL_CAUTERIZING_FLAMES, - SPELL_WITHERING_HEAT,SPELL_ANCIENT_DESPAIR,SPELL_ANCIENT_HYSTERIA); + uint32 RandDebuff = RAND(SPELL_GROUND_STOMP, SPELL_ANCIENT_DREAD, SPELL_CAUTERIZING_FLAMES, + SPELL_WITHERING_HEAT, SPELL_ANCIENT_DESPAIR, SPELL_ANCIENT_HYSTERIA); ai->Spell[1].Enabled = true; ai->Spell[1].Spell_Id = RandDebuff; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 5f74f998f95..c046b6a3a88 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -43,17 +43,17 @@ enum eDeathKnightSpells #define EVENT_BLOOD_STRIKE 3 #define EVENT_DEATH_COIL 4 -//used by 29519,29520,29565,29566,29567 but signed for 29519 +//used by 29519, 29520, 29565, 29566, 29567 but signed for 29519 int32 say_event_start[8] = { - -1609000,-1609001,-1609002,-1609003, - -1609004,-1609005,-1609006,-1609007 + -1609000, -1609001, -1609002, -1609003, + -1609004, -1609005, -1609006, -1609007 }; int32 say_event_attack[9] = { - -1609008,-1609009,-1609010,-1609011,-1609012, - -1609013,-1609014,-1609015,-1609016 + -1609008, -1609009, -1609010, -1609011, -1609012, + -1609013, -1609014, -1609015, -1609016 }; uint32 acherus_soul_prison[12] = @@ -192,7 +192,7 @@ public: for (uint8 i = 0; i < 12; ++i) { - if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i],30)) + if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i], 30)) { if (me->IsWithinDist(temp_prison, dist, false)) { @@ -401,7 +401,7 @@ public: return true; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature),pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); } return true; } @@ -787,14 +787,14 @@ public: // Ghouls should display their Birth Animation // Crawling out of the ground //DoCast(me, 35177, true); - //me->MonsterSay("Mommy?",LANG_UNIVERSAL,0); + //me->MonsterSay("Mommy?", LANG_UNIVERSAL, 0); me->SetReactState(REACT_DEFENSIVE); } void FindMinions(Unit *owner) { std::list<Creature*> MinionList; - owner->GetAllMinionsByEntry(MinionList,GHOULS); + owner->GetAllMinionsByEntry(MinionList, GHOULS); if (!MinionList.empty()) { @@ -959,7 +959,7 @@ public: AddWaypoint(11, 2202.595947f, -6061.325684f, 5.882018f); AddWaypoint(12, 2188.974609f, -6080.866699f, 3.370027f); - if (urand(0,1)) + if (urand(0, 1)) { AddWaypoint(13, 2176.483887f, -6110.407227f, 1.855181f); AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f); @@ -995,7 +995,7 @@ public: me->SetInFront(car); me->SendMovementFlagUpdate(); } - me->MonsterSay(SAY_SCARLET_MINER1,LANG_UNIVERSAL,0); + me->MonsterSay(SAY_SCARLET_MINER1, LANG_UNIVERSAL, 0); SetRun(true); IntroTimer = 4000; IntroPhase = 1; @@ -1009,7 +1009,7 @@ public: car->SendMonsterStop(); car->RemoveAura(SPELL_CART_DRAG); } - me->MonsterSay(SAY_SCARLET_MINER2,LANG_UNIVERSAL,0); + me->MonsterSay(SAY_SCARLET_MINER2, LANG_UNIVERSAL, 0); break; default: break; @@ -1059,7 +1059,7 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); if (Creature *car = pPlayer->GetVehicleCreatureBase()) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index fac16df491e..f30d0be1f74 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -19,7 +19,7 @@ #include "ScriptedEscortAI.h" //How to win friends and influence enemies -// texts signed for creature 28939 but used for 28939,28940,28610 +// texts signed for creature 28939 but used for 28939, 28940, 28610 enum win_friends { SAY_PERSUADE1 = -1609501, @@ -86,12 +86,12 @@ public: me->SetReactState(REACT_PASSIVE); DoCastAOE(58111, true); - DoScriptText(RAND(SAY_PERSUADE1,SAY_PERSUADE2,SAY_PERSUADE3, - SAY_PERSUADE4,SAY_PERSUADE5,SAY_PERSUADE6, + DoScriptText(RAND(SAY_PERSUADE1, SAY_PERSUADE2, SAY_PERSUADE3, + SAY_PERSUADE4, SAY_PERSUADE5, SAY_PERSUADE6, SAY_PERSUADE7), caster); - DoScriptText(RAND(SAY_CRUSADER1,SAY_CRUSADER2,SAY_CRUSADER3, - SAY_CRUSADER4,SAY_CRUSADER5,SAY_CRUSADER6), me); + DoScriptText(RAND(SAY_CRUSADER1, SAY_CRUSADER2, SAY_CRUSADER3, + SAY_CRUSADER4, SAY_CRUSADER5, SAY_CRUSADER6), me); } } } @@ -183,7 +183,7 @@ public: { pCreature->SetStandState(UNIT_STAND_STATE_STAND); - if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI,pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, pCreature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); } return true; @@ -505,7 +505,7 @@ public: void Shout() { if (rand()%100 < 15) - DoScriptText(RAND(SAY_VALROTH3,SAY_VALROTH4,SAY_VALROTH5), me); + DoScriptText(RAND(SAY_VALROTH3, SAY_VALROTH4, SAY_VALROTH5), me); } void JustDied(Unit* killer) @@ -520,7 +520,7 @@ public: /*###### ## npc_a_special_surprise ######*/ -//used by 29032,29061,29065,29067,29068,29070,29074,29072,29073,29071 but signed for 29032 +//used by 29032, 29061, 29065, 29067, 29068, 29070, 29074, 29072, 29073, 29071 but signed for 29032 enum SpecialSurprise { SAY_EXEC_START_1 = -1609025, // speech for all diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 825f115b973..fb98668f3f7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -243,7 +243,7 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* pPlayer = itr->getSource()) - pPlayer->SendUpdateWorldState(id,state); + pPlayer->SendUpdateWorldState(id, state); } } } @@ -377,11 +377,11 @@ public: uiTotal_scourge = ENCOUNTER_TOTAL_SCOURGE; uiSummon_counter = 0; - uiAnti_magic_zone = urand(1000,6000); - uiDeath_strike = urand(5000,10000); - uiDeath_embrace = urand(5000,10000); - uiIcy_touch = urand(5000,10000); - uiUnholy_blight = urand(5000,10000); + uiAnti_magic_zone = urand(1000, 6000); + uiDeath_strike = urand(5000, 10000); + uiDeath_embrace = urand(5000, 10000); + uiIcy_touch = urand(5000, 10000); + uiUnholy_blight = urand(5000, 10000); uiFight_speech = 15000; uiSpawncheck = 1000; @@ -1381,11 +1381,11 @@ public: if (uiFight_speech <= diff) { - DoScriptText(RAND(SAY_LIGHT_OF_DAWN09,SAY_LIGHT_OF_DAWN10,SAY_LIGHT_OF_DAWN11, - SAY_LIGHT_OF_DAWN12,SAY_LIGHT_OF_DAWN13,SAY_LIGHT_OF_DAWN14, - SAY_LIGHT_OF_DAWN15,SAY_LIGHT_OF_DAWN16,SAY_LIGHT_OF_DAWN17, - SAY_LIGHT_OF_DAWN18,SAY_LIGHT_OF_DAWN19,SAY_LIGHT_OF_DAWN20, - SAY_LIGHT_OF_DAWN21,SAY_LIGHT_OF_DAWN22,SAY_LIGHT_OF_DAWN23, + DoScriptText(RAND(SAY_LIGHT_OF_DAWN09, SAY_LIGHT_OF_DAWN10, SAY_LIGHT_OF_DAWN11, + SAY_LIGHT_OF_DAWN12, SAY_LIGHT_OF_DAWN13, SAY_LIGHT_OF_DAWN14, + SAY_LIGHT_OF_DAWN15, SAY_LIGHT_OF_DAWN16, SAY_LIGHT_OF_DAWN17, + SAY_LIGHT_OF_DAWN18, SAY_LIGHT_OF_DAWN19, SAY_LIGHT_OF_DAWN20, + SAY_LIGHT_OF_DAWN21, SAY_LIGHT_OF_DAWN22, SAY_LIGHT_OF_DAWN23, SAY_LIGHT_OF_DAWN24), me); uiFight_speech = 15000 + rand()%5000; } else uiFight_speech -= diff; @@ -1535,7 +1535,7 @@ public: { if (Creature* pTemp = Unit::GetCreature(*me, ui_GUID)) if (pTemp->isAlive()) - if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarger->isAlive()) { // pTemp->DeleteThreatList(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index dff84c6f700..d9c22780be4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -77,7 +77,7 @@ public: FlyBackTimer = 500; break; case 1: - plr->GetClosePoint(x,y,z, me->GetObjectSize()); + plr->GetClosePoint(x, y, z, me->GetObjectSize()); z += 2.5; x -= 2; y -= 1.5; me->GetMotionMaster()->MovePoint(0, x, y, z); me->SetUInt64Value(UNIT_FIELD_TARGET, plr->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 5895d43f5c2..6b0ddf80096 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -101,7 +101,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 9e9d6ecb287..3b5c3a064d4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -89,33 +89,33 @@ struct Locations static Locations FlightPoint[]= { - {1754.00f,1346.00f,17.50f}, - {1765.00f,1347.00f,19.00f}, - {1784.00f,1346.80f,25.40f}, - {1803.30f,1347.60f,33.00f}, - {1824.00f,1350.00f,42.60f}, - {1838.80f,1353.20f,49.80f}, - {1852.00f,1357.60f,55.70f}, - {1861.30f,1364.00f,59.40f}, - {1866.30f,1374.80f,61.70f}, - {1864.00f,1387.30f,63.20f}, - {1854.80f,1399.40f,64.10f}, - {1844.00f,1406.90f,64.10f}, - {1824.30f,1411.40f,63.30f}, - {1801.00f,1412.30f,60.40f}, - {1782.00f,1410.10f,55.50f}, - {1770.50f,1405.20f,50.30f}, - {1765.20f,1400.70f,46.60f}, - {1761.40f,1393.40f,41.70f}, - {1759.10f,1386.70f,36.60f}, - {1757.80f,1378.20f,29.00f}, - {1758.00f,1367.00f,19.51f} + {1754.00f, 1346.00f, 17.50f}, + {1765.00f, 1347.00f, 19.00f}, + {1784.00f, 1346.80f, 25.40f}, + {1803.30f, 1347.60f, 33.00f}, + {1824.00f, 1350.00f, 42.60f}, + {1838.80f, 1353.20f, 49.80f}, + {1852.00f, 1357.60f, 55.70f}, + {1861.30f, 1364.00f, 59.40f}, + {1866.30f, 1374.80f, 61.70f}, + {1864.00f, 1387.30f, 63.20f}, + {1854.80f, 1399.40f, 64.10f}, + {1844.00f, 1406.90f, 64.10f}, + {1824.30f, 1411.40f, 63.30f}, + {1801.00f, 1412.30f, 60.40f}, + {1782.00f, 1410.10f, 55.50f}, + {1770.50f, 1405.20f, 50.30f}, + {1765.20f, 1400.70f, 46.60f}, + {1761.40f, 1393.40f, 41.70f}, + {1759.10f, 1386.70f, 36.60f}, + {1757.80f, 1378.20f, 29.00f}, + {1758.00f, 1367.00f, 19.51f} }; static Locations Spawn[]= { - {1776.27f,1348.74f,19.20f}, //spawn point for pumpkin shrine mob - {1765.28f,1347.46f,17.55f} //spawn point for smoke + {1776.27f, 1348.74f, 19.20f}, //spawn point for pumpkin shrine mob + {1765.28f, 1347.46f, 17.55f} //spawn point for smoke }; static const char* Text[]= @@ -245,7 +245,7 @@ public: die = false; withbody = true; wait = 1000; - laugh = urand(15000,30000); + laugh = urand(15000, 30000); } void EnterCombat(Unit * /*who*/) {} @@ -253,13 +253,13 @@ public: { DoScriptText(textEntry, me, pTarget); //DoCast(me, SPELL_HEAD_SPEAKS, true); - Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); + Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) - speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); + speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); laugh += 3000; } - void DamageTaken(Unit* /*done_by*/,uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (withbody) return; @@ -327,13 +327,13 @@ public: if (laugh <= diff) { - laugh = urand(15000,30000); - DoPlaySoundToSet(me, RandomLaugh[urand(0,2)]); + laugh = urand(15000, 30000); + DoPlaySoundToSet(me, RandomLaugh[urand(0, 2)]); //DoCast(me, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head" - Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); + Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) - speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); - me->MonsterTextEmote(EMOTE_LAUGHS,0); + speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); + me->MonsterTextEmote(EMOTE_LAUGHS, 0); } else laugh -= diff; } else @@ -400,7 +400,7 @@ public: Phase = 1; conflagrate = 15000; summonadds = 15000; - laugh = urand(16000,20000); + laugh = urand(16000, 20000); cleave = 2000; regen = 1000; burn = 6000; @@ -429,7 +429,7 @@ public: me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); - me->SetSpeed(MOVE_WALK,5.0f,true); + me->SetSpeed(MOVE_WALK, 5.0f, true); wp_reached = false; count = 0; say_timer = 3000; @@ -451,7 +451,7 @@ public: break; case 1: { - if (Creature *smoke = me->SummonCreature(HELPER,Spawn[1].x,Spawn[1].y,Spawn[1].z,0,TEMPSUMMON_TIMED_DESPAWN,20000)) + if (Creature *smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3); DoCast(me, SPELL_RHYME_BIG); break; @@ -470,7 +470,7 @@ public: wp_reached = false; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); SaySound(SAY_ENTRANCE); - if (Unit *plr = Unit::GetUnit((*me),PlayerGUID)) + if (Unit *plr = Unit::GetUnit((*me), PlayerGUID)) DoStartMovement(plr); break; } @@ -537,7 +537,7 @@ public: void SpellHitTarget(Unit* unit, const SpellEntry* spell) { if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION)) - SaySound(SAY_CONFLAGRATION,unit); + SaySound(SAY_CONFLAGRATION, unit); } void JustDied(Unit* /*killer*/) @@ -545,9 +545,9 @@ public: me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); SaySound(SAY_DEATH); - if (Creature *flame = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000)) - flame->CastSpell(flame,SPELL_BODY_FLAME,false); - if (Creature *wisp = DoSpawnCreature(WISP_INVIS,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + flame->CastSpell(flame, SPELL_BODY_FLAME, false); + if (Creature *wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); @@ -571,14 +571,14 @@ public: SaySound(SAY_REJOINED); DoCast(me, SPELL_HEAD); caster->GetMotionMaster()->Clear(false); - caster->GetMotionMaster()->MoveFollow(me,6,float(urand(0,5))); + caster->GetMotionMaster()->MoveFollow(me, 6, float(urand(0, 5))); //DoResetThreat();//not sure if need std::list<HostileReference*>::const_iterator itr; for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr) { Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); if (pUnit && pUnit->isAlive() && pUnit != caster) - me->AddThreat(pUnit,caster->getThreatManager().getThreat(pUnit)); + me->AddThreat(pUnit, caster->getThreatManager().getThreat(pUnit)); } } } @@ -594,19 +594,19 @@ public: me->SetName("Headless Horseman, Unhorsed"); if (!headGUID) - headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6),0,0,TEMPSUMMON_DEAD_DESPAWN,0)->GetGUID(); + headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID(); Unit* Head = Unit::GetUnit((*me), headGUID); if (Head && Head->isAlive()) { Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - //Head->CastSpell(Head,SPELL_HEAD_INVIS,false); + //Head->CastSpell(Head, SPELL_HEAD_INVIS, false); me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_IMMUNE, true); DoCast(me, SPELL_BODY_REGEN, true); DoCast(Head, SPELL_FLYING_HEAD, true); DoCast(me, SPELL_CONFUSE, false); //test - done_by->ProcDamageAndSpell(me,PROC_FLAG_KILL,PROC_FLAG_KILLED,PROC_EX_NONE,0); - whirlwind = urand(4000,8000); + done_by->ProcDamageAndSpell(me, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0); + whirlwind = urand(4000, 8000); regen = 0; } } @@ -653,7 +653,7 @@ public: { wp_reached = false; me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MovePoint(id,FlightPoint[id].x,FlightPoint[id].y,FlightPoint[id].z); + me->GetMotionMaster()->MovePoint(id, FlightPoint[id].x, FlightPoint[id].y, FlightPoint[id].z); } } } @@ -663,7 +663,7 @@ public: break; if (burn <= diff) { - if (Creature *flame = me->SummonCreature(HELPER,Spawn[0].x,Spawn[0].y,Spawn[0].z,0,TEMPSUMMON_TIMED_DESPAWN,17000)) + if (Creature *flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); burned = true; } else burn -= diff; @@ -673,7 +673,7 @@ public: { if (Unit *plr = SelectRandomPlayer(30.0f)) DoCast(plr, SPELL_CONFLAGRATION, false); - conflagrate = urand(10000,16000); + conflagrate = urand(10000, 16000); } else conflagrate -= diff; break; case 3: @@ -682,15 +682,15 @@ public: me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_SUMMON_PUMPKIN); SaySound(SAY_SPROUTING_PUMPKINS); - summonadds = urand(25000,35000); + summonadds = urand(25000, 35000); } else summonadds -= diff; break; } if (laugh <= diff) { - laugh = urand(11000,22000); - me->MonsterTextEmote(EMOTE_LAUGHS,0); + laugh = urand(11000, 22000); + me->MonsterTextEmote(EMOTE_LAUGHS, 0); DoPlaySoundToSet(me, RandomLaugh[rand()%3]); } else laugh -= diff; @@ -700,7 +700,7 @@ public: if (cleave <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - cleave = urand(2000,6000); //1 cleave per 2.0f-6.0fsec + cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec } else cleave -= diff; } } @@ -728,8 +728,8 @@ public: if (whirlwind <= diff) { - whirlwind = urand(4000,8000); - if (urand(0,1)) + whirlwind = urand(4000, 8000); + if (urand(0, 1)) { me->RemoveAurasDueToSpell(SPELL_CONFUSE); DoCast(me, SPELL_WHIRLWIND, true); @@ -764,20 +764,20 @@ public: { float x, y, z; me->GetPosition(x, y, z); //this visual aura some under ground - me->GetMap()->CreatureRelocation(me, x,y,z + 0.35f, 0.0f); + me->GetMap()->CreatureRelocation(me, x, y, z + 0.35f, 0.0f); Despawn(); - Creature *debuff = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,14500); + Creature *debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); if (debuff) { debuff->SetDisplayId(me->GetDisplayId()); - debuff->CastSpell(debuff,SPELL_PUMPKIN_AURA_GREEN,false); + debuff->CastSpell(debuff, SPELL_PUMPKIN_AURA_GREEN, false); CAST_AI(mob_wisp_invis::mob_wisp_invisAI, debuff->AI())->SetType(1); debuffGUID = debuff->GetGUID(); } sprouted = false; DoCast(me, SPELL_PUMPKIN_AURA, true); DoCast(me, SPELL_SPROUTING); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } void EnterCombat(Unit * /*who*/){} @@ -788,7 +788,7 @@ public: { sprouted = true; me->RemoveAllAuras(); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); DoCast(me, SPELL_SPROUT_BODY, true); me->UpdateEntry(PUMPKIN_FIEND); DoStartMovement(me->getVictim()); @@ -798,7 +798,7 @@ public: void Despawn() { if (!debuffGUID) return; - Unit *debuff = Unit::GetUnit((*me),debuffGUID); + Unit *debuff = Unit::GetUnit((*me), debuffGUID); if (debuff) debuff->SetVisible(false); debuffGUID = 0; @@ -811,7 +811,7 @@ public: if (!who || !who->isTargetableForAttack() || !me->IsHostileTo(who) || me->getVictim()) return; - me->AddThreat(who,0.0f); + me->AddThreat(who, 0.0f); if (sprouted) DoStartMovement(who); } @@ -847,7 +847,7 @@ public: if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64) { */ pPlayer->AreaExploredOrEventHappens(11405); - if (Creature *horseman = soil->SummonCreature(HH_MOUNTED,FlightPoint[20].x,FlightPoint[20].y,FlightPoint[20].z,0,TEMPSUMMON_MANUAL_DESPAWN,0)) + if (Creature *horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) { CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 526a9210eb0..a97377f9d01 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -132,7 +132,7 @@ public: { mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) { - Start_Timer = urand(1000,6000); + Start_Timer = urand(1000, 6000); } uint32 Start_Timer; @@ -147,7 +147,7 @@ public: { if (Start_Timer <= diff) { - Start(true,true); + Start(true, true); Start_Timer = 0; } else Start_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 565b183c7ea..be37b82e8b0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -87,7 +87,7 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 40000; @@ -96,7 +96,7 @@ public: //Sleep_Timer if (Sleep_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) DoCast(pTarget, SPELL_SLEEP); Sleep_Timer = 30000; @@ -112,7 +112,7 @@ public: //Dispel_Timer if (Dispel_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 5bd2193f296..eb7ffbc111a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -81,7 +81,7 @@ public: return; //Any other actions to do with vorrel? setStandState? - if (Unit *vorrel = Unit::GetUnit(*me,pInstance->GetData64(DATA_VORREL))) + if (Unit *vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) DoScriptText(SAY_TRIGGER_VORREL, vorrel); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 33d2b16bf42..fd44a9bfe54 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -91,7 +91,7 @@ public: if (m_pInstance) if (me->isAlive()) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT,NOT_STARTED); + m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); m_bHasDied = false; m_bHeal = false; @@ -133,7 +133,7 @@ public: { m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS); - Whitemane->GetMotionMaster()->MovePoint(1,1163.113370f,1398.856812f,32.527786f); + Whitemane->GetMotionMaster()->MovePoint(1, 1163.113370f, 1398.856812f, 32.527786f); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MoveIdle(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 15c759b6ab4..eff0adccffb 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -125,7 +125,7 @@ public: if (Teleport_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { if (DoGetThreat(pTarget)) @@ -135,80 +135,80 @@ public: switch(rand()%6) { case 0: - DoTeleportPlayer(pTarget, 250.0696f,0.3921f,84.8408f,3.149f); - Summoned = me->SummonCreature(16119,254.2325f,0.3417f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 84.8408f, 3.149f); + Summoned = me->SummonCreature(16119, 254.2325f, 0.3417f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133f,4.0226f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 257.7133f, 4.0226f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702f,-2.60656f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 258.6702f, -2.60656f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,84.8410f,1.608f); - Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 84.8410f, 1.608f); + Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget, 95.1547f,-1.8173f,85.2289f,0.043f); - Summoned = me->SummonCreature(16119,100.9404f,-1.8016f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 95.1547f, -1.8173f, 85.2289f, 0.043f); + Summoned = me->SummonCreature(16119, 100.9404f, -1.8016f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.3729f,0.4882f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 101.3729f, 0.4882f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.4596f,-4.4740f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 101.4596f, -4.4740f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 3: - DoTeleportPlayer(pTarget, 250.0696f,0.3921f,72.6722f,3.149f); - Summoned = me->SummonCreature(16119,240.34481f,0.7368f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 72.6722f, 3.149f); + Summoned = me->SummonCreature(16119, 240.34481f, 0.7368f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.3633f,-2.9520f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 240.3633f, -2.9520f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.6702f,3.34949f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 240.6702f, 3.34949f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 4: - DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,70.7734f,1.608f); - Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 70.7734f, 1.608f); + Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 5: - DoTeleportPlayer(pTarget, 106.1541f,-1.8994f,75.3663f,0.043f); - Summoned = me->SummonCreature(16119,115.3945f,-1.5555f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 106.1541f, -1.8994f, 75.3663f, 0.043f); + Summoned = me->SummonCreature(16119, 115.3945f, -1.5555f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133f,1.8066f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 257.7133f, 1.8066f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702f,-5.1001f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 258.6702f, -5.1001f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index cd17ef2125c..9009cdcd1c2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -90,7 +90,7 @@ public: if (ShadowShock_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); ShadowShock_Timer = 12000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 9f2a7fd5428..467c4f1cd18 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -97,7 +97,7 @@ public: if (Corruption_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); Corruption_Timer = 24000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index e01b0fb5664..39f491d779f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -65,7 +65,7 @@ public: void SummonIllusions(Unit* victim) { - if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Illusion->AI()->AttackStart(victim); } @@ -108,13 +108,13 @@ public: me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetDisplayId(11686); // Invisible Model - DoModifyThreatPercent(me->getVictim(),-99); + DoModifyThreatPercent(me->getVictim(), -99); //Summon 10 Illusions attacking random gamers Unit *pTarget = NULL; for (uint8 i = 0; i < 10; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) SummonIllusions(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index f2b977933f7..b104a0a9b4c 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -63,13 +63,13 @@ public: void SummonMinions(Unit* victim) { - if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMinion->AI()->AttackStart(victim); } void SummonMages(Unit* victim) { - if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMage->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index f4d86668dde..e5bf50b6162 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -79,7 +79,7 @@ public: if (Immolate_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 12000; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 5dc95e3eba7..deef5178d02 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -48,11 +48,11 @@ enum eEnums const Position SpawnLocation[] = { - {-148.199f,2165.647f,128.448f,1.026f}, - {-153.110f,2168.620f,128.448f,1.026f}, - {-145.905f,2180.520f,128.448f,4.183f}, - {-140.794f,2178.037f,128.448f,4.090f}, - {-138.640f,2170.159f,136.577f,2.737f} + {-148.199f, 2165.647f, 128.448f, 1.026f}, + {-153.110f, 2168.620f, 128.448f, 1.026f}, + {-145.905f, 2180.520f, 128.448f, 4.183f}, + {-140.794f, 2178.037f, 128.448f, 4.090f}, + {-138.640f, 2170.159f, 136.577f, 2.737f} }; class instance_shadowfang_keep : public InstanceMapScript { @@ -137,8 +137,8 @@ public: if (pAda && pAda->isAlive() && pAsh && pAsh->isAlive()) { - DoScriptText(SAY_BOSS_DIE_AD,pAda); - DoScriptText(SAY_BOSS_DIE_AS,pAsh); + DoScriptText(SAY_BOSS_DIE_AD, pAda); + DoScriptText(SAY_BOSS_DIE_AS, pAsh); } } @@ -251,19 +251,19 @@ public: switch(uiPhase) { case 1: - pSummon = pArchmage->SummonCreature(pArchmage->GetEntry(),SpawnLocation[4],TEMPSUMMON_TIMED_DESPAWN,10000); + pSummon = pArchmage->SummonCreature(pArchmage->GetEntry(), SpawnLocation[4], TEMPSUMMON_TIMED_DESPAWN, 10000); pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); pSummon->SetReactState(REACT_DEFENSIVE); - pSummon->CastSpell(pSummon,SPELL_ASHCROMBE_TELEPORT,true); - DoScriptText(SAY_ARCHMAGE,pSummon); + pSummon->CastSpell(pSummon, SPELL_ASHCROMBE_TELEPORT, true); + DoScriptText(SAY_ARCHMAGE, pSummon); uiTimer = 2000; uiPhase = 2; break; case 2: - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[0],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[1],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[2],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); uiPhase = 0; break; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 169e8d63a8f..e1f8ee39ae1 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -164,7 +164,7 @@ public: void Reset() { - uiDarkOffering = urand(290,10); + uiDarkOffering = urand(290, 10); } void UpdateAI(uint32 const uiDiff) @@ -174,14 +174,14 @@ public: if (uiDarkOffering <= uiDiff) { - if (Creature* pFriend = me->FindNearestCreature(me->GetEntry(),25.0f,true)) + if (Creature* pFriend = me->FindNearestCreature(me->GetEntry(), 25.0f, true)) { if (pFriend) - DoCast(pFriend,SPELL_DARK_OFFERING); + DoCast(pFriend, SPELL_DARK_OFFERING); } else - DoCast(me,SPELL_DARK_OFFERING); - uiDarkOffering = urand(4400,12500); + DoCast(me, SPELL_DARK_OFFERING); + uiDarkOffering = urand(4400, 12500); } else uiDarkOffering -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 9e4fc930e1c..004996845e3 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -110,26 +110,26 @@ public: // RaiseDead_Timer = 30000; SummonSkeletons_Timer = 34000; if (pInstance && pInstance->GetData(TYPE_RAMSTEIN) == DONE) - pInstance->SetData(TYPE_BARON,NOT_STARTED); + pInstance->SetData(TYPE_BARON, NOT_STARTED); } void AttackStart(Unit* who) { if (pInstance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door - pInstance->SetData(TYPE_BARON,IN_PROGRESS); + pInstance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } void JustSummoned(Creature* summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_BARON,DONE); + pInstance->SetData(TYPE_BARON, DONE); } void UpdateAI(const uint32 diff) @@ -171,12 +171,12 @@ public: //SummonSkeletons if (SummonSkeletons_Timer <= diff) { - me->SummonCreature(11197,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,29000); + me->SummonCreature(11197, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 29000); //34 seconds until we should cast this again SummonSkeletons_Timer = 40000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index b11b785154c..1dd9ecea38c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -70,7 +70,7 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_BARONESS,IN_PROGRESS); + pInstance->SetData(TYPE_BARONESS, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -112,7 +112,7 @@ public: if (rand()%100 < 65) { Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_POSSESS); } //50 seconds until we should cast this again diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 825ac9d6a81..3c24fd48010 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -105,13 +105,13 @@ public: void JustDied(Unit* /*Victim*/) { - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } void EnterCombat(Unit * /*who*/) @@ -164,49 +164,49 @@ public: switch (rand()%9) { case 0: - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 1: - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 2: - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 3: - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 4: - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 5: - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 6: - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 7: - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 8: - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; } //30 seconds until we should cast this again diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index f15a27317d2..424602d3d5a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -186,7 +186,7 @@ public: //PsychicScream if (m_uiPsychicScream_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; @@ -195,7 +195,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index be2b0aa4133..1b14261e212 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -68,7 +68,7 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_PALLID,IN_PROGRESS); + pInstance->SetData(TYPE_PALLID, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index af57b5941c0..36b2cfc07a6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -70,12 +70,12 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_NERUB,IN_PROGRESS); + pInstance->SetData(TYPE_NERUB, IN_PROGRESS); } void RaiseUndeadScarab(Unit* pVictim) { - if (Creature* pUndeadScarab = DoSpawnCreature(10876, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000)) + if (Creature* pUndeadScarab = DoSpawnCreature(10876, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000)) if (pUndeadScarab->AI()) pUndeadScarab->AI()->AttackStart(pVictim); } @@ -95,7 +95,7 @@ public: //PierceArmor if (PierceArmor_Timer <= diff) { - if (urand(0,3) < 2) + if (urand(0, 3) < 2) DoCast(me->getVictim(), SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; } else PierceArmor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 66b67a22614..714c3b81ee8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -67,7 +67,7 @@ public: { for (uint8 i = 0; i < 30; ++i) { - if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35f+irand(-10,10),-3391.87f+irand(-10,10),119.11f,5.91f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) + if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD, 3969.35f+irand(-10, 10), -3391.87f+irand(-10, 10), 119.11f, 5.91f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000)) mob->AI()->AttackStart(me->SelectNearestTarget(100.0f)); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index cdd0f8fee01..faf35185559 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -56,7 +56,7 @@ public: { if (!HasYelled) { - me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,0); + me->MonsterYell(SAY_SPAWN, LANG_UNIVERSAL, 0); HasYelled = true; } } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index f62c197aa41..f5f407d4218 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -184,7 +184,7 @@ class instance_stratholme : public InstanceMapScript break; case GO_GAUNTLET_GATE1: //weird, but unless flag is set, client will not respond as expected. DB bug? - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_LOCKED); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); gauntletGate1GUID = go->GetGUID(); break; case GO_ZIGGURAT1: @@ -295,13 +295,13 @@ class instance_stratholme : public InstanceMapScript if (!count) { //a bit itchy, it should close the door after 10 secs, but it doesn't. skipping it for now. - //UpdateGoState(ziggurat4GUID,0,true); + //UpdateGoState(ziggurat4GUID, 0, true); if (Creature* pBaron = instance->GetCreature(baronGUID)) pBaron->SummonCreature(C_RAMSTEIN, 4032.84f, -3390.24f, 119.73f, 4.71f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: Ramstein spawned."); } else - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: %u Abomnation left to kill.",count); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: %u Abomnation left to kill.", count); } if (data == NOT_STARTED) @@ -329,7 +329,7 @@ class instance_stratholme : public InstanceMapScript if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA); - SetData(TYPE_BARON_RUN,DONE); + SetData(TYPE_BARON_RUN, DONE); } } if (data == DONE || data == NOT_STARTED) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 4c9f5bc2a62..4d78ef993bf 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -64,14 +64,14 @@ public: if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pGroupie->HasAura(SPELL_BARON_ULTIMATUM) && pGroupie->GetMap() == pGo->GetMap()) - pGroupie->CastSpell(pGroupie,SPELL_BARON_ULTIMATUM,true); + pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true); } } else if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_BARON_ULTIMATUM) && pPlayer->GetMap() == pGo->GetMap()) - pPlayer->CastSpell(pPlayer,SPELL_BARON_ULTIMATUM,true); + pPlayer->CastSpell(pPlayer, SPELL_BARON_ULTIMATUM, true); - pInstance->SetData(TYPE_BARON_RUN,IN_PROGRESS); + pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS); return false; } @@ -103,7 +103,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_ZAPPED0,SAY_ZAPPED1,SAY_ZAPPED2,SAY_ZAPPED3), me); + DoScriptText(RAND(SAY_ZAPPED0, SAY_ZAPPED1, SAY_ZAPPED2, SAY_ZAPPED3), me); } void EnterCombat(Unit* /*who*/) {} @@ -162,7 +162,7 @@ public: void JustSummoned(Creature *summoned) { - summoned->CastSpell(summoned,SPELL_SOUL_FREED,false); + summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } void JustDied(Unit* /*Killer*/) @@ -177,7 +177,7 @@ public: { if (Die_Timer <= diff) { - if (Unit* pTemp = Unit::GetUnit(*me,Tagger)) + if (Unit* pTemp = Unit::GetUnit(*me, Tagger)) { CAST_PLR(pTemp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); me->Kill(me); @@ -237,7 +237,7 @@ public: for (uint32 i = 1; i <= 4; ++i) { //100%, 50%, 33%, 25% chance to spawn - if (urand(1,i) == 1) + if (urand(1, i) == 1) DoSummon(ENTRY_RESTLESS, me, 20.0f, 600000); } } diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index b0e8a415183..08ac34c938c 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -169,20 +169,20 @@ public: void UseStatue(GameObject* go) { - go->SummonGameObject(GO_ATALAI_LIGHT1,go->GetPositionX(),go->GetPositionY(),go->GetPositionZ(),0,0,0,0,0,0); + go->SummonGameObject(GO_ATALAI_LIGHT1, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 0, 0, 0, 0, 0); go->SetUInt32Value(GAMEOBJECT_FLAGS, 4); } /* void UseLastStatue(GameObject* go) { - AtalaiStatue1->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue1->GetPositionX(),AtalaiStatue1->GetPositionY(),AtalaiStatue1->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue2->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue2->GetPositionX(),AtalaiStatue2->GetPositionY(),AtalaiStatue2->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue3->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue3->GetPositionX(),AtalaiStatue3->GetPositionY(),AtalaiStatue3->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue4->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue4->GetPositionX(),AtalaiStatue4->GetPositionY(),AtalaiStatue4->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue5->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue5->GetPositionX(),AtalaiStatue5->GetPositionY(),AtalaiStatue5->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue6->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue6->GetPositionX(),AtalaiStatue6->GetPositionY(),AtalaiStatue6->GetPositionZ(),0,0,0,0,0,100000); - go->SummonGameObject(148838,-488.997,96.61,-189.019,-1.52,0,0,0,0,100000); + AtalaiStatue1->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue1->GetPositionX(), AtalaiStatue1->GetPositionY(), AtalaiStatue1->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue2->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue2->GetPositionX(), AtalaiStatue2->GetPositionY(), AtalaiStatue2->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue3->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue3->GetPositionX(), AtalaiStatue3->GetPositionY(), AtalaiStatue3->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue4->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue4->GetPositionX(), AtalaiStatue4->GetPositionY(), AtalaiStatue4->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue5->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue5->GetPositionX(), AtalaiStatue5->GetPositionY(), AtalaiStatue5->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue6->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue6->GetPositionX(), AtalaiStatue6->GetPositionY(), AtalaiStatue6->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + go->SummonGameObject(148838, -488.997, 96.61, -189.019, -1.52, 0, 0, 0, 0, 100000); } */ diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index b2dac036e39..0e90a641a2a 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -59,7 +59,7 @@ public: bool OnGossipHello(Player* pPlayer, GameObject* pGo) { if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) - pInstance->SetData(EVENT_STATE,pGo->GetEntry()); + pInstance->SetData(EVENT_STATE, pGo->GetEntry()); return false; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 1c10ea81f8a..f26c03bb142 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -129,7 +129,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(YELL_KILL1,YELL_KILL2,YELL_KILL3), me); + DoScriptText(RAND(YELL_KILL1, YELL_KILL2, YELL_KILL3), me); } void JustDied(Unit* /*Killer*/) @@ -139,9 +139,9 @@ public: if (pInstance) { pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE); - float x,y,z; - me->GetPosition(x,y,z); - me->SummonCreature(FELMYST, x,y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0); + float x, y, z; + me->GetPosition(x, y, z); + me->SummonCreature(FELMYST, x, y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0); } } @@ -316,7 +316,7 @@ public: if (StompTimer <= diff) { - DoScriptText(RAND(YELL_LOVE1,YELL_LOVE2,YELL_LOVE3), me); + DoScriptText(RAND(YELL_LOVE1, YELL_LOVE2, YELL_LOVE3), me); DoCast(me->getVictim(), SPELL_STOMP); StompTimer = 30000; } else StompTimer -= diff; @@ -331,7 +331,7 @@ public: (*i)->CastSpell((*i), SPELL_BURN, true); break; } - BurnTimer = urand(60000,180000); + BurnTimer = urand(60000, 180000); } else BurnTimer -= diff; if (BerserkTimer < diff && !Enraged) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index dcfa7e461ce..5604f1d4a39 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -120,13 +120,13 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp) { if (Temp->isDead()) CAST_CRE(Temp)->Respawn(); else if (Temp->getVictim()) - me->getThreatManager().addThreat(Temp->getVictim(),0.0f); + me->getThreatManager().addThreat(Temp->getVictim(), 0.0f); } } @@ -152,7 +152,7 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } @@ -164,7 +164,7 @@ public: void KilledUnit(Unit * /*victim*/) { if (rand()%4 == 0) - DoScriptText(RAND(YELL_SAC_KILL_1,YELL_SAC_KILL_2), me); + DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -181,7 +181,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -231,7 +231,7 @@ public: if (pInstance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_ALYTHESS_DEAD, me); @@ -301,10 +301,10 @@ public: for (uint8 i = 0; i<3; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000); + temp = DoSpawnCreature(MOB_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); if (temp && pTarget) { - temp->AddThreat(pTarget,1000000);//don't change target(healers) + temp->AddThreat(pTarget, 1000000);//don't change target(healers) temp->AI()->AttackStart(pTarget); } } @@ -382,13 +382,13 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp) { if (Temp->isDead()) CAST_CRE(Temp)->Respawn(); else if (Temp->getVictim()) - me->getThreatManager().addThreat(Temp->getVictim(),0.0f); + me->getThreatManager().addThreat(Temp->getVictim(), 0.0f); } } @@ -415,7 +415,7 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } @@ -459,7 +459,7 @@ public: { if (rand()%4 == 0) { - DoScriptText(RAND(YELL_ALY_KILL_1,YELL_ALY_KILL_2), me); + DoScriptText(RAND(YELL_ALY_KILL_1, YELL_ALY_KILL_2), me); } } @@ -476,7 +476,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -568,7 +568,7 @@ public: if (pInstance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_SACROLASH_DEAD, me); @@ -582,12 +582,12 @@ public: { if (pInstance) { - Creature* sisiter = Unit::GetCreature((*me),pInstance->GetData64(DATA_SACROLASH)); + Creature* sisiter = Unit::GetCreature((*me), pInstance->GetData64(DATA_SACROLASH)); if (sisiter && !sisiter->isDead() && sisiter->getVictim()) { - me->AddThreat(sisiter->getVictim(),0.0f); + me->AddThreat(sisiter->getVictim(), 0.0f); DoStartNoMovement(sisiter->getVictim()); - me->Attack(sisiter->getVictim(),false); + me->Attack(sisiter->getVictim(), false); } } } @@ -701,7 +701,7 @@ public: void EnterCombat(Unit * /*who*/){} - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -714,7 +714,7 @@ public: { pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget,SPELL_DARK_TOUCHED,true); + } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); } break; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 80a382d63f3..efcb1e1b29e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -187,7 +187,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(YELL_KILL1,YELL_KILL2), me); + DoScriptText(RAND(YELL_KILL1, YELL_KILL2), me); } void JustRespawned() @@ -436,20 +436,20 @@ public: break; case EVENT_CLEAVE: DoCast(me->getVictim(), SPELL_CLEAVE, false); - events.ScheduleEvent(EVENT_CLEAVE, urand(5000,10000)); + events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); break; case EVENT_CORROSION: DoCast(me->getVictim(), SPELL_CORROSION, false); - events.ScheduleEvent(EVENT_CORROSION, urand(20000,30000)); + events.ScheduleEvent(EVENT_CORROSION, urand(20000, 30000)); break; case EVENT_GAS_NOVA: DoCast(me, SPELL_GAS_NOVA, false); - events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000,25000)); + events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000)); break; case EVENT_ENCAPSULATE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); - events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000,30000)); + events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000)); break; case EVENT_FLIGHT: EnterPhase(PHASE_FLIGHT); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 17d7ba173b8..cc7ede77917 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -171,7 +171,7 @@ public: FrostBreathTimer = 15000; WildMagicTimer = 10000; TailLashTimer = 25000; - SpectralBlastTimer = urand(20000,25000); + SpectralBlastTimer = urand(20000, 25000); CheckTimer = 1000; ResetTimer = 30000; @@ -320,7 +320,7 @@ public: advance(i, rand()%targetList.size()); if ((*i)) { - (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST,true); + (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST, true); SpectralBlastTimer = 20000+rand()%5000; } else SpectralBlastTimer = 1000; } else SpectralBlastTimer -= diff; @@ -360,10 +360,10 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_EVIL_SLAY1,SAY_EVIL_SLAY2), me); + DoScriptText(RAND(SAY_EVIL_SLAY1, SAY_EVIL_SLAY2), me); } - void MovementInform(uint32 type,uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) { if (type != POINT_MOTION_TYPE) return; @@ -404,7 +404,7 @@ public: break; case 3: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->GetMotionMaster()->MovePoint(0,FLY_X,FLY_Y,FLY_Z); + me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 600000; break; default: @@ -422,7 +422,7 @@ public: break; case 2: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->GetMotionMaster()->MovePoint(0,FLY_X,FLY_Y,FLY_Z); + me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 15000; break; case 3: @@ -658,7 +658,7 @@ public: EnterEvadeMode(); return; } - DoScriptText(RAND(SAY_SATH_SLAY1,SAY_SATH_SLAY2), me); + DoScriptText(RAND(SAY_SATH_SLAY1, SAY_SATH_SLAY2), me); } void JustDied(Unit * /*killer*/) @@ -686,7 +686,7 @@ public: if (i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5) { i->getSource()->RemoveAura(AURA_SPECTRAL_REALM); - i->getSource()->TeleportTo(me->GetMap()->GetId(),i->getSource()->GetPositionX(),i->getSource()->GetPositionY(),DRAGON_REALM_Z+5,i->getSource()->GetOrientation()); + i->getSource()->TeleportTo(me->GetMap()->GetId(), i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), DRAGON_REALM_Z+5, i->getSource()->GetOrientation()); } } } @@ -767,7 +767,7 @@ public: { if (pUnit->GetPositionZ() > me->GetPositionZ()+5) { - me->getThreatManager().modifyThreatPercent(pUnit,-100); + me->getThreatManager().modifyThreatPercent(pUnit, -100); } } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 86327f34c29..721659611de 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -324,7 +324,7 @@ public: } else { - if (GameObject* pOrb = GetOrb(urand(0,3))) + if (GameObject* pOrb = GetOrb(urand(0, 3))) { pOrb->CastSpell(me, SPELL_RING_OF_BLUE_FLAMES); pOrb->SetUInt32Value(GAMEOBJECT_FACTION, 35); @@ -468,7 +468,7 @@ public: if (uiRandomSayTimer < diff) { if (pInstance && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED) - DoScriptText(RAND(SAY_KJ_OFFCOMBAT1,SAY_KJ_OFFCOMBAT2,SAY_KJ_OFFCOMBAT3,SAY_KJ_OFFCOMBAT4,SAY_KJ_OFFCOMBAT5), me); + DoScriptText(RAND(SAY_KJ_OFFCOMBAT1, SAY_KJ_OFFCOMBAT2, SAY_KJ_OFFCOMBAT3, SAY_KJ_OFFCOMBAT4, SAY_KJ_OFFCOMBAT5), me); uiRandomSayTimer = 30000; } else uiRandomSayTimer -= diff; @@ -486,7 +486,7 @@ public: { me->RemoveAurasDueToSpell(SPELL_ANVEENA_ENERGY_DRAIN); phase = PHASE_NORMAL; - DoSpawnCreature(CREATURE_KILJAEDEN, 0, 0,0, 0, TEMPSUMMON_MANUAL_DESPAWN, 0); + DoSpawnCreature(CREATURE_KILJAEDEN, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN, 0); } } }; @@ -622,7 +622,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KJ_SLAY1,SAY_KJ_SLAY2), me); + DoScriptText(RAND(SAY_KJ_SLAY1, SAY_KJ_SLAY2), me); } void EnterEvadeMode() @@ -651,26 +651,26 @@ public: TimerIsDeactivated[TIMER_SHADOW_SPIKE] = false; Timer[TIMER_SHADOW_SPIKE] = 100; // empowered orbs before darkness - Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(10000,40000); + Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(10000, 40000); Timer[TIMER_ORBS_EMPOWER] = (Phase == PHASE_SACRIFICE) ? 10000 : 5000; } void CastSinisterReflection() { - DoScriptText(RAND(SAY_KJ_REFLECTION1,SAY_KJ_REFLECTION2), me); + DoScriptText(RAND(SAY_KJ_REFLECTION1, SAY_KJ_REFLECTION2), me); for (uint8 i = 0; i < 4; ++i) { - float x,y,z; + float x, y, z; Unit *pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break; + if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0))break; } if (pTarget) { - pTarget->GetPosition(x,y,z); - if (Creature* pSinisterReflection = me->SummonCreature(CREATURE_SINISTER_REFLECTION, x,y,z,0, TEMPSUMMON_CORPSE_DESPAWN, 0)) + pTarget->GetPosition(x, y, z); + if (Creature* pSinisterReflection = me->SummonCreature(CREATURE_SINISTER_REFLECTION, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) { pSinisterReflection->SetDisplayId(pTarget->GetDisplayId()); pSinisterReflection->AI()->AttackStart(pTarget); @@ -752,7 +752,7 @@ public: for (uint8 z = 0; z < 6; ++z) { pRandomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) + if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; } @@ -782,7 +782,7 @@ public: sy = ShieldOrbLocations[0][1] + sin(ShieldOrbLocations[i][1]); me->SummonCreature(CREATURE_SHIELD_ORB, sx, sy, SHIELD_ORB_Z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); } - Timer[TIMER_SUMMON_SHILEDORB] = urand(30000,60000); // 30-60seconds cooldown + Timer[TIMER_SUMMON_SHILEDORB] = urand(30000, 60000); // 30-60seconds cooldown Timer[TIMER_SOUL_FLAY] = 2000; break; case TIMER_SHADOW_SPIKE: //Phase 3 @@ -816,10 +816,10 @@ public: } else { - Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(40000,70000); + Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(40000, 70000); IsInDarkness = false; DoCastAOE(SPELL_DARKNESS_OF_A_THOUSAND_SOULS_DAMAGE); - DoScriptText(RAND(SAY_KJ_DARKNESS1,SAY_KJ_DARKNESS2,SAY_KJ_DARKNESS3), me); + DoScriptText(RAND(SAY_KJ_DARKNESS1, SAY_KJ_DARKNESS2, SAY_KJ_DARKNESS3), me); } Timer[TIMER_SOUL_FLAY] = 9000; } @@ -846,13 +846,13 @@ public: for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break; + if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; } if (pTarget) { float x, y, z; pTarget->GetPosition(x, y, z); - me->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x,y,z,0, TEMPSUMMON_TIMED_DESPAWN,15000); + me->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 15000); } Timer[TIMER_ARMAGEDDON] = 2000; // No, I'm not kidding break; @@ -933,7 +933,7 @@ public: void Reset() { // TODO: Timers! - ShadowBoltVolleyTimer = urand(8000,14000); // So they don't all cast it in the same moment. + ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment. FelfirePortalTimer = 20000; if (pInstance) pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); @@ -989,7 +989,7 @@ public: // Felfire Portal - Creatres a portal, that spawns Volatile Felfire Fiends, which do suicide bombing. if (FelfirePortalTimer <= diff) { - if (Creature* pPortal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) + if (Creature* pPortal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) { std::list<HostileReference*>::iterator itr; for (itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) @@ -1045,8 +1045,8 @@ public: if (uiSpawnFiendTimer <= diff) { if (Creature* pFiend = DoSpawnCreature(CREATURE_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) - pFiend->AddThreat(SelectTarget(SELECT_TARGET_RANDOM,0), 100000.0f); - uiSpawnFiendTimer = urand(4000,8000); + pFiend->AddThreat(SelectTarget(SELECT_TARGET_RANDOM, 0), 100000.0f); + uiSpawnFiendTimer = urand(4000, 8000); } else uiSpawnFiendTimer -= diff; } }; @@ -1196,13 +1196,13 @@ public: { me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); bPointReached = true; - uiTimer = urand(500,1000); + uiTimer = urand(500, 1000); uiCheckTimer = 1000; r = 17; c = 0; mx = ShieldOrbLocations[0][0]; my = ShieldOrbLocations[0][1]; - bClockwise = urand(0,1); + bClockwise = urand(0, 1); } void UpdateAI(const uint32 diff) @@ -1221,7 +1221,7 @@ public: } bPointReached = false; uiCheckTimer = 1000; - me->GetMotionMaster()->MovePoint(1,x, y, SHIELD_ORB_Z); + me->GetMotionMaster()->MovePoint(1, x, y, SHIELD_ORB_Z); c += M_PI/32; if (c >= 2*M_PI) c = 0; } @@ -1229,7 +1229,7 @@ public: { if (uiCheckTimer <= diff) { - DoTeleportTo(x,y,SHIELD_ORB_Z); + DoTeleportTo(x, y, SHIELD_ORB_Z); bPointReached = true; } else uiCheckTimer -= diff; @@ -1239,7 +1239,7 @@ public: { if (Unit* random = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0)) DoCast(random, SPELL_SHADOW_BOLT, false); - uiTimer = urand(500,1000); + uiTimer = urand(500, 1000); } else uiTimer -= diff; } @@ -1319,7 +1319,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_MOONFIRE, false); - uiTimer[1] = urand(2000,4000); + uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1327,19 +1327,19 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); - uiTimer[1] = urand(8000,10000); + uiTimer[1] = urand(8000, 10000); } if (uiTimer[2] <= diff) { DoCast(me->getVictim(), SPELL_SR_SHOOT, false); - uiTimer[2] = urand(4000,6000); + uiTimer[2] = urand(4000, 6000); } if (me->IsWithinMeleeRange(me->getVictim(), 6)) { if (uiTimer[0] <= diff) { DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); - uiTimer[0] = urand(6000,8000); + uiTimer[0] = urand(6000, 8000); } DoMeleeAttackIfReady(); } @@ -1348,7 +1348,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_FIREBALL, false); - uiTimer[1] = urand(2000,4000); + uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1356,12 +1356,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_SHADOW_BOLT, false); - uiTimer[1] = urand(3000,5000); + uiTimer[1] = urand(3000, 5000); } if (uiTimer[2] <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true); - uiTimer[2] = urand(2000,4000); + uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1369,7 +1369,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_WHIRLWIND, false); - uiTimer[1] = urand(9000,11000); + uiTimer[1] = urand(9000, 11000); } DoMeleeAttackIfReady(); break; @@ -1377,12 +1377,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false); - uiTimer[1] = urand(6000,8000); + uiTimer[1] = urand(6000, 8000); } if (uiTimer[2] <= diff) { DoCast(me->getVictim(), SPELL_SR_HOLY_SHOCK, false); - uiTimer[2] = urand(2000,4000); + uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1390,12 +1390,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HOLY_SMITE, false); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } if (uiTimer[2] <= diff) { DoCast(me, SPELL_SR_RENEW, false); - uiTimer[2] = urand(6000,8000); + uiTimer[2] = urand(6000, 8000); } DoMeleeAttackIfReady(); break; @@ -1403,7 +1403,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_EARTH_SHOCK, false); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); break; @@ -1411,7 +1411,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HEMORRHAGE, true); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); break; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 6509a0317a6..015f7b9e40c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -148,16 +148,16 @@ public: switch(summoned->GetEntry()) { case CREATURE_DARK_FIENDS: - summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); + summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); break; case CREATURE_DARKNESS: summoned->AddUnitState(UNIT_STAT_STUNNED); - float x,y,z,o; - summoned->GetHomePosition(x,y,z,o); - me->SummonCreature(CREATURE_DARK_FIENDS, x,y,z,o, TEMPSUMMON_CORPSE_DESPAWN, 0); + float x, y, z, o; + summoned->GetHomePosition(x, y, z, o); + me->SummonCreature(CREATURE_DARK_FIENDS, x, y, z, o, TEMPSUMMON_CORPSE_DESPAWN, 0); break; } - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); Summons.Summon(summoned); } @@ -248,7 +248,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoCastAOE(SPELL_NEGATIVE_ENERGY,false); + DoCastAOE(SPELL_NEGATIVE_ENERGY, false); if (pInstance) pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); @@ -276,10 +276,10 @@ public: me->SetVisible(false); break; case CREATURE_DARK_FIENDS: - summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); + summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); break; } - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); Summons.Summon(summoned); } @@ -331,13 +331,13 @@ public: { DarkFiend = false; for (uint8 i = 0; i < 8; ++i) - me->SummonCreature(CREATURE_DARK_FIENDS,DarkFiends[i][0],DarkFiends[i][1],DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(CREATURE_DARK_FIENDS, DarkFiends[i][0], DarkFiends[i][1], DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); Timer[TIMER_DARKNESS] = 42000; } break; case TIMER_HUMANOIDES: for (uint8 i = 0; i < 6; ++i) - me->SummonCreature(uint32(Humanoides[i][0]),Humanoides[i][1],Humanoides[i][2],Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(uint32(Humanoides[i][0]), Humanoides[i][1], Humanoides[i][2], Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0); Timer[TIMER_HUMANOIDES] = 60000; break; case TIMER_PHASE: @@ -415,9 +415,9 @@ public: void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) { - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - DoTeleportTo(x,y,z); + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + DoTeleportTo(x, y, z); InAction = true; switch(Spell->Id) { @@ -535,15 +535,15 @@ public: PulseTimer = 3000; VoidBlastTimer = 45000; //is this a correct timer? - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - DoTeleportTo(x,y,71); + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + DoTeleportTo(x, y, 71); } void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 8; ++i) - me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), float(rand()%6), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); + me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%6), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); } void UpdateAI(const uint32 diff) @@ -629,7 +629,7 @@ public: me->RemoveAura(SPELL_BLACKHOLE_GROW, 1); break; case 3: - SpellTimer = urand(400,900); + SpellTimer = urand(400, 900); NeedForAHack = 1; if (Unit* Temp = me->getVictim()) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index f127bc761fb..9cf1344beba 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -129,7 +129,7 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* plr = itr->getSource(); - if (plr && !plr->HasAura(45839,0)) + if (plr && !plr->HasAura(45839, 0)) return plr; } } @@ -226,15 +226,15 @@ public: { if (data == NOT_STARTED || data == DONE) { - HandleGameObject(ForceField,true); - HandleGameObject(KalecgosWall[0],true); - HandleGameObject(KalecgosWall[1],true); + HandleGameObject(ForceField, true); + HandleGameObject(KalecgosWall[0], true); + HandleGameObject(KalecgosWall[1], true); } else if (data == IN_PROGRESS) { - HandleGameObject(ForceField,false); - HandleGameObject(KalecgosWall[0],false); - HandleGameObject(KalecgosWall[1],false); + HandleGameObject(ForceField, false); + HandleGameObject(KalecgosWall[0], false); + HandleGameObject(KalecgosWall[1], false); } m_auiEncounter[0] = data; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 66d3ac557fb..01730f8142a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -101,7 +101,7 @@ class boss_archaedas : public CreatureScript if (pMinion && pMinion->isAlive()) { DoCast(pMinion, SPELL_AWAKEN_VAULT_WALKER, bFlag); - pMinion->CastSpell(pMinion, SPELL_ARCHAEDAS_AWAKEN,true); + pMinion->CastSpell(pMinion, SPELL_ARCHAEDAS_AWAKEN, true); } } @@ -109,7 +109,7 @@ class boss_archaedas : public CreatureScript { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } void SpellHit(Unit* /*caster*/, const SpellEntry *spell) @@ -118,7 +118,7 @@ class boss_archaedas : public CreatureScript if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN)) { me->MonsterYell(SAY_AGGRO, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me,SOUND_AGGRO); + DoPlaySoundToSet(me, SOUND_AGGRO); iAwakenTimer = 4000; bWakingUp = true; } @@ -161,12 +161,12 @@ class boss_archaedas : public CreatureScript //If we are <66 summon the guardians if (!bGuardiansAwake && !HealthAbovePct(66)) { - ActivateMinion(pInstance->GetData64(5),true); // EarthenGuardian1 - ActivateMinion(pInstance->GetData64(6),true); // EarthenGuardian2 - ActivateMinion(pInstance->GetData64(7),true); // EarthenGuardian3 - ActivateMinion(pInstance->GetData64(8),true); // EarthenGuardian4 - ActivateMinion(pInstance->GetData64(9),true); // EarthenGuardian5 - ActivateMinion(pInstance->GetData64(10),false); // EarthenGuardian6 + ActivateMinion(pInstance->GetData64(5), true); // EarthenGuardian1 + ActivateMinion(pInstance->GetData64(6), true); // EarthenGuardian2 + ActivateMinion(pInstance->GetData64(7), true); // EarthenGuardian3 + ActivateMinion(pInstance->GetData64(8), true); // EarthenGuardian4 + ActivateMinion(pInstance->GetData64(9), true); // EarthenGuardian5 + ActivateMinion(pInstance->GetData64(10), false); // EarthenGuardian6 me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON); bGuardiansAwake = true; @@ -175,10 +175,10 @@ class boss_archaedas : public CreatureScript //If we are <33 summon the vault walkers if (!bVaultWalkersAwake && !HealthAbovePct(33)) { - ActivateMinion(pInstance->GetData64(1),true); // VaultWalker1 - ActivateMinion(pInstance->GetData64(2),true); // VaultWalker2 - ActivateMinion(pInstance->GetData64(3),true); // VaultWalker3 - ActivateMinion(pInstance->GetData64(4),false); // VaultWalker4 + ActivateMinion(pInstance->GetData64(1), true); // VaultWalker1 + ActivateMinion(pInstance->GetData64(2), true); // VaultWalker2 + ActivateMinion(pInstance->GetData64(3), true); // VaultWalker3 + ActivateMinion(pInstance->GetData64(4), false); // VaultWalker4 me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON2); bVaultWalkersAwake = true; @@ -364,7 +364,7 @@ class mob_stonekeepers : public CreatureScript void JustDied(Unit * /*attacker*/) { - DoCast (me, SPELL_SELF_DESTRUCT,true); + DoCast (me, SPELL_SELF_DESTRUCT, true); if (pInstance) pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper } @@ -402,7 +402,7 @@ class go_altar_of_archaedas : public GameObjectScript pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false); - pInstance->SetData64(0,pPlayer->GetGUID()); // activate archaedas + pInstance->SetData64(0, pPlayer->GetGUID()); // activate archaedas return false; } }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 0add39a3f6e..3179ccc9949 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -148,7 +148,7 @@ class instance_uldaman : public InstanceMapScript { creature->setFaction(35); creature->RemoveAllAuras(); - //creature->RemoveFlag (UNIT_FIELD_FLAGS,UNIT_FLAG_ANIMATION_FROZEN); + //creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_ANIMATION_FROZEN); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } @@ -178,7 +178,7 @@ class instance_uldaman : public InstanceMapScript Creature* pTarget = instance->GetCreature(*i); if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; - pTarget->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); pTarget->setFaction(14); pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return; // only want the first one we find @@ -200,7 +200,7 @@ class instance_uldaman : public InstanceMapScript if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; archaedas->CastSpell(pTarget, SPELL_AWAKEN_VAULT_WALKER, true); - pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN,true); + pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN, true); return; // only want the first one we find } } @@ -247,7 +247,7 @@ class instance_uldaman : public InstanceMapScript if (Unit::GetUnit(*archaedas, target)) { - archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN,false); + archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN, false); uiWhoWokeuiArchaedasGUID = target; } } @@ -259,7 +259,7 @@ class instance_uldaman : public InstanceMapScript return; ironaya->setFaction(415); - ironaya->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 56acd4abd7d..043243a7d8f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -104,9 +104,9 @@ class boss_akilzon : public CreatureScript if (pInstance) pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED); - StaticDisruption_Timer = urand(10000,20000); //10 to 20 seconds (bosskillers) - GustOfWind_Timer = urand(20000,30000); //20 to 30 seconds(bosskillers) - CallLighting_Timer = urand(10000,20000); //totaly random timer. can't find any info on this + StaticDisruption_Timer = urand(10000, 20000); //10 to 20 seconds (bosskillers) + GustOfWind_Timer = urand(20000, 30000); //20 to 30 seconds(bosskillers) + CallLighting_Timer = urand(10000, 20000); //totaly random timer. can't find any info on this ElectricalStorm_Timer = 60000; //60 seconds(bosskillers) Enrage_Timer = 10*MINUTE*IN_MILLISECONDS; //10 minutes till enrage(bosskillers) SummonEagles_Timer = 99999; @@ -146,7 +146,7 @@ class boss_akilzon : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); @@ -163,7 +163,7 @@ class boss_akilzon : public CreatureScript { for (uint8 i = 0; i < 8; ++i) { - Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]); + Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (bird && bird->isAlive()) { bird->SetVisible(false); @@ -219,7 +219,7 @@ class boss_akilzon : public CreatureScript } } // visual - float x,y,z; + float x, y, z; z = me->GetPositionZ(); for (uint8 i = 0; i < 5+rand()%5; ++i) { @@ -232,7 +232,7 @@ class boss_akilzon : public CreatureScript trigger->SetHealth(100000); trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); if (Cloud) - Cloud->CastCustomSpell(trigger, /*43661*/43137, &bp0, NULL, NULL,true, 0, 0, Cloud->GetGUID()); + Cloud->CastCustomSpell(trigger, /*43661*/43137, &bp0, NULL, NULL, true, 0, 0, Cloud->GetGUID()); } } } @@ -244,7 +244,7 @@ class boss_akilzon : public CreatureScript me->InterruptNonMeleeSpells(false); CloudGUID = 0; if (Cloud) - Cloud->DealDamage(Cloud, Cloud->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Cloud->DealDamage(Cloud, Cloud->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); SetWeather(WEATHER_STATE_FINE, 0.0f); isRaining = false; } @@ -325,12 +325,12 @@ class boss_akilzon : public CreatureScript } pTarget->CastSpell(pTarget, 44007, true);//cloud visual DoCast(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual - float x,y,z; - pTarget->GetPosition(x,y,z); + float x, y, z; + pTarget->GetPosition(x, y, z); if (pTarget) { pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - pTarget->SendMonsterMove(x,y,me->GetPositionZ()+15,0); + pTarget->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); } Unit *Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) @@ -359,16 +359,16 @@ class boss_akilzon : public CreatureScript for (uint8 i = 0; i < 8; ++i) { - Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]); + Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - x = pTarget->GetPositionX() + irand(-10,10); - y = pTarget->GetPositionY() + irand(-10,10); - z = pTarget->GetPositionZ() + urand(16,20); + x = pTarget->GetPositionX() + irand(-10, 10); + y = pTarget->GetPositionY() + irand(-10, 10); + z = pTarget->GetPositionZ() + urand(16, 20); if (z > 95) - z = 95.0f - urand(0,5); + z = 95.0f - urand(0, 5); } Creature *pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (pCreature) @@ -448,11 +448,11 @@ class mob_akilzon_eagle : public CreatureScript float x, y, z; if (EagleSwoop_Timer) { - x = pTarget->GetPositionX() + irand(-10,10); - y = pTarget->GetPositionY() + irand(-10,10); - z = pTarget->GetPositionZ() + urand(10,15); + x = pTarget->GetPositionX() + irand(-10, 10); + y = pTarget->GetPositionY() + irand(-10, 10); + z = pTarget->GetPositionZ() + urand(10, 15); if (z > 95) - z = 95.0f - urand(0,5); + z = 95.0f - urand(0, 5); } else { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f7d1b3f5ead..109a3f14760 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -186,7 +186,7 @@ class boss_halazzi : public CreatureScript break; case PHASE_HUMAN: //DoCast(me, SPELL_SUMMON_LYNX, true); - DoSpawnCreature(MOB_SPIRIT_LYNX, 5,5,0,0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(MOB_SPIRIT_LYNX, 5, 5, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); me->SetMaxHealth(400000); me->SetHealth(400000); ShockTimer = 10000; @@ -238,7 +238,7 @@ class boss_halazzi : public CreatureScript if (FrenzyTimer <= diff) { DoCast(me, SPELL_FRENZY); - FrenzyTimer = urand(10000,15000); + FrenzyTimer = urand(10000, 15000); } else FrenzyTimer -= diff; if (Phase == PHASE_LYNX) @@ -262,7 +262,7 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->IsNonMeleeSpellCasted(false)) DoCast(pTarget, SPELL_EARTHSHOCK); @@ -315,7 +315,7 @@ class boss_halazzi : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -364,7 +364,7 @@ class mob_halazzi_lynx : public CreatureScript void Reset() { - FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds + FrenzyTimer = urand(30000, 50000); //frenzy every 30-50 seconds shredder_timer = 4000; } @@ -390,7 +390,7 @@ class mob_halazzi_lynx : public CreatureScript if (FrenzyTimer <= diff) { DoCast(me, SPELL_LYNX_FRENZY); - FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds + FrenzyTimer = urand(30000, 50000); //frenzy every 30-50 seconds } else FrenzyTimer -= diff; if (shredder_timer <= diff) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index b9b5253c511..4a7f4eaa9c8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -264,7 +264,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4; ++i) { - Unit* Temp = Unit::GetUnit((*me),AddGUID[i]); + Unit* Temp = Unit::GetUnit((*me), AddGUID[i]); if (Temp && Temp->isAlive()) CAST_CRE(Temp)->AI()->AttackStart(me->getVictim()); else @@ -277,7 +277,7 @@ class boss_hexlord_malacrass : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -300,7 +300,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4 ; ++i) { - Unit* Temp = Unit::GetUnit((*me),AddGUID[i]); + Unit* Temp = Unit::GetUnit((*me), AddGUID[i]); if (Temp && Temp->isAlive()) Temp->DealDamage(Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -371,7 +371,7 @@ class boss_hexlord_malacrass : public CreatureScript DoCast(me, SPELL_DRAIN_POWER, true); me->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_DRAIN_POWER); - DrainPower_Timer = urand(40000,55000); // must cast in 60 sec, or buff/debuff will disappear + DrainPower_Timer = urand(40000, 55000); // must cast in 60 sec, or buff/debuff will disappear } else DrainPower_Timer -= diff; if (SpiritBolts_Timer <= diff) @@ -410,7 +410,7 @@ class boss_hexlord_malacrass : public CreatureScript //me->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SIPHON_SOUL); PlayerGUID = pTarget->GetGUID(); - PlayerAbility_Timer = urand(8000,10000); + PlayerAbility_Timer = urand(8000, 10000); PlayerClass = pTarget->getClass() - 1; if (PlayerClass == CLASS_DRUID-1) @@ -428,7 +428,7 @@ class boss_hexlord_malacrass : public CreatureScript //if (pTarget && pTarget->isAlive()) //{ UseAbility(); - PlayerAbility_Timer = urand(8000,10000); + PlayerAbility_Timer = urand(8000, 10000); //} } else PlayerAbility_Timer -= diff; @@ -437,7 +437,7 @@ class boss_hexlord_malacrass : public CreatureScript void UseAbility() { - uint8 random = urand(0,2); + uint8 random = urand(0, 2); Unit *pTarget = NULL; switch(PlayerAbility[PlayerClass][random].target) { @@ -599,7 +599,7 @@ class boss_alyson_antille : public CreatureScript } else { - if (urand(0,1)) + if (urand(0, 1)) pTarget = DoSelectLowestHpFriendly(50, 0); else pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); @@ -611,7 +611,7 @@ class boss_alyson_antille : public CreatureScript /*if (dispelmagic_timer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) { Unit *pTarget = SelectTarget(); @@ -865,7 +865,7 @@ class boss_fenstalker : public CreatureScript if (volatileinf_timer <= diff) { // core bug - me->getVictim()->CastSpell(me->getVictim(),SPELL_VOLATILE_INFECTION, false); + me->getVictim()->CastSpell(me->getVictim(), SPELL_VOLATILE_INFECTION, false); volatileinf_timer = 12000; } else volatileinf_timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 251ae131d01..cd733460d06 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -87,18 +87,18 @@ float FireWallCoords[4][4] = float hatcherway[2][5][3] = { { - {-87.46f,1170.09f,6}, - {-74.41f,1154.75f,6}, - {-52.74f,1153.32f,19}, - {-33.37f,1172.46f,19}, - {-33.09f,1203.87f,19} + {-87.46f, 1170.09f, 6}, + {-74.41f, 1154.75f, 6}, + {-52.74f, 1153.32f, 19}, + {-33.37f, 1172.46f, 19}, + {-33.09f, 1203.87f, 19} }, { - {-86.57f,1132.85f,6}, - {-73.94f,1146.00f,6}, - {-52.29f,1146.51f,19}, - {-33.57f,1125.72f,19}, - {-34.29f,1095.22f,19} + {-86.57f, 1132.85f, 6}, + {-73.94f, 1146.00f, 6}, + {-52.29f, 1146.51f, 19}, + {-33.57f, 1125.72f, 19}, + {-34.29f, 1095.22f, 19} } }; class boss_janalai : public CreatureScript @@ -175,7 +175,7 @@ class boss_janalai : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void EnterCombat(Unit * /*who*/) @@ -210,9 +210,9 @@ class boss_janalai : public CreatureScript for (uint8 j = 0; j < WallNum; j++) { if (WallNum == 3) - wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0],FireWallCoords[i][1]+5*(j-1),FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000); + wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000); else - wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j,FireWallCoords[i][1],FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000); + wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000); if (wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true); } } @@ -312,7 +312,7 @@ class boss_janalai : public CreatureScript { Boom(); isBombing = false; - BombTimer = urand(20000,40000); + BombTimer = urand(20000, 40000); me->RemoveAurasDueToSpell(SPELL_FIRE_BOMB_CHANNEL); if (EnrageTimer <= 10000) EnrageTimer = 0; @@ -369,10 +369,10 @@ class boss_janalai : public CreatureScript me->AttackStop(); me->GetMotionMaster()->Clear(); - DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); + DoTeleportTo(JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2]); me->StopMoving(); DoCast(me, SPELL_FIRE_BOMB_CHANNEL, false); - //DoTeleportPlayer(me, JanalainPos[0][0], JanalainPos[0][1],JanalainPos[0][2], 0); + //DoTeleportPlayer(me, JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2], 0); //DoCast(me, SPELL_TELE_TO_CENTER, true); FireWall(); @@ -400,7 +400,7 @@ class boss_janalai : public CreatureScript me->AttackStop(); me->GetMotionMaster()->Clear(); - DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); + DoTeleportTo(JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2]); me->StopMoving(); DoCast(me, SPELL_HATCH_ALL, false); HatchAllEggs(2); @@ -411,8 +411,8 @@ class boss_janalai : public CreatureScript if (HatchAllEggs(0)) { DoScriptText(SAY_SUMMON_HATCHER, me); - me->SummonCreature(MOB_AMANI_HATCHER,hatcherway[0][0][0],hatcherway[0][0][1],hatcherway[0][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); - me->SummonCreature(MOB_AMANI_HATCHER,hatcherway[1][0][0],hatcherway[1][0][1],hatcherway[1][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); + me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); HatcherTimer = 90000; } else @@ -426,7 +426,7 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); @@ -578,7 +578,7 @@ class mob_janalai_hatcher : public CreatureScript if (WaitTimer) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,hatcherway[side][waypoint][0],hatcherway[side][waypoint][1],hatcherway[side][waypoint][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[side][waypoint][0], hatcherway[side][waypoint][1], hatcherway[side][waypoint][2]); ++waypoint; WaitTimer = 0; } @@ -637,9 +637,9 @@ class mob_janalai_hatchling : public CreatureScript { BuffetTimer = 7000; if (me->GetPositionY() > 1150) - me->GetMotionMaster()->MovePoint(0, hatcherway[0][3][0]+rand()%4-2,1150.0f+rand()%4-2,hatcherway[0][3][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[0][3][0]+rand()%4-2, 1150.0f+rand()%4-2, hatcherway[0][3][2]); else - me->GetMotionMaster()->MovePoint(0, hatcherway[1][3][0]+rand()%4-2,1150.0f+rand()%4-2,hatcherway[1][3][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[1][3][0]+rand()%4-2, 1150.0f+rand()%4-2, hatcherway[1][3][2]); me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 846e2179822..76a2d09df75 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,12 +30,12 @@ EndScriptData */ //Trash Waves float NalorakkWay[8][3] = { - { 18.569f, 1414.512f, 11.42f},// waypoint 1 + { 18.569f, 1414.512f, 11.42f}, // waypoint 1 {-17.264f, 1419.551f, 12.62f}, - {-52.642f, 1419.357f, 27.31f},// waypoint 2 + {-52.642f, 1419.357f, 27.31f}, // waypoint 2 {-69.908f, 1419.721f, 27.31f}, {-79.929f, 1395.958f, 27.31f}, - {-80.072f, 1374.555f, 40.87f},// waypoint 3 + {-80.072f, 1374.555f, 40.87f}, // waypoint 3 {-80.072f, 1314.398f, 40.87f}, {-80.072f, 1295.775f, 48.60f} // waypoint 4 }; @@ -135,11 +135,11 @@ class boss_nalorakk : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); inMove = false; waitTimer = 0; - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); }else { - (*me).GetMotionMaster()->MovePoint(0,NalorakkWay[7][0],NalorakkWay[7][1],NalorakkWay[7][2]); + (*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]); } if (pInstance) @@ -180,7 +180,7 @@ class boss_nalorakk : public CreatureScript for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { - if ((*i) && me->IsWithinDistInMap((*i),25)) + if ((*i) && me->IsWithinDistInMap((*i), 25)) { (*i)->SetNoCallAssistance(true); (*i)->AI()->AttackStart(pTarget); @@ -214,7 +214,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE1); - (*me).GetMotionMaster()->MovePoint(1,NalorakkWay[1][0],NalorakkWay[1][1],NalorakkWay[1][2]); + (*me).GetMotionMaster()->MovePoint(1, NalorakkWay[1][0], NalorakkWay[1][1], NalorakkWay[1][2]); MovePhase ++; inMove = true; @@ -227,7 +227,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE2); - (*me).GetMotionMaster()->MovePoint(3,NalorakkWay[3][0],NalorakkWay[3][1],NalorakkWay[3][2]); + (*me).GetMotionMaster()->MovePoint(3, NalorakkWay[3][0], NalorakkWay[3][1], NalorakkWay[3][2]); MovePhase ++; inMove = true; @@ -240,7 +240,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE3); - (*me).GetMotionMaster()->MovePoint(6,NalorakkWay[6][0],NalorakkWay[6][1],NalorakkWay[6][2]); + (*me).GetMotionMaster()->MovePoint(6, NalorakkWay[6][0], NalorakkWay[6][1], NalorakkWay[6][2]); MovePhase ++; inMove = true; @@ -288,7 +288,7 @@ class boss_nalorakk : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -348,7 +348,7 @@ class boss_nalorakk : public CreatureScript if (waitTimer <= diff) { (*me).GetMotionMaster()->MovementExpired(); - (*me).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]); + (*me).GetMotionMaster()->MovePoint(MovePhase, NalorakkWay[MovePhase][0], NalorakkWay[MovePhase][1], NalorakkWay[MovePhase][2]); waitTimer = 0; } else waitTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 87d79ba7121..dae48291e6d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -239,7 +239,7 @@ class boss_zuljin : public CreatureScript if (Intro_Timer) return; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -262,7 +262,7 @@ class boss_zuljin : public CreatureScript Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE); if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[3])) - Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } void AttackStart(Unit *who) @@ -358,7 +358,7 @@ class boss_zuljin : public CreatureScript if (Phase > 0) { if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[Phase - 1])) - Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[NextPhase - 1])) Temp->CastSpell(me, SPELL_SIPHON_SOUL, false); // should m cast on temp diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 9496d22200b..26bb7bb631c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -86,8 +86,8 @@ class npc_forest_frog : public CreatureScript if (cEntry) me->UpdateEntry(cEntry); - if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1,DONE); - if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2,DONE); + if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1, DONE); + if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2, DONE); } } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 9f787589b8e..dbbe60d7cef 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript if (m_uiMark_Timer <= uiDiff) { - Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pMarkedTarget) { @@ -193,7 +193,7 @@ class boss_arlokk : public CreatureScript { DoCast(me->getVictim(), SPELL_GOUGE); - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); m_uiGouge_Timer = 17000+rand()%10000; } @@ -242,7 +242,7 @@ class boss_arlokk : public CreatureScript me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35))); me->UpdateDamagePhysical(BASE_ATTACK); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) AttackStart(pTarget); m_bIsPhaseTwo = true; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index c8ea4f89585..06ea67db8c1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -68,10 +68,10 @@ class boss_grilek : public CreatureScript DoCast(me, SPELL_AVARTAR); Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); if (pTarget) AttackStart(pTarget); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index e53c66082dd..70d4d160ca0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -132,7 +132,7 @@ class boss_hakkar : public CreatureScript //CauseInsanity_Timer /*if (CauseInsanity_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; @@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript //WillOfHakkar_Timer if (WillOfHakkar_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 04474c9383c..eef2c3cce01 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -84,11 +84,11 @@ class boss_hazzarah : public CreatureScript Unit *pTarget = NULL; for (uint8 i = 0; i < 3; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Illusion = me->SummonCreature(15163,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000); + Creature *Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) Illusion->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index a80dd889d7e..c9cfffd690d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); AttackStart(pTarget); @@ -136,24 +136,24 @@ class boss_jeklik : public CreatureScript if (SpawnBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Bat = NULL; - Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); SpawnBats_Timer = 60000; @@ -165,7 +165,7 @@ class boss_jeklik : public CreatureScript { if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index f78a47c6585..4096f982095 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -90,7 +90,7 @@ class boss_jindo : public CreatureScript if (HealingWard_Timer <= diff) { //DoCast(me, SPELL_POWERFULLHEALINGWARD); - me->SummonCreature(14987, me->GetPositionX()+3, me->GetPositionY()-2, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,30000); + me->SummonCreature(14987, me->GetPositionX()+3, me->GetPositionY()-2, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000); HealingWard_Timer = 14000 + rand()%6000; } else HealingWard_Timer -= diff; @@ -100,7 +100,7 @@ class boss_jindo : public CreatureScript DoCast(me->getVictim(), SPELL_HEX); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); Hex_Timer = 12000 + rand()%8000; } else Hex_Timer -= diff; @@ -108,7 +108,7 @@ class boss_jindo : public CreatureScript //Casting the delusion curse with a shade. So shade will attack the same target with the curse. if (Delusions_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_DELUSIONSOFJINDO); @@ -124,13 +124,13 @@ class boss_jindo : public CreatureScript if (Teleport_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(pTarget, -11583.7783f,-1249.4278f,77.5471f,4.745f); + DoTeleportPlayer(pTarget, -11583.7783f, -1249.4278f, 77.5471f, 4.745f); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(pTarget,-100); + DoModifyThreatPercent(pTarget, -100); Creature *Skeletons; Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index e4054c9032b..5c8ba750bda 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -121,7 +121,7 @@ class boss_mandokir : public CreatureScript uint64 JindoGUID = m_pInstance->GetData64(DATA_JINDO); if (JindoGUID) { - if (Unit* jTemp = Unit::GetUnit(*me,JindoGUID)) + if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID)) { if (jTemp->isAlive()) DoScriptText(SAY_GRATS_JINDO, jTemp); @@ -175,7 +175,7 @@ class boss_mandokir : public CreatureScript else { DoCast(pUnit, SPELL_CHARGE); - //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true, 1); AttackStart(pUnit); } } @@ -186,7 +186,7 @@ class boss_mandokir : public CreatureScript if ((Watch_Timer < 8000) && !someWatched) //8 sec(cast time + expire time) before the check for the watch effect mandokir will cast watch debuff on a random target { - if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoScriptText(SAY_WATCH, me, p); DoCast(p, SPELL_WATCH); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 8674a821517..ad6950c8f30 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -118,22 +118,22 @@ class boss_marli : public CreatureScript { DoScriptText(SAY_SPIDER_SPAWN, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; Creature *Spider = NULL; - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); @@ -142,11 +142,11 @@ class boss_marli : public CreatureScript if (SpawnSpider_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature *Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); SpawnSpider_Timer = 12000 + rand()%5000; @@ -163,10 +163,10 @@ class boss_marli : public CreatureScript DoCast(me->getVictim(), SPELL_ENVOLWINGWEB); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-100); + DoModifyThreatPercent(me->getVictim(), -100); PhaseTwo = true; - Transform_Timer = urand(35000,60000); + Transform_Timer = urand(35000, 60000); } else Transform_Timer -= diff; if (PhaseTwo) @@ -178,7 +178,7 @@ class boss_marli : public CreatureScript while (i < 3) // max 3 tries to get a random target with power_mana { ++i; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1, 100, true); // not aggro leader + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader if (pTarget && pTarget->getPowerType() == POWER_MANA) i = 3; } @@ -186,7 +186,7 @@ class boss_marli : public CreatureScript { DoCast(pTarget, SPELL_CHARGE); //me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); AttackStart(pTarget); } @@ -202,7 +202,7 @@ class boss_marli : public CreatureScript me->UpdateDamagePhysical(BASE_ATTACK); PhaseTwo = false; - TransformBack_Timer = urand(25000,40000); + TransformBack_Timer = urand(25000, 40000); } else TransformBack_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 191d9f311b2..b5550e6e740 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -93,7 +93,7 @@ class boss_renataki : public CreatureScript if (Ambush_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); @@ -127,10 +127,10 @@ class boss_renataki : public CreatureScript if (Aggro_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); if (pTarget) AttackStart(pTarget); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 56b2fd34872..796124be1dd 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); DoResetThreat(); @@ -343,7 +343,7 @@ class mob_zealot_lorkhan : public CreatureScript if (!pThekal || !pZath) return; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: if (me->IsWithinMeleeRange(pThekal)) @@ -500,7 +500,7 @@ class mob_zealot_zath : public CreatureScript DoCast(me->getVictim(), SPELL_GOUGE); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-100); + DoModifyThreatPercent(me->getVictim(), -100); Gouge_Timer = 17000+rand()%10000; } else Gouge_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 4aaff206375..a623c8e3760 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript TargetInRange = 0; for (uint8 i = 0; i < 10; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,i)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) if (me->IsWithinMeleeRange(pTarget)) ++TargetInRange; } @@ -144,7 +144,7 @@ class boss_venoxis : public CreatureScript if (HolyFire_Timer < diff && TargetInRange < 3) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HOLY_FIRE); HolyFire_Timer = 8000; @@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript if (PhaseTwo && VenomSpit_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VENOMSPIT); VenomSpit_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 944a33fb620..e6e38b761ee 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -71,7 +71,7 @@ class boss_wushoolay : public CreatureScript if (LightningWave_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); LightningWave_Timer = 12000 + rand()%4000; diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index d893811db55..5c1a1d77b0d 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -72,13 +72,13 @@ public: void KilledUnit(Unit* /*victim*/) { - // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70,000 health. + // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70, 000 health. DoCast(me, SPELL_CAPTURESOUL); } void SummonHounds(Unit* pVictim) { - if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) Hound->AI()->AttackStart(pVictim); } @@ -91,7 +91,7 @@ public: //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - if (urand(0,99) < 45) + if (urand(0, 99) < 45) DoCast(me->getVictim(), SPELL_SHADOWVOLLEY); ShadowVolley_Timer = 5000; @@ -100,7 +100,7 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoCast(me->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; @@ -109,7 +109,7 @@ public: //ThunderClap_Timer if (ThunderClap_Timer <= diff) { - if (urand(0,9) < 2) + if (urand(0, 9) < 2) DoCast(me->getVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 12000; @@ -125,7 +125,7 @@ public: //VoidBolt_Timer if (VoidBolt_Timer <= diff) { - if (urand(0,9) < 4) + if (urand(0, 9) < 4) DoCast(me->getVictim(), SPELL_VOIDBOLT); VoidBolt_Timer = 18000; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 4071087d860..6a550d55a0b 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -38,16 +38,16 @@ public: { if (pPlayer->HasQuestForItem(21149)) { - if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16f,-489.57f,49.95f,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) + if (Unit* TCorrupter = pPlayer->SummonCreature(15625, -10328.16f, -489.57f, 49.95f, 0, TEMPSUMMON_MANUAL_DESPAWN, 60000)) { TCorrupter->setFaction(14); TCorrupter->SetMaxHealth(832750); } - if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()-1,0,TEMPSUMMON_TIMED_DESPAWN,15000)) + if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) { CorrupterSpeaker->SetName("Twilight Corrupter"); CorrupterSpeaker->SetVisible(true); - CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...",0,pPlayer->GetGUID()); + CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, pPlayer->GetGUID()); } } return false; @@ -89,7 +89,7 @@ public: } void EnterCombat(Unit* /*who*/) { - me->MonsterYell("The Nightmare cannot be stopped!",0,me->GetGUID()); + me->MonsterYell("The Nightmare cannot be stopped!", 0, me->GetGUID()); } void KilledUnit(Unit* victim) @@ -97,7 +97,7 @@ public: if (victim->GetTypeId() == TYPEID_PLAYER) { ++KillCount; - me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(),true); + me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(), true); if (KillCount == 3) { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 13f69b90d1b..c4bd0e022a4 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -420,16 +420,16 @@ public: switch(paladinPhase) { case 0: - DoScriptText(TEXT_SECOND_TRIAL_1,me); + DoScriptText(TEXT_SECOND_TRIAL_1, me); break; case 1: - DoScriptText(TEXT_SECOND_TRIAL_2,me); + DoScriptText(TEXT_SECOND_TRIAL_2, me); break; case 2: - DoScriptText(TEXT_SECOND_TRIAL_3,me); + DoScriptText(TEXT_SECOND_TRIAL_3, me); break; case 3: - DoScriptText(TEXT_SECOND_TRIAL_4,me); + DoScriptText(TEXT_SECOND_TRIAL_4, me); break; } } @@ -492,7 +492,7 @@ void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) if (me->GetEntry() == CHAMPION_SUNSTRIKER) { if (Killer->GetTypeId() == TYPEID_PLAYER) - Killer->ToPlayer()->GroupEventHappens(QUEST_SECOND_TRIAL,Killer); + Killer->ToPlayer()->GroupEventHappens(QUEST_SECOND_TRIAL, Killer); } } } @@ -690,7 +690,7 @@ public: if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES); - me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); } else EndTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 83faaf36dfe..31a574ccef8 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -62,7 +62,7 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true)) + if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226, 1, true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); @@ -211,7 +211,7 @@ public: case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); break; case 30: if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,me); + CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS, me); break; case 32: me->SetOrientation(2.978281f); diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index f9925feda74..75cf7d481a8 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -250,7 +250,7 @@ public: return; //only if attacked and escorter is not in combat? - DoScriptText(RAND(SAY_RIN_HELP_1,SAY_RIN_HELP_2), me); + DoScriptText(RAND(SAY_RIN_HELP_1, SAY_RIN_HELP_2), me); } } diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 4a0d59b02f8..7fbf32875e1 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -71,7 +71,7 @@ public: { if (Timer <= diff) { - uint32 i = urand(1,2); + uint32 i = urand(1, 2); if (i == 1) DoScriptText(SAY_CONVERTED_1, me); else diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 71aaa4158c3..f104d104583 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -47,7 +47,7 @@ public: { if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION) { - CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI,pCreature->AI())->Start(true, false, pPlayer->GetGUID(),pQuest); + CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID(), pQuest); DoScriptText(SAY_CORPORAL_1, pCreature); } @@ -123,12 +123,12 @@ public: uiPhase = 2; break; case 2: - DoScriptText(SAY_CORPORAL_2,me); + DoScriptText(SAY_CORPORAL_2, me); uiTimer = 15000; uiPhase = 3; break; case 3: - DoScriptText(SAY_CORPORAL_3,me); + DoScriptText(SAY_CORPORAL_3, me); me->SetStandState(UNIT_STAND_STATE_STAND); SetEscortPaused(false); uiTimer = 0; @@ -151,13 +151,13 @@ public: if (uiMockingBlowTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_MOCKING_BLOW); + DoCast(me->getVictim(), SPELL_MOCKING_BLOW); uiMockingBlowTimer = 5000; } else uiMockingBlowTimer -= uiDiff; if (uiShieldBashTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_MOCKING_BLOW); + DoCast(me->getVictim(), SPELL_MOCKING_BLOW); uiShieldBashTimer = 8000; } else uiShieldBashTimer -= uiDiff; diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index 7a9d7efb347..f99fa6119c3 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -62,7 +62,7 @@ public: { lifeTimer = 120000; me->SetStandState(UNIT_STAND_STATE_DEAD); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,7); // lay down + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 7); // lay down spellHit = false; } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 9ae10832e28..a1c75f4bbc5 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -170,7 +170,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me, who); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me, who); } }; diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 76af8e4460e..0cd539c1101 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -356,9 +356,9 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { - pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977f, 468.611450f, 123.759903f); + pMarzon->GetMotionMaster()->MovePoint(0, -8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); } uiTimer = 2000; @@ -370,7 +370,7 @@ public: void DoGuardsDisappearAndDie() { std::list<Creature*> GuardList; - me->GetCreatureListWithEntryInGrid(GuardList,NPC_STORMWIND_ROYAL,8.0f); + me->GetCreatureListWithEntryInGrid(GuardList, NPC_STORMWIND_ROYAL, 8.0f); if (!GuardList.empty()) { for (std::list<Creature*>::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) @@ -607,7 +607,7 @@ public: uiPhase = 2; break; case 2: - if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION,10.0f)) + if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 10.0f)) DoScriptText(SAY_TYRION_1, pTyrion); uiTimer = 3000; uiPhase = 3; @@ -639,7 +639,7 @@ public: uiPhase = 0; break; case 8: - if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR,10.0f)) + if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f)) DoScriptText(SAY_LESCOVAR_1, pLescovar); uiTimer = 3000; uiPhase = 9; @@ -650,11 +650,11 @@ public: uiPhase = 10; break; case 10: - if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR,10.0f)) + if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f)) { if (Player* pPlayer = GetPlayerForEscort()) { - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI,pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f); } } @@ -696,8 +696,8 @@ public: { if (Creature* pSpybot = pCreature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) { - CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI,pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); - CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI,pSpybot->AI())->SetMaxPlayerDistance(200.0f); + CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->SetMaxPlayerDistance(200.0f); } return true; } diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 6b68ac58ea3..1e220276a96 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -80,8 +80,8 @@ public: me->RestoreFaction(); - if (!me->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE)) - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } void EnterCombat(Unit* /*who*/) {} @@ -101,7 +101,7 @@ public: uiDamage = 0; me->RestoreFaction(); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->CombatStop(true); m_uiPhase = 1; @@ -201,7 +201,7 @@ public: if (GameObject* pDoor = pPlayer->FindNearestGameObject(GO_DOOR, 30.0f)) { pGo->SetGoState(GO_STATE_ACTIVE); - pDoor->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); return true; } diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 4b0ac365181..ea78f0892e0 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -107,9 +107,9 @@ public: { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit *pTarget = Unit::GetUnit(*summoned,targetGUID)) + if (Unit *pTarget = Unit::GetUnit(*summoned, targetGUID)) { - pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f,0); + pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0); pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); } @@ -186,8 +186,8 @@ public: if (EventMove_Timer <= diff) { me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->SendMonsterMoveWithSpeed(me->GetPositionX(),me->GetPositionY(),HIGHBORNE_LOC_Y_NEW,5000); - me->GetMap()->CreatureRelocation(me,me->GetPositionX(),me->GetPositionY(),HIGHBORNE_LOC_Y_NEW,me->GetOrientation()); + me->SendMonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, 5000); + me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetOrientation()); EventMove = false; } else EventMove_Timer -= diff; } @@ -225,7 +225,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false); + pCreature->CastSpell(pPlayer, SPELL_MARK_OF_SHAME, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 3ef6b7f689c..6534fd4d0e9 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -213,7 +213,7 @@ public: if (CAST_PLR(who)->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE || CAST_PLR(who)->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE) { - me->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoDie(); } break; @@ -221,7 +221,7 @@ public: if (CAST_PLR(who)->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE || CAST_PLR(who)->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE) { - me->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoDie(); } break; @@ -358,7 +358,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f,-1825.42f ,81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f , 81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 5b6c377a37e..424d5427238 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -246,14 +246,14 @@ public: DoScriptText(SAY_END, me, pPlayer); { if (pPlayer) - pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD,me); + pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD, me); } break; } } void EnterCombat(Unit* who) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me, who); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me, who); } void Reset() {} diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 7cc62b1d49d..85609aab584 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -112,7 +112,7 @@ class example_creature : public CreatureScript m_uiPhase = 1; // Start in phase 1 m_uiPhaseTimer = 60000; // 60 seconds m_uiSpell1Timer = 5000; // 5 seconds - m_uiSpell2Timer = urand(10000,20000); // between 10 and 20 seconds + m_uiSpell2Timer = urand(10000, 20000); // between 10 and 20 seconds m_uiSpell3Timer = 19000; // 19 seconds m_uiBeserkTimer = 120000; // 2 minutes @@ -170,7 +170,7 @@ class example_creature : public CreatureScript if (m_uiSayTimer <= uiDiff) { //Random switch between 5 outcomes - DoScriptText(RAND(SAY_RANDOM_0,SAY_RANDOM_1,SAY_RANDOM_2,SAY_RANDOM_3,SAY_RANDOM_4), me); + DoScriptText(RAND(SAY_RANDOM_0, SAY_RANDOM_1, SAY_RANDOM_2, SAY_RANDOM_3, SAY_RANDOM_4), me); m_uiSayTimer = 45000; //Say something agian in 45 seconds } diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 6dfb21bf3f8..212ed450ed5 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -245,7 +245,7 @@ class spell_ex_66244 : public SpellScriptLoader { OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_ex_66244AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic,EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_DUMMY); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_ex_66244AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_ex_66244AuraScript::HandleEffectCalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index c66eb20f3c7..424ddcc16e4 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -30,7 +30,7 @@ enum eSpells #define GOSSIP_ITEM_MORRIDUNE "Please port me to Darnassus" -const Position HomePosition = {-815.817f,-145.299f,-25.870f, 0}; +const Position HomePosition = {-815.817f, -145.299f, -25.870f, 0}; class go_blackfathom_altar : public GameObjectScript { @@ -40,7 +40,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGo*/) { if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) - pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM,pPlayer); + pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer); return true; } @@ -102,9 +102,9 @@ public: { bFlee = false; - uiRavageTimer = urand(5000,8000); - uiFrostNovaTimer = urand(9000,12000); - uiFrostBoltVolleyTimer = urand(2000,4000); + uiRavageTimer = urand(5000, 8000); + uiFrostNovaTimer = urand(9000, 12000); + uiFrostBoltVolleyTimer = urand(2000, 4000); } void AttackPlayer() @@ -143,7 +143,7 @@ public: if (uiRavageTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_RAVAGE); - uiRavageTimer = urand(9000,14000); + uiRavageTimer = urand(9000, 14000); } else uiRavageTimer -= uiDiff; break; } @@ -161,17 +161,17 @@ public: { if (uiFrostBoltVolleyTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) DoCast(pTarget, SPELL_FROST_BOLT_VOLLEY); } - uiFrostBoltVolleyTimer = urand(5000,8000); + uiFrostBoltVolleyTimer = urand(5000, 8000); } else uiFrostBoltVolleyTimer -= uiDiff; if (uiFrostNovaTimer <= uiDiff) { - DoCastAOE(SPELL_FROST_NOVA,false); - uiFrostNovaTimer = urand(25000,30000); + DoCastAOE(SPELL_FROST_NOVA, false); + uiFrostNovaTimer = urand(25000, 30000); } else uiFrostNovaTimer -= uiDiff; break; } @@ -207,7 +207,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->TeleportTo(1,9952.239f,2284.277f,1341.394f,1.595f); + pPlayer->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -231,9 +231,9 @@ public: { npc_morriduneAI(Creature* pCreature) : npc_escortAI(pCreature) { - DoScriptText(SAY_MORRIDUNE_1,pCreature); + DoScriptText(SAY_MORRIDUNE_1, pCreature); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - Start(false,false,0); + Start(false, false, 0); } void WaypointReached(uint32 uiPoint) @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2,me); + DoScriptText(SAY_MORRIDUNE_2, me); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 3580b3d4c30..fabe4ce7526 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -48,7 +48,7 @@ public: void Reset() { - uiPoisonCloudTimer = urand(5000,9000); + uiPoisonCloudTimer = urand(5000, 9000); bIsEnraged = false; if (pInstance) pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED); @@ -74,12 +74,12 @@ public: if (uiPoisonCloudTimer < diff) { DoCastVictim(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(25000,50000); + uiPoisonCloudTimer = urand(25000, 50000); } else uiPoisonCloudTimer -= diff; if (!bIsEnraged && HealthBelowPct(30)) { - DoCast(me,SPELL_FRENZIED_RAGE); + DoCast(me, SPELL_FRENZIED_RAGE); bIsEnraged = true; } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 9eec90ad02f..88b6382c105 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -46,7 +46,7 @@ public: void Reset() { - uiNetTimer = urand(2000,4000); + uiNetTimer = urand(2000, 4000); if (pInstance) pInstance->SetData(TYPE_GELIHAST, NOT_STARTED); } @@ -71,7 +71,7 @@ public: if (uiNetTimer < diff) { DoCastVictim(SPELL_NET); - uiNetTimer = urand(4000,7000); + uiNetTimer = urand(4000, 7000); } else uiNetTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 5833cb2d123..471d4663b0c 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -56,8 +56,8 @@ public: void Reset() { - uiMindBlastTimer = urand(2000,5000); - uiSleepTimer = urand(9000,12000); + uiMindBlastTimer = urand(2000, 5000); + uiSleepTimer = urand(9000, 12000); if (pInstance) pInstance->SetData(TYPE_KELRIS, NOT_STARTED); } @@ -84,7 +84,7 @@ public: if (uiMindBlastTimer < diff) { DoCastVictim(SPELL_MIND_BLAST); - uiMindBlastTimer = urand(7000,9000); + uiMindBlastTimer = urand(7000, 9000); } else uiMindBlastTimer -= diff; if (uiSleepTimer < diff) @@ -94,7 +94,7 @@ public: DoScriptText(SAY_SLEEP, me); DoCast(pTarget, SPELL_SLEEP); } - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index c1fb711e5fd..0b0e9076fc1 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -102,7 +102,7 @@ public: m_uiTwilightLordKelrisGUID = creature->GetGUID(); break; case NPC_LORGUS_JETT: - creature->SetHomePosition(LorgusPosition[urand(0,3)]); + creature->SetHomePosition(LorgusPosition[urand(0, 3)]); break; } } @@ -135,7 +135,7 @@ public: break; case GO_AKU_MAI_DOOR: if (m_auiEncounter[2] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); m_uiMainDoorGUID = go->GetGUID(); break; } @@ -157,7 +157,7 @@ public: if (GameObject* go = instance->GetGameObject(m_uiAltarOfTheDeepsGUID)) { go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - go->SummonCreature(NPC_MORRIDUNE,SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); } break; case DATA_FIRE: @@ -206,7 +206,7 @@ public: case DATA_EVENT: uiDeathTimes = uiData; if (uiDeathTimes == 18) - HandleGameObject(m_uiMainDoorGUID,true); + HandleGameObject(m_uiMainDoorGUID, true); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 3bd68634571..978b0b822b1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -106,7 +106,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -130,7 +130,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -177,8 +177,8 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CARRION_SWARM); - SwarmTimer = urand(45000,60000); - switch (urand(0,1)) + SwarmTimer = urand(45000, 60000); + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SWARM1); @@ -196,10 +196,10 @@ public: for (uint8 i = 0; i < 3; ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget,SPELL_SLEEP,true); + pTarget->CastSpell(pTarget, SPELL_SLEEP, true); } SleepTimer = 60000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SLEEP1); @@ -214,13 +214,13 @@ public: if (AuraTimer <= diff) { DoCast(me, SPELL_VAMPIRIC_AURA, true); - AuraTimer = urand(10000,20000); + AuraTimer = urand(10000, 20000); } else AuraTimer -= diff; if (InfernoTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_INFERNO1); @@ -297,7 +297,7 @@ public: { if (AnetheronGUID) { - Creature* boss = Unit::GetCreature((*me),AnetheronGUID); + Creature* boss = Unit::GetCreature((*me), AnetheronGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index e2fa3a69f96..8b2aa35e2ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -194,9 +194,9 @@ public: { if (ChangeTargetTimer <= diff) { - if (Unit *temp = Unit::GetUnit(*me,TargetGUID)) + if (Unit *temp = Unit::GetUnit(*me, TargetGUID)) { - me->GetMotionMaster()->MoveFollow(temp,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(temp, 0.0f, 0.0f); TargetGUID = 0; } else @@ -274,9 +274,9 @@ public: DrainNordrassilTimer = 0; FearTimer = 42000; AirBurstTimer = 30000; - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); DoomfireTimer = 20000; - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); SoulChargeCount = 0; MeleeRangeCheckTimer = 15000; HandOfDeathTimer = 2000; @@ -303,7 +303,7 @@ public: void KilledUnit(Unit * victim) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) GainSoulCharge(CAST_PLR(victim)); @@ -330,7 +330,7 @@ public: break; } - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); ++SoulChargeCount; } @@ -397,12 +397,12 @@ public: if (summoned->GetEntry() == CREATURE_DOOMFIRE) { - summoned->CastSpell(summoned,SPELL_DOOMFIRE_SPAWN,false); - summoned->CastSpell(summoned,SPELL_DOOMFIRE,true,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_DOOMFIRE_SPAWN, false); + summoned->CastSpell(summoned, SPELL_DOOMFIRE, true, 0, 0, me->GetGUID()); if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) { - summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit,0.0f,0.0f); + summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit, 0.0f, 0.0f); DoomfireSpiritGUID = 0; } } @@ -412,11 +412,11 @@ public: void SummonDoomfire(Unit *pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0f,pTarget->GetPositionY()+15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()+15.0f, pTarget->GetPositionY()+15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0f,pTarget->GetPositionY()-15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()-15.0f, pTarget->GetPositionY()-15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } @@ -428,7 +428,7 @@ public: uint32 chargeSpell = 0; uint32 unleashSpell = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: chargeSpell = SPELL_SOUL_CHARGE_RED; @@ -453,7 +453,7 @@ public: } if (HasCast) - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); } void UpdateAI(const uint32 diff) @@ -584,18 +584,18 @@ public: if (GripOfTheLegionTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); } else GripOfTheLegionTimer -= diff; if (AirBurstTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_AIR_BURST1, me); else DoScriptText(SAY_AIR_BURST2, me); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank - AirBurstTimer = urand(25000,40000); + AirBurstTimer = urand(25000, 40000); } else AirBurstTimer -= diff; if (FearTimer <= diff) @@ -606,7 +606,7 @@ public: if (DoomfireTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_DOOMFIRE1, me); else DoScriptText(SAY_DOOMFIRE2, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 3959337bc49..77a3549dbc3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -99,7 +99,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -123,7 +123,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -166,13 +166,13 @@ public: if (RainTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true), SPELL_RAIN_OF_FIRE); RainTimer = 20000+rand()%15000; } else RainTimer -= diff; if (DoomTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_DOOM);//never on tank DoomTimer = 45000+rand()%5000; } else DoomTimer -= diff; @@ -267,7 +267,7 @@ public: { if (AzgalorGUID) { - Creature* boss = Unit::GetCreature((*me),AzgalorGUID); + Creature* boss = Unit::GetCreature((*me), AzgalorGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index fc3abbaab9f..86e1348f399 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -118,7 +118,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -184,14 +184,14 @@ public: Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) { - pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users + pTarget->CastSpell(pTarget, SPELL_MARK, true);//only cast on mana users } } MarkTimerBase -= 5000; if (MarkTimerBase < 5500) MarkTimerBase = 5500; MarkTimer = MarkTimerBase; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_MARK1); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 295727c44ac..fdd046b454f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -114,7 +114,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -165,7 +165,7 @@ public: { DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_DECAY1); @@ -181,7 +181,7 @@ public: { DoCast(me->getVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_NOVA1); @@ -195,7 +195,7 @@ public: } else NovaTimer -= diff; if (IceboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_ICEBOLT); IceboltTimer = 11000+rand()%20000; } else IceboltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 26aa3fd7cfc..1394ec232fd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -223,7 +223,7 @@ public: { Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); if (item && pPlayer) - pPlayer->SendNewItem(item,1,true,false,true); + pPlayer->SendNewItem(item, 1, true, false, true); } pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); CAST_AI(hyjalAI, pCreature->AI()); @@ -237,7 +237,7 @@ public: uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); // Only let them get item if Azgalor is dead. - if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) + if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 38ffeeed042..1db2a350dac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -72,8 +72,8 @@ float HordeBase[4][3]= // Lady Jaina's waypoints when retreathing float JainaWPs[2][3]= { - {5078.56f, -1789.79f, 1320.73f},//next to the small stairs - {5037.38f, -1778.39f, 1322.61f},//center of alliance base + {5078.56f, -1789.79f, 1320.73f}, //next to the small stairs + {5037.38f, -1778.39f, 1322.61f}, //center of alliance base }; float InfernalPos[8][3]=//spawn points for the infernals in the horde base @@ -138,10 +138,10 @@ float VeinPos[14][8]=//spawn points of the ancient gem veins float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun { - {5279.94f, -2049.68f, 1311.38f, 0},//garg1 - {5289.15f, -2219.06f, 1291.12f, 0},//garg2 - {5202.07f, -2136.10f, 1305.07f, 2.8f},//garg3 - {5071.52f, -2425.63f, 1454.48f, 5.54f},//garg4 + {5279.94f, -2049.68f, 1311.38f, 0}, //garg1 + {5289.15f, -2219.06f, 1291.12f, 0}, //garg2 + {5202.07f, -2136.10f, 1305.07f, 2.8f}, //garg3 + {5071.52f, -2425.63f, 1454.48f, 5.54f}, //garg4 {5120.65f, -2467.92f, 1463.93f, 2.54f}//garg5 }; @@ -456,19 +456,19 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3)) {//summon at tower - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; }else{//summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; case 17907: //FROST_WYRM , if (FirstBossDead && WaveCount == 1) //summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0],SpawnPointSpecial[SPAWN_WYRM_GATE][1],SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); else { - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1], SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; } @@ -652,27 +652,27 @@ void hyjalAI::Retreat() { if (pInstance) { - pInstance->SetData(TYPE_RETREAT,SPECIAL); + pInstance->SetData(TYPE_RETREAT, SPECIAL); if (Faction == 0) { pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); - AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]); - AddWaypoint(1,JainaWPs[1][0],JainaWPs[1][1],JainaWPs[1][2]); + AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]); + AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } if (Faction == 1) { pInstance->SetData(DATA_HORDE_RETREAT, 1); - Creature* JainaDummy = me->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000); + Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000); if (JainaDummy) { JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true; DummyGuid = JainaDummy->GetGUID(); } - AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]); + AddWaypoint(0, JainaDummySpawn[1][0], JainaDummySpawn[1][1], JainaDummySpawn[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } @@ -690,7 +690,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 0; i<7; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -700,7 +700,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 7; i<14; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -714,7 +714,7 @@ void hyjalAI::DeSpawnVeins() return; if (Faction == 1) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -725,7 +725,7 @@ void hyjalAI::DeSpawnVeins() } } else if (Faction) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_THRALL)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -760,7 +760,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(me->GetPositionX(), me->GetPositionY()); HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); } else me->SetVisible(true); @@ -773,7 +773,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(5563, -2763.19f); HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); } else me->SetVisible(true); @@ -975,14 +975,14 @@ void hyjalAI::WaypointReached(uint32 i) { if (i == 1 || (i == 0 && me->GetEntry() == THRALL)) { - me->MonsterYell(YELL_HURRY,0,0); + me->MonsterYell(YELL_HURRY, 0, 0); WaitForTeleport = true; TeleportTimer = 20000; if (me->GetEntry() == JAINA) DoCast(me, SPELL_MASS_TELEPORT, false); if (me->GetEntry() == THRALL && DummyGuid) { - Unit* Dummy = Unit::GetUnit((*me),DummyGuid); + Unit* Dummy = Unit::GetUnit((*me), DummyGuid); if (Dummy) { CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; @@ -1021,7 +1021,7 @@ void hyjalAI::WaypointReached(uint32 i) float range = 10; if (me->GetEntry() == THRALL)range = 20; me->GetNearPoint(me, x, y, z, range, 0, me->GetAngle((*itr))); - (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), me->GetPositionZ()); + (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5, 5), y+irand(-5, 5), me->GetPositionZ()); } } } @@ -1075,12 +1075,12 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1092,7 +1092,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 3; ++i)//summon 3 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1116,7 +1116,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) break; case 1://horde for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); for (uint8 i = 0; i < 26; ++i)//summon infernals { @@ -1133,7 +1133,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1145,7 +1145,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 5; ++i)//summon 5 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 93450203aa0..c0be18cdb7f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -33,7 +33,7 @@ float HordeWPs[8][3]=//basic waypoints from spawn to leader {5554.58f, -2514.66f, 1476.12f}, {5554.16f, -2567.23f, 1479.90f}, {5540.67f, -2625.99f, 1480.89f}, - {5508.16f, -2659.20f, 1480.15f},//random rush starts from here + {5508.16f, -2659.20f, 1480.15f}, //random rush starts from here {5489.62f, -2704.05f, 1482.18f}, {5457.04f, -2726.26f, 1485.10f} }; @@ -43,7 +43,7 @@ float AllianceWPs[8][3]=//basic waypoints from spawn to leader {4898.68f, -1615.02f, 1329.48f}, {4907.12f, -1667.08f, 1321.00f}, {4963.18f, -1699.35f, 1340.51f}, - {4989.16f, -1716.67f, 1335.74f},//first WP in the base, after the gate + {4989.16f, -1716.67f, 1335.74f}, //first WP in the base, after the gate {5026.27f, -1736.89f, 1323.02f}, {5037.77f, -1770.56f, 1324.36f}, {5067.23f, -1789.95f, 1321.17f} @@ -72,87 +72,87 @@ float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde bas float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave { - {4976.37f,-1708.02f,1339.43f},//0spawn - {4994.83f,-1725.52f,1333.25f},//1 start - {4982.92f,-1753.7f,1330.69f},//2 end - {4996.75f,-1721.47f,1332.95f},//3 start - {5015.74f,-1755.05f,1322.49f},//4 - {4998.68f,-1773.44f,1329.59f},//5 - {4994.83f,-1725.52f,1333.25f},//6 start - {5022.8f,-1735.46f,1323.53f},//7 - {5052.15f,-1729.02f,1320.88f},//8 - {5082.43f,-1726.29f,1327.87f},//9 - {4994.83f,-1725.52f,1333.25f},//10 start - {5018.92f,-1751.14f,1322.19f},//11 - {5040.09f,-1792.09f,1322.1f},//12 - {4994.83f,-1725.52f,1333.25f},//13 start - {5023.47f,-1748.1f,1322.51f},//14 - {5013.43f,-1842.39f,1322.07f},//15 - {4994.83f,-1725.52f,1333.25f},//16 start - {5020.8f,-1756.86f,1322.2f},//17 - {5019.53f,-1824.6f,1321.96f},//18 - {5043.42f,-1853.75f,1324.52f},//19 - {5053.02f,-1864.13f,1330.36f},//20 - {5062.49f,-1852.47f,1330.49f},//21 - {5015.27f, -1738.77f, 1324.83f},//35//start 22 - {5027.97f, -1775.25f, 1321.87f},//34 23 - {5015.94f, -1821.24f, 1321.86f},//33 24 - {4983.25f, -1857.4f, 1320.48f},//32 25 - {4981.51f, -1883.7f, 1322.34f},//31 26 - {5002.33f, -1893.98f, 1325.88f},//30 27 - {5049.32f, -1886.54f, 1331.69f},//29 28 - {5089.68f, -1846.88f, 1328.99f},//28 29 - {5127.90f, -1825.14f, 1335.58f},//27 30 - {5163.27f, -1789.08f, 1337.04f},//26 31 - {5138.97f, -1755.88f, 1334.57f},//25 32 - {5096.63f, -1742.22f, 1329.61f},//24 33 - {5065.81f, -1729.43f, 1325.66f},//23 34 - {5049.32f, -1726.31f, 1320.64f},//22 start - {5081.07f, -1902.10f, 1346.36f},//36 abo start - {5107.65f, -1912.03f, 1356.49f},//37 - {5132.83f, -1927.07f, 1362.42f},//38 - {5147.78f, -1954.41f, 1365.98f},//39 - {5164.96f, -1966.48f, 1367.04f},//40 - {5189.04f, -1961.06f, 1367.90f},//41 - {5212.27f, -1975.30f, 1365.58f},//42 - {5221.82f, -1994.18f, 1364.97f},//43 end1 - {5202.23f, -1994.94f, 1367.59f},//44 end2 - {5279.94f, -2049.68f, 1311.38f},//45 garg1 - {5289.15f, -2219.06f, 1291.12f},//46 garg2 - {5202.07f, -2136.10f, 1305.07f},//47 garg3 - {5071.52f, -2425.63f, 1454.48f},//48 garg4 - {5120.65f, -2467.92f, 1463.93f},//49 garg5 - {5283.04f, -2043.26f, 1300.11f},//50 garg target1 - {5313.22f, -2207.60f, 1290.06f},//51 garg target2 - {5180.41f, -2121.87f, 1292.62f},//52 garg target3 - {5088.68f, -2432.04f, 1441.73f},//53 garg target4 + {4976.37f, -1708.02f, 1339.43f}, //0spawn + {4994.83f, -1725.52f, 1333.25f}, //1 start + {4982.92f, -1753.7f, 1330.69f}, //2 end + {4996.75f, -1721.47f, 1332.95f}, //3 start + {5015.74f, -1755.05f, 1322.49f}, //4 + {4998.68f, -1773.44f, 1329.59f}, //5 + {4994.83f, -1725.52f, 1333.25f}, //6 start + {5022.8f, -1735.46f, 1323.53f}, //7 + {5052.15f, -1729.02f, 1320.88f}, //8 + {5082.43f, -1726.29f, 1327.87f}, //9 + {4994.83f, -1725.52f, 1333.25f}, //10 start + {5018.92f, -1751.14f, 1322.19f}, //11 + {5040.09f, -1792.09f, 1322.1f}, //12 + {4994.83f, -1725.52f, 1333.25f}, //13 start + {5023.47f, -1748.1f, 1322.51f}, //14 + {5013.43f, -1842.39f, 1322.07f}, //15 + {4994.83f, -1725.52f, 1333.25f}, //16 start + {5020.8f, -1756.86f, 1322.2f}, //17 + {5019.53f, -1824.6f, 1321.96f}, //18 + {5043.42f, -1853.75f, 1324.52f}, //19 + {5053.02f, -1864.13f, 1330.36f}, //20 + {5062.49f, -1852.47f, 1330.49f}, //21 + {5015.27f, -1738.77f, 1324.83f}, //35//start 22 + {5027.97f, -1775.25f, 1321.87f}, //34 23 + {5015.94f, -1821.24f, 1321.86f}, //33 24 + {4983.25f, -1857.4f, 1320.48f}, //32 25 + {4981.51f, -1883.7f, 1322.34f}, //31 26 + {5002.33f, -1893.98f, 1325.88f}, //30 27 + {5049.32f, -1886.54f, 1331.69f}, //29 28 + {5089.68f, -1846.88f, 1328.99f}, //28 29 + {5127.90f, -1825.14f, 1335.58f}, //27 30 + {5163.27f, -1789.08f, 1337.04f}, //26 31 + {5138.97f, -1755.88f, 1334.57f}, //25 32 + {5096.63f, -1742.22f, 1329.61f}, //24 33 + {5065.81f, -1729.43f, 1325.66f}, //23 34 + {5049.32f, -1726.31f, 1320.64f}, //22 start + {5081.07f, -1902.10f, 1346.36f}, //36 abo start + {5107.65f, -1912.03f, 1356.49f}, //37 + {5132.83f, -1927.07f, 1362.42f}, //38 + {5147.78f, -1954.41f, 1365.98f}, //39 + {5164.96f, -1966.48f, 1367.04f}, //40 + {5189.04f, -1961.06f, 1367.90f}, //41 + {5212.27f, -1975.30f, 1365.58f}, //42 + {5221.82f, -1994.18f, 1364.97f}, //43 end1 + {5202.23f, -1994.94f, 1367.59f}, //44 end2 + {5279.94f, -2049.68f, 1311.38f}, //45 garg1 + {5289.15f, -2219.06f, 1291.12f}, //46 garg2 + {5202.07f, -2136.10f, 1305.07f}, //47 garg3 + {5071.52f, -2425.63f, 1454.48f}, //48 garg4 + {5120.65f, -2467.92f, 1463.93f}, //49 garg5 + {5283.04f, -2043.26f, 1300.11f}, //50 garg target1 + {5313.22f, -2207.60f, 1290.06f}, //51 garg target2 + {5180.41f, -2121.87f, 1292.62f}, //52 garg target3 + {5088.68f, -2432.04f, 1441.73f}, //53 garg target4 {5111.26f, -2454.73f, 1449.63f}//54 garg target5 }; float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave { - {5490.72f,-2702.94f,1482.14f},//0 start - {5469.77f,-2741.34f,1486.95f}, - {5439.47f,-2771.02f,1494.59f}, - {5408.85f,-2811.92f,1505.68f}, - {5423.87f,-2857.80f,1515.55f}, - {5428.19f,-2898.15f,1524.61f}, - {5394.59f,-2930.05f,1528.23f}, - {5351.11f,-2935.80f,1532.24f}, - {5312.37f,-2959.06f,1536.21f}, - {5264.93f,-2989.80f,1545.70f}, - {5256.63f,-3056.16f,1559.24f}, - {5267.32f,-3119.55f,1575.36f}, - {5305.61f,-3139.88f,1586.38f}, - {5330.56f,-3135.37f,1588.58f}, - {5365.87f,-3139.78f,1583.96f}, - {5389.39f,-3163.57f,1582.57f},//15 end - {5500.86f,-2669.89f,1481.04f},//16 start - {5472.08f,-2715.14f,1483.55f}, - {5450.11f,-2721.47f,1485.61f}, - {5433.25f,-2712.93f,1493.02f},//19 end 1 - {5429.91f,-2718.44f,1493.42f}//20 end 2 + {5490.72f, -2702.94f, 1482.14f}, //0 start + {5469.77f, -2741.34f, 1486.95f}, + {5439.47f, -2771.02f, 1494.59f}, + {5408.85f, -2811.92f, 1505.68f}, + {5423.87f, -2857.80f, 1515.55f}, + {5428.19f, -2898.15f, 1524.61f}, + {5394.59f, -2930.05f, 1528.23f}, + {5351.11f, -2935.80f, 1532.24f}, + {5312.37f, -2959.06f, 1536.21f}, + {5264.93f, -2989.80f, 1545.70f}, + {5256.63f, -3056.16f, 1559.24f}, + {5267.32f, -3119.55f, 1575.36f}, + {5305.61f, -3139.88f, 1586.38f}, + {5330.56f, -3135.37f, 1588.58f}, + {5365.87f, -3139.78f, 1583.96f}, + {5389.39f, -3163.57f, 1582.57f}, //15 end + {5500.86f, -2669.89f, 1481.04f}, //16 start + {5472.08f, -2715.14f, 1483.55f}, + {5450.11f, -2721.47f, 1485.61f}, + {5433.25f, -2712.93f, 1493.02f}, //19 end 1 + {5429.91f, -2718.44f, 1493.42f}//20 end 2 }; hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) @@ -176,7 +176,7 @@ void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) { damageTaken += damage; if (pInstance) - pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage + pInstance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage } } @@ -196,56 +196,56 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2]); - me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2]); + me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2]); - me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2]); + me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; @@ -256,69 +256,69 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3,3), AllianceOverrunWP[1][1]+irand(-3,3), AllianceOverrunWP[1][2]); - AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2]); - me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2],0); + AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); + AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2]); + me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2], 0); SetDespawnAtEnd(false); LastOverronPos = 5; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3,3), AllianceOverrunWP[3][1]+irand(-3,3), AllianceOverrunWP[3][2]); - AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3,3), AllianceOverrunWP[4][1]+irand(-3,3), AllianceOverrunWP[4][2]); - AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2]); - me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2],0); + AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3, 3), AllianceOverrunWP[3][1]+irand(-3, 3), AllianceOverrunWP[3][2]); + AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3, 3), AllianceOverrunWP[4][1]+irand(-3, 3), AllianceOverrunWP[4][2]); + AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2]); + me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 2: - AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3,3), AllianceOverrunWP[6][1]+irand(-3,3), AllianceOverrunWP[6][2]); - AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3,3), AllianceOverrunWP[7][1]+irand(-3,3), AllianceOverrunWP[7][2]); - AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3,3), AllianceOverrunWP[8][1]+irand(-3,3), AllianceOverrunWP[8][2]); - AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2]); - me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2],0); + AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3, 3), AllianceOverrunWP[6][1]+irand(-3, 3), AllianceOverrunWP[6][2]); + AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3, 3), AllianceOverrunWP[7][1]+irand(-3, 3), AllianceOverrunWP[7][2]); + AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3, 3), AllianceOverrunWP[8][1]+irand(-3, 3), AllianceOverrunWP[8][2]); + AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2]); + me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2], 0); SetDespawnAtEnd(false); LastOverronPos = 7; Start(true, true); break; case 3: - AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3,3), AllianceOverrunWP[10][1]+irand(-3,3), AllianceOverrunWP[10][2]); - AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3,3), AllianceOverrunWP[11][1]+irand(-3,3), AllianceOverrunWP[11][2]); - AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2]); - me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2],0); + AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3, 3), AllianceOverrunWP[10][1]+irand(-3, 3), AllianceOverrunWP[10][2]); + AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3, 3), AllianceOverrunWP[11][1]+irand(-3, 3), AllianceOverrunWP[11][2]); + AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2]); + me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 4: - AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3,3), AllianceOverrunWP[13][1]+irand(-3,3), AllianceOverrunWP[13][2]); - AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3,3), AllianceOverrunWP[14][1]+irand(-3,3), AllianceOverrunWP[14][2]); - AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2]); - me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2],0); + AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3, 3), AllianceOverrunWP[13][1]+irand(-3, 3), AllianceOverrunWP[13][2]); + AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3, 3), AllianceOverrunWP[14][1]+irand(-3, 3), AllianceOverrunWP[14][2]); + AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2]); + me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 5: - AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3,3), AllianceOverrunWP[16][1]+irand(-3,3), AllianceOverrunWP[16][2]); - AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3,3), AllianceOverrunWP[17][1]+irand(-3,3), AllianceOverrunWP[17][2]); - AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3,3), AllianceOverrunWP[18][1]+irand(-3,3), AllianceOverrunWP[18][2]); - AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3,3), AllianceOverrunWP[19][1]+irand(-3,3), AllianceOverrunWP[19][2]); - AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3,3), AllianceOverrunWP[20][1]+irand(-3,3), AllianceOverrunWP[20][2]); - AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2]); - me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2],0); + AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3, 3), AllianceOverrunWP[16][1]+irand(-3, 3), AllianceOverrunWP[16][2]); + AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3, 3), AllianceOverrunWP[17][1]+irand(-3, 3), AllianceOverrunWP[17][2]); + AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3, 3), AllianceOverrunWP[18][1]+irand(-3, 3), AllianceOverrunWP[18][2]); + AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3, 3), AllianceOverrunWP[19][1]+irand(-3, 3), AllianceOverrunWP[19][2]); + AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3, 3), AllianceOverrunWP[20][1]+irand(-3, 3), AllianceOverrunWP[20][2]); + AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2]); + me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2], 0); SetDespawnAtEnd(false); LastOverronPos = 9; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; Start(true, true); @@ -331,32 +331,32 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]); - me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0); + me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; case 1: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]); - me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0); + me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; default: for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -366,9 +366,9 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-10, 10), HordeWPs[i][1]+irand(-10, 10), HordeWPs[i][2]); for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -436,7 +436,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -452,15 +452,15 @@ public: } if (!meteor) { - float x,y,z; - me->GetPosition(x,y,z); - Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000); + float x, y, z; + me->GetPosition(x, y, z); + Creature* trigger = me->SummonCreature(NPC_TRIGGER, x+8, y+8, z+25+rand()%10, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1000); if (trigger) { trigger->SetVisible(false); trigger->setFaction(me->getFaction()); trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - trigger->CastSpell(me,SPELL_METEOR,true); + trigger->CastSpell(me, SPELL_METEOR, true); } me->GetMotionMaster()->Clear(); meteor = true; @@ -477,7 +477,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -495,7 +495,7 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall + AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3), HordeWPs[7][1]+irand(-3, 3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall Start(true, true); SetDespawnAtEnd(false); } @@ -564,11 +564,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -598,13 +598,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -669,11 +669,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -705,13 +705,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -768,9 +768,9 @@ public: void JustSummoned(Creature* summon) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (pTarget && summon) - summon->Attack(pTarget,false); + summon->Attack(pTarget, false); summons.Summon(summon); } void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} @@ -783,29 +783,29 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } void KilledUnit(Unit* /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17902,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 1: - DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 2: - DoSpawnCreature(RAND(17902,17903),3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(RAND(17902, 17903), 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; } } @@ -827,13 +827,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); } @@ -899,11 +899,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -925,13 +925,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1000,11 +1000,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1026,13 +1026,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1092,11 +1092,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1118,13 +1118,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1187,7 +1187,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_FROST_BREATH, true); } } @@ -1198,11 +1198,11 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); } void EnterCombat(Unit* /*who*/) {} @@ -1230,7 +1230,7 @@ public: SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1309,7 +1309,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } @@ -1317,11 +1317,11 @@ public: void JustDied(Unit *victim) { - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); hyjal_trashAI::JustDied(victim); } @@ -1343,12 +1343,12 @@ public: if (!useFlyPath) { for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); + AddWaypoint(i, GargoyleWPs[i][0]+irand(-10, 10), GargoyleWPs[i][1]+irand(-10, 10), GargoyleWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1361,7 +1361,7 @@ public: { if (StrikeTimer <= diff) { - me->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); + me->CastSpell(DummyTarget[0], DummyTarget[1], DummyTarget[2], SPELL_GARGOYLE_STRIKE, false); StrikeTimer = 2000+rand()%1000; } else StrikeTimer -= diff; } @@ -1375,13 +1375,13 @@ public: { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) - me->Attack(pTarget,false); + me->Attack(pTarget, false); } if (MoveTimer <= diff) { - float x,y,z; - me->getVictim()->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); + float x, y, z; + me->getVictim()->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos); Zpos-=1.0f; if (Zpos <= 0)Zpos=0; MoveTimer = 2000; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index a2be655c9f5..847a1f36ed8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -191,7 +191,7 @@ public: Creature* creature = instance->GetCreature(Azgalor); if (creature) { - Creature* pUnit = creature->SummonCreature(21987,creature->GetPositionX(),creature->GetPositionY(),creature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000); + Creature* pUnit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); Map* pMap = creature->GetMap(); if (pMap->IsDungeon() && pUnit) @@ -206,7 +206,7 @@ public: if (i->getSource()) { WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,YELL_EFFORTS,0,YELL_EFFORTS_NAME,i->getSource()->GetGUID()); + pUnit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); i->getSource()->GetSession()->SendPacket(&data); WorldPacket data2(SMSG_PLAY_SOUND, 4); @@ -235,7 +235,7 @@ public: for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) { //don't know how long it expected - DoRespawnGameObject(*itr,DAY); + DoRespawnGameObject(*itr, DAY); } } } @@ -260,7 +260,7 @@ public: break; } - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)", type, data); if (data == DONE) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 7981bdbed7e..426fcf50fc0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -123,7 +123,7 @@ public: if (uiTimeWarpTimer < diff) { - DoScriptText(RAND(SAY_TIME_WARP_1,SAY_TIME_WARP_2,SAY_TIME_WARP_3), me); + DoScriptText(RAND(SAY_TIME_WARP_1, SAY_TIME_WARP_2, SAY_TIME_WARP_3), me); DoCastAOE(SPELL_TIME_WARP); uiTimeWarpTimer = 25300; } else uiTimeWarpTimer -= diff; @@ -144,7 +144,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index b269587b19d..78d22aeb18a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -103,8 +103,8 @@ public: Phase = COMBAT; uiCarrionSwarmTimer = 6000; uiMindBlastTimer = 11000; - uiVampiricTouchTimer = urand(10000,15000); - uiSleepTimer = urand(15000,20000); + uiVampiricTouchTimer = urand(10000, 15000); + uiSleepTimer = urand(15000, 20000); uiOutroTimer = 1000; if (pInstance) @@ -184,10 +184,10 @@ public: if (uiSleepTimer < diff) { - DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), me); + DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SLEEP); - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); @@ -248,7 +248,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 7ad2ba18ff5..ff3ca08c3f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -61,7 +61,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiChainTimer; @@ -72,9 +72,9 @@ public: void Reset() { - uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16 - uiDiseaseTimer = urand(2000,4000); //approx 3s - uiFrenzyTimer = urand(21000,26000); //made it up + uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 + uiDiseaseTimer = urand(2000, 4000); //approx 3s + uiFrenzyTimer = urand(21000, 26000); //made it up if (pInstance) pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); @@ -97,20 +97,20 @@ public: if (uiDiseaseTimer <= diff) { DoCastAOE(SPELL_DISEASE_EXPULSION); - uiDiseaseTimer = urand(1500,4000); + uiDiseaseTimer = urand(1500, 4000); } else uiDiseaseTimer -= diff; if (uiFrenzyTimer <= diff) { DoCast(me, SPELL_FRENZY); - uiFrenzyTimer = urand(21000,26000); + uiFrenzyTimer = urand(21000, 26000); } else uiFrenzyTimer -= diff; if (uiChainTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank - uiChainTimer = urand(2000,4000); + uiChainTimer = urand(2000, 4000); } else uiChainTimer -= diff; DoMeleeAttackIfReady(); @@ -129,7 +129,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 6eb1cb66bd7..7b26df8871a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -70,7 +70,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiCurseFleshTimer; @@ -84,10 +84,10 @@ public: void Reset() { uiCurseFleshTimer = 30000; //30s DBM - uiExplodeGhoulTimer = urand(25000,28000); //approx 6 sec after summon ghouls - uiShadowBoltTimer = urand(8000,12000); // approx 10s + uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls + uiShadowBoltTimer = urand(8000, 12000); // approx 10s uiStealFleshTimer = 12345; - uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro + uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro if (pInstance) pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); @@ -119,13 +119,13 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(8000,12000); + uiShadowBoltTimer = urand(8000, 12000); } else uiShadowBoltTimer -= diff; //Steal Flesh timer if (uiStealFleshTimer <= diff) { - DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me); + DoScriptText(RAND(SAY_STEAL_FLESH_1, SAY_STEAL_FLESH_2, SAY_STEAL_FLESH_3), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_STEAL_FLESH); uiStealFleshTimer = 10000; @@ -134,7 +134,7 @@ public: //Summon ghouls timer if (uiSummonGhoulsTimer <= diff) { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me); + DoScriptText(RAND(SAY_SUMMON_GHOULS_1, SAY_SUMMON_GHOULS_2), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_SUMMON_GHOULS); uiSummonGhoulsTimer = 10000; @@ -156,7 +156,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index d73373910b0..3e86a796480 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -233,7 +233,7 @@ public: bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) { pPlayer->PlayerTalkClass->ClearMenus(); - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (!pAI) return false; @@ -241,7 +241,7 @@ public: switch (action) { case GOSSIP_ACTION_INFO_DEF: - pAI->Start(true,true,pPlayer->GetGUID(),0,false,false); + pAI->Start(true, true, pPlayer->GetGUID(), 0, false, false); pAI->SetDespawnAtEnd(false); pAI->bStepping = false; pAI->uiStep = 1; @@ -275,7 +275,7 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (pAI && pAI->bStepping == false) { @@ -405,17 +405,17 @@ public: void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) { - me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000); + me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_DESPAWN, 11000); for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) { if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; - if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i-timeRiftID-1] = pTemp->GetGUID(); pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1],RiftAndSpawnsLocations[i][2],RiftAndSpawnsLocations[i][3]); + pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) uiEpochGUID = pTemp->GetGUID(); } @@ -427,7 +427,7 @@ public: for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { if ((uint32)WavesLocations[waveID][i][0] == 0) break; - if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0],WavesLocations[waveID][i][1],WavesLocations[waveID][i][2],WavesLocations[waveID][i][3],WavesLocations[waveID][i][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0], WavesLocations[waveID][i][1], WavesLocations[waveID][i][2], WavesLocations[waveID][i][3], WavesLocations[waveID][i][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i] = pTemp->GetGUID(); } @@ -464,9 +464,9 @@ public: bStepping = true; break; case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN,2091.977f,1275.021f,140.757f,0.558f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2,2093.514f,1275.842f,140.408f,3.801f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[1] = pCityman1->GetGUID(); break; case 8: @@ -477,14 +477,14 @@ public: case 12: SetRun(true); DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3,2398.14f,1207.81f,134.04f,5.155249f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); @@ -505,33 +505,33 @@ public: break; case 25: SetRun(false); - SpawnTimeRift(0,&uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307,me); + SpawnTimeRift(0, &uiInfiniteDraconianGUID[0]); + DoScriptText(SAY_PHASE307, me); break; case 29: SetRun(false); - SpawnTimeRift(5,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309,me); + SpawnTimeRift(5, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(8, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE309, me); SetHoldState(true); bStepping = true; break; case 31: SetRun(false); - SpawnTimeRift(11,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311,me); + SpawnTimeRift(11, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(14, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE311, me); SetHoldState(true); bStepping = true; break; case 32: - DoScriptText(SAY_PHASE401,me); + DoScriptText(SAY_PHASE401, me); break; case 34: - DoScriptText(SAY_PHASE402,me); + DoScriptText(SAY_PHASE402, me); break; case 35: - DoScriptText(SAY_PHASE403,me); + DoScriptText(SAY_PHASE403, me); break; case 36: if (pInstance) @@ -547,14 +547,14 @@ public: break; case 47: SetRun(false); - DoScriptText(SAY_PHASE405,me); + DoScriptText(SAY_PHASE405, me); break; case 48: SetRun(true); - DoScriptText(SAY_PHASE406,me); + DoScriptText(SAY_PHASE406, me); break; case 53: - DoScriptText(SAY_PHASE407,me); + DoScriptText(SAY_PHASE407, me); break; case 54: uiGossipStep = 5; @@ -580,7 +580,7 @@ public: case 0: if (Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f)) uiJainaGUID = pJaina->GetGUID(); - else if (Unit* pJaina = me->SummonCreature(NPC_JAINA,1895.48f,1292.66f,143.706f,0.023475f,TEMPSUMMON_DEAD_DESPAWN,180000)) + else if (Unit* pJaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000)) uiJainaGUID = pJaina->GetGUID(); bStepping = false; JumpToNextStep(0); @@ -588,7 +588,7 @@ public: //After waypoint 0 case 1: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pUther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiUtherGUID = pUther->GetGUID(); pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -677,7 +677,7 @@ public: if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) { pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pUther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -686,7 +686,7 @@ public: { me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pJaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -727,7 +727,7 @@ public: break; //After Gossip 1 (waypoint 8) case 24: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2026.469f,1287.088f,143.596f,1.37f,TEMPSUMMON_TIMED_DESPAWN,14000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2026.469f, 1287.088f, 143.596f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 14000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -752,7 +752,7 @@ public: { pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f); + pCityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); } JumpToNextStep(2000); break; @@ -796,7 +796,7 @@ public: JumpToNextStep(1000); break; case 34: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -805,7 +805,7 @@ public: JumpToNextStep(3000); break; case 35: - if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { uiStalkerGUID = pStalkerM->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -813,10 +813,10 @@ public: JumpToNextStep(1000); break; case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM,63793,false); + pMalganis->CastSpell(pStalkerM, 63793, false); uiMalganisGUID = pMalganis->GetGUID(); DoScriptText(SAY_PHASE206, pMalganis); @@ -851,7 +851,7 @@ public: JumpToNextStep(7000); break; case 40: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -921,11 +921,11 @@ public: else if (uiBossEvent == DATA_SALRAMM_EVENT) uiBossID = NPC_SALRAMM; - if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Unit* pBoss = me->SummonCreature(uiBossID, 2232.19f, 1331.933f, 126.662f, 3.15f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiBossGUID = pBoss->GetGUID(); pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f); + pBoss->GetMotionMaster()->MovePoint(0, 2194.110f, 1332.00f, 130.00f); } } JumpToNextStep(30000); @@ -985,12 +985,12 @@ public: JumpToNextStep(1000); break; case 66: - DoScriptText(SAY_PHASE304,me); + DoScriptText(SAY_PHASE304, me); JumpToNextStep(2000); break; case 67: if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305,pDisguised0); + DoScriptText(SAY_PHASE305, pDisguised0); JumpToNextStep(1000); break; case 68: @@ -1024,7 +1024,7 @@ public: JumpToNextStep(2000); break; case 71: - //After waypoint 26,29,31 + //After waypoint 26, 29, 31 case 73: case 75: case 77: @@ -1044,9 +1044,9 @@ public: uiPhaseTimer = 1000; else { - if (uiStep == 72) DoScriptText(SAY_PHASE308,me); - if (uiStep == 74) DoScriptText(SAY_PHASE308,me); - if (uiStep == 76) DoScriptText(SAY_PHASE310,me); + if (uiStep == 72) DoScriptText(SAY_PHASE308, me); + if (uiStep == 74) DoScriptText(SAY_PHASE308, me); + if (uiStep == 76) DoScriptText(SAY_PHASE310, me); SetHoldState(false); bStepping = false; SetRun(true); @@ -1058,21 +1058,21 @@ public: uiPhaseTimer = 1000; else { - DoScriptText(SAY_PHASE312,me); + DoScriptText(SAY_PHASE312, me); JumpToNextStep(5000); } break; case 79: - DoScriptText(SAY_PHASE313,me); + DoScriptText(SAY_PHASE313, me); JumpToNextStep(1000); break; case 80: if (pInstance) if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) { - SpawnTimeRift(17,&uiEpochGUID); + SpawnTimeRift(17, &uiEpochGUID); if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314,pEpoch); + DoScriptText(SAY_PHASE314, pEpoch); me->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID); } JumpToNextStep(18000); @@ -1117,14 +1117,14 @@ public: break; //After Gossip 4 case 84: - DoScriptText(SAY_PHASE404,me); + DoScriptText(SAY_PHASE404, me); SetHoldState(false); bStepping = false; break; //After Gossip 5 case 85: DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2296.665f,1502.362f,128.362f,4.961f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiMalganisGUID = pMalganis->GetGUID(); pMalganis->SetReactState(REACT_PASSIVE); @@ -1190,7 +1190,7 @@ public: if (uiExorcismTimer < diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_EXORCISM_N); uiExorcismTimer = 7300; } else uiExorcismTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 79bc8f9c1da..2e600b950ca 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -107,13 +107,13 @@ public: case GO_EXIT_GATE: uiExitGate = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(uiExitGate,true); + HandleGameObject(uiExitGate, true); break; case GO_MALGANIS_CHEST_N: case GO_MALGANIS_CHEST_H: uiMalGanisChest = go->GetGUID(); if (m_auiEncounter[3] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } } @@ -137,15 +137,15 @@ public: switch(m_auiEncounter[3]) { case NOT_STARTED: - HandleGameObject(uiMalGanisGate2,true); + HandleGameObject(uiMalGanisGate2, true); break; case IN_PROGRESS: - HandleGameObject(uiMalGanisGate2,false); + HandleGameObject(uiMalGanisGate2, false); break; case DONE: HandleGameObject(uiExitGate, true); if (GameObject* go = instance->GetGameObject(uiMalGanisChest)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 00faa87a378..438a53c16ef 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -83,7 +83,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -99,14 +99,14 @@ public: if (pInstance) { - pInstance->SetData(TYPE_RIFT,DONE); - pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed + pInstance->SetData(TYPE_RIFT, DONE); + pInstance->SetData(TYPE_MEDIVH, DONE);//FIXME: later should be removed } } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 3af197e8658..89e2fc763dd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -85,7 +85,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -97,7 +97,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -105,7 +105,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 8c9a5c5c1b9..3151a773a9b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -81,7 +81,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -89,7 +89,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void MoveInLineOfSight(Unit *who) @@ -97,7 +97,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index adc2dc2be00..f6f45069b38 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -108,7 +108,7 @@ public: return; DoScriptText(SAY_INTRO, me); - pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); + pInstance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; } @@ -121,12 +121,12 @@ public: if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT,false); + who->CastSpell(me, SPELL_CORRUPT, false); } else if (entry == C_AEONUS) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT_AEONUS,false); + who->CastSpell(me, SPELL_CORRUPT_AEONUS, false); } } } @@ -170,7 +170,7 @@ public: { if (SpellCorrupt_Timer <= diff) { - pInstance->SetData(TYPE_MEDIVH,SPECIAL); + pInstance->SetData(TYPE_MEDIVH, SPECIAL); if (me->HasAura(SPELL_CORRUPT_AEONUS)) SpellCorrupt_Timer = 1000; @@ -223,7 +223,7 @@ public: me->RemoveAura(SPELL_CHANNEL); //TODO: start the post-event here - pInstance->SetData(TYPE_MEDIVH,DONE); + pInstance->SetData(TYPE_MEDIVH, DONE); } } else Check_Timer -= diff; } @@ -313,7 +313,7 @@ public: if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) - Summon->AddThreat(temp,0.0f); + Summon->AddThreat(temp, 0.0f); } void DoSelectSummon() @@ -324,7 +324,7 @@ public: mRiftWaveCount = 0; entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).", mRiftWaveCount, entry); ++mRiftWaveCount; @@ -353,7 +353,7 @@ public: me->setDeathState(JUST_DIED); if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } }; @@ -376,7 +376,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); + pCreature->CastSpell(pPlayer, SPELL_CHRONO_BEACON, false); } return true; } @@ -386,15 +386,15 @@ public: if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); return true; } - else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 24ce52c6759..6ea59e4be02 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -111,7 +111,7 @@ public: void InitWorldState(bool Enable = true) { - DoUpdateWorldState(WORLD_STATE_BM,Enable ? 1 : 0); + DoUpdateWorldState(WORLD_STATE_BM, Enable ? 1 : 0); DoUpdateWorldState(WORLD_STATE_BM_SHIELD, 100); DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } @@ -130,7 +130,7 @@ public: if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return; - pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); + pPlayer->SendUpdateWorldState(WORLD_STATE_BM, 0); } void OnCreatureCreate(Creature* creature) @@ -267,7 +267,7 @@ public: if (entry == RIFT_BOSS) entry = RandRiftBoss(); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.", entry); Position pos; me->GetRandomNearPosition(pos, 10.0f); @@ -286,18 +286,18 @@ public: { if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) { - uint8 tmp = urand(0,2); + uint8 tmp = urand(0, 2); if (tmp >= CurrentRiftId) ++tmp; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).", tmp, CurrentRiftId); CurrentRiftId = tmp; Creature* pTemp = pMedivh->SummonCreature(C_TIME_RIFT, - PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3], - TEMPSUMMON_CORPSE_DESPAWN,0); + PortalLocation[tmp][0], PortalLocation[tmp][1], PortalLocation[tmp][2], PortalLocation[tmp][3], + TEMPSUMMON_CORPSE_DESPAWN, 0); if (pTemp) { pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -306,11 +306,11 @@ public: if (Creature* pBoss = SummonedPortalBoss(pTemp)) { if (pBoss->GetEntry() == C_AEONUS) - pBoss->AddThreat(pMedivh,0.0f); + pBoss->AddThreat(pMedivh, 0.0f); else { - pBoss->AddThreat(pTemp,0.0f); - pTemp->CastSpell(pBoss,SPELL_RIFT_CHANNEL,false); + pBoss->AddThreat(pTemp, 0.0f); + pTemp->CastSpell(pBoss, SPELL_RIFT_CHANNEL, false); } } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index e402a48c59a..f2dd3e2d481 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -85,7 +85,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4fa3fafebc5..ac934c4e5f4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -76,12 +76,12 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -106,7 +106,7 @@ public: DoCast(me->getVictim(), SPELL_SAND_BREATH); - DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), me); + DoScriptText(RAND(SAY_BREATH1, SAY_BREATH2), me); SandBreath_Timer = 10000 + rand()%10000; } else SandBreath_Timer -= diff; @@ -119,7 +119,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 0243441215b..0cdbcf9fc20 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -139,7 +139,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 974bd92c6cc..54382449303 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -96,7 +96,7 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* pPlayer = itr->getSource()) - pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); + pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0); } } } @@ -139,7 +139,7 @@ public: ++mBarrelCount; DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u", mBarrelCount); m_auiEncounter[0] = IN_PROGRESS; @@ -160,7 +160,7 @@ public: { ++mThrallEventCount; m_auiEncounter[1] = NOT_STARTED; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); m_auiEncounter[2] = NOT_STARTED; m_auiEncounter[3] = NOT_STARTED; m_auiEncounter[4] = NOT_STARTED; @@ -173,29 +173,29 @@ public: m_auiEncounter[3] = data; m_auiEncounter[4] = data; m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); } } else m_auiEncounter[1] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.", data); break; } case TYPE_THRALL_PART1: m_auiEncounter[2] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.", data); break; case TYPE_THRALL_PART2: m_auiEncounter[3] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.", data); break; case TYPE_THRALL_PART3: m_auiEncounter[4] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.", data); break; case TYPE_THRALL_PART4: m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.", data); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5c7f49e23df..ff296d3ce3b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -77,7 +77,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); InstanceScript* pInstance = pCreature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) + if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) @@ -208,8 +208,8 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) { - pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); - pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); @@ -229,9 +229,9 @@ public: case GOSSIP_ACTION_INFO_DEF+20: pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81f,270.26f,63.20f,5.41f,TEMPSUMMON_TIMED_DESPAWN,12000); + pCreature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); @@ -241,7 +241,7 @@ public: case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); break; } @@ -305,7 +305,7 @@ public: { case 8: SetRun(false); - me->SummonCreature(18764,2181.87f,112.46f,89.45f,0.26f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(18764, 2181.87f, 112.46f, 89.45f, 0.26f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 9: DoScriptText(SAY_TH_ARMORY, me); @@ -323,27 +323,27 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28f,137.37f,87.93f,5.07f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44f,131.83f,87.93f,0.78f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62f,135.40f,87.93f,3.70f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75f,130.13f,87.93f,1.48f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80f,154.01f,67.45f,4.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36f,151.87f,67.74f,4.46f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12f,154.41f,67.12f,4.56f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08f,155.38f,67.24f,4.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98f,192.17f,65.24f,6.02f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48f,198.75f,65.18f,5.15f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11f,197.29f,65.18f,5.63f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18f,194.82f,65.18f,5.75f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48f,271.22f,63.43f,5.27f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - //temporary,skarloc should rather be triggered to walk up to thrall + me->SummonCreature(ENTRY_SCARLOC, 2036.48f, 271.22f, 63.43f, 5.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + //temporary, skarloc should rather be triggered to walk up to thrall break; case 30: SetEscortPaused(true); @@ -357,12 +357,12 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26f,522.16f,56.87f,3.99f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69f,525.37f,57.11f,4.01f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65f,524.55f,56.63f,3.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64f,625.77f,58.26f,4.71f,TEMPSUMMON_TIMED_DESPAWN,10000); + me->SummonCreature(SKARLOC_MOUNT, 2488.64f, 625.77f, 58.26f, 4.71f, TEMPSUMMON_TIMED_DESPAWN, 10000); DoUnmount(); HadMount = false; SetRun(false); @@ -379,10 +379,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22f,692.60f,55.50f,2.84f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13f,696.55f,55.51f,3.38f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55f,693.64f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94f,695.81f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 71: SetRun(); @@ -391,10 +391,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33f,646.82f,56.03f,4.28f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14f,648.03f,56.03f,4.50f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32f,649.60f,56.03f,4.38f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22f,649.00f,56.03f,4.34f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: DoScriptText(SAY_TH_CHURCH_END, me); @@ -405,10 +405,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71f,660.31f,61.93f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96f,662.59f,61.93f,0.79f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36f,662.34f,61.93f,2.68f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39f,659.77f,61.93f,2.61f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 94: if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) @@ -419,7 +419,7 @@ public: break; case 95: DoScriptText(SAY_TH_MEET_TARETHA, me); - pInstance->SetData(TYPE_THRALL_PART3,DONE); + pInstance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: @@ -456,7 +456,7 @@ public: } //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47f,680.416f,55.38f,4.16f,TEMPSUMMON_TIMED_DESPAWN,120000); + me->SummonCreature(EROZION_ENTRY, 2646.47f, 680.416f, 55.38f, 4.16f, TEMPSUMMON_TIMED_DESPAWN, 120000); } break; case 108: @@ -483,7 +483,7 @@ public: } if (HasEscortState(STATE_ESCORT_ESCORTING)) { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1,SAY_TH_LEAVE_COMBAT2,SAY_TH_LEAVE_COMBAT3), me); + DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1, SAY_TH_LEAVE_COMBAT2, SAY_TH_LEAVE_COMBAT3), me); } } void StartWP() @@ -494,16 +494,16 @@ public: void DoMount() { me->Mount(SKARLOC_MOUNT_MODEL); - me->SetSpeed(MOVE_RUN,SPEED_MOUNT); + me->SetSpeed(MOVE_RUN, SPEED_MOUNT); } void DoUnmount() { me->Unmount(); - me->SetSpeed(MOVE_RUN,SPEED_RUN); + me->SetSpeed(MOVE_RUN, SPEED_RUN); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); + DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1, SAY_TH_RANDOM_AGGRO2, SAY_TH_RANDOM_AGGRO3, SAY_TH_RANDOM_AGGRO4), me); if (me->IsMounted()) { DoUnmount(); @@ -530,18 +530,18 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); + DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } void JustDied(Unit *slayer) { if (pInstance) - pInstance->SetData(TYPE_THRALL_EVENT,FAIL); + pInstance->SetData(TYPE_THRALL_EVENT, FAIL); // Don't do a yell if he kills self (if player goes too far or at the end). if (slayer == me) return; - DoScriptText(RAND(SAY_TH_RANDOM_DIE1,SAY_TH_RANDOM_DIE2), me); + DoScriptText(RAND(SAY_TH_RANDOM_DIE1, SAY_TH_RANDOM_DIE2), me); } void UpdateAI(const uint32 diff) @@ -554,7 +554,7 @@ public: //TODO: add his abilities'n-crap here if (!LowHp && HealthBelowPct(20)) { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1,SAY_TH_RANDOM_LOW_HP2), me); + DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1, SAY_TH_RANDOM_LOW_HP2), me); LowHp = true; } } @@ -596,9 +596,9 @@ public: if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) { - pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART4, IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13f,698.55f,65.43f,4.59f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 7bbec40784d..5ff4d8e1381 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -70,7 +70,7 @@ public: if (Wrath_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_WRATH); Wrath_Timer = 8000; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 88426f473c6..a8f088f343b 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -63,7 +63,7 @@ public: void SummonAdds(Unit* pVictim) { - if (Creature *Add = DoSpawnCreature(13456, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) + if (Creature *Add = DoSpawnCreature(13456, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Add->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 57231ba33fd..147e20fab80 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -63,7 +63,7 @@ public: void JustDied(Unit* /*killer*/) { - me->SummonCreature(12238,28.067f,61.875f,-123.405f,4.67f,TEMPSUMMON_TIMED_DESPAWN,600000); + me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } void UpdateAI(const uint32 diff) @@ -82,7 +82,7 @@ public: if (Boulder_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BOULDER); Boulder_Timer = 10000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 720e4603b1f..596d4eb8bbe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -77,14 +77,14 @@ struct sOnyxMove static sOnyxMove aMoveData[]= { - {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f},//west - {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f},//east - {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f},//north-west - {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f},//north-east - {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f},//south-east - {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f},//south-west - {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f},//south - {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f},//north + {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f}, //west + {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f}, //east + {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f}, //north-west + {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f}, //north-east + {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f}, //south-east + {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f}, //south-west + {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f}, //south + {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f}, //north }; const Position MiddleRoomLocation = {-23.6155f, -215.357f, -55.7344f, 0.0f}; @@ -200,7 +200,7 @@ public: void JustSummoned(Creature *pSummoned) { pSummoned->SetInCombatWithZone(); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); switch (pSummoned->GetEntry()) @@ -262,7 +262,7 @@ public: break; case 10: me->SetFlying(true); - me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(),Phase2Location.GetPositionY(),Phase2Location.GetPositionZ()+25); + me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25); me->SetSpeed(MOVE_FLIGHT, 1.0f); DoScriptText(SAY_PHASE_2_TRANS, me); if (m_pInstance) @@ -416,7 +416,7 @@ public: SetCombatMovement(true); me->SetFlying(false); m_bIsMoving = false; - me->GetMotionMaster()->MovePoint(9,me->GetHomePosition()); + me->GetMotionMaster()->MovePoint(9, me->GetHomePosition()); return; } @@ -478,7 +478,7 @@ public: { me->SummonCreature(NPC_WHELP, aSpawnLocations[0].GetPositionX(), aSpawnLocations[0].GetPositionY(), aSpawnLocations[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); me->SummonCreature(NPC_WHELP, aSpawnLocations[1].GetPositionX(), aSpawnLocations[1].GetPositionY(), aSpawnLocations[1].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); - if (m_uiSummonWhelpCount >= RAID_MODE(20,40)) + if (m_uiSummonWhelpCount >= RAID_MODE(20, 40)) { m_uiSummonWhelpCount = 0; m_uiWhelpTimer = 90000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index ca9f206835b..84923d3def5 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -41,7 +41,7 @@ public: //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed - std::map<uint64,uint32> FloorEruptionGUID[2]; + std::map<uint64, uint32> FloorEruptionGUID[2]; std::queue<uint64> FloorEruptionGUIDQueue; uint64 m_uiOnyxiasGUID; @@ -81,7 +81,7 @@ public: { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { - FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(),0)); + FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(), 0)); return; } @@ -90,7 +90,7 @@ public: case GO_WHELP_SPAWNER: Position goPos; go->GetPosition(&goPos); - if (Creature* pTemp = go->SummonCreature(NPC_WHELP,goPos,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pTemp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN)) { pTemp->SetInCombatWithZone(); ++m_uiManyWhelpsCounter; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 8fb2130c730..bd163b2d484 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -61,6 +61,6 @@ enum eAchievementData ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER = 12568, // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s ACHIEV_CRITERIA_DEEP_BREATH_10_PLAYER = 12566, // Criteria for achievement 4404: She Deep Breaths More (10 player) Everybody evade Deep Breath ACHIEV_CRITERIA_DEEP_BREATH_25_PLAYER = 12569, // Criteria for achievement 4407: She Deep Breaths More (25 player) Everybody evade Deep Breath - ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10,25 player) 5 min kill + ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10, 25 player) 5 min kill }; #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index e596773f875..abe8e7e8166 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -105,7 +105,7 @@ public: case GO_GONG: uiGongGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE) - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; default: break; @@ -123,7 +123,7 @@ public: case 9: case 14: if (GameObject* go = instance->GetGameObject(uiGongGUID)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 1: case 10: @@ -134,7 +134,7 @@ public: if (!go) return; - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); uint32 uiCreature = 0; uint8 uiSummonTimes = 0; @@ -156,17 +156,17 @@ public: break; } - if (Creature* creature = go->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) + if (Creature* creature = go->SummonCreature(uiCreature, 2502.635f, 844.140f, 46.896f, 0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = go->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f)) - pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + if (Creature* pSummon = go->SummonCreature(uiCreature, 2502.635f + float(irand(-5, 5)), 844.140f + float(irand(-5, 5)), 46.896f, 0.633f)) + pSummon->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } } - creature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + creature->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } break; } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index a49e12e99ca..cef5058187e 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -100,7 +100,7 @@ public: if (pInstance) { - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); return true; } @@ -137,7 +137,7 @@ public: void Reset() { - uiWebTimer = urand(5000,8000); + uiWebTimer = urand(5000, 8000); } void UpdateAI(const uint32 uiDiff) @@ -151,7 +151,7 @@ public: if (uiWebTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_WEB); - uiWebTimer = urand(7000,16000); + uiWebTimer = urand(7000, 16000); } else uiWebTimer -= uiDiff; } @@ -161,7 +161,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); } }; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index f1b21dba2ab..8fc0c83f83d 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -111,13 +111,13 @@ public: DoScriptText(SAY_FINALY, me, pPlayer); break; case 43: - me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: DoScriptText(SAY_WIN, me, pPlayer); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER,me); + CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: DoScriptText(SAY_END, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index bd916d801df..38477ab8486 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -65,11 +65,11 @@ public: void Reset() { bIsEnraged = false; - uiMortalWoundTimer = urand(2000,7000); - uiSandtrapTimer = urand(20000,30000); - uiWideSlashTimer = urand(10000,15000); - uiTrashTimer = urand(20000,25000); - uiSummonPlayerTimer = urand(30000,40000); + uiMortalWoundTimer = urand(2000, 7000); + uiSandtrapTimer = urand(20000, 30000); + uiWideSlashTimer = urand(10000, 15000); + uiTrashTimer = urand(20000, 25000); + uiSummonPlayerTimer = urand(30000, 40000); if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); @@ -103,7 +103,7 @@ public: if (uiMortalWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_MORTALWOUND); - uiMortalWoundTimer = urand(2000,7000); + uiMortalWoundTimer = urand(2000, 7000); } else uiMortalWoundTimer -= diff; //Santrap spell @@ -118,14 +118,14 @@ public: if (uiWideSlashTimer <= diff) { DoCast(me->getVictim(), SPELL_WIDE_SLASH); - uiWideSlashTimer = urand(10000,15000); + uiWideSlashTimer = urand(10000, 15000); } else uiWideSlashTimer -= diff; //Trash spell if (uiTrashTimer <= diff) { DoCast(me, SPELL_TRASH); - uiTrashTimer = urand(20000,25000); + uiTrashTimer = urand(20000, 25000); } else uiTrashTimer -= diff; //Summon Player spell @@ -133,7 +133,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SUMMON_PLAYER); - uiSummonPlayerTimer = urand(30000,40000); + uiSummonPlayerTimer = urand(30000, 40000); } else uiSummonPlayerTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index bae7f4ec8f7..37579f32a5e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -78,11 +78,11 @@ public: void Reset() { - uiTrampleTimer = urand(3000,7000); - uiDrainManaTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); + uiDrainManaTimer = urand(3000, 7000); uiPhaseTimer = 90000; Phase = NORMAL; - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); @@ -126,21 +126,21 @@ public: { DoCast(me->getVictim(), SPELL_ARCANEERUPTION); DoScriptText(EMOTE_MANA_FULL, me); - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); } //Trample Spell if (uiTrampleTimer <= diff) { DoCast(me->getVictim(), SPELL_TRAMPLE); - uiTrampleTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); } else uiTrampleTimer -= diff; //Drain Mana if (uiDrainManaTimer <= diff) { DrainMana(); - uiDrainManaTimer = urand(3000,7000); + uiDrainManaTimer = urand(3000, 7000); } else uiDrainManaTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 47c6a5e9c6d..50aeea950d8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -194,11 +194,11 @@ public: if (Charge_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { DoCast(pTarget, SPELL_CHARGE); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); AttackStart(pTarget); } @@ -210,7 +210,7 @@ public: { DoCast(me->getVictim(), SPELL_KNOCKBACK); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); KnockBack_Timer = 15000 + rand()%10000; } else KnockBack_Timer -= diff; @@ -273,8 +273,8 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); - Creature* Summoned = me->SummonCreature(15621,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); if (Summoned && pTarget) Summoned->AI()->AttackStart(pTarget); } @@ -306,7 +306,7 @@ public: Unit *pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); Unit *pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: if (pKri) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index dfaf4c5187a..801a4b078b5 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -241,7 +241,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(pTarget); } @@ -284,7 +284,7 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->InterruptNonMeleeSpells(false); DoCast(pTarget, SPELL_GREEN_BEAM); @@ -300,7 +300,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { Creature* Spawned = NULL; @@ -328,7 +328,7 @@ public: me->SetUInt64Value(UNIT_FIELD_TARGET, 0); //Select random target for dark beam to start on - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { //Face our target DarkGlareAngle = me->GetAngle(pTarget); @@ -617,12 +617,12 @@ public: for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { if (Player* pPlr = itr->getSource()) - pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER,pPlr); + pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr); } } //One random wisper every 90 - 300 seconds - WisperTimer = urand(90000,300000); + WisperTimer = urand(90000, 300000); } else WisperTimer -= diff; return; @@ -988,7 +988,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_MIND_FLAY); @@ -1064,7 +1064,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) { me->Kill(me); @@ -1281,7 +1281,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_GREEN_BEAM); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 1cb0a9631fb..8a17b7285e2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -112,19 +112,19 @@ public: //Summon 1-3 Spawns of Fankriss at random time. if (SpawnSpawns_Timer <= diff) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 1: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 2: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; } SpawnSpawns_Timer = 30000 + rand()%30000; @@ -137,7 +137,7 @@ public: if (SpawnHatchlings_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, SPELL_ROOT); @@ -145,10 +145,10 @@ public: if (DoGetThreat(pTarget)) DoModifyThreatPercent(pTarget, -100); - switch(urand(0,2)) + switch(urand(0, 2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142f,1289.2900f,-74.419533f,5.112f); + DoTeleportPlayer(pTarget, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -163,7 +163,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354f,1155.1907f,-78.849319f,2.608f); + DoTeleportPlayer(pTarget, -7990.135354f, 1155.1907f, -78.849319f, 2.608f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -178,7 +178,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget,-8159.7753f,1127.9064f,-76.868660f,0.675f); + DoTeleportPlayer(pTarget, -8159.7753f, 1127.9064f, -76.868660f, 0.675f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 0ae028e99f6..02b671083b3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -95,7 +95,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 510db661bf0..439ca675f1e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -112,7 +112,7 @@ public: if (Submerged && ChangeTarget_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 824c978e415..4c9e2f5eb7f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -106,7 +106,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -135,7 +135,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -243,7 +243,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -264,7 +264,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index f29b3b9f070..e6ad78a9d85 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -44,7 +44,7 @@ EndScriptData */ class ov_mycoordinates { public: - float x,y,z,r; + float x, y, z, r; ov_mycoordinates(float cx, float cy, float cz, float cr) { x = cx; y = cy; z = cz; r = cr; @@ -102,7 +102,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -115,7 +115,7 @@ public: { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void UpdateAI(const uint32 diff) @@ -154,18 +154,18 @@ public: if (Blink_Timer <= diff) { //DoCast(me, SPELL_BLINK); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - me->GetMap()->CreatureRelocation(me, -8340.782227f,2083.814453f,125.648788f,0.0f); + me->GetMap()->CreatureRelocation(me, -8340.782227f, 2083.814453f, 125.648788f, 0.0f); DoResetThreat(); break; case 1: - me->GetMap()->CreatureRelocation(me, -8341.546875f,2118.504639f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8341.546875f, 2118.504639f, 133.058151f, 0.0f); DoResetThreat(); break; case 2: - me->GetMap()->CreatureRelocation(me, -8318.822266f,2058.231201f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8318.822266f, 2058.231201f, 133.058151f, 0.0f); DoResetThreat(); break; } @@ -209,13 +209,13 @@ public: { DoScriptText(SAY_SPLIT, me); - ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f,2083.814453f,125.648788f,0); - ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f,2118.504639f,133.058151f,0); - ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f,2058.231201f,133.058151f,0); + ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); + ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); + ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f, 2058.231201f, 133.058151f, 0); ov_mycoordinates *bossc=place1, *i1=place2, *i2=place3; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: bossc=place1; @@ -264,7 +264,7 @@ public: case 25: Images25 = true; break; } - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature *Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) @@ -276,7 +276,7 @@ public: CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true; } - Creature *Image2 = me->SummonCreature(15263,i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); + Creature *Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image2) { Image2->SetMaxHealth(me->GetMaxHealth() / 5); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ac6dddc5f82..ceeb593d131 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -194,7 +194,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (Heal_Timer <= diff) { Unit *pOtherBoss = GetOtherBoss(); - if (pOtherBoss && pOtherBoss->IsWithinDist(me,60)) + if (pOtherBoss && pOtherBoss->IsWithinDist(me, 60)) { DoCast(pOtherBoss, SPELL_HEAL_BROTHER); Heal_Timer = 1000; @@ -311,8 +311,8 @@ struct boss_twinemperorsAI : public ScriptedAI Creature *RespawnNearbyBugsAndGetOne() { std::list<Creature*> lUnitList; - me->GetCreatureListWithEntryInGrid(lUnitList,15316,150.0f); - me->GetCreatureListWithEntryInGrid(lUnitList,15317,150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15316, 150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15317, 150.0f); if (lUnitList.empty()) return NULL; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 3d84ca41793..ade4fab62e8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -152,7 +152,7 @@ public: void AddSentinelsNear(Unit * /*nears*/) { std::list<Creature*> assistList; - me->GetCreatureListWithEntryInGrid(assistList,15264,70.0f); + me->GetCreatureListWithEntryInGrid(assistList, 15264, 70.0f); if (assistList.empty()) return; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 5c376edf629..22973967052 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y no z coordinat b/c they're all the same */ float pyramidSpawns [pyramidSpawnTotal][4] = { - {1,7789,1894.64f,1206.29f}, - {1,7787,1890.08f,1218.68f}, - {1,8876,1883.76f,1222.3f}, - {1,7789,1874.18f,1221.24f}, - {1,7787,1892.28f,1225.49f}, - {1,7788,1889.94f,1212.21f}, - {1,7787,1879.02f,1223.06f}, - {1,7789,1874.45f,1204.44f}, - {1,8876,1898.23f,1217.97f}, - {1,7787,1882.07f,1225.7f}, - {1,8877,1896.46f,1205.62f}, - {1,7787,1886.97f,1225.86f}, - {1,7787,1894.72f,1221.91f}, - {1,7787,1883.5f,1218.25f}, - {1,7787,1886.93f,1221.4f}, - {1,8876,1889.82f,1222.51f}, - {1,7788,1893.07f,1215.26f}, - {1,7788,1878.57f,1214.16f}, - {1,7788,1883.74f,1212.35f}, - {1,8877,1877,1207.27f}, - {1,8877,1873.63f,1204.65f}, - {1,8876,1877.4f,1216.41f}, - {1,8877,1899.63f,1202.52f}, - {2,7789,1902.83f,1223.41f}, - {2,8876,1889.82f,1222.51f}, - {2,7787,1883.5f,1218.25f}, - {2,7788,1883.74f,1212.35f}, - {2,8877,1877,1207.27f}, - {2,7787,1890.08f,1218.68f}, - {2,7789,1894.64f,1206.29f}, - {2,8876,1877.4f,1216.41f}, - {2,7787,1892.28f,1225.49f}, - {2,7788,1893.07f,1215.26f}, - {2,8877,1896.46f,1205.62f}, - {2,7789,1874.45f,1204.44f}, - {2,7789,1874.18f,1221.24f}, - {2,7787,1879.02f,1223.06f}, - {2,8876,1898.23f,1217.97f}, - {2,7787,1882.07f,1225.7f}, - {2,8877,1873.63f,1204.65f}, - {2,7787,1886.97f,1225.86f}, - {2,7788,1878.57f,1214.16f}, - {2,7787,1894.72f,1221.91f}, - {2,7787,1886.93f,1221.4f}, - {2,8876,1883.76f,1222.3f}, - {2,7788,1889.94f,1212.21f}, - {2,8877,1899.63f,1202.52f}, - {3,7788,1878.57f,1214.16f}, - {3,7787,1894.72f,1221.91f}, - {3,7787,1886.93f,1221.4f}, - {3,8876,1883.76f,1222.3f}, - {3,7788,1889.94f,1212.21f}, - {3,7275,1889.23f,1207.72f}, - {3,7796,1879.77f,1207.96f} + {1, 7789, 1894.64f, 1206.29f}, + {1, 7787, 1890.08f, 1218.68f}, + {1, 8876, 1883.76f, 1222.3f}, + {1, 7789, 1874.18f, 1221.24f}, + {1, 7787, 1892.28f, 1225.49f}, + {1, 7788, 1889.94f, 1212.21f}, + {1, 7787, 1879.02f, 1223.06f}, + {1, 7789, 1874.45f, 1204.44f}, + {1, 8876, 1898.23f, 1217.97f}, + {1, 7787, 1882.07f, 1225.7f}, + {1, 8877, 1896.46f, 1205.62f}, + {1, 7787, 1886.97f, 1225.86f}, + {1, 7787, 1894.72f, 1221.91f}, + {1, 7787, 1883.5f, 1218.25f}, + {1, 7787, 1886.93f, 1221.4f}, + {1, 8876, 1889.82f, 1222.51f}, + {1, 7788, 1893.07f, 1215.26f}, + {1, 7788, 1878.57f, 1214.16f}, + {1, 7788, 1883.74f, 1212.35f}, + {1, 8877, 1877, 1207.27f}, + {1, 8877, 1873.63f, 1204.65f}, + {1, 8876, 1877.4f, 1216.41f}, + {1, 8877, 1899.63f, 1202.52f}, + {2, 7789, 1902.83f, 1223.41f}, + {2, 8876, 1889.82f, 1222.51f}, + {2, 7787, 1883.5f, 1218.25f}, + {2, 7788, 1883.74f, 1212.35f}, + {2, 8877, 1877, 1207.27f}, + {2, 7787, 1890.08f, 1218.68f}, + {2, 7789, 1894.64f, 1206.29f}, + {2, 8876, 1877.4f, 1216.41f}, + {2, 7787, 1892.28f, 1225.49f}, + {2, 7788, 1893.07f, 1215.26f}, + {2, 8877, 1896.46f, 1205.62f}, + {2, 7789, 1874.45f, 1204.44f}, + {2, 7789, 1874.18f, 1221.24f}, + {2, 7787, 1879.02f, 1223.06f}, + {2, 8876, 1898.23f, 1217.97f}, + {2, 7787, 1882.07f, 1225.7f}, + {2, 8877, 1873.63f, 1204.65f}, + {2, 7787, 1886.97f, 1225.86f}, + {2, 7788, 1878.57f, 1214.16f}, + {2, 7787, 1894.72f, 1221.91f}, + {2, 7787, 1886.93f, 1221.4f}, + {2, 8876, 1883.76f, 1222.3f}, + {2, 7788, 1889.94f, 1212.21f}, + {2, 8877, 1899.63f, 1202.52f}, + {3, 7788, 1878.57f, 1214.16f}, + {3, 7787, 1894.72f, 1221.91f}, + {3, 7787, 1886.93f, 1221.4f}, + {3, 8876, 1883.76f, 1222.3f}, + {3, 7788, 1889.94f, 1212.21f}, + {3, 7275, 1889.23f, 1207.72f}, + {3, 7796, 1879.77f, 1207.96f} }; float Spawnsway[2][3] = { - {1884.86f,1228.62f,9}, - {1887.53f,1263,41} + {1884.86f, 1228.62f, 9}, + {1887.53f, 1263, 41} }; class instance_zulfarrak : public InstanceMapScript @@ -217,7 +217,7 @@ public: break; case PYRAMID_ARRIVED_AT_STAIR: SpawnPyramidWave(1); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_1); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_1); major_wave_Timer=120000; minor_wave_Timer=0; addGroupSize=2; @@ -225,7 +225,7 @@ public: case PYRAMID_WAVE_1: if (IsWaveAllDead()) { - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_2); major_wave_Timer = 10000; //give players a few seconds before wave 2 starts to rebuff } else @@ -242,7 +242,7 @@ public: { // beginning 2nd wave! SpawnPyramidWave(2); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_2); minor_wave_Timer = 0; addGroupSize=2; } @@ -253,7 +253,7 @@ public: if (IsWaveAllDead()) { SpawnPyramidWave(3); - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_3); major_wave_Timer = 5000; //give NPCs time to return to their home spots } else @@ -269,12 +269,12 @@ public: if (major_wave_Timer<diff) { // move NPCs to bottom of stair - MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f); - MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f); - MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f); - MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f); - MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); + MoveNPCIfAlive(ENTRY_BLY, 1887.92f, 1228.179f, 9.98f, 4.78f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.57f, 1228.68f, 9.69f, 4.78f); + MoveNPCIfAlive(ENTRY_ORO, 1897.23f, 1228.34f, 9.43f, 4.78f); + MoveNPCIfAlive(ENTRY_RAVEN, 1883.68f, 1227.95f, 9.543f, 4.78f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1878.02f, 1227.65f, 9.485f, 4.78f); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_3); } else major_wave_Timer -= diff; @@ -282,28 +282,28 @@ public: case PYRAMID_WAVE_3: if (IsWaveAllDead()) // move NPCS to their final positions { - SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS); - MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f); + SetData(EVENT_PYRAMID, PYRAMID_KILLED_ALL_TROLLS); + MoveNPCIfAlive(ENTRY_BLY, 1883.82f, 1200.83f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.83f, 1201.45f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_ORO, 1894.50f, 1204.40f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_RAVEN, 1874.11f, 1206.17f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1877.52f, 1199.63f, 8.87f, 1.32f); } break; }; } - std::list<uint64> addsAtBase,movedadds; + std::list<uint64> addsAtBase, movedadds; - void MoveNPCIfAlive(uint32 entry,float x,float y,float z,float o) + void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o) { if (Creature* npc = instance->GetCreature(GetData64(entry))) { if (npc->isAlive()) { npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - npc->GetMotionMaster()->MovePoint(1,x,y,z); - npc->SetHomePosition(x,y,z,o); + npc->GetMotionMaster()->MovePoint(1, x, y, z); + npc->SetHomePosition(x, y, z, o); } } } @@ -314,7 +314,7 @@ public: if (pyramidSpawns[i][0] == (float)wave) { Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0}; - TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]),pos); + TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]), pos); ts->GetMotionMaster()->MoveRandom(10); addsAtBase.push_back(ts->GetGUID()); } @@ -348,7 +348,7 @@ public: { if (Creature* add = instance->GetCreature(*addsAtBase.begin())) { - add->GetMotionMaster()->MovePath(PATH_ADDS,false); + add->GetMotionMaster()->MovePath(PATH_ADDS, false); movedadds.push_back(add->GetGUID()); } addsAtBase.erase(addsAtBase.begin()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 554c3f94499..950ed2d7fc3 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -67,7 +67,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI,pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); pCreature->AI()->DoAction(0); } return true; @@ -133,11 +133,11 @@ public: //weegli doesn't fight - he goes & blows up the door if (Creature* pWeegli = pInstance->instance->GetCreature(pInstance->GetData64(ENTRY_WEEGLI))) pWeegli->AI()->DoAction(0); - DoScriptText(SAY_1,me); + DoScriptText(SAY_1, me); Text_Timer = 5000; break; case 2: - DoScriptText(SAY_2,me); + DoScriptText(SAY_2, me); Text_Timer = 5000; break; case 3: @@ -185,7 +185,7 @@ public: Text_Timer = 0; } - void switchFactionIfAlive(InstanceScript* pInstance,uint32 entry) + void switchFactionIfAlive(InstanceScript* pInstance, uint32 entry) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) if (crew->isAlive()) @@ -199,14 +199,14 @@ public: +## go_troll_cage +######*/ -void initBlyCrewMember(InstanceScript* pInstance, uint32 entry,float x,float y, float z) +void initBlyCrewMember(InstanceScript* pInstance, uint32 entry, float x, float y, float z) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) { crew->SetReactState(REACT_AGGRESSIVE); crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - crew->SetHomePosition(x,y,z,0); - crew->GetMotionMaster()->MovePoint(1,x,y,z); + crew->SetHomePosition(x, y, z, 0); + crew->GetMotionMaster()->MovePoint(1, x, y, z); crew->setFaction(FACTION_FREED); } } @@ -222,11 +222,11 @@ public: { pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f); - initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f); + initBlyCrewMember(pInstance, ENTRY_BLY, 1884.99f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f); + initBlyCrewMember(pInstance, ENTRY_WEEGLI, 1890, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f); } return false; } @@ -319,7 +319,7 @@ public: void AttackStart(Unit *victim) { - AttackStartCaster(victim,10);//keep back & toss bombs/shoot + AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } void JustDied(Unit * /*victim*/) @@ -335,7 +335,7 @@ public: if (Bomb_Timer < diff) { - DoCast(me->getVictim(),SPELL_BOMB); + DoCast(me->getVictim(), SPELL_BOMB); Bomb_Timer = 10000; } else @@ -343,7 +343,7 @@ public: if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim())) { - DoCast(me->getVictim(),SPELL_SHOOT); + DoCast(me->getVictim(), SPELL_SHOOT); me->SetSheath(SHEATH_STATE_RANGED); } else @@ -359,9 +359,9 @@ public: { if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { - pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO,me); - me->SetHomePosition(1882.69f,1272.28f,41.87f,0); + pInstance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); + DoScriptText(SAY_WEEGLI_OHNO, me); + me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else if (destroyingDoor) @@ -383,9 +383,9 @@ public: if (me->isAlive()) { me->setFaction(FACTION_FRIENDLY); - me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f); - me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO,me); + me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); + me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted + DoScriptText(SAY_WEEGLI_OK_I_GO, me); destroyingDoor=true; } } @@ -415,7 +415,7 @@ public: // randomly summon a zombie or dead hero the first time a grave is used if (pGo->GetUseCount() == 0) { - uint32 randomchance = urand(0,100); + uint32 randomchance = urand(0, 100); if (randomchance < ZOMBIE_CHANCE) pGo->SummonCreature(ZOMBIE, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); else @@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* pPlayer,const AreaTriggerEntry * /*at*/) + bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) { Creature* pZumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 3b85f4799ce..0b4428964eb 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -85,9 +85,9 @@ class npc_torek : public CreatureScript break; case 19: //TODO: verify location and creatures amount. - me->SummonCreature(ENTRY_DURIEL,1776.73f,-2049.06f,109.83f,1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64f,-2049.41f,109.83f,1.40f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73f,-2049.50f,109.83f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 20: DoScriptText(SAY_WIN, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index e40775e9bb9..02d7852fbc7 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -138,7 +138,7 @@ public: { DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, pPlayer); - pPlayer->TalkedToCreature(me->GetEntry(),me->GetGUID()); + pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID()); } me->GetMotionMaster()->Clear(); @@ -390,7 +390,7 @@ public: case 29: DoScriptText(EMOTE_HUG, me, pPlayer); DoScriptText(SAY_END2, me, pPlayer); - pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,me); + pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } } @@ -533,7 +533,7 @@ public: if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE &&(*itr)->HasAura(SPELL_TREE_DISGUISE)) { - (*itr)->KilledMonsterCredit(MOB_SPARK,0); + (*itr)->KilledMonsterCredit(MOB_SPARK, 0); } } } @@ -541,7 +541,7 @@ public: void DespawnNagaFlag(bool despawn) { std::list<GameObject*> FlagList; - me->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 100.0f); + me->GetGameObjectListWithEntryInGrid(FlagList, GO_NAGA_FLAG, 100.0f); if (!FlagList.empty()) { @@ -592,7 +592,7 @@ public: { if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) { - ravager->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ravager->SetReactState(REACT_AGGRESSIVE); ravager->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 74fd2c27715..632dd0925ac 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -63,7 +63,7 @@ public: { uint32 spawnCreatureID = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: spawnCreatureID = 17681; @@ -72,7 +72,7 @@ public: break; case 1: case 2: - spawnCreatureID = possibleSpawns[urand(0,30)]; + spawnCreatureID = possibleSpawns[urand(0, 30)]; break; } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 81c7826c74f..454592e45dd 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -122,7 +122,7 @@ public: //ManaStorm_Timer if (ManaStorm_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index f756445462c..babc745af58 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -132,9 +132,9 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(EMOTE_KER_SLEEP_1,EMOTE_KER_SLEEP_2,EMOTE_KER_SLEEP_3), me); + DoScriptText(RAND(EMOTE_KER_SLEEP_1, EMOTE_KER_SLEEP_2, EMOTE_KER_SLEEP_3), me); - DoScriptText(RAND(SAY_KER_SLEEP_1,SAY_KER_SLEEP_2,SAY_KER_SLEEP_3,SAY_KER_SLEEP_4), me); + DoScriptText(RAND(SAY_KER_SLEEP_1, SAY_KER_SLEEP_2, SAY_KER_SLEEP_3, SAY_KER_SLEEP_4), me); me->SetStandState(UNIT_STAND_STATE_SLEEP); DoCast(me, SPELL_SLEEP_VISUAL, false); diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index a956ceacee1..a925090a16b 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -85,10 +85,10 @@ public: pCreatureTarget->GetEntry() == NPC_DYING_KODO || pCreatureTarget->GetEntry() == NPC_ANCIENT_KODO) { - pCaster->CastSpell(pCaster,SPELL_KODO_KOMBO_PLAYER_BUFF,true); + pCaster->CastSpell(pCaster, SPELL_KODO_KOMBO_PLAYER_BUFF, true); pCreatureTarget->UpdateEntry(NPC_TAMED_KODO); - pCreatureTarget->CastSpell(pCreatureTarget,SPELL_KODO_KOMBO_DESPAWN_BUFF,false); + pCreatureTarget->CastSpell(pCreatureTarget, SPELL_KODO_KOMBO_DESPAWN_BUFF, false); if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) pCreatureTarget->GetMotionMaster()->MoveIdle(); @@ -127,7 +127,7 @@ public: if (me->IsWithinDistInMap(pWho, 10.0f)) { - DoScriptText(RAND(SAY_SMEED_HOME_1,SAY_SMEED_HOME_2,SAY_SMEED_HOME_3), pWho); + DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), pWho); //spell have no implemented effect (dummy), so useful to notify spellHit DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true); @@ -179,7 +179,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) - pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(),pPlayer->GetInnPosY(),pPlayer->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); return true; } diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index ebd10679fd8..d0186840228 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -72,11 +72,11 @@ public: if (spell->Id == SPELL_AWAKEN_PEON && caster->GetTypeId() == TYPEID_PLAYER && CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE) { - caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(),me->GetGUID()); + caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); DoScriptText(SAY_SPELL_HIT, me, caster); me->RemoveAllAuras(); if (GameObject* Lumberpile = me->FindNearestGameObject(GO_LUMBERPILE, 20)) - me->GetMotionMaster()->MovePoint(1,Lumberpile->GetPositionX()-1,Lumberpile->GetPositionY(),Lumberpile->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, Lumberpile->GetPositionX()-1, Lumberpile->GetPositionY(), Lumberpile->GetPositionZ()); } } @@ -320,9 +320,9 @@ class npc_tiger_matriarch : public CreatureScript // These models was found in sniff. // TODO: generalize these models with race from dbc uint32 const trollmodel[] = -{11665,11734,11750,12037,12038,12042,12049,12849,13529,14759,15570,15701, -15702,1882,1897,1976,2025,27286,2734,2735,4084,4085,4087,4089,4231,4357, -4358,4360,4361,4362,4363,4370,4532,4537,4540,4610,6839,7037,9767,9768}; +{11665, 11734, 11750, 12037, 12038, 12042, 12049, 12849, 13529, 14759, 15570, 15701, +15702, 1882, 1897, 1976, 2025, 27286, 2734, 2735, 4084, 4085, 4087, 4089, 4231, 4357, +4358, 4360, 4361, 4362, 4363, 4370, 4532, 4537, 4540, 4610, 6839, 7037, 9767, 9768}; class npc_troll_volunteer : public CreatureScript { @@ -336,7 +336,7 @@ class npc_troll_volunteer : public CreatureScript Reset(); Player* player = me->GetOwner()->ToPlayer(); - switch (urand(1,4)) + switch (urand(1, 4)) { case 1: _mountModel = 6471; diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 189054480a1..b38e95a4f87 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -110,7 +110,7 @@ public: if (CAST_PLR(pKiller)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE) { DoCast(pKiller, SPELL_SUMMON_RESTLESS_APPARITION, true); - CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION,0); + CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION, 0); } } }; @@ -144,7 +144,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_RESTLESS_1,SAY_RESTLESS_2,SAY_RESTLESS_3), me); + DoScriptText(RAND(SAY_RESTLESS_1, SAY_RESTLESS_2, SAY_RESTLESS_3), me); } }; @@ -186,7 +186,7 @@ public: if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CLOSE_GOSSIP_MENU(); - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -507,7 +507,7 @@ public: ## npc_zelfrax ######*/ -const Position MovePosition = {-2967.030f,-3872.1799f,35.620f, 0.0f}; +const Position MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; enum eZelfrax { @@ -552,8 +552,8 @@ public: if (uiType != POINT_MOTION_TYPE) return; - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); SetCombatMovement(true); if (me->isInCombat()) @@ -564,9 +564,9 @@ public: void MoveToDock() { SetCombatMovement(false); - me->GetMotionMaster()->MovePoint(0,MovePosition); - DoScriptText(SAY_ZELFRAX,me); - DoScriptText(SAY_ZELFRAX_2,me); + me->GetMotionMaster()->MovePoint(0, MovePosition); + DoScriptText(SAY_ZELFRAX, me); + DoScriptText(SAY_ZELFRAX_2, me); } void UpdateAI(uint32 const /*uiDiff*/) diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 819b6ffe733..e7140cc1325 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -170,8 +170,8 @@ public: void EnterCombat(Unit* /*who*/) { //For an small probability the npc says something when he get aggro - if (urand(0,9) > 7) - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + if (urand(0, 9) > 7) + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 583ce6e31dc..c3706ae377f 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -366,7 +366,7 @@ public: AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); } PlayerGUID = pPlayer->GetGUID(); - Start(true,false,PlayerGUID); + Start(true, false, PlayerGUID); } return; } @@ -408,7 +408,7 @@ public: switch(Step) { case 0: - me->Say(CLINTAR_SPIRIT_SAY_START,0,PlayerGUID); + me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); Event_Timer = 8000; Step = 1; break; @@ -467,7 +467,7 @@ public: Creature *mob = me->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000); if (mob) { - mob->AddThreat(me,10000.0f); + mob->AddThreat(me, 10000.0f); mob->AI()->AttackStart(me); } Event_Timer = 2000; diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 7ae0eb6cd8f..6e1f4064413 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -160,7 +160,7 @@ public: switch(uiEventPhase) { case 1: - if (Unit* pUnit = Unit::GetUnit(*me,uiPlayerGUID)) + if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) { if (GameObject* pGo = pUnit->GetGameObject(SPELL_LUNCH)) { diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 9a9fba3aec0..1c82ad46e0e 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -96,7 +96,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE && - (pPlayer->HasItemCount(18563,1,false) || pPlayer->HasItemCount(18564,1,false))) + (pPlayer->HasItemCount(18563, 1, false) || pPlayer->HasItemCount(18564, 1, false))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(6812, pCreature->GetGUID()); @@ -287,7 +287,7 @@ npc_anachronos_the_ancient : Creature that controls the event. npc_anachronos_quest_trigger: controls the spawning of the BG War mobs. go_crystalline_tear : GameObject that begins the event and hands out quest TO DO: get correct spell IDs and timings for spells cast upon dragon transformations -TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation,but for some unknown reason it doesnt work. +TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation, but for some unknown reason it doesnt work. EndContentData */ #define QUEST_A_PAWN_ON_THE_ETERNAL_BOARD 8519 @@ -310,50 +310,50 @@ static QuestCinematic EventAnim[]= {ARYGOS_EMOTE_1, 2, 2000}, {CAELESTRASZ_SAY_1, 4, 8000}, {MERITHRA_SAY_2, 3, 6000}, - {0,3,2000}, + {0, 3, 2000}, {MERITHRA_YELL_1, 3, 2500}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1250},//fly - {0, 3, 250},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1250}, //fly + {0, 3, 250}, //remove flags {ARYGOS_SAY_1, 2, 3000}, - {0,3,2000}, + {0, 3, 2000}, {ARYGOS_YELL_1, 2, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1000},//fly - {0, 3, 1000},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1000}, //fly + {0, 3, 1000}, //remove flags {CAELESTRASZ_SAY_2, 4, 5000}, - {0,3,3000}, + {0, 3, 3000}, {CAELESTRASZ_YELL_1, 4, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 2500},// spell + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 2500}, // spell {ANACHRONOS_SAY_2, 0, 2000}, - {0, 3, 250},//fly - {0, 3, 25},//remove flags + {0, 3, 250}, //fly + {0, 3, 25}, //remove flags {FANDRAL_SAY_2, 1, 3000}, - {ANACHRONOS_SAY_3, 0, 10000},//Both run through the armies - {0,3,2000},// Sands will stop - {0,3,8000},// Summon Gate + {ANACHRONOS_SAY_3, 0, 10000}, //Both run through the armies + {0, 3, 2000}, // Sands will stop + {0, 3, 8000}, // Summon Gate {ANACHRONOS_SAY_4, 0, 4000}, - {0, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze) + {0, 0, 2000}, //spell 1-> Arcane cosmetic (Mobs freeze) {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) - {0, 0, 7000},//BarrieR - {0, 0, 4000},//Glyphs + {0, 0, 7000}, //BarrieR + {0, 0, 4000}, //Glyphs {ANACHRONOS_SAY_5, 0, 2000}, - {0, 0, 4000},// Roots - {FANDRAL_SAY_3, 1, 3000},//Root Text - {FANDRAL_EMOTE_1, 1, 3000},//falls knee + {0, 0, 4000}, // Roots + {FANDRAL_SAY_3, 1, 3000}, //Root Text + {FANDRAL_EMOTE_1, 1, 3000}, //falls knee {ANACHRONOS_SAY_6, 0, 3000}, {ANACHRONOS_SAY_7, 0, 3000}, {ANACHRONOS_SAY_8, 0, 8000}, - {ANACHRONOS_EMOTE_1, 0, 1000},//Give Scepter + {ANACHRONOS_EMOTE_1, 0, 1000}, //Give Scepter {FANDRAL_SAY_4, 1, 3000}, - {FANDRAL_SAY_5, 1, 3000},//->Equip hammer~Scepter, throw it at door - {FANDRAL_EMOTE_2, 1, 3000},//Throw hammer at door. + {FANDRAL_SAY_5, 1, 3000}, //->Equip hammer~Scepter, throw it at door + {FANDRAL_EMOTE_2, 1, 3000}, //Throw hammer at door. {ANACHRONOS_SAY_9, 0, 3000}, {FANDRAL_SAY_6, 1, 3000}, //fandral goes away {ANACHRONOS_EMOTE_2, 0, 3000}, @@ -376,76 +376,76 @@ static QuestCinematic EventAnim[]= //Cordinates for Spawns static const Position SpawnLocation[]= { - {-8085.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1424.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1422.0f, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1424.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1422.0f, 2.61f, 3.141592f}, //Kaldorei Infantry // 2 waves of warriors - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1525.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1523.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1521.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1519.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8088.0f, 1510.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8084.0f, 1520.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8088.0f, 1530.0f, 2.61f, 0.0f},//Anubisath Conqueror - - {-8080.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8082.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1531.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8081.0f, 1514.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1526.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1512.0f, 2.61f, 0.0f},//Qiraj Tank - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Tank - - {-8082.0f, 1513.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1525.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1523.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1521.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1519.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8088.0f, 1510.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8084.0f, 1520.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8088.0f, 1530.0f, 2.61f, 0.0f}, //Anubisath Conqueror + + {-8080.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8082.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1531.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8081.0f, 1514.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1526.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1512.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Tank + + {-8082.0f, 1513.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Anubisath Conqueror }; struct WaveData @@ -545,17 +545,17 @@ public: break; case 1: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - DoScriptText(FANDRAL_SAY_1, Fandral,me); + DoScriptText(FANDRAL_SAY_1, Fandral, me); break; case 2: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, 0); - DoScriptText(MERITHRA_EMOTE_1,Merithra); + DoScriptText(MERITHRA_EMOTE_1, Merithra); break; case 3: - DoScriptText(MERITHRA_SAY_1,Merithra); + DoScriptText(MERITHRA_SAY_1, Merithra); break; case 4: - DoScriptText(ARYGOS_EMOTE_1,Arygos); + DoScriptText(ARYGOS_EMOTE_1, Arygos); break; case 5: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, Fandral->GetGUID()); @@ -566,81 +566,81 @@ public: break; case 7: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, 0); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); break; case 8: - DoScriptText(MERITHRA_YELL_1,Merithra); + DoScriptText(MERITHRA_YELL_1, Merithra); break; case 9: - Merithra->CastSpell(Merithra,25105,true); + Merithra->CastSpell(Merithra, 25105, true); break; case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Merithra->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,3); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 3); break; case 11: - Merithra->CastSpell(Merithra,24818,false); + Merithra->CastSpell(Merithra, 24818, false); break; case 12: - Merithra->GetMotionMaster()->MoveCharge(-8100,1530,50,42); + Merithra->GetMotionMaster()->MoveCharge(-8100, 1530, 50, 42); break; case 13: break; case 14: - DoScriptText(ARYGOS_SAY_1,Arygos); + DoScriptText(ARYGOS_SAY_1, Arygos); Merithra->SetVisible(false); break; case 15: - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); - Merithra->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); break; case 16: DoScriptText(ARYGOS_YELL_1, Arygos); break; case 17: - Arygos->CastSpell(Arygos,25107,true); + Arygos->CastSpell(Arygos, 25107, true); break; case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Arygos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 42); break; case 19: - Arygos->CastSpell(Arygos,50505,false); + Arygos->CastSpell(Arygos, 50505, false); break; case 20: - Arygos->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Arygos->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); break; case 21: break; case 22: - DoScriptText(CAELESTRASZ_SAY_2,Caelestrasz, Fandral); + DoScriptText(CAELESTRASZ_SAY_2, Caelestrasz, Fandral); break; case 23: - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); Arygos->SetVisible(false); - Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 10); break; case 24: DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); break; case 25: - Caelestrasz->CastSpell(Caelestrasz,25106,true); + Caelestrasz->CastSpell(Caelestrasz, 25106, true); break; case 26: Caelestrasz->HandleEmoteCommand(254); Caelestrasz->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61f,4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 7.61f, 4); break; case 27: - Caelestrasz->CastSpell(Caelestrasz,54293,false); + Caelestrasz->CastSpell(Caelestrasz, 54293, false); break; case 28: - DoScriptText(ANACHRONOS_SAY_2,me, Fandral); + DoScriptText(ANACHRONOS_SAY_2, me, Fandral); break; case 29: - Caelestrasz->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Caelestrasz->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); DoScriptText(FANDRAL_SAY_2, Fandral, me); break; case 30: @@ -650,29 +650,29 @@ public: break; case 32: Caelestrasz->SetVisible(false); - Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); - Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8); - me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); + Fandral->GetMotionMaster()->MoveCharge(-8108, 1529, 2.77f, 8); + me->GetMotionMaster()->MoveCharge(-8113, 1525, 2.77f, 8); break;//both run to the gate case 33: DoScriptText(ANACHRONOS_SAY_4, me); - Caelestrasz->GetMotionMaster()->MoveCharge(-8050,1473,65,15); + Caelestrasz->GetMotionMaster()->MoveCharge(-8050, 1473, 65, 15); break; //Text: sands will stop case 34: DoCast(plr, 23017, true);//Arcane Channeling break; case 35: - me->CastSpell(-8088,1520.43f,2.67f,25158,true); + me->CastSpell(-8088, 1520.43f, 2.67f, 25158, true); break; case 36: DoCast(plr, 25159, true); break; case 37: - me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 38: DoCast(plr, 25166, true); - me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 39: DoScriptText(ANACHRONOS_SAY_5, me, Fandral); @@ -681,7 +681,7 @@ public: Fandral->CastSpell(me, 25167, true); break; case 41: - Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); DoScriptText(FANDRAL_SAY_3, Fandral); break; case 42: @@ -699,70 +699,70 @@ public: break; case 46: DoScriptText(ANACHRONOS_SAY_8, me); - me->GetMotionMaster()->MoveCharge(-8110,1527,2.77f,4); + me->GetMotionMaster()->MoveCharge(-8110, 1527, 2.77f, 4); break; case 47: DoScriptText(ANACHRONOS_EMOTE_1, me); break; case 48: - DoScriptText(FANDRAL_SAY_4,Fandral,me); + DoScriptText(FANDRAL_SAY_4, Fandral, me); break; case 49: - DoScriptText(FANDRAL_SAY_5,Fandral,me); + DoScriptText(FANDRAL_SAY_5, Fandral, me); break; case 50: - DoScriptText(FANDRAL_EMOTE_2,Fandral); - Fandral->CastSpell(-8127,1525,17.5f,33806,true); + DoScriptText(FANDRAL_EMOTE_2, Fandral); + Fandral->CastSpell(-8127, 1525, 17.5f, 33806, true); break; case 51: { uint32 entries[4] = { 15423, 15424, 15414, 15422 }; for (uint8 i = 0; i < 4; ++i) { - mob = plr->FindNearestCreature(entries[i],50,me); + mob = plr->FindNearestCreature(entries[i], 50, me); while (mob) { mob->RemoveFromWorld(); - mob = plr->FindNearestCreature(15423,50,me); + mob = plr->FindNearestCreature(15423, 50, me); } } break; } case 52: - Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f,4); - DoScriptText(ANACHRONOS_SAY_9, me,Fandral); + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f, 4); + DoScriptText(ANACHRONOS_SAY_9, me, Fandral); break; case 53: - DoScriptText(FANDRAL_SAY_6,Fandral); + DoScriptText(FANDRAL_SAY_6, Fandral); break; case 54: - DoScriptText(ANACHRONOS_EMOTE_2,me); + DoScriptText(ANACHRONOS_EMOTE_2, me); break; case 55: Fandral->SetVisible(false); break; case 56: DoScriptText(ANACHRONOS_EMOTE_3, me); - me->GetMotionMaster()->MoveCharge(-8116,1522,3.65f,4); + me->GetMotionMaster()->MoveCharge(-8116, 1522, 3.65f, 4); break; case 57: - me->GetMotionMaster()->MoveCharge(-8116.7f,1527,3.7f,4); + me->GetMotionMaster()->MoveCharge(-8116.7f, 1527, 3.7f, 4); break; case 58: - me->GetMotionMaster()->MoveCharge(-8112.67f,1529.9f,2.86f,4); + me->GetMotionMaster()->MoveCharge(-8112.67f, 1529.9f, 2.86f, 4); break; case 59: - me->GetMotionMaster()->MoveCharge(-8117.99f,1532.24f,3.94f,4); + me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); break; case 60: if (plr) - DoScriptText(ANACHRONOS_SAY_10, me,plr); - me->GetMotionMaster()->MoveCharge(-8113.46f,1524.16f,2.89f,4); + DoScriptText(ANACHRONOS_SAY_10, me, plr); + me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: - me->GetMotionMaster()->MoveCharge(-8057.1f,1470.32f,2.61f,6); - if (plr->IsInRange(me,0,15)) - plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD ,me); + me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); + if (plr->IsInRange(me, 0, 15)) + plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); break; case 62: me->SetDisplayId(15500); @@ -772,13 +772,13 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); break; case 64: - me->GetMotionMaster()->MoveCharge(-8000,1400,150,9); + me->GetMotionMaster()->MoveCharge(-8000, 1400, 150, 9); break; case 65: me->SetVisible(false); if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID))) { - DoScriptText(ARYGOS_YELL_1,me); + DoScriptText(ARYGOS_YELL_1, me); AnachronosQuestTrigger->AI()->EnterEvadeMode(); eventEnd=true; } @@ -824,7 +824,7 @@ public: uint64 MobGUID; uint64 PlayerGUID; - uint32 SpellTimer1, SpellTimer2, SpellTimer3,SpellTimer4; + uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4; bool Timers; bool hasTarget; @@ -888,23 +888,23 @@ public: if (!hasTarget) { if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) - pTarget = me->FindNearestCreature(15423,20,true); + pTarget = me->FindNearestCreature(15423, 20, true); if (me->GetEntry() == 15423) { - uint8 tar = urand(0,2); + uint8 tar = urand(0, 2); if (tar == 0) - pTarget = me->FindNearestCreature(15422,20,true); + pTarget = me->FindNearestCreature(15422, 20, true); else if (tar == 1) - pTarget = me->FindNearestCreature(15424,20,true); + pTarget = me->FindNearestCreature(15424, 20, true); else if (tar == 2) - pTarget = me->FindNearestCreature(15414,20,true); + pTarget = me->FindNearestCreature(15414, 20, true); } hasTarget = true; if (pTarget) me->AI()->AttackStart(pTarget); } - if (!(me->FindNearestCreature(15379,60))) + if (!(me->FindNearestCreature(15379, 60))) DoCast(me, 33652); if (!UpdateVictim()) @@ -1091,33 +1091,33 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535f,1535.14f,2.61f,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767f, 1533.148f,2.61f, 1.5f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52f, 1537.843f, 2.61f, 5.7f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462f, 1535.843f, 2.61f, 3.141592f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75f, 1538.795f, 2.61f, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); if (Merithra) { Merithra->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID,15420); + Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15420); Merithra->setFaction(35); } if (Caelestrasz) { Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID,15419); + Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15419); Caelestrasz->setFaction(35); } if (Arygos) { Arygos->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID,15418); + Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15418); Arygos->setFaction(35); } diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index fde36d3e590..e322baf4186 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -52,7 +52,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,6766,false); + pCreature->CastSpell(pPlayer, 6766, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 68ee527bbce..c3937ddc95e 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -80,10 +80,10 @@ public: void SendItem(Unit* receiver) { - if (CAST_PLR(receiver)->HasItemCount(11169,1,false) && - CAST_PLR(receiver)->HasItemCount(11172,11,false) && - CAST_PLR(receiver)->HasItemCount(11173,1,false) && - !CAST_PLR(receiver)->HasItemCount(11522,1,true)) + if (CAST_PLR(receiver)->HasItemCount(11169, 1, false) && + CAST_PLR(receiver)->HasItemCount(11172, 11, false) && + CAST_PLR(receiver)->HasItemCount(11173, 1, false) && + !CAST_PLR(receiver)->HasItemCount(11522, 1, true)) { ItemPosCountVec dest; uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, false); @@ -282,7 +282,7 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const *quest) { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return false; } @@ -291,7 +291,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return true; } @@ -409,7 +409,7 @@ public: { pCreature->setFaction(113); pCreature->SetFullHealth(); - pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); DoScriptText(SAY_OOX_START, pCreature); @@ -466,7 +466,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) @@ -626,8 +626,8 @@ public: { m_uiCheckSpeechTimer = 5000; - if (urand(0,9) > 8) - DoScriptText(RAND(SAY_TOOG_THIRST,SAY_TOOG_WORRIED), me); + if (urand(0, 9) > 8) + DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me); } else m_uiCheckSpeechTimer -= uiDiff; diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 0698ae4f0d5..6ede81728e6 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -446,7 +446,7 @@ public: if (!EventGrate && EventInProgress) { - float x,y,z; + float x, y, z; pWarrior->GetPosition(x, y, z); if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) { diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index f27e8e75edd..973cf0b7e1e 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -234,7 +234,7 @@ public: DoScriptText(SAY_START, pCreature, pPlayer); pCreature->setFaction(FACTION_ESCORTEE); - if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI,pCreature->AI())) + if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, pCreature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; @@ -415,7 +415,7 @@ public: { if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true)) { - panther->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); panther->SetReactState(REACT_AGGRESSIVE); panther->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index 2c202e68754..7dd6b5b21eb 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -99,7 +99,7 @@ public: if (BerserkerCharge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 0094e970e3d..35d70c64a6e 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -249,7 +249,7 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(SAY_FAINT_1,SAY_FAINT_2,SAY_FAINT_3,SAY_FAINT_4), me); + DoScriptText(RAND(SAY_FAINT_1, SAY_FAINT_2, SAY_FAINT_3, SAY_FAINT_4), me); } //what does actually happen here? Emote? Aura? @@ -263,7 +263,7 @@ public: if (HasFollowState(STATE_FOLLOW_POSTEVENT)) return; - DoScriptText(RAND(SAY_WAKE_1,SAY_WAKE_2,SAY_WAKE_3,SAY_WAKE_4), me); + DoScriptText(RAND(SAY_WAKE_1, SAY_WAKE_2, SAY_WAKE_3, SAY_WAKE_4), me); SetFollowPaused(false); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index fa9a0d77fad..4e751419303 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -212,7 +212,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN,SpawnPointGuardian[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Guardian->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Guardian); @@ -229,7 +229,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Venomancer->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Venomancer); @@ -248,7 +248,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Datter->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Datter); @@ -337,7 +337,7 @@ public: { if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 8b572323e16..0d2ef4c87be 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -76,11 +76,11 @@ public: me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); - uiAcidTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiLeechTimer = urand(3*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiPierceTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); - uiGrabTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); - uiDoorsTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiLeechTimer = urand(3*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiPierceTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); + uiDoorsTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiCheckDistanceTimer = 2*IN_MILLISECONDS; if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) @@ -118,7 +118,7 @@ public: return; float x=0.0f, y=0.0f, z=0.0f; - me->GetRespawnCoord(x,y,z); + me->GetRespawnCoord(x, y, z); if (uiCheckDistanceTimer <= uiDiff) uiCheckDistanceTimer = 5*IN_MILLISECONDS; @@ -129,7 +129,7 @@ public: } if (me->IsInEvadeMode() || !me->getVictim()) return; - if (me->GetDistance(x,y,z) > dist) + if (me->GetDistance(x, y, z) > dist) EnterEvadeMode(); } @@ -160,7 +160,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ACID_CLOUD); - uiAcidTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiAcidTimer -= diff; if (uiLeechTimer <= diff) @@ -168,7 +168,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LEECH_POISON); - uiLeechTimer = urand(11*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiLeechTimer = urand(11*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiLeechTimer -= diff; if (uiGrabTimer <= diff) @@ -176,12 +176,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. DoCast(pTarget, SPELL_WEB_GRAB); - uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiGrabTimer -= diff; if (uiDoorsTimer <= diff) { - uiDoorsTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS); + uiDoorsTimer = urand(30*IN_MILLISECONDS, 60*IN_MILLISECONDS); } else uiDoorsTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index b935cc243de..9048d2cfae8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_SUMMON_SKITTERING_SWARMER_1 = 52439, //Summon 3x 28735 H_SPELL_ACID_SPLASH = 59363, SPELL_ACID_SPLASH = 52446, - SPELL_CHARGE = 16979,//maybe is another spell + SPELL_CHARGE = 16979, //maybe is another spell SPELL_BACKSTAB = 52540, SPELL_SHADOW_BOLT = 52534, H_SPELL_SHADOW_BOLT = 59357, @@ -44,7 +44,7 @@ enum Spells SPELL_ENRAGE = 52470, SPELL_INFECTED_BITE = 52469, H_SPELL_INFECTED_BITE = 59364, - SPELL_WEB_WRAP = 52086,//the spell is not working properly + SPELL_WEB_WRAP = 52086, //the spell is not working properly SPELL_BLINDING_WEBS = 52524, H_SPELL_BLINDING_WEBS = 59365, SPELL_POSION_SPRAY = 52493, @@ -131,22 +131,22 @@ public: void Summon() { - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -212,12 +212,12 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } }; @@ -239,7 +239,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); + DoCast(me->getVictim(), SPELL_ACID_SPLASH, true); } }; @@ -277,7 +277,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoResetThreat(); - me->AddThreat(pTarget,1.0f); + me->AddThreat(pTarget, 1.0f); DoCast(pTarget, SPELL_CHARGE, true); } uiChargeTimer = 15*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 1b9e978ac01..383689b3ec8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -89,7 +89,7 @@ public: case 192395: uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192396: uiAnubarakDoor[0] = go->GetGUID(); @@ -125,7 +125,7 @@ public: case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; if (data == DONE) - HandleGameObject(uiKrikthirDoor,true); + HandleGameObject(uiKrikthirDoor, true); break; case DATA_HADRONOX_EVENT: auiEncounter[1] = data; @@ -182,7 +182,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2; + uint16 data0, data1, data2; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 7eb49ca7763..73ab6501ffa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -65,9 +65,9 @@ public: void Reset() { - uiRootTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiBashTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiBashTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiSpawnTimer = 0; me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); @@ -110,9 +110,9 @@ public: { Position pos; victim->GetPosition(&pos); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); } } @@ -127,27 +127,27 @@ public: if (uiSpawnTimer <= diff) { SpawnAdds(); - uiSpawnTimer = urand(35*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(35*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiRootTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); - uiRootTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; if (uiBashTimer <= diff) { DoCastVictim(SPELL_BASH); - uiBashTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBashTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBashTimer -= diff; if (uiBoltTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 3cfcd8b4f97..4ab8519ac4a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -97,7 +97,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); @@ -105,12 +105,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_SLAY_3,me); //SAY_SLAY_3 on death? + DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death? if (pInstance) { @@ -147,22 +147,22 @@ public: { DoCast(me, SPELL_SUMMON_SWARMERS, true); DoCast(me, SPELL_SUMMON_SWARMERS); - if (urand(1,3) == 3) // 33% chance of dialog - DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), me); + if (urand(1, 3) == 3) // 33% chance of dialog + DoScriptText(RAND(SAY_EGG_SAC_1, SAY_EGG_SAC_2), me); uiSwarmerSpawnTimer = 10*IN_MILLISECONDS; } else uiSwarmerSpawnTimer -= diff; if (!bGuardSpawned && uiGuardSpawnTimer <= diff) { - me->MonsterTextEmote(EMOTE_HATCHES,me->GetGUID(),true); + me->MonsterTextEmote(EMOTE_HATCHES, me->GetGUID(), true); DoCast(me, SPELL_SUMMON_SWARM_GUARD); bGuardSpawned = true; } else uiGuardSpawnTimer -= diff; if (uiEnragueTimer <= diff) { - if (me->HasAura(SPELL_ENRAGE,0)) + if (me->HasAura(SPELL_ENRAGE, 0)) return; float x, y, z, o; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 48f4ed1d980..da3eff81e6e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -67,7 +67,7 @@ public: struct boss_volazjAI : public ScriptedAI { - boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature),Summons(me) + boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) { pInstance = pCreature->GetInstanceScript(); } @@ -127,12 +127,12 @@ public: if (!plr || !plr->isAlive()) continue; // Summon clone - if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); // set phase - summon->SetPhaseMask((1<<(4+insanityHandled)),true); + summon->SetPhaseMask((1<<(4+insanityHandled)), true); } } ++insanityHandled; @@ -162,7 +162,7 @@ public: } // Visible for all players in insanity - me->SetPhaseMask((1|16|32|64|128|256),true); + me->SetPhaseMask((1|16|32|64|128|256), true); // Used for Insanity handling insanityHandled = 0; @@ -309,7 +309,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 5cea487eb81..68d1272750c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -94,7 +94,7 @@ public: void Reset() { - uiOpFerTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiCycloneTimer = 3*IN_MILLISECONDS; uiBoltTimer = 7*IN_MILLISECONDS; @@ -239,7 +239,7 @@ public: if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen(); bOnGround = false; - uiOpFerTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } void OpferRufen() @@ -295,7 +295,7 @@ public: if (uiCycloneTimer <= diff) { DoCast(me, SPELL_CYCLONE_STRIKE, false); - uiCycloneTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCycloneTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCycloneTimer -= diff; if (uiBoltTimer <= diff) @@ -303,7 +303,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; if (uiThunderTimer <= diff) @@ -311,7 +311,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); - uiThunderTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiThunderTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiThunderTimer -= diff; if (uiOpFerTimer <= diff) diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 053b3ff8b51..5bcddf61bbc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -22,9 +22,9 @@ enum Spells { SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, - SPELL_FLAME_SPHERE_SUMMON_1 = 55895,// 1x 30106 - H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511,// 1x 31686 - H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512,// 1x 31687 + SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 + H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 + H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512, // 1x 31687 SPELL_FLAME_SPHERE_SPAWN_EFFECT = 55891, SPELL_FLAME_SPHERE_VISUAL = 55928, SPELL_FLAME_SPHERE_PERIODIC = 55926, @@ -103,7 +103,7 @@ public: void Reset() { uiBloodthirstTimer = 10*IN_MILLISECONDS; - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); uiEmbraceTimer = 20*IN_MILLISECONDS; uiFlamesphereTimer = 5*IN_MILLISECONDS; uiEmbraceTakenDamage = 0; @@ -138,7 +138,7 @@ public: Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSphereTarget && pSpheres[0]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[0]->GetAngle(pSphereTarget); x = pSpheres[0]->GetPositionX() + DATA_SPHERE_DISTANCE * cos(angle); y = pSpheres[0]->GetPositionY() + DATA_SPHERE_DISTANCE * sin(angle); @@ -152,7 +152,7 @@ public: pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS); if (pSphereTarget && pSpheres[1] && pSpheres[2]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[1]->GetAngle(pSphereTarget) + DATA_SPHERE_ANGLE_OFFSET; x = pSpheres[1]->GetPositionX() + DATA_SPHERE_DISTANCE/2 * cos(angle); y = pSpheres[1]->GetPositionY() + DATA_SPHERE_DISTANCE/2 * sin(angle); @@ -224,7 +224,7 @@ public: //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) { - DoScriptText(RAND(SAY_VANISH_1,SAY_VANISH_2), me); + DoScriptText(RAND(SAY_VANISH_1, SAY_VANISH_2), me); DoCast(me, SPELL_VANISH); Phase = JUST_VANISHED; uiPhaseTimer = 500; @@ -232,7 +232,7 @@ public: uiEmbraceTarget = pEmbraceTarget->GetGUID(); } - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiVanishTimer -= diff; DoMeleeAttackIfReady(); @@ -278,7 +278,7 @@ public: uiPhaseTimer = 0; uiEmbraceTarget = 0; } - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } bool CheckSpheres() @@ -320,7 +320,7 @@ public: me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation()); uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); - pInstance->HandleGameObject(prison_GUID,true); + pInstance->HandleGameObject(prison_GUID, true); } }; @@ -398,8 +398,8 @@ public: switch(pGO->GetEntry()) { - case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT,IN_PROGRESS); break; - case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT,IN_PROGRESS); break; + case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; + case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; } CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index f693c7aad16..55346cd8197 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -112,7 +112,7 @@ public: switch(go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(0,true,go); break; + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { @@ -130,7 +130,7 @@ public: else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; } } @@ -167,7 +167,7 @@ public: } if (vInitiands.empty()) return 0; - uint8 j = urand(0,vInitiands.size() -1); + uint8 j = urand(0, vInitiands.size() -1); return vInitiands[j]; } case DATA_ADD_JEDOGA_OPFER: return JedogaSacrifices; @@ -183,7 +183,7 @@ public: case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: if (data == DONE) - HandleGameObject(Prince_TaldaramGate,true); + HandleGameObject(Prince_TaldaramGate, true); m_auiEncounter[1] = data; break; case DATA_JEDOGA_SHADOWSEEKER_EVENT: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 72fe60846b8..d21b57298cf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -104,7 +104,7 @@ public: { pInstance = pCreature->GetInstanceScript(); pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } InstanceScript* pInstance; @@ -152,7 +152,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -176,7 +176,7 @@ public: if (uiVenganceTimer <= uiDiff) { - DoCast(me,SPELL_VENGEANCE); + DoCast(me, SPELL_VENGEANCE); uiVenganceTimer = 10000; } else uiVenganceTimer -= uiDiff; @@ -211,7 +211,7 @@ public: MemoryGUID = 0; pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pCreature->RestoreFaction(); } @@ -232,9 +232,9 @@ public: { me->RemoveAllAuras(); - uiHolyFireTimer = urand(9000,12000); - uiHolySmiteTimer = urand(5000,7000); - uiRenewTimer = urand(2000,5000); + uiHolyFireTimer = urand(9000, 12000); + uiHolySmiteTimer = urand(5000, 7000); + uiRenewTimer = urand(2000, 5000); uiResetTimer = 7000; @@ -278,7 +278,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -290,12 +290,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_HOLY_FIRE); + DoCast(pTarget, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) uiHolyFireTimer = 13000; else - uiHolyFireTimer = urand(9000,12000); + uiHolyFireTimer = urand(9000, 12000); } else uiHolyFireTimer -= uiDiff; if (uiHolySmiteTimer <= uiDiff) @@ -303,12 +303,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SMITE); + DoCast(pTarget, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) uiHolySmiteTimer = 9000; else - uiHolySmiteTimer = urand(5000,7000); + uiHolySmiteTimer = urand(5000, 7000); } else uiHolySmiteTimer -= uiDiff; if (me->HasAura(SPELL_SHIELD)) @@ -316,11 +316,11 @@ public: if (uiRenewTimer <= uiDiff) { me->InterruptNonMeleeSpells(true); - uint8 uiTarget = urand(0,1); + uint8 uiTarget = urand(0, 1); switch(uiTarget) { case 0: - DoCast(me,SPELL_RENEW); + DoCast(me, SPELL_RENEW); break; case 1: if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) @@ -328,17 +328,17 @@ public: DoCast(pMemory, SPELL_RENEW); break; } - uiRenewTimer = urand(15000,17000); + uiRenewTimer = urand(15000, 17000); } else uiRenewTimer -= uiDiff; } if (!bHealth && !HealthAbovePct(25)) { me->InterruptNonMeleeSpells(true); - DoCastAOE(SPELL_HOLY_NOVA,false); + DoCastAOE(SPELL_HOLY_NOVA, false); DoCast(me, SPELL_SHIELD); - DoCastAOE(SPELL_SUMMON_MEMORY,false); - DoCastAOE(SPELL_CONFESS,false); + DoCastAOE(SPELL_SUMMON_MEMORY, false); + DoCastAOE(SPELL_CONFESS, false); bHealth = true; } @@ -385,7 +385,7 @@ public: if (uiOldWoundsTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_OLD_WOUNDS); @@ -401,10 +401,10 @@ public: if (uiShadowPastTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SHADOWS_PAST); + DoCast(pTarget, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; }else uiShadowPastTimer -= uiDiff; @@ -419,7 +419,7 @@ public: if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) { if (pSummoner && pSummoner->isAlive()) - CAST_CRE(pSummoner)->AI()->SetData(1,0); + CAST_CRE(pSummoner)->AI()->SetData(1, 0); } } } @@ -480,13 +480,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,712.14f,628.42f,411.88f); + AddWaypoint(0, 712.14f, 628.42f, 411.88f); break; case 1: - AddWaypoint(0,742.44f,650.29f,411.79f); + AddWaypoint(0, 742.44f, 650.29f, 411.79f); break; case 2: - AddWaypoint(0,783.33f,615.29f,411.84f); + AddWaypoint(0, 783.33f, 615.29f, 411.84f); break; } break; @@ -494,13 +494,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,713.12f,632.97f,411.90f); + AddWaypoint(0, 713.12f, 632.97f, 411.90f); break; case 1: - AddWaypoint(0,746.73f,650.24f,411.56f); + AddWaypoint(0, 746.73f, 650.24f, 411.56f); break; case 2: - AddWaypoint(0,781.32f,610.54f,411.82f); + AddWaypoint(0, 781.32f, 610.54f, 411.82f); break; } break; @@ -508,19 +508,19 @@ public: switch(uiType) { case 0: - AddWaypoint(0,715.06f,637.07f,411.91f); + AddWaypoint(0, 715.06f, 637.07f, 411.91f); break; case 1: - AddWaypoint(0,750.72f,650.20f,411.77f); + AddWaypoint(0, 750.72f, 650.20f, 411.77f); break; case 2: - AddWaypoint(0,779.77f,607.03f,411.81f); + AddWaypoint(0, 779.77f, 607.03f, 411.81f); break; } break; } - Start(false,true,0); + Start(false, true, 0); uiWaypoint = uiType; } @@ -537,7 +537,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); + pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 223fda6cde2..5157a602a21 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -118,16 +118,16 @@ public: uiPhase = PHASE_UNDEAD; - uiIcyTouchTimer = urand(5000,9000); - uiPlagueStrikeTimer = urand(10000,13000); - uiDeathRespiteTimer = urand(15000,16000); - uiObliterateTimer = urand(17000,19000); - uiDesecration = urand(15000,16000); + uiIcyTouchTimer = urand(5000, 9000); + uiPlagueStrikeTimer = urand(10000, 13000); + uiDeathRespiteTimer = urand(15000, 16000); + uiObliterateTimer = urand(17000, 19000); + uiDesecration = urand(15000, 16000); uiDeathArmyCheckTimer = 7000; uiResurrectTimer = 4000; uiGhoulExplodeTimer = 8000; - uiDeathBiteTimer = urand (2000,4000); - uiMarkedDeathTimer = urand (5000,7000); + uiDeathBiteTimer = urand (2000, 4000); + uiMarkedDeathTimer = urand (5000, 7000); } void RemoveSummons() @@ -161,7 +161,7 @@ public: if (uiResurrectTimer <= uiDiff) { me->SetFullHealth(); - DoCast(me,SPELL_BLACK_KNIGHT_RES,true); + DoCast(me, SPELL_BLACK_KNIGHT_RES, true); uiPhase++; uiResurrectTimer = 4000; bEventInProgress = false; @@ -177,17 +177,17 @@ public: if (uiIcyTouchTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiIcyTouchTimer = urand(5000,7000); + uiIcyTouchTimer = urand(5000, 7000); } else uiIcyTouchTimer -= uiDiff; if (uiPlagueStrikeTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiPlagueStrikeTimer = urand(12000,15000); + uiPlagueStrikeTimer = urand(12000, 15000); } else uiPlagueStrikeTimer -= uiDiff; if (uiObliterateTimer <= uiDiff) { DoCastVictim(SPELL_OBLITERATE); - uiObliterateTimer = urand(17000,19000); + uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; switch(uiPhase) { @@ -198,9 +198,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DEATH_RESPITE); + DoCast(pTarget, SPELL_DEATH_RESPITE); } - uiDeathRespiteTimer = urand(15000,16000); + uiDeathRespiteTimer = urand(15000, 16000); } else uiDeathRespiteTimer -= uiDiff; break; } @@ -226,9 +226,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DESECRATION); + DoCast(pTarget, SPELL_DESECRATION); } - uiDesecration = urand(15000,16000); + uiDesecration = urand(15000, 16000); } else uiDesecration -= uiDiff; if (uiGhoulExplodeTimer <= uiDiff) { @@ -253,7 +253,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_MARKED_DEATH); + DoCast(pTarget, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); } else uiMarkedDeathTimer -= uiDiff; @@ -289,7 +289,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); + pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); } }; @@ -349,7 +349,7 @@ public: { npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 /*i*/) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index d5254a0b706..e1e92b1cdd9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -81,14 +81,14 @@ enum eSeat /* struct Point { - float x,y,z; + float x, y, z; }; const Point MovementPoint[] = { - {746.84f,623.15f,411.41f}, - {747.96f,620.29f,411.09f}, - {750.23f,618.35f,411.09f} + {746.84f, 623.15f, 411.41f}, + {747.96f, 620.29f, 411.09f}, + {750.23f, 618.35f, 411.09f} }; */ void AggroAllPlayers(Creature* pTemp) @@ -107,7 +107,7 @@ void AggroAllPlayers(Creature* pTemp) if (pPlayer->isAlive()) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -171,7 +171,7 @@ public: { uiChargeTimer = 5000; uiShieldBreakerTimer = 8000; - uiBuffTimer = urand(30000,60000); + uiBuffTimer = urand(30000, 60000); } void SetData(uint32 uiType, uint32 /*uiData*/) @@ -179,28 +179,28 @@ public: switch(uiType) { case 1: - AddWaypoint(0,747.36f,634.07f,411.572f); - AddWaypoint(1,780.43f,607.15f,411.82f); - AddWaypoint(2,785.99f,599.41f,411.92f); - AddWaypoint(3,778.44f,601.64f,411.79f); + AddWaypoint(0, 747.36f, 634.07f, 411.572f); + AddWaypoint(1, 780.43f, 607.15f, 411.82f); + AddWaypoint(2, 785.99f, 599.41f, 411.92f); + AddWaypoint(3, 778.44f, 601.64f, 411.79f); uiWaypointPath = 1; break; case 2: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,768.72f,581.01f,411.92f); - AddWaypoint(2,763.55f,590.52f,411.71f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 768.72f, 581.01f, 411.92f); + AddWaypoint(2, 763.55f, 590.52f, 411.71f); uiWaypointPath = 2; break; case 3: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,784.02f,645.33f,412.39f); - AddWaypoint(2,775.67f,641.91f,411.91f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 784.02f, 645.33f, 412.39f); + AddWaypoint(2, 775.67f, 641.91f, 411.91f); uiWaypointPath = 3; break; } if (uiType <= 3) - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 i) @@ -226,7 +226,7 @@ public: void DoCastSpellShield() { for (uint8 i = 0; i < 3; ++i) - DoCast(me,SPELL_SHIELD,true); + DoCast(me, SPELL_SHIELD, true); } void UpdateAI(const uint32 uiDiff) @@ -241,7 +241,7 @@ public: if (!me->HasAura(SPELL_SHIELD)) DoCastSpellShield(); - uiBuffTimer = urand(30000,45000); + uiBuffTimer = urand(30000, 45000); }else uiBuffTimer -= uiDiff; if (uiChargeTimer <= uiDiff) @@ -252,10 +252,10 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,1.0f); + me->AddThreat(pPlayer, 1.0f); DoCast(pPlayer, SPELL_CHARGE); break; } @@ -279,9 +279,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,10.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 10.0f, 30.0f, false)) { - pPassenger->CastSpell(pPlayer,SPELL_SHIELD_BREAKER,true); + pPassenger->CastSpell(pPlayer, SPELL_SHIELD_BREAKER, true); break; } } @@ -320,7 +320,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -338,9 +338,9 @@ public: void Reset() { - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); uiInterceptTimer = 7000; - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } void JustReachedHome() @@ -363,11 +363,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); EnterEvadeMode(); bHome = true; @@ -393,11 +393,11 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,5.0f); - DoCast(pPlayer,SPELL_INTERCEPT); + me->AddThreat(pPlayer, 5.0f); + DoCast(pPlayer, SPELL_INTERCEPT); break; } } @@ -408,13 +408,13 @@ public: if (uiBladeStormTimer <= uiDiff) { DoCastVictim(SPELL_BLADESTORM); - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); } else uiBladeStormTimer -= uiDiff; if (uiMortalStrikeTimer <= uiDiff) { DoCastVictim(SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } else uiMortalStrikeTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -453,7 +453,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -497,11 +497,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -537,14 +537,14 @@ public: if (uiPolymorphTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; if (uiBlastWaveTimer <= uiDiff) { - DoCastAOE(SPELL_BLAST_WAVE,false); + DoCastAOE(SPELL_BLAST_WAVE, false); uiBlastWaveTimer = 13000; } else uiBlastWaveTimer -= uiDiff; @@ -552,7 +552,7 @@ public: { me->InterruptNonMeleeSpells(true); - DoCast(me,SPELL_HASTE); + DoCast(me, SPELL_HASTE); uiHasteTimer = 22000; } else uiHasteTimer -= uiDiff; @@ -592,7 +592,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -612,14 +612,14 @@ public: { uiChainLightningTimer = 16000; uiHealingWaveTimer = 12000; - uiEartShieldTimer = urand(30000,35000); - uiHexMendingTimer = urand(20000,25000); + uiEartShieldTimer = urand(30000, 35000); + uiHexMendingTimer = urand(20000, 25000); } void EnterCombat(Unit* pWho) { - DoCast(me,SPELL_EARTH_SHIELD); - DoCast(pWho,SPELL_HEX_OF_MENDING); + DoCast(me, SPELL_EARTH_SHIELD); + DoCast(pWho, SPELL_HEX_OF_MENDING); }; void JustReachedHome() @@ -642,11 +642,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -669,38 +669,38 @@ public: if (uiChainLightningTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; } else uiChainLightningTimer -= uiDiff; if (uiHealingWaveTimer <= uiDiff) { - bool bChance = urand(0,1); + bool bChance = urand(0, 1); if (!bChance) { if (Unit* pFriend = DoSelectLowestHpFriendly(40)) - DoCast(pFriend,SPELL_HEALING_WAVE); + DoCast(pFriend, SPELL_HEALING_WAVE); } else - DoCast(me,SPELL_HEALING_WAVE); + DoCast(me, SPELL_HEALING_WAVE); uiHealingWaveTimer = 12000; } else uiHealingWaveTimer -= uiDiff; if (uiEartShieldTimer <= uiDiff) { - DoCast(me,SPELL_EARTH_SHIELD); + DoCast(me, SPELL_EARTH_SHIELD); - uiEartShieldTimer = urand(30000,35000); + uiEartShieldTimer = urand(30000, 35000); } else uiEartShieldTimer -= uiDiff; if (uiHexMendingTimer <= uiDiff) { - DoCastVictim(SPELL_HEX_OF_MENDING,true); + DoCastVictim(SPELL_HEX_OF_MENDING, true); - uiHexMendingTimer = urand(20000,25000); + uiHexMendingTimer = urand(20000, 25000); } else uiHexMendingTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -739,7 +739,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -788,11 +788,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -815,13 +815,13 @@ public: if (uiLightningArrowsTimer <= uiDiff) { - DoCastAOE(SPELL_LIGHTNING_ARROWS,false); + DoCastAOE(SPELL_LIGHTNING_ARROWS, false); uiLightningArrowsTimer = 7000; } else uiLightningArrowsTimer -= uiDiff; if (uiShootTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f)) { uiTargetGUID = pTarget->GetGUID(); DoCast(pTarget, SPELL_SHOOT); @@ -836,9 +836,9 @@ public: me->InterruptNonMeleeSpells(true); Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); - if (pTarget && me->IsInRange(pTarget,5.0f,30.0f,false)) + if (pTarget && me->IsInRange(pTarget, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); } else { Map::PlayerList const& players = me->GetMap()->GetPlayers(); @@ -847,9 +847,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,5.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); break; } } @@ -894,7 +894,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -935,11 +935,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -962,20 +962,20 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_EVISCERATE); + DoCast(me->getVictim(), SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; if (uiFanKivesTimer <= uiDiff) { - DoCastAOE(SPELL_FAN_OF_KNIVES,false); + DoCastAOE(SPELL_FAN_OF_KNIVES, false); uiFanKivesTimer = 14000; } else uiFanKivesTimer -= uiDiff; if (uiPosionBottleTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_POISON_BOTTLE); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_POISON_BOTTLE); uiPosionBottleTimer = 19000; } else uiPosionBottleTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 8ed67493825..29f5fcbfffd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -136,7 +136,7 @@ public: case NPC_JAEREN: uiAnnouncerGUID = creature->GetGUID(); if (TeamInInstance == ALLIANCE) - creature->UpdateEntry(NPC_ARELAS,ALLIANCE); + creature->UpdateEntry(NPC_ARELAS, ALLIANCE); break; case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_BATTLEWORG: @@ -172,7 +172,7 @@ public: if (uiMovementDone == 3) { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - pAnnouncer->AI()->SetData(DATA_IN_POSITION,0); + pAnnouncer->AI()->SetData(DATA_IN_POSITION, 0); } break; case BOSS_GRAND_CHAMPIONS: @@ -189,9 +189,9 @@ public: { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } } } @@ -202,8 +202,8 @@ public: { if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) { - pBoss->GetMotionMaster()->MovePoint(0,746.88f,618.74f,411.06f); - pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pBoss->GetMotionMaster()->MovePoint(0, 746.88f, 618.74f, 411.06f); + pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pBoss->SetReactState(REACT_AGGRESSIVE); } } @@ -212,18 +212,18 @@ public: m_auiEncounter[1] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; case BOSS_ARGENT_CHALLENGE_P: m_auiEncounter[2] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index bf4d8f2ef4f..44dd6efe712 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -39,7 +39,7 @@ EndContentData */ ## npc_announcer_toc5 ######*/ -const Position SpawnPosition = {746.261f,657.401f,411.681f,4.65f}; +const Position SpawnPosition = {746.261f, 657.401f, 411.681f, 4.65f}; class npc_announcer_toc5 : public CreatureScript { @@ -74,7 +74,7 @@ public: Champion3List.clear(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetGrandChampionsForEncounter(); @@ -106,7 +106,7 @@ public: std::list<uint64> Champion2List; std::list<uint64> Champion3List; - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + void NextStep(uint32 uiTimerStep, bool bNextStep = true, uint8 uiPhaseStep = 0) { uiTimer = uiTimerStep; if (bNextStep) @@ -121,13 +121,13 @@ public: { case DATA_START: DoSummonGrandChampion(uiFirstBoss); - NextStep(10000,false,1); + NextStep(10000, false, 1); break; case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) - pInstance->HandleGameObject(pGO->GetGUID(),false); - NextStep(10000,false,3); + pInstance->HandleGameObject(pGO->GetGUID(), false); + NextStep(10000, false, 3); break; case DATA_LESSER_CHAMPIONS_DEFEATED: { @@ -213,7 +213,7 @@ public: return; } - if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1,SpawnPosition)) + if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { switch(uiSummonTimes) { @@ -227,10 +227,10 @@ public: uiGrandChampionBoss1 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1,uiVehicle1GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_1,uiGrandChampionBoss1); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1); } - pBoss->AI()->SetData(1,0); + pBoss->AI()->SetData(1, 0); break; } case 2: @@ -243,10 +243,10 @@ public: uiGrandChampionBoss2 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2,uiVehicle2GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_2,uiGrandChampionBoss2); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2); } - pBoss->AI()->SetData(2,0); + pBoss->AI()->SetData(2, 0); break; } case 3: @@ -259,10 +259,10 @@ public: uiGrandChampionBoss3 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3,uiVehicle3GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_3,uiGrandChampionBoss3); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3); } - pBoss->AI()->SetData(3,0); + pBoss->AI()->SetData(3, 0); break; } default: @@ -271,7 +271,7 @@ public: for (uint8 i = 0; i < 3; ++i) { - if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2,SpawnPosition,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { switch(uiSummonTimes) { @@ -289,13 +289,13 @@ public: switch(i) { case 0: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); break; case 1: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2); break; case 2: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2 + M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2 + M_PI); break; } } @@ -306,36 +306,36 @@ public: void DoStartArgentChampionEncounter() { - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); - if (me->SummonCreature(uiArgentChampion,SpawnPosition)) + if (me->SummonCreature(uiArgentChampion, SpawnPosition)) { for (uint8 i = 0; i < 3; ++i) { - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS,SpawnPosition)) - pTrash->AI()->SetData(i,0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS, SpawnPosition)) + pTrash->AI()->SetData(i, 0); } } } void SetGrandChampionsForEncounter() { - uiFirstBoss = urand(0,4); + uiFirstBoss = urand(0, 4); while (uiSecondBoss == uiFirstBoss || uiThirdBoss == uiFirstBoss || uiThirdBoss == uiSecondBoss) { - uiSecondBoss = urand(0,4); - uiThirdBoss = urand(0,4); + uiSecondBoss = urand(0, 4); + uiThirdBoss = urand(0, 4); } } void SetArgentChampion() { - uint8 uiTempBoss = urand(0,1); + uint8 uiTempBoss = urand(0, 1); switch(uiTempBoss) { @@ -360,7 +360,7 @@ public: if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) { if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) - me->AI()->SetData(DATA_START,0); + me->AI()->SetData(DATA_START, 0); if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) DoStartArgentChampionEncounter(); @@ -369,7 +369,7 @@ public: if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0); + me->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0); } } @@ -389,8 +389,8 @@ public: if (pPlayer->isAlive()) { - pTemp->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -410,11 +410,11 @@ public: { case 1: DoSummonGrandChampion(uiSecondBoss); - NextStep(10000,true); + NextStep(10000, true); break; case 2: DoSummonGrandChampion(uiThirdBoss); - NextStep(0,false); + NextStep(0, false); break; case 3: if (!Champion1List.empty()) @@ -422,7 +422,7 @@ public: for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*me, *itr)) AggroAllPlayers(pSummon); - NextStep(0,false); + NextStep(0, false); } break; } @@ -436,7 +436,7 @@ public: { if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { - pSummon->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pSummon->SetReactState(REACT_PASSIVE); } } @@ -455,7 +455,7 @@ public: case VEHICLE_ORGRIMMAR_WOLF: case VEHICLE_SILVERMOON_HAWKSTRIDER: case VEHICLE_DARKSPEAR_RAPTOR: - me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED,0); + me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED, 0); break; } } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 26ab0cc31c7..55d93f6997d 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -71,22 +71,22 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,NOT_STARTED); + pInstance->SetData(DATA_DRED_EVENT, NOT_STARTED); pInstance->SetData(DATA_KING_DRED_ACHIEV, 0); } uiBellowingRoarTimer = 33*IN_MILLISECONDS; uiGrievousBiteTimer = 20*IN_MILLISECONDS; uiManglingSlashTimer = 18500; - uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiPiercingSlashTimer = 17*IN_MILLISECONDS; - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } void EnterCombat(Unit* /*who*/) { if (pInstance) - pInstance->SetData(DATA_DRED_EVENT,IN_PROGRESS); + pInstance->SetData(DATA_DRED_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -103,38 +103,38 @@ public: if (uiGrievousBiteTimer < diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE ,false); + DoCastVictim(SPELL_GRIEVOUS_BITE , false); uiGrievousBiteTimer = 20*IN_MILLISECONDS; } else uiGrievousBiteTimer -=diff; if (uiManglingSlashTimer < diff) { - DoCastVictim(SPELL_MANGLING_SLASH,false); + DoCastVictim(SPELL_MANGLING_SLASH, false); uiManglingSlashTimer = 20*IN_MILLISECONDS; } else uiManglingSlashTimer -=diff; if (uiFearsomeRoarTimer < diff) { - DoCastAOE(SPELL_FEARSOME_ROAR,false); - uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS,18*IN_MILLISECONDS); + DoCastAOE(SPELL_FEARSOME_ROAR, false); + uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiFearsomeRoarTimer -=diff; if (uiPiercingSlashTimer < diff) { - DoCastVictim(SPELL_PIERCING_SLASH,false); + DoCastVictim(SPELL_PIERCING_SLASH, false); uiPiercingSlashTimer = 20*IN_MILLISECONDS; } else uiPiercingSlashTimer -=diff; if (uiRaptorCallTimer < diff) { - DoCastVictim(SPELL_RAPTOR_CALL,false); + DoCastVictim(SPELL_RAPTOR_CALL, false); - float x,y,z; + float x, y, z; - me->GetClosePoint(x,y,z,me->GetObjectSize()/3,10.0f); - me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILLISECONDS); + me->GetClosePoint(x, y, z, me->GetObjectSize()/3, 10.0f); + me->SummonCreature(RAND(NPC_RAPTOR_1, NPC_RAPTOR_2), x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 1*IN_MILLISECONDS); - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiRaptorCallTimer -=diff; DoMeleeAttackIfReady(); @@ -144,7 +144,7 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,DONE); + pInstance->SetData(DATA_DRED_EVENT, DONE); if (IsHeroic() && pInstance->GetData(DATA_KING_DRED_ACHIEV) == 6) pInstance->DoCompleteAchievement(ACHIEV_BETTER_OFF_DRED); @@ -176,7 +176,7 @@ public: void Reset() { - GutRipTimer = urand(10000,15000); + GutRipTimer = urand(10000, 15000); } void UpdateAI(const uint32 diff) @@ -187,8 +187,8 @@ public: if (GutRipTimer < diff) { - DoCastVictim(SPELL_GUT_RIP,false); - GutRipTimer = urand(10000,15000); + DoCastVictim(SPELL_GUT_RIP, false); + GutRipTimer = urand(10000, 15000); }else GutRipTimer -=diff; DoMeleeAttackIfReady(); @@ -230,7 +230,7 @@ public: void Reset() { - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -241,8 +241,8 @@ public: if (uiRendTimer < diff) { - DoCastVictim(SPELL_REND,false); - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + DoCastVictim(SPELL_REND, false); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); }else uiRendTimer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 87b4a080cb8..45ce90ffa4a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -148,7 +148,7 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); @@ -159,9 +159,9 @@ public: if (uiCrystalHandlerTimer <= diff) { DoScriptText(SAY_NECRO_ADD, me); - Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); - uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCrystalHandlerTimer -= diff; } break; @@ -169,9 +169,9 @@ public: if (uiTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST,SPELL_BLIZZARD,SPELL_FROSTBOLT,SPELL_WRATH_OF_MISERY), - RAND(H_SPELL_ARCANE_BLAST,H_SPELL_BLIZZARD,H_SPELL_FROSTBOLT,H_SPELL_WRATH_OF_MISERY))); - uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); + DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), + RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); + uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); } else uiTimer -= diff; break; default: @@ -268,7 +268,7 @@ public: void JustDied(Unit* /*killer*/) { if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) - CAST_AI(boss_novos::boss_novosAI,pNovos->AI())->RemoveCrystal(); + CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->RemoveCrystal(); } void UpdateAI(const uint32 diff) @@ -278,7 +278,7 @@ public: if (uiFlashOfDarknessTimer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS,H_SPELL_FLASH_OF_DARKNESS)); + DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS, H_SPELL_FLASH_OF_DARKNESS)); uiFlashOfDarknessTimer = 5*IN_MILLISECONDS; } else uiFlashOfDarknessTimer -= diff; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 11ebbb6199b..0f3725dce21 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -92,8 +92,8 @@ public: { uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); Phase = SKELETAL; me->SetDisplayId(me->GetNativeDisplayId()); if (pInstance) @@ -121,19 +121,19 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSE_OF_LIFE); - uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCurseOfLifeTimer -= diff; if (uiShadowVolleyTimer < diff) { DoCastVictim(SPELL_SHADOW_VOLLEY); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else uiShadowVolleyTimer -= diff; if (uiRainOfFireTimer < diff) { DoCastAOE(SPELL_RAIN_OF_FIRE); - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiRainOfFireTimer -= diff; if (uiPhaseTimer < diff) @@ -148,7 +148,7 @@ public: case GOING_FLESH: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_FLESH_1,SAY_FLESH_2),me); + DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); me->SetDisplayId(MODEL_FLESH); std::list<Unit *> playerList; @@ -156,13 +156,13 @@ public: for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { Unit *pTemp = (*itr); - me->AddAura(SPELL_GIFT_OF_THARON_JA,pTemp); + me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); pTemp->SetDisplayId(MODEL_SKELETON); } uiPhaseTimer = 20*IN_MILLISECONDS; - uiLightningBreathTimer = urand(3*IN_MILLISECONDS,4*IN_MILLISECONDS); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,8*IN_MILLISECONDS); - uiPoisonCloudTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(3*IN_MILLISECONDS, 4*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 8*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); Phase = FLESH; } else uiPhaseTimer -= diff; break; @@ -171,20 +171,20 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BREATH); - uiLightningBreathTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_EYE_BEAM); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,6*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 6*IN_MILLISECONDS); } else uiEyeBeamTimer -= diff; if (uiPoisonCloudTimer < diff) { DoCastAOE(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(10*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(10*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiPoisonCloudTimer -= diff; if (uiPhaseTimer < diff) @@ -198,13 +198,13 @@ public: case GOING_SKELETAL: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_SKELETON_1,SAY_SKELETON_2), me); + DoScriptText(RAND(SAY_SKELETON_1, SAY_SKELETON_2), me); me->DeMorph(); Phase = SKELETAL; uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); std::list<Unit *> playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); @@ -222,12 +222,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2),me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index eb2fc36d3c9..7c605d6d6ca 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -83,16 +83,16 @@ public: { uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; - uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS); - uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiCrushTimer = urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(60*IN_MILLISECONDS, 10*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); bAchiev = IsHeroic(); lSummons.DespawnAll(); - me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); @@ -114,10 +114,10 @@ public: if (uiSpawnTimer <= diff) { - uint32 spawnNumber = urand(2,DUNGEON_MODE(3,5)); + uint32 spawnNumber = urand(2, DUNGEON_MODE(3, 5)); for (uint8 i = 0; i < spawnNumber; ++i) - DoSummon(RAND(NPC_DRAKKARI_INVADER_1,NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + DoSummon(RAND(NPC_DRAKKARI_INVADER_1, NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiConsumeTimer <= diff) @@ -129,7 +129,7 @@ public: if (bAchiev) { - Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pConsumeAura && pConsumeAura->GetStackAmount() > 9) bAchiev = false; } @@ -137,20 +137,20 @@ public: if (uiCrushTimer <= diff) { DoCastVictim(SPELL_CRUSH); - uiCrushTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCrushTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCrushTimer -= diff; if (uiInfectedWoundTimer <= diff) { DoCastVictim(SPELL_INFECTED_WOUND); - uiInfectedWoundTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiInfectedWoundTimer -= diff; if (uiExplodeCorpseTimer <= diff) { DoCast(SPELL_CORPSE_EXPLODE); DoScriptText(SAY_EXPLODE, me); - uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); + uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); } else uiExplodeCorpseTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index fb992f0ca8a..8be1d4b7538 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -211,7 +211,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2,data3; + uint16 data0, data1, data2, data3; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 00c674907db..63c8cbe85b2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -61,7 +61,7 @@ enum Spells SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual SPELL_WAILING_SOULS = 68873, // the actual spell H_SPELL_WAILING_SOULS = 70324, -// 68871,68873,68875,68876,68899,68912,70324, +// 68871, 68873, 68875, 68876, 68899, 68912, 70324, // 68899 trigger 68871 }; @@ -288,7 +288,7 @@ class boss_devourer_of_souls : public CreatureScript case EVENT_WAILING_SOULS: me->SetDisplayId(DISPLAY_DESIRE); - DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me); + DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL, SAY_FACE_DESIRE_WAILING_SOUL), me); DoScriptText(EMOTE_WAILING_SOUL, me); DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -332,7 +332,7 @@ class boss_devourer_of_souls : public CreatureScript me->SetDisplayId(DISPLAY_ANGER); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); me->GetMotionMaster()->MoveChase(me->getVictim()); - events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); + events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000)); } break; } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index d0e1794be95..28d9e406e92 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -79,7 +79,7 @@ public: events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. } void JustDied(Unit* /*killer*/) @@ -92,7 +92,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -122,7 +122,7 @@ public: break; case EVENT_DEFILING_HORROR: DoCast(SPELL_DEFILING_HORROR); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. break; } @@ -131,7 +131,7 @@ public: || (uiHopelessnessCount < 3 && HealthBelowPct(10))) { uiHopelessnessCount++; - DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS,H_SPELL_HOPELESSNESS)); + DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS, H_SPELL_HOPELESSNESS)); } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index c8c512e8d98..6574846831e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -89,7 +89,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -114,7 +114,7 @@ public: events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); break; case EVENT_CORRUPTED_FLESH: - DoScriptText(RAND(SAY_CORRUPTED_FLESH_1,SAY_CORRUPTED_FLESH_2), me); + DoScriptText(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2), me); DoCast(SPELL_CORRUPTED_FLESH); events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 0cc1633ce58..a6307f3c796 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -683,7 +683,7 @@ public: return; case EVENT_DARK_MENDING: // find an ally with missing HP - if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000,50000))) + if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { DoCast(pTarget, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 373ad249f9b..b82ac92bd9f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -44,56 +44,56 @@ enum Events static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = { - {5277.74f,2016.88f,707.778f,5.96903f}, - {5295.88f,2040.34f,707.778f,5.07891f}, - {5320.37f,1980.13f,707.778f,2.00713f}, - {5280.51f,1997.84f,707.778f,0.296706f}, - {5302.45f,2042.22f,707.778f,4.90438f}, - {5306.57f,1977.47f,707.778f,1.50098f}, + {5277.74f, 2016.88f, 707.778f, 5.96903f}, + {5295.88f, 2040.34f, 707.778f, 5.07891f}, + {5320.37f, 1980.13f, 707.778f, 2.00713f}, + {5280.51f, 1997.84f, 707.778f, 0.296706f}, + {5302.45f, 2042.22f, 707.778f, 4.90438f}, + {5306.57f, 1977.47f, 707.778f, 1.50098f}, }; static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = { - {5312.75f,2037.12f,707.778f,4.59022f}, - {5309.58f,2042.67f,707.778f,4.69494f}, - {5275.08f,2008.72f,707.778f,6.21337f}, - {5279.65f,2004.66f,707.778f,0.069813f}, - {5275.48f,2001.14f,707.778f,0.174533f}, - {5316.7f,2041.55f,707.778f,4.50295f}, + {5312.75f, 2037.12f, 707.778f, 4.59022f}, + {5309.58f, 2042.67f, 707.778f, 4.69494f}, + {5275.08f, 2008.72f, 707.778f, 6.21337f}, + {5279.65f, 2004.66f, 707.778f, 0.069813f}, + {5275.48f, 2001.14f, 707.778f, 0.174533f}, + {5316.7f, 2041.55f, 707.778f, 4.50295f}, }; static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = { - {5302.25f,1972.41f,707.778f,1.37881f}, - {5311.03f,1972.23f,707.778f,1.64061f}, - {5277.36f,1993.23f,707.778f,0.401426f}, - {5318.7f,2036.11f,707.778f,4.2237f}, - {5335.72f,1996.86f,707.778f,2.74017f}, - {5299.43f,1979.01f,707.778f,1.23918f}, + {5302.25f, 1972.41f, 707.778f, 1.37881f}, + {5311.03f, 1972.23f, 707.778f, 1.64061f}, + {5277.36f, 1993.23f, 707.778f, 0.401426f}, + {5318.7f, 2036.11f, 707.778f, 4.2237f}, + {5335.72f, 1996.86f, 707.778f, 2.74017f}, + {5299.43f, 1979.01f, 707.778f, 1.23918f}, }; static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = { - {5306.06f,2037,707.778f,4.81711f}, - {5344.15f,2007.17f,707.778f,3.15905f}, - {5337.83f,2010.06f,707.778f,3.22886f}, - {5343.29f,1999.38f,707.778f,2.9147f}, - {5340.84f,1992.46f,707.778f,2.75762f}, - {5325.07f,1977.6f,707.778f,2.07694f}, - {5336.6f,2017.28f,707.778f,3.47321f}, - {5313.82f,1978.15f,707.778f,1.74533f}, - {5280.63f,2012.16f,707.778f,6.05629f}, - {5322.96f,2040.29f,707.778f,4.34587f}, + {5306.06f, 2037, 707.778f, 4.81711f}, + {5344.15f, 2007.17f, 707.778f, 3.15905f}, + {5337.83f, 2010.06f, 707.778f, 3.22886f}, + {5343.29f, 1999.38f, 707.778f, 2.9147f}, + {5340.84f, 1992.46f, 707.778f, 2.75762f}, + {5325.07f, 1977.6f, 707.778f, 2.07694f}, + {5336.6f, 2017.28f, 707.778f, 3.47321f}, + {5313.82f, 1978.15f, 707.778f, 1.74533f}, + {5280.63f, 2012.16f, 707.778f, 6.05629f}, + {5322.96f, 2040.29f, 707.778f, 4.34587f}, }; static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = { - {5343.47f,2015.95f,707.778f,3.49066f}, - {5337.86f,2003.4f,707.778f,2.98451f}, - {5319.16f,1974,707.778f,1.91986f}, - {5299.25f,2036,707.778f,5.02655f}, - {5295.64f,1973.76f,707.778f,1.18682f}, - {5282.9f,2019.6f,707.778f,5.88176f}, + {5343.47f, 2015.95f, 707.778f, 3.49066f}, + {5337.86f, 2003.4f, 707.778f, 2.98451f}, + {5319.16f, 1974, 707.778f, 1.91986f}, + {5299.25f, 2036, 707.778f, 5.02655f}, + {5295.64f, 1973.76f, 707.778f, 1.18682f}, + {5282.9f, 2019.6f, 707.778f, 5.88176f}, }; class instance_halls_of_reflection : public InstanceMapScript @@ -184,22 +184,22 @@ public: { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, false, go); break; case GO_FROSTMOURNE_ALTAR: uiFrostmourneAltar = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_FRONT_DOOR: uiFrontDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_ARTHAS_DOOR: uiArthasDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); if (uiEncounter[1] == DONE) HandleGameObject(0, true, go); @@ -384,19 +384,19 @@ public: // TODO: do composition at random. # of spawn also depends on uiWaveCount // As of now, it is just one of each. - index = urand(0,ENCOUNTER_WAVE_MERCENARY-1); + index = urand(0, ENCOUNTER_WAVE_MERCENARY-1); pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_FOOTMAN-1); + index = urand(0, ENCOUNTER_WAVE_FOOTMAN-1); pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_RIFLEMAN-1); + index = urand(0, ENCOUNTER_WAVE_RIFLEMAN-1); pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_PRIEST-1); + index = urand(0, ENCOUNTER_WAVE_PRIEST-1); pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_MAGE-1); + index = urand(0, ENCOUNTER_WAVE_MAGE-1); pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 403feb7cf3e..a906fe03d12 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -97,12 +97,12 @@ class boss_drakkari_colossus : public CreatureScript if (GetData(DATA_INTRO_DONE)) { me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); } //events.Reset(); -> done in _Reset(); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000,30000)); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000, 30000)); phase = COLOSSUS_PHASE_NORMAL; @@ -149,8 +149,8 @@ class boss_drakkari_colossus : public CreatureScript me->GetMotionMaster()->MoveIdle(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); - DoCast(me,SPELL_FREEZE_ANIM); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + DoCast(me, SPELL_FREEZE_ANIM); break; case ACTION_UNFREEZE_COLOSSUS: @@ -158,13 +158,13 @@ class boss_drakkari_colossus : public CreatureScript return; me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); me->SetInCombatWithZone(); if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim(), 0,0); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); break; } @@ -172,7 +172,7 @@ class boss_drakkari_colossus : public CreatureScript void DamageTaken(Unit* /*attacker*/, uint32& damage) { - if (me->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE)) + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) damage = 0; if (phase == COLOSSUS_PHASE_NORMAL || @@ -220,8 +220,8 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(),SPELL_MIGHTY_BLOW); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000,15000)); + DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } } @@ -258,16 +258,16 @@ class boss_drakkari_elemental : public CreatureScript { boss_drakkari_elementalAI(Creature* creature) : ScriptedAI(creature) { - DoCast(me,SPELL_ELEMENTAL_SPAWN_EFFECT); + DoCast(me, SPELL_ELEMENTAL_SPAWN_EFFECT); instance = creature->GetInstanceScript(); } void Reset() { events.Reset(); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); - me->AddAura(SPELL_MOJO_VOLLEY,me); + me->AddAura(SPELL_MOJO_VOLLEY, me); } void JustDied(Unit* killer) @@ -299,8 +299,8 @@ class boss_drakkari_elemental : public CreatureScript case EVENT_SURGE: DoCast(SPELL_SURGE_VISUAL); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) - DoCast(target,SPELL_SURGE); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + DoCast(target, SPELL_SURGE); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); break; } } @@ -318,7 +318,7 @@ class boss_drakkari_elemental : public CreatureScript { if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS))) // what if the elemental is more than 80 yards from drakkari colossus ? - DoCast(colossus,SPELL_MERGE,true); + DoCast(colossus, SPELL_MERGE, true); } break; } @@ -345,7 +345,7 @@ class boss_drakkari_elemental : public CreatureScript if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) return; - me->GetMotionMaster()->MovePoint(0,colossus->GetPositionX(),colossus->GetPositionY(),colossus->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, colossus->GetPositionX(), colossus->GetPositionY(), colossus->GetPositionZ()); return; }*/ DoAction(ACTION_RETURN_TO_COLOSSUS); @@ -408,13 +408,13 @@ public: void MoveMojos(Creature* boss) { std::list<Creature*> mojosList; - boss->GetCreatureListWithEntryInGrid(mojosList,me->GetEntry(),12.0f); + boss->GetCreatureListWithEntryInGrid(mojosList, me->GetEntry(), 12.0f); if (!mojosList.empty()) { for (std::list<Creature*>::const_iterator itr = mojosList.begin(); itr != mojosList.end(); ++itr) { if (Creature* mojo = *itr) - mojo->GetMotionMaster()->MovePoint(1,boss->GetHomePosition().GetPositionX(),boss->GetHomePosition().GetPositionY(),boss->GetHomePosition().GetPositionZ()); + mojo->GetMotionMaster()->MovePoint(1, boss->GetHomePosition().GetPositionX(), boss->GetHomePosition().GetPositionY(), boss->GetHomePosition().GetPositionZ()); } } } @@ -430,7 +430,7 @@ public: { colossus->AI()->DoAction(ACTION_UNFREEZE_COLOSSUS); if (!colossus->AI()->GetData(DATA_INTRO_DONE)) - colossus->AI()->SetData(DATA_INTRO_DONE,true); + colossus->AI()->SetData(DATA_INTRO_DONE, true); colossus->SetInCombatWithZone(); me->DespawnOrUnsummon(); } @@ -451,7 +451,7 @@ public: Position colossusHomePosition; colossus->GetHomePosition().GetPosition(&colossusHomePosition); - float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ()); + float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(), colossusHomePosition.GetPositionY(), colossusHomePosition.GetPositionZ()); if (distance < 12.0f) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 64a32fbfcec..d0825f79af0 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -57,7 +57,7 @@ public: void Reset() { - uiBerserkTimer = urand(60*IN_MILLISECONDS,90*IN_MILLISECONDS); //60-90 secs according to wowwiki + uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki uiBiteTimer = 5*IN_MILLISECONDS; uiSpitTimer = 10*IN_MILLISECONDS; uiSpringTimer = 8*IN_MILLISECONDS; @@ -83,22 +83,22 @@ public: if (uiBiteTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_BITE); - uiBiteTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_SPIT); - uiSpitTimer = urand(6*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; if (uiSpringTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); - uiSpringTimer = urand(5*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiSpringTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } } else uiSpringTimer -= diff; @@ -156,7 +156,7 @@ public: { if (pInstance) { - pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID()); + pInstance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID()); if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0) me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index d5f6bcf5a4b..968be40223b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -172,7 +172,7 @@ public: if (uiStampedeTimer <= diff) { DoCast(me, SPELL_STAMPEDE); - DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me); + DoScriptText(RAND(SAY_SUMMON_RHINO_1, SAY_SUMMON_RHINO_2, SAY_SUMMON_RHINO_3), me); uiStampedeTimer = 15*IN_MILLISECONDS; } else uiStampedeTimer -= diff; @@ -277,7 +277,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index e39151551a7..d02a906b79b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -164,7 +164,7 @@ public: if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index e6498c889ac..2d1a6b4a5ea 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -145,23 +145,23 @@ public: { if (uiPhase == 1) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); if (uiPhase == 2) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); uiSpawnTimer = 5*IN_MILLISECONDS; } else uiSpawnTimer -= diff; } if (uiPhase == 0 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON_SNAKES,me); + DoScriptText(SAY_SUMMON_SNAKES, me); uiPhase = 1; } if (uiPhase == 1 && HealthBelowPct(25)) { - DoScriptText(SAY_SUMMON_CONSTRICTORS,me); + DoScriptText(SAY_SUMMON_CONSTRICTORS, me); uiPhase = 2; } @@ -178,12 +178,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); lSummons.Summon(summoned); } }; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index e25f9b900a4..a0fdb4cce7b 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -159,11 +159,11 @@ public: case 192518: uiSladRanAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiSladRanStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -174,11 +174,11 @@ public: case 192519: uiMoorabiAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiMoorabiStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -189,11 +189,11 @@ public: case 192520: uiDrakkariColossusAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiDrakkariColossusStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -220,21 +220,21 @@ public: case 192632: uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192569: uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); case 193208: uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193209: uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193188: uiBridge = go->GetGUID(); @@ -261,7 +261,7 @@ public: { GameObject* go = instance->GetGameObject(uiSladRanAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_MOORABI_EVENT: @@ -270,9 +270,9 @@ public: { GameObject* go = instance->GetGameObject(uiMoorabiAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (bHeroicMode) - HandleGameObject(uiEckTheFerociousDoor,true); + HandleGameObject(uiEckTheFerociousDoor, true); } break; case DATA_DRAKKARI_COLOSSUS_EVENT: @@ -281,21 +281,21 @@ public: { GameObject* go = instance->GetGameObject(uiDrakkariColossusAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_GAL_DARAH_EVENT: m_auiEncounter[3] = data; if (data == DONE) { - HandleGameObject(uiGalDarahDoor1,true); - HandleGameObject(uiGalDarahDoor2,true); + HandleGameObject(uiGalDarahDoor1, true); + HandleGameObject(uiGalDarahDoor2, true); } break; case DATA_ECK_THE_FEROCIOUS_EVENT: m_auiEncounter[4] = data; if (bHeroicMode && data == DONE) - HandleGameObject(uiEckTheFerociousDoorBehind,true); + HandleGameObject(uiEckTheFerociousDoorBehind, true); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 101ecf10adb..3a5b289acb0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -619,7 +619,7 @@ class boss_prince_taldaram_icc : public CreatureScript DoZoneInCombat(controller); events.ScheduleEvent(EVENT_BERSERK, 600000); - events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000,15000)); + events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000, 15000)); events.ScheduleEvent(EVENT_CONJURE_FLAME, 20000); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index b38448d9f19..05f620db168 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -78,9 +78,9 @@ static const uint32 vampireAuras[3][MAX_DIFFICULTY] = {70877, 71474, 70877, 71474}, }; -#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867,71473,71532,71533) -#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879,71525,71530,71531) -#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877,71474,70877,71474) +#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867, 71473, 71532, 71533) +#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879, 71525, 71530, 71531) +#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877, 71474, 70877, 71474) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 66d3755ec6f..3f73184248a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -114,7 +114,7 @@ enum Spells }; // Helper to get id of the aura on different modes (HasAura(baseId) wont work) -#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385,72441,72442,72443) +#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385, 72441, 72442, 72443) enum Events { @@ -710,7 +710,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript float x, y, z; deathbringer->GetClosePoint(x, y, z, deathbringer->GetObjectSize()); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(POINT_CORPSE ,x, y, z); + me->GetMotionMaster()->MovePoint(POINT_CORPSE , x, y, z); } break; case EVENT_OUTRO_HORDE_5: // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 3a0de0d7fc4..e7dfe62184e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -53,8 +53,8 @@ enum Spells }; // Used for HasAura checks -#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195,71219,73031,73032) -#define INOCULATED_HELPER RAID_MODE<uint32>(69291,72101,72102,72103) +#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195, 71219, 73031, 73032) +#define INOCULATED_HELPER RAID_MODE<uint32>(69291, 72101, 72102, 72103) static const uint32 gaseousBlight[3] = {69157, 69162, 69164}; static const uint32 gaseousBlightVisual[3] = {69126, 69152, 69154}; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 6b5ab146e4b..f7b9fdf350e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -176,9 +176,9 @@ enum DeprogrammingData POINT_DESPAWN = 384721, }; -#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10,NPC_DARNAVAN_25,NPC_DARNAVAN_10,NPC_DARNAVAN_25) -#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25,NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25) -#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25,QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25) +#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10, NPC_DARNAVAN_25, NPC_DARNAVAN_10, NPC_DARNAVAN_25) +#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25, NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25) +#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25, QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25) static const uint32 addEntries[2] = {NPC_CULT_FANATIC, NPC_CULT_ADHERENT}; @@ -521,7 +521,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3]); _SummonAdd(addEntries[addIndex], addSpawnPos[addIndexOther*3+1]); _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3+2]); - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); } ++addWaveCounter; } @@ -537,7 +537,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndex], addSpawnPos[addIndex*3+2]); } else - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); ++addWaveCounter; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index ef6e78f13d2..7ef59bb9565 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -101,7 +101,7 @@ enum Spells SPELL_MUTATED_TRANSFORMATION_NAME = 72401, }; -#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672,72455,72832,72833) +#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672, 72455, 72832, 72833) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 809c6cecbf7..e506e5300fc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -61,7 +61,7 @@ enum Spells SPELL_DECIMATE = 71123, }; -#define MUTATED_INFECTION RAID_MODE<int32>(69674,71224,73022,73023) +#define MUTATED_INFECTION RAID_MODE<int32>(69674, 71224, 73022, 73023) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 922957cd106..5708771d83c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -34,7 +34,7 @@ enum Texts SAY_KILL = 8, // Perish! // A flaw of mortality... SAY_BERSERK = 9, // Enough! I tire of these games! - SAY_DEATH = 10,// Free...at last... + SAY_DEATH = 10, // Free...at last... }; enum Spells diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 5b8d0e66206..999676d736d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -18,8 +18,8 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_GREET RAND(-1533000,-1533004,-1533005,-1533006,-1533007) -#define SAY_AGGRO RAND(-1533001,-1533002,-1533003) +#define SAY_GREET RAND(-1533000, -1533004, -1533005, -1533006, -1533007) +#define SAY_AGGRO RAND(-1533001, -1533002, -1533003) #define SAY_SLAY -1533008 #define MOB_CRYPT_GUARD 16573 @@ -116,7 +116,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 600000); if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) - events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000,20000)); + events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } void MoveInLineOfSight(Unit *who) @@ -154,14 +154,14 @@ public: case EVENT_IMPALE: //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm - if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25))) + if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25))) if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10,SPELL_IMPALE_25)); - events.ScheduleEvent(EVENT_IMPALE, urand(10000,20000)); + DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); + events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; case EVENT_LOCUST: // TODO : Add Text - DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25)); + DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25)); DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_LOCUST, 90000); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 7a1c1863937..629fc42dcd6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -78,10 +78,10 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4), me); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); } void Reset() @@ -104,7 +104,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%3)) - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -113,7 +113,7 @@ public: DoScriptText(SAY_DEATH, me); if (instance && bAchievement) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10,ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10, ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); } void UpdateAI(const uint32 diff) @@ -137,23 +137,23 @@ public: switch(eventId) { case EVENT_POISON: - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) - DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY,H_SPELL_POISON_BOLT_VOLLEY)); - events.ScheduleEvent(EVENT_POISON, urand(8000,15000)); + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) + DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY, H_SPELL_POISON_BOLT_VOLLEY)); + events.ScheduleEvent(EVENT_POISON, urand(8000, 15000)); break; case EVENT_FIRE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); break; case EVENT_FRENZY: // TODO : Add Text - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) DoCast(me, RAID_MODE(SPELL_FRENZY, H_SPELL_FRENZY)); else doDelayFrenzy = true; - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); break; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 91f15bcf6ba..fe0e94c76e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -56,26 +56,26 @@ const Position WaypointPositions[12] = const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; const uint32 SPELL_MARK[] = {28832, 28833, 28834, 28835}; -#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i],SPELL_PRIMARY_H[i]) +#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i], SPELL_PRIMARY_H[i]) const uint32 SPELL_PRIMARY_N[] = {28884, 28863, 28882, 28883}; const uint32 SPELL_PRIMARY_H[] = {57467, 57463, 57369, 57466}; -#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i],SPELL_SECONDARY_H[i]) +#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i], SPELL_SECONDARY_H[i]) const uint32 SPELL_SECONDARY_N[]= {0, 57374, 0, 57376}; const uint32 SPELL_SECONDARY_H[]= {0, 57464, 0, 57465}; const uint32 SPELL_PUNISH[] = {0, 57381, 0, 57377}; #define SPELL_BERSERK 26662 -// used by 16063,16064,16065,30549, but signed for 16063 +// used by 16063, 16064, 16065, 30549, but signed for 16063 const int32 SAY_AGGRO[] = {-1533051, -1533044, -1533065, -1533058}; const int32 SAY_TAUNT[3][4] ={ {-1533052, -1533045, -1533071, -1533059}, {-1533053, -1533046, -1533072, -1533060}, - {-1533054, -1533047, -1533073, -1533061},}; + {-1533054, -1533047, -1533073, -1533061}, }; const int32 SAY_SPECIAL[] = {-1533055, -1533048, -1533070, -1533062}; const int32 SAY_SLAY[] = {-1533056, -1533049, -1533068, -1533063}; const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; -#define SAY_BARON_AGGRO RAND(-1533065,-1533066,-1533067) -#define SAY_BARON_SLAY RAND(-1533068,-1533069) +#define SAY_BARON_AGGRO RAND(-1533065, -1533066, -1533067) +#define SAY_BARON_SLAY RAND(-1533068, -1533069) class boss_four_horsemen : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 505938f1be9..dccce84818b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,8 +19,8 @@ #include "naxxramas.h" #define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371,54427) -#define SPELL_DECIMATE RAID_MODE(28374,54426) +#define SPELL_ENRAGE RAID_MODE(28371, 54427) +#define SPELL_DECIMATE RAID_MODE(28374, 54426) #define SPELL_BERSERK 26662 #define SPELL_INFECTED_WOUND 29306 @@ -123,7 +123,7 @@ public: break; case EVENT_SUMMON: for (int32 i = 0; i < RAID_MODE(1, 2); ++i) - DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1,3)]); + DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]); events.ScheduleEvent(EVENT_SUMMON, 10000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bf37f218adc..1d5e3192c61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -427,11 +427,11 @@ public: } if (waves[waveCount].mode == 1) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 2) && (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 0) && (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else events.ScheduleEvent(EVENT_SUMMON, 0); @@ -447,7 +447,7 @@ public: summons.DoAction(0, 0); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_BOLT, 1000); - events.ScheduleEvent(EVENT_HARVEST, urand(3000,15000)); + events.ScheduleEvent(EVENT_HARVEST, urand(3000, 15000)); events.ScheduleEvent(EVENT_TELEPORT, 20000); } break; @@ -457,7 +457,7 @@ public: break; case EVENT_HARVEST: DoCast(me->getVictim(), SPELL_HARVEST_SOUL, true); - events.ScheduleEvent(EVENT_HARVEST, urand(20000,25000)); + events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: if (!thirtyPercentReached) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index cb4e4b9f782..098b22e30ac 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -22,7 +22,7 @@ #define SPELL_POISON_CLOUD 28240 #define SPELL_MUTATING_INJECTION 28169 -#define SPELL_SLIME_SPRAY RAID_MODE(28157,54364) +#define SPELL_SLIME_SPRAY RAID_MODE(28157, 54364) #define SPELL_BERSERK 26662 #define SPELL_POISON_CLOUD_ADD 59116 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 27d9f9757a6..5bf864d8ed3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -18,13 +18,13 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533109,-1533110,-1533111) +#define SAY_AGGRO RAND(-1533109, -1533110, -1533111) #define SAY_SLAY -1533112 -#define SAY_TAUNT RAND(-1533113,-1533114,-1533115,-1533116,-1533117) +#define SAY_TAUNT RAND(-1533113, -1533114, -1533115, -1533116, -1533117) #define SAY_DEATH -1533118 #define SPELL_SPELL_DISRUPTION 29310 -#define SPELL_DECREPIT_FEVER RAID_MODE(29998,55011) +#define SPELL_DECREPIT_FEVER RAID_MODE(29998, 55011) #define SPELL_PLAGUE_CLOUD 29350 enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9d034723299..fff19b5cbb4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -325,7 +325,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -389,13 +389,13 @@ public: switch(eventId) { case EVENT_WASTE: - DoSummon(NPC_WASTE, Pos[RAND(0,3,6,9)]); - events.RepeatEvent(urand(2000,5000)); + DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); + events.RepeatEvent(urand(2000, 5000)); break; case EVENT_ABOMIN: if (nAbomination < 8) { - DoSummon(NPC_ABOMINATION, Pos[RAND(1,4,7,10)]); + DoSummon(NPC_ABOMINATION, Pos[RAND(1, 4, 7, 10)]); nAbomination++; events.RepeatEvent(20000); } @@ -405,7 +405,7 @@ public: case EVENT_WEAVER: if (nWeaver < 8) { - DoSummon(NPC_WEAVER, Pos[RAND(0,3,6,9)]); + DoSummon(NPC_WEAVER, Pos[RAND(0, 3, 6, 9)]); nWeaver++; events.RepeatEvent(25000); } @@ -419,19 +419,19 @@ public: break; case EVENT_PHASE: events.Reset(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); spawns.DespawnAll(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); DoStartMovement(me->getVictim()); - events.ScheduleEvent(EVENT_BOLT, urand(5000,10000)); + events.ScheduleEvent(EVENT_BOLT, urand(5000, 10000)); events.ScheduleEvent(EVENT_NOVA, 15000); - events.ScheduleEvent(EVENT_DETONATE, urand(30000,40000)); - events.ScheduleEvent(EVENT_FISSURE, urand(10000,30000)); - events.ScheduleEvent(EVENT_BLAST, urand(60000,120000)); + events.ScheduleEvent(EVENT_DETONATE, urand(30000, 40000)); + events.ScheduleEvent(EVENT_FISSURE, urand(10000, 30000)); + events.ScheduleEvent(EVENT_BLAST, urand(60000, 120000)); if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL) - events.ScheduleEvent(EVENT_CHAIN, urand(30000,60000)); + events.ScheduleEvent(EVENT_CHAIN, urand(30000, 60000)); Phase = 2; break; default: @@ -463,12 +463,12 @@ public: } } } - else if (nGuardiansOfIcecrownCount < RAID_MODE(2,4)) + else if (nGuardiansOfIcecrownCount < RAID_MODE(2, 4)) { if (uiGuardiansOfIcecrownTimer <= diff) { // TODO : Add missing text - if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2,5,8,11)])) + if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2, 5, 8, 11)])) pGuardian->SetFloatValue(UNIT_FIELD_COMBATREACH, 2); ++nGuardiansOfIcecrownCount; uiGuardiansOfIcecrownTimer = 5000; @@ -484,16 +484,16 @@ public: switch(eventId) { case EVENT_BOLT: - DoCastVictim(RAID_MODE(SPELL_FROST_BOLT,H_SPELL_FROST_BOLT)); - events.RepeatEvent(urand(5000,10000)); + DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); + events.RepeatEvent(urand(5000, 10000)); break; case EVENT_NOVA: - DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE,H_SPELL_FROST_BOLT_AOE)); - events.RepeatEvent(urand(15000,30000)); + DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE, H_SPELL_FROST_BOLT_AOE)); + events.RepeatEvent(urand(15000, 30000)); break; case EVENT_CHAIN: { - uint32 count = urand(1,3); + uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); @@ -507,8 +507,8 @@ public: } } if (!chained.empty()) - DoScriptText(RAND(SAY_CHAIN_1,SAY_CHAIN_2), me); - events.RepeatEvent(urand(100000,180000)); + DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me); + events.RepeatEvent(urand(100000, 180000)); break; } case EVENT_CHAINED_SPELL: @@ -533,7 +533,7 @@ public: switch(player->getClass()) { case CLASS_DRUID: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_MOONFIRE, false); else player->CastSpell(me, SPELL_LIFEBLOOM, false); @@ -551,19 +551,19 @@ public: player->CastSpell(pTarget, RAND(SPELL_BLADESTORM, SPELL_CLEAVE), false); break; case CLASS_PALADIN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_HAMMER_OF_JUSTICE, false); else player->CastSpell(me, SPELL_HOLY_SHOCK, false); break; case CLASS_PRIEST: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_VAMPIRIC_TOUCH, false); else player->CastSpell(me, SPELL_RENEW, false); break; case CLASS_SHAMAN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_EARTH_SHOCK, false); else player->CastSpell(me, SPELL_HEALING_WAVE, false); @@ -572,7 +572,7 @@ public: player->CastSpell(pTarget, RAND(SPELL_HEMORRHAGE, SPELL_MUTILATE), false); break; case CLASS_DEATH_KNIGHT: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_PLAGUE_STRIKE, true); else player->CastSpell(pTarget, SPELL_HOWLING_BLAST, true); @@ -607,23 +607,23 @@ public: std::vector<Unit*>::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); - DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2,SAY_SPECIAL_3), me); + DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me); } - events.RepeatEvent(urand(20000,50000)); + events.RepeatEvent(urand(20000, 50000)); break; } case EVENT_FISSURE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISURE); - events.RepeatEvent(urand(10000,45000)); + events.RepeatEvent(urand(10000, 45000)); break; case EVENT_BLAST: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1,0), 0, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); - events.RepeatEvent(urand(30000,90000)); + events.RepeatEvent(urand(30000, 90000)); break; default: events.PopEvent(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 292d3f16d2b..63a7d69baa8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -76,11 +76,11 @@ public: case EVENT_BLOOM: // TODO : Add missing text DoCastAOE(SPELL_SUMMON_SPORE, true); - DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM,H_SPELL_DEATHBLOOM)); + DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM, H_SPELL_DEATHBLOOM)); events.ScheduleEvent(EVENT_BLOOM, 30000); break; case EVENT_DOOM: - DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM,H_SPELL_INEVITABLE_DOOM)); + DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM, H_SPELL_INEVITABLE_DOOM)); events.ScheduleEvent(EVENT_DOOM, events.GetTimer() < 5*60000 ? 30000 : 15000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f47b806e865..50ee49203d5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -78,8 +78,8 @@ public: enraged = false; events.ScheduleEvent(EVENT_WRAP, 20000); events.ScheduleEvent(EVENT_SPRAY, 40000); - events.ScheduleEvent(EVENT_SHOCK, urand(5000,10000)); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); + events.ScheduleEvent(EVENT_SHOCK, urand(5000, 10000)); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); events.ScheduleEvent(EVENT_SUMMON, 30000); } @@ -102,11 +102,11 @@ public: { case EVENT_WRAP: // TODO : Add missing text - for (uint8 i = 0; i < RAID_MODE(1,2); ++i) + for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { - pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; pTarget->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); if (Creature *wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) @@ -116,24 +116,24 @@ public: events.ScheduleEvent(EVENT_WRAP, 40000); break; case EVENT_SPRAY: - DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); events.ScheduleEvent(EVENT_SPRAY, 40000); break; case EVENT_SHOCK: - DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10,SPELL_POISON_SHOCK_25)); - events.ScheduleEvent(EVENT_SHOCK, urand(10000,20000)); + DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10, SPELL_POISON_SHOCK_25)); + events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10,SPELL_NECROTIC_POISON_25)); + DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: - DoCast(me, RAID_MODE(SPELL_FRENZY_10,SPELL_FRENZY_25), true); + DoCast(me, RAID_MODE(SPELL_FRENZY_10, SPELL_FRENZY_25), true); events.ScheduleEvent(EVENT_FRENZY, 600000); break; case EVENT_SUMMON: // TODO : Add missing text - uint8 amount = urand(8,10); + uint8 amount = urand(8, 10); for (uint8 i = 0; i < amount; ++i) DoSummon(MOB_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_SUMMON, 40000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 1cd130556e9..80174a610ee 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -18,16 +18,16 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533075,-1533076,-1533077) +#define SAY_AGGRO RAND(-1533075, -1533076, -1533077) #define SAY_SUMMON -1533078 -#define SAY_SLAY RAND(-1533079,-1533080) +#define SAY_SLAY RAND(-1533079, -1533080) #define SAY_DEATH -1533081 #define SOUND_DEATH 8848 -#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213,54835) -#define SPELL_BLINK RAND(29208,29209,29210,29211) -#define SPELL_CRIPPLE RAID_MODE(29212,54814) +#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213, 54835) +#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) +#define SPELL_CRIPPLE RAID_MODE(29212, 54814) #define SPELL_TELEPORT 29216 #define MOB_WARRIOR 16984 @@ -157,7 +157,7 @@ public: return; case EVENT_WARRIOR: DoScriptText(SAY_SUMMON, me); - SummonUndead(MOB_WARRIOR, RAID_MODE(2,3)); + SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; case EVENT_BLINK: @@ -180,12 +180,12 @@ public: DoScriptText(SAY_SUMMON, me); switch(balconyCount) { - case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2,4)); break; - case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1,2)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(1,2)); break; - case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2,4)); break; - default:SummonUndead(MOB_CHAMPION, RAID_MODE(5,10)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(5,10));break; + case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; + case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(1, 2)); break; + case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2, 4)); break; + default:SummonUndead(MOB_CHAMPION, RAID_MODE(5, 10)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break; } ++waveCount; events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, 30000 + rand()%15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 42afc0e57a0..e2fe4135996 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -90,7 +90,7 @@ public: { _EnterCombat(); Enraged = false; - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); events.ScheduleEvent(EVENT_HATEFUL, 1200); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -129,7 +129,7 @@ public: if (!pMostHPTarget) pMostHPTarget = me->getVictim(); - DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE,H_SPELL_HATEFUL_STRIKE), true); + DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE, H_SPELL_HATEFUL_STRIKE), true); events.ScheduleEvent(EVENT_HATEFUL, 1200); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 479fda3c875..7056eb0ea33 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -32,14 +32,14 @@ //8860 death - An honorable... death... //8947 - Aggro Mixed? - ? -#define SOUND_AGGRO RAND(8852,8853,8854) -#define SOUND_SLAY RAND(8861,8863) -#define SOUND_COMMND RAND(8855,8856,8858,8859,8861) +#define SOUND_AGGRO RAND(8852, 8853, 8854) +#define SOUND_SLAY RAND(8861, 8863) +#define SOUND_COMMND RAND(8855, 8856, 8858, 8859, 8861) #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 #define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107,55543) +#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) #define SPELL_JAGGED_KNIFE 55550 #define SPELL_HOPELESS 29125 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 0ce6f5e0829..9bd06669d5c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -21,11 +21,11 @@ #define EMOTE_BREATH -1533082 #define EMOTE_ENRAGE -1533083 -#define SPELL_FROST_AURA RAID_MODE(28531,55799) +#define SPELL_FROST_AURA RAID_MODE(28531, 55799) #define SPELL_CLEAVE 19983 -#define SPELL_TAIL_SWEEP RAID_MODE(55697,55696) +#define SPELL_TAIL_SWEEP RAID_MODE(55697, 55696) #define SPELL_SUMMON_BLIZZARD 28560 -#define SPELL_LIFE_DRAIN RAID_MODE(28542,55665) +#define SPELL_LIFE_DRAIN RAID_MODE(28542, 55665) #define SPELL_ICEBOLT 28522 #define SPELL_FROST_BREATH 29318 #define SPELL_FROST_EXPLOSION 28524 @@ -33,7 +33,7 @@ #define SPELL_BERSERK 26662 #define SPELL_DIES 29357 -#define SPELL_CHILL RAID_MODE(28547,55699) +#define SPELL_CHILL RAID_MODE(28547, 55699) #define MOB_BLIZZARD 16474 #define GO_ICEBLOCK 181247 @@ -265,9 +265,9 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000,30000), TEMPSUMMON_TIMED_DESPAWN)) + if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) pSummon->GetMotionMaster()->MoveRandom(40); - events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000,7000), 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; } case EVENT_FLIGHT: @@ -295,7 +295,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_ICEBOLT, 1500); - iceboltCount = RAID_MODE(2,3); + iceboltCount = RAID_MODE(2, 3); return; case EVENT_ICEBOLT: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 9aabf5b315c..c61f5bddc7d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -183,9 +183,9 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); events.ScheduleEvent(EVENT_SHIFT, 30000); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); events.ScheduleEvent(EVENT_BERSERK, 360000); } @@ -237,7 +237,7 @@ public: return; case EVENT_CHAIN: DoCast(me->getVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); @@ -282,7 +282,7 @@ public: if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); - powerSurgeTimer = urand(20000,25000); + powerSurgeTimer = urand(20000, 25000); magneticPullTimer = 20000; } @@ -331,7 +331,7 @@ public: if (powerSurgeTimer <= uiDiff) { DoCast(me, RAID_MODE(SPELL_POWERSURGE, H_SPELL_POWERSURGE)); - powerSurgeTimer = urand(15000,20000); + powerSurgeTimer = urand(15000, 20000); } else powerSurgeTimer -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index ee13dc23c43..c49ac5b67bf 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,8 +20,8 @@ const DoorData doorData[] = { - {181126, BOSS_ANUBREKHAN,DOOR_TYPE_ROOM, BOUNDARY_S}, - {181195, BOSS_ANUBREKHAN,DOOR_TYPE_PASSAGE, 0}, + {181126, BOSS_ANUBREKHAN, DOOR_TYPE_ROOM, BOUNDARY_S}, + {181195, BOSS_ANUBREKHAN, DOOR_TYPE_PASSAGE, 0}, {194022, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_MAEXXNA, DOOR_TYPE_ROOM, BOUNDARY_SW}, @@ -56,7 +56,7 @@ const MinionData minionData[] = {16064, BOSS_HORSEMEN}, {16065, BOSS_HORSEMEN}, {30549, BOSS_HORSEMEN}, - {0, 0,} + {0, 0, } }; enum eEnums diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index c2a9afc3788..3111361a46e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -153,24 +153,24 @@ enum MalygosSays // Sniffed data const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { - {782.9821f,1296.652f,282.1114f}, - {779.5459f,1287.228f,282.1393f}, - {773.0028f,1279.52f,282.4164f}, - {764.3626f,1274.476f,282.4731f}, - {754.3961f,1272.639f,282.4171f}, - {744.4422f,1274.412f,282.222f}, - {735.575f,1279.742f,281.9674f}, - {729.2788f,1287.187f,281.9943f}, - {726.1191f,1296.688f,282.2997f}, - {725.9396f,1306.531f,282.2448f}, - {729.3045f,1316.122f,281.9108f}, - {735.8322f,1323.633f,282.1887f}, - {744.4616f,1328.999f,281.9948f}, - {754.4739f,1330.666f,282.049f}, - {764.074f,1329.053f,281.9949f}, - {772.8409f,1323.951f,282.077f}, - {779.5085f,1316.412f,281.9145f}, - {782.8365f,1306.778f,282.3035f}, + {782.9821f, 1296.652f, 282.1114f}, + {779.5459f, 1287.228f, 282.1393f}, + {773.0028f, 1279.52f, 282.4164f}, + {764.3626f, 1274.476f, 282.4731f}, + {754.3961f, 1272.639f, 282.4171f}, + {744.4422f, 1274.412f, 282.222f}, + {735.575f, 1279.742f, 281.9674f}, + {729.2788f, 1287.187f, 281.9943f}, + {726.1191f, 1296.688f, 282.2997f}, + {725.9396f, 1306.531f, 282.2448f}, + {729.3045f, 1316.122f, 281.9108f}, + {735.8322f, 1323.633f, 282.1887f}, + {744.4616f, 1328.999f, 281.9948f}, + {754.4739f, 1330.666f, 282.049f}, + {764.074f, 1329.053f, 281.9949f}, + {772.8409f, 1323.951f, 282.077f}, + {779.5085f, 1316.412f, 281.9145f}, + {782.8365f, 1306.778f, 282.3035f}, }; #define GROUND_Z 268 @@ -179,22 +179,22 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { - {812.7299f,1391.672f,283.2763f}, - {848.2912f,1358.61f,283.2763f}, - {853.9227f,1307.911f,283.2763f}, - {847.1437f,1265.538f,283.2763f}, - {839.9229f,1245.245f,283.2763f}, - {827.3463f,1221.818f,283.2763f}, - {803.2727f,1203.851f,283.2763f}, - {772.9372f,1197.981f,283.2763f}, - {732.1138f,1200.647f,283.2763f}, - {693.8761f,1217.995f,283.2763f}, - {664.5038f,1256.539f,283.2763f}, - {650.1497f,1303.485f,283.2763f}, - {662.9109f,1350.291f,283.2763f}, - {677.6391f,1377.607f,283.2763f}, - {704.8198f,1401.162f,283.2763f}, - {755.2642f,1417.1f,283.2763f}, + {812.7299f, 1391.672f, 283.2763f}, + {848.2912f, 1358.61f, 283.2763f}, + {853.9227f, 1307.911f, 283.2763f}, + {847.1437f, 1265.538f, 283.2763f}, + {839.9229f, 1245.245f, 283.2763f}, + {827.3463f, 1221.818f, 283.2763f}, + {803.2727f, 1203.851f, 283.2763f}, + {772.9372f, 1197.981f, 283.2763f}, + {732.1138f, 1200.647f, 283.2763f}, + {693.8761f, 1217.995f, 283.2763f}, + {664.5038f, 1256.539f, 283.2763f}, + {650.1497f, 1303.485f, 283.2763f}, + {662.9109f, 1350.291f, 283.2763f}, + {677.6391f, 1377.607f, 283.2763f}, + {704.8198f, 1401.162f, 283.2763f}, + {755.2642f, 1417.1f, 283.2763f}, }; #define MAX_SUMMONS_PHASE_TWO 4 @@ -202,7 +202,7 @@ const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = #define MAX_MALYGOS_POS 2 const Position MalygosPositions[MAX_MALYGOS_POS] = { - {754.544f,1301.71f,320.0f}, + {754.544f, 1301.71f, 320.0f}, {754.39f, 1301.27f, 292.91f} }; @@ -232,14 +232,14 @@ public: bersekerTimer = 0; currentPos = 0; - SetPhase(PHASE_ONE,true); + SetPhase(PHASE_ONE, true); delayedMovementTimer = 8000; delayedMovement = false; summonDeaths = 0; - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); cannotMove = true; } @@ -293,7 +293,7 @@ public: if (!instance) return; - SetPhase(PHASE_THREE,true); + SetPhase(PHASE_THREE, true); // this despawns Hover Disks summons.DespawnAll(); @@ -308,16 +308,16 @@ public: continue; // The rest is handled in the AI of the vehicle. - target->CastSpell(target,SPELL_SUMMOM_RED_DRAGON,true); + target->CastSpell(target, SPELL_SUMMOM_RED_DRAGON, true); } } - if (GameObject* go = GameObject::GetGameObject(*me,instance->GetData64(DATA_PLATFORM))) + if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_PLATFORM))) go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); // In sniffs it has this flag, but i don't know how is applied. // pos sniffed me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } void SetPhaseEvents(uint8 _phase) @@ -325,23 +325,23 @@ public: switch (_phase) { case PHASE_ONE: - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(15,20)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_VORTEX,urand(30,40)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(15, 20)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_VORTEX, urand(30, 40)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, _phase); break; case PHASE_TWO: - events.ScheduleEvent(EVENT_YELL_0,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_1,24*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(2,5)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_0, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_1, 24*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(2, 5)*IN_MILLISECONDS, 0, _phase); break; case PHASE_THREE: - events.ScheduleEvent(EVENT_YELL_2,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_3,8*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_YELL_4,16*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_2, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_3, 8*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_YELL_4, 16*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, _phase); break; default: break; @@ -353,7 +353,7 @@ public: _EnterCombat(); me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(SAY_AGGRO_P_ONE); @@ -409,17 +409,17 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_VORTEX,MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_VORTEX, MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); // continues in MovementInform function. } void ExecuteVortex() { - DoCast(me,SPELL_VORTEX_1,true); - DoCast(me,SPELL_VORTEX_2,true); + DoCast(me, SPELL_VORTEX_1, true); + DoCast(me, SPELL_VORTEX_2, true); // the vortex execution continues in the dummy effect of this spell (see its script) - DoCast(me,SPELL_VORTEX_3,true); + DoCast(me, SPELL_VORTEX_3, true); } void MovementInform(uint32 type, uint32 id) @@ -436,7 +436,7 @@ public: case MOVE_DEEP_BREATH_ROTATION: currentPos = currentPos == MALYGOS_MAX_WAYPOINTS - 1 ? 0 : currentPos+1; me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); break; case MOVE_INIT_PHASE_ONE: me->SetInCombatWithZone(); @@ -451,24 +451,24 @@ public: void StartPhaseTwo() { - SetPhase(PHASE_TWO,true); + SetPhase(PHASE_TWO, true); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[0]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[0]); - Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); + Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_2); - summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[0]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_1); for (uint8 i = 0; i < 2; i++) { // not sure about its position. - summon = me->SummonCreature(NPC_HOVER_DISK_MELEE,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_MELEE, HoverDiskWaypoints[0]); if (summon) summon->SetInCombatWithZone(); } @@ -496,7 +496,7 @@ public: if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE) { me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } } } @@ -506,7 +506,7 @@ public: { if (delayedMovementTimer <= diff) { - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); delayedMovementTimer = 8000; delayedMovement = false; } delayedMovementTimer -= diff; @@ -544,38 +544,38 @@ public: Talk(SAY_AGGRO_P_TWO); break; case EVENT_ARCANE_BREATH: - DoCast(me->getVictim(),SPELL_ARCANE_BREATH); - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(35,60)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_BREATH); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(35, 60)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_ARCANE_STORM: - DoCast(me->getVictim(),SPELL_ARCANE_STORM); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_STORM); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_VORTEX: PrepareForVortex(); - events.ScheduleEvent(EVENT_VORTEX,urand(60,80)*IN_MILLISECONDS,0,PHASE_ONE); + events.ScheduleEvent(EVENT_VORTEX, urand(60, 80)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_POWER_SPARKS: - instance->SetData(DATA_POWER_SPARKS_HANDLING,0); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,PHASE_ONE); + instance->SetData(DATA_POWER_SPARKS_HANDLING, 0); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_SURGE_POWER: me->GetMotionMaster()->MoveIdle(); delayedMovement = true; DoCast(SPELL_SURGE_POWER); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SUMMON_ARCANE: DoCast(SPELL_SUMMON_ARCANE_BOMB); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(12,15)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(12, 15)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SURGE_POWER_PHASE_3: - DoCast(GetTargetPhaseThree(),SPELL_SURGE_POWER_PHASE_3); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_SURGE_POWER_PHASE_3); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, PHASE_THREE); break; case EVENT_STATIC_FIELD: - DoCast(GetTargetPhaseThree(),SPELL_STATIC_FIELD); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_STATIC_FIELD); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, PHASE_THREE); break; default: break; @@ -587,7 +587,7 @@ public: Unit* GetTargetPhaseThree() { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); // we are a drake if (target->GetVehicleKit()) @@ -643,7 +643,7 @@ public: // each player will enter to the trigger vehicle (entry 30090) already spawned (each one can hold up to 5 players, it has 5 seats) // the players enter to the vehicles casting SPELL_VORTEX_4 OR SPELL_VORTEX_5 if (InstanceScript* instance = caster->GetInstanceScript()) - instance->SetData(DATA_VORTEX_HANDLING,0); + instance->SetData(DATA_VORTEX_HANDLING, 0); // the rest of the vortex execution continues when SPELL_VORTEX_2 is removed. } @@ -735,23 +735,23 @@ public: void Reset() { - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } void UpdateAI(const uint32 diff) { if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) && !me->HasAura(SPELL_PORTAL_OPENED)) - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { me->RemoveAura(SPELL_PORTAL_OPENED); - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); } } } @@ -762,7 +762,7 @@ public: if (summonTimer <= diff) { DoCast(SPELL_SUMMON_POWER_PARK); - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } else summonTimer -= diff; } @@ -808,8 +808,8 @@ public: if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -818,7 +818,7 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { @@ -833,7 +833,7 @@ public: } if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -842,7 +842,7 @@ public: if (damage > me->GetMaxHealth()) { damage = 0; - DoCast(me,SPELL_POWER_SPARK_DEATH,true); + DoCast(me, SPELL_POWER_SPARK_DEATH, true); me->DespawnOrUnsummon(1000); } } @@ -893,11 +893,11 @@ public: // This will only be called if the passenger dies if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - malygos->AI()->SetData(DATA_SUMMON_DEATHS,malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); } - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } me->GetMotionMaster()->MoveIdle(); @@ -906,8 +906,8 @@ public: { // Hack: Fall ground function can fail (remember the platform is a gameobject), we will teleport the disk to the ground if (me->GetPositionZ() > GROUND_Z) - me->NearTeleportTo(me->GetPositionX(),me->GetPositionY(),GROUND_Z,0); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), GROUND_Z, 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); me->setFaction(FACTION_FRIENDLY); me->AI()->EnterEvadeMode(); } @@ -928,14 +928,14 @@ public: { case ACTION_HOVER_DISK_START_WP_1: for (uint8 i = 0; i < MAX_HOVER_DISK_WAYPOINTS; i++) - AddWaypoint(i,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(i, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); break; case ACTION_HOVER_DISK_START_WP_2: { uint8 count = 0; for (uint8 i = MAX_HOVER_DISK_WAYPOINTS-1; i > 0; i--) { - AddWaypoint(count,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(count, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); count++; } break; @@ -944,7 +944,7 @@ public: return; } - Start(true,false,0,0,false,true); + Start(true, false, 0, 0, false, true); } void UpdateEscortAI(const uint32 /*diff*/) @@ -985,7 +985,7 @@ public: void Reset() { - DoCast(me,SPELL_ARCANE_OVERLOAD,false); + DoCast(me, SPELL_ARCANE_OVERLOAD, false); } void UpdateAI(const uint32 diff) @@ -1023,12 +1023,12 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { - summoner->CastSpell(me,SPELL_RIDE_RED_DRAGON,true); - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + summoner->CastSpell(me, SPELL_RIDE_RED_DRAGON, true); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { float victim_threat = malygos->getThreatManager().getThreat(summoner); malygos->getThreatManager().resetAllAggro(); @@ -1084,7 +1084,7 @@ public: { events.Reset(); - events.ScheduleEvent(EVENT_YELL_1,0); + events.ScheduleEvent(EVENT_YELL_1, 0); } void UpdateAI(const uint32 diff) @@ -1095,15 +1095,15 @@ public: { case EVENT_YELL_1: Talk(SAY_ONE); - events.ScheduleEvent(EVENT_YELL_2,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_2, 4*IN_MILLISECONDS); break; case EVENT_YELL_2: Talk(SAY_TWO); - events.ScheduleEvent(EVENT_YELL_3,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_3, 4*IN_MILLISECONDS); break; case EVENT_YELL_3: Talk(SAY_THREE); - events.ScheduleEvent(EVENT_YELL_4,7*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_4, 7*IN_MILLISECONDS); break; case EVENT_YELL_4: Talk(SAY_FOUR); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index a28b5258e4b..c2a9978d1d3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -62,17 +62,17 @@ public: } } - SpawnGameObject(GO_FOCUSING_IRIS,focusingIrisPosition); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_FOCUSING_IRIS, focusingIrisPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); if (GameObject* platform = instance->GetGameObject(platformGUID)) platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); } else if (state == DONE) { if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->SummonCreature(NPC_ALEXSTRASZA,829.0679f,1244.77f,279.7453f,2.32f); + malygos->SummonCreature(NPC_ALEXSTRASZA, 829.0679f, 1244.77f, 279.7453f, 2.32f); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); // we make the platform appear again because at the moment we don't support looting using a vehicle if (GameObject* platform = instance->GetGameObject(platformGUID)) @@ -89,9 +89,9 @@ public: void SpawnGameObject(uint32 entry, Position& pos) { GameObject* go = new GameObject; - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),entry, instance, - PHASEMASK_NORMAL, pos.GetPositionX(),pos.GetPositionY(),pos.GetPositionZ(),pos.GetOrientation(), - 0,0,0,0,120,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, instance, + PHASEMASK_NORMAL, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), + 0, 0, 0, 0, 120, GO_STATE_READY)) { delete go; return; @@ -143,7 +143,7 @@ public: { go->Delete(); // this is not the best way. if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->GetMotionMaster()->MovePoint(4,770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE + malygos->GetMotionMaster()->MovePoint(4, 770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE if (GameObject* exitPortal = instance->GetGameObject(exitPortalGUID)) exitPortal->Delete(); @@ -176,7 +176,7 @@ public: if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; - player->CastSpell(trigger,SPELL_VORTEX_4,true); + player->CastSpell(trigger, SPELL_VORTEX_4, true); counter++; } } @@ -196,7 +196,7 @@ public: if (Creature* trigger = instance->GetCreature(*itr_trigger)) { lastPortalGUID = trigger->GetGUID(); - trigger->CastSpell(trigger,SPELL_PORTAL_OPENED,true); + trigger->CastSpell(trigger, SPELL_PORTAL_OPENED, true); return; } } @@ -206,7 +206,7 @@ public: } } - void SetData(uint32 data,uint32 /*value*/) + void SetData(uint32 data, uint32 /*value*/) { switch (data) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index ffdd038ace3..001547379a3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -149,7 +149,7 @@ public: Phase = 1; DoScriptText(SAY_SHIELD, me); DoCast(me, SPELL_RIFT_SHIELD); - Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); + Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); @@ -215,7 +215,7 @@ public: void JustDied(Unit * /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) - CAST_AI(boss_anomalus::boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; + CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true; } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 07a943a0234..c7fa97899a1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -82,7 +82,7 @@ public: void Reset() { uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); uiTailSweepTimer = 5*IN_MILLISECONDS; bEnrage = false; @@ -214,7 +214,7 @@ public: DoCast(me, SPELL_CRYSTALIZE); else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CRYSTAL_CHAINS); - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index eaca718d419..1fd13bc1619 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -256,7 +256,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } @@ -273,7 +273,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 431740b8e08..360e003c0ca 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -195,7 +195,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid()); + Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) { pTarget = pTemp; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 9853b98487e..58203f95a40 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -75,9 +75,9 @@ public: { _Reset(); - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); - events.ScheduleEvent(EVENT_STOMP,17000); - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); + events.ScheduleEvent(EVENT_STOMP, 17000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); postPull = false; } @@ -110,21 +110,21 @@ public: for (uint8 i = 0; i <= (postPull ? 3 : 0); i++) { - me->GetRandomNearPosition(pPosition, float(urand(0,10))); + me->GetRandomNearPosition(pPosition, float(urand(0, 10))); me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); } } - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); break; case EVENT_MAGIC_PULL: DoCast(SPELL_MAGIC_PULL); postPull = true; - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); break; case EVENT_STOMP: - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me); DoCast(SPELL_THUNDERING_STOMP); - events.ScheduleEvent(EVENT_STOMP,17000); + events.ScheduleEvent(EVENT_STOMP, 17000); break; } } @@ -144,7 +144,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); } private: bool postPull; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 51b75f19f7e..e6520806a68 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -92,7 +92,7 @@ enum AmberDrake SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. // SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. //you do not have access to until you kill the Mage-Lord Urom. - SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. + SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15, 000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. }; /*Emerald Drake, @@ -105,7 +105,7 @@ enum EmeraldDrake SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346 SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times. - SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. + SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25, 000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. // you do not have access to until you kill the Mage-Lord Urom SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. }; @@ -145,10 +145,10 @@ public: if (action != ACTION_SET_NORMAL_EVENTS) return; - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); } void JustSummoned(Creature* summon) @@ -169,7 +169,7 @@ public: return; // TO-DO: See why the spell is not casted - summon->CastSpell(summon,SPELL_PLANAR_BLAST,true); + summon->CastSpell(summon, SPELL_PLANAR_BLAST, true); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) @@ -208,22 +208,22 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->getVictim(),SPELL_ARCANE_BARRAGE); - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: DoCastAOE(SPELL_ARCANE_VOLLEY); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ENRAGED_ASSAULT: Talk(SAY_ENRAGE); DoCast(SPELL_ENRAGED_ASSAULT); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_SUMMON_LEY_WHELP: for (uint8 i = 0; i < 3; i++) DoCast(SPELL_SUMMON_LEY_WHELP); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; } } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index a5bcd92b8ee..07188b1a08b 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -78,12 +78,12 @@ static Summons Group[]= static uint32 TeleportSpells[]= { - SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3 + SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3 }; static int32 SayAggro[]= { - SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4 + SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4 }; class boss_urom : public CreatureScript @@ -98,7 +98,7 @@ public: struct boss_uromAI : public BossAI { - boss_uromAI(Creature* creature) : BossAI(creature,DATA_UROM_EVENT) {} + boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) {} void Reset() { @@ -120,11 +120,11 @@ public: me->GetMotionMaster()->MoveIdle(); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); arcaneExplosionTimer = 9000; castArcaneExplosionTimer = 2000; - frostBombTimer = urand(5000,8000); - timeBombTimer = urand(20000,25000); + frostBombTimer = urand(5000, 8000); + timeBombTimer = urand(20000, 25000); } void EnterCombat(Unit* /*pWho*/) @@ -136,7 +136,7 @@ public: CastTeleport(); if (instance->GetData(DATA_UROM_PLATAFORM) != 3) - instance->SetData(DATA_UROM_PLATAFORM,instance->GetData(DATA_UROM_PLATAFORM)+1); + instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } void AttackStart(Unit* pWho) @@ -151,12 +151,12 @@ public: { if (me->Attack(pWho, true)) { - DoScriptText(SayAggro[3],me); + DoScriptText(SayAggro[3], me); me->SetInCombatWith(pWho); pWho->SetInCombatWith(me); - me->GetMotionMaster()->MoveChase(pWho, 0,0); + me->GetMotionMaster()->MoveChase(pWho, 0, 0); } } } @@ -169,7 +169,7 @@ public: while (group[0] == group[1] || group[0] == group[2] || group[1] == group[2]) { for (uint8 i = 0; i < 3; i++) - group[i] = urand(0,2); + group[i] = urand(0, 2); } } @@ -206,7 +206,7 @@ public: for (uint8 i = 0; i < 4 ; i++) { SetPosition(i); - me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i],x,y,me->GetPositionZ(),me->GetOrientation()); + me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i], x, y, me->GetPositionZ(), me->GetOrientation()); } } @@ -215,7 +215,7 @@ public: if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2) return; - DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)],me); + DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me); DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } @@ -231,10 +231,10 @@ public: if (teleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT,me); + DoScriptText(SAY_TELEPORT, me); me->GetMotionMaster()->MoveIdle(); DoCast(SPELL_TELEPORT); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); } else teleportTimer -= uiDiff; @@ -256,8 +256,8 @@ public: Position pPos; me->getVictim()->GetPosition(&pPos); - me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(),0,0); + me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation()); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); canCast = false; @@ -271,15 +271,15 @@ public: if (frostBombTimer <= uiDiff) { DoCastVictim(SPELL_FROSTBOMB); - frostBombTimer = urand(5000,8000); + frostBombTimer = urand(5000, 8000); } else frostBombTimer -= uiDiff; if (timeBombTimer <= uiDiff) { if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit,SPELL_TIME_BOMB); + DoCast(pUnit, SPELL_TIME_BOMB); - timeBombTimer = urand(20000,25000); + timeBombTimer = urand(20000, 25000); } else timeBombTimer -= uiDiff; } @@ -303,15 +303,15 @@ public: switch(pSpell->Id) { case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f); + me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f); + me->SetHomePosition(1164.02f, 1170.85f, 527.321f, 3.66f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f); + me->SetHomePosition(1118.31f, 1080.377f, 508.361f, 4.25f); LeaveCombat(); break; case SPELL_TELEPORT: @@ -323,7 +323,7 @@ public: } } private: - float x,y; + float x, y; bool canCast; bool canGoBack; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 273fa33414f..d7025897eb8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -65,17 +65,17 @@ public: boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT) { if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE) - DoCast(me,SPELL_CENTRIFUGE_SHIELD); + DoCast(me, SPELL_CENTRIFUGE_SHIELD); } void Reset() { _Reset(); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20, 25) * IN_MILLISECONDS); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); // not sure if this is handled by a timer or hp percentage - events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(15, 30) * IN_MILLISECONDS); firstCoreEnergize = false; coreEnergizeOrientation = 0.0f; @@ -109,7 +109,7 @@ public: switch (eventId) { case EVENT_ENERGIZE_CORES: - DoCast(me,SPELL_ENERGIZE_CORES); + DoCast(me, SPELL_ENERGIZE_CORES); events.CancelEvent(EVENT_ENERGIZE_CORES); break; case EVENT_ENERGIZE_CORES_VISUAL: @@ -120,20 +120,20 @@ public: } else coreEnergizeOrientation = MapManager::NormalizeOrientation(coreEnergizeOrientation - 2.0f); - DoCast(me,SPELL_ENERGIZE_CORES_VISUAL); + DoCast(me, SPELL_ENERGIZE_CORES_VISUAL); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4000); break; case EVENT_CALL_AZURE: // not sure how blizz handles this, i cant see any pattern between the differnt spells - DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN); + DoCast(me, SPELL_CALL_AZURE_RING_CAPTAIN); Talk(SAY_AZURE); Talk(SAY_AZURE_EMOTE); - events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->getVictim(),SPELL_CALL_AMPLIFY_MAGIC); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17,20) * IN_MILLISECONDS); + DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } } @@ -177,7 +177,7 @@ class npc_azure_ring_captain : public CreatureScript { if (spell->Id == SPELL_ICE_BEAM) { - target->CastSpell(target,SPELL_SUMMON_ARCANE_BEAM,true); + target->CastSpell(target, SPELL_SUMMON_ARCANE_BEAM, true); me->DespawnOrUnsummon(); } } @@ -198,8 +198,8 @@ class npc_azure_ring_captain : public CreatureScript me->GetMotionMaster()->MoveIdle(); - if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID)) - DoCast(target,SPELL_ICE_BEAM); + if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) + DoCast(target, SPELL_ICE_BEAM); } void DoAction(const int32 action) @@ -209,13 +209,13 @@ class npc_azure_ring_captain : public CreatureScript case ACTION_CALL_DRAGON_EVENT: if (instance) { - if (Creature* varos = ObjectAccessor::GetCreature(*me,instance->GetData64(DATA_VAROS))) + if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VAROS))) { - if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->SetReactState(REACT_PASSIVE); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT,victim->GetPositionX(),victim->GetPositionY(),victim->GetPositionZ() + 20.0f); + me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT, victim->GetPositionX(), victim->GetPositionY(), victim->GetPositionZ() + 20.0f); targetGUID = victim->GetGUID(); } } @@ -269,7 +269,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void Register() { - OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0,SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -298,14 +298,14 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) @@ -345,14 +345,14 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index a4576f2aa82..41aa988583d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -61,7 +61,7 @@ public: if (creature->GetEntry() != NPC_CENTRIFUGE_CONSTRUCT) return; - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,--centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, --centrifugueConstructCounter); if (!centrifugueConstructCounter) if (Creature* varos = instance->GetCreature(varosGUID)) @@ -72,12 +72,12 @@ public: { if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); } else { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 0); } } @@ -95,7 +95,7 @@ public: if (!varos) return; - if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN,varos->GetPositionX(),varos->GetPositionY(),varos->GetPositionZ()+40)) + if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN, varos->GetPositionX(), varos->GetPositionY(), varos->GetPositionZ()+40)) drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT); } @@ -117,7 +117,7 @@ public: break; case NPC_CENTRIFUGE_CONSTRUCT: if (creature->isAlive()) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,++centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter); break; } } @@ -145,14 +145,14 @@ public: case DATA_DRAKOS_EVENT: if (state == DONE) { - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); OpenCageDoors(); } break; case DATA_VAROS_EVENT: if (state == DONE) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); break; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 71313f54d59..d6c2942d16a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -26,7 +26,7 @@ #define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight" #define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?" -#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1)) +#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE, 1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE, 1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE, 1)) enum Drakes { diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index fd75d1d28ce..bc844698fdb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -141,11 +141,11 @@ struct Waypoint struct Location { - float x,y,z; + float x, y, z; }; struct Locations { - float x,y,z; + float x, y, z; }; //each dragons special points. First where fly to before connect to connon, second where land point is. @@ -307,7 +307,7 @@ public: { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); - pTenebron->AI()->SetData(DATA_CAN_LOOT,0); + pTenebron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -325,7 +325,7 @@ public: { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); - pShadron->AI()->SetData(DATA_CAN_LOOT,0); + pShadron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -343,7 +343,7 @@ public: { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); - pVesperon->AI()->SetData(DATA_CAN_LOOT,0); + pVesperon->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -358,7 +358,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SARTHARION_AGGRO,me); + DoScriptText(SAY_SARTHARION_AGGRO, me); DoZoneInCombat(); if (pInstance) @@ -370,7 +370,7 @@ public: void JustDied(Unit* /*pKiller*/) { - DoScriptText(SAY_SARTHARION_DEATH,me); + DoScriptText(SAY_SARTHARION_DEATH, me); if (pInstance) { @@ -385,17 +385,17 @@ public: pVesperon->DisappearAndDie(); if (achievProgress == 1) - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); else if (achievProgress == 2) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); } else if (achievProgress == 3) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE, H_ACHIEV_TWILIGHT_ZONE)); } pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); @@ -404,7 +404,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me); + DoScriptText(RAND(SAY_SARTHARION_SLAY_1, SAY_SARTHARION_SLAY_2, SAY_SARTHARION_SLAY_3), me); } // me->ResetLootMode() is called from Reset() @@ -484,7 +484,7 @@ public: { if (pInstance) { - if (Creature *pTemp = Unit::GetCreature(*me,pInstance->GetData64(uiDataId))) + if (Creature *pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) { if (pTemp->isAlive() && !pTemp->getVictim()) { @@ -598,13 +598,13 @@ public: if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); - switch(urand(0,1)) + switch(urand(0, 1)) { case 0: { - Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); + Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -612,8 +612,8 @@ public: } case 1: { - Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); + Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; @@ -630,7 +630,7 @@ public: { DoScriptText(SAY_SARTHARION_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); - m_uiFlameBreathTimer = urand(25000,35000); + m_uiFlameBreathTimer = urand(25000, 35000); } else m_uiFlameBreathTimer -= uiDiff; @@ -639,7 +639,7 @@ public: if (m_uiTailSweepTimer <= uiDiff) { DoCast(me->getVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); - m_uiTailSweepTimer = urand(15000,20000); + m_uiTailSweepTimer = urand(15000, 20000); } else m_uiTailSweepTimer -= uiDiff; @@ -648,7 +648,7 @@ public: if (m_uiCleaveTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CLEAVE); - m_uiCleaveTimer = urand(7000,10000); + m_uiCleaveTimer = urand(7000, 10000); } else m_uiCleaveTimer -= uiDiff; @@ -660,10 +660,10 @@ public: { CastLavaStrikeOnTarget(pTarget); - if(urand(0,5) == 0) - DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1,SAY_SARTHARION_SPECIAL_2,SAY_SARTHARION_SPECIAL_3), me); + if(urand(0, 5) == 0) + DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); } - m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000,20000)); + m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); } else m_uiLavaStrikeTimer -= uiDiff; @@ -847,7 +847,7 @@ struct dummy_dragonAI : public ScriptedAI //using a grid search here seem to be more efficient than caching all four guids //in instance script and calculate range to each. - GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL,50.0f); + GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); switch(me->GetEntry()) { @@ -857,12 +857,12 @@ struct dummy_dragonAI : public ScriptedAI if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for(uint32 i = 0; i < 6; ++i) - me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } else { for(uint32 i = 0; i < 6; ++i) - me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; } @@ -881,7 +881,7 @@ struct dummy_dragonAI : public ScriptedAI iTextId = WHISPER_OPEN_PORTAL; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000)) + if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -890,7 +890,7 @@ struct dummy_dragonAI : public ScriptedAI } else { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000)) + if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -1034,7 +1034,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me); + DoScriptText(RAND(SAY_TENEBRON_SLAY_1, SAY_TENEBRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1052,7 +1052,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1071,7 +1071,7 @@ public: { DoScriptText(SAY_TENEBRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1123,14 +1123,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SHADRON_AGGRO,me); + DoScriptText(SAY_SHADRON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_SHADRON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me); + DoScriptText(RAND(SAY_SHADRON_SLAY_1, SAY_SHADRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1148,7 +1148,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1165,7 +1165,7 @@ public: OpenPortal(); m_bHasPortalOpen = true; - m_uiAcolyteShadronTimer = urand(60000,65000); + m_uiAcolyteShadronTimer = urand(60000, 65000); } } else @@ -1176,7 +1176,7 @@ public: { DoScriptText(SAY_SHADRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1222,14 +1222,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_VESPERON_AGGRO,me); + DoScriptText(SAY_VESPERON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_VESPERON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me); + DoScriptText(RAND(SAY_VESPERON_SLAY_1, SAY_VESPERON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1247,7 +1247,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1261,7 +1261,7 @@ public: { OpenPortal(); DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); - m_uiAcolyteVesperonTimer = urand(60000,70000); + m_uiAcolyteVesperonTimer = urand(60000, 70000); } } else @@ -1272,7 +1272,7 @@ public: { DoScriptText(SAY_VESPERON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1328,7 +1328,7 @@ public: } } - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } void JustDied(Unit* /*killer*/) @@ -1338,7 +1338,7 @@ public: Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); if(Shadron) { - (CAST_AI(mob_shadron::mob_shadronAI,Shadron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } Creature* pDebuffTarget = NULL; @@ -1352,10 +1352,10 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } @@ -1422,7 +1422,7 @@ public: uiDespawnTimer = 28000; if (pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } @@ -1436,7 +1436,7 @@ public: { Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON)); if (pVesperon) - (CAST_AI(mob_vesperon::mob_vesperonAI,pVesperon->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); @@ -1451,14 +1451,14 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->getVictim()) i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } @@ -1518,7 +1518,7 @@ public: { if(pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } m_uiFadeArmorTimer = 1000; m_uiHatchEggTimer = 20000; @@ -1546,7 +1546,7 @@ public: { Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); if(Tenebron) - (CAST_AI(mob_tenebron::mob_tenebronAI,Tenebron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } else @@ -1598,13 +1598,13 @@ public: { if (Tsunami_Timer <= diff) { - DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA); + DoCast(me, SPELL_FLAME_TSUNAMI_DMG_AURA); Tsunami_Timer = 500; }else Tsunami_Timer -= diff; if(TsunamiBuff_timer <= diff) { - if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true)) + if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); TsunamiBuff_timer = 1000; }else TsunamiBuff_timer -= diff; @@ -1699,7 +1699,7 @@ public: if (m_uiFadeArmorTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_FADE_ARMOR); - m_uiFadeArmorTimer = urand(5000,10000); + m_uiFadeArmorTimer = urand(5000, 10000); } else m_uiFadeArmorTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index f2d972bb051..54cdc46245b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -180,7 +180,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*pKiller*/) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9b9d7a38489..3a14946dfc0 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -109,7 +109,7 @@ public: uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); - uiDisperseHealth = 45 + urand(0,10); + uiDisperseHealth = 45 + urand(0, 10); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); @@ -140,7 +140,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void SpellHit(Unit* /*caster*/, const SpellEntry* spell) @@ -197,7 +197,7 @@ public: { lSparkList.Summon(pSummoned); - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true); + pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) @@ -278,7 +278,7 @@ public: { bHasDispersed = true; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 1b314ee3c9d..011c4c589b5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -125,7 +125,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void UpdateAI(const uint32 uiDiff) @@ -190,7 +190,7 @@ public: if (m_uiLightningNova_Timer <= uiDiff) { - DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), me); + DoScriptText(RAND(SAY_NOVA_1, SAY_NOVA_2, SAY_NOVA_3), me); DoScriptText(EMOTE_NOVA, me); DoCast(me, SPELL_LIGHTNING_NOVA_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1161ffac5eb..700df86881f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -172,7 +172,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void DespawnGolem() @@ -263,7 +263,7 @@ public: if (m_uiShatteringStomp_Timer <= uiDiff) { // Should he stomp even if he has no brittle golem to shatter? - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2), me); DoCast(me, SPELL_SHATTERING_STOMP_N); @@ -297,7 +297,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoScriptText(RAND(SAY_FORGE_1,SAY_FORGE_2), me); + DoScriptText(RAND(SAY_FORGE_1, SAY_FORGE_2), me); m_bHasTemper = true; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 5468837a711..7cf99900672 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -170,7 +170,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index f286dd23f58..92ec5db126e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -186,7 +186,7 @@ public: { uint32 uiSummonPipe = rand()%2; me->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : - RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), + RAND(CREATURE_FORGED_IRON_DWARF, CREATURE_FORGED_IRON_TROGG), PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); uiSummonTimer = 20000; @@ -231,7 +231,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void KilledIronSludge() diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 9fc0cc599d9..f237871ef90 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -174,10 +174,10 @@ public: if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } KaddrakGUIDList.clear(); @@ -369,7 +369,7 @@ public: case 17: DoScriptText(SAY_EVENT_INTRO_2, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); SetEscortPaused(true); JumpToNextStep(8500); @@ -386,7 +386,7 @@ public: { case 1: { - uint32 uiSpawnNumber = DUNGEON_MODE(2,3); + uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); @@ -470,7 +470,7 @@ public: case 8: DoScriptText(SAY_EVENT_A_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); @@ -494,7 +494,7 @@ public: case 12: DoScriptText(SAY_EVENT_B_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; JumpToNextStep(10000); @@ -526,7 +526,7 @@ public: case 18: DoScriptText(SAY_EVENT_C_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); @@ -580,7 +580,7 @@ public: DoScriptText(SAY_EVENT_END_01, me); me->SetStandState(UNIT_STAND_STATE_STAND); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); bIsBattle = true; @@ -703,10 +703,10 @@ public: { if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } Player* pPlayer = GetPlayerForEscort(); if (pPlayer) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index afeb8a23e88..e28d082062f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -144,7 +144,7 @@ public: case GO_TRIBUNAL_CHEST_HERO: uiTribunalChest = go->GetGUID(); if (m_auiEncounter[2] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; case 191527: uiTribunalSkyFloor = go->GetGUID(); @@ -159,12 +159,12 @@ public: case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; if (m_auiEncounter[1] == DONE) - HandleGameObject(uiBrannDoor,true); + HandleGameObject(uiBrannDoor, true); break; case DATA_KRYSTALLUS_EVENT: m_auiEncounter[0] = data; if (m_auiEncounter[0] == DONE) - HandleGameObject(uiMaidenOfGriefDoor,true); + HandleGameObject(uiMaidenOfGriefDoor, true); break; case DATA_SJONNIR_EVENT: m_auiEncounter[3] = data; @@ -173,10 +173,10 @@ public: m_auiEncounter[2] = data; if (m_auiEncounter[2] == DONE) { - HandleGameObject(uiSjonnirDoor,true); + HandleGameObject(uiSjonnirDoor, true); GameObject* go = instance->GetGameObject(uiTribunalChest); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); } break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 608685830ab..854624727db 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -127,7 +127,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void Reset() @@ -187,8 +187,8 @@ public: void SummonCollapsingStar(Unit* target) { DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); + me->SummonCreature(CREATURE_COLLAPSING_STAR, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 100000); + me->SummonCreature(CREATURE_BLACK_HOLE, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } void UpdateAI(const uint32 diff) @@ -205,7 +205,7 @@ public: if (HealthBelowPct(2)) { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f,417.321381f,0,0,0,0,0,0); + me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f, 417.321381f, 0, 0, 0, 0, 0, 0); // All of them. or random? DoScriptText(SAY_DEATH_1, me); @@ -259,36 +259,36 @@ public: if (QuantumStrike_Timer <= diff) { - DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE,H_SPELL_QUANTUM_STRIKE), true); + DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE, H_SPELL_QUANTUM_STRIKE), true); QuantumStrike_Timer = urand(4000, 14000); } else QuantumStrike_Timer -= diff; if (BigBang_Timer <= diff) { - DoScriptText(RAND(SAY_BIG_BANG_1,SAY_BIG_BANG_2), me); - DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG,H_SPELL_BIG_BANG), true); + DoScriptText(RAND(SAY_BIG_BANG_1, SAY_BIG_BANG_2), me); + DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG, H_SPELL_BIG_BANG), true); BigBang_Timer = 90000; } else BigBang_Timer -= diff; if (Ascend_Timer <= diff) { - DoCast(me->getVictim(),SPELL_ASCEND, true); + DoCast(me->getVictim(), SPELL_ASCEND, true); Ascend_Timer = 480000; } else Ascend_Timer -= diff; if (PhasePunch_Timer <= diff) { - DoCast(me->getVictim(),SPELL_PHASE_PUNCH, true); + DoCast(me->getVictim(), SPELL_PHASE_PUNCH, true); PhasePunch_Timer = 8000; } else PhasePunch_Timer -= diff; if (CosmicSmash_Timer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH,H_SPELL_COSMIC_SMASH), true); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH, H_SPELL_COSMIC_SMASH), true); CosmicSmash_Timer = urand(30000, 60000); } else CosmicSmash_Timer -= diff; @@ -296,7 +296,7 @@ public: if (Berserk_Timer <= diff) { DoScriptText(SAY_BERSERK, me); - DoCast(me->getVictim(),SPELL_BERSERK, true); + DoCast(me->getVictim(), SPELL_BERSERK, true); Berserk_Timer = 360000; } else Berserk_Timer -= diff; @@ -314,7 +314,7 @@ public: { DoCast(me, SPELL_ASCEND); DoScriptText(SAY_BERSERK, me); - Ascend_Timer = urand(360000,365000); + Ascend_Timer = urand(360000, 365000); Enrage = false; } else Ascend_Timer -= diff; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 6b63563d73c..ddf6858ff6d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -281,14 +281,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1,SAY_STEELBREAKER_DEATH_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1,SAY_STEELBREAKER_SLAY_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); if (phase == 3) DoCast(me, SPELL_ELECTRICAL_CHARGE); @@ -392,7 +392,7 @@ public: if (phase >= 2) events.RescheduleEvent(EVENT_RUNE_OF_DEATH, 30000); if (phase >= 3) - events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -428,14 +428,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_MOLGEIM_DEATH_1,SAY_MOLGEIM_DEATH_2), me); + DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_MOLGEIM_SLAY_1,SAY_MOLGEIM_SLAY_2), me); + DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -470,19 +470,19 @@ public: } case EVENT_SHIELD_OF_RUNES: DoCast(me, RAID_MODE(SPELL_SHIELD_OF_RUNES, SPELL_SHIELD_OF_RUNES_H)); - events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000,34000)); + events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000)); break; case EVENT_RUNE_OF_DEATH: DoScriptText(SAY_MOLGEIM_RUNE_DEATH, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_DEATH); - events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000,40000)); + events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000, 40000)); break; case EVENT_RUNE_OF_SUMMONING: DoScriptText(SAY_MOLGEIM_SUMMON, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_SUMMONING); - events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -628,14 +628,14 @@ public: { case EVENT_UPDATEPHASE: events.SetPhase(++phase); - events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); - events.RescheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); + events.RescheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); if (phase >= 2) - events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); if (phase >= 3) { DoCast(me, SPELL_STORMSHIELD); - events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000,80000)); + events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000, 80000)); } break; @@ -673,14 +673,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_BRUNDIR_DEATH_1,SAY_BRUNDIR_DEATH_2), me); + DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_BRUNDIR_SLAY_1,SAY_BRUNDIR_SLAY_2), me); + DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -705,17 +705,17 @@ public: DoCast(SPELL_BERSERK); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_CHAIN_LIGHTNING_N , SPELL_CHAIN_LIGHTNING_H)); - events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); + events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); break; case EVENT_OVERLOAD: DoCast(RAID_MODE(SPELL_OVERLOAD , SPELL_OVERLOAD_H)); - events.ScheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); break; case EVENT_LIGHTNING_WHIRL: DoCast(RAID_MODE(SPELL_LIGHTNING_WHIRL , SPELL_LIGHTNING_WHIRL_H)); - events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); break; case EVENT_LIGHTNING_TENDRILS: DoCast(RAID_MODE(SPELL_LIGHTNING_TENDRILS, SPELL_LIGHTNING_TENDRILS_H)); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 0485e22b9ae..cee7b17ec64 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -62,12 +62,12 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 352af769f59..d6f582e7b37 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -182,29 +182,29 @@ Position const Center[]= Position const PosSiege[5] = { - {-814.59f,-64.54f,429.92f,5.969f}, - {-784.37f,-33.31f,429.92f,5.096f}, - {-808.99f,-52.10f,429.92f,5.668f}, - {-798.59f,-44.00f,429.92f,5.663f}, - {-812.83f,-77.71f,429.92f,0.046f}, + {-814.59f, -64.54f, 429.92f, 5.969f}, + {-784.37f, -33.31f, 429.92f, 5.096f}, + {-808.99f, -52.10f, 429.92f, 5.668f}, + {-798.59f, -44.00f, 429.92f, 5.663f}, + {-812.83f, -77.71f, 429.92f, 0.046f}, }; Position const PosChopper[5] = { - {-717.83f,-106.56f,430.02f,0.122f}, - {-717.83f,-114.23f,430.44f,0.122f}, - {-717.83f,-109.70f,430.22f,0.122f}, - {-718.45f,-118.24f,430.26f,0.052f}, - {-718.45f,-123.58f,430.41f,0.085f}, + {-717.83f, -106.56f, 430.02f, 0.122f}, + {-717.83f, -114.23f, 430.44f, 0.122f}, + {-717.83f, -109.70f, 430.22f, 0.122f}, + {-718.45f, -118.24f, 430.26f, 0.052f}, + {-718.45f, -123.58f, 430.41f, 0.085f}, }; Position const PosDemolisher[5] = { - {-724.12f,-176.64f,430.03f,2.543f}, - {-766.70f,-225.03f,430.50f,1.710f}, - {-729.54f,-186.26f,430.12f,1.902f}, - {-756.01f,-219.23f,430.50f,2.369f}, - {-798.01f,-227.24f,429.84f,1.446f}, + {-724.12f, -176.64f, 430.03f, 2.543f}, + {-766.70f, -225.03f, 430.50f, 1.710f}, + {-729.54f, -186.26f, 430.12f, 1.902f}, + {-756.01f, -219.23f, 430.50f, 2.369f}, + {-798.01f, -227.24f, 429.84f, 1.446f}, }; class boss_flame_leviathan : public CreatureScript @@ -284,7 +284,7 @@ class boss_flame_leviathan : public CreatureScript if (towerOfFlames) { me->AddAura(SPELL_BUFF_TOWER_OF_FLAMES, me); - events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO,70*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, 70*IN_MILLISECONDS); } if (towerOfFrost) @@ -376,7 +376,7 @@ class boss_flame_leviathan : public CreatureScript events.Update(diff); - if (Shutdown == RAID_MODE(2,4)) + if (Shutdown == RAID_MODE(2, 4)) { Shutdown = 0; events.ScheduleEvent(EVENT_SHUTDOWN, 4000); @@ -411,7 +411,7 @@ class boss_flame_leviathan : public CreatureScript break; // this is a must case EVENT_PURSUE: DoScriptText(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3), me); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,75,true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 75, true)) { me->AddAura(SPELL_PURSUED, target); me->MonsterTextEmote(EMOTE_PURSUE, target->GetGUID(), true); @@ -454,7 +454,7 @@ class boss_flame_leviathan : public CreatureScript case EVENT_THORIM_S_HAMMER: // Tower of Storms for (uint8 i = 0; i < 7; ++i) { - if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20,60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) + if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20, 60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) thorim->GetMotionMaster()->MoveRandom(100); } DoScriptText(SAY_TOWER_STORM, me); @@ -661,7 +661,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) if(CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); @@ -763,7 +763,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript void JustDied(Unit* /*killer*/) { - float x,y,z; + float x, y, z; me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z); @@ -1020,7 +1020,7 @@ class npc_hodirs_fury : public CreatureScript void MoveInLineOfSight(Unit* who) { - if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who,0,5,false)) + if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 5, false)) { if (Creature* trigger = DoSummonFlyer(NPC_HODIR_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN)) trigger->CastSpell(who, SPELL_HODIR_S_FURY, true); @@ -1170,9 +1170,9 @@ class npc_lorekeeper : public CreatureScript if (player) { player->PrepareGossipMenu(creature); - instance->instance->LoadGrid(364,-16); //make sure leviathan is loaded + instance->instance->LoadGrid(364, -16); //make sure leviathan is loaded - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } break; @@ -1207,7 +1207,7 @@ class npc_lorekeeper : public CreatureScript { player->PrepareGossipMenu(creature); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } return true; @@ -1240,7 +1240,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // break; @@ -1260,7 +1260,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // return true; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 0076ed9f55f..817fcfcd4cc 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -87,7 +87,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index c27625fcf60..ed8fe571241 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -158,7 +158,7 @@ public: However, if there are not at least 9 people outside of 15 yards he will start casting it on players inside 15 yards melee and tank included. */ - Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4,9), 15.0f, 50.f); + Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4, 9), 15.0f, 50.f); if (!target) target = SelectTarget(SELECT_TARGET_RANDOM); DoCast(target, SPELL_MARK_OF_THE_FACELESS); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 382b88be6c8..293d6fd3bdf 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -54,7 +54,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 6fc96c8dd7f..ba0e77cbee3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -86,26 +86,26 @@ enum eAchievementData const Position Pos[20] = { - {630.366f,216.772f,360.891f,3.001970f}, - {630.594f,231.846f,360.891f,3.124140f}, - {630.435f,337.246f,360.886f,3.211410f}, - {630.493f,313.349f,360.886f,3.054330f}, - {630.444f,321.406f,360.886f,3.124140f}, - {630.366f,247.307f,360.888f,3.211410f}, - {630.698f,305.311f,360.886f,3.001970f}, - {630.500f,224.559f,360.891f,3.054330f}, - {630.668f,239.840f,360.890f,3.159050f}, - {630.384f,329.585f,360.886f,3.159050f}, - {543.220f,313.451f,360.886f,0.104720f}, - {543.356f,329.408f,360.886f,6.248280f}, - {543.076f,247.458f,360.888f,6.213370f}, - {543.117f,232.082f,360.891f,0.069813f}, - {543.161f,305.956f,360.886f,0.157080f}, - {543.277f,321.482f,360.886f,0.052360f}, - {543.316f,337.468f,360.886f,6.195920f}, - {543.280f,239.674f,360.890f,6.265730f}, - {543.265f,217.147f,360.891f,0.174533f}, - {543.256f,224.831f,360.891f,0.122173f} + {630.366f, 216.772f, 360.891f, 3.001970f}, + {630.594f, 231.846f, 360.891f, 3.124140f}, + {630.435f, 337.246f, 360.886f, 3.211410f}, + {630.493f, 313.349f, 360.886f, 3.054330f}, + {630.444f, 321.406f, 360.886f, 3.124140f}, + {630.366f, 247.307f, 360.888f, 3.211410f}, + {630.698f, 305.311f, 360.886f, 3.001970f}, + {630.500f, 224.559f, 360.891f, 3.054330f}, + {630.668f, 239.840f, 360.890f, 3.159050f}, + {630.384f, 329.585f, 360.886f, 3.159050f}, + {543.220f, 313.451f, 360.886f, 0.104720f}, + {543.356f, 329.408f, 360.886f, 6.248280f}, + {543.076f, 247.458f, 360.888f, 6.213370f}, + {543.117f, 232.082f, 360.891f, 0.069813f}, + {543.161f, 305.956f, 360.886f, 0.157080f}, + {543.277f, 321.482f, 360.886f, 0.052360f}, + {543.316f, 337.468f, 360.886f, 6.195920f}, + {543.280f, 239.674f, 360.890f, 6.265730f}, + {543.265f, 217.147f, 360.891f, 0.174533f}, + {543.256f, 224.831f, 360.891f, 0.122173f} }; class boss_ignis : public CreatureScript @@ -169,10 +169,10 @@ public: { // Shattered if (Shattered) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10,ACHIEVEMENT_SHATTERED_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10, ACHIEVEMENT_SHATTERED_25)); // Stokin' the Furnace if (EncounterTime <= MAX_ENCOUNTER_TIME) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10,ACHIEVEMENT_STOKIN_THE_FURNACE_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10, ACHIEVEMENT_STOKIN_THE_FURNACE_25)); } } @@ -196,7 +196,7 @@ public: case EVENT_JET: me->MonsterTextEmote(EMOTE_JETS, 0, true); DoCastAOE(SPELL_FLAME_JETS); - events.RescheduleEvent(EVENT_JET,urand(35000,40000)); + events.RescheduleEvent(EVENT_JET, urand(35000, 40000)); break; case EVENT_SLAG_POT: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -207,7 +207,7 @@ public: events.DelayEvents(3000); events.ScheduleEvent(EVENT_GRAB_POT, 500); } - events.RescheduleEvent(EVENT_SLAG_POT,RAID_MODE(30000, 15000)); + events.RescheduleEvent(EVENT_SLAG_POT, RAID_MODE(30000, 15000)); break; case EVENT_GRAB_POT: if (Unit* SlagPotTarget = Unit::GetUnit(*me, SlagPotGUID)) @@ -240,14 +240,14 @@ public: if (Unit *pTarget = me->getVictim()) me->SummonCreature(NPC_GROUND_SCORCH, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); - events.RescheduleEvent(EVENT_SCORCH,25000); + events.RescheduleEvent(EVENT_SCORCH, 25000); break; case EVENT_CONSTRUCT: DoScriptText(SAY_SUMMON, me); DoSummon(NPC_IRON_CONSTRUCT, Pos[rand()%20], 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); DoCast(SPELL_STRENGHT); DoCast(me, SPELL_ACTIVATE_CONSTRUCT); - events.RescheduleEvent(EVENT_CONSTRUCT,RAID_MODE(40000, 30000)); + events.RescheduleEvent(EVENT_CONSTRUCT, RAID_MODE(40000, 30000)); break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); @@ -409,10 +409,10 @@ public: { if(HeatTimer <= uiDiff) { - Creature* Construct = me->GetCreature(*me ,ConstructGUID); + Creature* Construct = me->GetCreature(*me , ConstructGUID); if (Construct && !Construct->HasAura(SPELL_MOLTEN)) { - me->AddAura(SPELL_HEAT,Construct); + me->AddAura(SPELL_HEAT, Construct); HeatTimer=1000; } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index a8f4d237306..ae416693f7d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -26,13 +26,13 @@ SDComment: TODO: Achievements SDCategory: Ulduar EndScriptData */ -#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629,63979) -#define SPELL_TWO_ARM_SMASH RAID_MODE(63356,64003) -#define SPELL_ONE_ARM_SMASH RAID_MODE(63573,64006) -#define SPELL_ARM_SWEEP RAID_MODE(63766,63983) -#define SPELL_STONE_SHOUT RAID_MODE(63716,64005) -#define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980) -#define SPELL_STONE_GRIP RAID_MODE(62166,63981) +#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629, 63979) +#define SPELL_TWO_ARM_SMASH RAID_MODE(63356, 64003) +#define SPELL_ONE_ARM_SMASH RAID_MODE(63573, 64006) +#define SPELL_ARM_SWEEP RAID_MODE(63766, 63983) +#define SPELL_STONE_SHOUT RAID_MODE(63716, 64005) +#define SPELL_PETRIFY_BREATH RAID_MODE(62030, 63980) +#define SPELL_STONE_GRIP RAID_MODE(62166, 63981) #define SPELL_STONE_GRIP_CANCEL 65594 #define SPELL_SUMMON_RUBBLE 63633 #define SPELL_FALLING_RUBBLE 63821 @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_ARM_ENTER_VISUAL 64753 #define SPELL_SUMMON_FOCUSED_EYEBEAM 63342 -#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347,63977) +#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347, 63977) #define SPELL_FOCUSED_EYEBEAM_VISUAL 63369 #define SPELL_FOCUSED_EYEBEAM_VISUAL_LEFT 63676 #define SPELL_FOCUSED_EYEBEAM_VISUAL_RIGHT 63702 @@ -153,7 +153,7 @@ class boss_kologarn : public CreatureScript void KilledUnit(Unit* /*who*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 9e0b6ff5a35..d3e31eebbf1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -218,7 +218,7 @@ class boss_razorscale_controller : public CreatureScript events.ScheduleEvent(EVENT_BUILD_HARPOON_3, 90000); break; case ACTION_PLACE_BROKEN_HARPOON: - for (uint8 n = 0; n < RAID_MODE(2,4); n++) + for (uint8 n = 0; n < RAID_MODE(2, 4); n++) me->SummonGameObject(GO_RAZOR_BROKEN_HARPOON, PosHarpoon[n].GetPositionX(), PosHarpoon[n].GetPositionY(), PosHarpoon[n].GetPositionZ(), 2.286f, 0, 0, 0, 0, 180000); break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index a99927d5e50..fe66401a669 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -69,7 +69,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) @@ -80,7 +80,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); _EnterCombat(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 2af069977b0..96d7168f468 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -274,7 +274,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) @@ -314,7 +314,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); uiGravityBombTarget = pTarget->GetGUID(); } uiGravityBombTimer = TIMER_GRAVITY_BOMB; @@ -425,7 +425,7 @@ public: { if (Unit *pGravityBombTarget = me->GetUnit(*me, uiGravityBombTarget)) { - pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); if (hardMode) { //Remains spawned for 3 minutes diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index a32c68fdf3b..8977e4860b6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -139,7 +139,7 @@ public: bEventInProgress = true; bIsUndead = true; - DoScriptText(YELL_DEAD_1,me); + DoScriptText(YELL_DEAD_1, me); } if (bEventInProgress) @@ -157,12 +157,12 @@ public: me->SetInCombatWith(me->getVictim()); me->GetMotionMaster()->MoveChase(me->getVictim()); - DoScriptText(YELL_AGGRO_2,me); + DoScriptText(YELL_AGGRO_2, me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(YELL_AGGRO_1,me); + DoScriptText(YELL_AGGRO_1, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); @@ -170,7 +170,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(YELL_DEAD_2,me); + DoScriptText(YELL_DEAD_2, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, DONE); @@ -179,9 +179,9 @@ public: void KilledUnit(Unit * /*victim*/) { if (bIsUndead) - DoScriptText(YELL_KILL_1,me); + DoScriptText(YELL_KILL_1, me); else - DoScriptText(YELL_KILL_2,me); + DoScriptText(YELL_KILL_2, me); } void UpdateAI(const uint32 diff) @@ -245,7 +245,7 @@ public: Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { - me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); DoCast(me, SPELL_SHADOW_AXE_SUMMON); } @@ -301,7 +301,7 @@ public: pInstance = c->GetInstanceScript(); } - float x,y,z; + float x, y, z; InstanceScript* pInstance; uint32 uiResurectTimer; uint32 uiResurectPhase; @@ -314,15 +314,15 @@ public: me->SetSpeed(MOVE_WALK , 1.0f); //me->SetSpeed(MOVE_FLIGHT , 1.0f); - me->GetPosition(x,y,z); - DoTeleportTo(x+1,y,z+30); + me->GetPosition(x, y, z); + DoTeleportTo(x+1, y, z+30); Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); if (ingvar) { - me->GetMotionMaster()->MovePoint(1,x,y,z+15); + me->GetMotionMaster()->MovePoint(1, x, y, z+15); - // DoScriptText(YELL_RESSURECT,me); + // DoScriptText(YELL_RESSURECT, me); } } @@ -337,14 +337,14 @@ public: { case 1: ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_DUMMY, true); DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); uiResurectTimer = 8000; uiResurectPhase = 1; break; case 2: me->SetVisible(false); - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); break; } @@ -366,7 +366,7 @@ public: if (ingvar) { ingvar->SetStandState(UNIT_STAND_STATE_STAND); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_HEAL, false); } uiResurectTimer = 3000; uiResurectPhase = 2; @@ -380,7 +380,7 @@ public: if (boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI* pAI = CAST_AI(boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI, ingvar->AI())) pAI->StartZombiePhase(); - me->GetMotionMaster()->MovePoint(2,x+1,y,z+30); + me->GetMotionMaster()->MovePoint(2, x+1, y, z+30); ++uiResurectPhase; uiResurectTimer = 0; } @@ -417,13 +417,13 @@ public: void Reset() { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET,50); + Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); if (pTarget) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); - float x,y,z; - pTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); + float x, y, z; + pTarget->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z); } uiDespawnTimer = 7000; } @@ -434,7 +434,7 @@ public: { if (uiDespawnTimer <= diff) { - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); uiDespawnTimer = 0; } else uiDespawnTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 1e874b3d5ee..096ee335077 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -96,7 +96,7 @@ public: if (FrostTombGUID) { - Unit* FrostTomb = Unit::GetUnit((*me),FrostTombGUID); + Unit* FrostTomb = Unit::GetUnit((*me), FrostTombGUID); if (FrostTomb) FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); } @@ -104,7 +104,7 @@ public: void UpdateAI(const uint32 /*diff*/) { - Unit* temp = Unit::GetUnit((*me),FrostTombGUID); + Unit* temp = Unit::GetUnit((*me), FrostTombGUID); if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -282,7 +282,7 @@ public: void Reset() { Respawn_Time = 12000; - Decrepify_Timer = urand(10000,20000); + Decrepify_Timer = urand(10000, 20000); isDead = false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index dd5fb2a6c82..6ff8e4d9ac8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -27,14 +27,14 @@ EndScriptData */ enum eEnums { - //signed for 24200, but used by 24200,27390 + //signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = -1574011, YELL_SKARVALD_DAL_DIED = -1574012, YELL_SKARVALD_SKA_DIEDFIRST = -1574013, YELL_SKARVALD_KILL = -1574014, YELL_SKARVALD_DAL_DIEDFIRST = -1574015, - //signed for 24201, but used by 24201,27389 + //signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = -1574016, YELL_DALRONN_SKA_DIED = -1574017, YELL_DALRONN_DAL_DIEDFIRST = -1574018, @@ -93,7 +93,7 @@ public: ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isDead()) CAST_CRE(dalronn)->Respawn(); @@ -105,11 +105,11 @@ public: { if (!ghost && pInstance) { - DoScriptText(YELL_SKARVALD_AGGRO,me); + DoScriptText(YELL_SKARVALD_AGGRO, me); - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) - dalronn->getThreatManager().addThreat(who,0.0f); + dalronn->getThreatManager().addThreat(who, 0.0f); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); } @@ -119,25 +119,25 @@ public: { if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn) { if (dalronn->isDead()) { - DoScriptText(YELL_SKARVALD_DAL_DIED,me); + DoScriptText(YELL_SKARVALD_DAL_DIED, me); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); - Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -149,7 +149,7 @@ public: { if (!ghost) { - DoScriptText(YELL_SKARVALD_KILL,me); + DoScriptText(YELL_SKARVALD_KILL, me); } } @@ -184,7 +184,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; @@ -250,7 +250,7 @@ public: ghost = me->GetEntry() == MOB_DALRONN_GHOST; if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isDead()) CAST_CRE(skarvald)->Respawn(); @@ -262,9 +262,9 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) - skarvald->getThreatManager().addThreat(who,0.0f); + skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; @@ -277,26 +277,26 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald) { if (skarvald->isDead()) { - DoScriptText(YELL_DALRONN_SKA_DIED,me); + DoScriptText(YELL_DALRONN_SKA_DIED, me); if (pInstance) pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_DAL_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); - Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -308,7 +308,7 @@ public: { if (!ghost) { - DoScriptText(YELL_DALRONN_KILL,me); + DoScriptText(YELL_DALRONN_KILL, me); } } @@ -327,7 +327,7 @@ public: { if (AggroYell_Timer <= diff) { - DoScriptText(YELL_DALRONN_AGGRO,me); + DoScriptText(YELL_DALRONN_AGGRO, me); AggroYell_Timer = 0; } else AggroYell_Timer -= diff; @@ -354,7 +354,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_SKA_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 92972d67469..443512d5986 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -139,27 +139,27 @@ public: { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; } } @@ -197,42 +197,42 @@ public: case EVENT_FORGE_1: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[0],false); - HandleGameObject(forge_fire[0],false); - HandleGameObject(forge_anvil[0],false); + HandleGameObject(forge_bellow[0], false); + HandleGameObject(forge_fire[0], false); + HandleGameObject(forge_anvil[0], false); }else { - HandleGameObject(forge_bellow[0],true); - HandleGameObject(forge_fire[0],true); - HandleGameObject(forge_anvil[0],true); + HandleGameObject(forge_bellow[0], true); + HandleGameObject(forge_fire[0], true); + HandleGameObject(forge_anvil[0], true); } forge_event[0] = data; break; case EVENT_FORGE_2: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[1],false); - HandleGameObject(forge_fire[1],false); - HandleGameObject(forge_anvil[1],false); + HandleGameObject(forge_bellow[1], false); + HandleGameObject(forge_fire[1], false); + HandleGameObject(forge_anvil[1], false); }else { - HandleGameObject(forge_bellow[1],true); - HandleGameObject(forge_fire[1],true); - HandleGameObject(forge_anvil[1],true); + HandleGameObject(forge_bellow[1], true); + HandleGameObject(forge_fire[1], true); + HandleGameObject(forge_anvil[1], true); } forge_event[1] = data; break; case EVENT_FORGE_3: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[2],false); - HandleGameObject(forge_fire[2],false); - HandleGameObject(forge_anvil[2],false); + HandleGameObject(forge_bellow[2], false); + HandleGameObject(forge_fire[2], false); + HandleGameObject(forge_anvil[2], false); }else { - HandleGameObject(forge_bellow[2],true); - HandleGameObject(forge_fire[2],true); - HandleGameObject(forge_anvil[2],true); + HandleGameObject(forge_bellow[2], true); + HandleGameObject(forge_fire[2], true); + HandleGameObject(forge_anvil[2], true); } forge_event[2] = data; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 5f3a93e0d57..0b9bd93e2ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -59,13 +59,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); break; } } @@ -79,13 +79,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,DONE); + pInstance->SetData(EVENT_FORGE_1, DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,DONE); + pInstance->SetData(EVENT_FORGE_2, DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,DONE); + pInstance->SetData(EVENT_FORGE_3, DONE); break; } } @@ -99,17 +99,17 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); break; case 2: - pInstance->SetData(EVENT_FORGE_2,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_2, IN_PROGRESS); break; case 3: - pInstance->SetData(EVENT_FORGE_3,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_3, IN_PROGRESS); break; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE ,EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() @@ -120,10 +120,10 @@ public: for (uint8 i = 0; i < 3 ; ++i) { GameObject* temp; - temp = me->FindNearestGameObject(entry_search[i],30); + temp = me->FindNearestGameObject(entry_search[i], 30); if (temp) { - if (me->IsWithinDist(temp,diff,false)) + if (me->IsWithinDist(temp, diff, false)) { near_f = i + 1; diff = me->GetDistance2d(temp); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 04d7a38b4c0..7f0d4dbed5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -64,12 +64,12 @@ struct Locations struct Locations moveLocs[]= { - {261.6f,-449.3f,109.5f}, - {263.3f,-454.0f,109.5f}, - {291.5f,-450.4f,109.5f}, - {291.5f,-454.0f,109.5f}, - {310.0f,-453.4f,109.5f}, - {238.6f,-460.7f,109.5f} + {261.6f, -449.3f, 109.5f}, + {263.3f, -454.0f, 109.5f}, + {291.5f, -450.4f, 109.5f}, + {291.5f, -454.0f, 109.5f}, + {310.0f, -453.4f, 109.5f}, + {238.6f, -460.7f, 109.5f} }; enum Phase @@ -190,20 +190,20 @@ public: if (uiArcingSmashTimer <= diff) { DoCast(me, SPELL_ARCING_SMASH); - uiArcingSmashTimer = urand(13000,17000); + uiArcingSmashTimer = urand(13000, 17000); } else uiArcingSmashTimer -= diff; if (uiImpaleTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_IMPALE); - uiImpaleTimer = urand(8000,12000); + uiImpaleTimer = urand(8000, 12000); } else uiImpaleTimer -= diff; if (uiWhiteringRoarTimer <= diff) { DoCast(me, SPELL_WITHERING_ROAR); - uiWhiteringRoarTimer = urand(8000,12000); + uiWhiteringRoarTimer = urand(8000, 12000); } else uiWhiteringRoarTimer -= diff; DoMeleeAttackIfReady(); @@ -726,7 +726,7 @@ public: { Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) - CAST_AI(boss_palehoof::boss_palehoofAI,pPalehoof->AI())->NextPhase(); + CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } } @@ -796,7 +796,7 @@ public: pNext->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_OOC_NOT_ATTACKABLE); pNext->SetStandState(UNIT_STAND_STATE_STAND); pNext->SetInCombatWithZone(); - pNext->Attack(pNext->SelectNearestTarget(100),true); + pNext->Attack(pNext->SelectNearestTarget(100), true); } currentPhase = PHASE_NONE; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index b2f98b11475..9da89393f02 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -356,7 +356,7 @@ public: break; case 3: me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); - DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); + DoScriptText(RAND(SAY_DRAKE_BREATH_1, SAY_DRAKE_BREATH_2), me); DoScriptText(EMOTE_BREATH, me); m_uiMovementTimer = 2500; break; @@ -417,14 +417,14 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void SpawnMobs() { - for (uint8 i = 0; i < DUNGEON_MODE(5,6); ++i) + for (uint8 i = 0; i < DUNGEON_MODE(5, 6); ++i) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; @@ -436,7 +436,7 @@ public: void SpawnTrigger() { uint8 iStart = 0, iEnd = 0; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: iStart = 8; @@ -466,9 +466,9 @@ public: InstanceScript* m_pInstance = pGO->GetInstanceScript(); if (!m_pInstance) return false; - if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) + if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) { - pPlayer->CastSpell(pSkadi,SPELL_RAPID_FIRE, true); + pPlayer->CastSpell(pSkadi, SPELL_RAPID_FIRE, true); } return false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c1970aaadb4..00cc67cd06f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -295,7 +295,7 @@ public: if (pInstance) { pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - pInstance->SetData64(DATA_SACRIFICED_PLAYER,0); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, 0); } } @@ -355,7 +355,7 @@ public: Phase = SACRIFICING; if (pInstance) { - pInstance->SetData64(DATA_SACRIFICED_PLAYER,pSacrificeTarget->GetGUID()); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); for (uint8 i = 0; i < 3; ++i) if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 16caa1adadb..3c04d522c4c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -83,7 +83,7 @@ struct ActiveBoatStruct { uint32 npc; int32 say; - float MoveX,MoveY,MoveZ,SpawnX,SpawnY,SpawnZ,SpawnO; + float MoveX, MoveY, MoveZ, SpawnX, SpawnY, SpawnZ, SpawnO; }; static ActiveBoatStruct ActiveBot[4] = @@ -291,7 +291,7 @@ public: if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) { - float x,y,z; + float x, y, z; x = me->GetPositionX()-5; y = me->GetPositionY()-5; z = me->GetPositionZ(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 7e7cdc01d22..f2c59b63e86 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -22,14 +22,14 @@ //Spells Archavon #define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960,60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663,60880) -#define SPELL_IMPALE RAID_MODE(58666,60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. +#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. +#define SPELL_STOMP RAID_MODE(58663, 60880) +#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. #define SPELL_BERSERK 47008 //Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919,60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897,60899) -#define SPELL_WHIRL RAID_MODE(60902,60916) +#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) +#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) +#define SPELL_WHIRL RAID_MODE(60902, 60916) //4 Warders spawned #define ARCHAVON_WARDER 32353 //npc 32353 @@ -47,7 +47,7 @@ enum Events EVENT_BERSERK = 5, // 300s cd //mob - EVENT_ROCK_SHOWER = 6, // set = 20s cd,unkown cd + EVENT_ROCK_SHOWER = 6, // set = 20s cd, unkown cd EVENT_SHIELD_CRUSH = 7, // set = 30s cd EVENT_WHIRL = 8, // set= 10s cd }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 31ca69c11c3..5ddd2f02a17 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -153,7 +153,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1e540c09220..c1f7aac1779 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -72,8 +72,8 @@ public: { uiBloodlustTimer = 15000; uiChainHealTimer = 0; - uiEarthShockTimer = urand(2000,8000); - uiLightningBoltTimer = urand(5000,10000); + uiEarthShockTimer = urand(2000, 8000); + uiLightningBoltTimer = urand(5000, 10000); uiEarthShieldTimer = 20000; if (pInstance) { @@ -187,20 +187,20 @@ public: if (uiBloodlustTimer <= diff) { DoCast(me, SPELL_BLOODLUST); - uiBloodlustTimer = urand(35000,45000); + uiBloodlustTimer = urand(35000, 45000); } else uiBloodlustTimer -= diff; if (uiEarthShockTimer <= diff) { DoCast(me->getVictim(), SPELL_EARTH_SHOCK); - uiEarthShockTimer = urand(8000,13000); + uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; if (uiLightningBoltTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); - uiLightningBoltTimer = urand(18000,24000); + uiLightningBoltTimer = urand(18000, 24000); } else uiLightningBoltTimer -= diff; DoMeleeAttackIfReady(); @@ -229,7 +229,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } uint64 GetChainHealTargetGUID() @@ -283,9 +283,9 @@ public: void Reset() { - uiStrikeTimer = urand(4000,8000); - uiHowlingScreechTimer = urand(8000,13000); - uiGushingWoundTimer = urand(1000,3000); + uiStrikeTimer = urand(4000, 8000); + uiHowlingScreechTimer = urand(8000, 13000); + uiGushingWoundTimer = urand(1000, 3000); } void AttackStart(Unit* pWho) @@ -314,19 +314,19 @@ public: if (uiStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_STRIKE); - uiStrikeTimer = urand(4000,8000); + uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { DoCast(me->getVictim(), SPELL_HOWLING_SCREECH); - uiHowlingScreechTimer = urand(8000,13000); + uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_GUSHING_WOUND); - uiGushingWoundTimer = urand(7000,12000); + uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b6db8eaf8f6..b82996bfc89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -307,7 +307,7 @@ public: pSummoned->SetSpeed(MOVE_RUN, 0.3f); pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0); m_waterElements.push_back(pSummoned->GetGUID()); - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } } @@ -316,7 +316,7 @@ public: if (pSummoned) { m_waterElements.remove(pSummoned->GetGUID()); - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } } @@ -324,7 +324,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; @@ -354,7 +354,7 @@ public: void Reset() { uiRangeCheck_Timer = 1000; - DoCast(me,SPELL_WATER_GLOBULE); + DoCast(me, SPELL_WATER_GLOBULE); } void AttackStart(Unit* /*pWho*/) diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 65de6aef578..67153a0cf81 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { DoCast(me->getVictim(), SPELL_FIREBOLT); - uiFireboltTimer = urand(5000,13000); + uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { DoCast(me->getVictim(), SPELL_FLAME_BREATH); - uiFlameBreathTimer = urand(10000,15000); + uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { DoCast(me->getVictim(), SPELL_LAVA_BURN); - uiLavaBurnTimer = urand(15000,23000); + uiLavaBurnTimer = urand(15000, 23000); } if (IsHeroic()) @@ -130,7 +130,7 @@ public: if (uiCauterizingFlamesTimer <= diff) { DoCast(me->getVictim(), SPELL_CAUTERIZING_FLAMES); - uiCauterizingFlamesTimer = urand(10000,16000); + uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 2ef3a9b6df6..e2893a5445b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -127,7 +127,7 @@ public: else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) { pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT,13); + pInstance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 19aea5f8769..bfaf971abce 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -99,7 +99,7 @@ public: void DespawnSphere() { std::list<Creature*> assistList; - GetCreatureListWithEntryInGrid(assistList,me, NPC_ETHEREAL_SPHERE ,150.0f); + GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE , 150.0f); if (assistList.empty()) return; @@ -218,7 +218,7 @@ public: if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 9ed5d005321..9b6cb6c2964 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -171,14 +171,14 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summon) { summon->AI()->AttackStart(me->getVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); - summon->SetPhaseMask(17,true); + summon->SetPhaseMask(17, true); } }; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c21d1b491d1..93ef8256fef 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -200,7 +200,7 @@ public: uiDoorIntegrity = 100; uiWaveCount = 0; - uiLocation = urand(0,5); + uiLocation = urand(0, 5); uiFirstBoss = 0; uiSecondBoss = 0; uiCountErekemGuards = 0; @@ -469,9 +469,9 @@ public: void SpawnPortal() { - SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1,5))%6); + SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1, 5))%6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) - if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[GetData(DATA_PORTAL_LOCATION)],TEMPSUMMON_CORPSE_DESPAWN)) + if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -482,7 +482,7 @@ public: switch(uiBoss) { case BOSS_MORAGG: - HandleGameObject(uiMoraggCell,bForceRespawn); + HandleGameObject(uiMoraggCell, bForceRespawn); pBoss = instance->GetCreature(uiMoragg); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove1); @@ -516,25 +516,25 @@ public: } break; case BOSS_ICHORON: - HandleGameObject(uiIchoronCell,bForceRespawn); + HandleGameObject(uiIchoronCell, bForceRespawn); pBoss = instance->GetCreature(uiIchoron); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove3); break; case BOSS_LAVANTHOR: - HandleGameObject(uiLavanthorCell,bForceRespawn); + HandleGameObject(uiLavanthorCell, bForceRespawn); pBoss = instance->GetCreature(uiLavanthor); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove4); break; case BOSS_XEVOZZ: - HandleGameObject(uiXevozzCell,bForceRespawn); + HandleGameObject(uiXevozzCell, bForceRespawn); pBoss = instance->GetCreature(uiXevozz); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove5); break; case BOSS_ZURAMAT: - HandleGameObject(uiZuramatCell,bForceRespawn); + HandleGameObject(uiZuramatCell, bForceRespawn); pBoss = instance->GetCreature(uiZuramat); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove6); @@ -570,7 +570,7 @@ public: { case 6: if (uiFirstBoss == 0) - uiFirstBoss = urand(1,6); + uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) @@ -583,7 +583,7 @@ public: if (uiSecondBoss == 0) do { - uiSecondBoss = urand(1,6); + uiSecondBoss = urand(1, 6); } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { @@ -597,7 +597,7 @@ public: { Creature* pSinclari = instance->GetCreature(uiSinclari); if (pSinclari) - pSinclari->SummonCreature(CREATURE_CYANIGOSA,CyanigosasSpawnLocation,TEMPSUMMON_DEAD_DESPAWN); + pSinclari->SummonCreature(CREATURE_CYANIGOSA, CyanigosasSpawnLocation, TEMPSUMMON_DEAD_DESPAWN); break; } case 1: @@ -701,7 +701,7 @@ public: StartBossEncounter(uiFirstBoss, false); StartBossEncounter(uiSecondBoss, false); - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); SetData(DATA_WAVE_COUNT, 0); uiMainEventPhase = NOT_STARTED; @@ -719,12 +719,12 @@ public: { pGuard->SetVisible(true); pGuard->SetReactState(REACT_AGGRESSIVE); - pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition()); + pGuard->GetMotionMaster()->MovePoint(1, pGuard->GetHomePosition()); } } } - pSinclari->GetMotionMaster()->MovePoint(1,pSinclari->GetHomePosition()); - pSinclari->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + pSinclari->GetMotionMaster()->MovePoint(1, pSinclari->GetHomePosition()); + pSinclari->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } @@ -771,14 +771,14 @@ public: { if(uiDoorSpellTimer < diff) { - SetData(DATA_DOOR_INTEGRITY,GetData(DATA_DOOR_INTEGRITY)-1); + SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; } else uiDoorSpellTimer -= diff; } // else set door state to active (means door will open and group have failed to sustain mob invasion on the door) else { - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); uiMainEventPhase = FAIL; } } @@ -792,7 +792,7 @@ public: { Creature* creature = instance->GetCreature(*itr); if (creature && creature->isAlive()) - creature->CastSpell(creature,SPELL_ARCANE_LIGHTNING,true); // Who should cast the spell? + creature->CastSpell(creature, SPELL_ARCANE_LIGHTNING, true); // Who should cast the spell? } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index cd6a0c66641..e03c69f4672 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -262,13 +262,13 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_sinclari_vh::npc_sinclariAI, (pCreature->AI()))->uiPhase = 1; if (InstanceScript *pInstance = pCreature->GetInstanceScript()) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(),playerTeleportPosition.GetPositionY(),playerTeleportPosition.GetPositionZ(),playerTeleportPosition.GetOrientation(),true); + pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -283,12 +283,12 @@ public: { case NOT_STARTED: case FAIL: // Allow to start event if not started or wiped - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; case IN_PROGRESS: // Allow to teleport inside if event is in progress - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_I_WANT_IN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+3); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; default: @@ -395,7 +395,7 @@ public: break; case 5: if (pInstance) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,IN_PROGRESS); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS); me->SetReactState(REACT_PASSIVE); uiTimer = 0; uiPhase = 0; @@ -492,36 +492,36 @@ public: { case 1: for(int i=0;i<3;i++) - AddWaypoint(i,SaboteurFinalPos1[i][0],SaboteurFinalPos1[i][1],SaboteurFinalPos1[i][2],0); - me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346f); + AddWaypoint(i, SaboteurFinalPos1[i][0], SaboteurFinalPos1[i][1], SaboteurFinalPos1[i][2], 0); + me->SetHomePosition(SaboteurFinalPos1[2][0], SaboteurFinalPos1[2][1], SaboteurFinalPos1[2][2], 4.762346f); break; case 2: for(int i=0;i<3;i++) - AddWaypoint(i,SaboteurFinalPos2[i][0],SaboteurFinalPos2[i][1],SaboteurFinalPos2[i][2],0); - me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674f); + AddWaypoint(i, SaboteurFinalPos2[i][0], SaboteurFinalPos2[i][1], SaboteurFinalPos2[i][2], 0); + me->SetHomePosition(SaboteurFinalPos2[2][0], SaboteurFinalPos2[2][1], SaboteurFinalPos2[2][2], 1.862674f); break; case 3: for(int i=0;i<2;i++) - AddWaypoint(i,SaboteurFinalPos3[i][0],SaboteurFinalPos3[i][1],SaboteurFinalPos3[i][2],0); - me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638f); + AddWaypoint(i, SaboteurFinalPos3[i][0], SaboteurFinalPos3[i][1], SaboteurFinalPos3[i][2], 0); + me->SetHomePosition(SaboteurFinalPos3[1][0], SaboteurFinalPos3[1][1], SaboteurFinalPos3[1][2], 5.500638f); break; case 4: - AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0); - me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108f); + AddWaypoint(0, SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 0); + me->SetHomePosition(SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 3.991108f); break; case 5: - AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0); - me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841f); + AddWaypoint(0, SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 0); + me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: for(int i=0;i<5;i++) - AddWaypoint(i,SaboteurFinalPos6[i][0],SaboteurFinalPos6[i][1],SaboteurFinalPos6[i][2],0); - me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031f); + AddWaypoint(i, SaboteurFinalPos6[i][0], SaboteurFinalPos6[i][1], SaboteurFinalPos6[i][2], 0); + me->SetHomePosition(SaboteurFinalPos6[4][0], SaboteurFinalPos6[4][1], SaboteurFinalPos6[4][2], 0.983031f); break; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } @@ -529,7 +529,7 @@ public: { me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false); me->DisappearAndDie(); - Creature* pSaboPort = Unit::GetCreature((*me),pInstance->GetData64(DATA_SABOTEUR_PORTAL)); + Creature* pSaboPort = Unit::GetCreature((*me), pInstance->GetData64(DATA_SABOTEUR_PORTAL)); if (pSaboPort) pSaboPort->DisappearAndDie(); pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1); @@ -553,7 +553,7 @@ public: npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me) { pInstance = c->GetInstanceScript(); - uiTypeOfMobsPortal = urand(0,1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs + uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs bPortalGuardianOrKeeperOrEliteSpawn = false; } @@ -602,7 +602,7 @@ public: uint8 k = uiWaveCount < 12 ? 2 : 3; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR); + uint32 entry = RAND(CREATURE_AZURE_CAPTAIN, CREATURE_AZURE_RAIDER, CREATURE_AZURE_STALKER, CREATURE_AZURE_SORCEROR); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } me->SetVisible(false); @@ -627,7 +627,7 @@ public: uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_INVADER_1,CREATURE_AZURE_INVADER_2,CREATURE_AZURE_SPELLBREAKER_1,CREATURE_AZURE_SPELLBREAKER_2,CREATURE_AZURE_MAGE_SLAYER_1,CREATURE_AZURE_MAGE_SLAYER_2,CREATURE_AZURE_BINDER_1,CREATURE_AZURE_BINDER_2); + uint32 entry = RAND(CREATURE_AZURE_INVADER_1, CREATURE_AZURE_INVADER_2, CREATURE_AZURE_SPELLBREAKER_1, CREATURE_AZURE_SPELLBREAKER_2, CREATURE_AZURE_MAGE_SLAYER_1, CREATURE_AZURE_MAGE_SLAYER_2, CREATURE_AZURE_BINDER_1, CREATURE_AZURE_BINDER_2); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } } @@ -653,21 +653,21 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1); + pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } void JustSummoned(Creature *pSummoned) { listOfMobs.Summon(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } void SummonedMobDied(Creature *pSummoned) { listOfMobs.Despawn(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } }; @@ -733,57 +733,57 @@ struct violet_hold_trashAI : public npc_escortAI { case 0: for(int i=0;i<6;i++) - AddWaypoint(i,FirstPortalWPs[i][0]+irand(-1,1),FirstPortalWPs[i][1]+irand(-1,1),FirstPortalWPs[i][2]+irand(-1,1),0); - me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439f); + AddWaypoint(i, FirstPortalWPs[i][0]+irand(-1, 1), FirstPortalWPs[i][1]+irand(-1, 1), FirstPortalWPs[i][2]+irand(-1, 1), 0); + me->SetHomePosition(FirstPortalWPs[5][0], FirstPortalWPs[5][1], FirstPortalWPs[5][2], 3.149439f); break; case 1: - secondPortalRouteID = urand(0,1); + secondPortalRouteID = urand(0, 1); switch(secondPortalRouteID) { case 0: for(int i=0;i<9;i++) - AddWaypoint(i,SecondPortalFirstWPs[i][0]+irand(-1,1),SecondPortalFirstWPs[i][1]+irand(-1,1),SecondPortalFirstWPs[i][2],0); - me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439f); + AddWaypoint(i, SecondPortalFirstWPs[i][0]+irand(-1, 1), SecondPortalFirstWPs[i][1]+irand(-1, 1), SecondPortalFirstWPs[i][2], 0); + me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1, 1), SecondPortalFirstWPs[8][1]+irand(-1, 1), SecondPortalFirstWPs[8][2]+irand(-1, 1), 3.149439f); break; case 1: for(int i=0;i<8;i++) - AddWaypoint(i,SecondPortalSecondWPs[i][0]+irand(-1,1),SecondPortalSecondWPs[i][1]+irand(-1,1),SecondPortalSecondWPs[i][2],0); - me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439f); + AddWaypoint(i, SecondPortalSecondWPs[i][0]+irand(-1, 1), SecondPortalSecondWPs[i][1]+irand(-1, 1), SecondPortalSecondWPs[i][2], 0); + me->SetHomePosition(SecondPortalSecondWPs[7][0], SecondPortalSecondWPs[7][1], SecondPortalSecondWPs[7][2], 3.149439f); break; } break; case 2: for(int i=0;i<8;i++) - AddWaypoint(i,ThirdPortalWPs[i][0]+irand(-1,1),ThirdPortalWPs[i][1]+irand(-1,1),ThirdPortalWPs[i][2],0); - me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439f); + AddWaypoint(i, ThirdPortalWPs[i][0]+irand(-1, 1), ThirdPortalWPs[i][1]+irand(-1, 1), ThirdPortalWPs[i][2], 0); + me->SetHomePosition(ThirdPortalWPs[7][0], ThirdPortalWPs[7][1], ThirdPortalWPs[7][2], 3.149439f); break; case 3: for(int i=0;i<9;i++) - AddWaypoint(i,FourthPortalWPs[i][0]+irand(-1,1),FourthPortalWPs[i][1]+irand(-1,1),FourthPortalWPs[i][2],0); - me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439f); + AddWaypoint(i, FourthPortalWPs[i][0]+irand(-1, 1), FourthPortalWPs[i][1]+irand(-1, 1), FourthPortalWPs[i][2], 0); + me->SetHomePosition(FourthPortalWPs[8][0], FourthPortalWPs[8][1], FourthPortalWPs[8][2], 3.149439f); break; case 4: for(int i=0;i<6;i++) - AddWaypoint(i,FifthPortalWPs[i][0]+irand(-1,1),FifthPortalWPs[i][1]+irand(-1,1),FifthPortalWPs[i][2],0); - me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439f); + AddWaypoint(i, FifthPortalWPs[i][0]+irand(-1, 1), FifthPortalWPs[i][1]+irand(-1, 1), FifthPortalWPs[i][2], 0); + me->SetHomePosition(FifthPortalWPs[5][0], FifthPortalWPs[5][1], FifthPortalWPs[5][2], 3.149439f); break; case 5: for(int i=0;i<4;i++) - AddWaypoint(i,SixthPoralWPs[i][0]+irand(-1,1),SixthPoralWPs[i][1]+irand(-1,1),SixthPoralWPs[i][2],0); - me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439f); + AddWaypoint(i, SixthPoralWPs[i][0]+irand(-1, 1), SixthPoralWPs[i][1]+irand(-1, 1), SixthPoralWPs[i][2], 0); + me->SetHomePosition(SixthPoralWPs[3][0], SixthPoralWPs[3][1], SixthPoralWPs[3][2], 3.149439f); break; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } void JustDied(Unit * /*unit*/) { - if (Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) - CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me); + if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) + CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); } void CreatureStartAttackDoor() @@ -791,7 +791,7 @@ struct violet_hold_trashAI : public npc_escortAI me->SetReactState(REACT_PASSIVE); DoCast(SPELL_DESTROY_DOOR_SEAL); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1); } }; @@ -838,7 +838,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(),SPELL_CLEAVE); + DoCast(me->getVictim(), SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -846,7 +846,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_IMPALE); + DoCast(pTarget, SPELL_IMPALE); uiImpaleTimer = 4000; } else uiImpaleTimer -= diff; } @@ -855,14 +855,14 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_BRUTAL_STRIKE); + DoCast(me->getVictim(), SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->getVictim(),SPELL_SUNDER_ARMOR); - uiSunderArmorTimer = urand(8000,10000); + DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; DoMeleeAttackIfReady(); @@ -916,7 +916,7 @@ public: { if (uiArcaneExplosionTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION,H_SPELL_ARCANE_EXPLOSION)); + DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); uiArcaneExplosionTimer = 5000; } else uiArcaneExplosionTimer -= diff; @@ -924,7 +924,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BARRAGE,H_SPELL_ARCANE_BARRAGE)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BARRAGE, H_SPELL_ARCANE_BARRAGE)); uiArcainBarrageTimer = 6000; } else uiArcainBarrageTimer -= diff; } @@ -933,7 +933,7 @@ public: { if (uiFrostNovaTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA)); + DoCast(DUNGEON_MODE(SPELL_FROST_NOVA, H_SPELL_FROST_NOVA)); uiFrostNovaTimer = 5000; } else uiFrostNovaTimer -= diff; @@ -941,7 +941,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_FROSTBOLT,H_SPELL_FROSTBOLT)); + DoCast(pTarget, DUNGEON_MODE(SPELL_FROSTBOLT, H_SPELL_FROSTBOLT)); uiFrostboltTimer = 6000; } else uiFrostboltTimer -= diff; } @@ -990,7 +990,7 @@ public: { if (uiArcaneEmpowermentTimer <= diff) { - DoCast(me,SPELL_ARCANE_EMPOWERMENT); + DoCast(me, SPELL_ARCANE_EMPOWERMENT); uiArcaneEmpowermentTimer = 14000; } else uiArcaneEmpowermentTimer -= diff; } @@ -1001,7 +1001,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SPELL_LOCK); + DoCast(pTarget, SPELL_SPELL_LOCK); uiSpellLockTimer = 9000; } else uiSpellLockTimer -= diff; } @@ -1048,14 +1048,14 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->getVictim(),SPELL_CONCUSSION_BLOW); + DoCast(me->getVictim(), SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; if (uiMagicReflectionTimer <= diff) { DoCast(SPELL_MAGIC_REFLECTION); - uiMagicReflectionTimer = urand(10000,15000); + uiMagicReflectionTimer = urand(10000, 15000); } else uiMagicReflectionTimer -= diff; DoMeleeAttackIfReady(); @@ -1105,7 +1105,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true); if (pTarget) - DoCast(pTarget,SPELL_TACTICAL_BLINK); + DoCast(pTarget, SPELL_TACTICAL_BLINK); uiTacticalBlinkTimer = 6000; TacticalBlinkCasted = true; } else uiTacticalBlinkTimer -= diff; @@ -1116,7 +1116,7 @@ public: if (uiBackstabTimer <= diff) { Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true); - DoCast(pTarget,SPELL_BACKSTAB); + DoCast(pTarget, SPELL_BACKSTAB); TacticalBlinkCasted = false; uiBackstabTimer =1300; } else uiBackstabTimer -= diff; @@ -1167,7 +1167,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BLAST,H_SPELL_ARCANE_BLAST)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); uiArcaneBlastTimer = 6000; } else uiArcaneBlastTimer -= diff; @@ -1175,7 +1175,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SLOW); + DoCast(pTarget, SPELL_SLOW); uiSlowTimer = 5000; } else uiSlowTimer -= diff; } @@ -1186,13 +1186,13 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_CHAINS_OF_ICE); + DoCast(pTarget, SPELL_CHAINS_OF_ICE); uiChainsOfIceTimer = 7000; } else uiChainsOfIceTimer -= diff; if (uiConeOfColdTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD,H_SPELL_CONE_OF_COLD)); + DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD, H_SPELL_CONE_OF_COLD)); uiConeOfColdTimer = 5000; } else uiConeOfColdTimer -= diff; } @@ -1243,13 +1243,13 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_MORTAL_STRIKE); + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; if (uiWhirlwindTimer <= diff) { - DoCast(me,SPELL_WHIRLWIND_OF_STEEL); + DoCast(me, SPELL_WHIRLWIND_OF_STEEL); uiWhirlwindTimer = 8000; } else uiWhirlwindTimer -= diff; @@ -1299,15 +1299,15 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_STREAM,H_SPELL_ARCANE_STREAM)); - uiArcaneStreamTimer = urand(0,5000)+5000; + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_STREAM, H_SPELL_ARCANE_STREAM)); + uiArcaneStreamTimer = urand(0, 5000)+5000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; } else uiArcaneStreamTimer -= diff; if (uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2) { - DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION,H_SPELL_MANA_DETONATION)); - uiManaDetonationTimer = urand(2000,6000); + DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION, H_SPELL_MANA_DETONATION)); + uiManaDetonationTimer = urand(2000, 6000); } else uiManaDetonationTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 7b0c5de36d2..a675bcc6f03 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -100,13 +100,13 @@ public: case 1: DoCast(me, SPELL_EXPLODE_CART, true); DoCast(me, SPELL_SUMMON_CART, true); - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->SetUInt32Value(GAMEOBJECT_FACTION, 14); uiPhaseTimer = 3000; Phase = 2; break; case 2: - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->UseDoorOrButton(); DoCast(me, SPELL_EXPLODE_CART, true); uiPhaseTimer = 3000; @@ -139,7 +139,7 @@ public: case 7: DoCast(me, SPELL_EXPLODE_CART, true); if (Player *caster = Unit::GetPlayer(*me, casterGuid)) - caster->KilledMonster(me->GetCreatureInfo(),me->GetGUID()); + caster->KilledMonster(me->GetCreatureInfo(), me->GetGUID()); uiPhaseTimer = 5000; Phase = 8; break; @@ -362,14 +362,14 @@ public: { if (CAST_PLR(Killer)->GetQuestStatus(11611) == QUEST_STATUS_INCOMPLETE) { - uint8 uiRand = urand(0,99); + uint8 uiRand = urand(0, 99); if (uiRand < 25) { - Killer->CastSpell(me,45532,true); + Killer->CastSpell(me, 45532, true); CAST_PLR(Killer)->KilledMonsterCredit(WARSONG_PEON, 0); } else if (uiRand < 75) - Killer->CastSpell(me, nerubarVictims[urand(0,2)], true); + Killer->CastSpell(me, nerubarVictims[urand(0, 2)], true); } } } @@ -403,7 +403,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE, 5.0f)) if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); } @@ -471,7 +471,7 @@ public: { if (setCrateNumber) { - me->AddAura(SPELL_CRATES_CARRIED,me); + me->AddAura(SPELL_CRATES_CARRIED, me); setCrateNumber = false; } @@ -600,7 +600,7 @@ public: if (summon->isSummon()) if (Unit *pTemp = summon->GetSummoner()) if (pTemp->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(),0); + CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); @@ -742,12 +742,12 @@ public: switch(IntroPhase) { case 1: - //DoScriptText(SAY_WP_1_LUR_START,me); + //DoScriptText(SAY_WP_1_LUR_START, me); IntroPhase = 2; IntroTimer = 7500; break; case 2: - //DoScriptText(SAY_WP_1_LUR_END,me); + //DoScriptText(SAY_WP_1_LUR_END, me); IntroPhase = 3; IntroTimer = 7500; break; @@ -757,12 +757,12 @@ public: IntroTimer = 0; break; case 4: - //DoScriptText(SAY_WP_41_LUR_START,me); + //DoScriptText(SAY_WP_41_LUR_START, me); IntroPhase = 5; IntroTimer = 8000; break; case 5: - //DoScriptText(SAY_WP_41_LUR_END,me); + //DoScriptText(SAY_WP_41_LUR_END, me); IntroPhase = 6; IntroTimer = 2500; break; @@ -889,7 +889,7 @@ public: { if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { - pHarpooner->KilledMonsterCredit(26175,0); + pHarpooner->KilledMonsterCredit(26175, 0); pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED); SetFollowComplete(); HarpoonerGUID = 0; @@ -1031,13 +1031,13 @@ public: pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pArthas->SetReactState(REACT_PASSIVE); pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f,3564.841309f,477.433014f); + pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f,3568.882080f,477.433014f); + pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f, 3568.882080f, 477.433014f); } me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -1084,7 +1084,7 @@ public: case 2: if (pTalbot) { - pTalbot->UpdateEntry(NPC_PRINCE_VALANAR,ALLIANCE); + pTalbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE); pTalbot->setFaction(14); pTalbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTalbot->SetReactState(REACT_PASSIVE); @@ -1115,13 +1115,13 @@ public: break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArlos = pArlos->GetGUID(); pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1300,7 +1300,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; } }; @@ -1332,7 +1332,7 @@ public: me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; } }; @@ -1378,9 +1378,9 @@ public: LeryssaGUID = 0; ArlosGUID = 0; bCheck = false; - uiShadowBoltTimer = urand(5000,12000); - uiDeflectionTimer = urand(20000,25000); - uiSoulBlastTimer = urand (12000,18000); + uiShadowBoltTimer = urand(5000, 12000); + uiDeflectionTimer = urand(20000, 25000); + uiSoulBlastTimer = urand (12000, 18000); } void MovementInform(uint32 uiType, uint32 /*uiId*/) { @@ -1389,7 +1389,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; } void UpdateAI(const uint32 uiDiff) @@ -1411,19 +1411,19 @@ public: if (uiShadowBoltTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(5000,12000); + uiShadowBoltTimer = urand(5000, 12000); } else uiShadowBoltTimer -= uiDiff; if (uiDeflectionTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_DEFLECTION); - uiDeflectionTimer = urand(20000,25000); + uiDeflectionTimer = urand(20000, 25000); } else uiDeflectionTimer -= uiDiff; if (uiSoulBlastTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SOUL_BLAST); - uiSoulBlastTimer = urand (12000,18000); + uiSoulBlastTimer = urand (12000, 18000); } else uiSoulBlastTimer -= uiDiff; } @@ -1447,7 +1447,7 @@ public: pLeryssa->RemoveAura(SPELL_STUN); pLeryssa->ClearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); + pLeryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); @@ -1500,7 +1500,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; bDone = true; } else @@ -1564,7 +1564,7 @@ public: if (Unit* pThassarian = CAST_SUM(me)->GetSummoner()) { DoScriptText(SAY_THASSARIAN_7, pThassarian); - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pThassarian)->AI())->uiPhase = 16; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pThassarian)->AI())->uiPhase = 16; } uiPhaseTimer = 5000; Phase = 0; @@ -1765,7 +1765,7 @@ public: if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID)) { DoScriptText(SAY_IMPRISIONED_BERYL_5, me); - pCaster->KilledMonsterCredit(25478,0); + pCaster->KilledMonsterCredit(25478, 0); uiStep = 6; } } @@ -1875,7 +1875,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; case 20: - me->SetPhaseMask(1,true); + me->SetPhaseMask(1, true); DoScriptText(SAY_5, me); me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); if (pPlayer) @@ -1954,7 +1954,7 @@ public: { if (Bonker_agro == 0) { - DoScriptText(SAY_bonker_1,me); + DoScriptText(SAY_bonker_1, me); Bonker_agro++; } DoMeleeAttackIfReady(); @@ -2046,7 +2046,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetGoState(GO_STATE_ACTIVE); @@ -2063,7 +2063,7 @@ public: { Position pos; me->GetRandomNearPosition(pos, 10.0f); - me->GetMotionMaster()->MovePoint(0,pos); + me->GetMotionMaster()->MovePoint(0, pos); bStarted = false; } else uiTimer -= diff; @@ -2085,7 +2085,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetLootState(GO_JUST_DEACTIVATED); @@ -2132,7 +2132,7 @@ public: { Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); if (qInfo) - CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0); + CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); } } }; @@ -2162,7 +2162,7 @@ public: uint32 uiExplosionTimer; void Reset() { - uiExplosionTimer = urand(5000,10000); + uiExplosionTimer = urand(5000, 10000); } void UpdateAI(const uint32 diff) { @@ -2177,7 +2177,7 @@ public: { Player* pOwner = uOwner->ToPlayer(); if (pOwner && pOwner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE) - pOwner->KilledMonsterCredit(cCredit->GetEntry(),cCredit->GetGUID()); + pOwner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID()); } } } @@ -2216,7 +2216,7 @@ public: void Reset() { - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } void UpdateAI(const uint32 diff) @@ -2224,12 +2224,12 @@ public: if (uiTimer <= diff) { me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); - GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1,10); + GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1, 10); if (!pCannon) - pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2,10); + pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2, 10); if (pCannon) pCannon->Use(me); - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } else uiTimer -= diff; @@ -2299,10 +2299,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() > 6680) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_CALANDRA: @@ -2313,10 +2313,10 @@ public: { if (Creature* pOrb = *itr) if ((pOrb->GetPositionY() < 6680) && (pOrb->GetPositionY() > 6630)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_WATKINS: @@ -2327,10 +2327,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() < 6630) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; } @@ -2403,10 +2403,10 @@ public: void Reset() { if (uiEmoteState) - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,uiEmoteState); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, uiEmoteState); if (uiNpcFlags) - me->SetUInt32Value(UNIT_NPC_FLAGS,uiNpcFlags); + me->SetUInt32Value(UNIT_NPC_FLAGS, uiNpcFlags); uiEventTimer = 0; uiEventPhase = 0; @@ -2439,7 +2439,7 @@ public: void AttackPlayer() { me->setFaction(14); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) me->AI()->AttackStart(pPlayer); } @@ -2453,18 +2453,18 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0); - DoScriptText(SAY_HIDDEN_CULTIST_1,me); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + DoScriptText(SAY_HIDDEN_CULTIST_1, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_GUARD_MITCHELLS: - DoScriptText(SAY_HIDDEN_CULTIST_2,me); + DoScriptText(SAY_HIDDEN_CULTIST_2, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_TOM_HEGGER: - DoScriptText(SAY_HIDDEN_CULTIST_3,me); + DoScriptText(SAY_HIDDEN_CULTIST_3, me); uiEventTimer = 5000; uiEventPhase = 2; break; @@ -2474,8 +2474,8 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - DoScriptText(SAY_HIDDEN_CULTIST_4,me); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + DoScriptText(SAY_HIDDEN_CULTIST_4, me); + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { me->SetInFront(pPlayer); me->SendMovementFlagUpdate(); diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 92040aed8d8..277f9d98091 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -87,13 +87,13 @@ public: }else { if (!uiTargetGUID) - if (Creature* pOrb = GetClosestCreatureWithEntry(me,NPC_TRANSITUS_SHIELD_DUMMY,32.0f)) + if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) uiTargetGUID = pOrb->GetGUID(); } - if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + if (Creature* pOrb = me->GetCreature(*me, uiTargetGUID)) + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } }; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 67e0ad5d776..fa08e8cafb4 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -195,7 +195,7 @@ public: if (Unit::GetCreature(*me, MrfloppyGUID)) { DoScriptText(SAY_WORGHAGGRO1, me); - me->SummonCreature(NPC_HUNGRY_WORG,me->GetPositionX()+5,me->GetPositionY()+2,me->GetPositionZ()+1,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + me->SummonCreature(NPC_HUNGRY_WORG, me->GetPositionX()+5, me->GetPositionY()+2, me->GetPositionZ()+1, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; case 11: @@ -206,7 +206,7 @@ public: if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, me); - if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG,me->GetPositionX()+10,me->GetPositionY()+8,me->GetPositionZ()+2,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000)) + if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); RWORGGUID = RWORG->GetGUID(); @@ -217,7 +217,7 @@ public: { if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); - DoCast(Mrfloppy,SPELL_MRFLOPPY); + DoCast(Mrfloppy, SPELL_MRFLOPPY); } break; case 19: @@ -242,7 +242,7 @@ public: RWORG->Kill(Mrfloppy); Mrfloppy->ExitVehicle(); RWORG->setFaction(14); - RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10,RWORG->GetPositionY()+80,RWORG->GetPositionZ()); + RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10, RWORG->GetPositionY()+80, RWORG->GetPositionZ()); DoScriptText(SAY_VICTORY2, me); } } @@ -600,7 +600,7 @@ public: && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); - DoScriptText(RAND(RANDOM_SAY_1,RANDOM_SAY_2,RANDOM_SAY_3),caster); + DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); if(me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else @@ -656,7 +656,7 @@ public: void Reset() { - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } void UpdateAI(const uint32 uiDiff) @@ -667,7 +667,7 @@ public: if (uiChargedSentryTotem <= uiDiff) { DoCast(SPELL_CHARGED_SENTRY_TOTEM); - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } else uiChargedSentryTotem -= uiDiff; @@ -728,7 +728,7 @@ public: { uiPlayerGUID = 0; uiTimer = 0; - uiChopTimer = urand(10000,12500); + uiChopTimer = urand(10000, 12500); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); } @@ -776,7 +776,7 @@ public: if (uiChopTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CHOP); - uiChopTimer = urand(10000,12000); + uiChopTimer = urand(10000, 12000); } else uiChopTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1729f5f55d5..3810d445b61 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -114,22 +114,22 @@ public: me->DespawnOrUnsummon(); break; case 5: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 6: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; case 8: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 9: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); break; case 10: @@ -139,7 +139,7 @@ public: SetRun(false); break; case 14: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; @@ -400,7 +400,7 @@ public: void JustSummoned(Creature* pSummon) { - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { if (pPlayer->isAlive()) { diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index b29e3929722..6075bc52d25 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -187,7 +187,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451f,952.472f,547.554f,0.38f); + pCreature->SummonCreature(NPC_ARGENT_VALIANT, 8575.451f, 952.472f, 547.554f, 0.38f); } return true; } @@ -214,7 +214,7 @@ public: { npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) { - pCreature->GetMotionMaster()->MovePoint(0,8599.258f,963.951f,547.553f); + pCreature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f); pCreature->setFaction(35); //wrong faction in db? } @@ -240,10 +240,10 @@ public: if (uiDamage > me->GetHealth() && pDoneBy->GetTypeId() == TYPEID_PLAYER) { uiDamage = 0; - CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT,0); + CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT, 0); me->setFaction(35); me->DespawnOrUnsummon(5000); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); EnterEvadeMode(); } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 7d2e0c2e2a1..f7011e00e6a 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -56,7 +56,7 @@ class npc_four_car_garage : public CreatureScript return; } - me->CastSpell(who,spellId,true); + me->CastSpell(who, spellId, true); } } }; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 53dfca49d5f..f03236f86a4 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -101,7 +101,7 @@ public: if (Player* pPlayer = GetPlayerForEscort()) pPlayer->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me); // me->RestoreFaction(); - DoScriptText(SAY_END_IRO,me); + DoScriptText(SAY_END_IRO, me); SetRun(false); break; } @@ -307,7 +307,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) if (pSummoner) - me->GetMotionMaster()->MovePoint(0,pSummoner->GetPositionX(),pSummoner->GetPositionY(),pSummoner->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ()); } void UpdateAI(const uint32 /*uiDiff*/) diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index a8575d72ee7..3f6003e8903 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -213,7 +213,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE, 5.0f)) { if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 2bf418a2130..befe34faeed 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -92,7 +92,7 @@ public: if (Creature* pRageclaw = Unit::GetCreature(*me, RageclawGUID)) { UnlockRageclaw(pCaster); - pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(),RageclawGUID); + pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(), RageclawGUID); me->DisappearAndDie(); } else @@ -122,7 +122,7 @@ const char * SAY_RAGECLAW_1 = "I poop on you, trollses!"; const char * SAY_RAGECLAW_2 = "ARRRROOOOGGGGAAAA!"; const char * SAY_RAGECLAW_3 = "No more mister nice wolvar!"; -#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1,SAY_RAGECLAW_2,SAY_RAGECLAW_3) +#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1, SAY_RAGECLAW_2, SAY_RAGECLAW_3) class npc_captured_rageclaw : public CreatureScript { @@ -292,10 +292,10 @@ struct BossAndAdd static BossAndAdd Boss[]= { - {NPC_GARGORAL,NPC_FIEND_WATER,SPELL_CRASHING_WAVE,SPELL_ORB_OF_WATER}, - {NPC_AZ_BARIN,NPC_FIEND_AIR,SPELL_BLAST_OF_AIR,SPELL_ORB_OF_STORMS}, - {NPC_DUKE_SINGEN,NPC_FIEND_FIRE,SPELL_MAGMA_WAVE,SPELL_ORB_OF_FLAME}, - {NPC_ERATHIUS,NPC_FIEND_EARTH,SPELL_SHOCKWAVE,SPELL_BOULDER}, + {NPC_GARGORAL, NPC_FIEND_WATER, SPELL_CRASHING_WAVE, SPELL_ORB_OF_WATER}, + {NPC_AZ_BARIN, NPC_FIEND_AIR, SPELL_BLAST_OF_AIR, SPELL_ORB_OF_STORMS}, + {NPC_DUKE_SINGEN, NPC_FIEND_FIRE, SPELL_MAGMA_WAVE, SPELL_ORB_OF_FLAME}, + {NPC_ERATHIUS, NPC_FIEND_EARTH, SPELL_SHOCKWAVE, SPELL_BOULDER}, }; const Position SpawnPosition[] = @@ -457,7 +457,7 @@ public: std::string sText = ("The grand Amphitheater of Anguish awaits, " + std::string(pPlayer->GetName()) + ". Remember, once a battle starts you have to stay in the area. WIN OR DIE!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 9; } @@ -468,7 +468,7 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 3000; uiPhase = 8; } @@ -484,19 +484,19 @@ public: return; std::string sText = ("Here we are once again, ladies and gentlemen. The epic struggle between life and death in the Amphitheater of Anguish! For this round we have " + std::string(pPlayer->GetName()) + " versus the hulking jormungar, Yg... Yggd? Yggdoze? Who comes up with these names?! " + std::string(pPlayer->GetName()) + " versus big worm!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 10000; uiPhase = 10; } break; case 10: me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); - DoScriptText(EMOTE_YGGDRAS_SPAWN,me); + DoScriptText(EMOTE_YGGDRAS_SPAWN, me); uiPhase = 0; break; case 11: if (Creature* pCreature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - DoScriptText(SAY_STINKBEARD_SPAWN,pCreature); + DoScriptText(SAY_STINKBEARD_SPAWN, pCreature); uiPhase = 0; break; case 12: @@ -505,20 +505,20 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 13; } break; case 13: - DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN,me); + DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN, me); uiTimer = 3000; uiPhase = 14; break; case 14: - uiBossRandom = urand(0,3); - if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss,SpawnPosition[2],TEMPSUMMON_CORPSE_DESPAWN, 1000)) - pCreature->AI()->SetData(1,uiBossRandom); + uiBossRandom = urand(0, 3); + if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss, SpawnPosition[2], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + pCreature->AI()->SetData(1, uiBossRandom); uiPhase = 0; break; } @@ -624,7 +624,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); uiBattleShoutTimer = 7000; } @@ -646,7 +646,7 @@ public: if (uiFishyScentTimer <= uiDiff) { - if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pAffected, SPELL_FISHY_SCENT); AffectedGUID = pAffected->GetGUID(); @@ -656,7 +656,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP ,me); + DoScriptText(SAY_CALL_FOR_HELP , me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature *pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) @@ -723,7 +723,7 @@ public: { npc_korrak_bloodragerAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -746,7 +746,7 @@ public: switch(uiI) { case 6: - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); break; @@ -844,7 +844,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -872,7 +872,7 @@ public: if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) { std::string sText = (std::string(pKiller->GetName()) + " has defeated Yg.. Yggg-really big worm!"); - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -916,7 +916,7 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_PASSIVE); - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -928,7 +928,7 @@ public: void Reset() { - me->AddAura(SPELL_THUNDERBLADE,me); + me->AddAura(SPELL_THUNDERBLADE, me); uiKnockAwayTimer = 10000; uiStinkyBeardTimer = 15000; bEnrage = false; @@ -966,7 +966,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1015,7 +1015,7 @@ public: pPlayer->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, pKiller); std::string sText = ("And with AUTHORITY, " + std::string(pKiller->GetName()) + " dominates the magnataur lord! Stinkbeard's clan is gonna miss him back home in the Dragonblight!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1051,7 +1051,7 @@ public: { uiBossRandom = 0; uiSpellEntry = 0; - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); bAddAttack = false; } @@ -1074,9 +1074,9 @@ public: for (uint8 uiI = 0; uiI < 16 ; uiI++) { - if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd,AddSpawnPosition[uiI])) + if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd, AddSpawnPosition[uiI])) { - pSummon->AI()->SetData(1,uiBossRandom); + pSummon->AI()->SetData(1, uiBossRandom); SummonList.push_back(pSummon->GetGUID()); } } @@ -1111,7 +1111,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1123,7 +1123,7 @@ public: { DoCastVictim(Boss[uiBossRandom].uiSpell); - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); } else uiElementalSpellTimer -= uiDiff; if (!bAddAttack && !HealthAbovePct(20)) @@ -1160,7 +1160,7 @@ public: std::string sText = (std::string(pKiller->GetName()) + " is victorious once more!"); if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1192,7 +1192,7 @@ public: me->GetMotionMaster()->MoveIdle(); uiSpell = 0; - uiMissleTimer = urand(2000,7000); + uiMissleTimer = urand(2000, 7000); } void AttackStart(Unit* pWho) @@ -1219,8 +1219,8 @@ public: { if (uiMissleTimer <= uiDiff) { - DoCast(me,uiSpell); // this spell is not supported ... YET! - uiMissleTimer = urand(2000,7000); + DoCast(me, uiSpell); // this spell is not supported ... YET! + uiMissleTimer = urand(2000, 7000); } else uiMissleTimer -= uiDiff; } @@ -1322,14 +1322,14 @@ public: // say random text me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - DoScriptText(RAND(SAY_RECRUIT_1,SAY_RECRUIT_2,SAY_RECRUIT_3), me); + DoScriptText(RAND(SAY_RECRUIT_1, SAY_RECRUIT_2, SAY_RECRUIT_3), me); m_uiTimer = 3000; m_uiPhase = 2; break; case 2: // walk forward me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(0,me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); m_uiTimer = 5000; m_uiPhase = 3; break; @@ -1401,11 +1401,11 @@ public: { if (pPlayer->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) { - Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY,20.0f); + Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY, 20.0f); if (pGymerDummy) { pGO->UseDoorOrButton(); - pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(),pGymerDummy->GetGUID()); + pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(), pGymerDummy->GetGUID()); pGymerDummy->CastSpell(pGymerDummy, 55529, true); pGymerDummy->DisappearAndDie(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index b1b82aef1d8..1a69c6a828d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -31,8 +31,8 @@ OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_UnitsSummonedSide(0) { - SetCapturePointData(EPCapturePoints[EP_EWT].entry,EPCapturePoints[EP_EWT].map,EPCapturePoints[EP_EWT].x,EPCapturePoints[EP_EWT].y,EPCapturePoints[EP_EWT].z,EPCapturePoints[EP_EWT].o,EPCapturePoints[EP_EWT].rot0,EPCapturePoints[EP_EWT].rot1,EPCapturePoints[EP_EWT].rot2,EPCapturePoints[EP_EWT].rot3); - AddObject(EP_EWT_FLAGS,EPTowerFlags[EP_EWT].entry,EPTowerFlags[EP_EWT].map,EPTowerFlags[EP_EWT].x,EPTowerFlags[EP_EWT].y,EPTowerFlags[EP_EWT].z,EPTowerFlags[EP_EWT].o,EPTowerFlags[EP_EWT].rot0,EPTowerFlags[EP_EWT].rot1,EPTowerFlags[EP_EWT].rot2,EPTowerFlags[EP_EWT].rot3); + SetCapturePointData(EPCapturePoints[EP_EWT].entry, EPCapturePoints[EP_EWT].map, EPCapturePoints[EP_EWT].x, EPCapturePoints[EP_EWT].y, EPCapturePoints[EP_EWT].z, EPCapturePoints[EP_EWT].o, EPCapturePoints[EP_EWT].rot0, EPCapturePoints[EP_EWT].rot1, EPCapturePoints[EP_EWT].rot2, EPCapturePoints[EP_EWT].rot3); + AddObject(EP_EWT_FLAGS, EPTowerFlags[EP_EWT].entry, EPTowerFlags[EP_EWT].map, EPTowerFlags[EP_EWT].x, EPTowerFlags[EP_EWT].y, EPTowerFlags[EP_EWT].z, EPTowerFlags[EP_EWT].o, EPTowerFlags[EP_EWT].rot0, EPTowerFlags[EP_EWT].rot1, EPTowerFlags[EP_EWT].rot2, EPTowerFlags[EP_EWT].rot3); } void OPvPCapturePointEP_EWT::ChangeState() @@ -40,12 +40,12 @@ void OPvPCapturePointEP_EWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0; } @@ -58,14 +58,14 @@ void OPvPCapturePointEP_EWT::ChangeState() artkit = 2; SummonSupportUnitAtNorthpassTower(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonSupportUnitAtNorthpassTower(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -160,7 +160,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team) for (uint8 i = 0; i < EP_EWT_NUM_CREATURES; ++i) { DelCreature(i); - AddCreature(i,ct[i].entry,ct[i].teamval,ct[i].map,ct[i].x,ct[i].y,ct[i].z,ct[i].o,1000000); + AddCreature(i, ct[i].entry, ct[i].teamval, ct[i].map, ct[i].x, ct[i].y, ct[i].z, ct[i].o, 1000000); } } } @@ -169,8 +169,8 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team) OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_SummonedGOSide(0) { - SetCapturePointData(EPCapturePoints[EP_NPT].entry,EPCapturePoints[EP_NPT].map,EPCapturePoints[EP_NPT].x,EPCapturePoints[EP_NPT].y,EPCapturePoints[EP_NPT].z,EPCapturePoints[EP_NPT].o,EPCapturePoints[EP_NPT].rot0,EPCapturePoints[EP_NPT].rot1,EPCapturePoints[EP_NPT].rot2,EPCapturePoints[EP_NPT].rot3); - AddObject(EP_NPT_FLAGS,EPTowerFlags[EP_NPT].entry,EPTowerFlags[EP_NPT].map,EPTowerFlags[EP_NPT].x,EPTowerFlags[EP_NPT].y,EPTowerFlags[EP_NPT].z,EPTowerFlags[EP_NPT].o,EPTowerFlags[EP_NPT].rot0,EPTowerFlags[EP_NPT].rot1,EPTowerFlags[EP_NPT].rot2,EPTowerFlags[EP_NPT].rot3); + SetCapturePointData(EPCapturePoints[EP_NPT].entry, EPCapturePoints[EP_NPT].map, EPCapturePoints[EP_NPT].x, EPCapturePoints[EP_NPT].y, EPCapturePoints[EP_NPT].z, EPCapturePoints[EP_NPT].o, EPCapturePoints[EP_NPT].rot0, EPCapturePoints[EP_NPT].rot1, EPCapturePoints[EP_NPT].rot2, EPCapturePoints[EP_NPT].rot3); + AddObject(EP_NPT_FLAGS, EPTowerFlags[EP_NPT].entry, EPTowerFlags[EP_NPT].map, EPTowerFlags[EP_NPT].x, EPTowerFlags[EP_NPT].y, EPTowerFlags[EP_NPT].z, EPTowerFlags[EP_NPT].o, EPTowerFlags[EP_NPT].rot0, EPTowerFlags[EP_NPT].rot1, EPTowerFlags[EP_NPT].rot2, EPTowerFlags[EP_NPT].rot3); } void OPvPCapturePointEP_NPT::ChangeState() @@ -178,12 +178,12 @@ void OPvPCapturePointEP_NPT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0; } @@ -196,14 +196,14 @@ void OPvPCapturePointEP_NPT::ChangeState() artkit = 2; SummonGO(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonGO(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -301,10 +301,10 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) { m_SummonedGOSide = team; DelObject(EP_NPT_BUFF); - AddObject(EP_NPT_BUFF,EP_NPT_LordaeronShrine.entry,EP_NPT_LordaeronShrine.map,EP_NPT_LordaeronShrine.x,EP_NPT_LordaeronShrine.y,EP_NPT_LordaeronShrine.z,EP_NPT_LordaeronShrine.o,EP_NPT_LordaeronShrine.rot0,EP_NPT_LordaeronShrine.rot1,EP_NPT_LordaeronShrine.rot2,EP_NPT_LordaeronShrine.rot3); + AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3); GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); if (go) - go->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 84 : 83)); + go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83)); } } @@ -312,8 +312,8 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_GraveyardSide(0) { - SetCapturePointData(EPCapturePoints[EP_CGT].entry,EPCapturePoints[EP_CGT].map,EPCapturePoints[EP_CGT].x,EPCapturePoints[EP_CGT].y,EPCapturePoints[EP_CGT].z,EPCapturePoints[EP_CGT].o,EPCapturePoints[EP_CGT].rot0,EPCapturePoints[EP_CGT].rot1,EPCapturePoints[EP_CGT].rot2,EPCapturePoints[EP_CGT].rot3); - AddObject(EP_CGT_FLAGS,EPTowerFlags[EP_CGT].entry,EPTowerFlags[EP_CGT].map,EPTowerFlags[EP_CGT].x,EPTowerFlags[EP_CGT].y,EPTowerFlags[EP_CGT].z,EPTowerFlags[EP_CGT].o,EPTowerFlags[EP_CGT].rot0,EPTowerFlags[EP_CGT].rot1,EPTowerFlags[EP_CGT].rot2,EPTowerFlags[EP_CGT].rot3); + SetCapturePointData(EPCapturePoints[EP_CGT].entry, EPCapturePoints[EP_CGT].map, EPCapturePoints[EP_CGT].x, EPCapturePoints[EP_CGT].y, EPCapturePoints[EP_CGT].z, EPCapturePoints[EP_CGT].o, EPCapturePoints[EP_CGT].rot0, EPCapturePoints[EP_CGT].rot1, EPCapturePoints[EP_CGT].rot2, EPCapturePoints[EP_CGT].rot3); + AddObject(EP_CGT_FLAGS, EPTowerFlags[EP_CGT].entry, EPTowerFlags[EP_CGT].map, EPTowerFlags[EP_CGT].x, EPTowerFlags[EP_CGT].y, EPTowerFlags[EP_CGT].z, EPTowerFlags[EP_CGT].o, EPTowerFlags[EP_CGT].rot0, EPTowerFlags[EP_CGT].rot1, EPTowerFlags[EP_CGT].rot2, EPTowerFlags[EP_CGT].rot3); } void OPvPCapturePointEP_CGT::ChangeState() @@ -321,12 +321,12 @@ void OPvPCapturePointEP_CGT::ChangeState() // if changing from controlling alliance to horde or vice versa if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0; } @@ -339,14 +339,14 @@ void OPvPCapturePointEP_CGT::ChangeState() artkit = 2; LinkGraveYard(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; LinkGraveYard(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -432,8 +432,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team) if (m_GraveyardSide != team) { m_GraveyardSide = team; - sObjectMgr->RemoveGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false); - sObjectMgr->AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false); + sObjectMgr->RemoveGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false); + sObjectMgr->AddGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false); } } @@ -441,8 +441,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team) OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_FlightMasterSpawned(0), m_TowerState(EP_TS_N) { - SetCapturePointData(EPCapturePoints[EP_PWT].entry,EPCapturePoints[EP_PWT].map,EPCapturePoints[EP_PWT].x,EPCapturePoints[EP_PWT].y,EPCapturePoints[EP_PWT].z,EPCapturePoints[EP_PWT].o,EPCapturePoints[EP_PWT].rot0,EPCapturePoints[EP_PWT].rot1,EPCapturePoints[EP_PWT].rot2,EPCapturePoints[EP_PWT].rot3); - AddObject(EP_PWT_FLAGS,EPTowerFlags[EP_PWT].entry,EPTowerFlags[EP_PWT].map,EPTowerFlags[EP_PWT].x,EPTowerFlags[EP_PWT].y,EPTowerFlags[EP_PWT].z,EPTowerFlags[EP_PWT].o,EPTowerFlags[EP_PWT].rot0,EPTowerFlags[EP_PWT].rot1,EPTowerFlags[EP_PWT].rot2,EPTowerFlags[EP_PWT].rot3); + SetCapturePointData(EPCapturePoints[EP_PWT].entry, EPCapturePoints[EP_PWT].map, EPCapturePoints[EP_PWT].x, EPCapturePoints[EP_PWT].y, EPCapturePoints[EP_PWT].z, EPCapturePoints[EP_PWT].o, EPCapturePoints[EP_PWT].rot0, EPCapturePoints[EP_PWT].rot1, EPCapturePoints[EP_PWT].rot2, EPCapturePoints[EP_PWT].rot3); + AddObject(EP_PWT_FLAGS, EPTowerFlags[EP_PWT].entry, EPTowerFlags[EP_PWT].map, EPTowerFlags[EP_PWT].x, EPTowerFlags[EP_PWT].y, EPTowerFlags[EP_PWT].z, EPTowerFlags[EP_PWT].o, EPTowerFlags[EP_PWT].rot0, EPTowerFlags[EP_PWT].rot1, EPTowerFlags[EP_PWT].rot2, EPTowerFlags[EP_PWT].rot3); } void OPvPCapturePointEP_PWT::ChangeState() @@ -450,12 +450,12 @@ void OPvPCapturePointEP_PWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0; } @@ -468,14 +468,14 @@ void OPvPCapturePointEP_PWT::ChangeState() SummonFlightMaster(ALLIANCE); artkit = 2; ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; SummonFlightMaster(HORDE); artkit = 1; ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -572,13 +572,13 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) { m_FlightMasterSpawned = team; DelCreature(EP_PWT_FLIGHTMASTER); - AddCreature(EP_PWT_FLIGHTMASTER,EP_PWT_FlightMaster.entry,team,EP_PWT_FlightMaster.map,EP_PWT_FlightMaster.x,EP_PWT_FlightMaster.y,EP_PWT_FlightMaster.z,EP_PWT_FlightMaster.o); + AddCreature(EP_PWT_FLIGHTMASTER, EP_PWT_FlightMaster.entry, team, EP_PWT_FlightMaster.map, EP_PWT_FlightMaster.x, EP_PWT_FlightMaster.y, EP_PWT_FlightMaster.z, EP_PWT_FlightMaster.o); /* // sky - we need update gso code Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team - c->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 55 : 68)); + c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); if(c) { GossipOption gso; @@ -620,7 +620,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) OutdoorPvPEP::OutdoorPvPEP() { m_TypeId = OUTDOOR_PVP_EP; - memset(EP_Controls,0,sizeof(EP_Controls)); + memset(EP_Controls, 0, sizeof(EP_Controls)); m_AllianceTowersControlled = 0; m_HordeTowersControlled = 0; } @@ -649,8 +649,8 @@ bool OutdoorPvPEP::Update(uint32 diff) ++m_AllianceTowersControlled; else if (EP_Controls[i] == HORDE) ++m_HordeTowersControlled; - SendUpdateWorldState(EP_UI_TOWER_COUNT_A,m_AllianceTowersControlled); - SendUpdateWorldState(EP_UI_TOWER_COUNT_H,m_HordeTowersControlled); + SendUpdateWorldState(EP_UI_TOWER_COUNT_A, m_AllianceTowersControlled); + SendUpdateWorldState(EP_UI_TOWER_COUNT_H, m_HordeTowersControlled); BuffTeams(); } return true; @@ -664,14 +664,14 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5) - plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true); + plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true); } else { if (m_HordeTowersControlled && m_HordeTowersControlled < 5) - plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true); + plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -699,7 +699,7 @@ void OutdoorPvPEP::BuffTeams() for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5) - plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true); + plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true); } } for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) @@ -709,7 +709,7 @@ void OutdoorPvPEP::BuffTeams() for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); if (m_HordeTowersControlled && m_HordeTowersControlled < 5) - plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true); + plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true); } } } @@ -729,35 +729,35 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data) void OutdoorPvPEP::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A,0); - plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N,0); - - plr->SendUpdateWorldState(EP_EWT_A,0); - plr->SendUpdateWorldState(EP_EWT_H,0); - plr->SendUpdateWorldState(EP_EWT_N,0); - plr->SendUpdateWorldState(EP_EWT_N_A,0); - plr->SendUpdateWorldState(EP_EWT_N_H,0); - - plr->SendUpdateWorldState(EP_PWT_A,0); - plr->SendUpdateWorldState(EP_PWT_H,0); - plr->SendUpdateWorldState(EP_PWT_N,0); - plr->SendUpdateWorldState(EP_PWT_N_A,0); - plr->SendUpdateWorldState(EP_PWT_N_H,0); - - plr->SendUpdateWorldState(EP_NPT_A,0); - plr->SendUpdateWorldState(EP_NPT_H,0); - plr->SendUpdateWorldState(EP_NPT_N,0); - plr->SendUpdateWorldState(EP_NPT_N_A,0); - plr->SendUpdateWorldState(EP_NPT_N_H,0); - - plr->SendUpdateWorldState(EP_CGT_A,0); - plr->SendUpdateWorldState(EP_CGT_H,0); - plr->SendUpdateWorldState(EP_CGT_N,0); - plr->SendUpdateWorldState(EP_CGT_N_A,0); - plr->SendUpdateWorldState(EP_CGT_N_H,0); + plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, 0); + + plr->SendUpdateWorldState(EP_EWT_A, 0); + plr->SendUpdateWorldState(EP_EWT_H, 0); + plr->SendUpdateWorldState(EP_EWT_N, 0); + plr->SendUpdateWorldState(EP_EWT_N_A, 0); + plr->SendUpdateWorldState(EP_EWT_N_H, 0); + + plr->SendUpdateWorldState(EP_PWT_A, 0); + plr->SendUpdateWorldState(EP_PWT_H, 0); + plr->SendUpdateWorldState(EP_PWT_N, 0); + plr->SendUpdateWorldState(EP_PWT_N_A, 0); + plr->SendUpdateWorldState(EP_PWT_N_H, 0); + + plr->SendUpdateWorldState(EP_NPT_A, 0); + plr->SendUpdateWorldState(EP_NPT_H, 0); + plr->SendUpdateWorldState(EP_NPT_N, 0); + plr->SendUpdateWorldState(EP_NPT_N_A, 0); + plr->SendUpdateWorldState(EP_NPT_N_H, 0); + + plr->SendUpdateWorldState(EP_CGT_A, 0); + plr->SendUpdateWorldState(EP_CGT_H, 0); + plr->SendUpdateWorldState(EP_CGT_N, 0); + plr->SendUpdateWorldState(EP_CGT_N_A, 0); + plr->SendUpdateWorldState(EP_CGT_N_H, 0); } class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 76d056a7b78..6ce4cd1bcb2 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -114,31 +114,31 @@ enum EP_GoSummons enum EP_Towers { EP_EWT = 0, // plaguelands 03 - EP_NPT,// plaguelands 01 - EP_PWT,// plaguelands 04 - EP_CGT,// plaguelands 02 + EP_NPT, // plaguelands 01 + EP_PWT, // plaguelands 04 + EP_CGT, // plaguelands 02 EP_TOWER_NUM }; const go_type EPCapturePoints[EP_TOWER_NUM] = { - {182097,0,2574.51f,-4794.89f,144.704f,-1.45003f,-0.097056f,0.095578f,-0.656229f,0.742165f}, - {181899,0,3181.08f,-4379.36f,174.123f,-2.03472f,-0.065392f,0.119494f,-0.842275f,0.521553f}, - {182098,0,2962.71f,-3042.31f,154.789f,2.08426f,-0.074807f,-0.113837f,0.855928f,0.49883f}, - {182096,0,1860.85f,-3731.23f,196.716f,-2.53214f,0.033967f,-0.131914f,0.944741f,-0.298177f} + {182097, 0, 2574.51f, -4794.89f, 144.704f, -1.45003f, -0.097056f, 0.095578f, -0.656229f, 0.742165f}, + {181899, 0, 3181.08f, -4379.36f, 174.123f, -2.03472f, -0.065392f, 0.119494f, -0.842275f, 0.521553f}, + {182098, 0, 2962.71f, -3042.31f, 154.789f, 2.08426f, -0.074807f, -0.113837f, 0.855928f, 0.49883f}, + {182096, 0, 1860.85f, -3731.23f, 196.716f, -2.53214f, 0.033967f, -0.131914f, 0.944741f, -0.298177f} }; const go_type EPTowerFlags[EP_TOWER_NUM] = { - {182106,0,2569.60f,-4772.93f,115.399f,2.72271f,0.0f,0.0f,0.978148f,0.207912f}, - {182106,0,3148.17f,-4365.51f,145.029f,1.53589f,0.0f,0.0f,0.694658f,0.71934f}, - {182106,0,2992.63f,-3022.95f,125.593f,3.03687f,0.0f,0.0f,0.99863f,0.052336f}, - {182106,0,1838.42f,-3703.56f,167.713f,0.890118f,0.0f,0.0f,0.430511f,0.902585f} + {182106, 0, 2569.60f, -4772.93f, 115.399f, 2.72271f, 0.0f, 0.0f, 0.978148f, 0.207912f}, + {182106, 0, 3148.17f, -4365.51f, 145.029f, 1.53589f, 0.0f, 0.0f, 0.694658f, 0.71934f}, + {182106, 0, 2992.63f, -3022.95f, 125.593f, 3.03687f, 0.0f, 0.0f, 0.99863f, 0.052336f}, + {182106, 0, 1838.42f, -3703.56f, 167.713f, 0.890118f, 0.0f, 0.0f, 0.430511f, 0.902585f} }; -const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705}; +const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691, 10699, 10701, 10705}; -const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692,10698,10700,10704}; +const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692, 10698, 10700, 10704}; const uint8 EP_NUM_CREATURES = 6; const uint8 EP_EWT_NUM_CREATURES = 5; @@ -147,20 +147,20 @@ const uint8 EP_EWT_NUM_CREATURES = 5; // should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] = { - {17635,469,0, 3167.61f,-4352.09f,138.20f,4.5811f}, - {17647,469,0, 3172.74f,-4352.99f,139.14f,4.9873f}, - {17647,469,0, 3165.89f,-4354.46f,138.67f,3.7244f}, - {17647,469,0, 3164.65f,-4350.26f,138.22f,2.4794f}, - {17647,469,0, 3169.91f,-4349.68f,138.37f,0.7444f} + {17635, 469, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f}, + {17647, 469, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f}, + {17647, 469, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f}, + {17647, 469, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f}, + {17647, 469, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f} }; const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] = { - {17995,67,0, 3167.61f,-4352.09f,138.20f,4.5811f}, - {17996,67,0, 3172.74f,-4352.99f,139.14f,4.9873f}, - {17996,67,0, 3165.89f,-4354.46f,138.67f,3.7244f}, - {17996,67,0, 3164.65f,-4350.26f,138.22f,2.4794f}, - {17996,67,0, 3169.91f,-4349.68f,138.37f,0.7444f} + {17995, 67, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f}, + {17996, 67, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f}, + {17996, 67, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f}, + {17996, 67, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f}, + {17996, 67, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f} }; enum EP_TowerStates @@ -175,10 +175,10 @@ enum EP_TowerStates }; // when spawning, pay attention at setting the faction manually! -const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5f,-3049.11f,120.126f,5.75959f}; +const creature_type EP_PWT_FlightMaster = {17209, 0, 0, 2987.5f, -3049.11f, 120.126f, 5.75959f}; // after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id); -const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72f,-4355.91f,138.785f,1.69297f,0.0f,0.0f,0.748956f,0.66262f}; +const go_type EP_NPT_LordaeronShrine = {181682, 0, 3167.72f, -4355.91f, 138.785f, 1.69297f, 0.0f, 0.0f, 0.748956f, 0.66262f}; class OutdoorPvPEP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index f711710e448..7a4e3b2abaf 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -25,15 +25,15 @@ #include "Language.h" #include "ScriptPCH.h" -const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A,LANG_OPVP_HP_LOSE_OVERLOOK_A,LANG_OPVP_HP_LOSE_STADIUM_A}; +const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A, LANG_OPVP_HP_LOSE_OVERLOOK_A, LANG_OPVP_HP_LOSE_STADIUM_A}; -const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H,LANG_OPVP_HP_LOSE_OVERLOOK_H,LANG_OPVP_HP_LOSE_STADIUM_H}; +const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H, LANG_OPVP_HP_LOSE_OVERLOOK_H, LANG_OPVP_HP_LOSE_STADIUM_H}; -const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A,LANG_OPVP_HP_CAPTURE_OVERLOOK_A,LANG_OPVP_HP_CAPTURE_STADIUM_A}; +const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A, LANG_OPVP_HP_CAPTURE_OVERLOOK_A, LANG_OPVP_HP_CAPTURE_STADIUM_A}; -const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H,LANG_OPVP_HP_CAPTURE_OVERLOOK_H,LANG_OPVP_HP_CAPTURE_STADIUM_H}; +const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H, LANG_OPVP_HP_CAPTURE_OVERLOOK_H, LANG_OPVP_HP_CAPTURE_STADIUM_H}; -OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp,OutdoorPvPHPTowerType type) +OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp, OutdoorPvPHPTowerType type) : OPvPCapturePoint(pvp), m_TowerType(type) { SetCapturePointData(HPCapturePoints[type].entry, @@ -72,11 +72,11 @@ bool OutdoorPvPHP::SetupOutdoorPvP() for (int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i) RegisterZone(OutdoorPvPHPBuffZones[i]); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_BROKEN_HILL)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_BROKEN_HILL)); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_OVERLOOK)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_OVERLOOK)); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_STADIUM)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_STADIUM)); return true; } @@ -87,14 +87,14 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled >=3) - plr->CastSpell(plr,AllianceBuff,true); + plr->CastSpell(plr, AllianceBuff, true); } else { if (m_HordeTowersControlled >=3) - plr->CastSpell(plr,HordeBuff,true); + plr->CastSpell(plr, HordeBuff, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -133,18 +133,18 @@ bool OutdoorPvPHP::Update(uint32 diff) void OutdoorPvPHP::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A,0); - plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H,0); - plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H,0); - plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY,0); + plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0); for (int i = 0; i < HP_TOWER_NUM; ++i) { - plr->SendUpdateWorldState(HP_MAP_N[i],0); - plr->SendUpdateWorldState(HP_MAP_A[i],0); - plr->SendUpdateWorldState(HP_MAP_H[i],0); + plr->SendUpdateWorldState(HP_MAP_N[i], 0); + plr->SendUpdateWorldState(HP_MAP_A[i], 0); + plr->SendUpdateWorldState(HP_MAP_H[i], 0); } } @@ -175,13 +175,13 @@ void OPvPCapturePointHP::ChangeState() field = HP_MAP_A[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); break; case OBJECTIVESTATE_HORDE: field = HP_MAP_H[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: field = HP_MAP_N[m_TowerType]; @@ -216,7 +216,7 @@ void OPvPCapturePointHP::ChangeState() artkit2 = HP_TowerArtKit_A[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled<3) ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); break; case OBJECTIVESTATE_HORDE: field = HP_MAP_H[m_TowerType]; @@ -224,7 +224,7 @@ void OPvPCapturePointHP::ChangeState() artkit2 = HP_TowerArtKit_H[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled<3) ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: field = HP_MAP_N[m_TowerType]; @@ -326,9 +326,9 @@ void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed) return; if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE) - plr->CastSpell(plr,AlliancePlayerKillReward,true); + plr->CastSpell(plr, AlliancePlayerKillReward, true); else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE) - plr->CastSpell(plr,HordePlayerKillReward,true); + plr->CastSpell(plr, HordePlayerKillReward, true); } class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index 0e1b26ac277..e53a3537b83 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -40,11 +40,11 @@ enum OutdoorPvPHPTowerType HP_TOWER_NUM = 3 }; -const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032,19028,19029}; +const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032, 19028, 19029}; -const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404,11396,11388}; +const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404, 11396, 11388}; -const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403,11395,11387}; +const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403, 11395, 11387}; enum OutdoorPvPHPWorldStates { @@ -59,30 +59,30 @@ enum OutdoorPvPHPWorldStates HP_UI_TOWER_SLIDER_DISPLAY = 2473 }; -const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5,0x9b2,0x9a8}; +const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5, 0x9b2, 0x9a8}; -const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3,0x9b0,0x9a7}; +const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3, 0x9b0, 0x9a7}; -const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4,0x9b1,0x9a6}; +const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4, 0x9b1, 0x9a6}; -const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65,62,67}; +const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65, 62, 67}; -const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64,61,68}; +const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64, 61, 68}; -const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69}; +const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66, 63, 69}; const go_type HPCapturePoints[HP_TOWER_NUM] = { - {182175,530,-471.462f,3451.09f,34.6432f,0.174533f,0.0f,0.0f,0.087156f,0.996195f}, // 0 - Broken Hill - {182174,530,-184.889f,3476.93f,38.205f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f}, // 1 - Overlook - {182173,530,-290.016f,3702.42f,56.6729f,0.034907f,0.0f,0.0f,0.017452f,0.999848f} // 2 - Stadium + {182175, 530, -471.462f, 3451.09f, 34.6432f, 0.174533f, 0.0f, 0.0f, 0.087156f, 0.996195f}, // 0 - Broken Hill + {182174, 530, -184.889f, 3476.93f, 38.205f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f}, // 1 - Overlook + {182173, 530, -290.016f, 3702.42f, 56.6729f, 0.034907f, 0.0f, 0.0f, 0.017452f, 0.999848f} // 2 - Stadium }; const go_type HPTowerFlags[HP_TOWER_NUM] = { - {183514,530,-467.078f,3528.17f,64.7121f,3.14159f,0.0f,0.0f,1.0f,0.0f}, // 0 broken hill - {182525,530,-187.887f,3459.38f,60.0403f,-3.12414f,0.0f,0.0f,0.999962f,-0.008727f}, // 1 overlook - {183515,530,-289.610f,3696.83f,75.9447f,3.12414f,0.0f,0.0f,0.999962f,0.008727f} // 2 stadium + {183514, 530, -467.078f, 3528.17f, 64.7121f, 3.14159f, 0.0f, 0.0f, 1.0f, 0.0f}, // 0 broken hill + {182525, 530, -187.887f, 3459.38f, 60.0403f, -3.12414f, 0.0f, 0.0f, 0.999962f, -0.008727f}, // 1 overlook + {183515, 530, -289.610f, 3696.83f, 75.9447f, 3.12414f, 0.0f, 0.0f, 0.999962f, 0.008727f} // 2 stadium }; class OPvPCapturePointHP : public OPvPCapturePoint diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index a796dd7c918..a015de48f88 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -33,11 +33,11 @@ void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed) { if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam()) { - plr->KilledMonsterCredit(NA_CREDIT_MARKER,0); // 0 guid, btw it isn't even used in killedmonster function :S + plr->KilledMonsterCredit(NA_CREDIT_MARKER, 0); // 0 guid, btw it isn't even used in killedmonster function :S if (plr->GetTeam() == ALLIANCE) - plr->CastSpell(plr,NA_KILL_TOKEN_ALLIANCE,true); + plr->CastSpell(plr, NA_KILL_TOKEN_ALLIANCE, true); else - plr->CastSpell(plr,NA_KILL_TOKEN_HORDE,true); + plr->CastSpell(plr, NA_KILL_TOKEN_HORDE, true); } } @@ -93,7 +93,7 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team) else return; for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) - AddCreature(i,creatures[i].entry,creatures[i].teamval,creatures[i].map,creatures[i].x,creatures[i].y,creatures[i].z,creatures[i].o,1000000); + AddCreature(i, creatures[i].entry, creatures[i].teamval, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, 1000000); } void OPvPCapturePointNA::DeSpawnNPCs() @@ -122,7 +122,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team) i == NA_BOMB_WAGON_N || i == NA_BOMB_WAGON_E) continue; // roosts and bomb wagons are spawned when someone uses the matching destroyed roost - AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3); + AddObject(i, gos[i].entry, gos[i].map, gos[i].x, gos[i].y, gos[i].z, gos[i].o, gos[i].rot0, gos[i].rot1, gos[i].rot2, gos[i].rot3); } } @@ -137,15 +137,15 @@ void OPvPCapturePointNA::DeSpawnGOs() void OPvPCapturePointNA::FactionTakeOver(uint32 team) { if (m_ControllingFaction) - sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false); + sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); if (m_ControllingFaction == ALLIANCE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); else if (m_ControllingFaction == HORDE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); m_ControllingFaction = team; if (m_ControllingFaction) - sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false); + sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); DeSpawnGOs(); DeSpawnNPCs(); SpawnGOsForTeam(team); @@ -163,7 +163,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); } else { @@ -175,7 +175,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); } UpdateWyvernRoostWorldState(NA_ROOST_S); UpdateWyvernRoostWorldState(NA_ROOST_N); @@ -207,7 +207,7 @@ OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFactio m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0), m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) { - SetCapturePointData(182210,530,-1572.57f,7945.3f,-22.475f,2.05949f,0.0f,0.0f,0.857167f,0.515038f); + SetCapturePointData(182210, 530, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f); } bool OutdoorPvPNA::SetupOutdoorPvP() @@ -229,8 +229,8 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) { // add buffs if (plr->GetTeam() == m_obj->m_ControllingFaction) - plr->CastSpell(plr,NA_CAPTURE_BUFF,true); - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + plr->CastSpell(plr, NA_CAPTURE_BUFF, true); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -299,34 +299,34 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW,0); - plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW,0); - plr->SendUpdateWorldState(NA_UI_GUARDS_MAX,0); - plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); + plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); + plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); + plr->SendUpdateWorldState(NA_UI_GUARDS_MAX, 0); + plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, 0); } bool OutdoorPvPNA::Update(uint32 diff) @@ -346,7 +346,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_N]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_SOUTH: @@ -354,7 +354,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_S]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_WEST: @@ -362,7 +362,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_W]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_EAST: @@ -370,7 +370,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_E]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; default: @@ -401,7 +401,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj if (count > 0 && item) { - plr->SendNewItem(item,count,true,false); + plr->SendNewItem(item, count, true, false); } return true; @@ -521,10 +521,10 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid) DelObject(del2); if (add>-1) - AddObject(add,gos[add].entry,gos[add].map,gos[add].x,gos[add].y,gos[add].z,gos[add].o,gos[add].rot0,gos[add].rot1,gos[add].rot2,gos[add].rot3); + AddObject(add, gos[add].entry, gos[add].map, gos[add].x, gos[add].y, gos[add].z, gos[add].o, gos[add].rot0, gos[add].rot1, gos[add].rot2, gos[add].rot3); if (add2>-1) - AddObject(add2,gos[add2].entry,gos[add2].map,gos[add2].x,gos[add2].y,gos[add2].z,gos[add2].o,gos[add2].rot0,gos[add2].rot1,gos[add2].rot2,gos[add2].rot3); + AddObject(add2, gos[add2].entry, gos[add2].map, gos[add2].x, gos[add2].y, gos[add2].z, gos[add2].o, gos[add2].rot0, gos[add2].rot1, gos[add2].rot2, gos[add2].rot3); return retval; } @@ -550,7 +550,7 @@ bool OPvPCapturePointNA::Update(uint32 diff) if (m_GuardsAlive == 0) m_capturable = true; // update the guard count for the players in zone - m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT,m_GuardsAlive); + m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); } } else m_GuardCheckTimer -= diff; @@ -625,11 +625,11 @@ void OPvPCapturePointNA::SendChangePhase() void OPvPCapturePointNA::UpdateHalaaWorldState() { - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL ,uint32(bool(m_HalaaState & HALAA_N))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A ,uint32(bool(m_HalaaState & HALAA_N_A))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H ,uint32(bool(m_HalaaState & HALAA_N_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE ,uint32(bool(m_HalaaState & HALAA_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE ,uint32(bool(m_HalaaState & HALAA_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL , uint32(bool(m_HalaaState & HALAA_N))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A , uint32(bool(m_HalaaState & HALAA_N_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H , uint32(bool(m_HalaaState & HALAA_N_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE , uint32(bool(m_HalaaState & HALAA_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE , uint32(bool(m_HalaaState & HALAA_A))); } void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) @@ -637,28 +637,28 @@ void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) switch(roost) { case NA_ROOST_S: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,uint32(bool(m_WyvernStateSouth & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, uint32(bool(m_WyvernStateSouth & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE))); break; case NA_ROOST_N: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,uint32(bool(m_WyvernStateNorth & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, uint32(bool(m_WyvernStateNorth & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE))); break; case NA_ROOST_W: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,uint32(bool(m_WyvernStateWest & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, uint32(bool(m_WyvernStateWest & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE))); break; case NA_ROOST_E: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,uint32(bool(m_WyvernStateEast & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, uint32(bool(m_WyvernStateEast & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE))); break; } } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index b9a4f82ec90..eba273245eb 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -105,8 +105,8 @@ enum ControlGOTypes NA_CONTROL_GO_NUM = 12 }; -const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103,105,107,109}; -const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104,106,108,110}; +const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103, 105, 107, 109}; +const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104, 106, 108, 110}; enum FlightSpellsNA { @@ -119,39 +119,39 @@ enum FlightSpellsNA // spawned when the alliance is attacking, horde is in control const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = { - {182267,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_ROOST_SOUTH - {182280,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_ROOST_WEST - {182281,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_ROOST_NORTH - {182282,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_ROOST_EAST - - {182222,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_BOMB_WAGON_SOUTH - {182272,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_BOMB_WAGON_WEST - {182273,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_BOMB_WAGON_NORTH - {182274,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_BOMB_WAGON_EAST - - {182266,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH - {182275,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_ALLY_ROOST_WEST - {182276,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_ALLY_ROOST_NORTH - {182277,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_ALLY_ROOST_EAST + {182267, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_ROOST_SOUTH + {182280, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_ROOST_WEST + {182281, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_ROOST_NORTH + {182282, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST + + {182222, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH + {182272, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST + {182273, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH + {182274, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST + + {182266, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH + {182275, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST + {182276, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_ALLY_ROOST_NORTH + {182277, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_ALLY_ROOST_EAST }; // spawned when the horde is attacking, alliance is in control const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = { - {182301,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_ROOST_SOUTH - {182302,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_ROOST_WEST - {182303,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_ROOST_NORTH - {182304,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_ROOST_EAST - - {182305,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_BOMB_WAGON_SOUTH - {182306,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_BOMB_WAGON_WEST - {182307,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_BOMB_WAGON_NORTH - {182308,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_BOMB_WAGON_EAST - - {182297,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH - {182298,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_HORDE_ROOST_WEST - {182299,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_HORDE_ROOST_NORTH - {182300,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_HORDE_ROOST_EAST + {182301, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_ROOST_SOUTH + {182302, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_ROOST_WEST + {182303, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_ROOST_NORTH + {182304, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST + + {182305, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH + {182306, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST + {182307, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH + {182308, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST + + {182297, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH + {182298, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST + {182299, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_HORDE_ROOST_NORTH + {182300, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST }; enum ControlNPCTypes @@ -183,50 +183,50 @@ enum ControlNPCTypes const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = { - {18816,67,530,-1523.92f,7951.76f,-17.6942f,3.51172f}, - {18821,67,530,-1527.75f,7952.46f,-17.6948f,3.99317f}, - {21474,67,530,-1520.14f,7927.11f,-20.2527f,3.39389f}, - {21484,67,530,-1524.84f,7930.34f,-20.182f,3.6405f}, - {21483,67,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, - {18192,67,530,-1654.06f,8000.46f,-26.59f,3.37f}, - {18192,67,530,-1487.18f,7899.1f,-19.53f,0.954f}, - {18192,67,530,-1480.88f,7908.79f,-19.19f,4.485f}, - {18192,67,530,-1540.56f,7995.44f,-20.45f,0.947f}, - {18192,67,530,-1546.95f,8000.85f,-20.72f,6.035f}, - {18192,67,530,-1595.31f,7860.53f,-21.51f,3.747f}, - {18192,67,530,-1642.31f,7995.59f,-25.8f,3.317f}, - {18192,67,530,-1545.46f,7995.35f,-20.63f,1.094f}, - {18192,67,530,-1487.58f,7907.99f,-19.27f,5.567f}, - {18192,67,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, - {18192,67,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, - {18192,67,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, - {18192,67,530,-1550.6f,7944.45f,-21.63f,3.559f}, - {18192,67,530,-1545.57f,7935.83f,-21.13f,3.448f}, - {18192,67,530,-1550.86f,7937.56f,-21.7f,3.801f} + {18816, 67, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f}, + {18821, 67, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f}, + {21474, 67, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f}, + {21484, 67, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f}, + {21483, 67, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, + {18192, 67, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, + {18192, 67, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, + {18192, 67, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, + {18192, 67, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, + {18192, 67, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, + {18192, 67, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, + {18192, 67, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, + {18192, 67, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, + {18192, 67, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, + {18192, 67, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, + {18192, 67, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, + {18192, 67, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, + {18192, 67, 530, -1550.6f, 7944.45f, -21.63f, 3.559f}, + {18192, 67, 530, -1545.57f, 7935.83f, -21.13f, 3.448f}, + {18192, 67, 530, -1550.86f, 7937.56f, -21.7f, 3.801f} }; const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = { - {18817,469,530,-1591.18f,8020.39f,-22.2042f,4.59022f}, - {18822,469,530,-1588.0f,8019.0f,-22.2042f,4.06662f}, - {21485,469,530,-1521.93f,7927.37f,-20.2299f,3.24631f}, - {21487,469,530,-1540.33f,7971.95f,-20.7186f,3.07178f}, - {21488,469,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, - {18256,469,530,-1654.06f,8000.46f,-26.59f,3.37f}, - {18256,469,530,-1487.18f,7899.1f,-19.53f,0.954f}, - {18256,469,530,-1480.88f,7908.79f,-19.19f,4.485f}, - {18256,469,530,-1540.56f,7995.44f,-20.45f,0.947f}, - {18256,469,530,-1546.95f,8000.85f,-20.72f,6.035f}, - {18256,469,530,-1595.31f,7860.53f,-21.51f,3.747f}, - {18256,469,530,-1642.31f,7995.59f,-25.8f,3.317f}, - {18256,469,530,-1545.46f,7995.35f,-20.63f,1.094f}, - {18256,469,530,-1487.58f,7907.99f,-19.27f,5.567f}, - {18256,469,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, - {18256,469,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, - {18256,469,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, - {18256,469,530,-1603.75f,8000.36f,-24.18f,4.516f}, - {18256,469,530,-1585.73f,7994.68f,-23.29f,4.439f}, - {18256,469,530,-1595.5f,7991.27f,-23.53f,4.738f} + {18817, 469, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f}, + {18822, 469, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f}, + {21485, 469, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f}, + {21487, 469, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f}, + {21488, 469, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, + {18256, 469, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, + {18256, 469, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, + {18256, 469, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, + {18256, 469, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, + {18256, 469, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, + {18256, 469, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, + {18256, 469, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, + {18256, 469, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, + {18256, 469, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, + {18256, 469, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, + {18256, 469, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, + {18256, 469, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, + {18256, 469, 530, -1603.75f, 8000.36f, -24.18f, 4.516f}, + {18256, 469, 530, -1585.73f, 7994.68f, -23.29f, 4.439f}, + {18256, 469, 530, -1595.5f, 7991.27f, -23.53f, 4.738f} }; enum WyvernStates diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index dd93db2aa76..ab336e3b2ba 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -43,16 +43,16 @@ void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPSI::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(SI_GATHERED_A,0); - plr->SendUpdateWorldState(SI_GATHERED_H,0); - plr->SendUpdateWorldState(SI_SILITHYST_MAX,0); + plr->SendUpdateWorldState(SI_GATHERED_A, 0); + plr->SendUpdateWorldState(SI_GATHERED_H, 0); + plr->SendUpdateWorldState(SI_SILITHYST_MAX, 0); } void OutdoorPvPSI::UpdateWorldState() { - SendUpdateWorldState(SI_GATHERED_A,m_Gathered_A); - SendUpdateWorldState(SI_GATHERED_H,m_Gathered_H); - SendUpdateWorldState(SI_SILITHYST_MAX,SI_MAX_RESOURCES); + SendUpdateWorldState(SI_GATHERED_A, m_Gathered_A); + SendUpdateWorldState(SI_GATHERED_H, m_Gathered_H); + SendUpdateWorldState(SI_SILITHYST_MAX, SI_MAX_RESOURCES); } bool OutdoorPvPSI::SetupOutdoorPvP() @@ -70,8 +70,8 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/) void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone) { if (plr->GetTeam() == m_LastController) - plr->CastSpell(plr,SI_CENARION_FAVOR,true); - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + plr->CastSpell(plr, SI_CENARION_FAVOR, true); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -94,20 +94,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) if (m_Gathered_A >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); m_LastController = ALLIANCE; m_Gathered_A = 0; m_Gathered_H = 0; } UpdateWorldState(); // reward player - plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true); + plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true); // add 19 honor - plr->RewardHonor(NULL,1,19); + plr->RewardHonor(NULL, 1, 19); // add 20 cenarion circle repu - plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20); + plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20); // complete quest - plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A,0); + plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, 0); } return true; case SI_AREATRIGGER_H: @@ -119,20 +119,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) if (m_Gathered_H >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); m_LastController = HORDE; m_Gathered_A = 0; m_Gathered_H = 0; } UpdateWorldState(); // reward player - plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true); + plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true); // add 19 honor - plr->RewardHonor(NULL,1,19); + plr->RewardHonor(NULL, 1, 19); // add 20 cenarion circle repu - plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20); + plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20); // complete quest - plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H,0); + plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, 0); } return true; } @@ -152,7 +152,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (atEntry) { // 5.0f is safe-distance - if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius) + if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound GameObject * go = new GameObject; @@ -163,7 +163,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } @@ -182,7 +182,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (atEntry) { // 5.0f is safe-distance - if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius) + if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound GameObject * go = new GameObject; @@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) delete go; return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask() , plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } @@ -215,7 +215,7 @@ bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go { if (!go || spellId != SI_SILITHYST_FLAG_GO_SPELL) return false; - plr->CastSpell(plr,SI_SILITHYST_FLAG,true); + plr->CastSpell(plr, SI_SILITHYST_FLAG, true); if (go->GetGOInfo()->entry == SI_SILITHYST_MOUND) { // despawn go diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index a991a7fc49c..ffcbfd7997e 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -33,7 +33,7 @@ OutdoorPvPTF::OutdoorPvPTF() OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP *pvp, OutdoorPvPTF_TowerType type) : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(TF_TOWERSTATE_N) { - SetCapturePointData(TFCapturePoints[type].entry,TFCapturePoints[type].map,TFCapturePoints[type].x,TFCapturePoints[type].y,TFCapturePoints[type].z,TFCapturePoints[type].o,TFCapturePoints[type].rot0,TFCapturePoints[type].rot1,TFCapturePoints[type].rot2,TFCapturePoints[type].rot3); + SetCapturePointData(TFCapturePoints[type].entry, TFCapturePoints[type].map, TFCapturePoints[type].x, TFCapturePoints[type].y, TFCapturePoints[type].z, TFCapturePoints[type].o, TFCapturePoints[type].rot0, TFCapturePoints[type].rot1, TFCapturePoints[type].rot2, TFCapturePoints[type].rot3); } void OPvPCapturePointTF::FillInitialWorldStates(WorldPacket &data) @@ -69,35 +69,35 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPTF::SendRemoveWorldStates(Player * plr) { - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY,uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY,uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); for (int i = 0; i < TF_TOWER_NUM; ++i) { - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n),uint32(0)); - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h),uint32(0)); - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a),uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n), uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h), uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a), uint32(0)); } } void OPvPCapturePointTF::UpdateTowerState() { - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n),uint32(bool(m_TowerState & TF_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h),uint32(bool(m_TowerState & TF_TOWERSTATE_H))); - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a),uint32(bool(m_TowerState & TF_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n), uint32(bool(m_TowerState & TF_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h), uint32(bool(m_TowerState & TF_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A))); } bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr) @@ -129,18 +129,18 @@ bool OutdoorPvPTF::Update(uint32 diff) { TeamApplyBuff(TEAM_ALLIANCE, TF_CAPTURE_BUFF); m_IsLocked = true; - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(1)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(1)); SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); } else if (m_HordeTowersControlled == TF_TOWER_NUM) { TeamApplyBuff(TEAM_HORDE, TF_CAPTURE_BUFF); m_IsLocked = true; - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(1)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(1)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); } else @@ -160,9 +160,9 @@ bool OutdoorPvPTF::Update(uint32 diff) m_LockTimerUpdate = 0; m_IsLocked = false; SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(1)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); } else { @@ -176,9 +176,9 @@ bool OutdoorPvPTF::Update(uint32 diff) second_digit = minutes_left % 10; first_digit = minutes_left / 10; - SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,first_digit); - SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,second_digit); - SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,hours_left); + SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, first_digit); + SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, second_digit); + SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, hours_left); } else m_LockTimerUpdate -= diff; m_LockTimer -= diff; } @@ -191,14 +191,14 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled >= TF_TOWER_NUM) - plr->CastSpell(plr,TF_CAPTURE_BUFF,true); + plr->CastSpell(plr, TF_CAPTURE_BUFF, true); } else { if (m_HordeTowersControlled >= TF_TOWER_NUM) - plr->CastSpell(plr,TF_CAPTURE_BUFF,true); + plr->CastSpell(plr, TF_CAPTURE_BUFF, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -224,11 +224,11 @@ bool OutdoorPvPTF::SetupOutdoorPvP() for (uint8 i = 0; i < OutdoorPvPTFBuffZonesNum; ++i) RegisterZone(OutdoorPvPTFBuffZones[i]); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_N)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NE)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_SE)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_S)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NW)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_N)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NE)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_SE)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_S)); return true; } @@ -250,14 +250,14 @@ void OPvPCapturePointTF::ChangeState() { if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); } uint32 artkit = 21; @@ -269,7 +269,7 @@ void OPvPCapturePointTF::ChangeState() artkit = 2; if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled<TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); for (PlayerSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr) (*itr)->AreaExploredOrEventHappens(TF_ALLY_QUEST); break; @@ -278,7 +278,7 @@ void OPvPCapturePointTF::ChangeState() artkit = 1; if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled<TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); for (PlayerSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr) (*itr)->AreaExploredOrEventHappens(TF_HORDE_QUEST); break; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index e11dc6a6704..e42dd54777f 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -55,11 +55,11 @@ enum OutdoorPvPTF_TowerType const go_type TFCapturePoints[TF_TOWER_NUM] = { - {183104,530,-3081.65f,5335.03f,17.1853f,-2.14675f,0.0f,0.0f,0.878817f,-0.477159f}, - {183411,530,-2939.9f,4788.73f,18.987f,2.77507f,0.0f,0.0f,0.983255f,0.182236f}, - {183412,530,-3174.94f,4440.97f,16.2281f,1.86750f,0.0f,0.0f,0.803857f,0.594823f}, - {183413,530,-3603.31f,4529.15f,20.9077f,0.994838f,0.0f,0.0f,0.477159f,0.878817f}, - {183414,530,-3812.37f,4899.3f,17.7249f,0.087266f,0.0f,0.0f,0.043619f,0.999048f} + {183104, 530, -3081.65f, 5335.03f, 17.1853f, -2.14675f, 0.0f, 0.0f, 0.878817f, -0.477159f}, + {183411, 530, -2939.9f, 4788.73f, 18.987f, 2.77507f, 0.0f, 0.0f, 0.983255f, 0.182236f}, + {183412, 530, -3174.94f, 4440.97f, 16.2281f, 1.86750f, 0.0f, 0.0f, 0.803857f, 0.594823f}, + {183413, 530, -3603.31f, 4529.15f, 20.9077f, 0.994838f, 0.0f, 0.0f, 0.477159f, 0.878817f}, + {183414, 530, -3812.37f, 4899.3f, 17.7249f, 0.087266f, 0.0f, 0.0f, 0.043619f, 0.999048f} }; struct tf_tower_world_state @@ -71,11 +71,11 @@ struct tf_tower_world_state const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = { - {0xa79,0xa7a,0xa7b}, - {0xa7e,0xa7d,0xa7c}, - {0xa82,0xa81,0xa80}, - {0xa88,0xa87,0xa86}, - {0xa85,0xa84,0xa83} + {0xa79, 0xa7a, 0xa7b}, + {0xa7e, 0xa7d, 0xa7c}, + {0xa82, 0xa81, 0xa80}, + {0xa88, 0xa87, 0xa86}, + {0xa85, 0xa84, 0xa83} }; const uint32 TFTowerPlayerEnterEvents[TF_TOWER_NUM] = diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index dcd6eb7d7a1..1af7f602c0b 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -29,7 +29,7 @@ OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP *pvp, ZM_BeaconType type) : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(ZM_TOWERSTATE_N) { - SetCapturePointData(ZMCapturePoints[type].entry,ZMCapturePoints[type].map,ZMCapturePoints[type].x,ZMCapturePoints[type].y,ZMCapturePoints[type].z,ZMCapturePoints[type].o,ZMCapturePoints[type].rot0,ZMCapturePoints[type].rot1,ZMCapturePoints[type].rot2,ZMCapturePoints[type].rot3); + SetCapturePointData(ZMCapturePoints[type].entry, ZMCapturePoints[type].map, ZMCapturePoints[type].x, ZMCapturePoints[type].y, ZMCapturePoints[type].z, ZMCapturePoints[type].o, ZMCapturePoints[type].rot0, ZMCapturePoints[type].rot1, ZMCapturePoints[type].rot2, ZMCapturePoints[type].rot3); } void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data) @@ -44,12 +44,12 @@ void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointZM_Beacon::UpdateTowerState() { - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); } bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr) @@ -78,14 +78,14 @@ void OPvPCapturePointZM_Beacon::ChangeState() { if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } switch(m_State) @@ -94,13 +94,13 @@ void OPvPCapturePointZM_Beacon::ChangeState() m_TowerState = ZM_TOWERSTATE_A; if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled<ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); break; case OBJECTIVESTATE_HORDE: m_TowerState = ZM_TOWERSTATE_H; if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled<ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL: case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: @@ -144,14 +144,14 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_A) - plr->CastSpell(plr,ZM_CAPTURE_BUFF,true); + plr->CastSpell(plr, ZM_CAPTURE_BUFF, true); } else { if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_H) - plr->CastSpell(plr,ZM_CAPTURE_BUFF,true); + plr->CastSpell(plr, ZM_CAPTURE_BUFF, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -182,8 +182,8 @@ bool OutdoorPvPZM::SetupOutdoorPvP() for (uint8 i = 0; i < OutdoorPvPZMBuffZonesNum; ++i) RegisterZone(OutdoorPvPZMBuffZones[i]); - AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST)); - AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_EAST)); + AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_WEST)); + AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_EAST)); m_GraveYard = new OPvPCapturePointZM_GraveYard(this); AddCapturePoint(m_GraveYard); // though the update function isn't used, the handleusego is! @@ -196,9 +196,9 @@ void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed) return; if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE) - plr->CastSpell(plr,ZM_AlliancePlayerKillReward,true); + plr->CastSpell(plr, ZM_AlliancePlayerKillReward, true); else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE) - plr->CastSpell(plr,ZM_HordePlayerKillReward,true); + plr->CastSpell(plr, ZM_HordePlayerKillReward, true); } bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/) @@ -216,28 +216,28 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid) if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A) { if (m_GraveYardState == ZM_GRAVEYARD_H) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); m_GraveYardState = ZM_GRAVEYARD_A; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant - AddObject(0,ZM_Banner_A.entry,ZM_Banner_A.map,ZM_Banner_A.x,ZM_Banner_A.y,ZM_Banner_A.z,ZM_Banner_A.o,ZM_Banner_A.rot0,ZM_Banner_A.rot1,ZM_Banner_A.rot2,ZM_Banner_A.rot3); + AddObject(0, ZM_Banner_A.entry, ZM_Banner_A.map, ZM_Banner_A.x, ZM_Banner_A.y, ZM_Banner_A.z, ZM_Banner_A.o, ZM_Banner_A.rot0, ZM_Banner_A.rot1, ZM_Banner_A.rot2, ZM_Banner_A.rot3); sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF); plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); } else if (plr->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H) { if (m_GraveYardState == ZM_GRAVEYARD_A) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); m_GraveYardState = ZM_GRAVEYARD_H; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant - AddObject(0,ZM_Banner_H.entry,ZM_Banner_H.map,ZM_Banner_H.x,ZM_Banner_H.y,ZM_Banner_H.z,ZM_Banner_H.o,ZM_Banner_H.rot0,ZM_Banner_H.rot1,ZM_Banner_H.rot2,ZM_Banner_H.rot3); + AddObject(0, ZM_Banner_H.entry, ZM_Banner_H.map, ZM_Banner_H.x, ZM_Banner_H.y, ZM_Banner_H.z, ZM_Banner_H.o, ZM_Banner_H.rot0, ZM_Banner_H.rot1, ZM_Banner_H.rot2, ZM_Banner_H.rot3); sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF); plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); } UpdateTowerState(); } @@ -251,22 +251,22 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP *pvp) m_GraveYardState = ZM_GRAVEYARD_N; m_FlagCarrierGUID = 0; // add field scouts here - AddCreature(ZM_ALLIANCE_FIELD_SCOUT,ZM_AllianceFieldScout.entry,ZM_AllianceFieldScout.teamval,ZM_AllianceFieldScout.map,ZM_AllianceFieldScout.x,ZM_AllianceFieldScout.y,ZM_AllianceFieldScout.z,ZM_AllianceFieldScout.o); - AddCreature(ZM_HORDE_FIELD_SCOUT,ZM_HordeFieldScout.entry,ZM_HordeFieldScout.teamval,ZM_HordeFieldScout.map,ZM_HordeFieldScout.x,ZM_HordeFieldScout.y,ZM_HordeFieldScout.z,ZM_HordeFieldScout.o); + AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.teamval, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.x, ZM_AllianceFieldScout.y, ZM_AllianceFieldScout.z, ZM_AllianceFieldScout.o); + AddCreature(ZM_HORDE_FIELD_SCOUT, ZM_HordeFieldScout.entry, ZM_HordeFieldScout.teamval, ZM_HordeFieldScout.map, ZM_HordeFieldScout.x, ZM_HordeFieldScout.y, ZM_HordeFieldScout.z, ZM_HordeFieldScout.o); // add neutral banner - AddObject(0,ZM_Banner_N.entry,ZM_Banner_N.map,ZM_Banner_N.x,ZM_Banner_N.y,ZM_Banner_N.z,ZM_Banner_N.o,ZM_Banner_N.rot0,ZM_Banner_N.rot1,ZM_Banner_N.rot2,ZM_Banner_N.rot3); + AddObject(0, ZM_Banner_N.entry, ZM_Banner_N.map, ZM_Banner_N.x, ZM_Banner_N.y, ZM_Banner_N.z, ZM_Banner_N.o, ZM_Banner_N.rot0, ZM_Banner_N.rot1, ZM_Banner_N.rot2, ZM_Banner_N.rot3); } void OPvPCapturePointZM_GraveYard::UpdateTowerState() { - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N))); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H))); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A))); - - m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,uint32(m_BothControllingFaction == ALLIANCE)); - m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,uint32(m_BothControllingFaction != ALLIANCE)); - m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,uint32(m_BothControllingFaction == HORDE)); - m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,uint32(m_BothControllingFaction != HORDE)); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N))); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H))); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A))); + + m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, uint32(m_BothControllingFaction == ALLIANCE)); + m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, uint32(m_BothControllingFaction != ALLIANCE)); + m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, uint32(m_BothControllingFaction == HORDE)); + m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, uint32(m_BothControllingFaction != HORDE)); } void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPacket &data) @@ -329,7 +329,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems /*gso*/) { uint64 guid = c->GetGUID(); - std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); + std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && plr->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A) @@ -342,7 +342,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipM bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 /*gossipid*/) { - std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); + std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { Creature * cr = HashMapHolder<Creature>::Find(guid); @@ -353,12 +353,12 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, return true; if (itr->second == ZM_ALLIANCE_FIELD_SCOUT) { - cr->CastSpell(plr,ZM_BATTLE_STANDARD_A,true); + cr->CastSpell(plr, ZM_BATTLE_STANDARD_A, true); m_FlagCarrierGUID = plr->GetGUID(); } else if (itr->second == ZM_HORDE_FIELD_SCOUT) { - cr->CastSpell(plr,ZM_BATTLE_STANDARD_H,true); + cr->CastSpell(plr, ZM_BATTLE_STANDARD_H, true); m_FlagCarrierGUID = plr->GetGUID(); } UpdateTowerState(); @@ -393,32 +393,32 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPZM::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E,0); - plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1,1); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A,0); - plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,0); - plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,0); - plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,0); - plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E, 0); + plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1, 1); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, 0); } class OutdoorPvP_zangarmarsh : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index fbd693293f7..fd0f772e8a5 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -24,7 +24,7 @@ const uint8 OutdoorPvPZMBuffZonesNum = 5; // the buff is cast in these zones -const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3715,3716}; +const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521, 3607, 3717, 3715, 3716}; // linked when the central tower is controlled const uint32 ZM_GRAVEYARD_ZONE = 3521; @@ -47,15 +47,15 @@ enum OutdoorPvPZMSpells }; // banners 182527, 182528, 182529, gotta check them ingame -const go_type ZM_Banner_A = { 182527,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; -const go_type ZM_Banner_H = { 182528,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; -const go_type ZM_Banner_N = { 182529,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; +const go_type ZM_Banner_A = { 182527, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; +const go_type ZM_Banner_H = { 182528, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; +const go_type ZM_Banner_N = { 182529, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; // horde field scout spawn data -const creature_type ZM_HordeFieldScout = {18564,67,530,296.625f,7818.4f,42.6294f,5.18363f}; +const creature_type ZM_HordeFieldScout = {18564, 67, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f}; // alliance field scout spawn data -const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395f,6230.08f,22.8351f,0.593412f}; +const creature_type ZM_AllianceFieldScout = {18581, 469, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f}; enum ZMCreatureTypes { @@ -88,8 +88,8 @@ enum ZM_BeaconType const zm_beacon ZMBeaconInfo[ZM_NUM_BEACONS] = { - {2533,2535,2534,2560,2559,2558,2652,2651,2650,11807,11806}, - {2527,2529,2528,2557,2556,2555,2646,2645,2644,11805,11804} + {2533, 2535, 2534, 2560, 2559, 2558, 2652, 2651, 2650, 11807, 11806}, + {2527, 2529, 2528, 2557, 2556, 2555, 2646, 2645, 2644, 11805, 11804} }; const uint32 ZMBeaconCaptureA[ZM_NUM_BEACONS] = @@ -118,8 +118,8 @@ const uint32 ZMBeaconLoseH[ZM_NUM_BEACONS] = const go_type ZMCapturePoints[ZM_NUM_BEACONS] = { - {182523,530,303.243f,6841.36f,40.1245f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f}, - {182522,530,336.466f,7340.26f,41.4984f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f} + {182523, 530, 303.243f, 6841.36f, 40.1245f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f}, + {182522, 530, 336.466f, 7340.26f, 41.4984f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f} }; enum OutdoorPvPZMWorldStates diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index f29eae06ad8..285a7e6ed81 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -204,7 +204,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustSummoned(Creature *summoned) @@ -212,11 +212,11 @@ public: if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell. - summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false); + summoned->CastSpell(summoned, SPELL_STOLEN_SOUL_VISUAL, false); summoned->SetDisplayId(soulmodel); summoned->setFaction(me->getFaction()); - if (Unit *pTarget = Unit::GetUnit(*me,soulholder)) + if (Unit *pTarget = Unit::GetUnit(*me, soulholder)) { CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); @@ -230,7 +230,7 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -259,14 +259,14 @@ public: if (StolenSoul_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - uint32 i = urand(1,2); + uint32 i = urand(1, 2); if (i == 1) DoScriptText(SAY_ROAR, me); else @@ -286,7 +286,7 @@ public: if (Ribbon_of_Souls_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index b893f22b328..5371d8493e3 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -79,7 +79,7 @@ public: { if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) { - summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false); + summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false); summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); summoned->AddUnitState(UNIT_STAT_ROOT); @@ -136,11 +136,11 @@ public: if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { FocusedTargetGUID = pTarget->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); + me->SummonCreature(ENTRY_FOCUS_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); // TODO: Find better way to handle emote // Emote diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 72f628c2988..42256b6a501 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -116,7 +116,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); DoZoneInCombat(); summons.DoZoneInCombat(); @@ -126,9 +126,9 @@ public: { if (summoned->GetEntry() == NPC_BEACON) { - summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false); + summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } @@ -142,7 +142,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -201,7 +201,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - if (!urand(0,3)) + if (!urand(0, 3)) DoScriptText(SAY_SUMMON, me); DoCast(me, SPELL_ETHEREAL_BEACON, true); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 2345ae4c41b..586a8dcc96d 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -75,12 +75,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 6daae1372fa..5bafe396b0d 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -94,7 +94,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustDied(Unit* /*Killer*/) @@ -107,12 +107,12 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustSummoned(Creature *summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } @@ -154,7 +154,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; @@ -162,7 +162,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; @@ -170,7 +170,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; @@ -178,7 +178,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; @@ -186,7 +186,7 @@ public: if (chainlightning_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); chainlightning_timer = 25000; @@ -229,7 +229,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 5000; @@ -237,7 +237,7 @@ public: if (flamebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; @@ -288,7 +288,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; @@ -296,7 +296,7 @@ public: if (arcanebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; @@ -342,7 +342,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 5000; @@ -350,7 +350,7 @@ public: if (frostbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; @@ -397,7 +397,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; @@ -405,7 +405,7 @@ public: if (shadowbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index d19b756a5c7..c7ea5523dac 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -115,7 +115,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustDied(Unit* /*Killer*/) @@ -128,7 +128,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -155,9 +155,9 @@ public: //second top aggro target in normal, random target in heroic correct? if (IsHeroic()) - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); else - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) DoCast(pTarget, SPELL_POLYMORPH); @@ -184,7 +184,7 @@ public: { DoScriptText(EMOTE_ARCANE_EXP, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); @@ -196,7 +196,7 @@ public: float Y = pTarget->GetPositionY(); float Z = pTarget->GetPositionZ(); - DoTeleportTo(X,Y,Z); + DoTeleportTo(X, Y, Z); DoCast(pTarget, SPELL_BLINK_TELEPORT); Blink = true; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index a9e0c8224ea..55aca9695cd 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -78,7 +78,7 @@ public: { case DATA_IKISSDOOREVENT: if (data == DONE) - DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILLISECONDS); + DoUseDoorOrButton(m_uiIkissDoorGUID, DAY*IN_MILLISECONDS); break; case TYPE_ANZU_ENCOUNTER: AnzuEncounter = data; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index de106876d15..6be6824953c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -128,12 +128,12 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 984a55f2a44..17174439e58 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -93,7 +93,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -106,7 +106,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); @@ -138,7 +138,7 @@ public: { Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true); + pTarget->CastSpell(pTarget, SPELL_INCITE_CHAOS_B, true); } DoResetThreat(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 491e4798f54..c7954000934 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -51,7 +51,7 @@ EndScriptData */ #define MOB_VOID_PORTAL 19224 #define SPELL_VOID_PORTAL_VISUAL 33569 -float VorpilPosition[3] = {-252.8820f,-264.3030f,17.1f}; +float VorpilPosition[3] = {-252.8820f, -264.3030f, 17.1f}; float VoidPortalCoords[5][3] = { @@ -115,7 +115,7 @@ public: me->Kill(me); return; } - me->GetMotionMaster()->MoveFollow(Vorpil,0,0); + me->GetMotionMaster()->MoveFollow(Vorpil, 0, 0); if (me->IsWithinDist(Vorpil, 3)) { DoCast(me, SPELL_SACRIFICE, false); @@ -183,11 +183,11 @@ public: for (uint8 i = 0; i < 5; ++i) { Creature *Portal = NULL; - Portal = me->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000); + Portal = me->SummonCreature(MOB_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000); if (Portal) { PortalsGuid[i] = Portal->GetGUID(); - Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false); + Portal->CastSpell(Portal, SPELL_VOID_PORTAL_VISUAL, false); } } sumportals = true; @@ -212,8 +212,8 @@ public: void spawnVoidTraveler() { - int pos = urand(0,4); - me->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000); + int pos = urand(0, 4); + me->SummonCreature(MOB_VOID_TRAVELER, VoidPortalCoords[pos][0], VoidPortalCoords[pos][1], VoidPortalCoords[pos][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); if (!HelpYell) { DoScriptText(SAY_HELP, me); @@ -229,7 +229,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -243,7 +243,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); summonPortals(); if (pInstance) @@ -274,7 +274,7 @@ public: if (IsHeroic() && banish_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); if (pTarget) { DoCast(pTarget, SPELL_BANISH); @@ -289,9 +289,9 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->getSource()) if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) - i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); + i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); - me->GetMap()->CreatureRelocation(me, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); + me->GetMap()->CreatureRelocation(me, VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0.0f); DoCast(me, SPELL_DRAW_SHADOWS, true); DoCast(me, SPELL_RAIN_OF_FIRE); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index c583349ca67..58859e0230d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -101,7 +101,7 @@ public: void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) - me->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); + me->DealDamage(pTarget, (pTarget->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } void UpdateAI(const uint32 diff) @@ -131,7 +131,7 @@ public: // Murmur's Touch if (MurmursTouch_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) DoCast(pTarget, SPELL_MURMURS_TOUCH); MurmursTouch_Timer = 25000 + rand()%10000; } else MurmursTouch_Timer -= diff; @@ -149,7 +149,7 @@ public: // Magnetic Pull if (MagneticPull_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCast(pTarget, SPELL_MAGNETIC_PULL); @@ -166,7 +166,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) DoCast(pTarget, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; @@ -175,7 +175,7 @@ public: // Sonic Shock if (SonicShock_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) if (pTarget->isAlive()) DoCast(pTarget, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; @@ -189,7 +189,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) { me->TauntApply(pTarget); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 72622bb7c10..5558a98f559 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -108,7 +108,7 @@ public: if (creature->isAlive()) { ++m_uiFelOverseerCount; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.", m_uiFelOverseerCount); } break; } @@ -133,7 +133,7 @@ public: --m_uiFelOverseerCount; if (m_uiFelOverseerCount) - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.", m_uiFelOverseerCount); else { m_auiEncounter[1] = DONE; diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index b2a7ff4287f..d8c389eef1a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -114,7 +114,7 @@ public: Phase1 = true; me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } void EnterCombat(Unit * /*who*/) @@ -127,7 +127,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -218,7 +218,7 @@ public: if (EnrageTimer <= diff) { DoCast(me, SPELL_BERSERK); - DoScriptText(RAND(SAY_ENRAGE1,SAY_ENRAGE2), me); + DoScriptText(RAND(SAY_ENRAGE1, SAY_ENRAGE2), me); } else EnrageTimer -= diff; } @@ -289,7 +289,7 @@ public: DoModifyThreatPercent(pTarget, -100); me->AddThreat(pTarget, 50000000.0f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); // If VMaps are disabled, this spell can call the whole instance DoCast(me, SPELL_INSIGNIFIGANCE, true); DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true); @@ -301,7 +301,7 @@ public: //Cast this without triggered so that it appears in combat logs and shows visual. DoCast(me, SPELL_FEL_RAGE_SELF); - DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me); + DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); AcidGeyserTimer = 1000; PhaseChangeTimer = 30000; @@ -320,7 +320,7 @@ public: EjectTimer += 2000; PhaseChangeTimer = 60000; me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } } else PhaseChangeTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 3c3752c7c0b..d357faee386 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -259,17 +259,17 @@ static const Yells Conversation[22] = {0, "", AKAMA, 2000, 15, true}, {11466, "You are not prepared!", ILLIDAN_STORMRAGE, 3000, 406, true}, {0, "", EMPTY, 1000, 0, true}, - {0, "", EMPTY, 0, 0, false},//9 + {0, "", EMPTY, 0, 0, false}, //9 {11476, "Is this it, mortals? Is this all the fury you can muster?", ILLIDAN_STORMRAGE, 8000, 0, true}, {11491, "Their fury pales before mine, Illidan. We have some unsettled business between us.", MAIEV_SHADOWSONG, 8000, 5, true}, {11477, "Maiev... How is this even possible?", ILLIDAN_STORMRAGE, 5000, 1, true}, {11492, "Ah... my long hunt is finally over. Today, Justice will be done!", MAIEV_SHADOWSONG, 8000, 15, true}, - {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false},//14 - {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true},//15 + {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false}, //14 + {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true}, //15 {11478, "You have won... Maiev...but the huntress... is nothing...without the hunt... you... are nothing... without me..", ILLIDAN_STORMRAGE, 30000, 65, true}, // Emote dead for now. Kill him later {11497, "He is right. I feel nothing... I am nothing... Farewell, champions.", MAIEV_SHADOWSONG, 9000, 0, true}, {11498, "", MAIEV_SHADOWSONG, 5000, 0, true}, - {11498, "", EMPTY, 1000, 0, true},//19 Maiev disappear + {11498, "", EMPTY, 1000, 0, true}, //19 Maiev disappear {11387, "The Light will fill these dismal halls once again. I swear it.", AKAMA, 8000, 0, true}, {0, "", EMPTY, 1000, 0, false}//21 }; @@ -306,14 +306,14 @@ static const Locations HoverPosition[4]= static const Locations GlaivePosition[4]= { {695.105f, 305.303f, 354.256f}, - {659.338f, 305.303f, 354.256f},//the distance between two glaives is 36 + {659.338f, 305.303f, 354.256f}, //the distance between two glaives is 36 {700.105f, 305.303f, 354.256f}, {664.338f, 305.303f, 354.256f} }; static const Locations EyeBlast[2]= { - {677.0f, 350.0f, 354.0f},//start point, pass through glaive point + {677.0f, 350.0f, 354.0f}, //start point, pass through glaive point {677.0f, 260.0f, 354.0f} }; @@ -350,7 +350,7 @@ static const Animation DemonTransformation[10]= { {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, true}, {SPELL_DEMON_TRANSFORM_2, SPELL_DEMON_TRANSFORM_1, 4000, 0, 0, 6, true}, - {0, 0, 3000, 1073741824, 21322, 6, false},//stunned, cannot cast demon form + {0, 0, 3000, 1073741824, 21322, 6, false}, //stunned, cannot cast demon form {SPELL_DEMON_TRANSFORM_3, SPELL_DEMON_TRANSFORM_2, 3500, 0, 0, 6, false}, {SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 4, false}, {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, false}, @@ -568,7 +568,7 @@ public: { if (victim == me) return; // TODO: Find better way to handle emote - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(SAY_KILL1, LANG_UNIVERSAL, victim->GetGUID()); @@ -1655,8 +1655,8 @@ public: break; case 2: // spirit help DoCast(Channel, SPELL_AKAMA_DOOR_CHANNEL); - Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false); - Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false); + Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false); + Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false); Timer = 5000; break; case 3: //open the gate @@ -1991,7 +1991,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() { Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); Maiev->setDeathState(JUST_DIED); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } break; case 21: // Kill ourself. @@ -2218,7 +2218,7 @@ public: if (!me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND) && !me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) { - if (Creature* illidan = Unit::GetCreature((*me),IllidanGUID))//summon only in 1. phase + if (Creature* illidan = Unit::GetCreature((*me), IllidanGUID))//summon only in 1. phase if (CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL) me->CastSpell(me->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index c996a3ea35a..6eb6bb620c8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -64,7 +64,7 @@ uint32 PrismaticAuras[]= struct Locations { - float x,y,z; + float x, y, z; }; static Locations TeleportPoint[]= @@ -146,7 +146,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -235,7 +235,7 @@ public: TeleportPlayers(); - DoScriptText(RAND(SAY_SPELL2,SAY_SPELL3), me); + DoScriptText(RAND(SAY_SPELL2, SAY_SPELL3), me); FatalAttractionExplodeTimer = 2000; FatalAttractionTimer = 40000 + rand()%31 * 1000; } else FatalAttractionTimer -= diff; @@ -292,7 +292,7 @@ public: //Random taunts if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_TAUNT1,SAY_TAUNT2,SAY_TAUNT3), me); + DoScriptText(RAND(SAY_TAUNT1, SAY_TAUNT2, SAY_TAUNT3), me); RandomYellTimer = 60000 + rand()%91 * 1000; } else RandomYellTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 732f35c22a7..ae4d9790fca 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -88,7 +88,7 @@ EndScriptData */ struct Position2d { - float x,y; + float x, y; }; static Position2d Coords[]= @@ -294,7 +294,7 @@ public: MergeThreatList(Essence); Essence->RemoveAllAuras(); Essence->DeleteThreatList(); - Essence->GetMotionMaster()->MoveFollow(me,0.0f,0.0f); + Essence->GetMotionMaster()->MoveFollow(me, 0.0f, 0.0f); } else return; } break; @@ -302,7 +302,7 @@ public: Timer = 1500; if (Essence->IsWithinDistInMap(me, 10)) { - Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE,374); //rotate and disappear + Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, 374); //rotate and disappear Timer = 2000; me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } @@ -325,7 +325,7 @@ public: DoScriptText(DESI_SAY_AFTER, Essence); } Essence->DespawnOrUnsummon(); - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); EssenceGUID = 0; SoulCount = 0; SoulDeathCount = 0; @@ -406,7 +406,7 @@ public: { damage = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->Yell(SUFF_SAY_RECAP,LANG_UNIVERSAL,0); + me->Yell(SUFF_SAY_RECAP, LANG_UNIVERSAL, 0); DoScriptText(SUFF_SAY_RECAP, me); } } @@ -426,7 +426,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SUFF_SAY_SLAY1,SUFF_SAY_SLAY2,SUFF_SAY_SLAY3), me); + DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me); } void CastFixate() @@ -450,7 +450,7 @@ public: if (pTarget) pTarget->CastSpell(me, SPELL_FIXATE_TAUNT, true); DoResetThreat(); - me->AddThreat(pTarget,1000000); + me->AddThreat(pTarget, 1000000); } void UpdateAI(const uint32 diff) @@ -555,7 +555,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(DESI_SAY_SLAY1,DESI_SAY_SLAY2,DESI_SAY_SLAY3), me); + DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me); } void UpdateAI(const uint32 diff) @@ -634,7 +634,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(ANGER_SAY_FREED,ANGER_SAY_FREED2), me); + DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me); DoZoneInCombat(); DoCast(me, AURA_OF_ANGER, true); @@ -647,7 +647,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(ANGER_SAY_SLAY1,ANGER_SAY_SLAY2), me); + DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index f7f31ca08c1..3a8f367bd43 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -173,7 +173,7 @@ public: Creature* Shade = Unit::GetCreature((*me), ShadeGUID); if (Shade && Shade->isAlive() && me->isAlive()) { - if (me->IsWithinDist(Shade, 20,false)) + if (me->IsWithinDist(Shade, 20, false)) { me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveIdle(); @@ -208,7 +208,7 @@ public: AkamaGUID = pInstance ? pInstance->GetData64(DATA_AKAMA_SHADE) : 0; me->setActive(true);//if view distance is too low me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } InstanceScript* pInstance; @@ -381,7 +381,7 @@ public: void FindChannelers() { std::list<Creature*> ChannelerList; - me->GetCreatureListWithEntryInGrid(ChannelerList,CREATURE_CHANNELER,50.0f); + me->GetCreatureListWithEntryInGrid(ChannelerList, CREATURE_CHANNELER, 50.0f); if (!ChannelerList.empty()) { @@ -437,7 +437,7 @@ public: if (Creature* Akama = Unit::GetCreature(*me, AkamaGUID)) { float x, y, z; - Akama->GetPosition(x,y,z); + Akama->GetPosition(x, y, z); // They move towards AKama Defender->GetMotionMaster()->MovePoint(0, x, y, z); Defender->AI()->AttackStart(Akama); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 5ff1a565f33..fd741088ecc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -73,7 +73,7 @@ public: me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm())); me->GetMotionMaster()->MovePoint(0, x, y, z); me->SetVisible(false); - me->CastSpell(me,SPELL_MOLTEN_FLAME,true); + me->CastSpell(me, SPELL_MOLTEN_FLAME, true); } }; @@ -138,7 +138,7 @@ public: events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE); me->SetSpeed(MOVE_RUN, 1.2f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } else { @@ -147,7 +147,7 @@ public: events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE); me->SetSpeed(MOVE_RUN, 0.9f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } DoResetThreat(); DoZoneInCombat(); @@ -232,7 +232,7 @@ public: if (pTarget) { //DoCast(pTarget, SPELL_VOLCANIC_SUMMON);//movement bugged - me->SummonCreature(CREATURE_VOLCANO,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + me->SummonCreature(CREATURE_VOLCANO, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); DoScriptText(EMOTE_GROUND_CRACK, me); events.DelayEvents(1500, GCD_CAST); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 7ccf85bc821..4153c4c234f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -288,7 +288,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -302,7 +302,7 @@ public: float CalculateRandomLocation(float Loc, uint32 radius) { float coord = Loc; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: coord += rand()%radius; @@ -345,8 +345,8 @@ public: Ghost = Unit::GetUnit((*me), GhostGUID); if (Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH)) { - /*float x,y,z; - Ghost->GetPosition(x,y,z); + /*float x, y, z; + Ghost->GetPosition(x, y, z); Creature* control = me->SummonCreature(CREATURE_GHOST, x, y, z, 0, TEMPSUMMON_TIMED_DESAWN, 30000); if (control) { @@ -458,7 +458,7 @@ public: if (pTarget) { - DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me); + DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); DoCast(pTarget, SPELL_INCINERATE); IncinerateTimer = 20000 + rand()%31 * 1000; } @@ -491,7 +491,7 @@ public: if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_SPELL1,SAY_SPELL2), me); + DoScriptText(RAND(SAY_SPELL1, SAY_SPELL2), me); RandomYellTimer = 50000 + rand()%51 * 1000; } else RandomYellTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 299fa50adf4..fb8711ec7ac 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -189,13 +189,13 @@ public: SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) DoCast(*i, 39835, true); - events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST); + events.ScheduleEvent(EVENT_NEEDLE, urand(15000, 25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); return; } case EVENT_YELL: DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); - events.ScheduleEvent(EVENT_YELL, urand(25000,100000), GCD_YELL); + events.ScheduleEvent(EVENT_YELL, urand(25000, 100000), GCD_YELL); events.DelayEvents(15000, GCD_YELL); break; } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 3b44f115b93..0ae6d62e175 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -326,7 +326,7 @@ public: if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) VoiceTrigger->DealDamage(VoiceTrigger, VoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE); - //me->SummonCreature(AKAMAID,746.466980f,304.394989f,311.90208f,6.272870f,TEMPSUMMON_DEAD_DESPAWN,0); + //me->SummonCreature(AKAMAID, 746.466980f, 304.394989f, 311.90208f, 6.272870f, TEMPSUMMON_DEAD_DESPAWN, 0); } me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; @@ -518,7 +518,7 @@ public: void CastAuraOnCouncil() { uint32 spellid = 0; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: spellid = SPELL_DEVOTION_AURA; break; case 1: spellid = SPELL_CHROMATIC_AURA; break; @@ -540,7 +540,7 @@ public: { if (Unit* pUnit = SelectCouncilMember()) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD); break; case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break; @@ -570,7 +570,7 @@ public: if (SealTimer <= diff) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(me, SPELL_SEAL_OF_COMMAND); break; case 1: DoCast(me, SPELL_SEAL_OF_BLOOD); break; @@ -650,7 +650,7 @@ public: { DoCast(me, SPELL_DAMPEN_MAGIC); Cooldown = 1000; - DampenMagicTimer = 67200; // almost 1,12 minutes + DampenMagicTimer = 67200; // almost 1, 12 minutes ArcaneBoltTimer += 1000; // Give the Mage some time to spellsteal Dampen. } else DampenMagicTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 1a7d30baa65..3770dabd8c7 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -164,24 +164,24 @@ public: switch(go->GetEntry()) { case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) - if (m_auiEncounter[0] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) - if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; case 185478: ShadeOfAkamaDoor = go->GetGUID();break; case 185480: CommonDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; case 186153: TeronDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; case 185892: GuurtogDoor = go->GetGUID(); - if (m_auiEncounter[4] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[4] == DONE)HandleGameObject(0, true, go);break; case 185479: TempleDoor = go->GetGUID(); - if (m_auiEncounter[5] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[5] == DONE)HandleGameObject(0, true, go);break; case 185482: MotherDoor = go->GetGUID(); - if (m_auiEncounter[6] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[6] == DONE)HandleGameObject(0, true, go);break; case 185481: CouncilDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; case 186152: SimpleDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 201fa46bb02..b5e0120d004 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -201,7 +201,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*killer*/) @@ -432,7 +432,7 @@ public: pet = true; //uint32 spell_id; uint32 pet_id; - if (!urand(0,1)) + if (!urand(0, 1)) { //spell_id = SPELL_SUMMON_FATHOM_LURKER; pet_id = CREATURE_FATHOM_LURKER; @@ -443,8 +443,8 @@ public: pet_id = CREATURE_FATHOM_SPOREBAT; } //DoCast(me, spell_id, true); - Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Creature *Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (Pet && pTarget) { Pet->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 153bb9e5a66..9c79808b589 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -137,18 +137,18 @@ public: void SummonBeams() { - Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0); + Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -258.333f, -356.34f, 22.0499f, 5.90835f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (beamer) { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->CastSpell(me, SPELL_BLUE_BEAM, true); beamer->SetDisplayId(11686); //invisible beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[0]=beamer->GetGUID(); } - beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0); + beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (beamer) { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->CastSpell(me, SPELL_BLUE_BEAM, true); beamer->SetDisplayId(11686); //invisible beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[1]=beamer->GetGUID(); @@ -158,7 +158,7 @@ public: { for (uint8 i=0; i<2; ++i) { - Creature* mob = Unit::GetCreature(*me,beams[i]); + Creature* mob = Unit::GetCreature(*me, beams[i]); if (mob) { mob->setDeathState(DEAD); @@ -178,11 +178,11 @@ public: { if (CorruptedForm) { - DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me); + DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me); } else { - DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me); + DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me); } } @@ -191,13 +191,13 @@ public: if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true); Summons.Summon(summoned); } if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN) { summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true); Summons.Summon(summoned); } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index fadd533c65a..f9879dee03a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -228,7 +228,7 @@ public: } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -241,7 +241,7 @@ public: void StartEvent() { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3, SAY_AGGRO4), me); Phase = 1; @@ -301,7 +301,7 @@ public: void CastShootOrMultishot() { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: //Shoot @@ -316,7 +316,7 @@ public: } if (rand()%3) { - DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me); + DoScriptText(RAND(SAY_BOWSHOT1, SAY_BOWSHOT2), me); } } @@ -601,8 +601,8 @@ public: void Reset() { - me->SetSpeed(MOVE_WALK,0.6f);//walk - me->SetSpeed(MOVE_RUN,0.6f);//run + me->SetSpeed(MOVE_WALK, 0.6f);//walk + me->SetSpeed(MOVE_RUN, 0.6f);//run move = 0; phase = 1; @@ -618,7 +618,7 @@ public: } else { - if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z)) + if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(x, y, z)) { x = ElementWPPos[i][0]; y = ElementWPPos[i][1]; @@ -647,7 +647,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); if (phase == 1) me->GetMotionMaster()->MovePoint(0, x, y, z); - if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f)) + if (phase == 1 && me->IsWithinDist3d(x, y, z, 0.1f)) phase = 2; if (phase == 2) { @@ -676,7 +676,7 @@ public: }; //Tainted Elemental -//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental +//This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental class mob_tainted_elemental : public CreatureScript { public: @@ -812,7 +812,7 @@ public: if (movement_timer <= diff) { uint32 rndpos = rand()%8; - me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); + me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); movement_timer = 6000; } else movement_timer -= diff; @@ -823,11 +823,11 @@ public: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { - Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (trig) { trig->setFaction(14); - trig->CastSpell(trig, SPELL_TOXIC_SPORES,true); + trig->CastSpell(trig, SPELL_TOXIC_SPORES, true); } } bolt_timer = 10000+rand()%5000; @@ -859,7 +859,7 @@ public: }; //Coilfang Elite -//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage +//It's an elite Naga mob with 170, 000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage class mob_coilfang_elite : public CreatureScript { public: diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index bf91825bae9..d8e3b1158e9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -96,7 +96,7 @@ public: } void JustDied(Unit * /*victim*/) { - Unit* pUnit = Unit::GetUnit((*me),victimGUID); + Unit* pUnit = Unit::GetUnit((*me), victimGUID); if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } @@ -124,10 +124,10 @@ public: if (me->getVictim()->GetGUID() != victimGUID) { DoModifyThreatPercent(me->getVictim(), -100); - Unit* owner = Unit::GetUnit((*me),victimGUID); + Unit* owner = Unit::GetUnit((*me), victimGUID); if (owner && owner->isAlive()) { - me->AddThreat(owner,999999); + me->AddThreat(owner, 999999); AttackStart(owner); } else if (owner && owner->isDead()) { @@ -172,7 +172,7 @@ public: { boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) { - c->GetPosition(x,y,z); + c->GetPosition(x, y, z); pInstance = c->GetInstanceScript(); Demon = 0; @@ -195,7 +195,7 @@ public: bool DemonForm; bool IsFinalForm; bool EnrageUsed; - float x,y,z; + float x, y, z; uint64 InnderDemon[5]; uint32 InnerDemon_Count; @@ -233,7 +233,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i])) + if (Creature *add = Unit::GetCreature(*me, SpellBinderGUID[i])) add->DisappearAndDie(); float nx = x; @@ -242,7 +242,7 @@ public: if (i == 0) {nx += 10; ny -= 5; o=2.5f;} if (i == 1) {nx -= 8; ny -= 7; o=0.9f;} if (i == 2) {nx -= 3; ny += 9; o=5.0f;} - Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0); + Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0); if (binder) SpellBinderGUID[i] = binder->GetGUID(); @@ -282,7 +282,7 @@ public: uint8 AliveChannelers = 0; for (uint8 i = 0; i < 3; ++i) { - Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]); + Unit *add = Unit::GetUnit(*me, SpellBinderGUID[i]); if (add && add->isAlive()) ++AliveChannelers; } @@ -374,11 +374,11 @@ public: if (DemonForm) { - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); } else { - DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me); + DoScriptText(RAND(SAY_NIGHTELF_SLAY1, SAY_NIGHTELF_SLAY2, SAY_NIGHTELF_SLAY3), me); } } @@ -425,7 +425,7 @@ public: { DoResetThreat(); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, newTarget->GetPositionX(), newTarget->GetPositionY(), newTarget->GetPositionZ()); } Whirlwind_Timer = 2000; } else Whirlwind_Timer -= diff; @@ -474,7 +474,7 @@ public: if (SwitchToDemon_Timer <= diff) { //switch to demon form - me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0); + me->RemoveAurasDueToSpell(SPELL_WHIRLWIND, 0); me->SetDisplayId(MODEL_DEMON); DoScriptText(SAY_SWITCH_TO_DEMON, me); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); @@ -621,7 +621,7 @@ public: if (victim->GetTypeId() != TYPEID_PLAYER) return; - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -760,7 +760,7 @@ public: if (Mindblast_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index b05ed6ff25e..67cb8797593 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -239,7 +239,7 @@ public: if (SpoutTimer <= diff) { - me->MonsterTextEmote(EMOTE_SPOUT,0,true); + me->MonsterTextEmote(EMOTE_SPOUT, 0, true); me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); SpoutTimer = 45000; @@ -279,7 +279,7 @@ public: Map::PlayerList const &PlayerList = pMap->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2),i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) + if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water } } @@ -299,7 +299,7 @@ public: if (GeyserTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -311,7 +311,7 @@ public: { if (WaterboltTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -333,7 +333,7 @@ public: me->InterruptNonMeleeSpells(false);//shouldn't be any me->RemoveAllAuras(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); + me->RemoveFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED); DoCast(me, SPELL_EMERGE, true); Spawned = false; SpoutTimer = 3000; // directly cast Spout after emerging! @@ -357,8 +357,8 @@ public: { Creature* Summoned; if (i < 6) - Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Summoned) Summons.Summon(Summoned); @@ -457,7 +457,7 @@ public: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; if (pTarget) - me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true); + me->CastCustomSpell(pTarget, SPELL_SHOOT, &bp0, NULL, NULL, true); ShootBowTimer = 4000+rand()%5000; MultiShotTimer += 1500;//add global cooldown } else ShootBowTimer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index cf228240c27..62b41cd4c0f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -137,7 +137,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -183,7 +183,7 @@ public: } else { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); for (uint8 i = 0; i < 10; ++i) { @@ -234,7 +234,7 @@ public: } } - DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me); + DoScriptText(RAND(SAY_SUMMON_BUBL1, SAY_SUMMON_BUBL2), me); DoScriptText(EMOTE_WATERY_GRAVE, me); WateryGrave_Timer = 30000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 271a1a0a02f..8dd2db54e75 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -143,16 +143,16 @@ class instance_serpent_shrine : public InstanceMapScript if (!pPlayer->HasAura(SPELL_SCALDINGWATER)) { - pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true); + pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER, true); } } else if (Water == WATERSTATE_FRENZY) { //spawn frenzy if (DoSpawnFrenzy) { - if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000)) + if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) { - frenzy->Attack(pPlayer,false); + frenzy->Attack(pPlayer, false); frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); } DoSpawnFrenzy = false; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index a8d7c1ce0b7..dcc88ba5d78 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -89,12 +89,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (pInstance) pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); @@ -108,12 +108,12 @@ public: //LightningCloud_Timer if (LightningCloud_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); LightningCloud_Timer = 15000+rand()%10000; @@ -122,7 +122,7 @@ public: //LungBurst_Timer if (LungBurst_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LUNG_BURST); LungBurst_Timer = 7000+rand()%5000; } else LungBurst_Timer -=diff; @@ -130,12 +130,12 @@ public: //EnvelopingWinds_Timer if (EnvelopingWinds_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 10000+rand()%5000; } else EnvelopingWinds_Timer -=diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index f57d8cb25e9..6781e3562c2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -98,12 +98,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (pInstance) pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); @@ -114,14 +114,14 @@ public: { DoScriptText(SAY_MECHANICS, me); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } void UpdateAI(const uint32 diff) @@ -137,7 +137,7 @@ public: if (Saw_Blade_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_SAW_BLADE); else DoCast(me->getVictim(), SPELL_SAW_BLADE); @@ -248,7 +248,7 @@ public: else { //me->GetMotionMaster()->MovementExpired(); - //me->GetMotionMaster()->MoveFollow(pMekgineer,0,0); + //me->GetMotionMaster()->MoveFollow(pMekgineer, 0, 0); } } } else Repair_Timer = 5000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index e4102fe6b11..d91750beaa3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -87,14 +87,14 @@ public: DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true); if (pInstance) - pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); + pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS); } void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) if (pInstance) - pInstance->SetData(TYPE_DISTILLER,DONE); + pInstance->SetData(TYPE_DISTILLER, DONE); } }; @@ -137,7 +137,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); @@ -145,7 +145,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void SpellHit(Unit * /*caster*/, const SpellEntry *spell) @@ -191,7 +191,7 @@ public: //Impale_Timer if (Impale_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 41d8ab17e98..6eae132ebbc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -51,10 +51,10 @@ public: return false; if (go->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); + pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL); if (go->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL); return true; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 289cbc781a0..6ccce4646ba 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -75,7 +75,7 @@ public: if (Mushroom_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); else me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); @@ -85,7 +85,7 @@ public: if (AcidGeyser_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; } else AcidGeyser_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 92be08c2dae..d77cdcf69f0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -80,7 +80,7 @@ public: if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.push_back(summon->GetGUID()); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) summon->AI()->AttackStart(pTarget); else if (me->getVictim()) @@ -103,9 +103,9 @@ public: // Evade if too far if (check_Timer <= diff) { - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - if (!me->IsWithinDist3d(x,y,z, 60)) + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + if (!me->IsWithinDist3d(x, y, z, 60)) { EnterEvadeMode(); return; @@ -150,7 +150,7 @@ public: } if (Levitate_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { DoCast(pTarget, SPELL_LEVITATE); LevitatedTarget = pTarget->GetGUID(); @@ -163,7 +163,7 @@ public: // Chain Lightning if (ChainLightning_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 7000; } else ChainLightning_Timer -= diff; @@ -171,7 +171,7 @@ public: // Static Charge if (StaticCharge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) DoCast(pTarget, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; } else StaticCharge_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 01b7546506f..dad5f356a1c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -106,7 +106,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -128,7 +128,7 @@ public: { if (pTarget->GetTypeId() == TYPEID_PLAYER) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break; case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break; @@ -197,7 +197,7 @@ public: // Hurtful Strike if (m_uiHurtfulStrike_Timer <= uiDiff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget && me->IsWithinMeleeRange(me->getVictim())) DoCast(pTarget, SPELL_HURTFUL_STRIKE); @@ -221,7 +221,7 @@ public: // Cave In if (m_uiCaveIn_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index d48edfb8e07..4d835a680c0 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -170,7 +170,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -183,7 +183,7 @@ public: void AddDeath() { - DoScriptText(RAND(SAY_OGRE_DEATH1,SAY_OGRE_DEATH2,SAY_OGRE_DEATH3,SAY_OGRE_DEATH4), me); + DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me); } void EnterCombat(Unit *who) @@ -772,7 +772,7 @@ public: { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //15 yard radius minimum - if (pTarget && pTarget->IsWithinDist(me, 15,false)) + if (pTarget && pTarget->IsWithinDist(me, 15, false)) target_list.push_back(pTarget); pTarget = NULL; } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 2928a4f3d72..a21ce8473b7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -86,7 +86,7 @@ class boss_broggok : public CreatureScript summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID()); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index f2cdce78903..d65be72aec6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -60,11 +60,11 @@ enum eKelidan const float ShadowmoonChannelers[5][4]= { - {302.0f,-87.0f,-24.4f,0.157f}, - {321.0f,-63.5f,-24.6f,4.887f}, - {346.0f,-74.5f,-24.6f,3.595f}, - {344.0f,-103.5f,-24.5f,2.356f}, - {316.0f,-109.0f,-24.6f,1.257f} + {302.0f, -87.0f, -24.4f, 0.157f}, + {321.0f, -63.5f, -24.6f, 4.887f}, + {346.0f, -74.5f, -24.6f, 3.595f}, + {344.0f, -103.5f, -24.5f, 2.356f}, + {316.0f, -109.0f, -24.6f, 1.257f} }; class boss_kelidan_the_breaker : public CreatureScript @@ -124,7 +124,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void ChannelerEngaged(Unit* who) @@ -132,7 +132,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (who && !addYell) { addYell = true; - DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me); + DoScriptText(RAND(SAY_ADD_AGGRO_1, SAY_ADD_AGGRO_2, SAY_ADD_AGGRO_3), me); } for (uint8 i=0; i<5; ++i) { @@ -175,7 +175,7 @@ class boss_kelidan_the_breaker : public CreatureScript { Creature *channeler = Unit::GetCreature(*me, Channelers[i]); if (!channeler || channeler->isDead()) - channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000); + channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); if (channeler) Channelers[i] = channeler->GetGUID(); else @@ -254,7 +254,7 @@ class boss_kelidan_the_breaker : public CreatureScript } if (IsHeroic()) - DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + DoTeleportAll(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); BurningNova_Timer = 20000+rand()%8000; Firenova_Timer= 5000; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index c1c86aad7e9..7f2b5f7bd78 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -80,7 +80,7 @@ class boss_the_maker : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (!pInstance) return; @@ -91,7 +91,7 @@ class boss_the_maker : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript if (ExplodingBreaker_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; } @@ -133,7 +133,7 @@ class boss_the_maker : public CreatureScript if (domination_timer_timer <= diff) { Unit *pTarget; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); DoCast(pTarget, SPELL_DOMINATION); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 04ad98a965d..6afbe18a78e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -92,7 +92,7 @@ class boss_omor_the_unscarred : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void KilledUnit(Unit* /*victim*/) @@ -107,7 +107,7 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_SUMMON, me); - if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(random); ++SummonedCount; @@ -162,7 +162,7 @@ class boss_omor_the_unscarred : public CreatureScript Unit* temp = NULL; if (me->IsWithinMeleeRange(me->getVictim())) temp = me->getVictim(); - else temp = SelectTarget(SELECT_TARGET_RANDOM,0); + else temp = SelectTarget(SELECT_TARGET_RANDOM, 0); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { @@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_CURSE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; @@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Shadowbolt_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) pTarget = me->getVictim(); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 840d28065b4..6622c42827b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -112,15 +112,15 @@ class boss_nazan : public CreatureScript { summoned->SetLevel(me->getLevel()); summoned->setFaction(me->getFaction()); - summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE,SPELL_SUMMON_LIQUID_FIRE_H),true); - summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true); + summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE, SPELL_SUMMON_LIQUID_FIRE_H), true); + summoned->CastSpell(summoned, SPELL_FIRE_NOVA_VISUAL, true); } } void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) { if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) - me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); + me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } void UpdateAI(const uint32 diff) @@ -130,16 +130,16 @@ class boss_nazan : public CreatureScript if (Fireball_Timer <= diff) { - if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true); - Fireball_Timer = urand(4000,7000); + Fireball_Timer = urand(4000, 7000); } else Fireball_Timer -= diff; if (flight) // phase 1 - the flight { - Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID); + Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20))) { flight = false; @@ -148,7 +148,7 @@ class boss_nazan : public CreatureScript me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); me->GetMotionMaster()->Clear(); - if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST,0)) + if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST, 0)) me->AI()->AttackStart(pVictim); DoStartMovement(me->getVictim()); DoScriptText(EMOTE, me); @@ -160,8 +160,8 @@ class boss_nazan : public CreatureScript if (Turn_Timer <= diff) { uint32 waypoint = (Fly_Timer/10000)%2; - if (!me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5)) - me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]); + if (!me->IsWithinDist3d(VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2], 5)) + me->GetMotionMaster()->MovePoint(0, VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2]); Turn_Timer = 10000; } else @@ -227,13 +227,13 @@ class boss_vazruden : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void KilledUnit(Unit* who) { if (who && who->GetEntry() != ENTRY_VAZRUDEN) - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* who) @@ -263,7 +263,7 @@ class boss_vazruden : public CreatureScript if (Revenge_Timer <= diff) { if (Unit *victim = me->getVictim()) - DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H)); + DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H)); Revenge_Timer = 5000; } else @@ -346,9 +346,9 @@ class boss_vazruden_the_herald : public CreatureScript { if (!summoned) { - if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000)) VazrudenGUID = Vazruden->GetGUID(); - if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000)) NazanGUID = Nazan->GetGUID(); summoned = true; me->SetVisible(false); @@ -405,10 +405,10 @@ class boss_vazruden_the_herald : public CreatureScript case 1: // go to the middle and begin the fight if (check <= diff) { - if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5)) + if (!me->IsWithinDist3d(VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 5)) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]); + me->GetMotionMaster()->MovePoint(0, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2]); check = 1000; } else @@ -439,7 +439,7 @@ class boss_vazruden_the_herald : public CreatureScript } else if (!lootSpawned) { - me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H),VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0); + me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0); me->SetLootRecipient(NULL); // don't think this is necessary.. //me->Kill(me); lootSpawned = true; @@ -475,14 +475,14 @@ class mob_hellfire_sentry : public CreatureScript void Reset() { - KidneyShot_Timer = urand(3000,7000); + KidneyShot_Timer = urand(3000, 7000); } void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* who) { - if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150)) + if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 96d8e17c238..f1b21b1da69 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -80,7 +80,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void MoveInLineOfSight(Unit* who) @@ -106,7 +106,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { DoScriptText(SAY_SURGE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 06b856cc31b..ba6969acc2c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -66,7 +66,7 @@ class instance_ramparts : public InstanceMapScript void SetData(uint32 uiType, uint32 uiData) { - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData); switch(uiType) { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 332cd1792b1..71c05cbf93a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -158,7 +158,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void DoTauntPeons() { - DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me); + DoScriptText(RAND(SAY_TAUNT_1, SAY_TAUNT_2, SAY_TAUNT_3), me); //TODO: kill the peons first IsIntroEvent = false; @@ -194,7 +194,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript IsIntroEvent = true; if (pInstance) - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } if (IsIntroEvent || !IsMainEvent) @@ -205,7 +205,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustSummoned(Creature *summoned) @@ -215,13 +215,13 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid? - summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true); - summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true); + summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -231,7 +231,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (!pInstance) return; - pInstance->SetData(TYPE_NETHEKURSE,DONE); + pInstance->SetData(TYPE_NETHEKURSE, DONE); pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true); } @@ -277,18 +277,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (ShadowFissure_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISSURE); - ShadowFissure_Timer = urand(7500,15000); + ShadowFissure_Timer = urand(7500, 15000); } else ShadowFissure_Timer -= diff; if (DeathCoil_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DEATH_COIL); - DeathCoil_Timer = urand(15000,20000); + DeathCoil_Timer = urand(15000, 20000); } else DeathCoil_Timer -= diff; @@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript { if (pInstance->GetData64(DATA_NETHEKURSE)) { - Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)); + Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)); if (pKurse && me->IsWithinDist(pKurse, 45.0f)) { CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); @@ -350,7 +350,7 @@ class mob_fel_orc_convert : public CreatureScript if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) return; else - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } } } @@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) return; if (pInstance->GetData64(DATA_NETHEKURSE)) - if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE))) + if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE))) CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index b02521d6136..69e8c12ac41 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -190,13 +190,13 @@ class boss_warbringer_omrogg : public CreatureScript void Reset() { - if (Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { pLeftHead->setDeathState(JUST_DIED); LeftHeadGUID = 0; } - if (Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID)) + if (Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID)) { pRightHead->setDeathState(JUST_DIED); RightHeadGUID = 0; @@ -221,8 +221,8 @@ class boss_warbringer_omrogg : public CreatureScript void DoYellForThreat() { - Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); - if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { iaggro = rand()%3; @@ -271,8 +271,8 @@ class boss_warbringer_omrogg : public CreatureScript void KilledUnit(Unit* /*victim*/) { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -297,8 +297,8 @@ class boss_warbringer_omrogg : public CreatureScript void JustDied(Unit* /*Killer*/) { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -317,8 +317,8 @@ class boss_warbringer_omrogg : public CreatureScript { Delay_Timer = 3500; - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ResetThreat_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoYellForThreat(); DoResetThreat(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index e7098b1ffe1..417eb865b4d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -55,9 +55,9 @@ enum eCreatures #define TARGET_NUM 5 -float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8 -float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8 -float AddsEntrance[3] = {306.036f,-84.29f,1.93f}; +float AssassEntrance[3] = {275.136f, -84.29f, 2.3f}; // y -8 +float AssassExit[3] = {184.233f, -84.29f, 2.3f}; // y -8 +float AddsEntrance[3] = {306.036f, -84.29f, 1.93f}; class boss_warchief_kargath_bladefist : public CreatureScript { @@ -94,7 +94,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { removeAdds(); - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); summoned = 2; @@ -110,7 +110,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void JustSummoned(Creature *summoned) @@ -120,7 +120,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript case MOB_HEARTHEN_GUARD: case MOB_SHARPSHOOTER_GUARD: case MOB_REAVER_GUARD: - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); adds.push_back(summoned->GetGUID()); break; case MOB_SHATTERED_ASSASSIN: @@ -133,7 +133,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { if (victim->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } } @@ -166,11 +166,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript { for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) { - Unit* temp = Unit::GetUnit((*me),*itr); + Unit* temp = Unit::GetUnit((*me), *itr); if (temp && temp->isAlive()) { (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CAST_CRE(temp)->RemoveCorpse(); } } @@ -178,11 +178,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) { - Unit* temp = Unit::GetUnit((*me),*itr); + Unit* temp = Unit::GetUnit((*me), *itr); if (temp && temp->isAlive()) { (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CAST_CRE(temp)->RemoveCorpse(); } } @@ -190,10 +190,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript } void SpawnAssassin() { - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } void UpdateAI(const uint32 diff) @@ -223,7 +223,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { // stop bladedance InBlade = false; - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->GetMotionMaster()->MoveChase(me->getVictim()); Blade_Dance_Timer = 30000; Wait_Timer = 0; @@ -233,12 +233,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript else { //move in bladedance - float x,y,randx,randy; + float x, y, randx, randy; randx = 0.0f + rand()%40; randy = 0.0f + rand()%40; x = 210+ randx ; y = -60- randy ; - me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, x, y, me->GetPositionZ()); Wait_Timer = 0; } } @@ -256,7 +256,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript Wait_Timer = 1; InBlade = true; Blade_Dance_Timer = 0; - me->SetSpeed(MOVE_RUN,4); + me->SetSpeed(MOVE_RUN, 4); return; } else @@ -278,22 +278,22 @@ class boss_warchief_kargath_bladefist : public CreatureScript { for (uint8 i = 0; i < summoned; ++i) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } - if (urand(0,9) < 2) + if (urand(0, 9) < 2) ++summoned; - Summon_Assistant_Timer = urand(25000,35000); + Summon_Assistant_Timer = urand(25000, 35000); } else Summon_Assistant_Timer -= diff; @@ -303,7 +303,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript if (resetcheck_timer <= diff) { - uint32 tempx,tempy; + uint32 tempx, tempy; tempx = uint32(me->GetPositionX()); tempy = uint32(me->GetPositionY()); if (tempx > 255 || tempx < 205) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index a948ab70a34..7eef901f83e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -28,7 +28,7 @@ EndScriptData */ enum eSpells { - SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions + SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions SPELL_FLAME_QUILLS = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20% SPELL_REBIRTH = 34342, // Rebirth - beginning of second phase(after losing all health in phase 1) SPELL_REBIRTH_2 = 35369, // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2 @@ -291,7 +291,7 @@ class boss_alar : public CreatureScript if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) dist = 5.0f; WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f)); - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f); + me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f); me->StopMoving(); WaitEvent = WE_LAND; } @@ -343,7 +343,7 @@ class boss_alar : public CreatureScript } else { - if (urand(0,4)) // next platform + if (urand(0, 4)) // next platform { DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (cur_wp == 3) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 5d7fb7e9f35..d50ac198eff 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -145,7 +145,7 @@ class boss_high_astromancer_solarian : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me); } void JustDied(Unit * /*victim*/) @@ -180,7 +180,7 @@ class boss_high_astromancer_solarian : public CreatureScript float Portal_X(float radius) { - if (urand(0,1)) + if (urand(0, 1)) radius = -radius; return radius * (float)(rand()%100)/100.0f + CENTER_X; @@ -447,7 +447,7 @@ class mob_solarium_priest : public CreatureScript if (healTimer <= diff) { Unit *pTarget = NULL; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: if (pInstance) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 60b92956a34..95e6a52db2b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -236,7 +236,7 @@ struct advisorbase_ai : public ScriptedAI me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->ClearAllReactives(); - me->SetUInt64Value(UNIT_FIELD_TARGET,0); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -431,7 +431,7 @@ class boss_kaelthas : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustSummoned(Creature* pSummoned) @@ -798,7 +798,7 @@ class boss_kaelthas : public CreatureScript if (Phoenix_Timer <= diff) { DoCast(me, SPELL_PHOENIX_ANIMATION); - DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me); + DoScriptText(RAND(SAY_SUMMON_PHOENIX1, SAY_SUMMON_PHOENIX2), me); Phoenix_Timer = 60000; } @@ -909,7 +909,7 @@ class boss_kaelthas : public CreatureScript break; case 1: - DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me); + DoScriptText(RAND(SAY_GRAVITYLAPSE1, SAY_GRAVITYLAPSE2), me); // 2) At that point he will put a Gravity Lapse debuff on everyone for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) @@ -1487,7 +1487,7 @@ class mob_phoenix_tk : public CreatureScript { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); - me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); + me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000); } void UpdateAI(const uint32 diff) @@ -1498,7 +1498,7 @@ class mob_phoenix_tk : public CreatureScript if (Cycle_Timer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. - uint32 dmg = urand(4500,5500); + uint32 dmg = urand(4500, 5500); if (me->GetHealth() > dmg) me->ModifyHealth(-int32(dmg)); Cycle_Timer = 2000; @@ -1553,7 +1553,7 @@ class mob_phoenix_egg_tk : public CreatureScript void JustSummoned(Creature* summoned) { summoned->AddThreat(me->getVictim(), 0.0f); - summoned->CastSpell(summoned,SPELL_REBIRTH,false); + summoned->CastSpell(summoned, SPELL_REBIRTH, false); } void UpdateAI(const uint32 diff) @@ -1563,7 +1563,7 @@ class mob_phoenix_egg_tk : public CreatureScript if (Rebirth_Timer <= diff) { - me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); + me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5000); Rebirth_Timer = 0; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index b463952f508..c26c2551a67 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -82,7 +82,7 @@ class boss_void_reaver : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -110,7 +110,7 @@ class boss_void_reaver : public CreatureScript if (Pounding_Timer <= diff) { DoCast(me->getVictim(), SPELL_POUNDING); - DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me); + DoScriptText(RAND(SAY_POUNDING1, SAY_POUNDING2), me); Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) } else @@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript pTarget = me->getVictim(); if (pTarget) - me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); + me->CastSpell(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); ArcaneOrb_Timer = 3000; } else @@ -152,7 +152,7 @@ class boss_void_reaver : public CreatureScript DoCast(me->getVictim(), SPELL_KNOCK_AWAY); //Drop 25% aggro if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-25); + DoModifyThreatPercent(me->getVictim(), -25); KnockAway_Timer = 30000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 9dac1517444..2b575d2b499 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -83,7 +83,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -118,7 +118,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me); + DoScriptText(RAND(SAY_HAMMER_1, SAY_HAMMER_2), me); Jackhammer_Timer = 30000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index ba6318a4686..d82edd7391e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -98,7 +98,7 @@ class boss_nethermancer_sepethrea : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit* /*Killer*/) @@ -139,7 +139,7 @@ class boss_nethermancer_sepethrea : public CreatureScript { if (rand()%2) return; - DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me); + DoScriptText(RAND(SAY_DRAGONS_BREATH_1, SAY_DRAGONS_BREATH_2), me); } dragons_breath_Timer = 12000 + rand()%10000; } @@ -233,7 +233,7 @@ class mob_ragin_flames : public CreatureScript if (!onlyonce) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->GetMotionMaster()->MoveChase(pTarget); onlyonce = true; } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 6e06fd4920e..ecaf72d8567 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -100,7 +100,7 @@ class boss_pathaleon_the_calculator : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -129,8 +129,8 @@ class boss_pathaleon_the_calculator : public CreatureScript { for (uint8 i = 0; i < 3; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); - Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); if (pTarget && Wraith) Wraith->AI()->AttackStart(pTarget); } @@ -158,9 +158,9 @@ class boss_pathaleon_the_calculator : public CreatureScript if (Domination_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me); + DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me); DoCast(pTarget, SPELL_DOMINATION); } Domination_Timer = 25000 + rand()%5000; @@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript if (ArcaneMissiles_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_ARCANE_MISSILES); else DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 9db38aa3a0c..c67e70a8614 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -126,7 +126,7 @@ class npc_millhouse_manastorm : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit * /*victim*/) @@ -177,7 +177,7 @@ class npc_millhouse_manastorm : public CreatureScript break; case 7: if (pInstance) - pInstance->SetData(TYPE_WARDEN_2,DONE); + pInstance->SetData(TYPE_WARDEN_2, DONE); Init = true; break; } @@ -301,11 +301,11 @@ class npc_warden_mellichar : public CreatureScript EventProgress_Timer = 22000; Phase = 1; - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); DoCast(me, SPELL_TARGET_OMEGA); if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED); + pInstance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } void AttackStart(Unit* /*who*/) {} @@ -335,7 +335,7 @@ class npc_warden_mellichar : public CreatureScript if (pInstance) { - pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS); + pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); IsRunning = true; } @@ -375,23 +375,23 @@ class npc_warden_mellichar : public CreatureScript { case 2: DoCast(me, SPELL_TARGET_ALPHA); - pInstance->SetData(TYPE_WARDEN_1,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_1, IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); break; case 3: DoCast(me, SPELL_TARGET_BETA); - pInstance->SetData(TYPE_WARDEN_2,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_2, IN_PROGRESS); break; case 5: DoCast(me, SPELL_TARGET_DELTA); - pInstance->SetData(TYPE_WARDEN_3,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_3, IN_PROGRESS); break; case 6: DoCast(me, SPELL_TARGET_GAMMA); - pInstance->SetData(TYPE_WARDEN_4,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_4, IN_PROGRESS); break; case 7: - pInstance->SetData(TYPE_WARDEN_5,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_5, IN_PROGRESS); break; } CanSpawn = true; @@ -423,46 +423,46 @@ class npc_warden_mellichar : public CreatureScript switch(Phase) { case 2: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 3: - me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 4: DoScriptText(YELL_RELEASE2B, me); break; case 5: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 6: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 7: - me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoScriptText(YELL_WELCOME, me); break; } @@ -540,7 +540,7 @@ class mob_zerekethvoidzone : public CreatureScript void Reset() { - me->SetUInt32Value(UNIT_NPC_FLAGS,0); + me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(16); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 02c8c6bb4e5..040b1469130 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -89,7 +89,7 @@ class boss_harbinger_skyriss : public CreatureScript void Reset() { if (!Intro) - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); IsImage33 = false; IsImage66 = false; @@ -116,7 +116,7 @@ class boss_harbinger_skyriss : public CreatureScript { DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS,DONE); + pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE); } void JustSummoned(Creature *summon) @@ -138,7 +138,7 @@ class boss_harbinger_skyriss : public CreatureScript if (victim->GetEntry() == 21436) return; - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void DoSplit(uint32 val) @@ -173,18 +173,18 @@ class boss_harbinger_skyriss : public CreatureScript break; case 2: DoScriptText(SAY_AGGRO, me); - if (Unit *mellic = Unit::GetUnit(*me,pInstance->GetData64(DATA_MELLICHAR))) + if (Unit *mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR))) { //should have a better way to do this. possibly spell exist. mellic->setDeathState(JUST_DIED); mellic->SetHealth(0); - pInstance->SetData(TYPE_SHIELD_OPEN,IN_PROGRESS); + pInstance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS); } ++Intro_Phase; Intro_Timer = 3000; break; case 3: - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); Intro = true; break; } @@ -208,7 +208,7 @@ class boss_harbinger_skyriss : public CreatureScript if (MindRend_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_MIND_REND); else DoCast(me->getVictim(), SPELL_MIND_REND); @@ -223,9 +223,9 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), me); + DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); else DoCast(me->getVictim(), SPELL_FEAR); @@ -240,9 +240,9 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), me); + DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_DOMINATION); else DoCast(me->getVictim(), SPELL_DOMINATION); @@ -259,7 +259,7 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index a5600475c85..eef84ad093e 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -30,17 +30,17 @@ EndScriptData */ enum eUnits { - CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318,//door opened when Wrath-Scryer Soccothrates dies - CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319,//door opened when Dalliah the Doomsayer dies - POD_ALPHA = 183961,//pod first boss wave - POD_BETA = 183963,//pod second boss wave - POD_DELTA = 183964,//pod third boss wave - POD_GAMMA = 183962,//pod fourth boss wave - POD_OMEGA = 183965,//pod fifth boss wave - WARDENS_SHIELD = 184802,// warden shield - SEAL_SPHERE = 184802,//shield 'protecting' mellichar - - MELLICHAR = 20904,//skyriss will kill this unit + CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies + CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319, //door opened when Dalliah the Doomsayer dies + POD_ALPHA = 183961, //pod first boss wave + POD_BETA = 183963, //pod second boss wave + POD_DELTA = 183964, //pod third boss wave + POD_GAMMA = 183962, //pod fourth boss wave + POD_OMEGA = 183965, //pod fifth boss wave + WARDENS_SHIELD = 184802, // warden shield + SEAL_SPHERE = 184802, //shield 'protecting' mellichar + + MELLICHAR = 20904, //skyriss will kill this unit }; /* Arcatraz encounters: diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 247100fcb43..4d031be1195 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -104,7 +104,7 @@ class boss_high_botanist_freywinn : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -119,7 +119,7 @@ class boss_high_botanist_freywinn : public CreatureScript if (TreeForm_Timer <= diff) { - DoScriptText(RAND(SAY_TREE_1,SAY_TREE_2), me); + DoScriptText(RAND(SAY_TREE_1, SAY_TREE_2), me); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); @@ -146,7 +146,7 @@ class boss_high_botanist_freywinn : public CreatureScript { for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr) { - if (Unit *temp = Unit::GetUnit(*me,*itr)) + if (Unit *temp = Unit::GetUnit(*me, *itr)) { if (!temp->isAlive()) { @@ -179,7 +179,7 @@ class boss_high_botanist_freywinn : public CreatureScript return; } - /*if (me->HasAura(SPELL_TREE_FORM,0) || me->HasAura(SPELL_TRANQUILITY,0)) + /*if (me->HasAura(SPELL_TREE_FORM, 0) || me->HasAura(SPELL_TRANQUILITY, 0)) return;*/ //one random seedling every 5 secs, but not in tree form diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 4dc661b77d2..ac69e21a30b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -98,14 +98,14 @@ class mob_warp_splinter_treant : public CreatureScript { if (Unit *Warp = Unit::GetUnit(*me, WarpGuid)) { - if (me->IsWithinMeleeRange(Warp,2.5f)) + if (me->IsWithinMeleeRange(Warp, 2.5f)) { int32 CurrentHP_Treant = (int32)me->GetHealth(); - Warp->CastCustomSpell(Warp,SPELL_HEAL_FATHER,&CurrentHP_Treant, 0, 0, true,0 ,0, me->GetGUID()); + Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID()); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; } - me->GetMotionMaster()->MoveFollow(Warp,0,0); + me->GetMotionMaster()->MoveFollow(Warp, 0, 0); } check_Timer = 1000; } @@ -166,7 +166,7 @@ class boss_warp_splinter : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -182,12 +182,12 @@ class boss_warp_splinter : public CreatureScript float X = Treant_Spawn_Pos_X + TREANT_SPAWN_DIST * cos(angle); float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle); - float O = - me->GetAngle(X,Y); + float O = - me->GetAngle(X, Y); - if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000)) + if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); } - DoScriptText(RAND(SAY_SUMMON_1,SAY_SUMMON_2), me); + DoScriptText(RAND(SAY_SUMMON_1, SAY_SUMMON_2), me); } void UpdateAI(const uint32 diff) @@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript //Check for Arcane Volley if (Arcane_Volley_Timer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY,ARCANE_VOLLEY_H)); + DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H)); Arcane_Volley_Timer = 20000 + rand()%15000; } else diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 95ab6183c3f..0b8beb3edc9 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -84,8 +84,8 @@ enum eNetherdrake SAY_NIHIL_1 = -1000169, //signed for 5955 SAY_NIHIL_2 = -1000170, //signed for 5955 SAY_NIHIL_3 = -1000171, //signed for 5955 - SAY_NIHIL_4 = -1000172, //signed for 20021, used by 20021,21817,21820,21821,21823 - SAY_NIHIL_INTERRUPT = -1000173, //signed for 20021, used by 20021,21817,21820,21821,21823 + SAY_NIHIL_4 = -1000172, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 + SAY_NIHIL_INTERRUPT = -1000173, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 ENTRY_WHELP = 20021, ENTRY_PROTO = 21821, @@ -410,7 +410,7 @@ public: if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true) { - pGo->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); + pGo->SummonCreature(19963, 2943.40f, 4778.20f, 284.49f, 0.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); //reset global var obelisk_one = false; obelisk_two = false; diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index a841dacf9b5..d04a4b7b205 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -87,7 +87,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } void KilledUnit(Unit* victim) @@ -98,7 +98,7 @@ public: DoCast(me, SPELL_CAPTURESOUL); - DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index ba37b119623..a794690f04e 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -78,12 +78,12 @@ public: void KilledUnit(Unit* Victim) { - Victim->CastSpell(Victim,SPELL_MARK_DEATH,0); + Victim->CastSpell(Victim, SPELL_MARK_DEATH, 0); if (rand()%5) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*Killer*/) @@ -100,9 +100,9 @@ public: { if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who)) { - if (who->HasAura(SPELL_MARK_DEATH,0)) + if (who->HasAura(SPELL_MARK_DEATH, 0)) { - who->CastSpell(who,SPELL_AURA_DEATH,1); + who->CastSpell(who, SPELL_AURA_DEATH, 1); } } } @@ -126,7 +126,7 @@ public: //Spell Overrun if (Overrun_Timer <= diff) { - DoScriptText(RAND(SAY_OVERRUN_1,SAY_OVERRUN_2), me); + DoScriptText(RAND(SAY_OVERRUN_1, SAY_OVERRUN_2), me); DoCast(me->getVictim(), SPELL_OVERRUN); Overrun_Timer = 25000 + rand()%15000; @@ -138,7 +138,7 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_EARTHQUAKE_1,SAY_EARTHQUAKE_2), me); + DoScriptText(RAND(SAY_EARTHQUAKE_1, SAY_EARTHQUAKE_2), me); //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead if (InEnrage) @@ -152,7 +152,7 @@ public: if (Chain_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 414efdc7fb5..496e813a3a4 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -212,7 +212,7 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { - pGo->SummonCreature(C_AERANAS,-1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); + pGo->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; } @@ -438,7 +438,7 @@ public: case 27: DoScriptText(SAY_ELF_COMPLETE, me, pPlayer); // Award quest credit - pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,me); + pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me); break; } } @@ -498,13 +498,13 @@ public: if (uiType != POINT_MOTION_TYPE || uiId != 1) return; - if (Creature* pHelboar = me->GetCreature(*me,uiHelboarGUID)) + if (Creature* pHelboar = me->GetCreature(*me, uiHelboarGUID)) { pHelboar->RemoveCorpse(); DoCast(SPELL_SUMMON_POO); if (Player* pOwner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) - me->GetMotionMaster()->MoveFollow(pOwner,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(pOwner, 0.0f, 0.0f); } } @@ -517,7 +517,7 @@ public: if (pHelboar->GetGUID() != uiHelboarGUID && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && !me->FindCurrentSpellBySpellId(SPELL_SUMMON_POO)) { uiHelboarGUID = pHelboar->GetGUID(); - me->GetMotionMaster()->MovePoint(1,pHelboar->GetPositionX(),pHelboar->GetPositionY(),pHelboar->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, pHelboar->GetPositionX(), pHelboar->GetPositionY(), pHelboar->GetPositionZ()); } } uiCheckTimer = 5000; diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index de2f215bbec..da8b2b491b5 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -73,9 +73,9 @@ public: float y = me->GetPositionY(); float z = me->GetPositionZ(); - Hitter->SummonCreature(18181,x+(0.7f * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5f *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + Hitter->SummonCreature(18181, x+(0.7f * (rand()%30)), y+(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + Hitter->SummonCreature(18181, x+(rand()%5), y-(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + Hitter->SummonCreature(18181, x-(rand()%5), y+(0.5f *(rand()%60)), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); me->setDeathState(CORPSE); Spawn = true; } @@ -208,7 +208,7 @@ public: if (!me->IsStandState()) me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(RAND(LUMP_SAY0,LUMP_SAY1), me); + DoScriptText(RAND(LUMP_SAY0, LUMP_SAY1), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index d9ffcf311d8..6bd250dd171 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Netherstorm SD%Complete: 80 -SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299,10321,10322,10323,10329,10330,10338,10365(Shutting Down Manaforge), 10198, 10191 +SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299, 10321, 10322, 10323, 10329, 10330, 10338, 10365(Shutting Down Manaforge), 10198, 10191 SDCategory: Netherstorm EndScriptData */ @@ -38,7 +38,7 @@ EndContentData */ ## npc_manaforge_control_console ######*/ -//used by 20209,20417,20418,20440, signed for 20209 +//used by 20209, 20417, 20418, 20440, signed for 20209 enum eManaforgeConsoleData { EMOTE_START = -1000211, @@ -105,7 +105,7 @@ public: //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. if (spell->Id == SPELL_INTERRUPT_1) - DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL); + DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL); }*/ void JustDied(Unit* /*killer*/) @@ -114,7 +114,7 @@ public: if (someplayer) { - Unit* p = Unit::GetUnit((*me),someplayer); + Unit* p = Unit::GetUnit((*me), someplayer); if (p && p->GetTypeId() == TYPEID_PLAYER) { switch(me->GetEntry()) @@ -141,7 +141,7 @@ public: if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole)) + if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } } @@ -153,48 +153,48 @@ public: case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68f,4162.55f,164.00f,1.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2927.36f,4212.97f,164.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2933.68f, 4162.55f, 164.00f, 1.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2927.36f, 4212.97f, 164.00f); } else { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36f,4212.97f,164.00f,4.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2933.68f,4162.55f,164.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2927.36f, 4212.97f, 164.00f, 4.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2933.68f, 4162.55f, 164.00f); } Wave_Timer = 30000; break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21f,2765.26f,134.49f,3.93f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2424.21f,2740.15f,133.81f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86f,2731.85f,134.53f,1.31f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2435.37f,2766.04f,133.81f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2445.21f, 2765.26f, 134.49f, 3.93f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2424.21f, 2740.15f, 133.81f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2429.86f, 2731.85f, 134.53f, 1.31f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2435.37f, 2766.04f, 133.81f); Wave_Timer = 20000; break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80f,2205.36f,165.37f,3.74f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2985.15f,2197.32f,164.79f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91f,2191.20f,165.32f,0.22f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2060.01f,2185.27f,164.67f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2986.80f, 2205.36f, 165.37f, 3.74f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2985.15f, 2197.32f, 164.79f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2952.91f, 2191.20f, 165.32f, 0.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2060.01f, 2185.27f, 164.67f); Wave_Timer = 15000; break; case ENTRY_ARA_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_ARA_TECH,4035.11f,4038.97f,194.27f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); - add = me->SummonCreature(ENTRY_ARA_TECH,4033.66f,4036.79f,194.28f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); - add = me->SummonCreature(ENTRY_ARA_TECH,4037.13f,4037.30f,194.23f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4035.11f, 4038.97f, 194.27f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4033.66f, 4036.79f, 194.28f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4037.13f, 4037.30f, 194.23f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); } else { - add = me->SummonCreature(ENTRY_ARA_TECH,3099.59f,4049.30f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); - add = me->SummonCreature(ENTRY_ARA_TECH,3999.72f,4046.75f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); - add = me->SummonCreature(ENTRY_ARA_TECH,3996.81f,4048.26f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3099.59f, 4049.30f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3999.72f, 4046.75f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3996.81f, 4048.26f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); } Wave_Timer = 15000; break; @@ -205,30 +205,30 @@ public: switch(pCreature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52f,4201.42f,163.47f,3.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2927.49f,4192.81f,163.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2927.49f, 4192.81f, 163.00f); break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88f,2737.85f,133.27f,2.59f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62f,2735.32f,134.49f,1.97f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73f,2754.50f,134.49f,3.29f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2453.88f, 2737.85f, 133.27f, 2.59f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2441.62f, 2735.32f, 134.49f, 1.97f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2450.73f, 2754.50f, 134.49f, 3.29f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18f,2202.85f,165.32f,5.45f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30f,2211.50f,165.32f,4.55f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); - add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02f,2217.45f,164.16f,4.96f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2956.18f, 2202.85f, 165.32f, 5.45f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2975.30f, 2211.50f, 165.32f, 4.55f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_PROT, 2965.02f, 2217.45f, 164.16f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); break; case ENTRY_ARA_C_CONSOLE: - add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51f,4020.46f,192.18f,0.91f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4008.35f,4035.04f,192.70f); - add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56f,4059.35f,193.59f,4.44f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4016.62f,4039.89f,193.46f); + add = me->SummonCreature(ENTRY_ARA_ENGI, 3994.51f, 4020.46f, 192.18f, 0.91f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4008.35f, 4035.04f, 192.70f); + add = me->SummonCreature(ENTRY_ARA_GORKLONN, 4021.56f, 4059.35f, 193.59f, 4.44f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4016.62f, 4039.89f, 193.46f); break; } } @@ -270,14 +270,14 @@ public: DoScriptText(EMOTE_COMPLETE, me); if (someplayer) { - Unit* u = Unit::GetUnit((*me),someplayer); + Unit* u = Unit::GetUnit((*me), someplayer); if (u && u->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(),me->GetGUID()); + CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); DoCast(me, SPELL_DISABLE_VISUAL); } if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole)) + if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } ++Phase; @@ -321,23 +321,23 @@ public: { case 3726: //b'naar if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29366,1)) - manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95f,4189.98f,161.88f,0.34f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29366, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3730: //coruu if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29396,1)) - manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77f,2750.38f,133.24f,2.14f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29396, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3734: //duro if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29397,1)) - manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48f,2183.29f,163.20f,1.85f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29397, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3722: //ara if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29411,1)) - manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71f,4028.76f,192.10f,1.25f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29411, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; } @@ -431,8 +431,8 @@ public: // Emote Ardonis and Pathaleon void Turn_to_Pathaleons_Image() { - Creature *ardonis = Unit::GetCreature(*me,ardonisGUID); - Creature *pathaleon = Unit::GetCreature(*me,pathaleonGUID); + Creature *ardonis = Unit::GetCreature(*me, ardonisGUID); + Creature *pathaleon = Unit::GetCreature(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pathaleon || !pPlayer) @@ -457,7 +457,7 @@ public: //Set them back to each other void Turn_to_eachother() { - if (Unit *ardonis = Unit::GetUnit(*me,ardonisGUID)) + if (Unit *ardonis = Unit::GetUnit(*me, ardonisGUID)) { Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); @@ -514,8 +514,8 @@ public: return; } - Unit *ardonis = Unit::GetUnit(*me,ardonisGUID); - Unit *pathaleon = Unit::GetUnit(*me,pathaleonGUID); + Unit *ardonis = Unit::GetUnit(*me, ardonisGUID); + Unit *pathaleon = Unit::GetUnit(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pPlayer) @@ -988,7 +988,7 @@ public: case 17: case 29: //Find Object and "work" - if (GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE)) + if (GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE)) { // take the GO -> animation me->HandleEmoteCommand(EMOTE_STATE_LOOT); @@ -1019,7 +1019,7 @@ public: if (uiTakeTimer < uiDiff) { me->HandleEmoteCommand(EMOTE_STATE_NONE); - if (GameObject* pGO = GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE)) + if (GameObject* pGO = GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE)) { SetEscortPaused(false); bTake=false; @@ -1041,7 +1041,7 @@ public: if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, pCreature->AI())) { pCreature->setFaction(113); - pEscortAI->Start(false,false,pPlayer->GetGUID()); + pEscortAI->Start(false, false, pPlayer->GetGUID()); } } return true; diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 45dae7034c7..c705a159d9b 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -293,10 +293,10 @@ public: { DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true); /* - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); - float dx,dy,dz; + float dx, dy, dz; me->GetRandomPoint(x, y, z, 20, dx, dy, dz); dz += 20; // so it's in the air, not ground*/ @@ -474,9 +474,9 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658,1,true)) + if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659,1,true)) + if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); @@ -537,7 +537,7 @@ public: case GOSSIP_ACTION_INFO_DEF+6: //correct id not known pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); - pCreature->CastSpell(pPlayer,41121,false); + pCreature->CastSpell(pPlayer, 41121, false); pPlayer->AreaExploredOrEventHappens(QUEST_11082); break; } @@ -741,7 +741,7 @@ public: void StartEvent() { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83f, 602.584f, 85.2393f, 4.92598f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Illidan) { @@ -817,7 +817,7 @@ public: Illi->SetVisible(false); Illi->setDeathState(JUST_DIED); return 1000; break; - case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break; + case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break; case 24: me->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break; case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break; case 26: @@ -1013,7 +1013,7 @@ public: //this is very unclear, random say without no real relevance to script/event void DoRandomSay() { - DoScriptText(RAND(SAY_WIL_PROGRESS2,SAY_WIL_PROGRESS4,SAY_WIL_PROGRESS5), me); + DoScriptText(RAND(SAY_WIL_PROGRESS2, SAY_WIL_PROGRESS4, SAY_WIL_PROGRESS5), me); } void DoSpawnAssassin() @@ -1032,7 +1032,7 @@ public: if (pWho->GetTypeId() != TYPEID_PLAYER) { //appears to be random - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), pWho); } } @@ -1105,28 +1105,28 @@ struct Location static Location SpawnLocation[]= { //Cords used for: - {-4615.8556f, 1342.2532f, 139.9f, 1.612f},//Illidari Soldier - {-4598.9365f, 1377.3182f, 139.9f, 3.917f},//Illidari Soldier - {-4598.4697f, 1360.8999f, 139.9f, 2.427f},//Illidari Soldier - {-4589.3599f, 1369.1061f, 139.9f, 3.165f},//Illidari Soldier - {-4608.3477f, 1386.0076f, 139.9f, 4.108f},//Illidari Soldier - {-4633.1889f, 1359.8033f, 139.9f, 0.949f},//Illidari Soldier - {-4623.5791f, 1351.4574f, 139.9f, 0.971f},//Illidari Soldier - {-4607.2988f, 1351.6099f, 139.9f, 2.416f},//Illidari Soldier - {-4633.7764f, 1376.0417f, 139.9f, 5.608f},//Illidari Soldier - {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Mind Breaker - {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Mind Breaker - {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Highlord - {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Highlord - {-4615.5586f, 1353.0031f, 139.9f, 1.540f},//Illidari Highlord - {-4616.4736f, 1384.2170f, 139.9f, 4.971f},//Illidari Highlord + {-4615.8556f, 1342.2532f, 139.9f, 1.612f}, //Illidari Soldier + {-4598.9365f, 1377.3182f, 139.9f, 3.917f}, //Illidari Soldier + {-4598.4697f, 1360.8999f, 139.9f, 2.427f}, //Illidari Soldier + {-4589.3599f, 1369.1061f, 139.9f, 3.165f}, //Illidari Soldier + {-4608.3477f, 1386.0076f, 139.9f, 4.108f}, //Illidari Soldier + {-4633.1889f, 1359.8033f, 139.9f, 0.949f}, //Illidari Soldier + {-4623.5791f, 1351.4574f, 139.9f, 0.971f}, //Illidari Soldier + {-4607.2988f, 1351.6099f, 139.9f, 2.416f}, //Illidari Soldier + {-4633.7764f, 1376.0417f, 139.9f, 5.608f}, //Illidari Soldier + {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Mind Breaker + {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Mind Breaker + {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Highlord + {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Highlord + {-4615.5586f, 1353.0031f, 139.9f, 1.540f}, //Illidari Highlord + {-4616.4736f, 1384.2170f, 139.9f, 4.971f}, //Illidari Highlord {-4627.1240f, 1378.8752f, 139.9f, 2.544f} //Torloth The Magnificent }; struct WaveData { uint8 SpawnCount, UsedSpawnPoint; - uint32 CreatureId, SpawnTimer,YellTimer; + uint32 CreatureId, SpawnTimer, YellTimer; int32 WaveTextId; }; @@ -1218,10 +1218,10 @@ public: switch(AnimationCount) { case 0: - me->SetUInt32Value(UNIT_FIELD_BYTES_1,8); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); break; case 3: - me->RemoveFlag(UNIT_FIELD_BYTES_1,8); + me->RemoveFlag(UNIT_FIELD_BYTES_1, 8); break; case 5: if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID))) @@ -1238,8 +1238,8 @@ public: me->ClearUnitState(UNIT_STAT_ROOT); float x, y, z; - AggroTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); + AggroTarget->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z); } break; } @@ -1541,7 +1541,7 @@ public: { if (SpellTimer1 <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -1632,8 +1632,8 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() if (Player* pTarget = Unit::GetPlayer(*me, PlayerGUID)) { float x, y, z; - pTarget->GetPosition(x,y,z); - Spawn->GetMotionMaster()->MovePoint(0,x, y, z); + pTarget->GetPosition(x, y, z); + Spawn->GetMotionMaster()->MovePoint(0, x, y, z); } } CAST_AI(mob_illidari_spawn::mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); @@ -1786,7 +1786,7 @@ public: if (totemOspirits) { Summoned->setFaction(ENRAGED_SOUL_FRIENDLY); - Summoned->GetMotionMaster()->MovePoint(0,totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); + Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); Unit* Owner = totemOspirits->GetOwner(); if (Owner && Owner->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 1437702fbb5..12ac3ea777e 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -167,7 +167,7 @@ public: if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(20, damage)) { - CAST_PLR(done_by)->GroupEventHappens(QUEST_10004,me); + CAST_PLR(done_by)->GroupEventHappens(QUEST_10004, me); damage = 0; EnterEvadeMode(); } @@ -265,7 +265,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->CastSpell(pPlayer,37778,false); + pPlayer->CastSpell(pPlayer, 37778, false); return true; } @@ -355,7 +355,7 @@ public: case 55: DoScriptText(WHISP20, me, pPlayer); break; case 56: DoScriptText(WHISP21, me, pPlayer); if (pPlayer) - pPlayer->GroupEventHappens(10211,me); + pPlayer->GroupEventHappens(10211, me); break; } } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index b9a4d2c48e3..6a934362b2b 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -325,7 +325,7 @@ public: me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); if (rand()%100 < 75) - me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f,0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); + me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); } } @@ -577,16 +577,16 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,40642,false); + pPlayer->CastSpell(pPlayer, 40642, false); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->CastSpell(pPlayer,40640,false); + pPlayer->CastSpell(pPlayer, 40640, false); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->CastSpell(pPlayer,40632,false); + pPlayer->CastSpell(pPlayer, 40632, false); break; case GOSSIP_ACTION_INFO_DEF + 4: - pPlayer->CastSpell(pPlayer,40644,false); + pPlayer->CastSpell(pPlayer, 40644, false); break; } } @@ -679,12 +679,12 @@ public: switch(i) { case 3: - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99f,5420.33f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55f,5412.79f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER, -2793.55f, 5412.79f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 11: if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB,me); + pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB, me); break; } } diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 3face5ee606..b8c2aa34a0a 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -41,7 +41,7 @@ EndContentData */ #define GOSSIP_ITEM_BLESS_ASH "Grant me your mark, wise ancient." #define GOSSIP_ITEM_BLESS_KEL "Grant me your mark, mighty ancient." -//signed for 17900 but used by 17900,17901 +//signed for 17900 but used by 17900, 17901 #define GOSSIP_REWARD_BLESS -1000359 //#define TEXT_BLESSINGS "<You need higher standing with Cenarion Expedition to recive a blessing.>" @@ -70,8 +70,8 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pCreature->setPowerType(POWER_MANA); - pCreature->SetMaxPower(POWER_MANA,200); //set a "fake" mana value, we can't depend on database doing it in this case - pCreature->SetPower(POWER_MANA,200); + pCreature->SetMaxPower(POWER_MANA, 200); //set a "fake" mana value, we can't depend on database doing it in this case + pCreature->SetPower(POWER_MANA, 200); if (pCreature->GetEntry() == 17900) //check which Creature we are dealing with { @@ -246,7 +246,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 2: { - if (!pPlayer->HasItemCount(24573,1)) + if (!pPlayer->HasItemCount(24573, 1)) { ItemPosCountVec dest; uint32 itemId = 24573; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 28e38fbaac9..da4880b4b6b 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -711,7 +711,7 @@ class spell_gen_parachute_ic : public SpellScriptLoader return; if (target->ToPlayer()->m_movementInfo.fallTime > 2000) - target->CastSpell(target,SPELL_PARACHUTE_IC,true); + target->CastSpell(target, SPELL_PARACHUTE_IC, true); } void Register() diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 3a7983ac8f6..f30ced7b4b0 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -121,7 +121,7 @@ public: if (spellId) caster->CastCustomSpell(unitTarget, spellId, &basePoint, 0, 0, true); if (spellId == HUNTER_SPELL_CHIMERA_SHOT_SCORPID && caster->ToPlayer()) // Scorpid Sting - Add 1 minute cooldown - caster->ToPlayer()->AddSpellCooldown(spellId,0,uint32(time(NULL) + 60)); + caster->ToPlayer()->AddSpellCooldown(spellId, 0, uint32(time(NULL) + 60)); } void Register() @@ -281,7 +281,7 @@ public: spellInfo->Id != HUNTER_SPELL_READINESS && spellInfo->Id != HUNTER_SPELL_BESTIAL_WRATH && GetSpellRecoveryTime(spellInfo) > 0) - caster->ToPlayer()->RemoveSpellCooldown((itr++)->first,true); + caster->ToPlayer()->RemoveSpellCooldown((itr++)->first, true); else ++itr; } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 3679e004172..19a526826f0 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -834,9 +834,9 @@ class spell_item_create_heart_candy : public SpellScriptLoader Player* target = GetHitUnit()->ToPlayer(); - static const uint32 items[] = {ITEM_HEART_CANDY_1,ITEM_HEART_CANDY_2,ITEM_HEART_CANDY_3,ITEM_HEART_CANDY_4,ITEM_HEART_CANDY_5,ITEM_HEART_CANDY_6,ITEM_HEART_CANDY_7,ITEM_HEART_CANDY_8}; + static const uint32 items[] = {ITEM_HEART_CANDY_1, ITEM_HEART_CANDY_2, ITEM_HEART_CANDY_3, ITEM_HEART_CANDY_4, ITEM_HEART_CANDY_5, ITEM_HEART_CANDY_6, ITEM_HEART_CANDY_7, ITEM_HEART_CANDY_8}; - target->AddItem(items[urand(0,7)],1); + target->AddItem(items[urand(0, 7)], 1); } void Register() diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 4806457435d..762dd9292a8 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -33,7 +33,7 @@ enum ShamanSpells //For Earthen Power SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, //Spell casted by totem - SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566,//Spell witch remove snare effect + SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566, //Spell witch remove snare effect }; // 51474 - Astral shift diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 54c60da9909..48308545cc3 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -266,7 +266,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { - if (!player->FindNearestCreature(NPC_LARKORWI_MATE,15)) + if (!player->FindNearestCreature(NPC_LARKORWI_MATE, 15)) player->SummonCreature(NPC_LARKORWI_MATE, player->GetPositionX()+5, player->GetPositionY(), player->GetPositionZ(), 3.3f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 100000); } @@ -307,13 +307,13 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript { case 5332: case 5338: - pPosition = WorldLocation(571,3733.68f,3563.25f,290.812f,3.665192f); + pPosition = WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f); break; case 5334: - pPosition = WorldLocation(571,3802.38f,3585.95f,49.5765f,0.0f); + pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); break; case 5340: - pPosition = WorldLocation(571,3687.91f,3577.28f,473.342f,0.0f); + pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f); break; default: return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 2c39bb1b707..fc0c8f058af 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: GO_Scripts SD%Complete: 100 -SDComment: Quest support: 4285,4287,4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089,12843,12982, 2936. Soulwell +SDComment: Quest support: 4285, 4287, 4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089, 12843, 12982, 2936. Soulwell SDCategory: Game Objects EndScriptData */ @@ -67,7 +67,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; } }; @@ -148,7 +148,7 @@ public: { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { - pPlayer->CastSpell(pPlayer,26095,false); + pPlayer->CastSpell(pPlayer, 26095, false); } return true; } @@ -167,7 +167,7 @@ public: { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { - pPlayer->CastSpell(pPlayer,22864,false); + pPlayer->CastSpell(pPlayer, 22864, false); } return true; } @@ -213,7 +213,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) - pPlayer->CastSpell(pPlayer,23460,true); + pPlayer->CastSpell(pPlayer, 23460, true); return true; } @@ -232,7 +232,7 @@ public: { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { - pPlayer->CastSpell(pPlayer,24267,false); + pPlayer->CastSpell(pPlayer, 24267, false); } return true; } @@ -254,7 +254,7 @@ public: return true; if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE) - pPlayer->CastSpell(pPlayer,15065,false); + pPlayer->CastSpell(pPlayer, 15065, false); return true; } @@ -272,7 +272,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) - pPlayer->CastSpell(pPlayer,33382,true); + pPlayer->CastSpell(pPlayer, 33382, true); return true; } @@ -473,10 +473,10 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose - //pPlayer->CastSpell(pPlayer,SPELL_SUMMON_RIZZLE,false); + //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); if (Creature* pCreature = pPlayer->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0)) - pCreature->CastSpell(pPlayer,SPELL_BLACKJACK,false); + pCreature->CastSpell(pPlayer, SPELL_BLACKJACK, false); return false; } @@ -569,12 +569,12 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_BEAST,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_BEAST, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_BEAST,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_BEAST, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; @@ -628,12 +628,12 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_SORCERER,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_SORCERER, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_SORCERER,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_SORCERER, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; @@ -681,21 +681,21 @@ public: if (pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_YELLOW_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_YELLOW_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_B: if (pPlayer->HasItemCount(ITEM_YELLOW_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_YELLOW_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_BLUE_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_BLUE_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_C: if (pPlayer->HasItemCount(ITEM_BLUE_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_BLUE_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_RED_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_RED_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_D: @@ -856,16 +856,16 @@ public: switch(pPrisoner->GetEntry()) { case NPC_EBON_BLADE_PRISONER_HUMAN: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_H,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_H, true); break; case NPC_EBON_BLADE_PRISONER_NE: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_NE,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_NE, true); break; case NPC_EBON_BLADE_PRISONER_TROLL: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_TROLL,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_TROLL, true); break; case NPC_EBON_BLADE_PRISONER_ORC: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_ORC,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_ORC, true); break; } return true; @@ -912,10 +912,10 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { - if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY,1)) + if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1)) return false; - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true); return true; } @@ -1009,7 +1009,7 @@ public: if (qInfo) { //TODO: prisoner should help player for a short period of time - pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0); + pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); pPrisoner->DisappearAndDie(); } return true; @@ -1036,12 +1036,12 @@ public: { if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) { - Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE,1.0f); + Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); if (pTadpole) { pGO->UseDoorOrButton(); pTadpole->DisappearAndDie(); - pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE,0); + pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE, 0); //FIX: Summon minion tadpole } } @@ -1072,14 +1072,14 @@ public: if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE)) { - Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT,1.0f); + Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); if (!pPrisoner) - pPrisoner = pGO->FindNearestCreature(NPC_KUL,1.0f); + pPrisoner = pGO->FindNearestCreature(NPC_KUL, 1.0f); if (pPrisoner) { pGO->UseDoorOrButton(); pPrisoner->DisappearAndDie(); - pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(),0); + pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(), 0); } } return true; @@ -1133,11 +1133,11 @@ public: Creature* pTarget = GetClosestCreatureWithEntry(pPlayer, NPC_OUTHOUSE_BUNNY, 3.0f); if (pTarget) { - pTarget->AI()->SetData(1,pPlayer->getGender()); + pTarget->AI()->SetData(1, pPlayer->getGender()); pGO->CastSpell(pTarget, SPELL_INDISPOSED_III); } pGO->CastSpell(pPlayer, SPELL_INDISPOSED); - if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER,1)) + if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1)) pGO->CastSpell(pPlayer, SPELL_CREATE_AMBERSEEDS); return true; } @@ -1168,8 +1168,8 @@ public: bool OnGossipHello(Player *pPlayer, GameObject *pGO) { pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE); - pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX()+1,pGO->GetPositionY(),pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); - pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX(),pGO->GetPositionY()+1,pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); + pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); + pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX(), pGO->GetPositionY()+1, pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); return true; } }; diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index f3f7bd27720..0bf4b966471 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -64,7 +64,7 @@ public: void EnterCombat(Unit* who) { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) - DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1,SAY_GUARD_SIL_AGGRO2,SAY_GUARD_SIL_AGGRO3), me, who); + DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1, SAY_GUARD_SIL_AGGRO2, SAY_GUARD_SIL_AGGRO3), me, who); if (SpellEntry const* spell = me->reachWithSpellAttack(who)) DoCast(who, spell->Id); } @@ -124,7 +124,7 @@ public: info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //20% chance to replace our white hit with a spell - if (info && urand(0,99) < 20 && !globalCooldown) + if (info && urand(0, 99) < 20 && !globalCooldown) { //Cast the spell if (healing) @@ -171,9 +171,9 @@ public: //Cast spell if (healing) - DoCast(me,info->Id); + DoCast(me, info->Id); else - DoCast(me->getVictim(),info->Id); + DoCast(me->getVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; @@ -268,10 +268,10 @@ public: { if (exileTimer <= diff) { - if (Unit* temp = Unit::GetUnit(*me,playerGUID)) + if (Unit* temp = Unit::GetUnit(*me, playerGUID)) { - temp->CastSpell(temp,SPELL_EXILE,true); - temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true); + temp->CastSpell(temp, SPELL_EXILE, true); + temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true); } playerGUID = 0; exileTimer = 8500; @@ -333,10 +333,10 @@ public: { if (exileTimer <= diff) { - if (Unit* temp = Unit::GetUnit(*me,playerGUID)) + if (Unit* temp = Unit::GetUnit(*me, playerGUID)) { - temp->CastSpell(temp,SPELL_EXILE,true); - temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true); + temp->CastSpell(temp, SPELL_EXILE, true); + temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true); } playerGUID = 0; exileTimer = 8500; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4129fe0e3fa..4b15cc79dd9 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -26,7 +26,7 @@ EndScriptData */ /* ContentData item_draenei_fishing_net(i23654) Hacklike implements chance to spawn item or creature item_nether_wraith_beacon(i31742) Summons creatures for quest Becoming a Spellfire Tailor (q10832) -item_flying_machine(i34060,i34061) Engineering crafted flying machines +item_flying_machine(i34060, i34061) Engineering crafted flying machines item_gor_dreks_ointment(i30175) Protecting Our Own(q10488) item_only_for_flight Items which should only useable while flying EndContentData */ @@ -75,7 +75,7 @@ public: return false; // error - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; @@ -95,7 +95,7 @@ public: { if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE) { - if (urand(0,99) < 35) + if (urand(0, 99) < 35) { Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Murloc) @@ -156,7 +156,7 @@ public: targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578)) return false; - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; @@ -172,11 +172,11 @@ public: bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/) { - if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15)) + if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15)) return false; else { - pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); return true; } } @@ -376,19 +376,19 @@ public: return false; Creature* pMammoth; - pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF,5.0f); + pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f); if (!pMammoth) return false; GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = pPlayer->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = pPlayer->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pMammoth->AI()->DoAction(1); pTrap->SetGoState(GO_STATE_READY); - pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0); + pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF, 0); return true; } } @@ -418,7 +418,7 @@ public: } else pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW ,pItem, NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL); return true; } }; diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 626067bb602..1c146b85aee 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -143,8 +143,8 @@ public: IsSelfRooted = true; //Cast spell - if (Healing) DoCastSpell(me,info); - else DoCastSpell(me->getVictim(),info); + if (Healing) DoCastSpell(me, info); + else DoCastSpell(me->getVictim(), info); //Set our global cooldown GlobalCooldown = GENERIC_CREATURE_COOLDOWN; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 798ca9a86e4..1ca5fb54234 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -236,7 +236,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId) if (pItem->GetTemplate()->RequiredSpell == reqSpell) { //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetTemplate()->ItemId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.", reqSpell, pItem->GetTemplate()->ItemId); return false; } } @@ -499,17 +499,17 @@ public: switch(eCreature) { case 22427: //Zarevhi - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 19052: //Lorokeem - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 17909: //Lauranna Thar'well - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -645,7 +645,7 @@ public: //unknown textID (TALK_MUST_UNLEARN_WEAPON) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); } - else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON)) + else if (EquippedOk(pPlayer, S_UNLEARN_WEAPON)) { if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer))) { @@ -659,12 +659,12 @@ public: } else { - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); } break; case GOSSIP_ACTION_INFO_DEF + 4: - if (EquippedOk(pPlayer,S_UNLEARN_ARMOR)) + if (EquippedOk(pPlayer, S_UNLEARN_ARMOR)) { if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer))) { @@ -675,7 +675,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; //Learn Hammer/Axe/Sword @@ -693,7 +693,7 @@ public: break; //Unlearn Hammer/Axe/Sword case GOSSIP_ACTION_INFO_DEF + 8: - if (EquippedOk(pPlayer,S_UNLEARN_HAMMER)) + if (EquippedOk(pPlayer, S_UNLEARN_HAMMER)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -703,11 +703,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 9: - if (EquippedOk(pPlayer,S_UNLEARN_AXE)) + if (EquippedOk(pPlayer, S_UNLEARN_AXE)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -717,11 +717,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 10: - if (EquippedOk(pPlayer,S_UNLEARN_SWORD)) + if (EquippedOk(pPlayer, S_UNLEARN_SWORD)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -731,7 +731,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -774,23 +774,23 @@ public: case 11178: //Borgosh Corebender case 5164: //Grumnus Steelshaper case 11177: //Okothos Ironrager - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer), false); //unknown textID (TALK_UNLEARN_AXEORWEAPON) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11191: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_HAMMER_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11192: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_AXE_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11193: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_SWORD_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -1003,7 +1003,7 @@ public: break; //Unlearn Leather case GOSSIP_ACTION_INFO_DEF + 1: - if (EquippedOk(pPlayer,S_UNLEARN_DRAGON)) + if (EquippedOk(pPlayer, S_UNLEARN_DRAGON)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1013,11 +1013,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 2: - if (EquippedOk(pPlayer,S_UNLEARN_ELEMENTAL)) + if (EquippedOk(pPlayer, S_UNLEARN_ELEMENTAL)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1027,11 +1027,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 3: - if (EquippedOk(pPlayer,S_UNLEARN_TRIBAL)) + if (EquippedOk(pPlayer, S_UNLEARN_TRIBAL)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1041,7 +1041,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -1056,19 +1056,19 @@ public: { case 7866: //Peter Galen case 7867: //Thorkaf Dragoneye - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 7868: //Sarah Tanner case 7869: //Brumn Winterhoof - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 7870: //Caryssia Moonhunter case 7871: //Se'Jib - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -1188,7 +1188,7 @@ public: break; //Unlearn Tailor case GOSSIP_ACTION_INFO_DEF + 4: - if (EquippedOk(pPlayer,S_UNLEARN_SPELLFIRE)) + if (EquippedOk(pPlayer, S_UNLEARN_SPELLFIRE)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1198,11 +1198,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 5: - if (EquippedOk(pPlayer,S_UNLEARN_MOONCLOTH)) + if (EquippedOk(pPlayer, S_UNLEARN_MOONCLOTH)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1212,11 +1212,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 6: - if (EquippedOk(pPlayer,S_UNLEARN_SHADOWEAVE)) + if (EquippedOk(pPlayer, S_UNLEARN_SHADOWEAVE)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1226,7 +1226,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -1266,17 +1266,17 @@ public: switch(eCreature) { case 22213: //Gidge Spellweaver - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 22208: //Nasmara Moonsong - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 22212: //Andrion Darkspinner - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 677f2307643..e5b4a140bb6 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -71,11 +71,11 @@ public: switch(pCreature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus - if (pPlayer->HasItemCount(23843,1,true)) + if (pPlayer->HasItemCount(23843, 1, true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); break; case 20903: // Netherstorm - Protectorate Nether Drake - if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778,1)) + if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); break; case 18725: // Old Hillsbrad Foothills - Brazen @@ -165,7 +165,7 @@ public: break; case 23704: // Dustwallow Marsh - Cassa Crimsonwing if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25); break; case 26602: if (pCreature->isTaxi()) @@ -194,14 +194,14 @@ public: case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,32474,true); + pPlayer->CastSpell(pPlayer, 32474, true); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155)) break; case GOSSIP_ACTION_INFO_DEF + 2: - if (!pPlayer->HasItemCount(25853,1)) { + if (!pPlayer->HasItemCount(25853, 1)) { pPlayer->SEND_GOSSIP_MENU(9780, pCreature->GetGUID()); } else { pPlayer->CLOSE_GOSSIP_MENU(); @@ -210,59 +210,59 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,53335,true); //TaxiPath 1041 (Stormwind Harbor) + pPlayer->CastSpell(pPlayer, 53335, true); //TaxiPath 1041 (Stormwind Harbor) break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz) + pPlayer->CastSpell(pPlayer, 33768, true); //TaxiPath 585 (Gateways Murket and Shaadraz) break; case GOSSIP_ACTION_INFO_DEF + 5: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) + pPlayer->CastSpell(pPlayer, 35069, true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) break; case GOSSIP_ACTION_INFO_DEF + 6: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance)) + pPlayer->CastSpell(pPlayer, 33899, true); //TaxiPath 589 (Aerial Assault Flight (Alliance)) break; case GOSSIP_ACTION_INFO_DEF + 7: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head) + pPlayer->CastSpell(pPlayer, 35065, true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head) break; case GOSSIP_ACTION_INFO_DEF + 8: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz) + pPlayer->CastSpell(pPlayer, 33659, true); //TaxiPath 584 (Gateways Murket and Shaadraz) break; case GOSSIP_ACTION_INFO_DEF + 9: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde)) + pPlayer->CastSpell(pPlayer, 33825, true); //TaxiPath 587 (Aerial Assault Flight (Horde)) break; case GOSSIP_ACTION_INFO_DEF + 10: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) + pPlayer->CastSpell(pPlayer, 34578, true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) break; case GOSSIP_ACTION_INFO_DEF + 11: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,41278,true); //TaxiPath 706 + pPlayer->CastSpell(pPlayer, 41278, true); //TaxiPath 706 break; case GOSSIP_ACTION_INFO_DEF + 12: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45071,true); //TaxiPath 779 + pPlayer->CastSpell(pPlayer, 45071, true); //TaxiPath 779 break; case GOSSIP_ACTION_INFO_DEF + 13: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45113,true); //TaxiPath 784 + pPlayer->CastSpell(pPlayer, 45113, true); //TaxiPath 784 break; case GOSSIP_ACTION_INFO_DEF + 14: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45353,true); //TaxiPath 788 + pPlayer->CastSpell(pPlayer, 45353, true); //TaxiPath 788 break; case GOSSIP_ACTION_INFO_DEF + 15: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,34905,true); //TaxiPath 606 + pPlayer->CastSpell(pPlayer, 34905, true); //TaxiPath 606 break; case GOSSIP_ACTION_INFO_DEF + 16: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,41279,true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) + pPlayer->CastSpell(pPlayer, 41279, true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) break; case GOSSIP_ACTION_INFO_DEF + 17: pPlayer->CLOSE_GOSSIP_MENU(); @@ -290,7 +290,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 23: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,43074,true); //TaxiPath 736 + pPlayer->CastSpell(pPlayer, 43074, true); //TaxiPath 736 break; case GOSSIP_ACTION_INFO_DEF + 24: pPlayer->CLOSE_GOSSIP_MENU(); @@ -299,7 +299,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 25: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,42295,true); + pPlayer->CastSpell(pPlayer, 42295, true); break; case GOSSIP_ACTION_INFO_DEF + 26: pPlayer->GetSession()->SendTaxiMenu(pCreature); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 0cc5545e9c8..cdc91f010f2 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -421,13 +421,13 @@ public: DoCast(me, SPELL_BRAZIER, true); DoCast(me, SPELL_FIERY_AURA, false); float x, y, z; - me->GetPosition(x,y,z); - me->Relocate(x,y,z + 0.94f); + me->GetPosition(x, y, z); + me->Relocate(x, y, z + 0.94f); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); WorldPacket data; //send update position to client me->BuildHeartBeatMsg(&data); - me->SendMessageToSet(&data,true); + me->SendMessageToSet(&data, true); } void UpdateAI(const uint32 diff) @@ -447,14 +447,14 @@ public: void ReceiveEmote(Player* pPlayer, uint32 emote) { - if (me->IsWithinLOS(pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer,30.0f)) + if (me->IsWithinLOS(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer, 30.0f)) { me->SetInFront(pPlayer); active = false; WorldPacket data; me->BuildHeartBeatMsg(&data); - me->SendMessageToSet(&data,true); + me->SendMessageToSet(&data, true); switch(emote) { case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break; @@ -755,7 +755,7 @@ public: //stand up me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); - DoScriptText(RAND(SAY_DOC1,SAY_DOC2,SAY_DOC3), me); + DoScriptText(RAND(SAY_DOC1, SAY_DOC2, SAY_DOC3), me); uint32 mobId = me->GetEntry(); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -878,7 +878,7 @@ enum eGarments ENTRY_KORJA = 12430, ENTRY_DG_KEL = 12428, - //used by 12429,12423,12427,12430,12428, but signed for 12429 + //used by 12429, 12423, 12427, 12430, 12428, but signed for 12429 SAY_COMMON_HEALED = -1000164, SAY_DG_KEL_THANKS = -1000165, SAY_DG_KEL_GOODBYE = -1000166, @@ -945,14 +945,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_SHAYA_THANKS,me,pCaster); + DoScriptText(SAY_SHAYA_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -962,14 +962,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_ROBERTS_THANKS,me,pCaster); + DoScriptText(SAY_ROBERTS_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -979,14 +979,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_DOLF_THANKS,me,pCaster); + DoScriptText(SAY_DOLF_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -996,14 +996,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_KORJA_THANKS,me,pCaster); + DoScriptText(SAY_KORJA_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -1013,14 +1013,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_DG_KEL_THANKS,me,pCaster); + DoScriptText(SAY_DG_KEL_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -1029,7 +1029,7 @@ public: //give quest credit, not expect any special quest objectives if (bCanRun) - CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(),me->GetGUID()); + CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(), me->GetGUID()); } } } @@ -1044,18 +1044,18 @@ public: { if (RunAwayTimer <= diff) { - if (Unit *pUnit = Unit::GetUnit(*me,caster)) + if (Unit *pUnit = Unit::GetUnit(*me, caster)) { switch(me->GetEntry()) { - case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE,me,pUnit); break; - case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE,me,pUnit); break; - case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE,me,pUnit); break; - case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE,me,pUnit); break; - case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE,me,pUnit); break; + case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, pUnit); break; + case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE, me, pUnit); break; + case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE, me, pUnit); break; + case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE, me, pUnit); break; + case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE, me, pUnit); break; } - Start(false,true,true); + Start(false, true, true); } else EnterEvadeMode(); //something went wrong @@ -1141,7 +1141,7 @@ public: if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pPlayer->HasItemCount(ITEM_KT_SIGNET,1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) || + if (pPlayer->HasItemCount(ITEM_KT_SIGNET, 1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_H) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_N))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT_TO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -1155,7 +1155,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,SPELL_TELEPORT_DALARAN,false); + pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_DALARAN, false); } return true; } @@ -1283,7 +1283,7 @@ public: if (pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && pPlayer->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC); - if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681)) + if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126, 1) && !pPlayer->GetQuestRewardStatus(6681)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(5996, pCreature->GetGUID()); @@ -1300,7 +1300,7 @@ public: { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,21100,false); + pPlayer->CastSpell(pPlayer, 21100, false); break; case GOSSIP_ACTION_TRAIN: pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); @@ -1324,8 +1324,8 @@ public: // Cast spells that teach dual spec // Both are also ImplicitTarget self and must be cast by player - pPlayer->CastSpell(pPlayer,63680,true,NULL,NULL,pPlayer->GetGUID()); - pPlayer->CastSpell(pPlayer,63624,true,NULL,NULL,pPlayer->GetGUID()); + pPlayer->CastSpell(pPlayer, 63680, true, NULL, NULL, pPlayer->GetGUID()); + pPlayer->CastSpell(pPlayer, 63624, true, NULL, NULL, pPlayer->GetGUID()); // Should show another Gossip text with "Congratulations..." pPlayer->PlayerTalkClass->CloseGossip(); @@ -1454,42 +1454,42 @@ public: break; case GOSSIP_SENDER_MAIN+1: pCreature->CastSpell(pPlayer, SPELL_DMG, false); - pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_DMG, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+2: pCreature->CastSpell(pPlayer, SPELL_RES, false); - pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_RES, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+3: pCreature->CastSpell(pPlayer, SPELL_ARM, false); - pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_ARM, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+4: pCreature->CastSpell(pPlayer, SPELL_SPI, false); - pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_SPI, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+5: pCreature->CastSpell(pPlayer, SPELL_INT, false); - pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_INT, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+6: pCreature->CastSpell(pPlayer, SPELL_STM, false); - pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_STM, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+7: pCreature->CastSpell(pPlayer, SPELL_STR, false); - pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_STR, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+8: pCreature->CastSpell(pPlayer, SPELL_AGI, false); - pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_AGI, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; } @@ -1625,7 +1625,7 @@ public: { me->CastSpell(me, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->CastSpell(pPlayer, 26207, false); break; case 1: me->CastSpell(pPlayer, 26206, false); break; @@ -1724,10 +1724,10 @@ public: { if (IsViper) //Viper { - if (urand(0,2) == 0) //33% chance to cast + if (urand(0, 2) == 0) //33% chance to cast { uint32 spell; - if (urand(0,1) == 0) + if (urand(0, 1) == 0) spell = SPELL_MIND_NUMBING_POISON; else spell = SPELL_CRIPPLING_POISON; @@ -1739,7 +1739,7 @@ public: } else //Venomous Snake { - if (urand(0,2) == 0) //33% chance to cast + if (urand(0, 2) == 0) //33% chance to cast DoCast(me->getVictim(), SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100; } @@ -1779,7 +1779,7 @@ public: victimGUID = 0; hearts = 15000; if (Unit* own = me->GetOwner()) - me->GetMotionMaster()->MoveFollow(own,0,0); + me->GetMotionMaster()->MoveFollow(own, 0, 0); } void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) @@ -1817,17 +1817,17 @@ public: break; case 7:whisp.append(SAY_RANDOM_MOJO7);break; } - me->MonsterWhisper(whisp.c_str(),pPlayer->GetGUID()); + me->MonsterWhisper(whisp.c_str(), pPlayer->GetGUID()); if (victimGUID) { Player* victim = Unit::GetPlayer(*me, victimGUID); if (victim) victim->RemoveAura(43906);//remove polymorph frog thing } - me->AddAura(43906,pPlayer);//add polymorph frog thing + me->AddAura(43906, pPlayer);//add polymorph frog thing victimGUID = pPlayer->GetGUID(); DoCast(me, 20372, true);//tag.hearts - me->GetMotionMaster()->MoveFollow(pPlayer,0,0); + me->GetMotionMaster()->MoveFollow(pPlayer, 0, 0); hearts = 15000; } } @@ -1910,9 +1910,9 @@ public: Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check); me->VisitNearbyObject(30, searcher); for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) - if ((*iter)->GetAura(49206,owner->GetGUID())) + if ((*iter)->GetAura(49206, owner->GetGUID())) { - me->Attack((*iter),false); + me->Attack((*iter), false); break; } } @@ -2022,7 +2022,7 @@ public: void Reset() { - me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate + me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave uiResetTimer = 5000; @@ -2055,7 +2055,7 @@ public: return; if (!me->HasUnitState(UNIT_STAT_STUNNED)) - me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate + me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) { @@ -2107,7 +2107,7 @@ public: { if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND)) if (damage >= me->GetHealth()) - pOwner->CastSpell(pOwner,GLYPH_OF_SHADOWFIEND_MANA,true); + pOwner->CastSpell(pOwner, GLYPH_OF_SHADOWFIEND_MANA, true); } } @@ -2169,7 +2169,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - bool roll = urand(0,1); + bool roll = urand(0, 1); switch(uiAction) { diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 68825e48925..e0106ed788f 100755 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -20,7 +20,7 @@ #define TRINITYCORE_COMMON_H // config.h needs to be included 1st -// TODO this thingy looks like hack ,but its not, need to +// TODO this thingy looks like hack , but its not, need to // make separate header however, because It makes mess here. #ifdef HAVE_CONFIG_H // Remove Some things that we will define diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp index d6fbbc1b86a..998724f84ce 100755 --- a/src/server/shared/DataStores/DBCFileLoader.cpp +++ b/src/server/shared/DataStores/DBCFileLoader.cpp @@ -38,7 +38,7 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt) data = NULL; } - FILE* f = fopen(filename,"rb"); + FILE* f = fopen(filename, "rb"); if (!f) return false; @@ -177,7 +177,7 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos) char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**& indexTable, uint32 sqlRecordCount, uint32 sqlHighestIndex, char*& sqlDataTable) { /* - format STRING, NA, FLOAT,NA,INT <=> + format STRING, NA, FLOAT, NA, INT <=> struct{ char* field0, float field1, diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index 4534c761188..b2d99e9302f 100755 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -31,7 +31,7 @@ enum FT_INT='i', //uint32 FT_BYTE='b', //uint8 FT_SORT='d', //sorted by this field, field is not included - FT_IND='n', //the same,but parsed to data + FT_IND='n', //the same, but parsed to data FT_LOGIC='l', //Logical (boolean) FT_SQL_PRESENT='p', //Used in sql format to mark column present in sql dbc FT_SQL_ABSENT='a' //Used in sql format to mark column absent in sql dbc diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index d3a707780e6..0a7059ffa21 100755 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -117,9 +117,9 @@ class DBCStorage } char * sqlDataTable; fieldCount = dbc.GetCols(); - m_dataTable = (T*)dbc.AutoProduceData(fmt,nCount,(char**&)indexTable, sqlRecordCount, sqlHighestIndex, sqlDataTable); + m_dataTable = (T*)dbc.AutoProduceData(fmt, nCount, (char**&)indexTable, sqlRecordCount, sqlHighestIndex, sqlDataTable); - m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable)); + m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable)); // Insert sql data into arrays if (result) @@ -236,7 +236,7 @@ class DBCStorage if(!dbc.Load(fn, fmt)) return false; - m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable)); + m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)m_dataTable)); return true; } diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h index 3e2990092d1..f360128d367 100755 --- a/src/server/shared/Database/DatabaseEnv.h +++ b/src/server/shared/Database/DatabaseEnv.h @@ -31,8 +31,8 @@ #define _LIKE_ "LIKE" #define _TABLE_SIM_ "`" -#define _CONCAT3_(A,B,C) "CONCAT( " A " , " B " , " C " )" -#define _OFFSET_ "LIMIT %d,1" +#define _CONCAT3_(A, B, C) "CONCAT( " A " , " B " , " C " )" +#define _OFFSET_ "LIMIT %d, 1" #include "Implementation/LoginDatabase.h" #include "Implementation/CharacterDatabase.h" diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index c6bd3f8cc51..7784bea980f 100755 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -411,7 +411,7 @@ class DatabaseWorkerPool return; char* buf = new char[str.size()*2+1]; - escape_string(buf,str.c_str(),str.size()); + escape_string(buf, str.c_str(), str.size()); str = buf; delete[] buf; } diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h index 64f66611cba..a425c93c32b 100755 --- a/src/server/shared/Database/Field.h +++ b/src/server/shared/Database/Field.h @@ -242,7 +242,7 @@ class Field #if defined(__GNUC__) #pragma pack(1) #else - #pragma pack(push,1) + #pragma pack(push, 1) #endif struct { diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 8bc26388ff4..bb01c4ad138 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -37,10 +37,10 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_GET_BANNED_NAME, "SELECT characters.name FROM characters, character_banned WHERE character_banned.guid = ? AND character_banned.guid = characters.guid", CONNECTION_SYNCH) // Start LoginQueryHolder content - PREPARE_STATEMENT(CHAR_LOAD_PLAYER, "SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags," - "position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost," - "resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, instance_mode_mask," - "arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk," + PREPARE_STATEMENT(CHAR_LOAD_PLAYER, "SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, " + "position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, " + "resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, instance_mode_mask, " + "arenaPoints, totalHonorPoints, todayHonorPoints, yesterdayHonorPoints, totalKills, todayKills, yesterdayKills, chosenTitle, knownCurrencies, watchedFaction, drunk, " "health, power1, power2, power3, power4, power5, power6, power7, instance_id, speccount, activespec, exploredZones, equipmentCache, ammoId, knownTitles, actionBars FROM characters WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_GROUP, "SELECT guid FROM group_member WHERE memberGuid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_BOUNDINSTANCES, "SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = ?", CONNECTION_ASYNC) @@ -51,7 +51,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() "itemcount1, itemcount2, itemcount3, itemcount4 FROM character_queststatus WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_DAILYQUESTSTATUS, "SELECT quest, time FROM character_queststatus_daily WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_WEKLYQUESTSTATUS, "SELECT quest FROM character_queststatus_weekly WHERE guid = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_LOAD_PLAYER_REPUTATION, "SELECT faction,standing,flags FROM character_reputation WHERE guid = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_LOAD_PLAYER_REPUTATION, "SELECT faction, standing, flags FROM character_reputation WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_INVENTORY, "SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, bag, slot, " "item, itemEntry FROM character_inventory ci JOIN item_instance ii ON ci.item = ii.guid WHERE ci.guid = ? ORDER BY bag, slot", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_ACTIONS, "SELECT a.button, a.action, a.type FROM character_action as a, characters as c WHERE a.guid = c.guid AND a.spec = c.activespec AND a.guid = ? ORDER BY button", CONNECTION_ASYNC) @@ -61,7 +61,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_LOAD_PLAYER_HOMEBIND, "SELECT mapId, zoneId, posX, posY, posZ FROM character_homebind WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_SPELLCOOLDOWNS, "SELECT spell, item, time FROM character_spell_cooldown WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_DECLINEDNAMES, "SELECT genitive, dative, accusative, instrumental, prepositional FROM character_declinedname WHERE guid = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_LOAD_PLAYER_GUILD, "SELECT guildid,rank FROM guild_member WHERE guid = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_LOAD_PLAYER_GUILD, "SELECT guildid, rank FROM guild_member WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_ACHIEVEMENTS, "SELECT achievement, date FROM character_achievement WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_CRITERIAPROGRESS, "SELECT criteria, counter, date FROM character_achievement_progress WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_PLAYER_EQUIPMENTSETS, "SELECT setguid, setindex, name, iconname, item0, item1, item2, item3, item4, item5, item6, item7, item8, " @@ -82,7 +82,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_LOAD_AUCTIONS, "SELECT id, auctioneerguid, itemguid, itemEntry, itemowner, buyoutprice, time, buyguid, lastbid, startbid, deposit FROM auctionhouse ah INNER JOIN item_instance ii ON ii.guid = ah.itemguid", CONNECTION_SYNCH) PREPARE_STATEMENT(CHAR_ADD_AUCTION, "INSERT INTO auctionhouse (id, auctioneerguid, itemguid, itemowner, buyoutprice, time, buyguid, lastbid, startbid, deposit) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_AUCTION, "DELETE FROM auctionhouse WHERE id = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_MAIL, "INSERT INTO mail(id, messageType, stationery, mailTemplateId, sender, receiver, subject, body, has_items, expire_time, deliver_time, money,cod, checked) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_MAIL, "INSERT INTO mail(id, messageType, stationery, mailTemplateId, sender, receiver, subject, body, has_items, expire_time, deliver_time, money, cod, checked) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_MAIL, "DELETE FROM mail WHERE id = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_ADD_MAIL_ITEM, "INSERT INTO mail_items(mail_id, item_guid, receiver) VALUES (?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_EMPTY_EXPIRED_MAIL, "DELETE FROM mail WHERE expire_time < ? AND has_items = 0 AND body = ''", CONNECTION_ASYNC) @@ -155,7 +155,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // 0-5: uint32 PREPARE_STATEMENT(CHAR_SET_GUILD_EMBLEM_INFO, "UPDATE guild SET EmblemStyle = ?, EmblemColor = ?, BorderStyle = ?, BorderColor = ?, BackgroundColor = ? WHERE guildid = ?", CONNECTION_ASYNC) // 0: string, 1: string, 2: uint32, 3: uint8 - PREPARE_STATEMENT(CHAR_SET_GUILD_BANK_TAB_INFO, "UPDATE guild_bank_tab SET TabName = ?,TabIcon = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_SET_GUILD_BANK_TAB_INFO, "UPDATE guild_bank_tab SET TabName = ?, TabIcon = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SET_GUILD_BANK_MONEY, "UPDATE guild SET BankMoney = ? WHERE guildid = ?", CONNECTION_ASYNC) // 0: uint64, 1: uint32 // 0: uint8, 1: uint32, 2: uint8, 3: uint32 PREPARE_STATEMENT(CHAR_SET_GUILD_BANK_EVENTLOG_TAB, "UPDATE guild_bank_eventlog SET TabId = ? WHERE guildid = ? AND TabId = ? AND LogGuid = ?", CONNECTION_ASYNC) @@ -187,7 +187,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_RESET_GUILD_RANK_BANK_TIME5, "UPDATE guild_member SET BankResetTimeTab5 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_LOAD_GUILDS, // 0 1 2 3 4 5 6 - "SELECT g.guildid, g.name, g.leaderguid, g.EmblemStyle, g.EmblemColor, g.BorderStyle, g.BorderColor," + "SELECT g.guildid, g.name, g.leaderguid, g.EmblemStyle, g.EmblemColor, g.BorderStyle, g.BorderColor, " // 7 8 9 10 11 12 "g.BackgroundColor, g.info, g.motd, g.createdate, g.BankMoney, COUNT(gbt.guildid) " "FROM guild g LEFT JOIN guild_bank_tab gbt ON g.guildid = gbt.guildid GROUP BY g.guildid ORDER BY g.guildid ASC", CONNECTION_SYNCH) @@ -196,11 +196,11 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_LOAD_CHAR_DATA_FOR_GUILD, "SELECT name, level, class, zone, account FROM characters WHERE guid = ?", CONNECTION_SYNCH) PREPARE_STATEMENT(CHAR_LOAD_GUILD_MEMBERS, // 0 1 2 3 4 5 6 - "SELECT guildid, gm.guid, rank, pnote, offnote, BankResetTimeMoney, BankRemMoney," + "SELECT guildid, gm.guid, rank, pnote, offnote, BankResetTimeMoney, BankRemMoney, " // 7 8 9 10 11 12 - "BankResetTimeTab0, BankRemSlotsTab0, BankResetTimeTab1, BankRemSlotsTab1, BankResetTimeTab2, BankRemSlotsTab2," + "BankResetTimeTab0, BankRemSlotsTab0, BankResetTimeTab1, BankRemSlotsTab1, BankResetTimeTab2, BankRemSlotsTab2, " // 13 14 15 16 17 18 - "BankResetTimeTab3, BankRemSlotsTab3, BankResetTimeTab4, BankRemSlotsTab4, BankResetTimeTab5, BankRemSlotsTab5," + "BankResetTimeTab3, BankRemSlotsTab3, BankResetTimeTab4, BankRemSlotsTab4, BankResetTimeTab5, BankRemSlotsTab5, " // 19 20 21 22 23 24 "c.name, c.level, c.class, c.zone, c.account, c.logout_time " "FROM guild_member gm LEFT JOIN characters c ON c.guid = gm.guid ORDER BY guildid ASC", CONNECTION_SYNCH) @@ -237,12 +237,12 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Equipmentsets PREPARE_STATEMENT(CHAR_SET_EQUIP_SET, "UPDATE character_equipmentsets SET name=?, iconname=?, item0=?, item1=?, item2=?, item3=?, item4=?, item5=?, item6=?, item7=?, item8=?, item9=?, item10=?, item11=?, item12=?, item13=?, item14=?, item15=?, item16=?, item17=?, item18=? WHERE guid=? AND setguid=? AND setindex=?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_EQUIP_SET, "INSERT INTO character_equipmentsets (guid,setguid,setindex,name,iconname,item0,item1,item2,item3,item4,item5,item6,item7,item8,item9,item10,item11,item12,item13,item14,item15,item16,item17,item18) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_EQUIP_SET, "INSERT INTO character_equipmentsets (guid, setguid, setindex, name, iconname, item0, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item11, item12, item13, item14, item15, item16, item17, item18) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_EQUIP_SET, "DELETE FROM character_equipmentsets WHERE setguid=?", CONNECTION_ASYNC) // Auras PREPARE_STATEMENT(CHAR_DEL_AURA, "DELETE FROM character_aura WHERE guid = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_AURA, "INSERT INTO character_aura (guid,caster_guid,item_guid,spell,effect_mask,recalculate_mask,stackcount,amount0,amount1,amount2,base_amount0,base_amount1,base_amount2,maxduration,remaintime,remaincharges) " + PREPARE_STATEMENT(CHAR_ADD_AURA, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, effect_mask, recalculate_mask, stackcount, amount0, amount1, amount2, base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) // Account data @@ -261,7 +261,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_DEL_TUTORIALS, "DELETE FROM account_tutorial WHERE accountId = ?", CONNECTION_ASYNC) // Instance saves - PREPARE_STATEMENT(CHAR_ADD_INSTANCE_SAVE, "INSERT INTO instance (id,map,resettime,difficulty,completedEncounters,data) VALUES (?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_INSTANCE_SAVE, "INSERT INTO instance (id, map, resettime, difficulty, completedEncounters, data) VALUES (?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_UPDATE_INSTANCE_DATA, "UPDATE instance SET completedEncounters=?, data=? WHERE id=?", CONNECTION_ASYNC) // Game event saves diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp index f40be21fcf9..5014535be1c 100755 --- a/src/server/shared/Database/Implementation/LoginDatabase.cpp +++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp @@ -26,13 +26,13 @@ void LoginDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(LOGIN_SET_EXPIREDIPBANS, "DELETE FROM ip_banned WHERE unbandate<>bandate AND unbandate<=UNIX_TIMESTAMP()", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_SET_EXPIREDACCBANS, "UPDATE account_banned SET active = 0 WHERE active = 1 AND unbandate<>bandate AND unbandate<=UNIX_TIMESTAMP()", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_GET_IPBANNED, "SELECT * FROM ip_banned WHERE ip = ?", CONNECTION_SYNCH) - PREPARE_STATEMENT(LOGIN_SET_IPAUTOBANNED, "INSERT INTO ip_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?,'Trinity realmd', 'Failed login autoban')", CONNECTION_ASYNC) - PREPARE_STATEMENT(LOGIN_GET_ACCBANNED, "SELECT bandate,unbandate FROM account_banned WHERE id = ? AND active = 1", CONNECTION_SYNCH) + PREPARE_STATEMENT(LOGIN_SET_IPAUTOBANNED, "INSERT INTO ip_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity realmd', 'Failed login autoban')", CONNECTION_ASYNC) + PREPARE_STATEMENT(LOGIN_GET_ACCBANNED, "SELECT bandate, unbandate FROM account_banned WHERE id = ? AND active = 1", CONNECTION_SYNCH) PREPARE_STATEMENT(LOGIN_SET_ACCAUTOBANNED, "INSERT INTO account_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity realmd', 'Failed login autoban', 1)", CONNECTION_ASYNC) - PREPARE_STATEMENT(LOGIN_GET_SESSIONKEY, "SELECT a.sessionkey,a.id,aa.gmlevel FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE username = ?", CONNECTION_SYNCH) + PREPARE_STATEMENT(LOGIN_GET_SESSIONKEY, "SELECT a.sessionkey, a.id, aa.gmlevel FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE username = ?", CONNECTION_SYNCH) PREPARE_STATEMENT(LOGIN_SET_VS, "UPDATE account SET v = ?, s = ? WHERE username = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_SET_LOGONPROOF, "UPDATE account SET sessionkey = ?, last_ip = ?, last_login = NOW(), locale = ?, failed_logins = 0 WHERE username = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(LOGIN_GET_LOGONCHALLENGE, "SELECT a.sha_pass_hash,a.id,a.locked,a.last_ip,aa.gmlevel,a.v,a.s FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = ?", CONNECTION_SYNCH) + PREPARE_STATEMENT(LOGIN_GET_LOGONCHALLENGE, "SELECT a.sha_pass_hash, a.id, a.locked, a.last_ip, aa.gmlevel, a.v, a.s FROM account a LEFT JOIN account_access aa ON (a.id = aa.id) WHERE a.username = ?", CONNECTION_SYNCH) PREPARE_STATEMENT(LOGIN_SET_FAILEDLOGINS, "UPDATE account SET failed_logins = failed_logins + 1 WHERE username = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(LOGIN_GET_FAILEDLOGINS, "SELECT id, failed_logins FROM account WHERE username = ?", CONNECTION_SYNCH) PREPARE_STATEMENT(LOGIN_GET_ACCIDBYNAME, "SELECT id FROM account WHERE username = ?", CONNECTION_SYNCH) diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp index e49867600fb..ebf60e3d20e 100755 --- a/src/server/shared/Database/Implementation/WorldDatabase.cpp +++ b/src/server/shared/Database/Implementation/WorldDatabase.cpp @@ -24,7 +24,7 @@ void WorldDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(WORLD_LOAD_QUEST_POOLS, "SELECT entry, pool_entry FROM pool_quest", CONNECTION_SYNCH) PREPARE_STATEMENT(WORLD_DEL_CRELINKED_RESPAWN, "DELETE FROM linked_respawn WHERE guid = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(WORLD_REP_CRELINKED_RESPAWN, "REPLACE INTO linked_respawn (guid,linkedGuid) VALUES (?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(WORLD_REP_CRELINKED_RESPAWN, "REPLACE INTO linked_respawn (guid, linkedGuid) VALUES (?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(WORLD_LOAD_CRETEXT, "SELECT entry, groupid, id, text, type, language, probability, emote, duration, sound FROM creature_text", CONNECTION_SYNCH) PREPARE_STATEMENT(WORLD_LOAD_SMART_SCRIPTS, "SELECT entryorguid, source_type, id, link, event_type, event_phase_mask, event_chance, event_flags, event_param1, event_param2, event_param3, event_param4, action_type, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, target_type, target_param1, target_param2, target_param3, target_x, target_y, target_z, target_o FROM smart_scripts ORDER BY entryorguid, source_type, id, link", CONNECTION_SYNCH) PREPARE_STATEMENT(WORLD_LOAD_SMARTAI_WP, "SELECT entry, pointid, position_x, position_y, position_z FROM waypoints ORDER BY entry, pointid", CONNECTION_SYNCH) diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index b9a45e8fe77..accc89bfdc1 100755 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -340,7 +340,7 @@ bool MySQLConnection::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD * } else if (sLog->GetSQLDriverQueryLogging()) { - sLog->outSQLDriver("[%u ms] SQL: %s", getMSTimeDiff(_s,getMSTime()), sql); + sLog->outSQLDriver("[%u ms] SQL: %s", getMSTimeDiff(_s, getMSTime()), sql); } *pResult = mysql_store_result(m_Mysql); diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index de10f925fdb..b057791ea49 100755 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -228,7 +228,7 @@ bool MySQLPreparedStatement::CheckValidIndex(uint8 index) return true; } -void MySQLPreparedStatement::setBool(const uint8 index,const bool value) +void MySQLPreparedStatement::setBool(const uint8 index, const bool value) { setUInt32(index, value); } @@ -374,7 +374,7 @@ std::string MySQLPreparedStatement::getQueryString(const char *query) break; } replace << "'"; - queryString.replace(pos,1, replace.str()); + queryString.replace(pos, 1, replace.str()); } return queryString; diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h index ad79417c6ac..97240d79801 100755 --- a/src/server/shared/Database/PreparedStatement.h +++ b/src/server/shared/Database/PreparedStatement.h @@ -75,7 +75,7 @@ class PreparedStatement explicit PreparedStatement(uint32 index); ~PreparedStatement(); - void setBool(const uint8 index,const bool value); + void setBool(const uint8 index, const bool value); void setUInt8(const uint8 index, const uint8 value); void setUInt16(const uint8 index, const uint16 value); void setUInt32(const uint8 index, const uint32 value); @@ -109,7 +109,7 @@ class MySQLPreparedStatement MySQLPreparedStatement(MYSQL_STMT* stmt); ~MySQLPreparedStatement(); - void setBool(const uint8 index,const bool value); + void setBool(const uint8 index, const bool value); void setUInt8(const uint8 index, const uint8 value); void setUInt16(const uint8 index, const uint16 value); void setUInt32(const uint8 index, const uint32 value); diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp index 7e0debc4362..f8908e0c62d 100755 --- a/src/server/shared/Database/QueryHolder.cpp +++ b/src/server/shared/Database/QueryHolder.cpp @@ -44,7 +44,7 @@ bool SQLQueryHolder::SetPQuery(size_t index, const char *format, ...) { if (!format) { - sLog->outError("Query (index: %zu) is empty.",index); + sLog->outError("Query (index: %zu) is empty.", index); return false; } @@ -56,7 +56,7 @@ bool SQLQueryHolder::SetPQuery(size_t index, const char *format, ...) if (res == -1) { - sLog->outError("SQL Query truncated (and not execute) for format: %s",format); + sLog->outError("SQL Query truncated (and not execute) for format: %s", format); return false; } diff --git a/src/server/shared/Database/QueryHolder.h b/src/server/shared/Database/QueryHolder.h index 056cf199469..06cfde72e48 100755 --- a/src/server/shared/Database/QueryHolder.h +++ b/src/server/shared/Database/QueryHolder.h @@ -30,7 +30,7 @@ class SQLQueryHolder SQLQueryHolder() {} ~SQLQueryHolder(); bool SetQuery(size_t index, const char *sql); - bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3,4); + bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3, 4); bool SetPreparedQuery(size_t index, PreparedStatement* stmt); void SetSize(size_t size); QueryResult GetResult(size_t index); diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index 52f0f4d74b8..bee4b556f2e 100755 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -23,7 +23,7 @@ #include "Log.h" #include <ace/Stack_Trace.h> -#define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; sLog->outError( "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__,__FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } +#define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; sLog->outError( "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } #define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } #define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } #define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index 6a0d4e69be4..c2c3ec95e93 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -392,7 +392,7 @@ void WheatyExceptionReport::printTracesForAllThreads() { CONTEXT context; context.ContextFlags = 0xffffffff; - HANDLE threadHandle = OpenThread(THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION,false, te32.th32ThreadID); + HANDLE threadHandle = OpenThread(THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, false, te32.th32ThreadID); if (threadHandle && GetThreadContext(threadHandle, &context)) { WriteStackDetails(&context, false, threadHandle); @@ -454,7 +454,7 @@ PEXCEPTION_POINTERS pExceptionInfo) _tprintf(_T("\r\nRegisters:\r\n")); _tprintf(_T("EAX:%08X\r\nEBX:%08X\r\nECX:%08X\r\nEDX:%08X\r\nESI:%08X\r\nEDI:%08X\r\n") - ,pCtx->Eax, pCtx->Ebx, pCtx->Ecx, pCtx->Edx, + , pCtx->Eax, pCtx->Ebx, pCtx->Ecx, pCtx->Edx, pCtx->Esi, pCtx->Edi); _tprintf(_T("CS:EIP:%04X:%08X\r\n"), pCtx->SegCs, pCtx->Eip); @@ -469,8 +469,8 @@ PEXCEPTION_POINTERS pExceptionInfo) _tprintf(_T("\r\nRegisters:\r\n")); _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n") _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n") - ,pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx, - pCtx->Rsi, pCtx->Rdi ,pCtx->R9,pCtx->R10,pCtx->R11,pCtx->R12,pCtx->R13,pCtx->R14,pCtx->R15); + , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx, + pCtx->Rsi, pCtx->Rdi , pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip); _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"), pCtx->SegSs, pCtx->Rsp, pCtx->Rbp); @@ -724,7 +724,7 @@ bool bWriteVariables, HANDLE pThreadHandle) if (SymGetLineFromAddr64(m_hProcess, sf.AddrPC.Offset, &dwLineDisplacement, &lineInfo)) { - _tprintf(_T(" %s line %u"),lineInfo.FileName,lineInfo.LineNumber); + _tprintf(_T(" %s line %u"), lineInfo.FileName, lineInfo.LineNumber); } _tprintf(_T("\r\n")); @@ -820,7 +820,7 @@ unsigned /*cbBuffer*/) // Determine if the variable is a user defined type (UDT). IF so, bHandled // will return true. bool bHandled; - pszCurrBuffer = DumpTypeIndex(pszCurrBuffer,pSym->ModBase, pSym->TypeIndex, + pszCurrBuffer = DumpTypeIndex(pszCurrBuffer, pSym->ModBase, pSym->TypeIndex, 0, pVariable, bHandled, pSym->Name); if (!bHandled) @@ -929,7 +929,7 @@ char* /*Name*/) // Get the size of the child member ULONG64 length; - SymGetTypeInfo(m_hProcess, modBase, typeId, TI_GET_LENGTH,&length); + SymGetTypeInfo(m_hProcess, modBase, typeId, TI_GET_LENGTH, &length); // Calculate the address of the member DWORD_PTR dwFinalOffset = offset + dwMemberOffset; @@ -966,7 +966,7 @@ PVOID pAddress) { if (basicType == btFloat) { - pszCurrBuffer += sprintf(pszCurrBuffer," = %f", *(PFLOAT)pAddress); + pszCurrBuffer += sprintf(pszCurrBuffer, " = %f", *(PFLOAT)pAddress); } else if (basicType == btChar) { @@ -980,7 +980,7 @@ PVOID pAddress) *(PDWORD)pAddress); } else - pszCurrBuffer += sprintf(pszCurrBuffer," = %X", *(PDWORD)pAddress); + pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", *(PDWORD)pAddress); } else if (length == 8) { @@ -1010,7 +1010,7 @@ WheatyExceptionReport::GetBasicType(DWORD typeIndex, DWORD64 modBase) // Get the real "TypeId" of the child. We need this for the // SymGetTypeInfo(TI_GET_TYPEID) call below. DWORD typeId; - if (SymGetTypeInfo(m_hProcess,modBase, typeIndex, TI_GET_TYPEID, &typeId)) + if (SymGetTypeInfo(m_hProcess, modBase, typeIndex, TI_GET_TYPEID, &typeId)) { if (SymGetTypeInfo(m_hProcess, modBase, typeId, TI_GET_BASETYPE, &basicType)) diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h index 228d260e57d..cc77a598e67 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.h +++ b/src/server/shared/Debugging/WheatyExceptionReport.h @@ -96,7 +96,7 @@ class WheatyExceptionReport static void WriteStackDetails(PCONTEXT pContext, bool bWriteVariables, HANDLE pThreadHandle); - static BOOL CALLBACK EnumerateSymbolsCallback(PSYMBOL_INFO,ULONG, PVOID); + static BOOL CALLBACK EnumerateSymbolsCallback(PSYMBOL_INFO, ULONG, PVOID); static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME *, char * pszBuffer, unsigned cbBuffer); diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 46762c5d7e4..42663fb6bd4 100755 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -62,11 +62,11 @@ #if COMPILER == COMPILER_GNU # define ATTR_NORETURN __attribute__((noreturn)) -# define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V))) +# define ATTR_PRINTF(F, V) __attribute__ ((format (printf, F, V))) # define ATTR_DEPRECATED __attribute__((deprecated)) #else //COMPILER != COMPILER_GNU # define ATTR_NORETURN -# define ATTR_PRINTF(F,V) +# define ATTR_PRINTF(F, V) # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 34bb000dc17..be0e62135ec 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -71,15 +71,15 @@ template <class TO, class FROM> class Reference : public LinkedListElement return iRefTo != NULL; } - Reference<TO,FROM> * next() { return((Reference<TO,FROM> *) LinkedListElement::next()); } - Reference<TO,FROM> const * next() const { return((Reference<TO,FROM> const *) LinkedListElement::next()); } - Reference<TO,FROM> * prev() { return((Reference<TO,FROM> *) LinkedListElement::prev()); } - Reference<TO,FROM> const * prev() const { return((Reference<TO,FROM> const *) LinkedListElement::prev()); } - - Reference<TO,FROM> * nocheck_next() { return((Reference<TO,FROM> *) LinkedListElement::nocheck_next()); } - Reference<TO,FROM> const * nocheck_next() const { return((Reference<TO,FROM> const *) LinkedListElement::nocheck_next()); } - Reference<TO,FROM> * nocheck_prev() { return((Reference<TO,FROM> *) LinkedListElement::nocheck_prev()); } - Reference<TO,FROM> const * nocheck_prev() const { return((Reference<TO,FROM> const *) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); } + Reference<TO, FROM> const * next() const { return((Reference<TO, FROM> const *) LinkedListElement::next()); } + Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); } + Reference<TO, FROM> const * prev() const { return((Reference<TO, FROM> const *) LinkedListElement::prev()); } + + Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> const * nocheck_next() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> const * nocheck_prev() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_prev()); } TO* operator ->() const { return iRefTo; } TO* getTarget() const { return iRefTo; } diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h index dd5f6859e3a..981cd82197f 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctions.h +++ b/src/server/shared/Dynamic/TypeContainerFunctions.h @@ -50,7 +50,7 @@ namespace Trinity template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >&elements, SPECIFIC_TYPE* fake) { - return Count(elements._elements,fake); + return Count(elements._elements, fake); } template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >&elements, SPECIFIC_TYPE* fake) diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h index 8b7ef8f182d..9b43e325806 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h @@ -50,7 +50,7 @@ namespace Trinity // // template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >&elements, SPECIFIC_TYPE* fake) // { - // return Count(elements._elements,fake); + // return Count(elements._elements, fake); // } // // template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >&elements, SPECIFIC_TYPE* fake) @@ -77,8 +77,8 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { - CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake); - return (!t ? Find(elements._TailElements, hdl,fake) : t); + CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); + return (!t ? Find(elements._TailElements, hdl, fake) : t); } // const find functions @@ -100,9 +100,9 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { - CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake); + CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); if(!t) - t = Find(elements._TailElement, hdl,fake); + t = Find(elements._TailElement, hdl, fake); return t; } diff --git a/src/server/shared/Dynamic/TypeList.h b/src/server/shared/Dynamic/TypeList.h index b525b77da31..588bfc65755 100755 --- a/src/server/shared/Dynamic/TypeList.h +++ b/src/server/shared/Dynamic/TypeList.h @@ -35,7 +35,7 @@ struct TypeList }; // enough for now.. can be expand at any point in time as needed -#define TYPELIST_1(T1) TypeList<T1,TypeNull> +#define TYPELIST_1(T1) TypeList<T1, TypeNull> #define TYPELIST_2(T1, T2) TypeList<T1, TYPELIST_1(T2) > #define TYPELIST_3(T1, T2, T3) TypeList<T1, TYPELIST_2(T2, T3) > #define TYPELIST_4(T1, T2, T3, T4) TypeList<T1, TYPELIST_3(T2, T3, T4) > diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index eaff7cbd8fa..3c6a1882259 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -78,7 +78,7 @@ void Log::SetLogLevel(char *Level) NewLevel = 0; m_logLevel = NewLevel; - outString( "LogLevel is %u",m_logLevel ); + outString( "LogLevel is %u", m_logLevel ); } void Log::SetLogFileLevel(char *Level) @@ -88,7 +88,7 @@ void Log::SetLogFileLevel(char *Level) NewLevel = 0; m_logFileLevel = NewLevel; - outString( "LogFileLevel is %u",m_logFileLevel ); + outString( "LogFileLevel is %u", m_logFileLevel ); } void Log::SetDBLogLevel(char *Level) @@ -98,7 +98,7 @@ void Log::SetDBLogLevel(char *Level) NewLevel = 0; m_dbLogLevel = NewLevel; - outString( "DBLogLevel is %u",m_dbLogLevel ); + outString( "DBLogLevel is %u", m_dbLogLevel ); } void Log::Initialize() @@ -113,7 +113,7 @@ void Log::Initialize() SetRealmID(0); /// Common log files data - m_logsDir = sConfig->GetStringDefault("LogsDir",""); + m_logsDir = sConfig->GetStringDefault("LogsDir", ""); if (!m_logsDir.empty()) if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\')) m_logsDir.append("/"); @@ -121,27 +121,27 @@ void Log::Initialize() m_logsTimestamp = "_" + GetTimestampStr(); /// Open specific log files - logfile = openLogFile("LogFile","LogTimestamp","w"); + logfile = openLogFile("LogFile", "LogTimestamp", "w"); InitColors(sConfig->GetStringDefault("LogColors", "")); - m_gmlog_per_account = sConfig->GetBoolDefault("GmLogPerAccount",false); + m_gmlog_per_account = sConfig->GetBoolDefault("GmLogPerAccount", false); if(!m_gmlog_per_account) - gmLogfile = openLogFile("GMLogFile","GmLogTimestamp","a"); + gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); else { // GM log settings for per account case m_gmlog_filename_format = sConfig->GetStringDefault("GMLogFile", ""); if(!m_gmlog_filename_format.empty()) { - bool m_gmlog_timestamp = sConfig->GetBoolDefault("GmLogTimestamp",false); + bool m_gmlog_timestamp = sConfig->GetBoolDefault("GmLogTimestamp", false); size_t dot_pos = m_gmlog_filename_format.find_last_of("."); if(dot_pos!=m_gmlog_filename_format.npos) { if(m_gmlog_timestamp) - m_gmlog_filename_format.insert(dot_pos,m_logsTimestamp); + m_gmlog_filename_format.insert(dot_pos, m_logsTimestamp); - m_gmlog_filename_format.insert(dot_pos,"_#%u"); + m_gmlog_filename_format.insert(dot_pos, "_#%u"); } else { @@ -159,7 +159,7 @@ void Log::Initialize() dberLogfile = openLogFile("DBErrorLogFile", NULL, "a"); raLogfile = openLogFile("RaLogFile", NULL, "a"); chatLogfile = openLogFile("ChatLogFile", "ChatLogTimestamp", "a"); - arenaLogFile = openLogFile("ArenaLogFile", NULL,"a"); + arenaLogFile = openLogFile("ArenaLogFile", NULL, "a"); sqlLogFile = openLogFile("SQLDriverLogFile", NULL, "a"); // Main log file settings @@ -182,17 +182,17 @@ void Log::Initialize() } } -FILE* Log::openLogFile(char const* configFileName,char const* configTimeStampFlag, char const* mode) +FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode) { std::string logfn=sConfig->GetStringDefault(configFileName, ""); if(logfn.empty()) return NULL; - if(configTimeStampFlag && sConfig->GetBoolDefault(configTimeStampFlag,false)) + if(configTimeStampFlag && sConfig->GetBoolDefault(configTimeStampFlag, false)) { size_t dot_pos = logfn.find_last_of("."); if(dot_pos!=logfn.npos) - logfn.insert(dot_pos,m_logsTimestamp); + logfn.insert(dot_pos, m_logsTimestamp); else logfn += m_logsTimestamp; } @@ -206,7 +206,7 @@ FILE* Log::openGmlogPerAccount(uint32 account) return NULL; char namebuf[TRINITY_PATH_MAX]; - snprintf(namebuf,TRINITY_PATH_MAX,m_gmlog_filename_format.c_str(),account); + snprintf(namebuf, TRINITY_PATH_MAX, m_gmlog_filename_format.c_str(), account); return fopen(namebuf, "a"); } @@ -220,7 +220,7 @@ void Log::outTimestamp(FILE* file) // HH hour (2 digits 00-23) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) - fprintf(file,"%-4d-%02d-%02d %02d:%02d:%02d ",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday,aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + fprintf(file, "%-4d-%02d-%02d %02d:%02d:%02d ", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); } void Log::InitColors(const std::string& str) @@ -262,9 +262,9 @@ void Log::SetColor(bool stdout_stream, ColorTypes color) FOREGROUND_GREEN, // GREEN FOREGROUND_RED | FOREGROUND_GREEN, // BROWN FOREGROUND_BLUE, // BLUE - FOREGROUND_RED | FOREGROUND_BLUE,// MAGENTA + FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN - FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE + FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // WHITE // YELLOW FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // RED_BOLD @@ -347,7 +347,7 @@ std::string Log::GetTimestampStr() // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) char buf[20]; - snprintf(buf,20,"%04d-%02d-%02d_%02d-%02d-%02d",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday,aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); return std::string(buf); } @@ -386,7 +386,7 @@ void Log::outString(const char * str, ...) } if (m_colored) - SetColor(true,m_colors[LOGL_NORMAL]); + SetColor(true, m_colors[LOGL_NORMAL]); va_list ap; @@ -439,7 +439,7 @@ void Log::outCrash(const char * err, ...) } if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -482,7 +482,7 @@ void Log::outError(const char * err, ...) } if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -560,7 +560,7 @@ void Log::outErrorDb(const char * err, ...) return; if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -617,7 +617,7 @@ void Log::outBasic(const char * str, ...) if (m_logLevel > LOGL_NORMAL) { if (m_colored) - SetColor(true,m_colors[LOGL_BASIC]); + SetColor(true, m_colors[LOGL_BASIC]); va_list ap; va_start(ap, str); @@ -661,7 +661,7 @@ void Log::outDetail(const char * str, ...) if (m_logLevel > LOGL_BASIC) { if (m_colored) - SetColor(true,m_colors[LOGL_DETAIL]); + SetColor(true, m_colors[LOGL_DETAIL]); va_list ap; va_start(ap, str); @@ -735,7 +735,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) if( m_logLevel > LOGL_DETAIL ) { if (m_colored) - SetColor(true,m_colors[LOGL_DEBUG]); + SetColor(true, m_colors[LOGL_DEBUG]); va_list ap; va_start(ap, str); @@ -780,7 +780,7 @@ void Log::outStaticDebug(const char * str, ...) if( m_logLevel > LOGL_DETAIL ) { if (m_colored) - SetColor(true,m_colors[LOGL_DEBUG]); + SetColor(true, m_colors[LOGL_DEBUG]); va_list ap; va_start(ap, str); @@ -845,7 +845,7 @@ void Log::outCommand(uint32 account, const char * str, ...) if (m_logLevel > LOGL_NORMAL) { if (m_colored) - SetColor(true,m_colors[LOGL_BASIC]); + SetColor(true, m_colors[LOGL_BASIC]); va_list ap; va_start(ap, str); diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index 5f0fd8d27f2..94e0491229b 100755 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -113,23 +113,23 @@ class Log void ResetColor(bool stdout_stream); void outDB( LogTypes type, const char * str ); - void outString( const char * str, ... ) ATTR_PRINTF(2,3); + void outString( const char * str, ... ) ATTR_PRINTF(2, 3); void outString( ); - void outStringInLine( const char * str, ... ) ATTR_PRINTF(2,3); - void outError( const char * err, ... ) ATTR_PRINTF(2,3); - void outCrash( const char * err, ... ) ATTR_PRINTF(2,3); - void outBasic( const char * str, ... ) ATTR_PRINTF(2,3); - void outDetail( const char * str, ... ) ATTR_PRINTF(2,3); - void outDebug(DebugLogFilters f, const char* str, ...) ATTR_PRINTF(3,4); - void outStaticDebug( const char * str, ... ) ATTR_PRINTF(2,3); - void outDebugInLine( const char * str, ... ) ATTR_PRINTF(2,3); - void outErrorDb( const char * str, ... ) ATTR_PRINTF(2,3); - void outChar( const char * str, ... ) ATTR_PRINTF(2,3); - void outCommand( uint32 account, const char * str, ...) ATTR_PRINTF(3,4); - void outRemote( const char * str, ... ) ATTR_PRINTF(2,3); - void outChat( const char * str, ... ) ATTR_PRINTF(2,3); - void outArena( const char * str, ... ) ATTR_PRINTF(2,3); - void outSQLDriver( const char* str, ... ) ATTR_PRINTF(2,3); + void outStringInLine( const char * str, ... ) ATTR_PRINTF(2, 3); + void outError( const char * err, ... ) ATTR_PRINTF(2, 3); + void outCrash( const char * err, ... ) ATTR_PRINTF(2, 3); + void outBasic( const char * str, ... ) ATTR_PRINTF(2, 3); + void outDetail( const char * str, ... ) ATTR_PRINTF(2, 3); + void outDebug(DebugLogFilters f, const char* str, ...) ATTR_PRINTF(3, 4); + void outStaticDebug( const char * str, ... ) ATTR_PRINTF(2, 3); + void outDebugInLine( const char * str, ... ) ATTR_PRINTF(2, 3); + void outErrorDb( const char * str, ... ) ATTR_PRINTF(2, 3); + void outChar( const char * str, ... ) ATTR_PRINTF(2, 3); + void outCommand( uint32 account, const char * str, ...) ATTR_PRINTF(3, 4); + void outRemote( const char * str, ... ) ATTR_PRINTF(2, 3); + void outChat( const char * str, ... ) ATTR_PRINTF(2, 3); + void outArena( const char * str, ... ) ATTR_PRINTF(2, 3); + void outSQLDriver( const char* str, ... ) ATTR_PRINTF(2, 3); void outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name ); static void outTimestamp(FILE* file); @@ -150,7 +150,7 @@ class Log void SetLogDBLater(bool value) { m_enableLogDBLater = value; } bool GetSQLDriverQueryLogging() const { return m_sqlDriverQueryLogging; } private: - FILE* openLogFile(char const* configFileName,char const* configTimeStampFlag, char const* mode); + FILE* openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode); FILE* openGmlogPerAccount(uint32 account); FILE* raLogfile; diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index e6672719226..34bfea019ab 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -77,10 +77,10 @@ class ByteBuffer append((uint8 *)&value, sizeof(value)); } - template <typename T> void put(size_t pos,T value) + template <typename T> void put(size_t pos, T value) { EndianConvert(value); - put(pos,(uint8 *)&value,sizeof(value)); + put(pos, (uint8 *)&value, sizeof(value)); } ByteBuffer &operator<<(uint8 value) diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 2c72a1be8a1..47e91fbfa7d 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -147,7 +147,7 @@ void stripLineInvisibleChars(std::string &str) } if(wpos < str.size()) - str.erase(wpos,str.size()); + str.erase(wpos, str.size()); if(str.find("|TInterface")!=std::string::npos) str.clear(); @@ -218,7 +218,7 @@ std::string TimeToTimestampStr(time_t t) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) char buf[20]; - snprintf(buf,20,"%04d-%02d-%02d_%02d-%02d-%02d",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday,aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); return std::string(buf); } @@ -229,7 +229,7 @@ bool IsIPAddress(char const* ipaddress) return false; // Let the big boys do it. - // Drawback: all valid ip address formats are recognized e.g.: 12.23,121234,0xABCD) + // Drawback: all valid ip address formats are recognized e.g.: 12.23, 121234, 0xABCD) return inet_addr(ipaddress) != INADDR_NONE; } @@ -256,7 +256,7 @@ size_t utf8length(std::string& utf8str) { try { - return utf8::distance(utf8str.c_str(),utf8str.c_str()+utf8str.size()); + return utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); } catch(std::exception) { @@ -265,19 +265,19 @@ size_t utf8length(std::string& utf8str) } } -void utf8truncate(std::string& utf8str,size_t len) +void utf8truncate(std::string& utf8str, size_t len) { try { - size_t wlen = utf8::distance(utf8str.c_str(),utf8str.c_str()+utf8str.size()); + size_t wlen = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); if(wlen <= len) return; std::wstring wstr; wstr.resize(wlen); - utf8::utf8to16(utf8str.c_str(),utf8str.c_str()+utf8str.size(),&wstr[0]); + utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]); wstr.resize(len); - char* oend = utf8::utf16to8(wstr.c_str(),wstr.c_str()+wstr.size(),&utf8str[0]); + char* oend = utf8::utf16to8(wstr.c_str(), wstr.c_str()+wstr.size(), &utf8str[0]); utf8str.resize(oend-(&utf8str[0])); // remove unused tail } catch(std::exception) @@ -290,7 +290,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) { try { - size_t len = utf8::distance(utf8str,utf8str+csize); + size_t len = utf8::distance(utf8str, utf8str+csize); if(len > wsize) { if(wsize > 0) @@ -300,7 +300,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) } wsize = len; - utf8::utf8to16(utf8str,utf8str+csize,wstr); + utf8::utf8to16(utf8str, utf8str+csize, wstr); wstr[len] = L'\0'; } catch(std::exception) @@ -318,11 +318,11 @@ bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr) { try { - size_t len = utf8::distance(utf8str.c_str(),utf8str.c_str()+utf8str.size()); + size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); wstr.resize(len); if (len) - utf8::utf8to16(utf8str.c_str(),utf8str.c_str()+utf8str.size(),&wstr[0]); + utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]); } catch(std::exception) { @@ -342,7 +342,7 @@ bool WStrToUtf8(wchar_t* wstr, size_t size, std::string& utf8str) if (size) { - char* oend = utf8::utf16to8(wstr,wstr+size,&utf8str2[0]); + char* oend = utf8::utf16to8(wstr, wstr+size, &utf8str2[0]); utf8str2.resize(oend-(&utf8str2[0])); // remove unused tail } utf8str = utf8str2; @@ -365,7 +365,7 @@ bool WStrToUtf8(std::wstring wstr, std::string& utf8str) if (wstr.size()) { - char* oend = utf8::utf16to8(wstr.c_str(),wstr.c_str()+wstr.size(),&utf8str2[0]); + char* oend = utf8::utf16to8(wstr.c_str(), wstr.c_str()+wstr.size(), &utf8str2[0]); utf8str2.resize(oend-(&utf8str2[0])); // remove unused tail } utf8str = utf8str2; @@ -389,22 +389,22 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently) - static wchar_t const a_End[] = { wchar_t(1), wchar_t(0x0430),wchar_t(0x0000)}; - static wchar_t const o_End[] = { wchar_t(1), wchar_t(0x043E),wchar_t(0x0000)}; - static wchar_t const ya_End[] = { wchar_t(1), wchar_t(0x044F),wchar_t(0x0000)}; - static wchar_t const ie_End[] = { wchar_t(1), wchar_t(0x0435),wchar_t(0x0000)}; - static wchar_t const i_End[] = { wchar_t(1), wchar_t(0x0438),wchar_t(0x0000)}; - static wchar_t const yeru_End[] = { wchar_t(1), wchar_t(0x044B),wchar_t(0x0000)}; - static wchar_t const u_End[] = { wchar_t(1), wchar_t(0x0443),wchar_t(0x0000)}; - static wchar_t const yu_End[] = { wchar_t(1), wchar_t(0x044E),wchar_t(0x0000)}; - static wchar_t const oj_End[] = { wchar_t(2), wchar_t(0x043E),wchar_t(0x0439),wchar_t(0x0000)}; - static wchar_t const ie_j_End[] = { wchar_t(2), wchar_t(0x0435),wchar_t(0x0439),wchar_t(0x0000)}; - static wchar_t const io_j_End[] = { wchar_t(2), wchar_t(0x0451),wchar_t(0x0439),wchar_t(0x0000)}; - static wchar_t const o_m_End[] = { wchar_t(2), wchar_t(0x043E),wchar_t(0x043C),wchar_t(0x0000)}; - static wchar_t const io_m_End[] = { wchar_t(2), wchar_t(0x0451),wchar_t(0x043C),wchar_t(0x0000)}; - static wchar_t const ie_m_End[] = { wchar_t(2), wchar_t(0x0435),wchar_t(0x043C),wchar_t(0x0000)}; - static wchar_t const soft_End[] = { wchar_t(1), wchar_t(0x044C),wchar_t(0x0000)}; - static wchar_t const j_End[] = { wchar_t(1), wchar_t(0x0439),wchar_t(0x0000)}; + static wchar_t const a_End[] = { wchar_t(1), wchar_t(0x0430), wchar_t(0x0000)}; + static wchar_t const o_End[] = { wchar_t(1), wchar_t(0x043E), wchar_t(0x0000)}; + static wchar_t const ya_End[] = { wchar_t(1), wchar_t(0x044F), wchar_t(0x0000)}; + static wchar_t const ie_End[] = { wchar_t(1), wchar_t(0x0435), wchar_t(0x0000)}; + static wchar_t const i_End[] = { wchar_t(1), wchar_t(0x0438), wchar_t(0x0000)}; + static wchar_t const yeru_End[] = { wchar_t(1), wchar_t(0x044B), wchar_t(0x0000)}; + static wchar_t const u_End[] = { wchar_t(1), wchar_t(0x0443), wchar_t(0x0000)}; + static wchar_t const yu_End[] = { wchar_t(1), wchar_t(0x044E), wchar_t(0x0000)}; + static wchar_t const oj_End[] = { wchar_t(2), wchar_t(0x043E), wchar_t(0x0439), wchar_t(0x0000)}; + static wchar_t const ie_j_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x0439), wchar_t(0x0000)}; + static wchar_t const io_j_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x0439), wchar_t(0x0000)}; + static wchar_t const o_m_End[] = { wchar_t(2), wchar_t(0x043E), wchar_t(0x043C), wchar_t(0x0000)}; + static wchar_t const io_m_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x043C), wchar_t(0x0000)}; + static wchar_t const ie_m_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x043C), wchar_t(0x0000)}; + static wchar_t const soft_End[] = { wchar_t(1), wchar_t(0x044C), wchar_t(0x0000)}; + static wchar_t const j_End[] = { wchar_t(1), wchar_t(0x0439), wchar_t(0x0000)}; static wchar_t const* const dropEnds[6][8] = { { &a_End[1], &o_End[1], &ya_End[1], &ie_End[1], &soft_End[1], &j_End[1], NULL, NULL }, @@ -419,8 +419,8 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { size_t len = size_t((*itr)[-1]); // get length from string size field - if(wname.substr(wname.size()-len,len)==*itr) - return wname.substr(0,wname.size()-len); + if(wname.substr(wname.size()-len, len)==*itr) + return wname.substr(0, wname.size()-len); } return wname; @@ -430,11 +430,11 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr) { #if PLATFORM == PLATFORM_WINDOWS std::wstring wstr; - if(!Utf8toWStr(utf8str,wstr)) + if(!Utf8toWStr(utf8str, wstr)) return false; conStr.resize(wstr.size()); - CharToOemBuffW(&wstr[0],&conStr[0],wstr.size()); + CharToOemBuffW(&wstr[0], &conStr[0], wstr.size()); #else // not implemented yet conStr = utf8str; @@ -443,14 +443,14 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr) return true; } -bool consoleToUtf8(const std::string& conStr,std::string& utf8str) +bool consoleToUtf8(const std::string& conStr, std::string& utf8str) { #if PLATFORM == PLATFORM_WINDOWS std::wstring wstr; wstr.resize(conStr.size()); - OemToCharBuffW(&conStr[0],&wstr[0],conStr.size()); + OemToCharBuffW(&conStr[0], &wstr[0], conStr.size()); - return WStrToUtf8(wstr,utf8str); + return WStrToUtf8(wstr, utf8str); #else // not implemented yet utf8str = conStr; @@ -462,7 +462,7 @@ bool Utf8FitTo(const std::string& str, std::wstring search) { std::wstring temp; - if(!Utf8toWStr(str,temp)) + if(!Utf8toWStr(str, temp)) return false; // converting to lower case diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 2e5d9a12ad7..5ace48ee7be 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -184,7 +184,7 @@ bool WStrToUtf8(std::wstring wstr, std::string& utf8str); bool WStrToUtf8(wchar_t* wstr, size_t size, std::string& utf8str); size_t utf8length(std::string& utf8str); // set string to "" if invalid utf8 sequence -void utf8truncate(std::string& utf8str,size_t len); +void utf8truncate(std::string& utf8str, size_t len); inline bool isBasicLatinCharacter(wchar_t wchar) { @@ -366,7 +366,7 @@ inline void wstrToLower(std::wstring& str) std::wstring GetMainPartOfName(std::wstring wname, uint32 declension); bool utf8ToConsole(const std::string& utf8str, std::string& conStr); -bool consoleToUtf8(const std::string& conStr,std::string& utf8str); +bool consoleToUtf8(const std::string& conStr, std::string& utf8str); bool Utf8FitTo(const std::string& str, std::wstring search); void utf8printf(FILE *out, const char *str, ...); void vutf8printf(FILE *out, const char *str, va_list* ap); @@ -423,7 +423,7 @@ class flag96 private: uint32 part[3]; public: - flag96(uint32 p1=0,uint32 p2=0,uint32 p3=0) + flag96(uint32 p1=0, uint32 p2=0, uint32 p3=0) { part[0]=p1; part[1]=p2; @@ -537,14 +537,14 @@ public: template<class type> inline flag96 operator & (type & right) { - flag96 ret(part[0] & right.part[0],part[1] & right.part[1],part[2] & right.part[2]); + flag96 ret(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); return ret; }; template<class type> inline flag96 operator & (type & right) const { - flag96 ret(part[0] & right.part[0],part[1] & right.part[1],part[2] & right.part[2]); + flag96 ret(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); return ret; }; @@ -558,7 +558,7 @@ public: template<class type> inline flag96 operator | (type & right) { - flag96 ret(part[0] | right.part[0],part[1] | right.part[1],part[2] | right.part[2]); + flag96 ret(part[0] | right.part[0], part[1] | right.part[1], part[2] | right.part[2]); return ret; }; @@ -566,7 +566,7 @@ public: template<class type> inline flag96 operator | (type & right) const { - flag96 ret(part[0] | right.part[0],part[1] | right.part[1],part[2] | right.part[2]); + flag96 ret(part[0] | right.part[0], part[1] | right.part[1], part[2] | right.part[2]); return ret; }; @@ -587,7 +587,7 @@ public: template<class type> inline flag96 operator ^ (type & right) { - flag96 ret(part[0] ^ right.part[0],part[1] ^ right.part[1],part[2] ^ right.part[2]); + flag96 ret(part[0] ^ right.part[0], part[1] ^ right.part[1], part[2] ^ right.part[2]); return ret; }; @@ -595,7 +595,7 @@ public: template<class type> inline flag96 operator ^ (type & right) const { - flag96 ret(part[0] ^ right.part[0],part[1] ^ right.part[1],part[2] ^ right.part[2]); + flag96 ret(part[0] ^ right.part[0], part[1] ^ right.part[1], part[2] ^ right.part[2]); return ret; }; diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 957191c693a..f0210f9cdfa 100755 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -41,7 +41,7 @@ char * command_finder(const char* text, int state) { - static int idx,len; + static int idx, len; const char* ret; ChatCommand *cmd = ChatHandler::getCommandTable(); @@ -76,9 +76,9 @@ char ** cli_completion(const char * text, int start, int /*end*/) matches = (char**)NULL; if (start == 0) - matches = rl_completion_matches((char*)text,&command_finder); + matches = rl_completion_matches((char*)text, &command_finder); else - rl_bind_key('\t',rl_abort); + rl_bind_key('\t', rl_abort); return (matches); } @@ -96,11 +96,11 @@ void utf8print(void* /*arg*/, const char* str) #if PLATFORM == PLATFORM_WINDOWS wchar_t wtemp_buf[6000]; size_t wtemp_len = 6000-1; - if (!Utf8toWStr(str,strlen(str),wtemp_buf,wtemp_len)) + if (!Utf8toWStr(str, strlen(str), wtemp_buf, wtemp_len)) return; char temp_buf[6000]; - CharToOemBuffW(&wtemp_buf[0],&temp_buf[0],wtemp_len+1); + CharToOemBuffW(&wtemp_buf[0], &temp_buf[0], wtemp_len+1); printf(temp_buf); #else { @@ -191,7 +191,7 @@ std::string ChatHandler::GenerateDeletedCharacterGUIDsWhereStr(DeletedInfoList:: DeletedInfoList::const_iterator itr2 = itr; if (++itr2 != itr_end) - wherestr << "','"; + wherestr << "', '"; } wherestr << "')"; return wherestr.str(); @@ -436,7 +436,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){ if (!*args) return false; - char *character_name_str = strtok((char*)args," "); + char *character_name_str = strtok((char*)args, " "); if (!character_name_str) return false; @@ -459,7 +459,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){ character_guid = sObjectMgr->GetPlayerGUIDByName(character_name); if (!character_guid) { - PSendSysMessage(LANG_NO_PLAYER,character_name.c_str()); + PSendSysMessage(LANG_NO_PLAYER, character_name.c_str()); SetSentErrorMessage(true); return false; } @@ -468,10 +468,10 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){ } std::string account_name; - sAccountMgr->GetName (account_id,account_name); + sAccountMgr->GetName (account_id, account_name); Player::DeleteFromDB(character_guid, account_id, true, true); - PSendSysMessage(LANG_CHARACTER_DELETED,character_name.c_str(),GUID_LOPART(character_guid),account_name.c_str(), account_id); + PSendSysMessage(LANG_CHARACTER_DELETED, character_name.c_str(), GUID_LOPART(character_guid), account_name.c_str(), account_id); return true; } @@ -580,14 +580,14 @@ void CliRunnable::run() { fflush(stdout); - char *command_str ; // = fgets(commandbuf,sizeof(commandbuf),stdin); + char *command_str ; // = fgets(commandbuf, sizeof(commandbuf), stdin); #if PLATFORM == PLATFORM_WINDOWS char commandbuf[256]; command_str = fgets(commandbuf, sizeof(commandbuf), stdin); #else command_str = readline("TC>"); - rl_bind_key('\t',rl_complete); + rl_bind_key('\t', rl_complete); #endif if (command_str != NULL) { diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 08fce8a504c..ede65d07910 100755 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -66,7 +66,7 @@ void usage(const char *prog) " -s install install service\n\r" " -s uninstall uninstall service\n\r" #endif - ,prog); + , prog); } /// Launch the Trinity server diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 3876a7a1f8f..cfb8a5a1aaa 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -99,7 +99,7 @@ public: w_loops = World::m_worldLoopCounter; } // possible freeze - else if (getMSTimeDiff(w_lastchange,curtime) > _delaytime) + else if (getMSTimeDiff(w_lastchange, curtime) > _delaytime) { sLog->outError("World Thread hangs, kicking out server!"); ASSERT(false); diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp index 664e767d11f..c7e4891747d 100755 --- a/src/server/worldserver/WorldThread/WorldRunnable.cpp +++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp @@ -54,7 +54,7 @@ void WorldRunnable::run() ++World::m_worldLoopCounter; realCurrTime = getMSTime(); - uint32 diff = getMSTimeDiff(realPrevTime,realCurrTime); + uint32 diff = getMSTimeDiff(realPrevTime, realCurrTime); sWorld->Update( diff ); realPrevTime = realCurrTime; |