diff options
| author | Strangerke | 2011-09-16 20:31:11 +0200 |
|---|---|---|
| committer | Strangerke | 2011-09-16 20:31:39 +0200 |
| commit | 938c08ae589eaa9b0cafc02478997f34bf7d598d (patch) | |
| tree | e2ca985bb8db4db38184a168cf7597a75b313a77 /engines/cge/walk.cpp | |
| parent | 679fc754089473b8459c07b7192eb07f0b1ca183 (diff) | |
| download | scummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.tar.gz scummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.tar.bz2 scummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.zip | |
CGE: Get rid of some more global functions and static members
Diffstat (limited to 'engines/cge/walk.cpp')
| -rw-r--r-- | engines/cge/walk.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp index cda2875ac4..4de8bc779d 100644 --- a/engines/cge/walk.cpp +++ b/engines/cge/walk.cpp @@ -47,16 +47,6 @@ bool Cluster::isValid() const { return (_pt.x >= 0) && (_pt.x < kMapXCnt) && (_pt.y >= 0) && (_pt.y < kMapZCnt); } -Cluster XZ(int16 x, int16 y) { - if (y < kMapTop) - y = kMapTop; - - if (y > kMapTop + kMapHig - kMapGridZ) - y = kMapTop + kMapHig - kMapGridZ; - - return Cluster(x / kMapGridX, (y - kMapTop) / kMapGridZ); -} - Walk::Walk(CGEEngine *vm, BitmapPtr *shpl) : Sprite(vm, shpl), _dir(kDirNone), _tracePtr(-1), _level(0), _target(-1, -1), _findLevel(-1), _vm(vm) { } @@ -65,7 +55,7 @@ void Walk::tick() { if (_flags._hide) return; - _here = XZ(_x + _w / 2, _y + _h); + _here = _vm->XZ(_x + _w / 2, _y + _h); if (_dir != kDirNone) { _sys->funTouch(); |