mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
Don't use singleton to access static functions.
* This affects especially ObjectMgr functions: - GetCreatureInfo - GetGameObjectInfo - GetInstanceTemplate These are in fact static functions.
This commit is contained in:
parent
34dab079c4
commit
1f23884757
40 changed files with 104 additions and 104 deletions
|
|
@ -285,7 +285,7 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
|
|||
|
||||
sLog.outDetail("STORAGE: Item Query = %u", item);
|
||||
|
||||
ItemPrototype const *pProto = objmgr.GetItemPrototype( item );
|
||||
ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( item );
|
||||
if( pProto )
|
||||
{
|
||||
std::string Name = pProto->Name1;
|
||||
|
|
@ -739,7 +739,7 @@ void WorldSession::SendListInventory( uint64 vendorguid )
|
|||
{
|
||||
if(VendorItem const* crItem = vItems->GetItem(i))
|
||||
{
|
||||
if(ItemPrototype const *pProto = objmgr.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;
|
||||
|
|
@ -971,7 +971,7 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
|
|||
recv_data.read_skip<uint64>(); // guid
|
||||
|
||||
sLog.outDebug("WORLD: CMSG_ITEM_NAME_QUERY %u", itemid);
|
||||
ItemPrototype const *pProto = objmgr.GetItemPrototype( itemid );
|
||||
ItemPrototype const *pProto = ObjectMgr::GetItemPrototype( itemid );
|
||||
if( pProto )
|
||||
{
|
||||
std::string Name;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue