aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-04-19 18:48:20 +0200
committerMachiavelli <none@none>2009-04-19 18:48:20 +0200
commit99fc17d44fec12f31c55efd6b3f60c011baeb88a (patch)
treea628622efa91e5e73a64fa1999b9031e186d2afc /src
parent60736b1f7da05e5eee5100edc3e80fbb9e228495 (diff)
* Tabs to spaces cleanup
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/ScriptMgr.cpp4
-rw-r--r--src/bindings/scripts/scripts/go/go_scripts.cpp2
-rw-r--r--src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h2
-rw-r--r--src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp14
-rw-r--r--src/game/BattleGround.cpp34
-rw-r--r--src/game/BattleGround.h4
-rw-r--r--src/game/BattleGroundAB.cpp2
-rw-r--r--src/game/Chat.cpp13
-rw-r--r--src/game/Creature.cpp2
-rw-r--r--src/game/Map.h2
-rw-r--r--src/game/ObjectMgr.cpp20
-rw-r--r--src/game/Player.cpp2
-rw-r--r--src/game/Player.h2
-rw-r--r--src/game/SpellEffects.cpp2
-rw-r--r--src/game/SpellMgr.cpp2
15 files changed, 52 insertions, 55 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 1e8066a5581..ba87254df99 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -2085,7 +2085,7 @@ TRINITY_DLL_EXPORT
bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action )
{
if(!_GO)
- return false;
+ return false;
debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
@@ -2099,7 +2099,7 @@ TRINITY_DLL_EXPORT
bool GOSelectWithCode( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode )
{
if(!_GO)
- return false;
+ return false;
debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp
index 9aacd2487e9..cc64074b6bc 100644
--- a/src/bindings/scripts/scripts/go/go_scripts.cpp
+++ b/src/bindings/scripts/scripts/go/go_scripts.cpp
@@ -165,7 +165,7 @@ bool GOHello_go_teleporter(Player *player, GameObject* _GO)
bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO)
{
if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
- player->CastSpell(player,33382,true);
+ player->CastSpell(player,33382,true);
return true;
}
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
index 01c0e1334ac..b60f8eee565 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
@@ -13,7 +13,7 @@
#define TYPE_THRALL_PART4 6
#define DATA_THRALL 7
#define DATA_TARETHA 8
-#define DATA_EPOCH 9
+#define DATA_EPOCH 9
#define WORLD_STATE_OH 2436
#endif
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index 9ec75c06e0c..f18e29edf6d 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -28,7 +28,7 @@ EndScriptData */
#define THRALL_ENTRY 17876
#define TARETHA_ENTRY 18887
-#define EPOCH_ENTRY 18096
+#define EPOCH_ENTRY 18096
#define DRAKE_ENTRY 17848
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
mThrallEventCount = 0;
ThrallGUID = 0;
TarethaGUID = 0;
- EpochGUID = 0;
+ EpochGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounter[i] = NOT_STARTED;
@@ -106,9 +106,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
case TARETHA_ENTRY:
TarethaGUID = creature->GetGUID();
break;
- case EPOCH_ENTRY:
- EpochGUID = creature->GetGUID();
- break;
+ case EPOCH_ENTRY:
+ EpochGUID = creature->GetGUID();
+ break;
}
}
@@ -222,8 +222,8 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
return ThrallGUID;
case DATA_TARETHA:
return TarethaGUID;
- case DATA_EPOCH:
- return EpochGUID;
+ case DATA_EPOCH:
+ return EpochGUID;
}
return 0;
}
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 2538bd3434e..c0ec88b78fb 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -524,10 +524,10 @@ void BattleGround::EndBattleGround(uint32 winner)
if(!isArena()){
- if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
- almost_winning_team = 0; //no real winner
- if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
- almost_winning_team = ALLIANCE;
+ if(m_score[GetTeamIndexByTeamId(ALLIANCE)] == m_score[GetTeamIndexByTeamId(HORDE)])
+ almost_winning_team = 0; //no real winner
+ if(m_score[GetTeamIndexByTeamId(ALLIANCE)] > m_score[GetTeamIndexByTeamId(HORDE)])
+ almost_winning_team = ALLIANCE;
}
@@ -572,19 +572,19 @@ void BattleGround::EndBattleGround(uint32 winner)
}
else if(winner !=0)
{
- RewardMark(plr,ITEM_LOSER_COUNT);
+ RewardMark(plr,ITEM_LOSER_COUNT);
}
- else if(winner == 0)
- {
- if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
- { //nested ifs for the win! its boring writing that, forgive me my unfunniness
-
- if(almost_winning_team == team) //player's team had more points
- RewardMark(plr,ITEM_WINNER_COUNT);
- else
- RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
- }
- }
+ else if(winner == 0)
+ {
+ if(sWorld.getConfig(CONFIG_PREMATURE_BG_REWARD)) // We're feeling generous, giving rewards to people who not earned them ;)
+ { //nested ifs for the win! its boring writing that, forgive me my unfunniness
+
+ if(almost_winning_team == team) //player's team had more points
+ RewardMark(plr,ITEM_WINNER_COUNT);
+ else
+ RewardMark(plr,ITEM_LOSER_COUNT); // if scores were the same, each team gets 1 mark.
+ }
+ }
plr->CombatStopWithPets(true);
@@ -610,7 +610,7 @@ void BattleGround::EndBattleGround(uint32 winner)
// this way all arena team members will get notified, not only the ones who participated in this match
winner_arena_team->NotifyStatsChanged();
loser_arena_team->NotifyStatsChanged();
- sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
+ sLog.outDebug("Rated arena match between %s and %s finished, winner: %s", loser_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str(),winner_arena_team->GetName().c_str());
}
// inform invited players about the removal
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index c9592cebe63..e03e36cbd1e 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -489,7 +489,7 @@ class BattleGround
uint8 m_Events;
bool m_BuffChange;
- uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
+ uint32 m_score[2]; //array that keeps general team scores, used to determine who gets most marks when bg ends prematurely
BGHonorMode m_HonorMode;
private:
@@ -514,7 +514,7 @@ class BattleGround
bool m_PrematureCountDown;
uint32 m_PrematureCountDownTimer;
char const *m_Name;
-
+
/* Player lists */
std::vector<uint64> m_ResurrectQueue; // Player GUID
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index 1cd5cfad420..bbaef37152f 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -195,7 +195,7 @@ void BattleGroundAB::Update(time_t diff)
{
m_lastTick[team] -= BG_AB_TickIntervals[points];
m_TeamScores[team] += BG_AB_TickPoints[points];
- m_score[team] = m_TeamScores[team];
+ m_score[team] = m_TeamScores[team];
m_HonorScoreTics[team] += BG_AB_TickPoints[points];
m_ReputationScoreTics[team] += BG_AB_TickPoints[points];
if( m_ReputationScoreTics[team] >= BG_AB_ReputationScoreTicks[m_HonorMode] )
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 06e3b285d5a..15206f10c29 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -871,9 +871,6 @@ int ChatHandler::ParseCommands(const char* text)
std::string fullcmd = text;
- //if(m_session->GetSecurity() == 0)
- // return 0;
-
/// chat case (.command or !command format)
if(m_session)
{
@@ -895,11 +892,11 @@ int ChatHandler::ParseCommands(const char* text)
++text;
if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
- {
- if(m_session && m_session->GetSecurity() == SEC_PLAYER)
- return 0;
- SendSysMessage(LANG_NO_CMD);
- }
+ {
+ if(m_session && m_session->GetSecurity() == SEC_PLAYER)
+ return 0;
+ SendSysMessage(LANG_NO_CMD);
+ }
return 1;
}
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f86df8485df..e7572bf5e78 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -205,7 +205,7 @@ void Creature::SearchFormation()
uint32 lowguid = GetDBTableGUIDLow();
if(!lowguid)
- return;
+ return;
CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
if(frmdata != CreatureGroupMap.end())
diff --git a/src/game/Map.h b/src/game/Map.h
index f72b0c15ec3..f117a1c1cec 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -277,7 +277,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
- CreatureGroupHolderType CreatureGroupHolder;
+ CreatureGroupHolderType CreatureGroupHolder;
private:
void LoadVMap(int pX, int pY);
void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 31697f31df0..752d34b2284 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -4922,9 +4922,9 @@ void ObjectMgr::LoadAccessRequirements()
uint32 count = 0;
- // 0 1 2 3 4 5 6 7 8 9 10
+ // 0 1 2 3 4 5 6 7 8 9 10
QueryResult *result = WorldDatabase.Query("SELECT id, level_min, level_max, item, item2, heroic_key, heroic_key2, quest_done, quest_failed_text, heroic_quest_done, heroic_quest_failed_text FROM access_requirement");
- if( !result )
+ if( !result )
{
barGoLink bar( 1 );
@@ -5001,14 +5001,14 @@ void ObjectMgr::LoadAccessRequirements()
}
}
- if(ar.heroicQuest)
- {
- if(!mQuestTemplates[ar.heroicQuest])
- {
- sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
- ar.heroicQuest = 0;
- }
- }
+ if(ar.heroicQuest)
+ {
+ if(!mQuestTemplates[ar.heroicQuest])
+ {
+ sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
+ ar.heroicQuest = 0;
+ }
+ }
if(ar.quest)
{
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d927b162d31..7837a0186eb 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17817,7 +17817,7 @@ template<class T>
void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
{
if(!target)
- return;
+ return;
if(HaveAtClient(target))
{
if(!target->isVisibleForInState(this,true))
diff --git a/src/game/Player.h b/src/game/Player.h
index 9ba6c94ae24..7d530a57228 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -840,7 +840,7 @@ struct AccessRequirement
uint32 heroicKey2;
uint32 quest;
std::string questFailedText;
- uint32 heroicQuest;
+ uint32 heroicQuest;
std::string heroicQuestFailedText;
};
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 2ee6c7032b3..0022144e5b1 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4171,7 +4171,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
{
if(itr->second->GetSpellProto()->Dispel == DISPEL_POISON)
{
- totalDamagePercentMod *= 1.5f; // 150% if poisoned
+ totalDamagePercentMod *= 1.5f; // 150% if poisoned
break;
}
}
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 30112caa75a..95ddab074b1 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2209,7 +2209,7 @@ void SpellMgr::LoadSpellCustomAttr()
case 45027: // Revitalize
case 45976: // Muru Portal Channel
case 39365: // Thundering Storm
- case 41071: // Raise Dead
+ case 41071: // Raise Dead
spellInfo->MaxAffectedTargets = 1;
break;
case 41376: // Spite