[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.19,2.20 vars.cpp,1.23,1.24

[Max Horn]

At 7:06 Uhr -0800 29.12.2002, James Brown wrote:
>Update of /cvsroot/scummvm/scummvm/scumm
>In directory sc8-pr-cvs1:/tmp/cvs-serv27254
>
>Modified Files:
>	scummvm.cpp vars.cpp
>Log Message:
>override var was wrong, update mouse click code
>
>
>Index: scummvm.cpp
>===================================================================
>RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
>retrieving revision 2.19
>retrieving revision 2.20
>diff -u -d -r2.19 -r2.20
>--- scummvm.cpp	28 Dec 2002 12:42:55 -0000	2.19
>+++ scummvm.cpp	29 Dec 2002 15:06:44 -0000	2.20
>@@ -1213,7 +1213,15 @@
>  		_mouseButStat = MBS_RIGHT_CLICK;
>  	}
>
>-	if (_features & GF_AFTER_V7) {
>+	if (_features & GF_AFTER_V8) {
>+		_vars[VAR_MOUSE_BUTTONS] = 0;
>+		if (_leftBtnPressed & msClicked)
>+			_vars[VAR_MOUSE_BUTTONS] =+ 1;
>+
>+		if (_rightBtnPressed & msClicked)
>+			_vars[VAR_MOUSE_BUTTONS] =+ 2;
>+

Did you really mean to set the variable to +1 or to +2 ? Or did you 
mean to add 1 and 2? Then the right operator is += ... In any case, 
|= would seem more appropriate.



Max
-- 
-----------------------------------------------
Max Horn
Software Developer