mirror of
https://github.com/mangosfour/server.git
synced 2025-12-29 07:37:05 +00:00
[11590] Cleanups for barGoLink
* Rename barGoLink -> BarGoLink as expected by mangos code style * Add uint32/uint6 constructor versions for BarGoLink, and remove lot casts required before for BarGoLink use
This commit is contained in:
parent
6b8f9fe03d
commit
c870ef324d
26 changed files with 430 additions and 410 deletions
|
|
@ -283,7 +283,7 @@ struct LocalData
|
|||
};
|
||||
|
||||
template<class T>
|
||||
inline void LoadDBC(LocalData& localeData,barGoLink& bar, StoreProblemList& errlist, DBCStorage<T>& storage, const std::string& dbc_path, const std::string& filename)
|
||||
inline void LoadDBC(LocalData& localeData, BarGoLink& bar, StoreProblemList& errlist, DBCStorage<T>& storage, const std::string& dbc_path, const std::string& filename)
|
||||
{
|
||||
// compatibility format and C++ structure sizes
|
||||
MANGOS_ASSERT(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()) == sizeof(T) || LoadDBC_assert_print(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()),sizeof(T),filename));
|
||||
|
|
@ -364,7 +364,7 @@ void LoadDBCStores(const std::string& dataPath)
|
|||
|
||||
const uint32 DBCFilesCount = 92;
|
||||
|
||||
barGoLink bar( (int)DBCFilesCount );
|
||||
BarGoLink bar(DBCFilesCount);
|
||||
|
||||
StoreProblemList bad_dbc_files;
|
||||
|
||||
|
|
@ -373,9 +373,9 @@ void LoadDBCStores(const std::string& dataPath)
|
|||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaStore, dbcPath,"AreaTable.dbc");
|
||||
|
||||
// must be after sAreaStore loading
|
||||
for(uint32 i = 0; i < sAreaStore.GetNumRows(); ++i) // areaflag numbered from 0
|
||||
for (uint32 i = 0; i < sAreaStore.GetNumRows(); ++i) // areaflag numbered from 0
|
||||
{
|
||||
if(AreaTableEntry const* area = sAreaStore.LookupEntry(i))
|
||||
if (AreaTableEntry const* area = sAreaStore.LookupEntry(i))
|
||||
{
|
||||
// fill AreaId->DBC records
|
||||
sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID),area->exploreFlag));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue