diff -r 356fbb672f84 -r f1a42ba9cab2 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java Sat Nov 26 11:47:31 2011 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java Sat Nov 26 16:18:44 2011 +0100 @@ -34,7 +34,8 @@ public Scheme scheme = null; public Weapon weapon = null; - public String mission = null; + public String style = null; + public String training = null; public String seed = null; public ArrayList teams = new ArrayList(); @@ -53,7 +54,8 @@ Log.d("HW_Frontend", "Sending Gameconfig..."); int teamCount = 4; epn.sendToEngine("TL"); //Write game mode - if(mission != null) epn.sendToEngine(mission); + if(training != null) epn.sendToEngine(String.format("escript Scripts/Training/%s.lua", training)); + else if(style != null) epn.sendToEngine(String.format("escript Scripts/Multiplayer/%s.lua", style)); //seed info epn.sendToEngine(String.format("eseed {%s}", UUID.randomUUID().toString())); @@ -85,7 +87,8 @@ dest.writeString(theme); dest.writeParcelable(scheme, flags); dest.writeParcelable(weapon, flags); - dest.writeString(mission); + dest.writeString(style); + dest.writeString(training); dest.writeString(seed); dest.writeParcelableArray((Team[])teams.toArray(new Team[1]), 0); } @@ -96,7 +99,8 @@ theme = src.readString(); scheme = src.readParcelable(Scheme.class.getClassLoader()); weapon = src.readParcelable(Weapon.class.getClassLoader()); - mission = src.readString(); + style = src.readString(); + training = src.readString(); seed = src.readString(); Parcelable[] parcelables = src.readParcelableArray(Team[].class.getClassLoader()); for(Parcelable team : parcelables){