diff --git a/server/gameserver/mt/MergeItem.cc b/server/gameserver/mt/MergeItem.cc index 9b58fbc8..2d9a65d2 100644 --- a/server/gameserver/mt/MergeItem.cc +++ b/server/gameserver/mt/MergeItem.cc @@ -3,6 +3,7 @@ #include "mt/MergeItem.h" IMPL_TABLE(mt::MergeItem) +std::map> mt::MergeItem::gun_num_buff_hash_; namespace mt { @@ -11,4 +12,9 @@ namespace mt { } + std::set* GetBuffs(int gun_id, int num) + { + return nullptr; + } + } diff --git a/server/gameserver/mt/MergeItem.h b/server/gameserver/mt/MergeItem.h index 9eea4895..dccec10f 100644 --- a/server/gameserver/mt/MergeItem.h +++ b/server/gameserver/mt/MergeItem.h @@ -13,7 +13,14 @@ namespace mt void Init1(); + static std::set* GetBuffs(int gun_id, int num); + private: + static std::map> gun_num_buff_hash_; + + std::set _add_buff_list; + std::set _remove_buff_list; + }; }