Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:gummikana/poro

  • Loading branch information...
commit 9c027b17ad1ab37bf86b3fc38fb9c6b44ef7584e 2 parents c105c86 + a4b7b75
@gummikana authored
View
2  source/game_utils/actionscript/displayobjectcontainer.cpp
@@ -65,7 +65,7 @@ void DisplayObjectContainer::addChildAt( DisplayObjectContainer* child, int inde
mChildren.push_back( child );
}
-std::list< DisplayObjectContainer* >& DisplayObjectContainer::GetRawChildren(){
+DisplayObjectContainer::ChildList& DisplayObjectContainer::GetRawChildren(){
return mChildren;
}
View
1  source/game_utils/actionscript/displayobjectcontainer.h
@@ -23,6 +23,7 @@
#define INC_DISPLAYOBJECTCONTAINER_H
#include <list>
+#include <vector>
#include <algorithm>
#include "../../utils/debug.h"
View
8 source/game_utils/actionscript/sprite.cpp
@@ -177,8 +177,8 @@ Sprite* Sprite::GetChildByName( const std::string& name )
void Sprite::Clear()
{
- std::list< DisplayObjectContainer* > erase_me = mChildren;
- for( std::list< DisplayObjectContainer* >::iterator i = erase_me.begin(); i != erase_me.end(); ++i )
+ DisplayObjectContainer::ChildList erase_me = mChildren;
+ for( DisplayObjectContainer::ChildList::iterator i = erase_me.begin(); i != erase_me.end(); ++i )
delete *i;
@@ -310,7 +310,7 @@ bool Sprite::DrawChildren( poro::IGraphics* graphics, types::camera* camera, Tra
transform.PushXForm( mXForm, mColor );
- std::list< DisplayObjectContainer* >::iterator i;
+ DisplayObjectContainer::ChildList::iterator i;
Sprite* current = NULL;
for( i = mChildren.begin(); i != mChildren.end(); )
@@ -329,7 +329,7 @@ bool Sprite::DrawChildren( poro::IGraphics* graphics, types::camera* camera, Tra
}
else
{
- std::list< DisplayObjectContainer* >::iterator remove = i;
+ DisplayObjectContainer::ChildList::iterator remove = i;
++i;
mChildren.erase( remove );
// current->SetFather( NULL );
Please sign in to comment.
Something went wrong with that request. Please try again.