[Scummvm-cvs-logs] CVS: scummvm/sky mouse.cpp,1.30,1.30.2.1 sky.cpp,1.142,1.142.2.1
Travis Howell
kirben at users.sourceforge.net
Fri Aug 20 08:00:15 CEST 2004
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18732/sky
Modified Files:
Tag: branch-0-6-0
mouse.cpp sky.cpp
Log Message:
Back port:
Initialize variables (fix valgrind warnings)
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -d -r1.30 -r1.30.2.1
--- mouse.cpp 6 Jan 2004 12:45:32 -0000 1.30
+++ mouse.cpp 20 Aug 2004 14:59:14 -0000 1.30.2.1
@@ -91,7 +91,9 @@
_system = system;
_mouseB = 0;
_currentCursor = 6;
-
+ _mouseX = GAME_SCREEN_WIDTH / 2;
+ _mouseY = GAME_SCREEN_HEIGHT / 2;
+
_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.142
retrieving revision 1.142.2.1
diff -u -d -r1.142 -r1.142.2.1
--- sky.cpp 13 Feb 2004 10:51:33 -0000 1.142
+++ sky.cpp 20 Aug 2004 14:59:14 -0000 1.142.2.1
@@ -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