[Scummvm-cvs-logs] scummvm master -> 432771b5d931b5722c28d3158c5d82774c16c632

dreammaster dreammaster at scummvm.org
Wed Apr 20 13:07:06 CEST 2011


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:
432771b5d9 TSAGE: Properly destroy cloned objects when removed from a scene


Commit: 432771b5d931b5722c28d3158c5d82774c16c632
    https://github.com/scummvm/scummvm/commit/432771b5d931b5722c28d3158c5d82774c16c632
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-20T04:05:42-07:00

Commit Message:
TSAGE: Properly destroy cloned objects when removed from a scene

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index ba4c592..d064917 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2254,8 +2254,9 @@ void SceneObject::removeObject() {
 		_mover->remove();
 		_mover = NULL;
 	}
-	if (_flags & 0x800)
-		destroy();
+	if (_flags & OBJFLAG_CLONED)
+		// Cloned temporary object, so delete it
+		delete this;
 }
 
 GfxSurface SceneObject::getFrame() {






More information about the Scummvm-git-logs mailing list