[C++/Source] Gildenlager

--- "a/db/ClientManager.cpp"
+++ "b/db/ClientManager.cpp"
@@ -132,3 +132,42 @@ int CClientManager::Process()
 			// NEW [END]
 			/* [...] */
 }
+
+/* [...] */
+
+void CClientManager::ChargeCash(const TRequestChargeCash* packet)
+{
+	/* [...] */
+}
+
+// NEW
+void CClientManager::EraseItemCache(DWORD id)
+{
+	CItemCache* c = GetItemCache(id);
+
+	if (c)
+	{
+		TItemCacheSetPtrMap::iterator it = m_map_pkItemCacheSetPtr.find(c->Get()->owner);
+
+		if (it != m_map_pkItemCacheSetPtr.end())
+		{
+			if (g_test_server)
+				sys_log(0, "ITEM_CACHE: erase cache owner %u id %u", c->Get()->owner, id);
+
+			it->second->erase(c);
+		}
+
+		m_map_itemCache.erase(id);
+
+		delete c;
+	}
+}
+
+const TItemTable* CClientManager::GetItemTable(DWORD dwVnum) const
+{
+	itertype(m_map_itemTableByVnum) it = m_map_itemTableByVnum.find(dwVnum);
+	if (it == m_map_itemTableByVnum.end())
+		return NULL;
+	return it->second;
+}
+// NEW [END]

--- /dev/null
+++ b/db/ClientManager.h
@@ -0,0 +1,15 @@
+/* [...] */
+
+class CClientManager : public CNetBase, public singleton<CClientManager>
+{
+	/* [...] */
+
+	void UpdateChannelStatus(TChannelStatus* pData);
+	void RequestChannelStatus(CPeer* peer, DWORD dwHandle);
+
+	// NEW
+public:
+	void				EraseItemCache(DWORD id);
+	const TItemTable*	GetItemTable(DWORD dwVnum) const;
+	// NEW [END]
+};

--- a/game/input_db.cpp
+++ b/game/input_db.cpp
@@ -132,10 +132,10 @@ void CInputDB::GuildSafebox(BYTE bHeader, DWORD dwHandle, const char* c_pData)
 			else
 			{
 				char szLogQuery[512];
-				snprintf(szLogQuery, sizeof(szLogQuery), "INSERT INTO log.gsafebox_err_log (owner_id, item_id, item_vnum, item_count, is_gm_owner, "
+				snprintf(szLogQuery, sizeof(szLogQuery), "INSERT INTO log.gsafebox_err_log (owner_id, item_id, item_vnum, item_count, "
 					"socket0, socket1, socket2, attrtype0, attrvalue0, attrtype1, attrvalue1, attrtype2, attrvalue2, attrtype3, attrvalue3, "
 					"attrtype4, attrvalue4, attrtype5, attrvalue5, attrtype6, attrvalue6) VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %d, "
-					"%u, %d, %u, %d, %u, %d, %u, %d, %u, %d, %u, %d)", pItem->owner, pItem->id, pItem->vnum, pItem->count, pItem->is_gm_owner,
+					"%u, %d, %u, %d, %u, %d, %u, %d, %u, %d, %u, %d)", pItem->owner, pItem->id, pItem->vnum, pItem->count,
 					pItem->alSockets[0], pItem->alSockets[1], pItem->alSockets[2], pItem->aAttr[0].bType, pItem->aAttr[0].sValue,
 					pItem->aAttr[1].bType, pItem->aAttr[1].sValue, pItem->aAttr[2].bType, pItem->aAttr[2].sValue, pItem->aAttr[3].bType,
 					pItem->aAttr[3].sValue, pItem->aAttr[4].bType, pItem->aAttr[4].sValue, pItem->aAttr[5].bType, pItem->aAttr[5].sValue,

--- a/game/guild_safebox.cpp
+++ b/game/guild_safebox.cpp
@@ -182,13 +182,6 @@ void CGuildSafeBox::OpenSafebox(LPCHARACTER ch)
 			item.vnum = pkItem->vnum;
 			item.count = pkItem->count;
 			item.pos = pkItem->pos;
-#ifdef __EXTRA_ITEM_UPGRADE__
-			item.extra_upgrade_level = pkItem->extra_upgrade_level;
-#endif
-#ifdef __JEWELRY_ADDON__
-			item.jewelry_addon = pkItem->jewelry_addon;
-			item.jewelry_addon_time_left = pkItem->jewelry_addon_time_left;
-#endif
 			thecore_memcpy(item.sockets, pkItem->alSockets, sizeof(item.sockets));
 			thecore_memcpy(item.attr, pkItem->aAttr, sizeof(item.attr));
 
@@ -228,13 +221,6 @@ void CGuildSafeBox::CheckInItem(LPCHARACTER ch, LPITEM pkItem, int iDestCell)
 	item.pos = iDestCell;
 	item.vnum = pkItem->GetVnum();
 	item.count = pkItem->GetCount();
-#ifdef __EXTRA_ITEM_UPGRADE__
-	item.extra_upgrade_level = pkItem->GetExtraItemUpgradeLevel();
-#endif
-#ifdef __JEWELRY_ADDON__
-	item.jewelry_addon = pkItem->GetJewelryAddon();
-	item.jewelry_addon_time_left = pkItem->GetJewelryAddonTimeLeft();
-#endif
 	memcpy(item.alSockets, pkItem->GetSockets(), sizeof(item.alSockets));
 	memcpy(item.aAttr, pkItem->GetAttributes(), sizeof(item.aAttr));
 
@@ -419,13 +405,6 @@ void CGuildSafeBox::DB_SetItem(TPlayerItem* pkItem)
 	item.vnum = pkItem->vnum;
 	item.count = pkItem->count;
 	item.pos = pkItem->pos;
-#ifdef __EXTRA_ITEM_UPGRADE__
-	item.extra_upgrade_level = pkItem->extra_upgrade_level;
-#endif
-#ifdef __JEWELRY_ADDON__
-	item.jewelry_addon = pkItem->jewelry_addon;
-	item.jewelry_addon_time_left = pkItem->jewelry_addon_time_left;
-#endif
 	thecore_memcpy(item.sockets, pkItem->alSockets, sizeof(item.sockets));
 	thecore_memcpy(item.attr, pkItem->aAttr, sizeof(item.attr));
 
@@ -449,7 +428,7 @@ void CGuildSafeBox::DB_DelItem(BYTE bSlot)
 
 	delete m_pkItems[bSlot];
 	m_pkItems[bSlot] = NULL;
-	for (int i = bSlot; i < bSlot + GUILD_SAFEBOX_ITEM_WIDTH * pProto->bSize; ++i)
+	for (int i = bSlot; i < bSlot + GUILD_SAFEBOX_ITEM_WIDTH * pProto->bSize; i += GUILD_SAFEBOX_ITEM_WIDTH)
 		m_bItemGrid[i] = 0;
 
 	__ClientPacket(GUILD_SAFEBOX_SUBHEADER_REMOVE_ITEM, &bSlot, sizeof(BYTE));