josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Fix more warnings

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-08-24 14:44:56 +02:00
parent c728681422
commit 9e4357c9ad
29 changed files with 181 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.h
+1 -1
View File
@@ -125,7 +125,7 @@ class Object
public:
virtual ~Object ();
const bool IsInWorld() const { return m_inWorld; }
const bool& IsInWorld() const { return m_inWorld; }
virtual void AddToWorld()
{
if (m_inWorld)
src/server/game/Groups/Group.h
+1 -1
View File
@@ -237,7 +237,7 @@ class Group
bool IsCreated() const { return GetMembersCount() > 0; }
const uint64& GetLeaderGUID() const { return m_leaderGuid; }
const uint64& GetGUID() const { return m_guid; }
const uint32 GetLowGUID() const { return GUID_LOPART(m_guid); }
uint32 GetLowGUID() const { return GUID_LOPART(m_guid); }
const char * GetLeaderName() const { return m_leaderName.c_str(); }
LootMethod GetLootMethod() const { return m_lootMethod; }
const uint64& GetLooterGuid() const { return m_looterGuid; }
src/server/game/Guilds/Guild.h
+1 -1
View File
@@ -220,7 +220,7 @@ struct GuildBankEventLogEntry
uint8 DestTabId;
uint64 TimeStamp;
const bool isMoneyEvent()
bool isMoneyEvent()
{
return EventType == GUILD_BANK_LOG_DEPOSIT_MONEY ||
EventType == GUILD_BANK_LOG_WITHDRAW_MONEY ||
src/server/game/Spells/SpellScript.h
+2 -2
View File
@@ -281,8 +281,8 @@ class AuraScript : public _SpellScript
bool _Validate(SpellEntry const * entry, const char * scriptname);
bool _Load(Aura * aura);
void _ResetDefault() { m_default = true; }
bool _IsDefaultActionPrevented(SpellEffIndex effIndex) {return !m_default;};
bool PreventDefaultAction() { m_default = false; };
bool _IsDefaultActionPrevented(SpellEffIndex /*effIndex*/) {return !m_default;};
void PreventDefaultAction() { m_default = false; };
private:
Aura * m_aura;
bool m_default;
src/server/scripts/Examples/example_spell.cpp
+8 -9
View File
@@ -43,7 +43,7 @@ class spell_ex_5581 : public SpellScriptLoader
// function called on server startup
// checks if script has data required for it to work
bool Validate(SpellEntry const * spellEntry)
bool Validate(SpellEntry const * /*spellEntry*/)
{
// check if spellid 70522 exists in dbc, we will trigger it later
if (!sSpellStore.LookupEntry(SPELL_TRIGGERED))
@@ -71,11 +71,10 @@ class spell_ex_5581 : public SpellScriptLoader
delete localVariable2;
}
void HandleDummy(SpellEffIndex effIndex)
void HandleDummy(SpellEffIndex /*effIndex*/)
{
// we're handling SPELL_EFFECT_DUMMY in effIndex 0 here
sLog.outString("SPELL_EFFECT_DUMMY is executed on target!");
sLog.outString(localVariable.c_str());
// make caster cast a spell on a unit target of effect
if (Unit * target = GetHitUnit())
GetCaster()->CastSpell(target, SPELL_TRIGGERED, true);
@@ -156,7 +155,7 @@ class spell_ex_66244 : public SpellScriptLoader
return false;
}
void HandleEffectApply(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode)
void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraApplication const * aurApp, AuraEffectHandleModes /*mode*/)
{
sLog.outString("Aura Effect is about to be applied on target!");
Unit * target = aurApp->GetTarget();
@@ -164,7 +163,7 @@ class spell_ex_66244 : public SpellScriptLoader
target->CastSpell(target, SPELL_TRIGGERED, true);
}
void HandleEffectRemove(AuraEffect const * aurEff, AuraApplication const * aurApp, AuraEffectHandleModes mode)
void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraApplication const * aurApp, AuraEffectHandleModes /*mode*/)
{
sLog.outString("Aura Effect is just removed on target!");
Unit * target = aurApp->GetTarget();
@@ -176,7 +175,7 @@ class spell_ex_66244 : public SpellScriptLoader
target->CastSpell(caster, SPELL_TRIGGERED, true);
}
void HandleEffectPeriodic(AuraEffect const * aurEff, AuraApplication const * aurApp)
void HandleEffectPeriodic(AuraEffect const * /*aurEff*/, AuraApplication const * aurApp)
{
sLog.outString("Perioidic Aura Effect is does a tick on target!");
Unit * target = aurApp->GetTarget();
@@ -191,7 +190,7 @@ class spell_ex_66244 : public SpellScriptLoader
aurEff->ChangeAmount(aurEff->GetAmount() * 2);
}
void HandleEffectCalcAmount(AuraEffect const * aurEff, int32 & amount, bool & canBeRecalculated)
void HandleEffectCalcAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
{
sLog.outString("Amount of Aura Effect is being calculated now!");
// we're setting amount to 0
@@ -200,7 +199,7 @@ class spell_ex_66244 : public SpellScriptLoader
canBeRecalculated = false;
}
void HandleEffectCalcPeriodic(AuraEffect const * aurEff, bool & isPeriodic, int32 & amplitude)
void HandleEffectCalcPeriodic(AuraEffect const * /*aurEff*/, bool & isPeriodic, int32 & amplitude)
{
sLog.outString("Periodic data of Aura Effect is being calculated now!");
// we're setting aura to be periodic and tick every 10 seconds
@@ -208,7 +207,7 @@ class spell_ex_66244 : public SpellScriptLoader
amplitude = 2 * IN_MILLISECONDS;
}
void HandleEffectCalcSpellMod(AuraEffect * const aurEff, SpellModifier *& spellMod)
void HandleEffectCalcSpellMod(AuraEffect * const /*aurEff*/, SpellModifier *& spellMod)
{
sLog.outString("SpellMod data of Aura Effect is being calculated now!");
// we don't want spellmod for example
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+4 -4
View File
@@ -76,14 +76,14 @@ enum Phases
const Position SpawnPoint[2] =
{
{ 550.7f, 282.8f, 224.3f },
{ 551.1f, 229.4f, 224.3f },
{ 550.7f, 282.8f, 224.3f, 0.0f },
{ 551.1f, 229.4f, 224.3f, 0.0f },
};
const Position SpawnPointGuardian[2] =
{
{ 550.348633f, 316.006805f, 234.2947f },
{ 550.188660f, 324.264557f, 237.7412f },
{ 550.348633f, 316.006805f, 234.2947f, 0.0f },
{ 550.188660f, 324.264557f, 237.7412f, 0.0f },
};
class boss_anub_arak : public CreatureScript
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+2
View File
@@ -132,6 +132,7 @@ public:
} else uiPlagueTimer -= diff;
if (IsHeroic())
{
if (uiRagueTimer <= diff)
{
if (Creature *pSwarmer = me->FindNearestCreature(MOB_AHNKAHAR_SWARMER, 35))
@@ -140,6 +141,7 @@ public:
uiRagueTimer = 15*IN_MILLISECONDS;
}
} else uiRagueTimer -= diff;
}
if (uiSwarmerSpawnTimer <= diff)
{
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+1 -1
View File
@@ -570,7 +570,7 @@ public:
void UpdateAI(const uint32 diff)
{
if (gateClose && (!isOnSameSide(me) || me->getVictim() && !isOnSameSide(me->getVictim())))
if (gateClose && (!isOnSameSide(me) || (me->getVictim() && !isOnSameSide(me->getVictim()))))
{
EnterEvadeMode();
return;
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ public:
events.Update(diff);
if (phase != PHASE_BIRTH && !UpdateCombatState() || !CheckInRoom())
if ((phase != PHASE_BIRTH && !UpdateCombatState()) || !CheckInRoom())
return;
if (CanTheHundredClub)
src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+18 -16
View File
@@ -358,7 +358,7 @@ public:
pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* /*pWho*/)
{
DoScriptText(SAY_SARTHARION_AGGRO,me);
DoZoneInCombat();
@@ -370,7 +370,7 @@ public:
}
}
void JustDied(Unit* pKiller)
void JustDied(Unit* /*pKiller*/)
{
DoScriptText(SAY_SARTHARION_DEATH,me);
@@ -404,7 +404,7 @@ public:
}
}
void KilledUnit(Unit* pVictim)
void KilledUnit(Unit* /*pVictim*/)
{
DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me);
}
@@ -920,7 +920,7 @@ struct dummy_dragonAI : public ScriptedAI
//Refresh respawnTime so time again are set to 30secs?
}
void JustDied(Unit* pKiller)
void JustDied(Unit* /*pKiller*/)
{
if (!m_bCanLoot)
me->SetLootRecipient(NULL);
@@ -1032,14 +1032,14 @@ public:
m_bHasPortalOpen = false;
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* /*pWho*/)
{
DoScriptText(SAY_TENEBRON_AGGRO, me);
DoZoneInCombat();
DoCast(me, SPELL_POWER_OF_TENEBRON);
}
void KilledUnit(Unit* pVictim)
void KilledUnit(Unit* /*pVictim*/)
{
DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me);
}
@@ -1133,14 +1133,14 @@ public:
m_bHasPortalOpen = false;
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* /*pWho*/)
{
DoScriptText(SAY_SHADRON_AGGRO,me);
DoZoneInCombat();
DoCast(me, SPELL_POWER_OF_SHADRON);
}
void KilledUnit(Unit* pVictim)
void KilledUnit(Unit* /*pVictim*/)
{
DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me);
}
@@ -1237,14 +1237,14 @@ public:
m_bHasPortalOpen = false;
}
void EnterCombat(Unit* pWho)
void EnterCombat(Unit* /*pWho*/)
{
DoScriptText(SAY_VESPERON_AGGRO,me);
DoZoneInCombat();
DoCast(me, SPELL_POWER_OF_VESPERON);
}
void KilledUnit(Unit* pVictim)
void KilledUnit(Unit* /*pVictim*/)
{
DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me);
}
@@ -1339,19 +1339,21 @@ public:
//if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
{
if(pTarget = (Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION))))
pTarget = Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION));
if (pTarget)
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, pTarget);
}
else
{
if(pTarget = (Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON))))
pTarget = Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON));
if (pTarget)
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
}
}
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
}
void JustDied(Unit* killer)
void JustDied(Unit* /*killer*/)
{
if (pInstance)
{
@@ -1448,7 +1450,7 @@ public:
DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO);
}
void JustDied(Unit* pKiller)
void JustDied(Unit* /*pKiller*/)
{
me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO);
@@ -1576,8 +1578,8 @@ public:
}
void AttackStart(Unit* pWho) {}
void MoveInLineOfSight(Unit* pWho) {}
void AttackStart(Unit* /*pWho*/) {}
void MoveInLineOfSight(Unit* /*pWho*/) {}
};
};
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+2
View File
@@ -129,12 +129,14 @@ public:
} else uiUncontrollableEnergyTimer -= diff;
if (IsHeroic())
{
if (uiManaDestructionTimer <= diff)
{
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_MANA_DESTRUCTION);
uiManaDestructionTimer = 30000;
} else uiManaDestructionTimer -= diff;
}
DoMeleeAttackIfReady();
}
src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+2
View File
@@ -169,12 +169,14 @@ public:
else uiArcaneBarrageVolley_Timer -= uiDiff;
if (uiArcaneBuffet_Timer)
{
if (uiArcaneBuffet_Timer < uiDiff)
{
DoCast(me->getVictim(), SPELL_ARCANE_BUFFET);
uiArcaneBuffet_Timer = 0;
}
else uiArcaneBuffet_Timer -= uiDiff;
}
if (uiSummonEtherealSphere_Timer < uiDiff)
{
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+9 -9
View File
@@ -75,14 +75,14 @@ const Position PortalLocation[] =
{1908.31f, 809.657f, 38.7037f, 3.08701f} // WP 6
};
const Position BossStartMove1 = {1894.684448f, 739.390503f, 47.668003f};
const Position BossStartMove2 = {1875.173950f, 860.832703f, 43.333565f};
const Position BossStartMove21 = {1858.854614f, 855.071411f, 43.333565f};
const Position BossStartMove22 = {1891.926636f, 863.388977f, 43.333565f};
const Position BossStartMove3 = {1916.138062f, 778.152222f, 35.772308f};
const Position BossStartMove4 = {1853.618286f, 758.557617f, 38.657505f};
const Position BossStartMove5 = {1906.683960f, 842.348022f, 38.637459f};
const Position BossStartMove6 = {1928.207031f, 852.864441f, 47.200813f};
const Position BossStartMove1 = {1894.684448f, 739.390503f, 47.668003f, 0.0f};
const Position BossStartMove2 = {1875.173950f, 860.832703f, 43.333565f, 0.0f};
const Position BossStartMove21 = {1858.854614f, 855.071411f, 43.333565f, 0.0f};
const Position BossStartMove22 = {1891.926636f, 863.388977f, 43.333565f, 0.0f};
const Position BossStartMove3 = {1916.138062f, 778.152222f, 35.772308f, 0.0f};
const Position BossStartMove4 = {1853.618286f, 758.557617f, 38.657505f, 0.0f};
const Position BossStartMove5 = {1906.683960f, 842.348022f, 38.637459f, 0.0f};
const Position BossStartMove6 = {1928.207031f, 852.864441f, 47.200813f, 0.0f};
const Position CyanigosasSpawnLocation = {1930.281250f, 804.407715f, 52.410946f, 3.139621f};
const Position MiddleRoomLocation = {1892.291260f, 805.696838f, 38.438862f, 3.139621f};
@@ -793,7 +793,7 @@ public:
}
}
void ProcessEvent(GameObject* pGO, uint32 uiEventId)
void ProcessEvent(GameObject* /*pGO*/, uint32 uiEventId)
{
switch(uiEventId)
{
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+7 -7
View File
@@ -244,9 +244,9 @@ const float SaboteurFinalPos6[5][3] =
{1931.063354f, 848.468445f, 47.190434f}
};
const Position MovePosition = {1806.955566f, 803.851807f, 44.363323f};
const Position MovePosition = {1806.955566f, 803.851807f, 44.363323f, 0.0f};
const Position playerTeleportPosition = {1830.531006f, 803.939758f, 44.340508f, 6.281611f};
const Position sinclariOutsidePosition = {1817.315674f, 804.060608f, 44.363998f};
const Position sinclariOutsidePosition = {1817.315674f, 804.060608f, 44.363998f, 0.0f};
class npc_sinclari_vh : public CreatureScript
{
@@ -479,7 +479,7 @@ public:
void UpdateAI(const uint32 diff)
{
if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS))
if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
me->CastStop();
npc_escortAI::UpdateAI(diff);
@@ -723,8 +723,8 @@ struct violet_hold_trashAI : public npc_escortAI
void UpdateAI(const uint32)
{
if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS))
me->CastStop();
if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
me->CastStop();
if (!bHasGotMovingPoints)
{
@@ -778,7 +778,7 @@ struct violet_hold_trashAI : public npc_escortAI
}
}
void JustDied(Unit *unit)
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);
@@ -786,7 +786,7 @@ struct violet_hold_trashAI : public npc_escortAI
pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1);
}
void CreatureStartAttackDoor(uint32 creature_guid)
void CreatureStartAttackDoor(uint32 /*creature_guid*/)
{
me->SetReactState(REACT_PASSIVE);
DoCast(SPELL_DESTROY_DOOR_SEAL);
src/server/scripts/Northrend/dalaran.cpp
+4
View File
@@ -78,6 +78,7 @@ public:
{
case 29254:
if (pPlayer->GetTeam() == HORDE) // Horde unit found in Alliance area
{
if (GetClosestCreatureWithEntry(me, NPC_APPLEBOUGH_A, 32.0f))
{
if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me
@@ -85,9 +86,11 @@ public:
}
else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out
}
break;
case 29255:
if (pPlayer->GetTeam() == ALLIANCE) // Alliance unit found in Horde area
{
if (GetClosestCreatureWithEntry(me, NPC_SWEETBERRY_H, 32.0f))
{
if (me->isInBackInMap(pWho, 12.0f)) // In my line of sight, "outdoors", and behind me
@@ -95,6 +98,7 @@ public:
}
else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out
}
break;
}
me->SetOrientation(me->GetHomePosition().GetOrientation());
src/server/scripts/Northrend/grizzly_hills.cpp
+3 -3
View File
@@ -191,7 +191,7 @@ public:
MrfloppyGUID = Mrfloppy->GetGUID();
break;
case 10:
if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID))
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);
@@ -472,7 +472,7 @@ public:
{
if (m_uiPhase == 1)
{
if (GameObject* haunch = me->FindNearestGameObject(OBJECT_HAUNCH, 2.0f))
if (me->FindNearestGameObject(OBJECT_HAUNCH, 2.0f))
{
me->SetStandState(UNIT_STAND_STATE_DEAD);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
@@ -517,7 +517,7 @@ public:
void UpdateAI(const uint32 uiDiff)
{
// call this each update tick?
if (Creature* stag = me->FindNearestCreature(TALLHORN_STAG, 0.2f))
if (me->FindNearestCreature(TALLHORN_STAG, 0.2f))
{
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING);
}
src/server/scripts/Northrend/zuldrak.cpp
+7 -3
View File
@@ -86,7 +86,7 @@ public:
{
if (pSpell->Id == SPELL_UNLOCK_SHACKLE)
{
if (Creature *Rageclaw = Unit::GetCreature(*me, RageclawGUID))
if (Unit::GetCreature(*me, RageclawGUID))
UnlockRageclaw(pCaster);
else
me->setDeathState(JUST_DIED);
@@ -353,7 +353,7 @@ public:
bRemoveFlag = false;
}
void SetGUID(const uint64 &guid, int32 id)
void SetGUID(const uint64 &guid, int32 /*id*/)
{
uiPlayerGUID = guid;
}
@@ -401,6 +401,7 @@ public:
ScriptedAI::UpdateAI(uiDiff);
if (bRemoveFlag)
{
if (uiRemoveFlagTimer <= uiDiff)
{
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
@@ -408,6 +409,7 @@ public:
uiRemoveFlagTimer = 10000;
} else uiRemoveFlagTimer -= uiDiff;
}
if (uiPhase)
{
@@ -607,7 +609,7 @@ public:
pWhisker->RemoveFromWorld();
}
void MovementInform(uint32 uiType, uint32 uiId)
void MovementInform(uint32 uiType, uint32 /*uiId*/)
{
if (uiType != POINT_MOTION_TYPE)
return;
@@ -1209,12 +1211,14 @@ public:
return;
if (me->GetPositionZ() >= 287.0f)
{
if (uiMissleTimer <= uiDiff)
{
DoCast(me,uiSpell); // this spell is not supported ... YET!
uiMissleTimer = urand(2000,7000);
} else uiMissleTimer -= uiDiff;
}
DoMeleeAttackIfReady();
}
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+8 -2
View File
@@ -285,7 +285,7 @@ static Yells RandomTaunts[]=
static Yells MaievTaunts[]=
{
{11493, "That is for Naisha!", MAIEV_SHADOWSONG, 0, false},
{11493, "That is for Naisha!", MAIEV_SHADOWSONG, 0, 0, false},
{11494, "Bleed as I have bled!", MAIEV_SHADOWSONG, 0, 0, false},
{11495, "There shall be no prison for you this time!", MAIEV_SHADOWSONG, 0, 0, false},
{11500, "Meet your end, demon!", MAIEV_SHADOWSONG, 0, 0, false}
@@ -954,12 +954,14 @@ public:
for (int32 i = 1; i <= MaxTimer[Phase]; ++i)
{
if (Timer[i]) // Event is enabled
{
if (Timer[i] <= diff)
{
if (!Event) // No event with higher priority
Event = (EventIllidan)i;
}
else Timer[i] -= diff;
}
}
switch(Phase)
@@ -993,12 +995,14 @@ public:
if (Event == EVENT_TRANSFORM_SEQUENCE)
HandleTransformSequence();
break;
default:
break;
}
if (me->IsNonMeleeSpellCasted(false))
return;
if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED))
if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || (Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED)))
{
switch(Event)
{
@@ -2062,9 +2066,11 @@ public:
void UpdateAI(const uint32 diff)
{
if (DespawnTimer)
{
if (DespawnTimer <= diff)
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
else DespawnTimer -= diff;
}
//if (IllidanGUID && !SummonedBeams)
//{
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+6 -4
View File
@@ -281,11 +281,13 @@ public:
//Enrage
if (!me->HasAura(SPELL_BERSERK))
if (EnrageTimer <= diff)
{
DoCast(me, SPELL_BERSERK);
DoScriptText(SAY_ENRAGE, me);
} else EnrageTimer -= diff;
if (EnrageTimer <= diff)
{
DoCast(me, SPELL_BERSERK);
DoScriptText(SAY_ENRAGE, me);
} else EnrageTimer -= diff;
}
//Random taunts
if (RandomYellTimer <= diff)
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+18 -11
View File
@@ -40,20 +40,22 @@ struct Location
float x, y, o, z;
};
/* Not used
static Location ChannelerLocations[]=
{
{463.161285f, 401.219757f, 3.141592f},
{457.377625f, 391.227661f, 2.106461f},
{446.012421f, 391.227661f, 1.071904f},
{439.533783f, 401.219757f, 0.000000f},
{446.012421f, 411.211853f, 5.210546f},
{457.377625f, 411.211853f, 4.177494f}
{463.161285f, 401.219757f, 3.141592f, 0.0f},
{457.377625f, 391.227661f, 2.106461f, 0.0f},
{446.012421f, 391.227661f, 1.071904f, 0.0f},
{439.533783f, 401.219757f, 0.000000f, 0.0f},
{446.012421f, 411.211853f, 5.210546f, 0.0f},
{457.377625f, 411.211853f, 4.177494f, 0.0f}
};
*/
static Location SpawnLocations[]=
{
{498.652740f, 461.728119f, 0.0f},
{498.505003f, 339.619324f, 0.0f}
{498.652740f, 461.728119f, 0.0f, 0.0f},
{498.505003f, 339.619324f, 0.0f, 0.0f}
};
static Location AkamaWP[]=
@@ -335,7 +337,7 @@ public:
if (guid)
{
if (Sorcerers.empty())
sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", guid);
else Sorcerers.remove(guid);
}
}
@@ -387,7 +389,7 @@ public:
{
CAST_AI(mob_ashtongue_channeler::mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
Channelers.push_back((*itr)->GetGUID());
sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
}
}
else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
@@ -573,7 +575,10 @@ public:
ShadeHasDied = false;
StartCombat = false;
pInstance = c->GetInstanceScript();
ShadeGUID = pInstance ? pInstance->GetData64(DATA_SHADEOFAKAMA) : NOT_STARTED;
if (pInstance)
ShadeGUID = pInstance->GetData64(DATA_SHADEOFAKAMA);
else
ShadeGUID = NOT_STARTED;
me->setActive(true);
EventBegun = false;
CastSoulRetrieveTimer = 0;
@@ -794,6 +799,7 @@ public:
}
if (SoulRetrieveTimer)
{
if (SoulRetrieveTimer <= diff)
{
switch(EndingTalkCount)
@@ -849,6 +855,7 @@ public:
break;
}
} else SoulRetrieveTimer -= diff;
}
if (!UpdateVictim())
return;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ public:
beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
beams[0]=beamer->GetGUID();
}
beamer = 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);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+4
View File
@@ -417,6 +417,7 @@ public:
return;
}
if (me->HasAura(SPELL_WHIRLWIND))
{
if (Whirlwind_Timer <= diff)
{
Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -428,6 +429,7 @@ public:
}
Whirlwind_Timer = 2000;
} else Whirlwind_Timer -= diff;
}
// reseting after changing forms and after ending whirlwind
if (NeedThreatReset && !me->HasAura(SPELL_WHIRLWIND))
@@ -468,6 +470,7 @@ public:
//Switch_Timer
if (!IsFinalForm)
{
if (SwitchToDemon_Timer <= diff)
{
//switch to demon form
@@ -480,6 +483,7 @@ public:
NeedThreatReset = true;
SwitchToDemon_Timer = 45000;
} else SwitchToDemon_Timer -= diff;
}
DoMeleeAttackIfReady();
}
else
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+4 -2
View File
@@ -179,6 +179,7 @@ class boss_nazan : public CreatureScript
ConeOfFire_Timer -= diff;
if (IsHeroic())
{
if (BellowingRoar_Timer <= diff)
{
DoCast(me, SPELL_BELLOWING_ROAR);
@@ -186,6 +187,7 @@ class boss_nazan : public CreatureScript
}
else
BellowingRoar_Timer -= diff;
}
DoMeleeAttackIfReady();
}
@@ -422,9 +424,9 @@ class boss_vazruden_the_herald : public CreatureScript
{
Creature *Nazan = Unit::GetCreature(*me, NazanGUID);
Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
if (Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive())
if ((Nazan && Nazan->isAlive()) || (Vazruden && Vazruden->isAlive()))
{
if (Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim())
if ((Nazan && Nazan->getVictim()) || (Vazruden && Vazruden->getVictim()))
return;
else
{
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+8
View File
@@ -203,6 +203,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
return;
if (Assassins_Timer)
{
if (Assassins_Timer <= diff)
{
SpawnAssassin();
@@ -210,10 +211,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
else
Assassins_Timer -= diff;
}
if (InBlade)
{
if (Wait_Timer)
{
if (Wait_Timer <= diff)
{
if (target_num <= 0)
@@ -241,10 +244,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
else
Wait_Timer -= diff;
}
}
else
{
if (Blade_Dance_Timer)
{
if (Blade_Dance_Timer <= diff)
{
target_num = TARGET_NUM;
@@ -256,8 +261,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
else
Blade_Dance_Timer -= diff;
}
if (Charge_timer)
{
if (Charge_timer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE);
@@ -265,6 +272,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
else
Charge_timer -= diff;
}
if (Summon_Assistant_Timer <= diff)
{
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+2 -1
View File
@@ -68,8 +68,9 @@ const float SMALL_PORTAL_RADIUS = 12.6f;
const float LARGE_PORTAL_RADIUS = 26.0f;
const float PORTAL_Z = 17.005f;
// x, y, z, o
/* not used // x, y, z, o
static float SolarianPos[4] = {432.909f, -373.424f, 17.9608f, 1.06421f};
*/
class boss_high_astromancer_solarian : public CreatureScript
{
src/server/scripts/Outland/netherstorm.cpp
+2 -2
View File
@@ -910,10 +910,10 @@ public:
case 12:
if (pPlayer)
pPlayer->GroupEventHappens(Q_ALMABTRIEB, me);
if (Unit* Thadell = me->FindNearestCreature(N_THADELL, 30))
if (me->FindNearestCreature(N_THADELL, 30))
DoScriptText(SAY_THADELL_1, me); break;
case 13:
if (Unit* Thadell = me->FindNearestCreature(N_THADELL, 30))
if (me->FindNearestCreature(N_THADELL, 30))
DoScriptText(SAY_THADELL_2, me, pPlayer); break;
}
}
src/server/scripts/Outland/shadowmoon_valley.cpp
+50 -44
View File
@@ -283,37 +283,39 @@ public:
if (!UpdateVictim())
{
if (Tapped)
if (FlyTimer <= diff)
{
Tapped = false;
if (PlayerGUID)
if (FlyTimer <= diff)
{
Player* plr = Unit::GetPlayer(*me, PlayerGUID);
if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
Tapped = false;
if (PlayerGUID)
{
DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
/*
float x,y,z;
me->GetPosition(x,y,z);
float dx,dy,dz;
me->GetRandomPoint(x, y, z, 20, dx, dy, dz);
dz += 20; // so it's in the air, not ground*/
Position pos;
if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30))
EscapeDummy->GetPosition(&pos);
else
Player* plr = Unit::GetPlayer(*me, PlayerGUID);
if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
{
me->GetRandomNearPosition(pos, 20);
pos.m_positionZ += 25;
}
DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
/*
float x,y,z;
me->GetPosition(x,y,z);
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->GetMotionMaster()->MovePoint(1, pos);
float dx,dy,dz;
me->GetRandomPoint(x, y, z, 20, dx, dy, dz);
dz += 20; // so it's in the air, not ground*/
Position pos;
if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30))
EscapeDummy->GetPosition(&pos);
else
{
me->GetRandomNearPosition(pos, 20);
pos.m_positionZ += 25;
}
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->GetMotionMaster()->MovePoint(1, pos);
}
}
}
} else FlyTimer -= diff;
} else FlyTimer -= diff;
}
return;
}
@@ -386,17 +388,19 @@ public:
void UpdateAI(const uint32 diff)
{
if (PoisonTimer)
if (PoisonTimer <= diff)
{
if (PlayerGUID)
if (PoisonTimer <= diff)
{
Player* plr = Unit::GetPlayer(*me, PlayerGUID);
if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
plr->KilledMonsterCredit(23209, me->GetGUID());
}
PoisonTimer = 0;
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
} else PoisonTimer -= diff;
if (PlayerGUID)
{
Player* plr = Unit::GetPlayer(*me, PlayerGUID);
if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
plr->KilledMonsterCredit(23209, me->GetGUID());
}
PoisonTimer = 0;
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
} else PoisonTimer -= diff;
}
}
};
@@ -1351,17 +1355,19 @@ public:
{
if (slayer)
switch(slayer->GetTypeId())
{
case TYPEID_UNIT:
if (Unit *owner = slayer->GetOwner())
if (owner->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
{
case TYPEID_UNIT:
if (Unit *owner = slayer->GetOwner())
if (owner->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
case TYPEID_PLAYER:
CAST_PLR(slayer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
}
case TYPEID_PLAYER:
CAST_PLR(slayer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
default:
break;
}
if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID)))
{
src/server/scripts/Outland/zangarmarsh.cpp
+4
View File
@@ -92,6 +92,8 @@ public:
pCreature->CastSpell(pPlayer, 31815, true);
DoScriptText(GOSSIP_REWARD_BLESS, pCreature);
break;
default:
break;
}
}
@@ -115,6 +117,8 @@ public:
pCreature->CastSpell(pPlayer, 31814, true);
DoScriptText(GOSSIP_REWARD_BLESS, pCreature);
break;
default:
break;
}
}
pPlayer->CLOSE_GOSSIP_MENU();
src/server/scripts/Spells/spell_paladin.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ public:
class spell_pal_blessing_of_faith_SpellScript : public SpellScript
{
bool Validate(SpellEntry const *spellEntry)
bool Validate(SpellEntry const * /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_BLESSING_OF_LOWER_CITY_DRUID))
return false;