From b78facb844aa2308e5c6f2a15b38fa10a4e921e5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 6 Sep 2022 13:15:14 +0800 Subject: [PATCH] 1 --- server/gameserver/battledatacontext.cc | 2 +- server/gameserver/battledatacontext.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index 8b6a1dc1..bc100aac 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -268,7 +268,7 @@ void BattleDataContext::CalcBattleStat(struct PlayerStats* stats) } } -float BattleDataContext::CalcDmg(Creature* target, int weapon_uniid) +float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet) { float total_atk = (GetTotalAtk() / 100 + 1) * GetWeaponAtk(); float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / 1000); diff --git a/server/gameserver/battledatacontext.h b/server/gameserver/battledatacontext.h index f23e29e9..3711d3fc 100644 --- a/server/gameserver/battledatacontext.h +++ b/server/gameserver/battledatacontext.h @@ -20,6 +20,7 @@ namespace MetaData } class Creature; +class Bullet; struct PlayerStats; struct BattleDataContext { @@ -47,7 +48,7 @@ struct BattleDataContext void CalcBattleStat(struct PlayerStats* stats); - float CalcDmg(Creature* target, int weapon_uniid); + float CalcDmg(Creature* target, Bullet* bullet); float GetDef();