diff options
| author | Max Horn | 2003-10-02 17:43:02 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-02 17:43:02 +0000 |
| commit | 0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb (patch) | |
| tree | cef3882f5cb527ab9ced0c208d6f9c045bf8f3c4 /scumm/actor.cpp | |
| parent | f26d3d1784756fccaaf306f6b13a28cb709ad5bc (diff) | |
| download | scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.tar.gz scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.tar.bz2 scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.zip | |
renamed namespace ScummVM to Common
svn-id: r10544
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 0c7b4e5d94..e8b82103de 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -158,8 +158,8 @@ int Scumm::getAngleFromPos(int x, int y) const { } } -int Actor::calcMovementFactor(ScummVM::Point next) { - ScummVM::Point actorPos(_pos); +int Actor::calcMovementFactor(Common::Point next) { + Common::Point actorPos(_pos); int diffX, diffY; int32 deltaXFactor, deltaYFactor; @@ -341,7 +341,7 @@ void Actor::setBox(int box) { int Actor::actorWalkStep() { int tmpX, tmpY; - ScummVM::Point actorPos; + Common::Point actorPos; int distX, distY; int nextFacing; @@ -1334,7 +1334,7 @@ void Actor::startWalkAnim(int cmd, int angle) { void Actor::walkActor() { int new_dir, next_box; - ScummVM::Point foundPath; + Common::Point foundPath; if (_vm->_version >= 7) { // FIXME - this is kind of a hack right now but it fixes the @@ -1414,7 +1414,7 @@ void Actor::walkActor() { /* void Actor::walkActorV12() { - ScummVM::Point foundPath, tmp; + Common::Point foundPath, tmp; int new_dir, next_box; if (moving & MF_TURN) { @@ -1465,7 +1465,7 @@ void Actor::walkActorV12() { */ void Actor::walkActorOld() { - ScummVM::Point p2, p3; // Gate locations + Common::Point p2, p3; // Gate locations int new_dir, next_box; if (!moving) |