Compilation fixes: these classes weren't referenced before and so weren't
compiling, but I'm playing around with building .swc libraries to cut down on the build time of the client. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@46 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -41,7 +41,7 @@ public class DefaultFlexTableConfigurator extends TableConfigurator
|
|||||||
* Create a TableConfigurator that allows for the specified configuration
|
* Create a TableConfigurator that allows for the specified configuration
|
||||||
* parameters.
|
* parameters.
|
||||||
*/
|
*/
|
||||||
public function DefaultSwingTableConfigurator (
|
public function DefaultFlexTableConfigurator (
|
||||||
desiredPlayers :int, minPlayers :int = -1, maxPlayers :int = -1,
|
desiredPlayers :int, minPlayers :int = -1, maxPlayers :int = -1,
|
||||||
allowPrivate :Boolean = false)
|
allowPrivate :Boolean = false)
|
||||||
{
|
{
|
||||||
@@ -72,7 +72,7 @@ public class DefaultFlexTableConfigurator extends TableConfigurator
|
|||||||
}
|
}
|
||||||
|
|
||||||
// documentation inherited
|
// documentation inherited
|
||||||
protected function createConfigInterface () :void
|
override protected function createConfigInterface () :void
|
||||||
{
|
{
|
||||||
super.createConfigInterface();
|
super.createConfigInterface();
|
||||||
|
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ public class TableDirector extends BasicDirector
|
|||||||
}
|
}
|
||||||
|
|
||||||
// documentation inherited
|
// documentation inherited
|
||||||
protected function fetchServices (Client client) :void
|
override protected function fetchServices (client :Client) :void
|
||||||
{
|
{
|
||||||
// get a handle on our parlor services
|
// get a handle on our parlor services
|
||||||
_pservice = (client.requireService(ParlorService) as ParlorService);
|
_pservice = (client.requireService(ParlorService) as ParlorService);
|
||||||
|
|||||||
@@ -21,12 +21,15 @@
|
|||||||
|
|
||||||
package com.threerings.parlor.data {
|
package com.threerings.parlor.data {
|
||||||
|
|
||||||
|
import com.threerings.util.ArrayUtil;
|
||||||
|
import com.threerings.util.ClassUtil;
|
||||||
import com.threerings.util.Hashable;
|
import com.threerings.util.Hashable;
|
||||||
import com.threerings.util.Name;
|
import com.threerings.util.Name;
|
||||||
import com.threerings.util.StringBuilder;
|
import com.threerings.util.StringBuilder;
|
||||||
|
|
||||||
import com.threerings.io.ObjectInputStream;
|
import com.threerings.io.ObjectInputStream;
|
||||||
import com.threerings.io.ObjectOutputStream;
|
import com.threerings.io.ObjectOutputStream;
|
||||||
|
import com.threerings.io.TypedArray;
|
||||||
|
|
||||||
import com.threerings.presents.dobj.DSet;
|
import com.threerings.presents.dobj.DSet;
|
||||||
import com.threerings.presents.dobj.DSet_Entry;
|
import com.threerings.presents.dobj.DSet_Entry;
|
||||||
@@ -35,6 +38,7 @@ import com.threerings.crowd.data.BodyObject;
|
|||||||
|
|
||||||
import com.threerings.parlor.data.ParlorCodes;
|
import com.threerings.parlor.data.ParlorCodes;
|
||||||
import com.threerings.parlor.game.data.GameConfig;
|
import com.threerings.parlor.game.data.GameConfig;
|
||||||
|
import com.threerings.parlor.game.data.PartyGameCodes;
|
||||||
import com.threerings.parlor.game.data.PartyGameConfig;
|
import com.threerings.parlor.game.data.PartyGameConfig;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -42,7 +46,7 @@ import com.threerings.parlor.game.data.PartyGameConfig;
|
|||||||
* the Parlor services.
|
* the Parlor services.
|
||||||
*/
|
*/
|
||||||
public class Table
|
public class Table
|
||||||
implements Hashable, DSet_Entry, ParlorCodes
|
implements Hashable, DSet_Entry
|
||||||
{
|
{
|
||||||
/** The unique identifier for this table. */
|
/** The unique identifier for this table. */
|
||||||
public var tableId :int;
|
public var tableId :int;
|
||||||
@@ -138,7 +142,7 @@ public class Table
|
|||||||
|
|
||||||
// compress the team indexes down
|
// compress the team indexes down
|
||||||
var newTeams :TypedArray = new TypedArray("[[I");
|
var newTeams :TypedArray = new TypedArray("[[I");
|
||||||
var players :TypedArray = getPlayers();
|
var players :Array = getPlayers();
|
||||||
for (var ii :int = 0; ii < teams.length; ii++) {
|
for (var ii :int = 0; ii < teams.length; ii++) {
|
||||||
var subTeams :Array = (teams[ii] as Array);
|
var subTeams :Array = (teams[ii] as Array);
|
||||||
var newSubTeams :TypedArray = TypedArray.create(int);
|
var newSubTeams :TypedArray = TypedArray.create(int);
|
||||||
@@ -160,12 +164,12 @@ public class Table
|
|||||||
*/
|
*/
|
||||||
public function isPartyGame () :Boolean
|
public function isPartyGame () :Boolean
|
||||||
{
|
{
|
||||||
return (PartyGameConfig.NOT_PARTY_GAME != getPartyGameType());
|
return (PartyGameCodes.NOT_PARTY_GAME != getPartyGameType());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the type of party game being played at this table, or
|
* Get the type of party game being played at this table, or
|
||||||
* PartyGameConfig.NOT_PARTY_GAME.
|
* PartyGameCodes.NOT_PARTY_GAME.
|
||||||
*/
|
*/
|
||||||
public function getPartyGameType () :int
|
public function getPartyGameType () :int
|
||||||
{
|
{
|
||||||
@@ -173,7 +177,7 @@ public class Table
|
|||||||
return (config as PartyGameConfig).getPartyGameType();
|
return (config as PartyGameConfig).getPartyGameType();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
return PartyGameConfig.NOT_PARTY_GAME;
|
return PartyGameCodes.NOT_PARTY_GAME;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,12 +196,12 @@ public class Table
|
|||||||
{
|
{
|
||||||
// make sure the requested position is a valid one
|
// make sure the requested position is a valid one
|
||||||
if (position >= tconfig.desiredPlayerCount || position < 0) {
|
if (position >= tconfig.desiredPlayerCount || position < 0) {
|
||||||
return INVALID_TABLE_POSITION;
|
return ParlorCodes.INVALID_TABLE_POSITION;
|
||||||
}
|
}
|
||||||
|
|
||||||
// make sure the requested position is not already occupied
|
// make sure the requested position is not already occupied
|
||||||
if (occupants[position] != null) {
|
if (occupants[position] != null) {
|
||||||
return TABLE_POSITION_OCCUPIED;
|
return ParlorCodes.TABLE_POSITION_OCCUPIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// otherwise all is well, stick 'em in
|
// otherwise all is well, stick 'em in
|
||||||
@@ -224,7 +228,7 @@ public class Table
|
|||||||
* removed, false if the user was never seated at the table in the
|
* removed, false if the user was never seated at the table in the
|
||||||
* first place.
|
* first place.
|
||||||
*/
|
*/
|
||||||
public function clearOccupant (username :Name) :void
|
public function clearOccupant (username :Name) :Boolean
|
||||||
{
|
{
|
||||||
var dex :int = ArrayUtil.indexOf(occupants, username);
|
var dex :int = ArrayUtil.indexOf(occupants, username);
|
||||||
if (dex != -1) {
|
if (dex != -1) {
|
||||||
@@ -242,7 +246,7 @@ public class Table
|
|||||||
* removed, false if the user was never seated at the table in the
|
* removed, false if the user was never seated at the table in the
|
||||||
* first place.
|
* first place.
|
||||||
*/
|
*/
|
||||||
public function clearOccupant (bodyOid :int) :Boolean
|
public function clearOccupantByOid (bodyOid :int) :Boolean
|
||||||
{
|
{
|
||||||
var dex :int = ArrayUtil.indexOf(bodyOids, bodyOid);
|
var dex :int = ArrayUtil.indexOf(bodyOids, bodyOid);
|
||||||
if (dex != -1) {
|
if (dex != -1) {
|
||||||
@@ -319,7 +323,7 @@ public class Table
|
|||||||
public function equals (other :Object) :Boolean
|
public function equals (other :Object) :Boolean
|
||||||
{
|
{
|
||||||
return (other is Table) &&
|
return (other is Table) &&
|
||||||
(tableId == ((Table) other).tableId);
|
(tableId == (other as Table).tableId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// from Hashable
|
// from Hashable
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class Cluster extends Rectangle
|
|||||||
/**
|
/**
|
||||||
* Generates a string representation of this instance.
|
* Generates a string representation of this instance.
|
||||||
*/
|
*/
|
||||||
public function toString () :String
|
override public function toString () :String
|
||||||
{
|
{
|
||||||
return super.toString() + ", clusterOid=" + clusterOid;
|
return super.toString() + ", clusterOid=" + clusterOid;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ package com.threerings.whirled.spot.data {
|
|||||||
import com.threerings.presents.dobj.DObject;
|
import com.threerings.presents.dobj.DObject;
|
||||||
import com.threerings.presents.dobj.OidList;
|
import com.threerings.presents.dobj.OidList;
|
||||||
|
|
||||||
import com.threerings.crowd.chat.data.SpeakObject;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to dispatch chat in clusters.
|
* Used to dispatch chat in clusters.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ public class UpdateList
|
|||||||
} else if (gotVersion < expVersion) {
|
} else if (gotVersion < expVersion) {
|
||||||
// we somehow got an update that's older than updates we
|
// we somehow got an update that's older than updates we
|
||||||
// already have? wick wick wack
|
// already have? wick wick wack
|
||||||
throw new IllegalArgumentError("Invalid update version " +
|
throw new ArgumentError("Invalid update version " +
|
||||||
"[want=" + expVersion + ", got=" + update + "]");
|
"[want=" + expVersion + ", got=" + update + "]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user