diff options
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r-- | src/game/Map.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 8efba9785c2..144dce1edf6 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -501,7 +501,7 @@ Map::Add(T *obj) if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) { - sLog.outError("Map::Add: Object " I64FMTD " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); + sLog.outError("Map::Add: Object " UI64FMTD " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord); return; } @@ -2020,12 +2020,9 @@ void Map::SendInitSelf( Player * player ) UpdateData data; - bool hasTransport = false; - // attach to player data current transport data if(Transport* transport = player->GetTransport()) { - hasTransport = true; transport->BuildCreateUpdateBlockForPlayer(&data, player); } @@ -2039,14 +2036,13 @@ void Map::SendInitSelf( Player * player ) { if(player!=(*itr) && player->HaveAtClient(*itr)) { - hasTransport = true; (*itr)->BuildCreateUpdateBlockForPlayer(&data, player); } } } WorldPacket packet; - data.BuildPacket(&packet, hasTransport); + data.BuildPacket(&packet); player->GetSession()->SendPacket(&packet); } @@ -2063,20 +2059,17 @@ void Map::SendInitTransports( Player * player ) MapManager::TransportSet& tset = tmap[player->GetMapId()]; - bool hasTransport = false; - for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i) { // send data for current transport in other place if((*i) != player->GetTransport() && (*i)->GetMapId()==i_id) { - hasTransport = true; (*i)->BuildCreateUpdateBlockForPlayer(&transData, player); } } WorldPacket packet; - transData.BuildPacket(&packet, hasTransport); + transData.BuildPacket(&packet); player->GetSession()->SendPacket(&packet); } |