[Scummvm-git-logs] scummvm master -> 44e5c01e35fa0d41868e99b0d5656c75e1e42557

sev- sev at scummvm.org
Thu Dec 1 08:23:39 CET 2016


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

Summary:
44e5c01e35 FULLPIPE: Fix crash on scene switch


Commit: 44e5c01e35fa0d41868e99b0d5656c75e1e42557
    https://github.com/scummvm/scummvm/commit/44e5c01e35fa0d41868e99b0d5656c75e1e42557
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-01T08:23:11+01:00

Commit Message:
FULLPIPE: Fix crash on scene switch

Changed paths:
    engines/fullpipe/motion.cpp


diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 6edbd7b..05f13d4 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -779,6 +779,9 @@ MovGraphItem::MovGraphItem() {
 }
 
 void MovGraphItem::free() {
+	if (!mi_movitems)
+		return;
+
 	for (uint i = 0; i < mi_movitems->size(); i++) {
 		(*mi_movitems)[i]->movarr->_movSteps.clear();
 		delete (*mi_movitems)[i]->movarr;
@@ -914,6 +917,7 @@ Common::Array<MovItem *> *MovGraph::getPaths(StaticANIObject *ani, int x, int y,
 			Common::Array<MovItem *> *movitems = getPaths(&_items[idx]->movarr, (*movarr)[i], &sz);
 
 			if (sz > 0) {
+				_items[idx]->mi_movitems = new Common::Array<MovItem *>;
 				for (int j = 0; j < sz; j++)
 					_items[idx]->mi_movitems->push_back(movitems[j]);
 			}





More information about the Scummvm-git-logs mailing list