diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-11-26 19:28:53 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-01-15 19:57:34 +0100 |
| commit | 43d5d118b280b8a7daee3eec9c67d1018d059a3d (patch) | |
| tree | 62f67d5522e2107b7fa26d0eac1cd3de592830f1 /src | |
| parent | bac8c4376f323c74e9be3e0361b5e34554cf3b32 (diff) | |
Core/Misc: fix warning and misc codestyle fixes
(cherry picked from commit 3b90b0368a019d47911062da6257555e88d17fda)
Diffstat (limited to 'src')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 367388f2146..95792fead3c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -248,7 +248,7 @@ class SmartScript void DecPhase(int32 p = 1) { - if(mEventPhase > (uint32)p) + if (mEventPhase > (uint32)p) mEventPhase -= (uint32)p; else mEventPhase = 0; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 54d2a558b57..7b034d0167f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13985,7 +13985,7 @@ void Unit::SetFeared(bool apply) } if (Player* player = ToPlayer()) - if(!player->HasUnitState(UNIT_STATE_POSSESSED)) + if (!player->HasUnitState(UNIT_STATE_POSSESSED)) player->SetClientControl(this, !apply); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 83925fc6036..b820aa3266a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -155,7 +155,7 @@ public: void KilledUnit(Unit* victim) override { - if(victim->GetTypeId() == TYPEID_PLAYER) + if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 4f031756ac1..390695d6605 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -186,7 +186,7 @@ public: void Reset() override { - if(events.IsInPhase(PHASE_TRANSITION) || (events.IsInPhase(PHASE_THADDIUS) && me->IsAlive())) + if (events.IsInPhase(PHASE_TRANSITION) || (events.IsInPhase(PHASE_THADDIUS) && me->IsAlive())) BeginResetEncounter(); } @@ -640,7 +640,7 @@ public: void UpdateAI(uint32 uiDiff) override { - if(!isFeignDeath) + if (!isFeignDeath) if (!UpdateVictim()) return; @@ -657,7 +657,7 @@ public: else powerSurgeTimer -= uiDiff; - if(!isFeignDeath) + if (!isFeignDeath) DoMeleeAttackIfReady(); } @@ -825,7 +825,7 @@ public: void KilledUnit(Unit* victim) override { - if(victim->GetTypeId() == TYPEID_PLAYER) + if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_FEUGEN_SLAY); } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 71a167a0806..5ef66a2e57d 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -188,7 +188,7 @@ class instance_naxxramas : public InstanceMapScript AddMinion(creature, false); } - void ProcessEvent(WorldObject* source, uint32 eventId) override + void ProcessEvent(WorldObject* /*source*/, uint32 eventId) override { switch (eventId) { |