Some fixes for core 3.2.2a

--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-17 14:55:19 +01:00
parent eccf162be2
commit a7acabae8b
2 changed files with 75 additions and 124 deletions
-21
View File
@@ -257,23 +257,6 @@ enum ConditionType
#define MAX_CONDITION 14 // maximum value in ConditionType enum
//Player's info
typedef struct _tagCachePlayerInfo
{
std::string sPlayerName;
uint32 unfield;
uint32 unLevel;
uint8 unClass;
//Arena
uint32 unArenaInfoId0;
uint32 unArenaInfoId1;
uint32 unArenaInfoId2;
uint32 unArenaInfoSlot0;
uint32 unArenaInfoSlot1;
uint32 unArenaInfoSlot2;
}CachePlayerInfo, *PCachePlayerInfo;
typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap;
struct PlayerCondition
{
ConditionType condition; // additional condition type
@@ -641,10 +624,6 @@ class ObjectMgr
uint32 GenerateMailID();
uint32 GeneratePetNumber();
void LoadPlayerInfoInCache();
PCachePlayerInfo GetPlayerInfoFromCache(uint32 unPlayerGuid) const;
CachePlayerInfoMap m_mPlayerInfoMap;
uint32 CreateItemText(std::string text);
void AddItemText(uint32 itemTextId, std::string text) { mItemTexts[itemTextId] = text; }
std::string GetItemText( uint32 id )