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

Core/Script: Code style and some rewriting.

Browse Source 
JustDied(Unit* Killer) -> JustDied(Unit* killer)
JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* victim) -> JustDied(Unit* killer)
JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* who) -> JustDied(Unit* killer)
JustDied(Unit*) -> JustDied(Unit* /*killer*/)

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-31 18:56:37 +08:00
parent 7efb637258
commit d9088c083c
162 changed files with 316 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+3 -3
View File
@@ -125,9 +125,9 @@ public:
}
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
if (instance && IsEvent)
instance->SetData(DATA_ANETHERONEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -272,7 +272,7 @@ public:
{
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+2 -2
View File
@@ -343,9 +343,9 @@ public:
++SoulChargeCount;
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
DoScriptText(SAY_DEATH, me);
if (instance)
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+3 -3
View File
@@ -121,9 +121,9 @@ public:
}
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
if (instance && IsEvent)
instance->SetData(DATA_AZGALOREVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -251,7 +251,7 @@ public:
AttackStart(who);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+2 -2
View File
@@ -113,9 +113,9 @@ public:
}
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
if (instance && IsEvent)
instance->SetData(DATA_KAZROGALEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH);
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+2 -2
View File
@@ -115,9 +115,9 @@ public:
}
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
if (instance && IsEvent)
instance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH);
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+6 -5
View File
@@ -377,10 +377,11 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/)
}
}
void hyjal_trashAI::JustDied(Unit* /*victim*/)
void hyjal_trashAI::JustDied(Unit* /*killer*/)
{
if (!instance)
return;
if (IsEvent && !me->isWorldBoss())
instance->SetData(DATA_TRASH, 0);//signal trash is dead
@@ -1194,7 +1195,7 @@ public:
}
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance && IsEvent)
instance->SetData(DATA_TRASH, 0);//signal trash is dead
@@ -1313,14 +1314,14 @@ public:
}
}
void JustDied(Unit* victim)
void JustDied(Unit* killer)
{
float x, y, z;
me->GetPosition(x, y, z);
z = me->GetMap()->GetHeight(me->GetPhaseMask(), x, y, z);
me->GetMotionMaster()->MovePoint(0, x, y, z);
me->SetPosition(x, y, z, 0);
hyjal_trashAI::JustDied(victim);
hyjal_trashAI::JustDied(killer);
}
void UpdateAI(const uint32 diff)
@@ -1422,7 +1423,7 @@ public:
uint32 ExplodeTimer;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
}
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+2 -2
View File
@@ -153,9 +153,9 @@ public:
SpellCorrupt_Timer = 3000;
}
void JustDied(Unit* Killer)
void JustDied(Unit* killer)
{
if (Killer->GetEntry() == me->GetEntry())
if (killer->GetEntry() == me->GetEntry())
return;
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ public:
void EnterCombat(Unit* /*who*/) { }
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000);
}
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+2 -2
View File
@@ -168,7 +168,7 @@ public:
Enraged = false;
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -261,7 +261,7 @@ public:
VemDead = false;
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+4 -4
View File
@@ -949,7 +949,7 @@ public:
uint32 KillSelfTimer;
uint64 Portal;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p);
@@ -1025,7 +1025,7 @@ public:
uint32 EvadeTimer;
uint64 Portal;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p);
@@ -1136,7 +1136,7 @@ public:
uint32 EvadeTimer;
uint64 Portal;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p);
@@ -1252,7 +1252,7 @@ public:
uint32 BeamTimer;
uint64 Portal;
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ public:
DoScriptText(SAY_AGGRO, me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (!IsImage)
DoScriptText(SAY_DEATH, me);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ struct boss_twinemperorsAI : public ScriptedAI
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
Creature* pOtherBoss = GetOtherBoss();
if (pOtherBoss)
src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+1 -1
View File
@@ -242,7 +242,7 @@ public:
DoZoneInCombat();
}
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
for (int ni=0; ni<3; ++ni)
{
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ public:
AttackStartCaster(victim, 10);//keep back & toss bombs/shoot
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
/*if (instance)
instance->SetData(0, DONE);*/
src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+3 -3
View File
@@ -59,7 +59,7 @@ public:
{
}
void JustDied(Unit* Killer)
void JustDied(Unit* killer)
{
uint32 spawnCreatureID = 0;
@@ -67,8 +67,8 @@ public:
{
case 0:
spawnCreatureID = 17681;
if (Killer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(Killer)->KilledMonsterCredit(spawnCreatureID, 0);
if (Player* player = killer->ToPlayer())
player->KilledMonsterCredit(spawnCreatureID, 0);
break;
case 1:
case 2: