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/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;