diff options
author | Johannes Schickel | 2010-02-28 01:35:34 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-02-28 01:35:34 +0000 |
commit | 576f0b9a66d267e5068c00a955a14f736be95992 (patch) | |
tree | da3bd3ac53590d95561700ce920bcd2046df3c51 | |
parent | 2881a8c057baf9b60d2c1fd84fe5df47638b2976 (diff) | |
download | scummvm-rg350-576f0b9a66d267e5068c00a955a14f736be95992.tar.gz scummvm-rg350-576f0b9a66d267e5068c00a955a14f736be95992.tar.bz2 scummvm-rg350-576f0b9a66d267e5068c00a955a14f736be95992.zip |
Fix gcc warning.
svn-id: r48151
-rw-r--r-- | engines/m4/scene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/scene.cpp b/engines/m4/scene.cpp index ccdb60fc66..673a375fa2 100644 --- a/engines/m4/scene.cpp +++ b/engines/m4/scene.cpp @@ -926,8 +926,8 @@ void MadsScene::loadPlayerSprites(const char *prefix) { /*--------------------------------------------------------------------------*/ -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 @@ void MadsSceneInfo::load(int sceneId) { Common::SeekableReadStream *stream = sceneInfo.getItemStream(0); int resSceneId = stream->readUint16LE(); - assert(resSceneId == sceneId); + assert(resSceneId == sId); artFileNum = stream->readUint16LE(); field_4 = stream->readUint16LE(); |