AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid name collision.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@516 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2007-12-06 01:42:02 +00:00
parent 32c4464a85
commit daec25d27c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/data/Table.java
+6 -6
View File
@@ -165,16 +165,16 @@ public class Table
// FFA party games have 0-length players array, and non-party games will have the players // FFA party games have 0-length players array, and non-party games will have the players
// who are ready-to-go for the game start. // who are ready-to-go for the game start.
Name[] players = new Name[getOccupiedCount()]; Name[] plist = new Name[getOccupiedCount()];
if (players != null) { if (players != null) {
for (int ii = 0, dex = 0; ii < players.length; ii++) { for (int ii = 0, dex = 0; ii < players.length; ii++) {
if (players[ii] != null) { if (players[ii] != null) {
players[dex++] = players[ii]; plist[dex++] = players[ii];
} }
} }
} }
return players; return plist;
} }
/** /**
@@ -191,13 +191,13 @@ public class Table
// compress the team indexes down // compress the team indexes down
ArrayIntSet set = new ArrayIntSet(); ArrayIntSet set = new ArrayIntSet();
int[][] newTeams = new int[teams.length][]; int[][] newTeams = new int[teams.length][];
Name[] players = getPlayers(); Name[] plist = getPlayers();
for (int ii=0; ii < teams.length; ii++) { for (int ii=0; ii < teams.length; ii++) {
set.clear(); set.clear();
for (int jj=0; jj < teams[ii].length; jj++) { for (int jj=0; jj < teams[ii].length; jj++) {
Name occ = players[teams[ii][jj]]; Name occ = plist[teams[ii][jj]];
if (occ != null) { if (occ != null) {
set.add(ListUtil.indexOf(players, occ)); set.add(ListUtil.indexOf(plist, occ));
} }
} }
newTeams[ii] = set.toIntArray(); newTeams[ii] = set.toIntArray();