aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
diff options
context:
space:
mode:
authorclick <clickvd@gonnamakeyou.com>2011-06-11 22:35:29 +0200
committerclick <clickvd@gonnamakeyou.com>2011-06-11 22:35:29 +0200
commit158966dc793f47dd4ada264da775f647601298aa (patch)
tree8fa1dc1cc36d07123662c32eb5981cfac01e91b6 /src/server/game/Maps
parent9ef8bd307200445f448a67d1bb26c3afee9b7051 (diff)
Core: Codestyle cleanup
Diffstat (limited to 'src/server/game/Maps')
-rwxr-xr-xsrc/server/game/Maps/Map.cpp10
-rwxr-xr-xsrc/server/game/Maps/Map.h8
-rwxr-xr-xsrc/server/game/Maps/MapInstanced.cpp4
-rwxr-xr-xsrc/server/game/Maps/MapInstanced.h2
4 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 51b03e85581..baefb084702 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1866,7 +1866,7 @@ void Map::UpdateObjectsVisibilityFor(Player* player, Cell cell, CellPair cellpai
notifier.SendToSelf();
}
-void Map::SendInitSelf(Player * player)
+void Map::SendInitSelf(Player* player)
{
sLog->outDetail("Creating player data for himself %u", player->GetGUIDLow());
@@ -1898,7 +1898,7 @@ void Map::SendInitSelf(Player * player)
player->GetSession()->SendPacket(&packet);
}
-void Map::SendInitTransports(Player * player)
+void Map::SendInitTransports(Player* player)
{
// Hack to send out transports
MapManager::TransportMap& tmap = sMapMgr->m_TransportsByMap;
@@ -1925,7 +1925,7 @@ void Map::SendInitTransports(Player * player)
player->GetSession()->SendPacket(&packet);
}
-void Map::SendRemoveTransports(Player * player)
+void Map::SendRemoveTransports(Player* player)
{
// Hack to send out transports
MapManager::TransportMap& tmap = sMapMgr->m_TransportsByMap;
@@ -2583,7 +2583,7 @@ void BattlegroundMap::InitVisibilityDistance()
m_VisibilityNotifyPeriod = World::GetVisibilityNotifyPeriodInBGArenas();
}
-bool BattlegroundMap::CanEnter(Player * player)
+bool BattlegroundMap::CanEnter(Player* player)
{
if (player->GetMapRef().getTarget() == this)
{
@@ -2600,7 +2600,7 @@ bool BattlegroundMap::CanEnter(Player * player)
return Map::CanEnter(player);
}
-bool BattlegroundMap::Add(Player * player)
+bool BattlegroundMap::Add(Player* player)
{
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false);
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 57372c0c259..10935ee2b9a 100755
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -309,7 +309,7 @@ class Map : public GridRefManager<NGridType>
static void InitStateMachine();
static void DeleteStateMachine();
- Map const * GetParent() const { return m_parentMap; }
+ Map const* GetParent() const { return m_parentMap; }
// some calls like isInWater should not use vmaps due to processor power
// can return INVALID_HEIGHT if under z+2 z coord not found height
@@ -446,10 +446,10 @@ class Map : public GridRefManager<NGridType>
void SetTimer(uint32 t) { i_gridExpiry = t < MIN_GRID_DELAY ? MIN_GRID_DELAY : t; }
- void SendInitSelf(Player * player);
+ void SendInitSelf(Player* player);
- void SendInitTransports(Player * player);
- void SendRemoveTransports(Player * player);
+ void SendInitTransports(Player* player);
+ void SendRemoveTransports(Player* player);
bool CreatureCellRelocation(Creature *creature, Cell new_cell);
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index b64f4a030f3..cae027c2b8e 100755
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -107,7 +107,7 @@ void MapInstanced::UnloadAll()
- create the instance if it's not created already
- the player is not actually added to the instance (only in InstanceMap::Add)
*/
-Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
+Map* MapInstanced::CreateInstance(const uint32 mapId, Player* player)
{
if (GetId() != mapId || !player)
return NULL;
@@ -257,7 +257,7 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr)
return true;
}
-bool MapInstanced::CanEnter(Player * /*player*/)
+bool MapInstanced::CanEnter(Player* /*player*/)
{
//ASSERT(false);
return true;
diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
index 38ae8ca8fbc..16aeffe8580 100755
--- a/src/server/game/Maps/MapInstanced.h
+++ b/src/server/game/Maps/MapInstanced.h
@@ -39,7 +39,7 @@ class MapInstanced : public Map
void UnloadAll();
bool CanEnter(Player* player);
- Map* CreateInstance(const uint32 mapId, Player * player);
+ Map* CreateInstance(const uint32 mapId, Player* player);
Map* FindMap(uint32 InstanceId) const { return _FindMap(InstanceId); }
bool DestroyInstance(InstancedMaps::iterator &itr);