*Replace every tab with 4 spaces, checked by hand

--HG--
branch : trunk
This commit is contained in:
maximius committed 2009-08-15 19:08:39 -07:00
1 parent c88304af95
commit e581351794
10 files changed
+84 -84

No files matched your search

@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
{
boss_netherspiteAI(Creature* c) : ScriptedAI(c)
{
pInstance = ((ScriptedInstance*)c->GetInstanceData());
pInstance = ((ScriptedInstance*)c->GetInstanceData());
for(int i=0; i<3; ++i)
{
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
}
}
ScriptedInstance* pInstance;
ScriptedInstance* pInstance;
bool PortalPhase;
bool Berserk;
@@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
void Reset()
{
Berserk = false;
Berserk = false;
NetherInfusionTimer = 540000;
VoidZoneTimer = 15000;
NetherbreathTimer = 3000;
@@ -249,23 +249,23 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
m_creature->RemoveAurasDueToSpell(NetherBuff[i]);
}
void HandleDoors(bool open) // Massive Door switcher
void HandleDoors(bool open) // Massive Door switcher
{
if(GameObject *Door = GameObject::GetGameObject((*m_creature),pInstance->GetData64(DATA_GO_MASSIVE_DOOR)))
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
if(GameObject *Door = GameObject::GetGameObject((*m_creature),pInstance->GetData64(DATA_GO_MASSIVE_DOOR)))
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
void Aggro(Unit *who)
{
HandleDoors(false);
{
HandleDoors(false);
SwitchToPortalPhase();
}
}
void JustDied(Unit* killer)
{
HandleDoors(true);
void JustDied(Unit* killer)
{
HandleDoors(true);
DestroyPortals();
}
}
void UpdateAI(const uint32 diff)
{
@@ -2,30 +2,30 @@
#include "def_vault_of_archavon.h"
//Emalon spells
#define SPELL_CHAIN_LIGHTNING HEROIC(64213, 64215)
#define SPELL_LIGHTNING_NOVA HEROIC(64216, 65279)
#define SPELL_OVERCHARGE 64218 //Casted every 45 sec on a random Tempest Minion
#define SPELL_BERSERK 26662
#define SPELL_CHAIN_LIGHTNING HEROIC(64213, 64215)
#define SPELL_LIGHTNING_NOVA HEROIC(64216, 65279)
#define SPELL_OVERCHARGE 64218 //Casted every 45 sec on a random Tempest Minion
#define SPELL_BERSERK 26662
//Tempest Minion spells
#define SPELL_SHOCK 64363
#define SPELL_OVERCHARGED 64217
#define SPELL_OVERCHARGED_BLAST 64219 //Casted when Overcharged reaches 10 stacks. Mob dies after that
#define SPELL_SHOCK 64363
#define SPELL_OVERCHARGED 64217
#define SPELL_OVERCHARGED_BLAST 64219 //Casted when Overcharged reaches 10 stacks. Mob dies after that
//Emotes
#define EMOTE_OVERCHARGE -1590000
#define EMOTE_MINION_RESPAWN -1590001
#define EMOTE_BERSERK -1590002
#define EMOTE_OVERCHARGE -1590000
#define EMOTE_MINION_RESPAWN -1590001
#define EMOTE_BERSERK -1590002
//Events
#define EVENT_CHAIN_LIGHTNING 1
#define EVENT_LIGHTNING_NOVA 2
#define EVENT_OVERCHARGE 3
#define EVENT_BERSERK 4
#define EVENT_SHOCK 5
#define EVENT_CHAIN_LIGHTNING 1
#define EVENT_LIGHTNING_NOVA 2
#define EVENT_OVERCHARGE 3
#define EVENT_BERSERK 4
#define EVENT_SHOCK 5
//Creatures
#define MOB_TEMPEST_MINION 33998
#define MOB_TEMPEST_MINION 33998
float TempestMinions[4][5] =
{
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
SummonList summons;
void Reset()
{
{
events.Reset();
summons.DespawnAll();
MinionList.clear();
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
Minion->AI()->AttackStart(target);
}
if (pInstance)
if (pInstance)
pInstance->SetData(DATA_EMALON_EVENT, NOT_STARTED);
}
@@ -1,8 +1,8 @@
#ifndef DEF_ARCHAVON_H
#define DEF_ARCHAVON_H
#define DATA_ARCHAVON_EVENT 1
#define DATA_EMALON_EVENT 2
#define DATA_EMALON 3
#define DATA_ARCHAVON 4
#define DATA_ARCHAVON_EVENT 1
#define DATA_EMALON_EVENT 2
#define DATA_EMALON 3
#define DATA_ARCHAVON 4
#endif
@@ -18,12 +18,12 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
uint64 Emalon;
void Initialize()
{
{
Archavon = 0;
Emalon = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounters[i] = NOT_STARTED;
Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
@@ -47,8 +47,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(type)
{
case DATA_ARCHAVON_EVENT: return Encounters[0];
case DATA_EMALON_EVENT: return Encounters[1];
case DATA_ARCHAVON_EVENT: return Encounters[0];
case DATA_EMALON_EVENT: return Encounters[1];
}
return 0;
}
@@ -57,8 +57,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(identifier)
{
case DATA_ARCHAVON: return Archavon;
case DATA_EMALON: return Emalon;
case DATA_ARCHAVON: return Archavon;
case DATA_EMALON: return Emalon;
}
return 0;
}
@@ -67,8 +67,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(type)
{
case DATA_ARCHAVON_EVENT: Encounters[0] = data; break;
case DATA_EMALON_EVENT: Encounters[1] = data; break;
case DATA_ARCHAVON_EVENT: Encounters[0] = data; break;
case DATA_EMALON_EVENT: Encounters[1] = data; break;
}
if(data == DONE)
+1 -1
View File
@@ -746,7 +746,7 @@ bool ChatHandler::HandleDebugEnterVehicle(const char * args)
{
Creature *passenger = NULL;
Trinity::AllCreaturesOfEntryInRange check(m_session->GetPlayer(), entry, 20.0f);
Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(m_session->GetPlayer(), passenger, check);
Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(m_session->GetPlayer(), passenger, check);
m_session->GetPlayer()->VisitNearbyObject(30.0f, searcher);
if(!passenger || passenger == target)
return false;
+3 -3
View File
@@ -255,7 +255,7 @@ MapManager::Update(uint32 diff)
uint32 i=0;
MapMapType::iterator iter;
std::vector<Map*> update_queue(i_maps.size());
int omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS));
int omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS));
for(iter = i_maps.begin(), i=0;iter != i_maps.end(); ++iter, i++)
update_queue[i]=iter->second;
/*
@@ -294,13 +294,13 @@ void MapManager::DoDelayedMovesAndRemoves()
std::vector<Map*> update_queue(i_maps.size());
MapMapType::iterator iter;
for(iter = i_maps.begin();iter != i_maps.end(); ++iter, i++)
update_queue[i] = iter->second;
update_queue[i] = iter->second;
omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS));
#pragma omp parallel for schedule(dynamic) private(i) shared(update_queue)
for(i=0;i<i_maps.size();i++)
update_queue[i]->DoDelayedMovesAndRemoves();
update_queue[i]->DoDelayedMovesAndRemoves();
*/
}
+3 -3
View File
@@ -3804,8 +3804,8 @@ bool Player::resetTalents(bool no_cost)
PlayerTalentMap::iterator itr2 = m_talents[m_activeSpec]->begin();
for (; itr2 != m_talents[m_activeSpec]->end(); ++itr2)
{
removeSpell(itr2->first, !IsPassiveSpell(itr2->first),false);
itr2->second->state = PLAYERSPELL_REMOVED;
removeSpell(itr2->first, !IsPassiveSpell(itr2->first),false);
itr2->second->state = PLAYERSPELL_REMOVED;
}
}
@@ -21859,7 +21859,7 @@ void Player::ActivateSpec(uint8 spec)
_LoadActions(result);
}
UnsummonPetTemporaryIfAny();
AutoUnequipOffhandIfNeed();
AutoUnequipOffhandIfNeed();
SendActionButtons(1);
SetPower(getPowerType(), 0);
}
+3 -3
View File
@@ -92,10 +92,10 @@ void Log::SetDBLogLevel(char *Level)
{
int32 NewLevel = atoi((char*)Level);
if ( NewLevel < 0 )
NewLevel = 0;
m_dbLogLevel = NewLevel;
NewLevel = 0;
m_dbLogLevel = NewLevel;
outString( "DBLogLevel is %u",m_dbLogLevel );
outString( "DBLogLevel is %u",m_dbLogLevel );
}
void Log::Initialize()
+5 -5
View File
@@ -149,17 +149,17 @@ class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_
bool m_gmlog_per_account;
std::string m_gmlog_filename_format;
bool m_enableLogDBLater;
bool m_enableLogDB;
bool m_enableLogDBLater;
bool m_enableLogDB;
uint32 realm;
// log coloring
bool m_colored;
ColorTypes m_colors[4];
// log levels:
// 0 minimum/string, 1 basic/error, 2 detail, 3 full/debug
uint8 m_dbLogLevel;
// log levels:
// 0 minimum/string, 1 basic/error, 2 detail, 3 full/debug
uint8 m_dbLogLevel;
uint8 m_logLevel;
uint8 m_logFileLevel;
uint8 m_logFilter;
+26 -26
View File
@@ -57,17 +57,17 @@ char * command_finder(const char* text, int state)
while(ret = cmd[idx].Name)
{
if(!cmd[idx].AllowConsole)
{
idx++;
continue;
}
{
idx++;
continue;
}
idx++;
//printf("Checking %s \n", cmd[idx].Name);
if (strncmp(ret, text, len) == 0)
return strdup(ret);
return strdup(ret);
if(cmd[idx].Name == NULL)
break;
break;
}
return ((char*)NULL);
@@ -378,9 +378,9 @@ void CliRunnable::run()
bool canflush = true;
///- Display the list of available CLI functions then beep
sLog.outString("");
#if PLATFORM != WINDOWS
#if PLATFORM != WINDOWS
rl_attempted_completion_function = cli_completion;
#endif
#endif
if(sConfig.GetBoolDefault("BeepAtStart", true))
printf("\a"); // \a = Alert
@@ -395,13 +395,13 @@ void CliRunnable::run()
char *command_str ; // = fgets(commandbuf,sizeof(commandbuf),stdin);
#if PLATFORM == WINDOWS
command_str = fgets(commandbuf,sizeof(commandbuf),stdin);
#else
command_str = readline("TC>");
rl_bind_key('\t',rl_complete);
#endif
if (command_str != NULL)
#if PLATFORM == WINDOWS
command_str = fgets(commandbuf,sizeof(commandbuf),stdin);
#else
command_str = readline("TC>");
rl_bind_key('\t',rl_complete);
#endif
if (command_str != NULL)
{
for(int x=0;command_str[x];x++)
if(command_str[x]=='\r'||command_str[x]=='\n')
@@ -413,27 +413,27 @@ void CliRunnable::run()
if(!*command_str)
{
#if PLATFORM == WINDOWS
printf("TC>");
#endif
#if PLATFORM == WINDOWS
printf("TC>");
#endif
continue;
}
std::string command;
if(!consoleToUtf8(command_str,command)) // convert from console encoding to utf8
{
#if PLATFORM == WINDOWS
printf("TC>");
#endif
#if PLATFORM == WINDOWS
printf("TC>");
#endif
continue;
}
fflush(stdout);
fflush(stdout);
sWorld.QueueCliCommand(&utf8print,command.c_str());
#if PLATFORM != WINDOWS
add_history(command.c_str());
#endif
#if PLATFORM != WINDOWS
add_history(command.c_str());
#endif
}
}
else if (feof(stdin))
{
World::StopNow(SHUTDOWN_EXIT_CODE);