Core/Misc: Tab2spaces, remove trailing whitespaces and remove dupe code after merge

This commit is contained in:
Spp
2012-11-27 11:56:23 +01:00
parent 8ae0f2332c
commit 99e050fb27
9 changed files with 15 additions and 18 deletions

View File

@@ -226,7 +226,7 @@ public:
if (text)
CreatureAI::Talk(text);
}
void PrepareEncounter()

View File

@@ -171,7 +171,7 @@ public:
++speechCounter;
DoCastAOE(SPELL_THREAT_PULSE, true);
} else
} else
speechTimer -= diff;
return;

View File

@@ -34,7 +34,7 @@ EndScriptData */
//this texts are already used by 3975 and 3976
enum Says
{
SAY_LOST_HEAD = 0,
SAY_LOST_HEAD = 0,
SAY_PLAYER_DEATH = 1,
SAY_ENTRANCE = 0,

View File

@@ -54,7 +54,7 @@ enum Spells
AURA_SPECTRAL_REALM = 46021,
AURA_SPECTRAL_INVISIBILITY = 44801,
AURA_DEMONIC_VISUAL = 44800,
SPELL_SPECTRAL_BLAST = 44869,
SPELL_TELEPORT_SPECTRAL = 46019,
SPELL_ARCANE_BUFFET = 45018,

View File

@@ -34,7 +34,7 @@ EndScriptData */
enum Yells
{
SAY_KJ_OFFCOMBAT = 0,
SAY_KALECGOS_ENCOURAGE = 0,
SAY_KALECGOS_READY1 = 1,
SAY_KALECGOS_READY2 = 2,