From f9a8031e4f93a77353d3046396e8f25ac41e0651 Mon Sep 17 00:00:00 2001 From: "False.Genesis" Date: Thu, 8 Feb 2007 21:31:56 +0000 Subject: [PATCH] linking works again, very strange bug. --- src/Client/World/ObjMgr.cpp | 2 +- src/Client/World/ObjMgr.h | 4 ++-- src/Client/World/UpdateData.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Client/World/ObjMgr.cpp b/src/Client/World/ObjMgr.cpp index 262d53f..1823317 100644 --- a/src/Client/World/ObjMgr.cpp +++ b/src/Client/World/ObjMgr.cpp @@ -20,7 +20,7 @@ void ObjMgr::Add(Object *o) _obj.push_back(o); } -Object *ObjMgr::GetObject(uint64 guid) +Object *ObjMgr::GetObj(uint64 guid) { for(ObjList::iterator i = _obj.begin(); i!=_obj.end(); i++) if((*i)->GetGUID() == guid) diff --git a/src/Client/World/ObjMgr.h b/src/Client/World/ObjMgr.h index c357899..b2dd633 100644 --- a/src/Client/World/ObjMgr.h +++ b/src/Client/World/ObjMgr.h @@ -18,9 +18,9 @@ public: void Add(ItemProto*); void AddNonexistentItem(uint32); bool ItemNonExistent(uint32); - Object *GetObject(uint64); + Object *GetObj(uint64); void RemoveObject(uint64); - uint32 GetOjectCount(void) { return _obj.size(); } + uint32 GetObjectCount(void) { return _obj.size(); } uint32 GetItemProtoCount(void) { return _iproto.size(); } ItemProto *GetItemProto(uint32); ItemProto *GetItemProtoByPos(uint32); diff --git a/src/Client/World/UpdateData.cpp b/src/Client/World/UpdateData.cpp index 7d001d8..1b89f1e 100644 --- a/src/Client/World/UpdateData.cpp +++ b/src/Client/World/UpdateData.cpp @@ -77,7 +77,7 @@ void WorldSession::_HandleUpdateObjectOpcode(WorldPacket& recvPacket) case UPDATETYPE_MOVEMENT: { recvPacket >> uguid; - Object *obj = objmgr.GetObject(uguid); // WTF is wrong with this?! plz correct! + Object *obj = objmgr.GetObj(uguid); if(obj) this->_MovementUpdate(obj->GetTypeId(),uguid,recvPacket); else