diff -r 356fbb672f84 -r f1a42ba9cab2 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Sat Nov 26 11:47:31 2011 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Sat Nov 26 16:18:44 2011 +0100 @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.List; import org.hedgewars.hedgeroid.R; import org.hedgewars.hedgeroid.Utils; @@ -52,23 +53,18 @@ return ret; } - public static String[] getGameplay(Context c){ + public static List getGameplay(Context c){ String[] files = Utils.getFileNamesFromRelativeDir(c, "Scripts/Multiplayer"); - int retCounter = 0; - + ArrayList ret = new ArrayList(); + for(int i = 0; i < files.length; i++){ if(files[i].endsWith(".lua")){ - files[i] = files[i].replace('_', ' ').substring(0, files[i].length()-4); //replace _ by a space and removed the last four characters (.lua) - retCounter++; - }else files[i] = null; + ret.add(files[i].replace('_', ' ').substring(0, files[i].length()-4)); //replace _ by a space and removed the last four characters (.lua) + } } - String[] ret = new String[retCounter]; - retCounter = 0; - for(String s : files){ - if(s != null) ret[retCounter++] = s; - } - Arrays.sort(ret); + Collections.sort(ret); + ret.add(0,"None"); return ret; } @@ -76,12 +72,16 @@ return Utils.getDirsWithFileSuffix(c, "Themes", "icon.png"); } - public static ArrayList getSchemes(Context c){ - return Scheme.getSchemes(c); + public static List getSchemes(Context c){ + List list = Scheme.getSchemes(c); + Collections.sort(list); + return list; } - public static ArrayList getWeapons(Context c){ - return Weapon.getWeapons(c); + public static List getWeapons(Context c){ + List list = Weapon.getWeapons(c); + Collections.sort(list); + return list; } public static ArrayList> getGraves(Context c){