josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/ObjectMgr: Static members are no longer accessed through singleton

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-22 20:23:47 +01:00
parent 446c300505
commit 7b4e1c6387
43 changed files with 123 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+2 -2
View File
@@ -285,7 +285,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recv_data)
sLog.outDetail("STORAGE: Item Query = %u", item);
ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(item);
ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(item);
if (pProto)
{
std::string Name = pProto->Name1;
@@ -758,7 +758,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
{
if (VendorItem const* crItem = vItems->GetItem(vendorslot))
{
if (ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(crItem->item))
if (ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(crItem->item))
{
if ((pProto->AllowableClass & _player->getClassMask()) == 0 && pProto->Bonding == BIND_WHEN_PICKED_UP && !_player->isGameMaster())
continue;
src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
// get the destination map entry, not the current one, this will fix homebind and reset greeting
MapEntry const* mEntry = sMapStore.LookupEntry(loc.GetMapId());
InstanceTemplate const* mInstance = sObjectMgr.GetInstanceTemplate(loc.GetMapId());
InstanceTemplate const* mInstance = ObjectMgr::GetInstanceTemplate(loc.GetMapId());
// reset instance validity, except if going to an instance inside an instance
if (GetPlayer()->m_InstanceValid == false && !mInstance)
src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+2 -2
View File
@@ -697,7 +697,7 @@ void WorldSession::HandleUnstablePetCallback(QueryResult result, uint32 petnumbe
return;
}
CreatureInfo const* creatureInfo = sObjectMgr.GetCreatureTemplate(creature_id);
CreatureInfo const* creatureInfo = ObjectMgr::GetCreatureTemplate(creature_id);
if (!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets()))
{
// if problem in exotic pet
@@ -825,7 +825,7 @@ void WorldSession::HandleStableSwapPetCallback(QueryResult result, uint32 petnum
return;
}
CreatureInfo const* creatureInfo = sObjectMgr.GetCreatureTemplate(creature_id);
CreatureInfo const* creatureInfo = ObjectMgr::GetCreatureTemplate(creature_id);
if (!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets()))
{
// if problem in exotic pet
src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
}
}
ItemPrototype const *pProto = sObjectMgr.GetItemPrototype(charterid);
ItemPrototype const *pProto = ObjectMgr::GetItemPrototype(charterid);
if (!pProto)
{
_player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, NULL, charterid, 0);
src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+2 -2
View File
@@ -155,7 +155,7 @@ void WorldSession::HandleCreatureQueryOpcode(WorldPacket & recv_data)
uint64 guid;
recv_data >> guid;
CreatureInfo const *ci = sObjectMgr.GetCreatureTemplate(entry);
CreatureInfo const *ci = ObjectMgr::GetCreatureTemplate(entry);
if (ci)
{
@@ -218,7 +218,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recv_data)
uint64 guid;
recv_data >> guid;
const GameObjectInfo *info = sObjectMgr.GetGameObjectInfo(entryID);
const GameObjectInfo *info = ObjectMgr::GetGameObjectInfo(entryID);
if (info)
{
std::string Name;