OSDN Git Service

[fixed] listener wasn't cleared when fetching an action from the pool.
authorbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sat, 5 Feb 2011 21:47:22 +0000 (21:47 +0000)
committerbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Sat, 5 Feb 2011 21:47:22 +0000 (21:47 +0000)
13 files changed:
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/Delay.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/FadeIn.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/FadeOut.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/FadeTo.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/Forever.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/MoveBy.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/MoveTo.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/Parallel.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/Repeat.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/RotateBy.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/RotateTo.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/ScaleTo.java
gdx/src/com/badlogic/gdx/scenes/scene2d/actions/Sequence.java

index 3c9aae2..b751273 100644 (file)
@@ -32,6 +32,7 @@ public class Delay extends Action {
                Delay delay = pool.obtain();\r
                delay.duration = duration;\r
                delay.action = action;\r
+               delay.listener = null;\r
                return delay;\r
        }\r
 \r
index 80dc39d..a74bca7 100644 (file)
@@ -36,6 +36,7 @@ public class FadeIn extends Action {
                FadeIn action = pool.obtain();\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
@@ -46,6 +47,7 @@ public class FadeIn extends Action {
                this.deltaAlpha = 1;\r
                this.taken = 0;\r
                this.done = false;\r
+               \r
        }\r
 \r
        @Override public void act (float delta) {\r
index 51ef57a..c3aba6e 100644 (file)
@@ -36,6 +36,7 @@ public class FadeOut extends Action {
                FadeOut action = pool.obtain();\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 37214db..c391b6b 100644 (file)
@@ -40,6 +40,7 @@ public class FadeTo extends Action {
                action.toAlpha = alpha;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 39712ea..6254f99 100644 (file)
@@ -30,6 +30,7 @@ public class Forever extends Action {
        public static Forever $ (Action action) {\r
                Forever forever = pool.obtain();\r
                forever.action = action;\r
+               forever.listener = null;\r
                return forever;\r
        }\r
 \r
index 1a80bc5..77dc739 100644 (file)
@@ -42,6 +42,7 @@ public class MoveBy extends Action {
                action.y = y;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
@@ -52,7 +53,7 @@ public class MoveBy extends Action {
                this.deltaX = x;\r
                this.deltaY = y;\r
                this.taken = 0;\r
-               this.done = false;\r
+               this.done = false;              \r
        }\r
 \r
        @Override public void act (float delta) {\r
index 8d4a434..36a16e2 100644 (file)
@@ -42,6 +42,7 @@ public class MoveTo extends Action {
                action.y = y;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index af92958..72521f5 100644 (file)
@@ -35,6 +35,7 @@ public class Parallel extends Action {
                int len = actions.length;\r
                for (int i = 0; i < len; i++)\r
                        action.actions.add(actions[i]);\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 7c21ab2..dcd084e 100644 (file)
@@ -34,6 +34,7 @@ public class Repeat extends Action {
                repeat.action = action;\r
                repeat.times = times;\r
                repeat.finishedTimes = 0;\r
+               repeat.listener = null;\r
                return repeat;\r
        }\r
 \r
index abf7cfe..082a2b8 100644 (file)
@@ -38,6 +38,7 @@ public class RotateBy extends Action {
                action.rotation = rotation;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 1b532ab..cadda73 100644 (file)
@@ -38,6 +38,7 @@ public class RotateTo extends Action {
                action.rotation = rotation;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 0574e0f..89168e5 100644 (file)
@@ -42,6 +42,7 @@ public class ScaleTo extends Action {
                action.scaleY = scaleY;\r
                action.duration = duration;\r
                action.invDuration = 1 / duration;\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r
index 6cf1a71..fcc4a8b 100644 (file)
@@ -38,6 +38,7 @@ public class Sequence extends Action {
                int len = actions.length;\r
                for (int i = 0; i < len; i++)\r
                        action.actions.add(actions[i]);\r
+               action.listener = null;\r
                return action;\r
        }\r
 \r