diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc index 52f08cb6..1f536a1f 100644 --- a/server/gameserver/hero.cc +++ b/server/gameserver/hero.cc @@ -142,13 +142,7 @@ float Hero::GetSpeed() void Hero::UpdateMove() { - #if 0 - do { - int distance = std::min(5, speed); - InternalUpdateMove(distance); - speed -= distance; - } while (speed > 0); - #endif + Creature::UpdateMove(); } void Hero::RecalcSelfCollider() diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index e6f2abe6..16b53ac4 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -155,7 +155,7 @@ void Player::InternalUpdate(int delta_time) moved_frames = 0; } if (moving) { - UpdateMove(); + UpdateMoving(); } } if (room->GetFrameNo() % 2 == 0) { @@ -226,7 +226,7 @@ void Player::InternalUpdate(int delta_time) } } -void Player::UpdateMove() +void Player::UpdateMoving() { if (action_type == AT_Relive) { CancelAction(); diff --git a/server/gameserver/player.h b/server/gameserver/player.h index 64c9c4fb..507b8fac 100644 --- a/server/gameserver/player.h +++ b/server/gameserver/player.h @@ -91,7 +91,7 @@ class Player : public Human virtual ~Player() override; virtual void Initialize() override; virtual void Update(int delta_time) override; - void UpdateMove(); + void UpdateMoving(); void UpdateShot(); void UpdateSelectWeapon(); void UpdateDropWeapon();