aboutsummaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp2
-rw-r--r--src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp36
-rw-r--r--src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp4
-rw-r--r--src/scripts/kalimdor/azuremyst_isle.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp2
-rw-r--r--src/scripts/northrend/icecrown.cpp2
-rw-r--r--src/scripts/northrend/storm_peaks.cpp4
-rw-r--r--src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp2
-rw-r--r--src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp4
-rw-r--r--src/scripts/world/go_scripts.cpp2
-rw-r--r--src/scripts/world/npcs_special.cpp4
11 files changed, 32 insertions, 32 deletions
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
index f946e17b2d5..ae3062ea459 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
@@ -108,7 +108,7 @@ struct boss_nefarianAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
- if ( DespawnTimer <= diff)
+ if (DespawnTimer <= diff)
{
if (!UpdateVictim())
m_creature->ForcedDespawn();
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index d1a1888b224..a49ade8758f 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -869,31 +869,31 @@ struct npc_scarlet_minerAI : public npc_escortAI
{
AddWaypoint(1, 2389.03, -5902.74, 109.014, 5000);
AddWaypoint(2, 2341.812012, -5900.484863, 102.619743);
- AddWaypoint(3, 2306.561279, -5901.738281, 91.792419 );
- AddWaypoint(4, 2300.098389, -5912.618652, 86.014885 );
- AddWaypoint(5, 2294.142090, -5927.274414, 75.316849 );
- AddWaypoint(6, 2286.984375, -5944.955566, 63.714966 );
- AddWaypoint(7, 2280.001709, -5961.186035, 54.228283 );
- AddWaypoint(8, 2259.389648, -5974.197754, 42.359348 );
- AddWaypoint(9, 2242.882812, -5984.642578, 32.827850 );
- AddWaypoint(10, 2217.265625, -6028.959473, 7.675705 );
- AddWaypoint(11, 2202.595947, -6061.325684, 5.882018 );
- AddWaypoint(12, 2188.974609, -6080.866699, 3.370027 );
+ AddWaypoint(3, 2306.561279, -5901.738281, 91.792419);
+ AddWaypoint(4, 2300.098389, -5912.618652, 86.014885);
+ AddWaypoint(5, 2294.142090, -5927.274414, 75.316849);
+ AddWaypoint(6, 2286.984375, -5944.955566, 63.714966);
+ AddWaypoint(7, 2280.001709, -5961.186035, 54.228283);
+ AddWaypoint(8, 2259.389648, -5974.197754, 42.359348);
+ AddWaypoint(9, 2242.882812, -5984.642578, 32.827850);
+ AddWaypoint(10, 2217.265625, -6028.959473, 7.675705);
+ AddWaypoint(11, 2202.595947, -6061.325684, 5.882018);
+ AddWaypoint(12, 2188.974609, -6080.866699, 3.370027);
if (urand(0,1))
{
- AddWaypoint(13, 2176.483887, -6110.407227, 1.855181 );
- AddWaypoint(14, 2172.516602, -6146.752441, 1.074235 );
- AddWaypoint(15, 2138.918457, -6158.920898, 1.342926 );
- AddWaypoint(16, 2129.866699, -6174.107910, 4.380779 );
+ AddWaypoint(13, 2176.483887, -6110.407227, 1.855181);
+ AddWaypoint(14, 2172.516602, -6146.752441, 1.074235);
+ AddWaypoint(15, 2138.918457, -6158.920898, 1.342926);
+ AddWaypoint(16, 2129.866699, -6174.107910, 4.380779);
AddWaypoint(17, 2117.709473, -6193.830078, 13.3542, 10000);
}
else
{
- AddWaypoint(13, 2184.190186, -6166.447266, 0.968877 );
- AddWaypoint(14, 2234.265625, -6163.741211, 0.916021 );
- AddWaypoint(15, 2268.071777, -6158.750977, 1.822252 );
- AddWaypoint(16, 2270.028320, -6176.505859, 6.340538 );
+ AddWaypoint(13, 2184.190186, -6166.447266, 0.968877);
+ AddWaypoint(14, 2234.265625, -6163.741211, 0.916021);
+ AddWaypoint(15, 2268.071777, -6158.750977, 1.822252);
+ AddWaypoint(16, 2270.028320, -6176.505859, 6.340538);
AddWaypoint(17, 2271.739014, -6195.401855, 13.3542, 10000);
}
}
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
index 9965c273cc1..51e20cc3c78 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
@@ -1609,10 +1609,10 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
bool GossipHello_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreature)
{
if (pCreature->isQuestGiver())
- pPlayer->PrepareQuestMenu( pCreature->GetGUID() );
+ pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pPlayer->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE)
- pPlayer->ADD_GOSSIP_ITEM( 0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
diff --git a/src/scripts/kalimdor/azuremyst_isle.cpp b/src/scripts/kalimdor/azuremyst_isle.cpp
index e773ecfaef1..2cbf41ba4b1 100644
--- a/src/scripts/kalimdor/azuremyst_isle.cpp
+++ b/src/scripts/kalimdor/azuremyst_isle.cpp
@@ -491,7 +491,7 @@ struct npc_geezleAI : public ScriptedAI
for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE
- &&(*itr)->HasAura(SPELL_TREE_DISGUISE) )
+ &&(*itr)->HasAura(SPELL_TREE_DISGUISE))
{
(*itr)->KilledMonsterCredit(MOB_SPARK,0);
}
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
index 9a784c781d2..0401fab5cd9 100644
--- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
+++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
@@ -1155,7 +1155,7 @@ bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature)
}
-bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender, uint32 action )
+bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender, uint32 action)
{
npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI());
diff --git a/src/scripts/northrend/icecrown.cpp b/src/scripts/northrend/icecrown.cpp
index 362075ee1ee..eb72b7f5cbf 100644
--- a/src/scripts/northrend/icecrown.cpp
+++ b/src/scripts/northrend/icecrown.cpp
@@ -150,7 +150,7 @@ enum eSquireDavid
bool GossipHello_npc_squire_david(Player* pPlayer, Creature* pCreature)
{
if (pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_H) == QUEST_STATUS_INCOMPLETE ||
- pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE )//We need more info about it.
+ pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE)//We need more info about it.
{
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/scripts/northrend/storm_peaks.cpp
index 6d5440dba25..b439a76d5a8 100644
--- a/src/scripts/northrend/storm_peaks.cpp
+++ b/src/scripts/northrend/storm_peaks.cpp
@@ -54,7 +54,7 @@ bool GossipHello_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature)
return true;
}
-bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction )
+bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
@@ -273,7 +273,7 @@ bool GossipHello_npc_victorious_challenger(Player* pPlayer, Creature* pCreature)
return false;
}
-bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction )
+bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
diff --git a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
index 101ddf7a7a5..18dcbe1b1da 100644
--- a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -410,7 +410,7 @@ struct mob_rune_of_summoningAI : public ScriptedAI
void SummonLightningElemental()
{
- m_creature->SummonCreature(CREATURE_RUNE_OF_SUMMONING, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN );
+ m_creature->SummonCreature(CREATURE_RUNE_OF_SUMMONING, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN);
m_creature->DealDamage(m_creature, m_creature->GetHealth());
}
};
diff --git a/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp b/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
index 469271bd5f7..5d6c66a197a 100644
--- a/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
+++ b/src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
@@ -21,7 +21,7 @@ The teleporter appears to be active and stable.
#define WALKWAY 205
#define CONSERVATORY 206
-bool GoHello_ulduar_teleporter( Player *pPlayer, GameObject *pGO )
+bool GoHello_ulduar_teleporter(Player *pPlayer, GameObject *pGO)
{
ScriptedInstance *pInstance = pGO->GetInstanceData();
if (!pInstance) return true;
@@ -48,7 +48,7 @@ bool GoHello_ulduar_teleporter( Player *pPlayer, GameObject *pGO )
return true;
}
-bool GOSelect_ulduar_teleporter( Player *pPlayer, GameObject *pGO, uint32 sender, uint32 action )
+bool GOSelect_ulduar_teleporter(Player *pPlayer, GameObject *pGO, uint32 sender, uint32 action)
{
if (sender != GOSSIP_SENDER_MAIN) return true;
if (!pPlayer->getAttackers().empty()) return true;
diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp
index 1ea5d5b9498..d068f538fa2 100644
--- a/src/scripts/world/go_scripts.cpp
+++ b/src/scripts/world/go_scripts.cpp
@@ -429,7 +429,7 @@ enum eFelCrystalforge
bool GOHello_go_fel_crystalforge(Player *pPlayer, GameObject *pGO)
{
- if ( pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER ) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
+ if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp
index 7e3325c7842..1737a86ba3c 100644
--- a/src/scripts/world/npcs_special.cpp
+++ b/src/scripts/world/npcs_special.cpp
@@ -1254,7 +1254,7 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32
{
if (pPlayer->GetMoney() < 10000000)
{
- pPlayer->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
+ pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
pPlayer->PlayerTalkClass->CloseGossip();
break;
}
@@ -1822,7 +1822,7 @@ struct npc_ebon_gargoyleAI : CasterAI
// Fly away when dismissed
void SpellHit(Unit *source, const SpellEntry *spell)
{
- if (spell->Id != 50515 || !me->isAlive() )
+ if (spell->Id != 50515 || !me->isAlive())
return;
Unit *owner = me->GetOwner();