diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-05 11:32:34 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2015-04-05 13:57:45 +0200 |
| commit | 96b7b7ced51efd6e4044f816e63fcc1d97ac3b09 (patch) | |
| tree | 28be5e399e87754926ef2931c9efdc7bcf88a642 | |
| parent | 16481d17aacfd9e866615212df11ddcdcf1fc2e4 (diff) | |
Build fix for GCC 4.7
(cherry picked from commit e7deae947c94eab04370b5bdaab059ac425d697d)
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 3060c690cfc..6586c5035ec 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -312,7 +312,7 @@ void LoadDBCStores(const std::string& dataPath) for (uint32 i = 0; i < sCharSectionsStore.GetNumRows(); ++i) if (CharSectionsEntry const* entry = sCharSectionsStore.LookupEntry(i)) if (entry->Race && ((1 << (entry->Race - 1)) & RACEMASK_ALL_PLAYABLE) != 0) //ignore Nonplayable races - sCharSectionMap.emplace(uint8(entry->GenType) | (uint8(entry->Gender) << 8) | (uint8(entry->Race) << 16), entry); + sCharSectionMap.insert({ entry->GenType | (entry->Gender << 8) | (entry->Race << 16), entry }); LoadDBC(availableDbcLocales, bad_dbc_files, sCharTitlesStore, dbcPath, "CharTitles.dbc"); LoadDBC(availableDbcLocales, bad_dbc_files, sChatChannelsStore, dbcPath, "ChatChannels.dbc"); |