From 563d76d34292bf8e83bbb6fb254799af2ebe9fb8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 Mar 2009 03:45:33 +0000
Subject: AGOS: Changed _leftButtonDown & _rightButtonDown from byte to int

svn-id: r39256
---
 engines/agos/agos.cpp   |  4 ++--
 engines/agos/agos.h     |  2 +-
 engines/agos/cursor.cpp | 14 +++++++-------
 engines/agos/event.cpp  |  4 ++--
 engines/agos/input.cpp  |  4 ++--
 engines/agos/vga.cpp    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 5b6465dc32..3a92553120 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -290,8 +290,8 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_pendingDeleteTimeEvent = 0;
 
 	_initMouse = 0;
-	_leftButtonDown = 0;
-	_rightButtonDown = 0;
+	_leftButtonDown = false;
+	_rightButtonDown = false;
 	_clickOnly = 0;
 	_oneClick = 0;
 	_leftClick = 0;
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index a77e6862b1..afd9a1ec1b 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -409,7 +409,7 @@ protected:
 	uint16 _mouseHideCount;
 	bool _mouseToggle;
 
-	byte _leftButtonDown, _rightButtonDown;
+	bool _leftButtonDown, _rightButtonDown;
 	byte _leftButton, _leftButtonCount, _leftButtonOld;
 	byte _oneClick;
 	bool _clickOnly;
diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index 02141eaec9..01b7a2b4f6 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -360,15 +360,15 @@ void AGOSEngine_PuzzlePack::handleMouseMoved() {
 	_mouse = _eventMan->getMousePos();
 
 	x = 0;
-	if (_lastHitArea3 == 0 && _leftButtonDown != 0) {
+	if (_lastHitArea3 == 0 && _leftButtonDown) {
 		_verbHitArea = 300;
-		_leftButtonDown = 0;
+		_leftButtonDown = false;
 		x = 1;
 	}
 
-	if (_rightButtonDown != 0) {
+	if (_rightButtonDown) {
 		_verbHitArea = (getGameId() == GID_DIMP) ? 301 : 300;
-		_rightButtonDown = 0;
+		_rightButtonDown = false;
 		x = 1;
 	}
 
@@ -419,7 +419,7 @@ void AGOSEngine_Simon1::handleMouseMoved() {
 		}
 
 		if (_rightButtonDown) {
-			_rightButtonDown = 0;
+			_rightButtonDown = false;
 			setVerb(NULL);
 		}
 	} else if (getGameType() == GType_SIMON2) {
@@ -453,8 +453,8 @@ void AGOSEngine_Simon1::handleMouseMoved() {
 	_leftButtonOld = _leftButton;
 
 	x = 0;
-	if (_lastHitArea3 == 0 && _leftButtonDown != 0) {
-		_leftButtonDown = 0;
+	if (_lastHitArea3 == 0 && _leftButtonDown) {
+		_leftButtonDown = false;
 		x = 1;
 	} else {
 		if (_litBoxFlag == 0 && _needHitAreaRecalc == 0)
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 183aff1cf1..387984e0bd 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -503,7 +503,7 @@ void AGOSEngine::delay(uint amount) {
 			case Common::EVENT_LBUTTONDOWN:
 				if (getGameType() == GType_FF)
 					setBitFlag(89, true);
-				_leftButtonDown++;
+				_leftButtonDown = true;
 				_leftButton = 1;
 				break;
 			case Common::EVENT_LBUTTONUP:
@@ -517,7 +517,7 @@ void AGOSEngine::delay(uint amount) {
 			case Common::EVENT_RBUTTONDOWN:
 				if (getGameType() == GType_FF)
 					setBitFlag(92, false);
-				_rightButtonDown++;
+				_rightButtonDown = true;
 				break;
 			case Common::EVENT_RBUTTONUP:
 				_rightClick = true;
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 36ff77a5c0..2e9291288c 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -126,7 +126,7 @@ void AGOSEngine::setup_cond_c_helper() {
 	while (!shouldQuit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = 0;
-		_leftButtonDown = 0;
+		_leftButtonDown = false;
 
 		do {
 			if (_exitCutscene && getBitFlag(9)) {
@@ -172,7 +172,7 @@ void AGOSEngine::waitForInput() {
 	HitArea *ha;
 	uint id;
 
-	_leftButtonDown = 0;
+	_leftButtonDown = false;
 	_lastHitArea = 0;
 	//_lastClickRem = 0;
 	_verbHitArea = 0;
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index f40ddf1be5..9c6bb211e9 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1213,7 +1213,7 @@ void AGOSEngine::vc33_setMouseOn() {
 void AGOSEngine::vc34_setMouseOff() {
 	mouseOff();
 	_mouseHideCount = 200;
-	_leftButtonDown = 0;
+	_leftButtonDown = false;
 }
 
 void AGOSEngine::clearVideoBackGround(uint16 num, uint16 color) {
-- 
cgit v1.2.3