libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 23:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cancel walkto when actor tries to move.

Browse Source
This commit is contained in:
Joel Teichroeb 2011-05-09 11:14:22 +08:00 committed by Pawel Kolodziejski
parent 2b660226a5
commit 0c67b7c8c2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/grim/actor.cpp
View File

@ -505,7 +505,7 @@ void Actor::turnTo(float pitchParam, float yawParam, float rollParam) {
_turning = false;
}
void Actor::walkTo(Graphics::Vector3d p) {
void Actor::walkTo(const Graphics::Vector3d &p) {
if (p == _pos)
_walking = false;
else {
@ -632,6 +632,7 @@ bool Actor::isTurning() const {
void Actor::walkForward() {
float dist = g_grim->getPerSecond(_walkRate);
_walking = false;
// HACK: Limit the speed of the movement. Find a better way??
// When the game starts or the scene changes the value of g_grim->frameRate() can
@ -804,6 +805,7 @@ void Actor::setMumbleChore(int chore, Costume *cost) {
}
void Actor::turn(int dir) {
_walking = false;
float delta = g_grim->getPerSecond(_turnRate) * dir;
setYaw(_yaw + delta);
_currTurnDir = dir;

2
engines/grim/actor.h
View File

@ -66,7 +66,7 @@ public:
Color *getTalkColor() const { return _talkColor; }
void setPos(Graphics::Vector3d position);
Graphics::Vector3d getPos() const;
void walkTo(Graphics::Vector3d p);
void walkTo(const Graphics::Vector3d &p);
Graphics::Vector3d getDestPos() const;
void stopWalking() { _walking = false; }
bool isWalking() const;