[Scummvm-cvs-logs] SF.net SVN: scummvm: [28345] scummvm/trunk/engines/saga

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jul 31 02:07:01 CEST 2007


Revision: 28345
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28345&view=rev
Author:   thebluegr
Date:     2007-07-30 17:06:57 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Loading saved games in the demo version of IHNM should work now

Modified Paths:
--------------
    scummvm/trunk/engines/saga/rscfile.cpp
    scummvm/trunk/engines/saga/saveload.cpp

Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp	2007-07-30 23:37:18 UTC (rev 28344)
+++ scummvm/trunk/engines/saga/rscfile.cpp	2007-07-31 00:06:57 UTC (rev 28345)
@@ -702,7 +702,7 @@
 		free(resourcePointer);
 	} else {
 		// The IHNM demo has a fixed music track and doesn't load a song table
-		_vm->_music->play(3, MUSIC_NORMAL);
+		_vm->_music->play(3, MUSIC_LOOP);
 	}
 
 	int voiceLUTResourceID = 0;

Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp	2007-07-30 23:37:18 UTC (rev 28344)
+++ scummvm/trunk/engines/saga/saveload.cpp	2007-07-31 00:06:57 UTC (rev 28345)
@@ -276,7 +276,10 @@
 		_scene->setCurrentMusicTrack(in->readSint32LE());
 		_scene->setCurrentMusicRepeat(in->readSint32LE());
 		_music->stop();
-		_music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL);			
+		if (getGameId() != GID_IHNM_DEMO)
+			_music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL);			
+		else
+			_music->play(3, MUSIC_LOOP);
 	}
 
 	// Inset scene


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