From 92ecda9c19abcb67d65a1fdb7ba9911c9828003d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 20 May 2023 22:14:33 +0800 Subject: [PATCH] 1 --- server/gameserver/compose.cc | 5 +++++ server/gameserver/compose.h | 1 + server/gameserver/human.cc | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/gameserver/compose.cc b/server/gameserver/compose.cc index 7e1db850..5618607a 100644 --- a/server/gameserver/compose.cc +++ b/server/gameserver/compose.cc @@ -47,6 +47,11 @@ void Compose::Clear() hold_buffs_.clear(); } +bool Compose::CanAdd() +{ + return GetNum() < 9; +} + void Compose::IncNum() { ++num_; diff --git a/server/gameserver/compose.h b/server/gameserver/compose.h index ea0f423d..f90f8bb2 100644 --- a/server/gameserver/compose.h +++ b/server/gameserver/compose.h @@ -12,6 +12,7 @@ class Compose void Init(); void IncNum(); + bool CanAdd(); int GetNum() { return num_; } private: diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 3eac896a..5aa70c70 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2637,7 +2637,7 @@ void Human::ProcLootWeaponNew(AddItemDTO& dto) if (GetCurrWeapon()->weapon_idx == GUN_SLOT1 || GetCurrWeapon()->weapon_idx == GUN_SLOT2) { if (GetCurrWeapon()->weapon_id == dto.item_meta->id()) { - if (GetCompose()->GetNum() >= 9) { + if (!GetCompose()->CanAdd()) { return; } GetCompose()->IncNum();