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

*Update to Mangos 7125.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-20 19:59:43 -06:00
parent 1bbd896861
commit 68c0bcd069
51 changed files with 1058 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.h
+4 -11
View File
@@ -1454,10 +1454,7 @@ class TRINITY_DLL_SPEC Player : public Unit
Item* GetMItem(uint32 id)
{
ItemMap::const_iterator itr = mMitems.find(id);
if (itr != mMitems.end())
return itr->second;
return NULL;
return itr != mMitems.end() ? itr->second : NULL;
}
void AddMItem(Item* it)
@@ -1469,12 +1466,7 @@ class TRINITY_DLL_SPEC Player : public Unit
bool RemoveMItem(uint32 id)
{
ItemMap::iterator i = mMitems.find(id);
if (i == mMitems.end())
return false;
mMitems.erase(i);
return true;
return mMitems.erase(id) ? true : false;
}
void PetSpellInitialize();
@@ -2083,7 +2075,7 @@ class TRINITY_DLL_SPEC Player : public Unit
}
uint64 GetFarSight() const { return GetUInt64Value(PLAYER_FARSIGHT); }
void SetFarSight(uint64 guid) { SetUInt64Value(PLAYER_FARSIGHT, guid); }
void SetFarSightGUID(uint64 guid) { SetUInt64Value(PLAYER_FARSIGHT, guid); }
void SetBindSight(Unit *target);
WorldObject* GetFarsightTarget() const;
void ClearFarsight();
@@ -2263,6 +2255,7 @@ class TRINITY_DLL_SPEC Player : public Unit
void _LoadActions(QueryResult *result);
void _LoadAuras(QueryResult *result, uint32 timediff);
void _LoadGlyphAuras();
void _LoadBoundInstances(QueryResult *result);
void _LoadInventory(QueryResult *result, uint32 timediff);
void _LoadMailInit(QueryResult *resultUnread, QueryResult *resultDelivery);