diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:22:14 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 02:22:14 +0200 |
| commit | 560048cf338e539c68d8e33f7268dfe64a9b6f43 (patch) | |
| tree | 2f27c7dc82c38388044d8f842895d097ecaf4f24 /src/server/game | |
| parent | 547115476f363096483197863e8bbc24064a99ef (diff) | |
Core: meh, fix build and warnings
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
2 files changed, 4 insertions, 2 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; } |