[Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.28,1.29 driver96.h,1.65,1.66 rdwin.cpp,1.38,1.39

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Fri Dec 19 08:51:03 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv20540/driver

Modified Files:
	_mouse.cpp driver96.h rdwin.cpp 
Log Message:
Implemented scroll wheel handling for save/load dialogs. (This turned up a
few other hitherto harmless bugs, which I've hopefully managed to fix.)


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- _mouse.cpp	16 Nov 2003 14:18:29 -0000	1.28
+++ _mouse.cpp	19 Dec 2003 16:50:03 -0000	1.29
@@ -25,9 +25,9 @@
 #define MOUSEFLASHFRAME 6
 
 /**
- * Logs the mouse button event passed in buttons.  The button events are 
- * defined as RD_LEFTBUTTONDOWN, RD_LEFTBUTTONUP, RD_RIGHTBUTTONDOWN and
- * RD_RIGHTBUTTONUP.
+ * Logs the mouse button event passed in buttons. The button events were
+ * originaly defined as RD_LEFTBUTTONDOWN, RD_LEFTBUTTONUP, RD_RIGHTBUTTONDOWN
+ * and RD_RIGHTBUTTONUP. ScummVM adds RD_WHEELDOWN and RD_WHEELUP.
  */
 
 void Input::logMouseEvent(uint16 buttons) {

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/driver96.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- driver96.h	10 Dec 2003 13:14:50 -0000	1.65
+++ driver96.h	19 Dec 2003 16:50:03 -0000	1.66
@@ -83,7 +83,9 @@
 	RD_LEFTBUTTONDOWN		= 0x01,
 	RD_LEFTBUTTONUP			= 0x02,
 	RD_RIGHTBUTTONDOWN		= 0x04,
-	RD_RIGHTBUTTONUP		= 0x08
+	RD_RIGHTBUTTONUP		= 0x08,
+	RD_WHEELUP			= 0x10,
+	RD_WHEELDOWN			= 0x20
 };
 
 // Sprite defines

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- rdwin.cpp	16 Nov 2003 14:18:29 -0000	1.38
+++ rdwin.cpp	19 Dec 2003 16:50:03 -0000	1.39
@@ -51,6 +51,12 @@
 		case OSystem::EVENT_RBUTTONUP:
 			logMouseEvent(RD_RIGHTBUTTONUP);
 			break;
+		case OSystem::EVENT_WHEELUP:
+			logMouseEvent(RD_WHEELUP);
+			break;
+		case OSystem::EVENT_WHEELDOWN:
+			logMouseEvent(RD_WHEELDOWN);
+			break;
 		case OSystem::EVENT_QUIT:
 			_vm->closeGame();
 			break;





More information about the Scummvm-git-logs mailing list