[Scummvm-cvs-logs] SF.net SVN: scummvm:[34593] scummvm/branches/branch-0-12-0/engines

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Sep 17 20:23:55 CEST 2008


Revision: 34593
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34593&view=rev
Author:   fingolfin
Date:     2008-09-17 18:23:51 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Backporting two warning fixes to 0.12.x

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/agos/saveload.cpp
    scummvm/branches/branch-0-12-0/engines/kyra/sound_towns.cpp

Modified: scummvm/branches/branch-0-12-0/engines/agos/saveload.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/agos/saveload.cpp	2008-09-17 18:16:06 UTC (rev 34592)
+++ scummvm/branches/branch-0-12-0/engines/agos/saveload.cpp	2008-09-17 18:23:51 UTC (rev 34593)
@@ -244,7 +244,7 @@
 void AGOSEngine::userGame(bool load) {
 	WindowBlock *window = _windowArray[4];
 	const char *message1;
-	int i, numSaveGames;
+	int i = 0, numSaveGames;
 	char *name;
 	char buf[8];
 

Modified: scummvm/branches/branch-0-12-0/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/sound_towns.cpp	2008-09-17 18:16:06 UTC (rev 34592)
+++ scummvm/branches/branch-0-12-0/engines/kyra/sound_towns.cpp	2008-09-17 18:23:51 UTC (rev 34593)
@@ -3318,7 +3318,9 @@
 	if (_pcmChannel)
 		_pcmChannel->reset();
 
-	_musicPlaying = _sfxPlaying = _fading = false;
+	_musicPlaying = false;
+	_sfxPlaying = false;
+	_fading = false;
 	_looping = 0;
 	_musicTickCounter = 0;
 	_sfxData = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list