diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
| commit | ac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (patch) | |
| tree | 9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Maps/Map.cpp | |
| parent | d268b81044707e15266eadb4ab49f176135d4c26 (diff) | |
| parent | 43d5fb5eaefeafb34bea10ff5c6a2878c6c14df1 (diff) | |
Merge branch 'dbc' of https://github.com/Intel/TrinityCore into Intel-dbc
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Events/GameEventMgr.cpp
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d18244a05bd..16a8f110a15 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2038,7 +2038,7 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R { if (LiquidTypeEntry const* liquidEntry = sLiquidTypeStore.LookupEntry(_liquidEntry[idx])) { - entry = liquidEntry->Id; + entry = liquidEntry->ID; type &= MAP_LIQUID_TYPE_DARK_WATER; uint32 liqTypeIdx = liquidEntry->Type; if (entry < 21) @@ -2272,7 +2272,7 @@ uint16 Map::GetAreaFlag(float x, float y, float z, bool *isOutdoors) const areaflag = gmap->getArea(x, y); // this used while not all *.map files generated (instances) else - areaflag = GetAreaFlagByMapId(i_mapEntry->MapID); + areaflag = GetAreaFlagByMapId(i_mapEntry->ID); } if (isOutdoors) @@ -2470,7 +2470,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->MapName_lang : "UNNAMEDMAP\x0"; } void Map::UpdateObjectVisibility(WorldObject* obj, Cell cell, CellCoord cellpair) @@ -3212,7 +3212,7 @@ uint32 InstanceMap::GetMaxPlayers() const if (mapDiff && mapDiff->maxPlayers) return mapDiff->maxPlayers; - return GetEntry()->maxPlayers; + return GetEntry()->MaxPlayers; } uint32 InstanceMap::GetMaxResetDelay() const |