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

Allow derived classes to work with more specifically typed arrays if they like.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@769 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Mike Thomas
2008-10-28 23:47:36 +00:00
parent 387eb32349
commit 3fff321829
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/data/Table.java
+14 -6
View File
@@ -66,7 +66,7 @@ public class Table
/** An array of the usernames of the non-player occupants of this game. For FFA party games /** An array of the usernames of the non-player occupants of this game. For FFA party games
* this is all of a room's occupants and they are in fact players. */ * this is all of a room's occupants and they are in fact players. */
public Name[] watchers = new Name[0]; public Name[] watchers = createPlayerNamesArray(0);
/** The body oids of the players of this table, or null if a party game. (This is not /** The body oids of the players of this table, or null if a party game. (This is not
* propagated to remote instances.) */ * propagated to remote instances.) */
@@ -107,7 +107,7 @@ public class Table
// make room for the maximum number of players // make room for the maximum number of players
if (config.getMatchType() != GameConfig.PARTY) { if (config.getMatchType() != GameConfig.PARTY) {
players = new Name[tconfig.desiredPlayerCount]; players = createPlayerNamesArray(tconfig.desiredPlayerCount);
bodyOids = new int[players.length]; bodyOids = new int[players.length];
// fill in information on the AIs // fill in information on the AIs
@@ -118,7 +118,7 @@ public class Table
} }
} else { } else {
players = new Name[0]; players = createPlayerNamesArray(0);
bodyOids = new int[0]; bodyOids = new int[0];
} }
} }
@@ -163,12 +163,12 @@ public class Table
{ {
// seated party games need a spot for every seat // seated party games need a spot for every seat
if (GameConfig.SEATED_CONTINUOUS == config.getMatchType()) { if (GameConfig.SEATED_CONTINUOUS == config.getMatchType()) {
return new Name[tconfig.desiredPlayerCount]; return createPlayerNamesArray(tconfig.desiredPlayerCount);
} }
// 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[] plist = new Name[getOccupiedCount()]; Name[] plist = createPlayerNamesArray(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) {
@@ -351,7 +351,7 @@ public class Table
} }
wlist.add(info.username); wlist.add(info.username);
} }
watchers = wlist.toArray(new Name[wlist.size()]); watchers = wlist.toArray(createPlayerNamesArray(wlist.size()));
} }
/** /**
@@ -453,6 +453,14 @@ public class Table
buf.append(", config=").append(config); buf.append(", config=").append(config);
} }
/**
* Creates a names array of the appropriate type.
*/
protected Name[] createPlayerNamesArray (int length)
{
return new Name[length];
}
/** A counter for assigning table ids. */ /** A counter for assigning table ids. */
protected static int _tableIdCounter = 0; protected static int _tableIdCounter = 0;