From 576f0b9a66d267e5068c00a955a14f736be95992 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 28 Feb 2010 01:35:34 +0000 Subject: Fix gcc warning. svn-id: r48151 --- engines/m4/scene.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/m4') 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(); -- cgit v1.2.3