Added DisplayObjectContainer::addChildAndRemoveFromPreviousFather

gummikana · Aug 28, 2014 · 217562c · 217562c
1 parent 28fe740
commit 217562c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/source/game_utils/actionscript/displayobjectcontainer.cpp b/source/game_utils/actionscript/displayobjectcontainer.cpp
@@ -70,6 +70,19 @@ void DisplayObjectContainer::addChild( DisplayObjectContainer* child )
 }
 //-----------------------------------------------------------------------------
 
+void DisplayObjectContainer::addChildAndRemoveFromPreviousFather( DisplayObjectContainer* child )
+{
+	cassert( child );
+	cassert( child != this );
+
+	if ( child->mFather != NULL )
+		child->mFather->removeChildForReuse( child );
+
+	mChildren.push_back( child );
+	child->SetFather( this );
+}
+//-----------------------------------------------------------------------------
+
 void DisplayObjectContainer::removeChild( DisplayObjectContainer* child )
 {
 	if( child == NULL ) return;
@@ -118,6 +131,7 @@ void DisplayObjectContainer::SetFather( DisplayObjectContainer* father )
 		}
 	}
 }
+
 //-----------------------------------------------------------------------------
 
 void DisplayObjectContainer::RemoveAllChildren()

diff --git a/source/game_utils/actionscript/displayobjectcontainer.h b/source/game_utils/actionscript/displayobjectcontainer.h
@@ -55,6 +55,7 @@ class DisplayObjectContainer : public EventDispatcher
 	// children and should not be used in time critical places
 	DisplayObjectContainer* GetChildAt( int index );
 	virtual void addChild( DisplayObjectContainer* child );
+	virtual void addChildAndRemoveFromPreviousFather( DisplayObjectContainer* child );
 	virtual void addChildAt( DisplayObjectContainer* child, int index );
 
 	virtual void removeChild( DisplayObjectContainer* child );