From ab509ec6e93dce15f33b9a1cd9480616ac09d3bb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 9 Sep 2022 11:24:51 +0800 Subject: [PATCH] 1 --- server/gameserver/weapon.cc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/server/gameserver/weapon.cc b/server/gameserver/weapon.cc index 0dbcfb47..6425ad83 100644 --- a/server/gameserver/weapon.cc +++ b/server/gameserver/weapon.cc @@ -31,15 +31,27 @@ void Weapon::Recalc() int Weapon::GetClipVolume(Creature* c) { - return c->GetBattleContext()->GetClipVolume(c, this); + if (c->GetBattleContext()) { + return c->GetBattleContext()->GetClipVolume(c, this); + } else { + return meta ? meta->i->clip_volume() :0; + } } int Weapon::GetFireRate(Creature* c) { - return c->GetBattleContext()->GetFireRate(c, this); + if (c->GetBattleContext()) { + return c->GetBattleContext()->GetFireRate(c, this); + } else { + return meta ? meta->i->fire_rate() :0; + } } int Weapon::GetReloadTime(Creature* c) { - return c->GetBattleContext()->GetReloadTime(c, this); + if (c->GetBattleContext()) { + return c->GetBattleContext()->GetReloadTime(c, this); + } else { + return meta ? meta->i->reload_time() :0; + } }