From 6de9cb4a0de820d5b9032ff9baed48046a0bbff0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 29 Mar 2023 20:24:19 +0800 Subject: [PATCH] 1 --- server/gameserver/buff/bufffactory.cc | 3 --- server/gameserver/buff/callfunc.cc | 4 ++++ server/gameserver/buff/summon_hero.cc | 19 ------------------- server/gameserver/buff/summon_hero.h | 12 ------------ 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 server/gameserver/buff/summon_hero.cc delete mode 100644 server/gameserver/buff/summon_hero.h diff --git a/server/gameserver/buff/bufffactory.cc b/server/gameserver/buff/bufffactory.cc index ad5ad7dc..95ff3e5c 100644 --- a/server/gameserver/buff/bufffactory.cc +++ b/server/gameserver/buff/bufffactory.cc @@ -36,7 +36,6 @@ #include "buff/select_target_with_self_pos.h" #include "buff/sprint.h" #include "buff/summon_loot.h" -#include "buff/summon_hero.h" #include "buff/summon_obstacle.h" #include "buff/turnover.h" #include "buff/use_skill.h" @@ -118,8 +117,6 @@ std::shared_ptr BuffFactory::MakeBuff(const mt::Buff* buff_meta) return std::make_shared(); case kBET_Sprint: return std::make_shared(); - case kBET_SummonHero: - return std::make_shared(); case kBET_SummonObstacle: return std::make_shared(); case kBET_TurnOver: diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc index 36c591be..256a759e 100644 --- a/server/gameserver/buff/callfunc.cc +++ b/server/gameserver/buff/callfunc.cc @@ -607,12 +607,16 @@ void CallFuncBuff::SummonHeroSpecPoint() float x = meta->GetBuffParam3(this); float y = meta->GetBuffParam4(this); float z = meta->GetBuffParam5(this); + if (!owner->dead || meta->dead_valid() != 0) { + } } void CallFuncBuff::SummonHeroSpecDistance() { int hero_id = meta->_int_buff_param2; float distance = meta->GetBuffParam3(this); + if (!owner->dead || meta->dead_valid() != 0) { + } } void CallFuncBuff::ClearSummonHero() diff --git a/server/gameserver/buff/summon_hero.cc b/server/gameserver/buff/summon_hero.cc deleted file mode 100644 index cccd74fe..00000000 --- a/server/gameserver/buff/summon_hero.cc +++ /dev/null @@ -1,19 +0,0 @@ -#include "precompile.h" - -#include "buff/summon_hero.h" - -#include "creature.h" - -#include "mt/Buff.h" - -void SummonHeroBuff::Activate() -{ - if (!owner->dead || meta->dead_valid() != 0) { - owner->SummonHero(this, owner->GetPos(), owner->GetMoveDir()); - } -} - -void SummonHeroBuff::Deactivate() -{ - -} diff --git a/server/gameserver/buff/summon_hero.h b/server/gameserver/buff/summon_hero.h deleted file mode 100644 index c5fd18c9..00000000 --- a/server/gameserver/buff/summon_hero.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "buff.h" - -class SummonHeroBuff : public Buff -{ -public: - - virtual void Activate() override; - virtual void Deactivate() override; - -};