project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java
changeset 7485 0481bd74267c
parent 7476 2fb781bbdd51
child 7508 763d3961400b
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java	Sun Aug 12 22:37:57 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java	Sun Aug 12 22:46:23 2012 +0200
@@ -38,13 +38,19 @@
 	}
 	
 	public int getHealth() {
-		return settings.get("health");
+		Integer health = settings.get("health");
+		return health==null ? 100 : health.intValue();
 	}
 
-	@Override
+	/*@Override
 	public String toString() {
 		return "Scheme [metascheme=" + metascheme + ", name=" + name
 				+ ", settings=" + settings + ", mods=" + mods + "]";
+	}*/
+	
+	@Override
+	public String toString() {
+		return name; // TODO change back once StartGameActivity does not need this anymore
 	}
 	
 	public static final Comparator<Scheme> caseInsensitiveNameComparator = new Comparator<Scheme>() {