From e1365f04b5b7efb689edcf11eb0c4d4e416f8ad3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 29 Dec 2022 09:58:05 +0800 Subject: [PATCH] 1 --- .../gameserver/buff/{passener.cc => passenger.cc} | 6 ++++-- server/gameserver/buff/{passener.h => passenger.h} | 2 +- server/gameserver/buff/pull_to_walkable.cc | 6 ++++++ server/gameserver/buff/pull_to_walkable.h | 2 +- server/gameserver/buff/rescuer.cc | 5 +++++ server/gameserver/buff/rescuer.h | 2 +- server/gameserver/buff/reserve.cc | 9 +++++++++ server/gameserver/buff/reserve.h | 2 +- server/gameserver/buff/reserve_move.h | 2 +- .../gameserver/buff/select_target_with_self_pos.cc | 4 ++++ .../gameserver/buff/select_target_with_self_pos.h | 2 +- server/gameserver/buff/sprint.cc | 13 +++++++++++-- server/gameserver/buff/sprint.h | 2 +- server/gameserver/buff/summon_hero.cc | 4 ++++ server/gameserver/buff/turnover.cc | 7 +++++++ server/gameserver/buff/turnover.h | 2 +- 16 files changed, 58 insertions(+), 12 deletions(-) rename server/gameserver/buff/{passener.cc => passenger.cc} (81%) rename server/gameserver/buff/{passener.h => passenger.h} (94%) diff --git a/server/gameserver/buff/passener.cc b/server/gameserver/buff/passenger.cc similarity index 81% rename from server/gameserver/buff/passener.cc rename to server/gameserver/buff/passenger.cc index d5e3a2d7..b8f00c89 100644 --- a/server/gameserver/buff/passener.cc +++ b/server/gameserver/buff/passenger.cc @@ -2,7 +2,9 @@ #include "buff/passenger.h" -void PassengerAdd::Activate() +#include "creature.h" + +void PassengerBuff::Activate() { hold_curr_weapon_idx_ = caster_.Get()->GetCurrWeapon()->weapon_idx; CalcPassengerShotOffset(); @@ -10,7 +12,7 @@ void PassengerAdd::Activate() caster_.Get()->SyncAroundPlayers(__FILE__, __LINE__, __func__); } -void PassenerAdd::Deactivate() +void PassengerBuff::Deactivate() { RecoverHoldWeapons(); caster_.Get()->shoot_offset = GlmHelper::ZERO; diff --git a/server/gameserver/buff/passener.h b/server/gameserver/buff/passenger.h similarity index 94% rename from server/gameserver/buff/passener.h rename to server/gameserver/buff/passenger.h index 16d21041..261fa2f9 100644 --- a/server/gameserver/buff/passener.h +++ b/server/gameserver/buff/passenger.h @@ -4,7 +4,7 @@ class PassengerBuff : Buff { - pubic: +public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/pull_to_walkable.cc b/server/gameserver/buff/pull_to_walkable.cc index d404fbc7..1eab991e 100644 --- a/server/gameserver/buff/pull_to_walkable.cc +++ b/server/gameserver/buff/pull_to_walkable.cc @@ -1,7 +1,13 @@ #include "precompile.h" +#include +#include + #include "buff/pull_to_walkable.h" +#include "creature.h" +#include "room.h" + void PullToWalkableBuff::Activate() { if (!owner->CollisonDetection()) { diff --git a/server/gameserver/buff/pull_to_walkable.h b/server/gameserver/buff/pull_to_walkable.h index 1b75c023..d58fd352 100644 --- a/server/gameserver/buff/pull_to_walkable.h +++ b/server/gameserver/buff/pull_to_walkable.h @@ -4,7 +4,7 @@ class PullToWalkableBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/rescuer.cc b/server/gameserver/buff/rescuer.cc index 61332692..6013a796 100644 --- a/server/gameserver/buff/rescuer.cc +++ b/server/gameserver/buff/rescuer.cc @@ -2,6 +2,11 @@ #include "buff/rescuer.h" +#include "creature.h" +#include "trigger.h" +#include "room.h" +#include "human.h" + void RescuerBuff::Activate() { Human* target = owner->room->GetHumanByUniId(owner->AsHuman()->GetActionTargetId()); diff --git a/server/gameserver/buff/rescuer.h b/server/gameserver/buff/rescuer.h index ddb8aa63..005b194e 100644 --- a/server/gameserver/buff/rescuer.h +++ b/server/gameserver/buff/rescuer.h @@ -4,7 +4,7 @@ class RescuerBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/reserve.cc b/server/gameserver/buff/reserve.cc index f4161646..a4bd87e4 100644 --- a/server/gameserver/buff/reserve.cc +++ b/server/gameserver/buff/reserve.cc @@ -1,7 +1,16 @@ #include "precompile.h" +#include +#include + #include "buff/reserve.h" +#include "creature.h" +#include "skillhelper.h" + +#include "mt/Skill.h" +#include "mt/Buff.h" + void ReserveBuff::Activate() { if (caster_.Get()) { diff --git a/server/gameserver/buff/reserve.h b/server/gameserver/buff/reserve.h index c27ddf5e..75ed51fd 100644 --- a/server/gameserver/buff/reserve.h +++ b/server/gameserver/buff/reserve.h @@ -4,7 +4,7 @@ class ReserveBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/reserve_move.h b/server/gameserver/buff/reserve_move.h index 22d1c74b..e55c3b0f 100644 --- a/server/gameserver/buff/reserve_move.h +++ b/server/gameserver/buff/reserve_move.h @@ -4,7 +4,7 @@ class ReserveMoveBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/select_target_with_self_pos.cc b/server/gameserver/buff/select_target_with_self_pos.cc index 7b2339db..4a890dcb 100644 --- a/server/gameserver/buff/select_target_with_self_pos.cc +++ b/server/gameserver/buff/select_target_with_self_pos.cc @@ -2,6 +2,10 @@ #include "buff/select_target_with_self_pos.h" +#include "creature.h" + +#include "mt/Buff.h" + void SelectTargetWithSelfPosBuff::Activate() { std::vector targets; diff --git a/server/gameserver/buff/select_target_with_self_pos.h b/server/gameserver/buff/select_target_with_self_pos.h index c18016a0..b9298471 100644 --- a/server/gameserver/buff/select_target_with_self_pos.h +++ b/server/gameserver/buff/select_target_with_self_pos.h @@ -4,7 +4,7 @@ class SelectTargetWithSelfPosBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/sprint.cc b/server/gameserver/buff/sprint.cc index 5a80f2be..fd1906b1 100644 --- a/server/gameserver/buff/sprint.cc +++ b/server/gameserver/buff/sprint.cc @@ -2,7 +2,16 @@ #include "buff/sprint.h" -void SprintAdd::Activate() +#include "creature.h" +#include "skillhelper.h" +#include "skill.h" +#include "room.h" +#include "human.h" + +#include "mt/Buff.h" +#include "mt/Skill.h" + +void SprintBuff::Activate() { if (caster_.Get()->IsPlayer()) { if (meta->_int_param5) { @@ -139,7 +148,7 @@ void SprintAdd::Activate() } } -void SprintAdd::Deactivate() +void SprintBuff::Deactivate() { if (meta->_int_param5) { owner->DecDisableMoveDirTimes(); diff --git a/server/gameserver/buff/sprint.h b/server/gameserver/buff/sprint.h index 04f38fe7..a9c01857 100644 --- a/server/gameserver/buff/sprint.h +++ b/server/gameserver/buff/sprint.h @@ -4,7 +4,7 @@ class SprintBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override; diff --git a/server/gameserver/buff/summon_hero.cc b/server/gameserver/buff/summon_hero.cc index 5e589c10..cccd74fe 100644 --- a/server/gameserver/buff/summon_hero.cc +++ b/server/gameserver/buff/summon_hero.cc @@ -2,6 +2,10 @@ #include "buff/summon_hero.h" +#include "creature.h" + +#include "mt/Buff.h" + void SummonHeroBuff::Activate() { if (!owner->dead || meta->dead_valid() != 0) { diff --git a/server/gameserver/buff/turnover.cc b/server/gameserver/buff/turnover.cc index ffe5934c..050ed647 100644 --- a/server/gameserver/buff/turnover.cc +++ b/server/gameserver/buff/turnover.cc @@ -2,6 +2,13 @@ #include "buff/turnover.h" +#include "creature.h" +#include "room.h" +#include "skill.h" + +#include "mt/Buff.h" +#include "mt/Skill.h" + void TurnOverBuff::Activate() { Skill* skill = owner->CurrentSkill(); diff --git a/server/gameserver/buff/turnover.h b/server/gameserver/buff/turnover.h index e8195d36..4550ecae 100644 --- a/server/gameserver/buff/turnover.h +++ b/server/gameserver/buff/turnover.h @@ -4,7 +4,7 @@ class TurnOverBuff : Buff { - pubic: + public: virtual void Activate() override; virtual void Deactivate() override;