diff options
| author | Vincent-Michael <Vincent_Michael_Michael@gmx.de> | 2014-04-18 17:02:04 +0200 | 
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael_Michael@gmx.de> | 2014-04-18 17:02:04 +0200 | 
| commit | 89cc056a506e6df2e9819860ae55bfba1699dd49 (patch) | |
| tree | 46299041c07fe18c64bc513ed763032bbeb7d8e2 | |
| parent | 20c9981578fc927da8b4c6c09c4431b7d0e1e538 (diff) | |
Fix
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/NPCHandler.h | 2 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp | 6 | 
8 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2691a6870f2..13635424cf0 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25058,7 +25058,7 @@ void Player::HandleFall(MovementInfo const& movementInfo)          if (damageperc > 0)          {              uint32 damage = (uint32)(damageperc * GetMaxHealth()*sWorld->getRate(RATE_DAMAGE_FALL)); -             +              if (GetCommandStatus(CHEAT_GOD))                  damage = 0; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3cdfff7dc4b..e4dbe60535d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5236,7 +5236,7 @@ void ObjectMgr::LoadGossipText()              gText.Options[i].Text_0           = fields[cic++].GetString();              gText.Options[i].Text_1           = fields[cic++].GetString(); -			gText.Options[i].BroadcastTextID  = fields[cic++].GetUInt32(); // Need for correct loading order +            gText.Options[i].BroadcastTextID  = fields[cic++].GetUInt32(); // Need for correct loading order              gText.Options[i].Language         = fields[cic++].GetUInt8();              gText.Options[i].Probability      = fields[cic++].GetFloat(); diff --git a/src/server/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h index 7cf80bf0b9b..7210d9a53b5 100644 --- a/src/server/game/Handlers/NPCHandler.h +++ b/src/server/game/Handlers/NPCHandler.h @@ -31,7 +31,7 @@ struct GossipTextOption  {      std::string Text_0;      std::string Text_1; -	uint32 BroadcastTextID; +    uint32 BroadcastTextID;      uint32 Language;      float Probability;      QEmote Emotes[MAX_GOSSIP_TEXT_EMOTES]; diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 726ac025d3c..8ed8a2b3c49 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -388,7 +388,7 @@ class ItemScript : public ScriptObject          // Called when the item expires (is destroyed).          virtual bool OnExpire(Player* /*player*/, ItemTemplate const* /*proto*/) { return false; } -		 +          // Called when the item is destroyed.          virtual bool OnRemove(Player* /*player*/, Item* /*item*/) { return false; }  }; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 93bd409652a..0342b22d735 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -784,8 +784,8 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr      bool hasFamilyMask = false; -    /**  -     +    /** +      * @brief Check auras procced by periodics      *Only damaging Dots can proc auras with PROC_FLAG_TAKEN_DAMAGE @@ -799,12 +799,12 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr      *Only Dots can proc auras with PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_NEG or PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_NEG      *Only Hots can proc auras with PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_POS or PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_POS -     +      * @param procSpell the spell proccing the aura      * @param procFlags proc_flags of spellProc      * @param procExtra proc_EX of procSpell      * @param EventProcFlag proc_flags of aura to be procced -     +      */ diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 76d59bd1e85..5f11870b3e9 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -691,7 +691,7 @@ class SpellMgr          // SpellInfo object management          SpellInfo const* GetSpellInfo(uint32 spellId) const { return spellId < GetSpellInfoStoreSize() ?  mSpellInfoMap[spellId] : NULL; }          // Use this only with 100% valid spellIds -        SpellInfo const* EnsureSpellInfo(uint32 spellId) const  +        SpellInfo const* EnsureSpellInfo(uint32 spellId) const          {              ASSERT(spellId < GetSpellInfoStoreSize());              SpellInfo const* spellInfo = mSpellInfoMap[spellId]; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 31c565e5be2..3541ad0f1a3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -286,8 +286,8 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript          struct npc_prince_taldaram_flame_sphereAI : public ScriptedAI          { -            npc_prince_taldaram_flame_sphereAI(Creature* creature) : ScriptedAI(creature)  -            {  +            npc_prince_taldaram_flame_sphereAI(Creature* creature) : ScriptedAI(creature) +            {                  _flameSphereTargetGUID = 0;              } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 1281d40fe5c..916f60bd78a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -438,7 +438,7 @@ class npc_watcher_gashra : public CreatureScript                  _events.ScheduleEvent(EVENT_WEB_WRAP_GASHRA, 11000);                  _events.ScheduleEvent(EVENT_INFECTED_BITE_GASHRA, 4000);              } -             +              void JustDied(Unit* /*killer*/) OVERRIDE              {                  Creature* krikthir = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_KRIKTHIR_THE_GATEWATCHER)); @@ -511,7 +511,7 @@ class npc_watcher_narjil : public CreatureScript                  _events.ScheduleEvent(EVENT_INFECTED_BITE_NARJIL, 4000);                  _events.ScheduleEvent(EVENT_BINDING_WEBS, 17000);              } -             +              void JustDied(Unit* /*killer*/) OVERRIDE              {                  Creature* krikthir = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_KRIKTHIR_THE_GATEWATCHER)); @@ -600,7 +600,7 @@ class npc_watcher_silthik : public CreatureScript              {                  if (!UpdateVictim())                      return; -                     +                  _events.Update(diff);                  if (me->HasUnitState(UNIT_STATE_CASTING))  | 
