diff options
author | kaelima <jeppo_meyer@msn.com> | 2011-06-11 19:05:47 +0200 |
---|---|---|
committer | kaelima <jeppo_meyer@msn.com> | 2011-06-11 19:05:47 +0200 |
commit | a73c7f506ef0d125b5f5e7bad00de5c4e15f3ef2 (patch) | |
tree | 6b26f9c154e3b3dc25f5e81cb2c55436696bd7ba /src | |
parent | 5bbeccd00f2c94d7b1d74235744ef9e168cf989a (diff) |
Core/Misc:
- Changed some error messages for changing spec to be displayed as debug messages.
- Fixed compile warnings.
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 10 | ||||
-rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 194c3f687de..caaf605e2e7 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6622,13 +6622,13 @@ bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type) { if (button >= MAX_ACTION_BUTTONS) { - sLog->outError( "Action %u not added into button %u for player %s: button must be < %u", action, button, GetName(), MAX_ACTION_BUTTONS ); + sLog->outDebug("Action %u not added into button %u for player %s: button must be < %u", action, button, GetName(), MAX_ACTION_BUTTONS); return false; } if (action >= MAX_ACTION_BUTTON_ACTION_VALUE) { - sLog->outError( "Action %u not added into button %u for player %s: action must be < %u", action, button, GetName(), MAX_ACTION_BUTTON_ACTION_VALUE ); + sLog->outDebug("Action %u not added into button %u for player %s: action must be < %u", action, button, GetName(), MAX_ACTION_BUTTON_ACTION_VALUE); return false; } @@ -6637,20 +6637,20 @@ bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type) case ACTION_BUTTON_SPELL: if (!sSpellStore.LookupEntry(action)) { - sLog->outError( "Spell action %u not added into button %u for player %s: spell not exist", action, button, GetName() ); + sLog->outError("Spell action %u not added into button %u for player %s: spell not exist", action, button, GetName()); return false; } if (!HasSpell(action)) { - sLog->outError( "Spell action %u not added into button %u for player %s: player don't known this spell", action, button, GetName() ); + sLog->outDebug("Spell action %u not added into button %u for player %s: player don't known this spell", action, button, GetName()); return false; } break; case ACTION_BUTTON_ITEM: if (!sObjectMgr->GetItemTemplate(action)) { - sLog->outError( "Item action %u not added into button %u for player %s: item not exist", action, button, GetName() ); + sLog->outError("Item action %u not added into button %u for player %s: item not exist", action, button, GetName()); return false; } break; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index c3eedcc8e2f..bfe24f4ea88 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -827,7 +827,7 @@ class npc_hodir_mage : public CreatureScript switch (eventId) { case EVENT_CONJURE_FIRE: - if (summons.size() >= RAID_MODE(2, 4)) + if (summons.size() >= RAID_MODE<uint64>(2, 4)) break; DoCast(me, SPELL_CONJURE_FIRE, true); events.ScheduleEvent(EVENT_CONJURE_FIRE, urand(15000, 20000)); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index b41a825d276..ac23c28ddeb 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -810,7 +810,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader if (!owner) return; - if (aurEff->GetAmount() >= owner->GetHealth()) + if (aurEff->GetAmount() >= int32(owner->GetHealth())) if (XT002AI* xt002AI = CAST_AI(XT002AI, xt002->GetAI())) xt002AI->GravityBombCasualty = true; } @@ -843,7 +843,7 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader if (!caster) return; - if (GetHitDamage() >= GetHitUnit()->GetHealth()) + if (GetHitDamage() >= int32(GetHitUnit()->GetHealth())) if (XT002AI* xt002AI = CAST_AI(XT002AI, GetCaster()->GetAI())) xt002AI->GravityBombCasualty = true; } |