aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2011-09-29 12:43:05 +0200
committerSpp <spp@jorge.gr>2011-09-29 12:43:05 +0200
commitb16d2245bbd374805d15cdca585e8b42bf139605 (patch)
treeb7b63c567112e1999a2566611363cf5e83adb1be /src/server/game/Maps
parent8b820baa7324d41df264f48e344d62584bff70f8 (diff)
Cosmetic: Multiple cosmetic changes
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '(' - Added missing space after a comma and remove space before comma (with some exceptions) - Remove trailing spaces - Convert tab to spaces Note: Only affects files with extension "cpp" and "h" under /src/server
Diffstat (limited to 'src/server/game/Maps')
-rwxr-xr-xsrc/server/game/Maps/Map.cpp20
-rwxr-xr-xsrc/server/game/Maps/Map.h8
2 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 5dcce67bcd3..e122c5bffae 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -119,7 +119,7 @@ void Map::LoadVMap(int gx, int gy)
{
// x and y are swapped !!
int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy);
- switch(vmapLoadResult)
+ switch (vmapLoadResult)
{
case VMAP::VMAP_LOAD_RESULT_OK:
sLog->outDetail("VMAP loaded name:%s, id:%d, x:%d, y:%d (vmap rep.: x:%d, y:%d)", GetMapName(), GetId(), gx, gy, gx, gy);
@@ -305,8 +305,8 @@ void Map::SwitchGridContainers(T* obj, bool on)
obj->m_isWorldObject = on;
}
-template void Map::SwitchGridContainers(Creature* , bool);
-//template void Map::SwitchGridContainers(DynamicObject* , bool);
+template void Map::SwitchGridContainers(Creature*, bool);
+//template void Map::SwitchGridContainers(DynamicObject*, bool);
template<class T>
void Map::DeleteFromWorld(T* obj)
@@ -2028,7 +2028,7 @@ void Map::RemoveAllObjectsInRemoveList()
bool on = itr->second;
i_objectsToSwitch.erase(itr);
- switch(obj->GetTypeId())
+ switch (obj->GetTypeId())
{
case TYPEID_UNIT:
if (!obj->ToCreature()->isPet())
@@ -2045,7 +2045,7 @@ void Map::RemoveAllObjectsInRemoveList()
std::set<WorldObject*>::iterator itr = i_objectsToRemove.begin();
WorldObject* obj = *itr;
- switch(obj->GetTypeId())
+ switch (obj->GetTypeId())
{
case TYPEID_CORPSE:
{
@@ -2181,10 +2181,10 @@ template void Map::Add(Creature*);
template void Map::Add(GameObject*);
template void Map::Add(DynamicObject*);
-template void Map::Remove(Corpse* , bool);
-template void Map::Remove(Creature* , bool);
-template void Map::Remove(GameObject* , bool);
-template void Map::Remove(DynamicObject* , bool);
+template void Map::Remove(Corpse*, bool);
+template void Map::Remove(Creature*, bool);
+template void Map::Remove(GameObject*, bool);
+template void Map::Remove(DynamicObject*, bool);
/* ******* Dungeon Instance Maps ******* */
@@ -2593,7 +2593,7 @@ BattlegroundMap::BattlegroundMap(uint32 id, time_t expiry, uint32 InstanceId, Ma
BattlegroundMap::~BattlegroundMap()
{
- if(m_bg)
+ if (m_bg)
{
//unlink to prevent crash, always unlink all pointer reference before destruction
m_bg->SetBgMap(NULL);
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 081516bb338..640b70413f8 100755
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -255,7 +255,7 @@ class Map : public GridRefManager<NGridType>
}
virtual bool Add(Player*);
- virtual void Remove(Player* , bool);
+ virtual void Remove(Player*, bool);
template<class T> void Add(T *);
template<class T> void Remove(T *, bool);
@@ -266,7 +266,7 @@ class Map : public GridRefManager<NGridType>
//function for setting up visibility distance for maps on per-type/per-Id basis
virtual void InitVisibilityDistance();
- void PlayerRelocation(Player* , float x, float y, float z, float orientation);
+ void PlayerRelocation(Player*, float x, float y, float z, float orientation);
void CreatureRelocation(Creature* creature, float x, float y, float z, float ang, bool respawnRelocationOnFail = true);
template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor);
@@ -578,7 +578,7 @@ class InstanceMap : public Map
InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent);
~InstanceMap();
bool Add(Player*);
- void Remove(Player* , bool);
+ void Remove(Player*, bool);
void Update(const uint32);
void CreateInstanceData(bool load);
bool Reset(uint8 method);
@@ -608,7 +608,7 @@ class BattlegroundMap : public Map
~BattlegroundMap();
bool Add(Player*);
- void Remove(Player* , bool);
+ void Remove(Player*, bool);
bool CanEnter(Player* player);
void SetUnload();
//void UnloadAll(bool pForce);