From 2366fb6b6f971d3101aa1cd58bae6ad52c2f6263 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 28 Jul 2021 09:44:54 +0000 Subject: [PATCH] 1 --- server/gameserver/metadata.cc | 14 ++++++++++++++ server/gameserver/metadata.h | 1 + server/gameserver/metamgr.cc | 3 +++ 3 files changed, 18 insertions(+) diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index c97a13e..cbdd8f9 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -340,6 +340,20 @@ namespace MetaData } } + void Equip::Init2() + { + if (i->equip_type() == EQUIP_TYPE_WEAPON) { + MetaData::Equip* bullet = MetaMgr::Instance()->GetEquip(i->use_bullet()); + if (!bullet) { + #if 0 + a8::XPrintf("no bullet %d\n", {i->id()}); + #else + abort(); + #endif + } + } + } + int Equip::GetWeaponIdx() { int weapon_idx = -1; diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 6e0ea00..daa8388 100644 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -89,6 +89,7 @@ namespace MetaData long long special_damage_type = 0; void Init(); + void Init2(); int GetWeaponIdx(); bool Match(CondAddBuff_e cond, int val, int val2); }; diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 4560d3b..f81c109 100644 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -454,6 +454,9 @@ private: for (auto& buff : buff_list) { buff.Init2(); } + for (auto& equip : equip_list) { + equip.Init2(); + } } }