[Scummvm-cvs-logs] scummvm master -> 548e6e3f52a9877f28459b2ae4205d8e4855aceb

dreammaster dreammaster at scummvm.org
Sat Oct 5 14:35:56 CEST 2013


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:
548e6e3f52 TSAGE: R2R bugfix for objects being removed and then readded incorrectly


Commit: 548e6e3f52a9877f28459b2ae4205d8e4855aceb
    https://github.com/scummvm/scummvm/commit/548e6e3f52a9877f28459b2ae4205d8e4855aceb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-05T05:35:28-07:00

Commit Message:
TSAGE: R2R bugfix for objects being removed and then readded incorrectly

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f7fbb1d..6f356d8 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2482,7 +2482,8 @@ void SceneObject::postInit(SceneObjectList *OwnerList) {
 	if (!OwnerList)
 		OwnerList = g_globals->_sceneObjects;
 
-	if (!OwnerList->contains(this) || ((_flags & OBJFLAG_REMOVE) != 0)) {
+	bool isExisting = OwnerList->contains(this); 
+	if (!isExisting || ((_flags & OBJFLAG_REMOVE) != 0)) {
 		_percent = 100;
 		_priority = 255;
 		_flags = OBJFLAG_ZOOMED;
@@ -2501,7 +2502,8 @@ void SceneObject::postInit(SceneObjectList *OwnerList) {
 		_numFrames = 10;
 		_regionBitList = 0;
 
-		OwnerList->push_back(this);
+		if (!isExisting)
+			OwnerList->push_back(this);
 		_flags |= OBJFLAG_PANES;
 	}
 }






More information about the Scummvm-git-logs mailing list