From 2b0cec1cd7b87fe971f2adc44da20e03e71991dc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Aug 2011 21:15:59 +1000
Subject: CGE: Fix problem with being able to walk into protected areas

---
 engines/cge/walk.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp
index a418bfb178..7bce9e29e6 100644
--- a/engines/cge/walk.cpp
+++ b/engines/cge/walk.cpp
@@ -49,7 +49,8 @@ bool Cluster::isValid() const {
 
 bool Cluster::chkBar() const {
 	assert(_vm->_now <= _vm->_caveMax);
-	return (_a == _vm->_barriers[_vm->_now]._horz) && (_b == _vm->_barriers[_vm->_now]._vert);
+	return (_a < 0) || (_b < 0) || (_a >= _vm->_barriers[_vm->_now]._horz) || 
+		(_b >= _vm->_barriers[_vm->_now]._vert);
 }
 
 Cluster XZ(int x, int y) {
-- 
cgit v1.2.3