[Scummvm-cvs-logs] scummvm master -> 2362498d54af2764465beb1d5e2fac77395ccbf0

[sev-]

This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
35236884d7 FULLPIPE: Implement MctlCompound::freeItems()
5d6c7fbcd1 RECORDER: Initialize variable. CID 1047258
a71e59fd2d CINE: Remove unnecessary check. CID 1004117
aa2a6d7445 GUI: Skip useless assignment. CID 1002117
69ac3bb944 FULLPIPE: Initialize variable. CID 1109665
2362498d54 SCUMM: Fix potential memory leak. CID 1003586


Commit: 35236884d706536af35b2eff138430afa0acc0a3
    https://github.com/scummvm/scummvm/commit/35236884d706536af35b2eff138430afa0acc0a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
FULLPIPE: Implement MctlCompound::freeItems()

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index aa7d02a..d117890 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -113,7 +113,8 @@ void MctlCompound::initMovGraph2() {
 }
 
 void MctlCompound::freeItems() {
-	warning("STUB: MctlCompound::freeItems()");
+	for (uint i = 0; i < _motionControllers.size(); i++)
+		_motionControllers[i]->_motionControllerObj->freeItems();
 }
 
 MessageQueue *MctlCompound::method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) {


Commit: 5d6c7fbcd1c87238a9b463c9cfd2e3ba09a69324
    https://github.com/scummvm/scummvm/commit/5d6c7fbcd1c87238a9b463c9cfd2e3ba09a69324
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
RECORDER: Initialize variable. CID 1047258

Changed paths:
    common/recorderfile.cpp



diff --git a/common/recorderfile.cpp b/common/recorderfile.cpp
index d08bc59..7c438cb 100644
--- a/common/recorderfile.cpp
+++ b/common/recorderfile.cpp
@@ -45,6 +45,8 @@ PlaybackFile::PlaybackFile() : _tmpRecordFile(_tmpBuffer, kRecordBuffSize), _tmp
 	_recordCount = 0;
 	_eventsSize = 0;
 	memset(_tmpBuffer, 1, kRecordBuffSize);
+
+	_playbackParseState = kFileStateCheckFormat;
 }
 
 PlaybackFile::~PlaybackFile() {


Commit: a71e59fd2da78a564805fa74e5942cf2036b426d
    https://github.com/scummvm/scummvm/commit/a71e59fd2da78a564805fa74e5942cf2036b426d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
CINE: Remove unnecessary check. CID 1004117

Changed paths:
    engines/cine/sound.cpp



diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 0df9266..de6f91d 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -309,9 +309,7 @@ void AdLibSoundDriver::setupChannel(int channel, const byte *data, int instrumen
 			volume = 0;
 		}
 		volume += volume / 4;
-		if (volume > 127) {
-			volume = 127;
-		}
+
 		_channelsVolumeTable[channel] = volume;
 		setupInstrument(data, channel);
 	}


Commit: aa2a6d74457f47f6dee0894d58c00d58e4e3bb07
    https://github.com/scummvm/scummvm/commit/aa2a6d74457f47f6dee0894d58c00d58e4e3bb07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
GUI: Skip useless assignment. CID 1002117

Changed paths:
    gui/predictivedialog.cpp



diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index ef94ec6..5d45a30 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -752,7 +752,8 @@ bool PredictiveDialog::matchWord() {
 		char tmp[kMaxLineLen];
 		strncpy(tmp, _unitedDict.dictLine[line], kMaxLineLen);
 		tmp[kMaxLineLen - 1] = 0;
-		char *tok = strtok(tmp, " ");
+		char *tok;
+		strtok(tmp, " ");
 		tok = strtok(NULL, " ");
 		_currentWord = Common::String(tok, _currentCode.size());
 		return true;


Commit: 69ac3bb944196aeffe0c62d0862cd00505f1e98c
    https://github.com/scummvm/scummvm/commit/69ac3bb944196aeffe0c62d0862cd00505f1e98c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
FULLPIPE: Initialize variable. CID 1109665

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index d117890..d058403 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1068,7 +1068,7 @@ MovGraphLink *MovGraph2::findLink1(int x, int y, int idx, int fuzzyMatch) {
 
 MovGraphLink *MovGraph2::findLink2(int x, int y) {
 	double mindist = 1.0e20;
-	MovGraphLink *res;
+	MovGraphLink *res = 0;
 
 	for (ObList::iterator i = _links.begin(); i != _links.end(); ++i) {
 		assert(((CObject *)*i)->_objtype == kObjTypeMovGraphLink);


Commit: 2362498d54af2764465beb1d5e2fac77395ccbf0
    https://github.com/scummvm/scummvm/commit/2362498d54af2764465beb1d5e2fac77395ccbf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-02T16:28:03-07:00

Commit Message:
SCUMM: Fix potential memory leak. CID 1003586

Changed paths:
    engines/scumm/imuse_digi/dimuse_sndmgr.cpp



diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index af4f877..26e248f 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -443,11 +443,13 @@ ImuseDigiSndMgr::SoundDesc *ImuseDigiSndMgr::openSound(int32 soundId, const char
 		} else if (soundName[0] == 0) {
 			if (sound->bundle->decompressSampleByIndex(soundId, 0, 0x2000, &ptr, 0, header_outside) == 0 || ptr == NULL) {
 				closeSound(sound);
+				free(ptr);
 				return NULL;
 			}
 		} else {
 			if (sound->bundle->decompressSampleByName(soundName, 0, 0x2000, &ptr, header_outside) == 0 || ptr == NULL) {
 				closeSound(sound);
+				free(ptr);
 				return NULL;
 			}
 		}