From b53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 30 Jul 2011 15:43:49 +0200
Subject: CGE: Move some conditional defines to variables

---
 engines/cge/walk.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/cge/walk.cpp')

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) {
-- 
cgit v1.2.3