From b48da9755ff4cb535c0d453e8d2c0fc8e74d21ab Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 8 Apr 2010 22:40:11 +0400 Subject: [PATCH] [9699] Drop item text ids generation. Now item text not used as independent object (real item texts associated with item guid) --- src/game/ObjectMgr.cpp | 8 -------- src/game/ObjectMgr.h | 2 -- src/shared/revision_nr.h | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 67cd33a24..b810aec05 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -150,7 +150,6 @@ ObjectMgr::ObjectMgr() : m_AuctionIds("Auction ids"), m_EquipmentSetIds("Equipment set ids"), m_GuildIds("Guild ids"), - m_ItemTextIds("Item text ids"), m_MailIds("Mail ids"), m_PetNumbers("Pet numbers"), m_GroupIds("Group ids") @@ -5765,13 +5764,6 @@ void ObjectMgr::SetHighestGuids() delete result; } - result = CharacterDatabase.Query( "SELECT MAX(id) FROM item_text" ); - if( result ) - { - m_ItemTextIds.Set((*result)[0].GetUInt32()+1); - delete result; - } - result = CharacterDatabase.Query( "SELECT MAX(guid) FROM corpse" ); if( result ) { diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index ab9732f29..8031b7471 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -681,7 +681,6 @@ class ObjectMgr uint32 GeneratePetNumber() { return m_PetNumbers.Generate(); } void CreateItemText(uint32 guid, std::string text); - void AddItemText(uint32 guid, std::string text) { mItemTexts[guid] = text; } std::string GetItemText( uint32 id ) { ItemTextMap::const_iterator itr = mItemTexts.find( id ); @@ -911,7 +910,6 @@ class ObjectMgr IdGenerator m_AuctionIds; IdGenerator m_EquipmentSetIds; IdGenerator m_GuildIds; - IdGenerator m_ItemTextIds; IdGenerator m_MailIds; IdGenerator m_PetNumbers; IdGenerator m_GroupIds; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 953aacd0d..fe6d694e4 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9698" + #define REVISION_NR "9699" #endif // __REVISION_NR_H__