Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Datastores: use generated member names for MapEntry fields

Browse Source 
* load all dbc fields of MapEntry
This commit is contained in:
Ovahlord
2019-02-24 00:14:44 +01:00
parent 36bd27e347
commit 1e4cc2293a
25 changed files with 120 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Maps/Map.cpp
View File

@@ -2523,7 +2523,7 @@ uint32 Map::GetAreaId(PhaseShift const& phaseShift, float x, float y, float z) c
areaId = gridAreaId;
if (!areaId)
areaId = i_mapEntry->linked_zone;
areaId = i_mapEntry->AreaTableID;
return areaId;
}
@@ -2701,7 +2701,7 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x,
}
if (!data.areaId)
data.areaId = i_mapEntry->linked_zone;
data.areaId = i_mapEntry->AreaTableID;
AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(data.areaId);
@@ -2829,7 +2829,7 @@ bool Map::CheckGridIntegrity(Creature* c, bool moved) const
char const* Map::GetMapName() const
{
return i_mapEntry ? i_mapEntry->name : "UNNAMEDMAP\x0";
return i_mapEntry ? i_mapEntry->Name : "UNNAMEDMAP\x0";
}
void Map::SendInitSelf(Player* player)
@@ -4119,7 +4119,7 @@ bool Map::Is25ManRaid() const
uint32 Map::GetId() const
{
return i_mapEntry->MapID;
return i_mapEntry->ID;
}
bool Map::IsRegularDifficulty() const
@@ -4162,7 +4162,7 @@ uint32 InstanceMap::GetMaxPlayers() const
if (mapDiff && mapDiff->maxPlayers)
return mapDiff->maxPlayers;
return GetEntry()->maxPlayers;
return GetEntry()->MaxPlayers;
}
uint32 InstanceMap::GetMaxResetDelay() const