1

server/gameserver/compose.cc

@@ -54,15 +54,12 @@ void Compose::IncNum()
 
 void Compose::TakeOnWeapon(Weapon* weapon)
 {
-    #if 0
-    std::set<int>* buffs = mt::Grasp::GetBuffs(owner_->AsHuman()->meta->id(),
-                                               owner_->GetBattleContext()->GetHeroLevel(),
-                                               weapon->meta->id());
+    std::set<int>* 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
 }

server/gameserver/mt/MergeItem.cc

@@ -12,7 +12,7 @@ namespace mt
     {
     }
 
-    std::set<int>* GetBuffs(int gun_id, int num)
+    std::set<int>* MergeItem::GetBuffs(int gun_id, int num)
     {
         return nullptr;
     }