[Scummvm-cvs-logs] SF.net SVN: scummvm:[48151] scummvm/trunk/engines/m4/scene.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Feb 28 02:35:34 CET 2010


Revision: 48151
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48151&view=rev
Author:   lordhoto
Date:     2010-02-28 01:35:34 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Fix gcc warning.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/scene.cpp

Modified: scummvm/trunk/engines/m4/scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/scene.cpp	2010-02-28 01:07:25 UTC (rev 48150)
+++ scummvm/trunk/engines/m4/scene.cpp	2010-02-28 01:35:34 UTC (rev 48151)
@@ -926,8 +926,8 @@
 
 /*--------------------------------------------------------------------------*/
 
-void MadsSceneInfo::load(int sceneId) {
-	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneId, ".DAT");
+void MadsSceneInfo::load(int sId) {
+	const char *sceneInfoStr = MADSResourceManager::getResourceName(RESPREFIX_RM, sId, ".DAT");
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneInfoStr);
 	MadsPack sceneInfo(rawStream);
 
@@ -935,7 +935,7 @@
 	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
 
 	int resSceneId = stream->readUint16LE();
-	assert(resSceneId == sceneId);
+	assert(resSceneId == sId);
 
 	artFileNum = stream->readUint16LE();
 	field_4 = stream->readUint16LE();


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