Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Updated opcodes and db2 to 7.0.3.21414

Browse Source
This commit is contained in:
Shauren
2016-04-25 22:03:34 +02:00
parent 885d9b53c3
commit 70102f32fe
98 changed files with 3722 additions and 3593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,7 @@ m_unloadTimer(0), m_VisibleDistance(DEFAULT_VISIBILITY_DISTANCE),
m_VisibilityNotifyPeriod(DEFAULT_VISIBILITY_NOTIFY_PERIOD),
m_activeNonPlayersIter(m_activeNonPlayers.end()), _transportsUpdateIter(_transports.end()),
i_gridExpiry(expiry),
i_scriptLock(false), _defaultLight(GetDefaultMapLight(id))
i_scriptLock(false), _defaultLight(DB2Manager::GetDefaultMapLight(id))
{
m_parentMap = (_parent ? _parent : this);
for (unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
@@ -2403,7 +2403,7 @@ bool Map::IsOutdoors(float x, float y, float z) const
return true;
AreaTableEntry const* atEntry = nullptr;
WMOAreaTableEntry const* wmoEntry= GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
WMOAreaTableEntry const* wmoEntry= sDB2Manager.GetWMOAreaTable(rootId, adtId, groupId);
if (wmoEntry)
{
TC_LOG_DEBUG("maps", "Got WMOAreaTableEntry! flag %u, areaid %u", wmoEntry->Flags, wmoEntry->AreaTableID);
@@ -2443,7 +2443,7 @@ uint32 Map::GetAreaId(float x, float y, float z, bool *isOutdoors) const
if (GetAreaInfo(x, y, z, mogpFlags, adtId, rootId, groupId))
{
haveAreaInfo = true;
wmoEntry = GetWMOAreaTableEntryByTripple(rootId, adtId, groupId);
wmoEntry = sDB2Manager.GetWMOAreaTable(rootId, adtId, groupId);
if (wmoEntry)
{
areaId = wmoEntry->AreaTableID;
@@ -3413,7 +3413,7 @@ void InstanceMap::SetResetSchedule(bool on)
MapDifficultyEntry const* Map::GetMapDifficulty() const
{
return GetMapDifficultyData(GetId(), GetDifficultyID());
return sDB2Manager.GetMapDifficultyData(GetId(), GetDifficultyID());
}
uint32 Map::GetDifficultyLootBonusTreeMod() const
@@ -3428,6 +3428,36 @@ uint32 Map::GetDifficultyLootBonusTreeMod() const
return 0;
}
uint32 Map::GetId() const
{
return i_mapEntry->ID;
}
bool Map::Instanceable() const
{
return i_mapEntry && i_mapEntry->Instanceable();
}
bool Map::IsDungeon() const
{
return i_mapEntry && i_mapEntry->IsDungeon();
}
bool Map::IsNonRaidDungeon() const
{
return i_mapEntry && i_mapEntry->IsNonRaidDungeon();
}
bool Map::IsRaid() const
{
return i_mapEntry && i_mapEntry->IsRaid();
}
bool Map::IsRaidOrHeroicDungeon() const
{
return IsRaid() || IsHeroic();
}
bool Map::IsHeroic() const
{
if (DifficultyEntry const* difficulty = sDifficultyStore.LookupEntry(i_spawnMode))
@@ -3435,6 +3465,38 @@ bool Map::IsHeroic() const
return false;
}
bool Map::Is25ManRaid() const
{
return IsRaid() && (i_spawnMode == DIFFICULTY_25_N || i_spawnMode == DIFFICULTY_25_HC);
}
bool Map::IsBattleground() const
{
return i_mapEntry && i_mapEntry->IsBattleground();
}
bool Map::IsBattleArena() const
{
return i_mapEntry && i_mapEntry->IsBattleArena();
}
bool Map::IsBattlegroundOrArena() const
{
return i_mapEntry && i_mapEntry->IsBattlegroundOrArena();
}
bool Map::IsGarrison() const
{
return i_mapEntry && i_mapEntry->IsGarrison();
}
bool Map::GetEntrancePos(int32 &mapid, float &x, float &y)
{
if (!i_mapEntry)
return false;
return i_mapEntry->GetEntrancePos(mapid, x, y);
}
bool InstanceMap::HasPermBoundPlayers() const
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PERM_BIND_BY_INSTANCE);
@@ -3454,7 +3516,7 @@ uint32 InstanceMap::GetMaxPlayers() const
uint32 InstanceMap::GetMaxResetDelay() const
{
MapDifficultyEntry const* mapDiff = GetMapDifficulty();
return mapDiff ? mapDiff->RaidDuration : 0;
return mapDiff ? mapDiff->GetRaidDuration() : 0;
}
/* ******* Battleground Instance Maps ******* */