aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp26
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp36
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h8
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp16
-rw-r--r--src/game/Debugcmds.cpp2
-rw-r--r--src/game/MapManager.cpp6
-rw-r--r--src/game/Player.cpp6
-rw-r--r--src/shared/Log.cpp6
-rw-r--r--src/shared/Log.h10
-rw-r--r--src/trinitycore/CliRunnable.cpp52
10 files changed, 84 insertions, 84 deletions
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
index 34a4e25d73c..fc90ff5b4f0 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
@@ -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)
{
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
index ba999ca766c..94290a05007 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
@@ -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);
}
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h b/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
index 0ebadb214d8..95c44035184 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
@@ -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
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
index 4b5c8f371af..45d0a4be7ae 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
@@ -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)
diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp
index 69b3bcb1284..b7c88b1ad04 100644
--- a/src/game/Debugcmds.cpp
+++ b/src/game/Debugcmds.cpp
@@ -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;
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 297bc1a3874..74bfb5764ac 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -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();
*/
}
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2bd8ab771ed..1bc545e628e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -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);
}
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 117eabffb4a..8de6e635dec 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -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()
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 40f09e4b29e..283b8819a10 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -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;
diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp
index d950adc22f8..fb7276548ce 100644
--- a/src/trinitycore/CliRunnable.cpp
+++ b/src/trinitycore/CliRunnable.cpp
@@ -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);