[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.119,1.120 mouse.cpp,1.20,1.21 screen.cpp,1.43,1.44 sky.cpp,1.85,1.86

[Robert G?ffringmann]

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

Modified Files:
	logic.cpp mouse.cpp screen.cpp sky.cpp 
Log Message:
fixed item descriptions

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- logic.cpp	10 Jul 2003 08:24:16 -0000	1.119
+++ logic.cpp	11 Jul 2003 19:41:37 -0000	1.120
@@ -2315,9 +2315,7 @@
 	fnNoHuman(0, 0, 0); 
 	_skyMouse->lockMouse();
 
-	//waitRelative(0);
 	_skyMouse->waitMouseNotPressed();
-	//waitRelative(40);
 	
 	_skyMouse->unlockMouse();
 	fnAddHuman(0, 0, 0);

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mouse.cpp	10 Jul 2003 08:24:16 -0000	1.20
+++ mouse.cpp	11 Jul 2003 19:41:37 -0000	1.21
@@ -167,7 +167,17 @@
 }
 
 void SkyMouse::waitMouseNotPressed(void) {
-	while (_mouseB) ;
+
+	bool mousePressed = true;
+	OSystem::Event event;
+	while (mousePressed) {
+		_system->delay_msecs(20);
+		while (_system->poll_event(&event)) {
+			if ((event.event_code == OSystem::EVENT_LBUTTONUP) ||
+				(event.event_code == OSystem::EVENT_QUIT))
+				mousePressed = false;
+		}
+	}
 	_bMouseB = 0;
 }
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- screen.cpp	11 Jul 2003 15:52:46 -0000	1.43
+++ screen.cpp	11 Jul 2003 19:41:37 -0000	1.44
@@ -197,7 +197,6 @@
 void SkyScreen::flip(void) {
 
 	SkyState::_systemVars.mouseFlag |= MF_NO_UPDATE;
-	// drawMouseToBackScreen();
 	uint8 *screenPos = _currentScreen;
 	uint8 *backPos = _backScreen;
 	uint32 copyX, copyWidth;
@@ -230,7 +229,7 @@
 		backPos += (GRID_H - 1) * GAME_SCREEN_WIDTH;
 	}
 	SkyState::_systemVars.mouseFlag &= ~MF_NO_UPDATE;
-	// _skyMouse->restoreDataToBackScreen();
+	_system->update_screen();
 }
 
 void SkyScreen::fnDrawScreen(uint32 palette, uint32 scroll) {

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- sky.cpp	10 Jul 2003 10:36:24 -0000	1.85
+++ sky.cpp	11 Jul 2003 19:41:37 -0000	1.86
@@ -192,9 +192,10 @@
 			_skyScreen->recreate();
 			_skyScreen->spriteEngine();
 			_skyScreen->flip();
-			if (_paintGrid)
+			if (_paintGrid) {
 				_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(SkyLogic::_scriptVariables[SCREEN]));
-			_system->update_screen();
+				_system->update_screen();
+			}
 		}
 	}
 }