From c743df7d475735b26395c6ed5c17b4be2d972be2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 28 五月 2025 16:21:12 +0800
Subject: [PATCH] 1.初步去掉GlassList, 替换为Slot,待测;
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 3bffbe7..e28bc78 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -80,16 +80,14 @@
ASSERT(m_pEquipment);
- std::list<SERVO::CGlass*> list;
- m_pEquipment->getGlassList(list);
- for (auto item : list) {
- item->addRef();
- item->release(); // 閲婃斁list涓殑寮曠敤
+ for (int i = 0; i < SLOT_MAX; i++) {
+ SERVO::CGlass* pGlass = m_pEquipment->getGlassFromSlot(i+1);
+ pGlass->addRef();
- SERVO::CGlass* pBuddy = item->getBuddy();
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
- m_listCtrl.SetItemData(index, (DWORD_PTR)item);
- m_listCtrl.SetItemText(index, 1, item->getID().c_str());
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pGlass);
+ m_listCtrl.SetItemText(index, 1, pGlass->getID().c_str());
if (pBuddy != nullptr) {
m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
}
@@ -172,6 +170,7 @@
void CEquipmentPage2::OnBnClickedButtonRemove()
{
+ /*
int index = GetSelectedItemIndex();
if (index >= 0) {
SERVO::CGlass* pGlass = (SERVO::CGlass*)m_listCtrl.GetItemData(index);
@@ -182,4 +181,5 @@
m_listCtrl.DeleteItem(index);
}
}
+ */
}
--
Gitblit v1.9.3