[Scummvm-cvs-logs] CVS: scummvm/sky mouse.cpp,1.13,1.14 mouse.h,1.12,1.13 sky.cpp,1.60,1.61

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv31821/sky

Modified Files:
	mouse.cpp mouse.h sky.cpp 
Log Message:
mouse-fixes, note that: buttonPressed() keeping track of a repeated push DOES NOT WORK YET, _bMouseB gets cleared elsewhere, so we obviously need to come up with something else. and we still need a wait_relative equivalent to have a proper fnLookAt() ...hmm...this commit message is starting to look like a todo list. oh, well. :)

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mouse.cpp	9 Jun 2003 18:15:02 -0000	1.13
+++ mouse.cpp	9 Jun 2003 18:58:37 -0000	1.14
@@ -172,7 +172,7 @@
 }
 
 void SkyMouse::waitMouseNotPressed(void) {
-	while (_mouseB != 0) ;
+	while (_mouseB) ;
 	_bMouseB = 0;
 }
 
@@ -271,6 +271,16 @@
 			_skyLogic->script((uint16)SkyLogic::_scriptVariables[GET_OFF],(uint16)(SkyLogic::_scriptVariables[GET_OFF] >> 16));
 		SkyLogic::_scriptVariables[GET_OFF] = 0;
 	}
+}
+
+void SkyMouse::buttonPressed(uint8 button) {
+	if (_bMouseB == button)
+		_mouseB = 1;
+	else
+		_mouseB = 0;
+	
+	_bMouseB = button;
+	
 }
 
 void SkyMouse::buttonEngine1(void) {

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mouse.h	9 Jun 2003 18:15:02 -0000	1.12
+++ mouse.h	9 Jun 2003 18:58:37 -0000	1.13
@@ -46,7 +46,7 @@
 	void drawNewMouse(void);
 	void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY);
 	void useLogicInstance(SkyLogic *skyLogic) { _skyLogic = skyLogic; };
-	void buttonPressed(uint8 button) { _bMouseB = button; };
+	void buttonPressed(uint8 button);
 	void waitMouseNotPressed(void);
 	uint16 giveMouseX(void) { return _aMouseX; };
 	uint16 giveMouseY(void) { return _aMouseY; };

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sky.cpp	8 Jun 2003 12:11:12 -0000	1.60
+++ sky.cpp	9 Jun 2003 18:58:37 -0000	1.61
@@ -285,7 +285,7 @@
 					break;
 
 				case OSystem::EVENT_LBUTTONDOWN:
-					_skyMouse->buttonPressed(1);
+					_skyMouse->buttonPressed(2);
 #ifdef _WIN32_WCE
 					_sdl_mouse_x = event.mouse.x;
 					_sdl_mouse_y = event.mouse.y;
@@ -293,7 +293,7 @@
 					break;
 
 				case OSystem::EVENT_RBUTTONDOWN:
-					_skyMouse->buttonPressed(2);					
+					_skyMouse->buttonPressed(1);					
 					break;
 
 				case OSystem::EVENT_QUIT: