[Scummvm-git-logs] scummvm master -> 7cf299c475b06136993a662bd11f7178681dbaeb

sev- sev at scummvm.org
Wed Nov 30 20:36:54 CET 2016


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

Summary:
6071d1b05c FULLPIPE: Restart SFX on request instead of skipping it.
80d86745cf FULLPIPE: Implement MovGraph destructor
7cf299c475 FULLPIPE: Hide useless noisy warning


Commit: 6071d1b05ce453c9723452fb858bb66c30c8f24f
    https://github.com/scummvm/scummvm/commit/6071d1b05ce453c9723452fb858bb66c30c8f24f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-30T20:36:46+01:00

Commit Message:
FULLPIPE: Restart SFX on request instead of skipping it.

This matches the original and fixes the footstep sounds.

Changed paths:
    engines/fullpipe/sound.cpp


diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index fd248f5..be539bc 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -222,8 +222,9 @@ void Sound::setPanAndVolume(int vol, int pan) {
 void Sound::play(int flag) {
 	Audio::SoundHandle *handle = getHandle();
 
-	if (g_fp->_mixer->isSoundHandleActive(*handle))
-		return;
+	if (g_fp->_mixer->isSoundHandleActive(*handle)) { // We need to restart the music
+		g_fp->_mixer->stopHandle(*handle);
+	}
 
 	byte *soundData = loadData();
 	Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(soundData, getDataSize());


Commit: 80d86745cf21a25463d4d94e90ea264ebbd56d22
    https://github.com/scummvm/scummvm/commit/80d86745cf21a25463d4d94e90ea264ebbd56d22
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-30T20:36:46+01:00

Commit Message:
FULLPIPE: Implement MovGraph destructor

Changed paths:
    engines/fullpipe/motion.cpp


diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index e5eb972..68bfb13 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -815,7 +815,13 @@ MovGraph::MovGraph() {
 }
 
 MovGraph::~MovGraph() {
-	warning("STUB: MovGraph::~MovGraph()");
+	for (ObList::iterator i = _links.begin(); i != _links.end(); ++i)
+		delete *i;
+
+	for (ObList::iterator i = _nodes.begin(); i != _nodes.end(); ++i)
+		delete *i;
+
+	detachAllObjects();
 }
 
 bool MovGraph::load(MfcArchive &file) {


Commit: 7cf299c475b06136993a662bd11f7178681dbaeb
    https://github.com/scummvm/scummvm/commit/7cf299c475b06136993a662bd11f7178681dbaeb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-30T20:36:46+01:00

Commit Message:
FULLPIPE: Hide useless noisy warning

Changed paths:
    engines/fullpipe/utils.cpp


diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 9dfebf2..7133b39 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -182,7 +182,7 @@ void MemoryObject::loadFile(char *filename) {
 
 			delete s;
 		} else {
-			warning("MemoryObject::loadFile(): reading failure");
+			// We have no object to read. This is fine
 		}
 
 		g_fp->_currArchive = arr;





More information about the Scummvm-git-logs mailing list