diff --git a/server/gameserver/guide.cc b/server/gameserver/guide.cc index 08302169..cdcecade 100644 --- a/server/gameserver/guide.cc +++ b/server/gameserver/guide.cc @@ -49,9 +49,9 @@ void Guide::UpdateStep() ProcMoveTarget(); } break; - case mt::MOVE_TARGET_AND_PICKUP_GUIDE_STEP: + case mt::PICKUP_GUIDE_STEP: { - ProcMoveTargetAndPickup(); + ProcPickup(); } break; case mt::KILL_ENEMY_GUIDE_STEP: @@ -99,7 +99,7 @@ void Guide::ProcMoveTarget() &owner_->xtimer_attacher); } -void Guide::ProcMoveTargetAndPickup() +void Guide::ProcPickup() { if (curr_step_meta_->_params.empty()) { NextStep(); diff --git a/server/gameserver/guide.h b/server/gameserver/guide.h index c2cd3a2f..69509ff3 100644 --- a/server/gameserver/guide.h +++ b/server/gameserver/guide.h @@ -17,7 +17,7 @@ class Guide void UpdateStep(); void ProcMoveTarget(); - void ProcMoveTargetAndPickup(); + void ProcPickup(); void ProcKillEnemy(); void ProcUseSkillAndKillEnemy(); void ProcUseSkill(); diff --git a/server/gameserver/mt/GuideStep.cc b/server/gameserver/mt/GuideStep.cc index b81db4b5..d2224e67 100644 --- a/server/gameserver/mt/GuideStep.cc +++ b/server/gameserver/mt/GuideStep.cc @@ -37,7 +37,7 @@ namespace mt 0)); } break; - case MOVE_TARGET_AND_PICKUP_GUIDE_STEP: + case PICKUP_GUIDE_STEP: case KILL_ENEMY_GUIDE_STEP: { for (auto& str : param_strs) { diff --git a/server/gameserver/mt/GuideStep.h b/server/gameserver/mt/GuideStep.h index 1bf7ae2a..faa82bc1 100644 --- a/server/gameserver/mt/GuideStep.h +++ b/server/gameserver/mt/GuideStep.h @@ -7,7 +7,7 @@ namespace mt { const int MOVE_TARGET_GUIDE_STEP = 1; - const int MOVE_TARGET_AND_PICKUP_GUIDE_STEP = 2; + const int PICKUP_GUIDE_STEP = 2; const int KILL_ENEMY_GUIDE_STEP = 3; const int USE_SKILL_AND_KILL_ENEMY_GUIDE_STEP = 4; const int USE_SKILL_GUIDE_STEP = 5;