diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2014-12-29 01:32:55 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2014-12-29 01:32:55 +0100 |
| commit | e8f97ec80a0ca0a1cf55aa5e2a2fd9a43ec19766 (patch) | |
| tree | e148896e0d846bcc49f13fffa5e4db75fd87192b /src/server/game/DataStores | |
| parent | 9ecc578cb187cc1ae0fd454883dab0cd058d3807 (diff) | |
Core: fixed typos from previous commit and kill more warnings
Diffstat (limited to 'src/server/game/DataStores')
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index f27e48f71ff..708bb0cccd1 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -66,7 +66,7 @@ inline void LoadDB2(uint32& availableDb2Locales, DB2StoreProblemList& errlist, D { // compatibility format and C++ structure sizes ASSERT(DB2FileLoader::GetFormatRecordSize(storage.GetFormat()) == sizeof(T), - "Size of '%s' set by format string (" SZFMTD ") not equal size of C++ structure (%u).", + "Size of '%s' set by format string (%u) not equal size of C++ structure (" SZFMTD ").", filename.c_str(), DB2FileLoader::GetFormatRecordSize(storage.GetFormat()), sizeof(T)); ++DB2FilesCount; diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 31d9cfa7e4e..ee2a604a49a 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -504,7 +504,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sNameGenStore, dbcPath, "NameGen.dbc"); // 19116 for (uint32 i = 0; i < sNameGenStore.GetNumRows(); ++i) if (NameGenEntry const* entry = sNameGenStore.LookupEntry(i)) - sGenerateNamesMap[entry->Race].Contents[entry->Sex].push_back(std::string(entry->Name)); + sGenerateNamesMap[entry->Race].Contents[entry->Sex].emplace_back(entry->Name); sNameGenStore.Clear(); LoadDBC(availableDbcLocales, bad_dbc_files, sMovieStore, dbcPath, "Movie.dbc");//19116 @@ -1150,7 +1150,7 @@ std::list<uint32> GetSpellsForLevels(uint32 classId, uint32 raceMask, uint32 spe if (specIter != sSpecializationSpellsBySpecStore.end()) { SpecializationSpellsBySpecEntry learnSpellList = specIter->second; - for (int i = 0; i < learnSpellList.size(); i++) + for (size_t i = 0; i < learnSpellList.size(); ++i) { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(learnSpellList[i]->SpellID); if (!spellInfo) |