From b6c288ca9fb271923f493ee39d78b5dc4b2a996f Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 12 Dec 2008 11:21:28 -0600 Subject: *Update to Mangos 6902. Source: Mangos. *Skipped rev: rev 6893, some code about waypoint movement. --HG-- branch : trunk --- src/shared/Database/DBCStores.cpp | 6 +++--- src/shared/Database/DBCStores.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/shared/Database') diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index 03536daf738..fb132c75768 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -130,7 +130,7 @@ DBCStorage sWorldSafeLocsStore(WorldSafeLocsEntryfmt); typedef std::list StoreProblemList; -static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, std::string filename) +static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, const std::string& filename) { sLog.outError("ERROR: Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).",filename.c_str(),fsize,rsize); @@ -139,7 +139,7 @@ static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, std::string filename } template -inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList& errlist, DBCStorage& storage, std::string dbc_path, std::string filename) +inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList& errlist, DBCStorage& storage, const std::string& dbc_path, const std::string& filename) { // compatibility format and C++ structure sizes assert(DBCFile::GetFormatRecordSize(storage.GetFormat()) == sizeof(T) || LoadDBC_assert_print(DBCFile::GetFormatRecordSize(storage.GetFormat()),sizeof(T),filename)); @@ -174,7 +174,7 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList } } -void LoadDBCStores(std::string dataPath) +void LoadDBCStores(const std::string& dataPath) { std::string dbcPath = dataPath+"dbc/"; diff --git a/src/shared/Database/DBCStores.h b/src/shared/Database/DBCStores.h index 399b94213fe..98a54fbeccf 100644 --- a/src/shared/Database/DBCStores.h +++ b/src/shared/Database/DBCStores.h @@ -197,7 +197,7 @@ extern DBCStorage sTotemCategoryStore; //extern DBCStorage sWorldMapAreaStore; -- use Zone2MapCoordinates and Map2ZoneCoordinates extern DBCStorage sWorldSafeLocsStore; -void LoadDBCStores(std::string dataPath); +void LoadDBCStores(const std::string& dataPath); // script support functions TRINITY_DLL_SPEC DBCStorage const* GetSoundEntriesStore(); -- cgit v1.2.3