diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 34ed979291b..739a373dbf0 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -227,6 +227,8 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case TYPEID_GAMEOBJECT: condMeets &= object->ToGameObject()->GetDBTableGUIDLow() == ConditionValue3; break; + default: + break; } } } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 12050c482f7..6e2706e7607 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -11845,7 +11845,7 @@ InventoryResult Player::CanUseItem(ItemTemplate const* proto) const if (proto->RequiredSkill != 0) { if (GetSkillValue(proto->RequiredSkill) == 0) - return EQUIP_ERR_NO_REQUIRED_PROFICIENCY; + return EQUIP_ERR_PROFICIENCY_NEEDED; else if (GetSkillValue(proto->RequiredSkill) < proto->RequiredSkillRank) return EQUIP_ERR_CANT_EQUIP_SKILL; } @@ -11863,7 +11863,7 @@ InventoryResult Player::CanUseItem(ItemTemplate const* proto) const // learning (recipes, mounts, pets, etc.) if (proto->Spells[0].SpellId == 483 || proto->Spells[0].SpellId == 55884) if (HasSpell(proto->Spells[1].SpellId)) - return EQUIP_ERR_NONE; + return EQUIP_ERR_INTERNAL_BAG_ERROR; return EQUIP_ERR_OK; } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 100d14b756b..d76de6eeb42 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -574,12 +574,12 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader case SPELL_RIGHT_SIDE_SMACK_R: case SPELL_RIGHT_SIDE_SMACK_L: spellId = SPELL_KNOCKBACK_RIGHT; - angle -= M_PI * 0.5f; + angle -= float(M_PI) * 0.5f; break; case SPELL_LEFT_SIDE_SMACK_R: case SPELL_LEFT_SIDE_SMACK_L: spellId = SPELL_KNOCKBACK_LEFT; - angle += M_PI * 0.5f; + angle += float(M_PI) * 0.5f; break; case SPELL_HEAD_BONK_R: case SPELL_HEAD_BONK_L: @@ -588,7 +588,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader case SPELL_TICKLE_R: case SPELL_TICKLE_L: spellId = SPELL_KNOCKBACK_BACK; - angle -= M_PI; + angle -= float(M_PI); break; } |