diff --git a/server/gameserver/compose.cc b/server/gameserver/compose.cc index e588b971..7e1db850 100644 --- a/server/gameserver/compose.cc +++ b/server/gameserver/compose.cc @@ -54,15 +54,12 @@ void Compose::IncNum() void Compose::TakeOnWeapon(Weapon* weapon) { - #if 0 - std::set* buffs = mt::Grasp::GetBuffs(owner_->AsHuman()->meta->id(), - owner_->GetBattleContext()->GetHeroLevel(), - weapon->meta->id()); + std::set* buffs = mt::MergeItem::GetBuffs(weapon->meta->id(), + num_); Clear(); if (buffs) { for (int buff_id : *buffs) { hold_buffs_.push_back(owner_->TryAddBuff(owner_, buff_id, nullptr)); } } - #endif } diff --git a/server/gameserver/mt/MergeItem.cc b/server/gameserver/mt/MergeItem.cc index 2d9a65d2..afe07fde 100644 --- a/server/gameserver/mt/MergeItem.cc +++ b/server/gameserver/mt/MergeItem.cc @@ -12,7 +12,7 @@ namespace mt { } - std::set* GetBuffs(int gun_id, int num) + std::set* MergeItem::GetBuffs(int gun_id, int num) { return nullptr; }