[Scummvm-cvs-logs] SF.net SVN: scummvm:[39256] scummvm/trunk/engines/agos

[fingolfin at users.sourceforge.net]

Revision: 39256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39256&view=rev
Author:   fingolfin
Date:     2009-03-09 03:45:33 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
AGOS: Changed _leftButtonDown & _rightButtonDown from byte to int

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/cursor.cpp
    scummvm/trunk/engines/agos/event.cpp
    scummvm/trunk/engines/agos/input.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/agos.cpp	2009-03-09 03:45:33 UTC (rev 39256)
@@ -290,8 +290,8 @@
 	_pendingDeleteTimeEvent = 0;
 
 	_initMouse = 0;
-	_leftButtonDown = 0;
-	_rightButtonDown = 0;
+	_leftButtonDown = false;
+	_rightButtonDown = false;
 	_clickOnly = 0;
 	_oneClick = 0;
 	_leftClick = 0;

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/agos.h	2009-03-09 03:45:33 UTC (rev 39256)
@@ -409,7 +409,7 @@
 	uint16 _mouseHideCount;
 	bool _mouseToggle;
 
-	byte _leftButtonDown, _rightButtonDown;
+	bool _leftButtonDown, _rightButtonDown;
 	byte _leftButton, _leftButtonCount, _leftButtonOld;
 	byte _oneClick;
 	bool _clickOnly;

Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/cursor.cpp	2009-03-09 03:45:33 UTC (rev 39256)
@@ -360,15 +360,15 @@
 	_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 @@
 		}
 
 		if (_rightButtonDown) {
-			_rightButtonDown = 0;
+			_rightButtonDown = false;
 			setVerb(NULL);
 		}
 	} else if (getGameType() == GType_SIMON2) {
@@ -453,8 +453,8 @@
 	_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)

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/event.cpp	2009-03-09 03:45:33 UTC (rev 39256)
@@ -503,7 +503,7 @@
 			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 @@
 			case Common::EVENT_RBUTTONDOWN:
 				if (getGameType() == GType_FF)
 					setBitFlag(92, false);
-				_rightButtonDown++;
+				_rightButtonDown = true;
 				break;
 			case Common::EVENT_RBUTTONUP:
 				_rightClick = true;

Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/input.cpp	2009-03-09 03:45:33 UTC (rev 39256)
@@ -126,7 +126,7 @@
 	while (!shouldQuit()) {
 		_lastHitArea = NULL;
 		_lastHitArea3 = 0;
-		_leftButtonDown = 0;
+		_leftButtonDown = false;
 
 		do {
 			if (_exitCutscene && getBitFlag(9)) {
@@ -172,7 +172,7 @@
 	HitArea *ha;
 	uint id;
 
-	_leftButtonDown = 0;
+	_leftButtonDown = false;
 	_lastHitArea = 0;
 	//_lastClickRem = 0;
 	_verbHitArea = 0;

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2009-03-09 03:45:23 UTC (rev 39255)
+++ scummvm/trunk/engines/agos/vga.cpp	2009-03-09 03:45:33 UTC (rev 39256)
@@ -1213,7 +1213,7 @@
 void AGOSEngine::vc34_setMouseOff() {
 	mouseOff();
 	_mouseHideCount = 200;
-	_leftButtonDown = 0;
+	_leftButtonDown = false;
 }
 
 void AGOSEngine::clearVideoBackGround(uint16 num, uint16 color) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.