1 files changed, 7 insertions, 7 deletions

diff --git a/engines/gob/game_v6.cpp b/engines/gob/game_v6.cpp
index 8d40d41acc..dade2adddf 100644
--- a/engines/gob/game_v6.cpp
+++ b/engines/gob/game_v6.cpp
@@ -261,7 +261,7 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 		key = checkKeys(&_vm->_global->_inter_mouseX,
 				&_vm->_global->_inter_mouseY, &_mouseButtons, handleMouse);
 
-		if ((handleMouse == 0) && (_mouseButtons != 0)) {
+		if ((handleMouse == 0) && (_mouseButtons != kMouseButtonsNone)) {
 			_vm->_util->waitMouseRelease(0);
 			key = 3;
 		}
@@ -289,7 +289,7 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 		}
 
 		if (handleMouse != 0) {
-			if (_mouseButtons != 0) {
+			if (_mouseButtons != kMouseButtonsNone) {
 
 				if (deltaTime > 0) {
 					_vm->_draw->animateCursor(2);
@@ -308,7 +308,7 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 
 				if ((key != 0) || ((pResId != 0) && (*pResId != 0))) {
 					if ((handleMouse & 1) &&
-							((deltaTime <= 0) || (_mouseButtons == 0)))
+							((deltaTime <= 0) || (_mouseButtons == kMouseButtonsNone)))
 						_vm->_draw->blitCursor();
 
 					if (key != _lastCollKey)
@@ -331,7 +331,7 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 				collSubReenter();
 		}
 
-		if ((deltaTime == -2) && (key == 0) && (_mouseButtons == 0)) {
+		if ((deltaTime == -2) && (key == 0) && (_mouseButtons == kMouseButtonsNone)) {
 			if (pResId != 0)
 				*pResId = 0;
 
@@ -343,7 +343,7 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 		} else if (handleMouse != 0)
 			_vm->_draw->animateCursor(-1);
 
-		if ((deltaTime < 0) && (key == 0) && (_mouseButtons == 0)) {
+		if ((deltaTime < 0) && (key == 0) && (_mouseButtons == kMouseButtonsNone)) {
 			uint32 curtime = _vm->_util->getTimeKey();
 			if ((curtime + deltaTime) > timeKey) {
 				if (pResId != 0)
@@ -1069,7 +1069,7 @@ int16 Game_v6::checkMousePoint(int16 all, int16 *resId, int16 *resIndex) {
 			if ((ptr->flags & 0xF) < 1)
 				continue;
 
-			if ((((ptr->flags & 0x70) >> 4) != (_mouseButtons - 1)) &&
+			if ((((ptr->flags & 0x70) >> 4) != (((int32) _mouseButtons) - 1)) &&
 					(((ptr->flags & 0x70) >> 4) != 2))
 				continue;
 
@@ -1088,7 +1088,7 @@ int16 Game_v6::checkMousePoint(int16 all, int16 *resId, int16 *resIndex) {
 		}
 	}
 
-	if ((_mouseButtons != 1) && (all == 0))
+	if ((_mouseButtons != kMouseButtonsLeft) && (all == 0))
 		return 0x11B;
 
 	return 0;