Merge branch 'dev'

turpgames · Mar 3, 2014 · f072021 · f072021
2 parents feb4202 + afbbead
commit f072021
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/ichigu-android/AndroidManifest.xml b/ichigu-android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.turpgames.ichigu"
-    android:versionCode="5"
-    android:versionName="1.2.0" >
+    android:versionCode="6"
+    android:versionName="1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/ichigu-robovm/robovm.properties b/ichigu-robovm/robovm.properties
@@ -1,8 +1,8 @@
 #
 #Fri May 31 13:01:40 CEST 2013
-app.version=1.2.0
+app.version=1.2.1
 app.id=com.turpgames.ichigu
 app.mainclass=com.turpgames.ichigu.RobovmLauncher
 app.executable=Ichigu
-app.build=2
+app.build=3
 app.name=Ichigu
diff --git a/ichigu/src/com/turpgames/ichigu/model/game/IchiguObject.java b/ichigu/src/com/turpgames/ichigu/model/game/IchiguObject.java
@@ -9,7 +9,6 @@
 import com.turpgames.framework.v0.effects.fading.FadeOutEffect;
 import com.turpgames.framework.v0.effects.fading.IFadingEffectSubject;
 import com.turpgames.framework.v0.impl.GameObject;
-import com.turpgames.framework.v0.util.Vector;
 import com.turpgames.ichigu.utils.R;
 
 public abstract class IchiguObject extends GameObject implements IFadingEffectSubject, IBlinkEffectSubject {
@@ -33,12 +32,6 @@ public float getAlpha() {
 		return getColor().a;
 	}
 
-	public void moveTo(IEffectEndListener listener, Vector destination, float duration) {
-		getMoveEffect().setDestination(destination);
-		getMoveAndScaleEffect().setDuration(duration);
-		getMoveAndScaleEffect().start(listener);
-	}
-
 	@Override
 	public void setAlpha(float alpha) {
 		getColor().a = alpha;	

diff --git a/ichigu/src/com/turpgames/ichigu/model/game/mode/fullgame/FullGameMode.java b/ichigu/src/com/turpgames/ichigu/model/game/mode/fullgame/FullGameMode.java
@@ -210,7 +210,7 @@ protected void notifyModeEnd() {
 	@Override
 	protected void onDraw() {
 		timerText.draw();
-		if (pauseTimer.isRunning())
+		if (!pauseTimer.isStopped())
 			pauseTimerText.draw();
 		drawFeatureButtons();
 		super.onDraw();
@@ -219,6 +219,7 @@ protected void onDraw() {
 	@Override
 	protected void onEndMode() {
 		getTimer().stop();
+		pauseTimer.stop();
 		resultScreenButtons.activate();
 		deactivateFeatureButtons();
 		super.onEndMode();
@@ -231,11 +232,13 @@ protected boolean onExitMode() {
 		getTimer().stop();
 		resultScreenButtons.deactivate();
 		deactivateFeatureButtons();
+		pauseTimer.stop();
 		return true;
 	}
 
 	@Override
 	protected void onResetMode() {
+		pauseTimer.stop();
 		getTimer().restart();
 		timerText.syncText();
 		deactivateFeatureButtons();
@@ -245,6 +248,7 @@ protected void onResetMode() {
 
 	@Override
 	protected void onStartMode() {
+		pauseTimer.stop();
 		getTimer().restart();
 		timerText.syncText();
 		resultScreenButtons.deactivate();
@@ -254,11 +258,15 @@ protected void onStartMode() {
 
 	@Override
 	protected void pauseTimer() {
+		if (pauseTimer.isRunning())
+			pauseTimer.pause();
 		getTimer().pause();
 	}
 
 	@Override
 	protected void startTimer() {
+		if (pauseTimer.isPaused())
+			pauseTimer.start();
 		getTimer().start();
 	}
 
@@ -321,6 +329,7 @@ private void toastFeatureAlreadyUsed() {
 	private void onPauseTimerFeatureUsed() {
 		getTimer().pauseFor(R.durations.fullModeTimerPauseDuration);
 		pauseTimer.restart();
+		pauseTimerText.syncText();
 	}
 
 	private void onTimerPauseEnd() {