[Scummvm-git-logs] scummvm master -> a36039f9fe896241bddc1d0015c8d6f1cfaa5039

sev- sev at scummvm.org
Sat Nov 12 12:35:29 CET 2016


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

Summary:
f9d9bd8106 FULLPIPE: Fix memory leak
a36039f9fe FULLPIPE: Fix bug in original in scene05


Commit: f9d9bd810647834998a434dca7e8f2e5178f5b51
    https://github.com/scummvm/scummvm/commit/f9d9bd810647834998a434dca7e8f2e5178f5b51
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-12T12:35:18+01:00

Commit Message:
FULLPIPE: Fix memory leak

Changed paths:
    engines/fullpipe/scenes/scene09.cpp



diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index f556785..3a8b937 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -108,11 +108,11 @@ void scene09_initScene(Scene *sc) {
 
 	g_vars->scene09_sceneBalls.clear();
 
-	StaticANIObject *newball = new StaticANIObject(sc->getStaticANIObject1ById(ANI_BALL9, -1));
-	newball->setAlpha(0xc8);
+	StaticANIObject *newball1 = new StaticANIObject(sc->getStaticANIObject1ById(ANI_BALL9, -1));
+	newball1->setAlpha(0xc8);
 
 	for (int i = 0; i < 4; i++) {
-		newball = new StaticANIObject(newball);
+		StaticANIObject *newball = new StaticANIObject(newball1);
 
 		newball->setAlpha(0xc8);
 		g_vars->scene09_sceneBalls.push_back(newball);
@@ -120,6 +120,8 @@ void scene09_initScene(Scene *sc) {
 		sc->addStaticANIObject(newball, 1);
 	}
 
+	delete newball1;
+
 	g_fp->setObjectState(sO_RightStairs_9, g_fp->getObjectEnumState(sO_RightStairs_9, sO_IsClosed));
 
 	GameVar *eggvar = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName(sO_GulpedEggs);


Commit: a36039f9fe896241bddc1d0015c8d6f1cfaa5039
    https://github.com/scummvm/scummvm/commit/a36039f9fe896241bddc1d0015c8d6f1cfaa5039
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-12T12:35:18+01:00

Commit Message:
FULLPIPE: Fix bug in original in scene05

Changed paths:
    engines/fullpipe/scenes/scene05.cpp



diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp
index 99a485c..b8ecdc4 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/fullpipe/scenes/scene05.cpp
@@ -281,6 +281,9 @@ void sceneHandler05_testHatch(ExCommand *inex) {
 
 			mq->_isFinished = 0;
 
+			if (!mq->chain(wacko))
+				delete mq;
+
 			return;
 		}
 





More information about the Scummvm-git-logs mailing list