[Scummvm-cvs-logs] SF.net SVN: scummvm:[39647] scummvm/branches/branch-0-13-0/engines/saga

[eriktorbjorn at users.sourceforge.net]

Revision: 39647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39647&view=rev
Author:   eriktorbjorn
Date:     2009-03-23 21:28:22 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Backported fixes for Valgrind warnings.

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/saga/render.cpp
    scummvm/branches/branch-0-13-0/engines/saga/resource.cpp
    scummvm/branches/branch-0-13-0/engines/saga/resource.h

Modified: scummvm/branches/branch-0-13-0/engines/saga/render.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/saga/render.cpp	2009-03-23 20:42:53 UTC (rev 39646)
+++ scummvm/branches/branch-0-13-0/engines/saga/render.cpp	2009-03-23 21:28:22 UTC (rev 39647)
@@ -49,6 +49,7 @@
 	_vm = vm;
 	_system = system;
 	_initialized = false;
+	_fullRefresh = false;
 
 #ifdef SAGA_DEBUG
 	// Initialize FPS timer callback

Modified: scummvm/branches/branch-0-13-0/engines/saga/resource.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/saga/resource.cpp	2009-03-23 20:42:53 UTC (rev 39646)
+++ scummvm/branches/branch-0-13-0/engines/saga/resource.cpp	2009-03-23 21:28:22 UTC (rev 39647)
@@ -197,8 +197,6 @@
 bool Resource::createContexts() {
 	int i;
 	ResourceContext *context;
-	char musicFileName[256];
-	char soundFileName[256];
 	int soundFileIndex = 0;
 	int voicesFileIndex = 0;
 	bool digitalMusic = false;
@@ -285,7 +283,7 @@
 			if (Common::File::exists(curSoundfiles[i].fileName)) {
 				_contextsCount++;
 				soundFileIndex = _contextsCount - 1;
-				strcpy(soundFileName, curSoundfiles[i].fileName);
+				strcpy(_soundFileName, curSoundfiles[i].fileName);
 				compressedSounds = curSoundfiles[i].isCompressed;
 				fileFound = true;
 				break;
@@ -426,7 +424,7 @@
 				digitalMusic = true;
 				compressedMusic = musicFilesITE[i].isCompressed;
 				fileFound = true;
-				strcpy(musicFileName, musicFilesITE[i].fileName);
+				strcpy(_musicFileName, musicFilesITE[i].fileName);
 				break;
 			}
 		}
@@ -446,11 +444,11 @@
 
 		// For ITE, add the digital music file and sfx file information here
 		if (_vm->getGameId() == GID_ITE && digitalMusic && i == _contextsCount - 1) {
-			context->fileName = musicFileName;
+			context->fileName = _musicFileName;
 			context->fileType = GAME_MUSICFILE;
 			context->isCompressed = compressedMusic;
 		} else if (!soundFileInArray && i == soundFileIndex) {
-			context->fileName = soundFileName;
+			context->fileName = _soundFileName;
 			context->fileType = GAME_SOUNDFILE;
 			context->isCompressed = compressedSounds;
 		} else if (_vm->_voiceFilesExist && i == voicesFileIndex && !(_vm->getGameId() == GID_IHNM && _vm->isMacResources())) {

Modified: scummvm/branches/branch-0-13-0/engines/saga/resource.h
===================================================================
--- scummvm/branches/branch-0-13-0/engines/saga/resource.h	2009-03-23 20:42:53 UTC (rev 39646)
+++ scummvm/branches/branch-0-13-0/engines/saga/resource.h	2009-03-23 21:28:22 UTC (rev 39647)
@@ -158,6 +158,8 @@
 	ResourceContext *_contexts;
 	int _contextsCount;
 	char _voicesFileName[8][256];
+	char _musicFileName[256];
+	char _soundFileName[256];
 
 	bool loadContext(ResourceContext *context);
 	virtual bool loadMacContext(ResourceContext *context) = 0;


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