X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/1065ae67bcab7e10507617a2189026b63a180103..e1331c9ca833e2bcb07e8b3ad26c8c2394d279de:/src/de/cwde/freeshisen/ShisenSho.java diff --git a/src/de/cwde/freeshisen/ShisenSho.java b/src/de/cwde/freeshisen/ShisenSho.java index 99327bd..f32fa70 100644 --- a/src/de/cwde/freeshisen/ShisenSho.java +++ b/src/de/cwde/freeshisen/ShisenSho.java @@ -14,7 +14,7 @@ public class ShisenSho extends Application { public int[] boardSize=new int[2]; public int difficulty=1; // 1=Easy, 2=Hard public int size=3; // 1=Small, 2=Medium, 3=Big - public int tilesetid = R.drawable.classic; + public String tilesetid = "classic"; public boolean gravity=true; public boolean timeCounter=true; @@ -84,7 +84,7 @@ public class ShisenSho extends Application { int difficulty = Integer.parseInt(sharedPref.getString("pref_diff", "1")); boolean gravity = sharedPref.getBoolean("pref_grav", true); boolean timeCounter = sharedPref.getBoolean("pref_time", true); - int tilesetid = tilesetStringToRes(sharedPref.getString("pref_tile", "")); + String tilesetid = sharedPref.getString("pref_tile", ""); boolean needsReset = false; @@ -118,25 +118,4 @@ public class ShisenSho extends Application { } } - - private int tilesetStringToRes(String s) - { - if (s.equals("classic")) { - return R.drawable.classic; - } else if (s.equals("jade")) { - return R.drawable.jade; - } else if (s.equals("traditional")) { - return R.drawable.traditional; - } else if (s.equals("pixel")) { - return R.drawable.pixel; - } else if (s.equals("original")) { - return R.drawable.original; - } else if (s.equals("veit")) { - return R.drawable.veit; - } else { - // shouldn't be reached... - Log.e("ShisenSho", "somebody managed to set an invalid tileset string"); - return R.drawable.classic; - } - } }