[Scummvm-cvs-logs] CVS: scummvm/sky mouse.cpp,1.32,1.33 sky.cpp,1.144,1.145

Joost Peters joostp at users.sourceforge.net
Fri Aug 20 06:39:10 CEST 2004


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3269/sky

Modified Files:
	mouse.cpp sky.cpp 
Log Message:
Initialize variables (fix valgrind warnings)


Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- mouse.cpp	6 May 2004 00:25:18 -0000	1.32
+++ mouse.cpp	20 Aug 2004 13:37:49 -0000	1.33
@@ -91,6 +91,8 @@
 	_system = system;
 	_mouseB = 0;
 	_currentCursor = 6;
+	_mouseX = GAME_SCREEN_WIDTH / 2;
+	_mouseY = GAME_SCREEN_HEIGHT / 2;
 	
 	_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
 
@@ -193,7 +195,7 @@
 void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) {
 	_mouseX = mouseX;
 	_mouseY = mouseY;
-
+	
 	_logicClick = (_mouseB > 0); // click signal is available for Logic for one gamecycle
 
 	if (!Logic::_scriptVariables[MOUSE_STOP]) {

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- sky.cpp	25 Jun 2004 22:39:20 -0000	1.144
+++ sky.cpp	20 Aug 2004 13:37:50 -0000	1.145
@@ -197,11 +197,11 @@
 
 void SkyEngine::go() {
 
-	if (!_dump_file)
-		_dump_file = stdout;
-
 	initialise();
 
+	_sdl_mouse_x = GAME_SCREEN_WIDTH / 2;
+	_sdl_mouse_y = GAME_SCREEN_HEIGHT / 2;
+	
 	bool introSkipped = false;
 	if (!_quickLaunch) {
 		if (_systemVars.gameVersion > 267) {// don't do intro for floppydemos





More information about the Scummvm-git-logs mailing list