[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.123,1.124 scummvm.cpp,2.27,2.28 vars.cpp,1.27,1.28

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7467

Modified Files:
	scumm.h scummvm.cpp vars.cpp 
Log Message:
added yet another variable (for mouse-button-hold flags). Now the 'verb widget' shows up, though it is not erased properly

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- scumm.h	31 Dec 2002 17:28:50 -0000	1.123
+++ scumm.h	1 Jan 2003 02:56:21 -0000	1.124
@@ -1029,6 +1029,7 @@
 	byte VAR_LEFTBTN_HOLD;
 	byte VAR_RIGHTBTN_HOLD;
 	byte VAR_MOUSE_BUTTONS;
+	byte VAR_MOUSE_HOLD;
 	byte VAR_UNK_SCRIPT;
 	byte VAR_UNK_SCRIPT_2;
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- scummvm.cpp	31 Dec 2002 14:59:05 -0000	2.27
+++ scummvm.cpp	1 Jan 2003 02:56:22 -0000	2.28
@@ -1000,8 +1000,8 @@
 {
 	checkKeyHit();
 	_mouseButStat = 0;
-	_leftBtnPressed = 0;
-	_rightBtnPressed = 0;
+	_leftBtnPressed &= ~msClicked;
+	_rightBtnPressed &= ~msClicked;
 }
 
 int Scumm::checkKeyHit()
@@ -1219,9 +1219,14 @@
 		_vars[VAR_MOUSE_BUTTONS] = 0;
 		if (_leftBtnPressed & msClicked)
 			_vars[VAR_MOUSE_BUTTONS] += 1;
-
 		if (_rightBtnPressed & msClicked)
 			_vars[VAR_MOUSE_BUTTONS] += 2;
+
+		_vars[VAR_MOUSE_HOLD] = 0;
+		if (_leftBtnPressed & msDown)
+			_vars[VAR_MOUSE_HOLD] += 1;
+		if (_rightBtnPressed & msDown)
+			_vars[VAR_MOUSE_HOLD] += 2;
 
 	} else if (_features & GF_AFTER_V7) {
 //    _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- vars.cpp	31 Dec 2002 17:28:51 -0000	1.27
+++ vars.cpp	1 Jan 2003 02:56:22 -0000	1.28
@@ -226,6 +226,7 @@
 	VAR_TALK_ACTOR = 14;
 	VAR_HAVE_MSG = 15;
 	VAR_MOUSE_BUTTONS = 16;
+	VAR_MOUSE_HOLD = 18;
 
 	VAR_TIMEDATE_YEAR = 24;
 	VAR_TIMEDATE_MONTH = 25;