[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.83,1.84 mouse.cpp,1.8,1.9

Robert G?ffringmann lavosspawn at users.sourceforge.net
Thu Jun 5 13:38:09 CEST 2003


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

Modified Files:
	logic.cpp mouse.cpp 
Log Message:
make mouse move to middle of screen at start and let skystate initialize its _objectList

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- logic.cpp	5 Jun 2003 18:54:25 -0000	1.83
+++ logic.cpp	5 Jun 2003 20:37:52 -0000	1.84
@@ -59,6 +59,8 @@
 	_skyGrid = new SkyGrid(_skyDisk);
 	_skyAutoRoute = new SkyAutoRoute(_skyGrid);
 
+	memset(_objectList, 0, 30 * sizeof(uint32));
+
 	for (int i = 0; i < ARRAYSIZE(_moduleList); i++)
 		_moduleList[i] = 0;
 	_stackPtr = 0;
@@ -1713,6 +1715,7 @@
 	for (i = 0; i < ARRAYSIZE(_objectList); i++) {
 		if (_objectList[i])
 			(SkyState::fetchCompact(_objectList[i]))->status = ST_LOGIC;
+		else break;
 	}
 
 	// (5) NOW FIND OUT WHICH OBJECT TO START THE DISPLAY FROM (depending on scroll offset)
@@ -1724,7 +1727,7 @@
 
 	// (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN
 
-	uint16 rollingX = 128 + 28;
+	uint16 rollingX = TOP_LEFT_X + 28;
 	for (i = 0; i < 11; i++) {
 		cpt = SkyState::fetchCompact(
 				_objectList[_scriptVariables[SCROLL_OFFSET] + i]);

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mouse.cpp	5 Jun 2003 18:54:26 -0000	1.8
+++ mouse.cpp	5 Jun 2003 20:37:52 -0000	1.9
@@ -120,8 +120,10 @@
 		_tMouseX = _newSafeX;
 		_tMouseY = _newSafeY;
 
-		if (_aMouseY < 2)	//stop mouse activating top line
+		if (_aMouseY < 2) {	//stop mouse activating top line
 			_aMouseY = 2;
+			_system->warp_mouse(GAME_SCREEN_WIDTH / 2, GAME_SCREEN_HEIGHT / 2);
+		}
 	
 		//force the pointer engine into running a get-off
 		//even if it's over nothing





More information about the Scummvm-git-logs mailing list