From 2afca5a06eafff24b2892c7270ab994b04ffb8d4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 16 Sep 2014 22:12:24 +0200
Subject: ACCESS: Fix bool/int comparisons and assignments

---
 engines/access/amazon/amazon_scripts.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8c172334a5..8d63da2c8f 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -271,11 +271,11 @@ void AmazonScripts::plotInactive() {
 		_vm->_inactive._spritesPtr = _vm->_player->_playerSprites;
 		_vm->_player->_playerSprites = tmp;
 		_game->_charSegSwitch = false;
-	} else if (_game->_jasMayaFlag != _game->_currentCharFlag) {
+	} else if (_game->_jasMayaFlag != (_game->_currentCharFlag ? 1 : 0)) {
 		if (_vm->_player->_playerOff) {
-			_game->_jasMayaFlag = _game->_currentCharFlag;
+			_game->_jasMayaFlag = (_game->_currentCharFlag ? 1 : 0);
 		} else {
-			_game->_currentCharFlag = _game->_jasMayaFlag;
+			_game->_currentCharFlag = (_game->_jasMayaFlag == 1);
 			int tmpX = _game->_rawInactiveX;
 			int tmpY = _game->_rawInactiveY;
 			_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
-- 
cgit v1.2.3