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

[eriktorbjorn at users.sourceforge.net]

Revision: 49412
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49412&view=rev
Author:   eriktorbjorn
Date:     2010-06-03 21:13:08 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
Renamed some variables to silence GCC warnings.

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

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-03 20:42:06 UTC (rev 49411)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-03 21:13:08 UTC (rev 49412)
@@ -604,18 +604,18 @@
 
 /*--------------------------------------------------------------------------*/
 
-void MadsSceneResources::load(int sceneId, const char *resName, int v0, M4Surface *depthSurface, M4Surface *surface) {
-	char buffer[80];
+void MadsSceneResources::load(int sceneNumber, const char *resName, int v0, M4Surface *depthSurface, M4Surface *surface) {
+	char buffer1[80];
 	const char *sceneName;
 
 	// TODO: Initialise spriteSet / xp_list
 
-	if (sceneId > 0) {
-		sceneName = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneId, ".DAT");
+	if (sceneNumber > 0) {
+		sceneName = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneNumber, ".DAT");
 	} else {
-		strcat(buffer, "*");
-		strcat(buffer, resName);
-		sceneName = buffer; // TODO: Check whether this needs to be converted to 'HAG form'
+		strcat(buffer1, "*");
+		strcat(buffer1, resName);
+		sceneName = buffer1; // TODO: Check whether this needs to be converted to 'HAG form'
 	}
 
 	Common::SeekableReadStream *rawStream = _vm->_resourceManager->get(sceneName);
@@ -626,7 +626,7 @@
 	Common::SeekableReadStream *stream = sceneInfo.getItemStream(0);
 
 	int resSceneId = stream->readUint16LE();
-	assert(resSceneId == sceneId);
+	assert(resSceneId == sceneNumber);
 	artFileNum = stream->readUint16LE();
 	dialogStyle = stream->readUint16LE();
 	width = stream->readUint16LE();
@@ -651,8 +651,8 @@
 	int setCount = stream->readUint16LE();
 	stream->readUint16LE();
 	for (int i = 0; i < setCount; ++i) {
-		char buffer[64];
-		Common::String s(buffer, 64);
+		char buffer2[64];
+		Common::String s(buffer2, 64);
 		setNames.push_back(s);
 	}
 	
@@ -696,7 +696,7 @@
 	_vm->_resourceManager->toss(sceneName);
 
 	// Load the surface artwork
-	surface->loadBackground(sceneId);
+	surface->loadBackground(sceneNumber);
 
 	// Final cleanup
 	if (ssFlag)


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