diff --git a/src/as/com/threerings/parlor/card/data/PlayerCard.as b/src/as/com/threerings/parlor/card/data/PlayerCard.as index 48062f80..8c4db63d 100644 --- a/src/as/com/threerings/parlor/card/data/PlayerCard.as +++ b/src/as/com/threerings/parlor/card/data/PlayerCard.as @@ -53,7 +53,7 @@ public class PlayerCard public function readObject (ins :ObjectInputStream) :void { pidx = ins.readInt(); - card = (ins.readObject() as Card); + card = Card(ins.readObject()); } // from interface Streamable diff --git a/src/as/com/threerings/parlor/data/ChoiceParameter.as b/src/as/com/threerings/parlor/data/ChoiceParameter.as index f5bd2bdb..9e05f45f 100644 --- a/src/as/com/threerings/parlor/data/ChoiceParameter.as +++ b/src/as/com/threerings/parlor/data/ChoiceParameter.as @@ -32,7 +32,7 @@ public class ChoiceParameter extends Parameter override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); - choices = (ins.readObject() as TypedArray); + choices = TypedArray(ins.readObject()); start = (ins.readField(String) as String); } diff --git a/src/as/com/threerings/parlor/data/Table.as b/src/as/com/threerings/parlor/data/Table.as index a6de9f64..fb185252 100644 --- a/src/as/com/threerings/parlor/data/Table.as +++ b/src/as/com/threerings/parlor/data/Table.as @@ -240,10 +240,10 @@ public class Table tableId = ins.readInt(); lobbyOid = ins.readInt(); gameOid = ins.readInt(); - players = (ins.readObject() as TypedArray); - watchers = (ins.readObject() as TypedArray); - config = (ins.readObject() as GameConfig); - tconfig = (ins.readObject() as TableConfig); + players = TypedArray(ins.readObject()); + watchers = TypedArray(ins.readObject()); + config = GameConfig(ins.readObject()); + tconfig = TableConfig(ins.readObject()); } // from Streamable diff --git a/src/as/com/threerings/parlor/data/TableConfig.as b/src/as/com/threerings/parlor/data/TableConfig.as index b99aa7fc..314b65a9 100644 --- a/src/as/com/threerings/parlor/data/TableConfig.as +++ b/src/as/com/threerings/parlor/data/TableConfig.as @@ -58,7 +58,7 @@ public class TableConfig extends SimpleStreamableObject super.readObject(ins); desiredPlayerCount = ins.readInt(); minimumPlayerCount = ins.readInt(); - teamMemberIndices = (ins.readObject() as TypedArray); + teamMemberIndices = TypedArray(ins.readObject()); privateTable = ins.readBoolean(); } diff --git a/src/as/com/threerings/parlor/game/data/GameConfig.as b/src/as/com/threerings/parlor/game/data/GameConfig.as index f96314b0..c8aafd0a 100644 --- a/src/as/com/threerings/parlor/game/data/GameConfig.as +++ b/src/as/com/threerings/parlor/game/data/GameConfig.as @@ -170,9 +170,9 @@ public /*abstract*/ class GameConfig extends PlaceConfig override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); - players = (ins.readObject() as TypedArray); + players = TypedArray(ins.readObject()); rated = ins.readBoolean(); - ais = (ins.readObject() as TypedArray); + ais = TypedArray(ins.readObject()); } // from interface Streamable diff --git a/src/as/com/threerings/parlor/game/data/GameObject.as b/src/as/com/threerings/parlor/game/data/GameObject.as index 349bbfad..1f949478 100644 --- a/src/as/com/threerings/parlor/game/data/GameObject.as +++ b/src/as/com/threerings/parlor/game/data/GameObject.as @@ -427,7 +427,7 @@ public class GameObject extends PlaceObject state = ins.readInt(); isRated = ins.readBoolean(); isPrivate = ins.readBoolean(); - players = (ins.readObject() as TypedArray); + players = TypedArray(ins.readObject()); winners = (ins.readField(TypedArray.getJavaType(Boolean)) as TypedArray); sessionId = ins.readInt(); playerStatus = (ins.readField(TypedArray.getJavaType(int)) as TypedArray); diff --git a/src/as/com/threerings/whirled/data/SceneModel.as b/src/as/com/threerings/whirled/data/SceneModel.as index 6ee99756..111c832d 100644 --- a/src/as/com/threerings/whirled/data/SceneModel.as +++ b/src/as/com/threerings/whirled/data/SceneModel.as @@ -102,7 +102,7 @@ public class SceneModel extends SimpleStreamableObject sceneId = ins.readInt(); name = (ins.readField(String) as String); version = ins.readInt(); - auxModels = (ins.readObject() as TypedArray); + auxModels = TypedArray(ins.readObject()); } // documentation inherited from interface Streamable diff --git a/src/as/com/threerings/whirled/spot/data/ClusterObject.as b/src/as/com/threerings/whirled/spot/data/ClusterObject.as index c41aadb5..d0184229 100644 --- a/src/as/com/threerings/whirled/spot/data/ClusterObject.as +++ b/src/as/com/threerings/whirled/spot/data/ClusterObject.as @@ -75,7 +75,7 @@ public class ClusterObject extends DObject { super.readObject(ins); - occupants = (ins.readObject() as OidList); + occupants = OidList(ins.readObject()); } } } diff --git a/src/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as b/src/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as index 23510345..68957f13 100644 --- a/src/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as +++ b/src/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as @@ -81,8 +81,8 @@ public class ModifyPortalsUpdate extends SceneUpdate override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); - portalsRemoved = (ins.readObject() as TypedArray); - portalsAdded = (ins.readObject() as TypedArray); + portalsRemoved = TypedArray(ins.readObject()); + portalsAdded = TypedArray(ins.readObject()); } // from interface Streamable diff --git a/src/as/com/threerings/whirled/spot/data/Portal.as b/src/as/com/threerings/whirled/spot/data/Portal.as index 28b1f371..95ba9fa7 100644 --- a/src/as/com/threerings/whirled/spot/data/Portal.as +++ b/src/as/com/threerings/whirled/spot/data/Portal.as @@ -127,7 +127,7 @@ public class Portal extends SimpleStreamableObject { super.readObject(ins); portalId = ins.readShort(); - loc = (ins.readObject() as Location); + loc = Location(ins.readObject()); targetSceneId = ins.readInt(); targetPortalId = ins.readShort(); } diff --git a/src/as/com/threerings/whirled/spot/data/SceneLocation.as b/src/as/com/threerings/whirled/spot/data/SceneLocation.as index a1028720..d74229d6 100644 --- a/src/as/com/threerings/whirled/spot/data/SceneLocation.as +++ b/src/as/com/threerings/whirled/spot/data/SceneLocation.as @@ -75,7 +75,7 @@ public class SceneLocation extends SimpleStreamableObject { super.readObject(ins); bodyOid = ins.readInt(); - loc = (ins.readObject() as Location); + loc = Location(ins.readObject()); } // documentation inherited from superinterface Streamable diff --git a/src/as/com/threerings/whirled/spot/data/SpotSceneModel.as b/src/as/com/threerings/whirled/spot/data/SpotSceneModel.as index 2515db58..b16d08d8 100644 --- a/src/as/com/threerings/whirled/spot/data/SpotSceneModel.as +++ b/src/as/com/threerings/whirled/spot/data/SpotSceneModel.as @@ -102,7 +102,7 @@ public class SpotSceneModel extends SimpleStreamableObject override public function readObject (ins :ObjectInputStream) :void { super.readObject(ins); - portals = (ins.readObject() as TypedArray); + portals = TypedArray(ins.readObject()); defaultEntranceId = ins.readInt(); } diff --git a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as index bce7421f..cff55f58 100644 --- a/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as +++ b/src/as/com/threerings/whirled/spot/data/SpotSceneObject.as @@ -158,8 +158,8 @@ public class SpotSceneObject extends SceneObject { super.readObject(ins); - occupantLocs = (ins.readObject() as DSet); - clusters = (ins.readObject() as DSet); + occupantLocs = DSet(ins.readObject()); + clusters = DSet(ins.readObject()); } } } diff --git a/src/as/com/threerings/whirled/zone/data/SceneSummary.as b/src/as/com/threerings/whirled/zone/data/SceneSummary.as index db04bdbf..d3570253 100644 --- a/src/as/com/threerings/whirled/zone/data/SceneSummary.as +++ b/src/as/com/threerings/whirled/zone/data/SceneSummary.as @@ -66,8 +66,8 @@ public class SceneSummary { sceneId = ins.readInt(); name = (ins.readField(String) as String); - neighbors = (ins.readObject() as TypedArray); - neighborDirs = (ins.readObject() as TypedArray); + neighbors = TypedArray(ins.readObject()); + neighborDirs = TypedArray(ins.readObject()); } // from interface Streamable diff --git a/src/as/com/threerings/whirled/zone/data/ZoneSummary.as b/src/as/com/threerings/whirled/zone/data/ZoneSummary.as index d17b8482..de02c641 100644 --- a/src/as/com/threerings/whirled/zone/data/ZoneSummary.as +++ b/src/as/com/threerings/whirled/zone/data/ZoneSummary.as @@ -62,8 +62,8 @@ public class ZoneSummary extends SimpleStreamableObject { super.readObject(ins); zoneId = ins.readInt(); - name = (ins.readObject() as Name); - scenes = (ins.readObject() as TypedArray); + name = Name(ins.readObject()); + scenes = TypedArray(ins.readObject()); } // from interface Streamable