Skip to content

Commit e7a32c0

Browse files
committed
Fix start up transition
1 parent 350adc4 commit e7a32c0

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

StartUp.pde

+5-2
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,17 @@ public class StartUp extends Transitionable {
8585
m.p1.name = p1Name.getText();
8686
m.p2.name = p2Name.getText();
8787

88+
p1Name.remove();
89+
p2Name.remove();
90+
8891
// Begin transitioning!
8992
trans = true;
93+
9094
}
9195
}
9296

9397
protected void onTransOutBegin() {
94-
p1Name.remove();
95-
p2Name.remove();
98+
onDone();
9699
}
97100

98101
private class StartGameBtn extends Btn {

Transitionable.pde

+9-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ public abstract class Transitionable extends Obj {
5353

5454
if (m.transIn.done && m.transOut.done) {
5555
// When the trans is done
56-
trans = false;
57-
done = true;
58-
middle = false;
59-
60-
clean();
56+
onDone();
6157
}
6258
}
6359

@@ -66,6 +62,14 @@ public abstract class Transitionable extends Obj {
6662
m.transOut.reset();
6763
}
6864

65+
protected void onDone() {
66+
trans = false;
67+
done = true;
68+
middle = false;
69+
70+
clean();
71+
}
72+
6973
// Method whitch inheriting classes should implement
7074
// for cleanup
7175
protected void onTransOutBegin() {}

0 commit comments

Comments
 (0)