Effects/LayerMover.cpp

changeset 117
f1edaec047ec
parent 95
706ebab3b092
--- a/Effects/LayerMover.cpp	Mon Mar 12 12:04:56 2012 +0000
+++ b/Effects/LayerMover.cpp	Tue Mar 13 08:47:23 2012 +0000
@@ -34,7 +34,7 @@
 	}
 
 	animation::ProgressResult::Type LayerMover::Progress() {
-		if(from==to)
+		if(current==to)
 			return animation::ProgressResult::Finished;
 
 		if(!Controller)
@@ -73,8 +73,8 @@
 
 		if(from==to)
 			return animation::ProgressResult::Finished;
-		else
-			return animation::ProgressResult::None;
+
+		return animation::ProgressResult::None;
 	}
 
 	LayerMover::LayerMover( LayerBase *Target, animation::Timer &controller, bool owner ) :
@@ -93,7 +93,14 @@
 	{
 	}
 
-	LayerMover::LayerMover( LayerBase *Target, bool create/*=false*/ )
+	LayerMover::LayerMover( LayerBase *Target, bool create/*=false*/ ) : 
+	Target(Target), Base(create)
+	{
+
+	}
+
+	LayerMover::LayerMover( LayerBase &Target, bool create/*=false*/ ) : 
+	Target(&Target), Base(create)
 	{
 
 	}

mercurial