aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpp <none@none>2010-04-11 07:24:25 +0200
committerSpp <none@none>2010-04-11 07:24:25 +0200
commited72b887a054e4565af23cfeaaa4e7e1ac0cd832 (patch)
treec82b113c057866ec593f7b1601cab9cdb62ab5b2
parente9336be8fc4040373ca8d433ff2c2a6c5598f5d6 (diff)
Tab to spaces
--HG-- branch : trunk
-rw-r--r--src/game/BattleGroundSA.cpp2
-rw-r--r--src/game/MovementHandler.cpp8
-rw-r--r--src/game/Player.cpp2
-rw-r--r--src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp42
4 files changed, 27 insertions, 27 deletions
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp
index c3e81c5ddea..7a4386f0f16 100644
--- a/src/game/BattleGroundSA.cpp
+++ b/src/game/BattleGroundSA.cpp
@@ -545,7 +545,7 @@ WorldSafeLocsEntry const* BattleGroundSA::GetClosestGraveYard(Player* player)
if (GraveyardStatus[i] != player->GetTeamId())
continue;
- ret = sWorldSafeLocsStore.LookupEntry(BG_SA_GYEntries[i]);
+ ret = sWorldSafeLocsStore.LookupEntry(BG_SA_GYEntries[i]);
dist = sqrt((ret->x - x)*(ret->x - x) + (ret->y - y)*(ret->y - y)+(ret->z - z)*(ret->z - z));
if (dist < nearest)
{
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index c06d9581d0b..0920e2a3cad 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -601,8 +601,8 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
int8 seatId;
recv_data >> seatId;
- if (vehicle_base->GetGUID() != guid)
- return;
+ if (vehicle_base->GetGUID() != guid)
+ return;
if (!accessory)
GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next
@@ -623,8 +623,8 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
int8 seatId;
recv_data >> seatId;
- if (vehicle_base->GetGUID() == guid)
- GetPlayer()->ChangeSeat(seatId);
+ if (vehicle_base->GetGUID() == guid)
+ GetPlayer()->ChangeSeat(seatId);
}
break;
default:
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 762af7b0a48..1a8be965f8f 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -22056,7 +22056,7 @@ void Player::AddGlobalCooldown(SpellEntry const *spellInfo, Spell const *spell)
if (!(spellInfo->Attributes & (SPELL_ATTR_UNK4|SPELL_ATTR_PASSIVE)))
cdTime *= GetFloatValue(UNIT_MOD_CAST_SPEED);
- else if (IsRangedWeaponSpell(spellInfo) && !spell->IsAutoRepeat())
+ else if (IsRangedWeaponSpell(spellInfo) && !spell->IsAutoRepeat())
cdTime *= m_modAttackSpeedPct[RANGED_ATTACK];
m_globalCooldowns[spellInfo->StartRecoveryCategory] = ((cdTime < 1000 || cdTime > 2000) ? 1000 : cdTime);
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
index 218270c6be4..d54ac8ee39b 100644
--- a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
+++ b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
@@ -117,26 +117,26 @@ enum Events
enum Yells
{
- SAY_JAINA_INTRO_1 = -1632040,
- SAY_JAINA_INTRO_2 = -1632041,
- SAY_JAINA_INTRO_3 = -1632042,
- SAY_JAINA_INTRO_4 = -1632043,
- SAY_JAINA_INTRO_5 = -1632044,
- SAY_JAINA_INTRO_6 = -1632045,
- SAY_JAINA_INTRO_7 = -1632046,
- SAY_JAINA_INTRO_8 = -1632047,
+ SAY_JAINA_INTRO_1 = -1632040,
+ SAY_JAINA_INTRO_2 = -1632041,
+ SAY_JAINA_INTRO_3 = -1632042,
+ SAY_JAINA_INTRO_4 = -1632043,
+ SAY_JAINA_INTRO_5 = -1632044,
+ SAY_JAINA_INTRO_6 = -1632045,
+ SAY_JAINA_INTRO_7 = -1632046,
+ SAY_JAINA_INTRO_8 = -1632047,
SAY_SYLVANAS_INTRO_1 = -1632050,
- SAY_SYLVANAS_INTRO_2 = -1632051,
- SAY_SYLVANAS_INTRO_3 = -1632052,
- SAY_SYLVANAS_INTRO_4 = -1632053,
- SAY_SYLVANAS_INTRO_5 = -1632054,
- SAY_SYLVANAS_INTRO_6 = -1632055,
+ SAY_SYLVANAS_INTRO_2 = -1632051,
+ SAY_SYLVANAS_INTRO_3 = -1632052,
+ SAY_SYLVANAS_INTRO_4 = -1632053,
+ SAY_SYLVANAS_INTRO_5 = -1632054,
+ SAY_SYLVANAS_INTRO_6 = -1632055,
};
enum eSylvanas
{
- GOSSIP_SPEECHINTRO = 13525,
+ GOSSIP_SPEECHINTRO = 13525,
ACTION_INTRO,
};
@@ -183,8 +183,8 @@ struct npc_sylvanas_fosAI: public ScriptedAI
{
if (phase == PHASE_INTRO)
{
- if (!pInstance)
- return;
+ if (!pInstance)
+ return;
events.Update(diff);
switch(events.ExecuteEvent())
@@ -279,8 +279,8 @@ struct npc_jaina_fosAI: public ScriptedAI
{
if (phase == PHASE_INTRO)
{
- if (!pInstance)
- return;
+ if (!pInstance)
+ return;
events.Update(diff);
switch(events.ExecuteEvent())
@@ -354,9 +354,9 @@ bool GossipHello_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature)
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
if (pCreature->GetEntry() == NPC_JAINA_PART1)
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_JAINA_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_JAINA_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
else
- pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SYLVANAS_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SYLVANAS_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID());
return true;
@@ -367,7 +367,7 @@ bool GossipSelect_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature
switch(uiAction)
{
case GOSSIP_ACTION_INFO_DEF+1:
- pPlayer->CLOSE_GOSSIP_MENU();
+ pPlayer->CLOSE_GOSSIP_MENU();
if (pCreature->AI())
pCreature->AI()->DoAction(ACTION_INTRO);