diff -r 45b9f25ff611 -r 2fb781bbdd51 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Map.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Map.java Mon Aug 06 22:33:07 2012 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Map.java Mon Aug 06 22:39:36 2012 +0200 @@ -19,17 +19,11 @@ package org.hedgewars.hedgeroid.Datastructures; import java.io.File; -import java.io.IOException; - -import org.hedgewars.hedgeroid.EngineProtocol.EngineProtocolNetwork; - import android.content.Context; import android.graphics.drawable.Drawable; -import android.os.Parcel; -import android.os.Parcelable; -public class Map implements Comparable, Parcelable{ +public class Map implements Comparable { private static final String MISSION_PREFIX = "Mission: "; @@ -60,10 +54,6 @@ } - - public Map(Parcel in){ - readFromParcel(in); - } public String toString(){ switch(type){ @@ -77,10 +67,6 @@ } } - public void sendToEngine(EngineProtocolNetwork epn) throws IOException{ - epn.sendToEngine(String.format("emap %s",name)); - } - public MapType getType(){ return type; } @@ -133,31 +119,4 @@ public enum MapType{ TYPE_DEFAULT, TYPE_MISSION, TYPE_GENERATED } - - public int describeContents() { - return 0; - } - - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(name); - dest.writeString(path); - dest.writeString(previewPath); - dest.writeString(type.name()); - } - - private void readFromParcel(Parcel src){ - name = src.readString(); - path = src.readString(); - previewPath = src.readString(); - type = MapType.valueOf(src.readString()); - } - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - public Map createFromParcel(Parcel source) { - return new Map(source); - } - public Map[] newArray(int size) { - return new Map[size]; - } - - }; }