[Scummvm-cvs-logs] SF.net SVN: scummvm:[39641] scummvm/trunk/engines/saga
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Mar 23 21:25:25 CET 2009
Revision: 39641
http://scummvm.svn.sourceforge.net/scummvm/?rev=39641&view=rev
Author: eriktorbjorn
Date: 2009-03-23 20:25:25 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Made the music and sound file names part of the class, instead of local
variables. This fixes another Valgrind warning when SndRes::load() tries to
access the file names. (I could also have made the variables static, but I've
never been very fond of static variables.)
Modified Paths:
--------------
scummvm/trunk/engines/saga/resource.cpp
scummvm/trunk/engines/saga/resource.h
Modified: scummvm/trunk/engines/saga/resource.cpp
===================================================================
--- scummvm/trunk/engines/saga/resource.cpp 2009-03-23 20:20:00 UTC (rev 39640)
+++ scummvm/trunk/engines/saga/resource.cpp 2009-03-23 20:25:25 UTC (rev 39641)
@@ -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;
@@ -288,7 +286,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;
@@ -431,7 +429,7 @@
digitalMusic = true;
compressedMusic = musicFilesITE[i].isCompressed;
fileFound = true;
- strcpy(musicFileName, musicFilesITE[i].fileName);
+ strcpy(_musicFileName, musicFilesITE[i].fileName);
break;
}
}
@@ -451,11 +449,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_DIGITALMUSICFILE;
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/trunk/engines/saga/resource.h
===================================================================
--- scummvm/trunk/engines/saga/resource.h 2009-03-23 20:20:00 UTC (rev 39640)
+++ scummvm/trunk/engines/saga/resource.h 2009-03-23 20:25:25 UTC (rev 39641)
@@ -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.
More information about the Scummvm-git-logs
mailing list