Core/Transports: ported transport refactoring

* this implements full support for stoppable transports as well as serverside transport position tracking
* fixed several vehicle related issues
* fixed gameobject passengers not being displayed as transport passengers
* pets, dynamic objects and other summons are not added as transport passengers and will now properly be displayed
Todo:
- Deeprun Tram visual issues needs to be resolved
- Lady Deathwhisper's elevator needs some additional research
This commit is contained in:
Ovahlord committed 2018-11-21 12:04:26 +01:00
1 parent d8bf3a3170
commit 5229a734dd
49 files changed
+1381 -602

No files matched your search

+23 -12
View File
@@ -313,6 +313,8 @@ i_scriptLock(false), _respawnCheckTimer(0), _defaultLight(GetDefaultMapLight(id)
//lets initialize visibility distance for map
Map::InitVisibilityDistance();
GetGuidSequenceGenerator<HighGuid::Transport>().Set(sObjectMgr->GetGenerator<HighGuid::Transport>().GetNextAfterMaxUsed());
_weatherUpdateTimer.SetInterval(time_t(1 * IN_MILLISECONDS));
MMAP::MMapFactory::createOrGetMMapManager()->loadMapInstance(sWorld->GetDataPath(), GetId(), i_InstanceId);
@@ -493,7 +495,7 @@ void Map::DeleteFromWorld(Player* player)
}
template<>
void Map::DeleteFromWorld(Transport* transport)
void Map::DeleteFromWorld(MapTransport* transport)
{
ObjectAccessor::RemoveObject(transport);
delete transport;
@@ -692,7 +694,7 @@ bool Map::AddToMap(T* obj)
}
template<>
bool Map::AddToMap(Transport* obj)
bool Map::AddToMap(MapTransport* obj)
{
//TODO: Needs clean up. An object should not be added to map twice.
if (obj->IsInWorld())
@@ -713,7 +715,7 @@ bool Map::AddToMap(Transport* obj)
{
for (Map::PlayerList::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
{
if (itr->GetSource()->GetTransport() != obj)
if (itr->GetSource()->GetMapTransport() != obj)
{
UpdateData data(GetId());
obj->BuildCreateUpdateBlockForPlayer(&data, itr->GetSource());
@@ -1064,7 +1066,7 @@ void Map::RemoveFromMap(T *obj, bool remove)
}
template<>
void Map::RemoveFromMap(Transport* obj, bool remove)
void Map::RemoveFromMap(MapTransport* obj, bool remove)
{
obj->RemoveFromWorld();
@@ -1786,10 +1788,10 @@ void Map::UnloadAll()
for (TransportsContainer::iterator itr = _transports.begin(); itr != _transports.end();)
{
Transport* transport = *itr;
MapTransport* transport = *itr;
++itr;
RemoveFromMap<Transport>(transport, true);
RemoveFromMap<MapTransport>(transport, true);
}
for (auto& cellCorpsePair : _corpsesByCell)
@@ -2864,7 +2866,7 @@ void Map::SendInitSelf(Player* player)
player->BuildCreateUpdateBlockForPlayer(&data, player);
// build other passengers at transport also (they always visible and marked as visible and will not send at visibility update at add to map
if (Transport* transport = player->GetTransport())
if (MapTransport* transport = player->GetMapTransport())
for (WorldObject* passenger : transport->GetPassengers())
if (player != passenger && player->HaveAtClient(passenger))
passenger->BuildCreateUpdateBlockForPlayer(&data, player);
@@ -2880,7 +2882,7 @@ void Map::SendInitTransports(Player* player)
UpdateData transData(player->GetMapId());
for (Transport* transport : _transports)
{
if (transport != player->GetTransport() && player->IsInPhase(transport))
if (transport != player->GetMapTransport() && player->IsInPhase(transport))
{
transport->BuildCreateUpdateBlockForPlayer(&transData, player);
player->m_visibleTransports.insert(transport->GetGUID());
@@ -2898,7 +2900,7 @@ void Map::SendRemoveTransports(Player* player)
UpdateData transData(player->GetMapId());
for (Transport* transport : _transports)
{
if (transport != player->GetTransport())
if (transport != player->GetMapTransport())
{
transport->BuildOutOfRangeUpdateBlock(&transData);
player->m_visibleTransports.erase(transport->GetGUID());
@@ -3447,7 +3449,7 @@ void Map::DelayedUpdate(uint32 t_diff)
{
for (_transportsUpdateIter = _transports.begin(); _transportsUpdateIter != _transports.end();)
{
Transport* transport = *_transportsUpdateIter;
MapTransport* transport = *_transportsUpdateIter;
++_transportsUpdateIter;
if (!transport->IsInWorld())
@@ -3551,7 +3553,7 @@ void Map::RemoveAllObjectsInRemoveList()
case TYPEID_GAMEOBJECT:
{
GameObject* go = obj->ToGameObject();
if (Transport* transport = go->ToTransport())
if (MapTransport* transport = go->ToMapTransport())
RemoveFromMap(transport, true);
else
RemoveFromMap(go, true);
@@ -4327,13 +4329,22 @@ Pet* Map::GetPet(ObjectGuid const& guid)
Transport* Map::GetTransport(ObjectGuid const& guid)
{
if (!guid.IsMOTransport())
if (!guid.IsTransport())
return nullptr;
GameObject* go = GetGameObject(guid);
return go ? go->ToTransport() : nullptr;
}
MapTransport* Map::GetMapTransport(ObjectGuid const& guid)
{
if (!guid.IsTransport())
return nullptr;
GameObject* go = GetGameObject(guid);
return go ? go->ToMapTransport() : nullptr;
}
void Map::UpdateIteratorBack(Player* player)
{
if (m_mapRefIter == player->GetMapRef())