From b00d07ba26bee32396923cbe44b470c7ce08398b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 4 Jan 2024 16:14:59 +0800 Subject: [PATCH] 1 --- server/gameserver/ability.cc | 3 +++ server/gameserver/ability.h | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc index e92420a2..b50f59d8 100644 --- a/server/gameserver/ability.cc +++ b/server/gameserver/ability.cc @@ -424,6 +424,8 @@ void Ability::RecalcAttrRuduce(int attr_id) list_head* next = nullptr; bool inited = false; float new_val = 0.0f; +#ifdef NEW_NUM +#else list_for_each_safe(pos, next, head) { AttrRuduce* e = list_entry(pos, AttrRuduce, @@ -451,6 +453,7 @@ void Ability::RecalcAttrRuduce(int attr_id) break; } } +#endif if (IsValidHumanAttr(attr_id)) { std::get<0>(attr_dec_[attr_id]) = new_val; } else if (IsValidHumanVirtualAttr(attr_id)) { diff --git a/server/gameserver/ability.h b/server/gameserver/ability.h index 6633d468..8d97d6c4 100644 --- a/server/gameserver/ability.h +++ b/server/gameserver/ability.h @@ -48,13 +48,13 @@ private: void RecalcAttrDirect(int attr_id); private: CreatureWeakPtr owner_; - std::array, kHAT_End> attr_abs_ = {}; - std::array, kHAT_End> attr_rate_ = {}; - std::array, kHAT_End> attr_add_ = {}; - std::array, kHAT_End> attr_dec_ = {}; + std::array, kNHAT_End> attr_abs_ = {}; + std::array, kNHAT_End> attr_rate_ = {}; + std::array, kNHAT_End> attr_add_ = {}; + std::array, kNHAT_End> attr_dec_ = {}; std::array, kHVAT_End - kHVAT_Begin> vattr_add_ = {}; std::array, kHVAT_End - kHVAT_Begin> vattr_dec_ = {}; - std::array, kHAT_End> attr_direct_ = {}; + std::array, kNHAT_End> attr_direct_ = {}; std::array switch_times_ = {}; std::map immune_tags_;