diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-01-19 18:36:39 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-01-19 18:36:39 +0100 |
| commit | a5e7936a0fbaa0b5f0d76eb242b2f6d3fb670bb8 (patch) | |
| tree | 9f5adb648581da0f8561943aeb9b3a0d35461e3b /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 504ca4105adf0c35dd96576c25487b34cbca9891 (diff) | |
| parent | 0333c4ce8fb30133e14eae4d3fc9d5563d28ff6b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1916dd17c89..45859290d1f 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2834,10 +2834,9 @@ void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint3 if (count < -1) sLog->outError(LOG_FILTER_SQL, "Invalid count %i specified on item %u be removed from original player create info (use -1)!", count, itemId); - uint32 RaceClass = (race_) | (class_ << 8); for (uint32 gender = 0; gender < GENDER_NONE; ++gender) { - if (CharStartOutfitEntry const* entry = sCharStartOutfitStore.LookupEntry(RaceClass | (gender << 16))) + if (CharStartOutfitEntry const* entry = GetCharStartOutfitEntry(race_, class_, gender)) { bool found = false; for (uint8 x = 0; x < MAX_OUTFIT_ITEMS; ++x) |