--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerList.java	Tue Jul 24 16:57:48 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/PlayerList.java	Thu Jul 26 11:01:32 2012 +0200
@@ -5,14 +5,14 @@
 import java.util.TreeMap;
 
 import android.database.DataSetObservable;
+import android.util.Pair;
 
 public class PlayerList extends DataSetObservable {
 	private long nextId = 1;
-	private Map<String, Player> players = new TreeMap<String, Player>();
+	private Map<String, Pair<Player, Long>> players = new TreeMap<String, Pair<Player, Long>>();
 	
 	public void addPlayerWithNewId(String name) {
-		Player p = new Player(name, nextId++);
-		players.put(name, p);
+		players.put(name, Pair.create(new Player(name), nextId++));
 		notifyChanged();
 	}
 	
@@ -29,7 +29,7 @@
 		}
 	}
 
-	public Map<String, Player> getMap() {
+	public Map<String, Pair<Player, Long>> getMap() {
 		return Collections.unmodifiableMap(players);
 	}
 }