Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc:

Browse Source 
- Changed some error messages for changing spec to be displayed as debug messages.
- Fixed compile warnings.
This commit is contained in:
kaelima
2011-06-11 19:05:47 +02:00
parent 5bbeccd00f
commit a73c7f506e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Entities/Player/Player.cpp
View File

@@ -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;

2
src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
View File

@@ -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));

4
src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
View File

@@ -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;
}