diff options
| author | Bootz <Stage6Dev@EMPulseGaming.com> | 2011-10-07 11:08:09 -0500 |
|---|---|---|
| committer | Bootz <Stage6Dev@EMPulseGaming.com> | 2011-10-07 11:08:09 -0500 |
| commit | 81c0a3a8479fef8ea52e1af19174bd777a5759e3 (patch) | |
| tree | 048c3d98dd7f758ab022c3445b310cd256105997 /src/server/game/Pools/PoolMgr.cpp | |
| parent | 96d7a1e9704d8bdf55e2197ce26adbefb0a84e61 (diff) | |
REPO: code-style clean-up
* Fixed pPlayer->player
* Fixed pCreature->creature
~DevNote: codestyle for Player should be (*player), not *plr or *p...
same goes for Creatures (*creature)... more cleaning needed.
We've way too many codestyles happening here.
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
| -rwxr-xr-x | src/server/game/Pools/PoolMgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index c5d2deef376..801b95e4c42 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -220,8 +220,8 @@ void PoolGroup<Creature>::Despawn1Object(uint32 guid) { sObjectMgr->RemoveCreatureFromGrid(guid, data); - if (Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) - pCreature->AddObjectToRemoveList(); + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + creature->AddObjectToRemoveList(); } } @@ -363,15 +363,15 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj) // We use spawn coords to spawn if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) { - Creature* pCreature = new Creature; + Creature* creature = new Creature; //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning creature %u", guid); - if (!pCreature->LoadFromDB(obj->guid, map)) + if (!creature->LoadFromDB(obj->guid, map)) { - delete pCreature; + delete creature; return; } else - map->Add(pCreature); + map->Add(creature); } } } @@ -506,8 +506,8 @@ template <> void PoolGroup<Creature>::ReSpawn1Object(PoolObject* obj) { if (CreatureData const* data = sObjectMgr->GetCreatureData(obj->guid)) - if (Creature* pCreature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) - pCreature->GetMap()->Add(pCreature); + if (Creature* creature = ObjectAccessor::GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL)) + creature->GetMap()->Add(creature); } // Method that does the respawn job on the specified gameobject |
