diff --git a/AndorsTrail/res/layout/startscreen.xml b/AndorsTrail/res/layout/startscreen.xml
index 7f2657658..530b71bb3 100644
--- a/AndorsTrail/res/layout/startscreen.xml
+++ b/AndorsTrail/res/layout/startscreen.xml
@@ -44,7 +44,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="This is a development version of Andor's Trail. Savegames produced by this version are incompatible with the release version."
android:textColor="#880000"
android:gravity="center_horizontal"
android:visibility="gone"
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 2102d937c..968af3a43 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -649,5 +649,7 @@ Every skill level increases the attack chance of weapons with %1$d %% of their o
- 5
- 6
+ This is a development version of Andor\'s Trail. Savegames produced by this version are incompatible with the release version.
+ This is a prerelease version of Andor\'s Trail. Savegames produced by this version might not be compatible with the release version.
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index e398877fa..9d24e9ed1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -20,7 +20,8 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 37;
public static final String CURRENT_VERSION_DISPLAY = "0.7.0a1";
-
+ public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
+
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
private final WorldContext world = new WorldContext();
private final ControllerContext controllers = new ControllerContext(this, world);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index 689fc334a..531c37fe1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -94,11 +94,15 @@ public final class StartScreenActivity extends Activity {
Dialogs.showLoad(StartScreenActivity.this);
}
});
-
+
+ TextView development_version = (TextView) findViewById(R.id.startscreen_dev_version);
if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
- TextView development_version = (TextView) findViewById(R.id.startscreen_dev_version);
+ development_version.setText(R.string.startscreen_incompatible_savegames);
development_version.setVisibility(View.VISIBLE);
- }
+ } else if (!AndorsTrailApplication.IS_RELEASE_VERSION) {
+ development_version.setText(R.string.startscreen_non_release_version);
+ development_version.setVisibility(View.VISIBLE);
+ }
final Resources res = getResources();
TileManager tileManager = app.getWorld().tileManager;