diff options
| author | Strangerke | 2011-07-30 15:43:49 +0200 |
|---|---|---|
| committer | Strangerke | 2011-07-30 15:43:49 +0200 |
| commit | b53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff (patch) | |
| tree | 3ab435761eb439dd0381bc96eea429792f641852 /engines/cge/walk.cpp | |
| parent | 8b53899ca7d5ab1599f6bf3e1d4e49746876674b (diff) | |
| download | scummvm-rg350-b53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff.tar.gz scummvm-rg350-b53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff.tar.bz2 scummvm-rg350-b53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff.zip | |
CGE: Move some conditional defines to variables
Diffstat (limited to 'engines/cge/walk.cpp')
| -rw-r--r-- | engines/cge/walk.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp index 9bcc2be23d..e2c62513dd 100644 --- a/engines/cge/walk.cpp +++ b/engines/cge/walk.cpp @@ -30,8 +30,6 @@ namespace CGE { -extern Bar _barriers[]; - Walk *_hero; uint8 Cluster::_map[MAP_ZCNT][MAP_XCNT]; @@ -50,8 +48,8 @@ bool Cluster::isValid() const { } bool Cluster::chkBar() const { - assert(_vm->_now <= CAVE_MAX); - return (_a == _barriers[_vm->_now]._horz) && (_b == _barriers[_vm->_now]._vert); + assert(_vm->_now <= _vm->CAVE_MAX); + return (_a == _vm->_barriers[_vm->_now]._horz) && (_b == _vm->_barriers[_vm->_now]._vert); } Cluster XZ(int x, int y) { |