Regenerated actionscript services, and the callers that love them.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@864 c613c5cb-e716-0410-b11b-feb51c14d237

src/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as

@@ -32,12 +32,12 @@ import com.threerings.presents.client.InvocationService;
 public interface TrickCardGameService extends InvocationService
 {
     // from Java interface TrickCardGameService
-    function playCard (arg1 :Client, arg2 :Card, arg3 :int) :void;
+    function playCard (arg1 :Card, arg2 :int) :void;
 
     // from Java interface TrickCardGameService
-    function requestRematch (arg1 :Client) :void;
+    function requestRematch () :void;
 
     // from Java interface TrickCardGameService
-    function sendCardsToPlayer (arg1 :Client, arg2 :int, arg3 :TypedArray /* of class com.threerings.parlor.card.data.Card */) :void;
+    function sendCardsToPlayer (arg1 :int, arg2 :TypedArray /* of class com.threerings.parlor.card.data.Card */) :void;
 }
 }

src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as

@@ -42,10 +42,10 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     public static const PLAY_CARD :int = 1;
 
     // from interface TrickCardGameService
-    public function playCard (arg1 :Client, arg2 :Card, arg3 :int) :void
+    public function playCard (arg1 :Card, arg2 :int) :void
     {
-        sendRequest(arg1, PLAY_CARD, [
+        sendRequest(PLAY_CARD, [
-            arg2, Integer.valueOf(arg3)
+            arg1, Integer.valueOf(arg2)
         ]);
     }
 
@@ -53,9 +53,9 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     public static const REQUEST_REMATCH :int = 2;
 
     // from interface TrickCardGameService
-    public function requestRematch (arg1 :Client) :void
+    public function requestRematch () :void
     {
-        sendRequest(arg1, REQUEST_REMATCH, [
+        sendRequest(REQUEST_REMATCH, [
             
         ]);
     }
@@ -64,10 +64,10 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     public static const SEND_CARDS_TO_PLAYER :int = 3;
 
     // from interface TrickCardGameService
-    public function sendCardsToPlayer (arg1 :Client, arg2 :int, arg3 :TypedArray /* of class com.threerings.parlor.card.data.Card */) :void
+    public function sendCardsToPlayer (arg1 :int, arg2 :TypedArray /* of class com.threerings.parlor.card.data.Card */) :void
     {
-        sendRequest(arg1, SEND_CARDS_TO_PLAYER, [
+        sendRequest(SEND_CARDS_TO_PLAYER, [
-            Integer.valueOf(arg2), arg3
+            Integer.valueOf(arg1), arg2
         ]);
     }
 }

src/as/com/threerings/parlor/client/Invitation.as

@@ -65,8 +65,7 @@ public class Invitation
     public function accept () :void
     {
         // generate the invocation service request
-        _pservice.respond(_ctx.getClient(), inviteId,
+        _pservice.respond(inviteId, ParlorCodes.INVITATION_ACCEPTED, null, this);
-                          ParlorCodes.INVITATION_ACCEPTED, null, this);
     }
 
     /**
@@ -79,8 +78,7 @@ public class Invitation
     public function refuse (message :String) :void
     {
         // generate the invocation service request
-        _pservice.respond(_ctx.getClient(), inviteId,
+        _pservice.respond(inviteId, ParlorCodes.INVITATION_REFUSED, message, this);
-                          ParlorCodes.INVITATION_REFUSED, message, this);
     }
 
     /**
@@ -96,7 +94,7 @@ public class Invitation
 
         } else {
             // otherwise, generate the invocation service request
-            _pservice.cancel(_ctx.getClient(), inviteId, this);
+            _pservice.cancel(inviteId, this);
             // and remove it from the pending table
             _ctx.getParlorDirector().clearInvitation(this);
         }
@@ -118,8 +116,7 @@ public class Invitation
         _observer = observer;
 
         // generate the invocation service request
-        _pservice.respond(_ctx.getClient(), inviteId,
+        _pservice.respond(inviteId, ParlorCodes.INVITATION_COUNTERED, config, this);
-                          ParlorCodes.INVITATION_COUNTERED, config, this);
     }
 
     // documentation inherited from interface
@@ -131,7 +128,7 @@ public class Invitation
         // if the invitation was cancelled before we heard back about
         // it, we need to send off a cancellation request now
         if (_cancelled) {
-            _pservice.cancel(_ctx.getClient(), inviteId, this);
+            _pservice.cancel(inviteId, this);
         } else {
             // otherwise, put it in the pending invites table
             _ctx.getParlorDirector().registerInvitation(this);

src/as/com/threerings/parlor/client/ParlorDirector.as

@@ -111,7 +111,7 @@ public class ParlorDirector extends BasicDirector
         // create the invitation record
         var invite :Invitation = new Invitation(_pctx, _pservice, invitee, config, observer);
         // submit the invitation request to the server
-        _pservice.invite(_pctx.getClient(), invitee, config, invite);
+        _pservice.invite(invitee, config, invite);
         // and return the invitation to the caller
         return invite;
     }
@@ -125,7 +125,7 @@ public class ParlorDirector extends BasicDirector
     public function startSolitaire (
         config :GameConfig, listener :InvocationService_ConfirmListener) :void
     {
-        _pservice.startSolitaire(_pctx.getClient(), config, listener);
+        _pservice.startSolitaire(config, listener);
     }
 
     // documentation inherited

src/as/com/threerings/parlor/client/ParlorService.as

@@ -34,15 +34,15 @@ import com.threerings.util.Name;
 public interface ParlorService extends InvocationService
 {
     // from Java interface ParlorService
-    function cancel (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
+    function cancel (arg1 :int, arg2 :InvocationService_InvocationListener) :void;
 
     // from Java interface ParlorService
-    function invite (arg1 :Client, arg2 :Name, arg3 :GameConfig, arg4 :ParlorService_InviteListener) :void;
+    function invite (arg1 :Name, arg2 :GameConfig, arg3 :ParlorService_InviteListener) :void;
 
     // from Java interface ParlorService
-    function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void;
+    function respond (arg1 :int, arg2 :int, arg3 :Object, arg4 :InvocationService_InvocationListener) :void;
 
     // from Java interface ParlorService
-    function startSolitaire (arg1 :Client, arg2 :GameConfig, arg3 :InvocationService_ConfirmListener) :void;
+    function startSolitaire (arg1 :GameConfig, arg2 :InvocationService_ConfirmListener) :void;
 }
 }

src/as/com/threerings/parlor/client/TableDirector.as

@@ -198,7 +198,7 @@ public class TableDirector extends BasicDirector
         }
 
         // go ahead and issue the create request
-        _tlobj.getTableService().createTable(_pctx.getClient(), tableConfig, config, this);
+        _tlobj.getTableService().createTable(tableConfig, config, this);
     }
 
     /**
@@ -223,7 +223,7 @@ public class TableDirector extends BasicDirector
 
         // issue the join request
         log.info("Joining table", "tid", tableId, "pos", position);
-        _tlobj.getTableService().joinTable(_pctx.getClient(), tableId, position, this);
+        _tlobj.getTableService().joinTable(tableId, position, this);
     }
 
     /**
@@ -240,7 +240,7 @@ public class TableDirector extends BasicDirector
         }
 
         // issue the leave request
-        _tlobj.getTableService().leaveTable(_pctx.getClient(), tableId, this);
+        _tlobj.getTableService().leaveTable(tableId, this);
     }
 
     /**
@@ -255,7 +255,7 @@ public class TableDirector extends BasicDirector
             return;
         }
 
-        _tlobj.getTableService().startTableNow(_ctx.getClient(), tableId, this);
+        _tlobj.getTableService().startTableNow(tableId, this);
     }
 
     /**
@@ -269,7 +269,7 @@ public class TableDirector extends BasicDirector
             return;
         }
 
-        _tlobj.getTableService().bootPlayer(_ctx.getClient(), tableId, target, this);
+        _tlobj.getTableService().bootPlayer(tableId, target, this);
     }
 
     // documentation inherited

src/as/com/threerings/parlor/client/TableService.as

@@ -35,18 +35,18 @@ import com.threerings.util.Name;
 public interface TableService extends InvocationService
 {
     // from Java interface TableService
-    function bootPlayer (arg1 :Client, arg2 :int, arg3 :Name, arg4 :InvocationService_InvocationListener) :void;
+    function bootPlayer (arg1 :int, arg2 :Name, arg3 :InvocationService_InvocationListener) :void;
 
     // from Java interface TableService
-    function createTable (arg1 :Client, arg2 :TableConfig, arg3 :GameConfig, arg4 :InvocationService_ResultListener) :void;
+    function createTable (arg1 :TableConfig, arg2 :GameConfig, arg3 :InvocationService_ResultListener) :void;
 
     // from Java interface TableService
-    function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
+    function joinTable (arg1 :int, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
 
     // from Java interface TableService
-    function leaveTable (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
+    function leaveTable (arg1 :int, arg2 :InvocationService_InvocationListener) :void;
 
     // from Java interface TableService
-    function startTableNow (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
+    function startTableNow (arg1 :int, arg2 :InvocationService_InvocationListener) :void;
 }
 }

src/as/com/threerings/parlor/data/ParlorMarshaller.as

@@ -47,12 +47,12 @@ public class ParlorMarshaller extends InvocationMarshaller
     public static const CANCEL :int = 1;
 
     // from interface ParlorService
-    public function cancel (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void
+    public function cancel (arg1 :int, arg2 :InvocationService_InvocationListener) :void
     {
-        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener2 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, CANCEL, [
+        sendRequest(CANCEL, [
-            Integer.valueOf(arg2), listener3
+            Integer.valueOf(arg1), listener2
         ]);
     }
 
@@ -60,12 +60,12 @@ public class ParlorMarshaller extends InvocationMarshaller
     public static const INVITE :int = 2;
 
     // from interface ParlorService
-    public function invite (arg1 :Client, arg2 :Name, arg3 :GameConfig, arg4 :ParlorService_InviteListener) :void
+    public function invite (arg1 :Name, arg2 :GameConfig, arg3 :ParlorService_InviteListener) :void
     {
-        var listener4 :ParlorMarshaller_InviteMarshaller = new ParlorMarshaller_InviteMarshaller();
+        var listener3 :ParlorMarshaller_InviteMarshaller = new ParlorMarshaller_InviteMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, INVITE, [
+        sendRequest(INVITE, [
-            arg2, arg3, listener4
+            arg1, arg2, listener3
         ]);
     }
 
@@ -73,12 +73,12 @@ public class ParlorMarshaller extends InvocationMarshaller
     public static const RESPOND :int = 3;
 
     // from interface ParlorService
-    public function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void
+    public function respond (arg1 :int, arg2 :int, arg3 :Object, arg4 :InvocationService_InvocationListener) :void
     {
-        var listener5 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener5.listener = arg5;
+        listener4.listener = arg4;
-        sendRequest(arg1, RESPOND, [
+        sendRequest(RESPOND, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), arg4, listener5
+            Integer.valueOf(arg1), Integer.valueOf(arg2), arg3, listener4
         ]);
     }
 
@@ -86,12 +86,12 @@ public class ParlorMarshaller extends InvocationMarshaller
     public static const START_SOLITAIRE :int = 4;
 
     // from interface ParlorService
-    public function startSolitaire (arg1 :Client, arg2 :GameConfig, arg3 :InvocationService_ConfirmListener) :void
+    public function startSolitaire (arg1 :GameConfig, arg2 :InvocationService_ConfirmListener) :void
     {
-        var listener3 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
+        var listener2 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, START_SOLITAIRE, [
+        sendRequest(START_SOLITAIRE, [
-            arg2, listener3
+            arg1, listener2
         ]);
     }
 }

src/as/com/threerings/parlor/data/TableMarshaller.as

@@ -46,12 +46,12 @@ public class TableMarshaller extends InvocationMarshaller
     public static const BOOT_PLAYER :int = 1;
 
     // from interface TableService
-    public function bootPlayer (arg1 :Client, arg2 :int, arg3 :Name, arg4 :InvocationService_InvocationListener) :void
+    public function bootPlayer (arg1 :int, arg2 :Name, arg3 :InvocationService_InvocationListener) :void
     {
-        var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, BOOT_PLAYER, [
+        sendRequest(BOOT_PLAYER, [
-            Integer.valueOf(arg2), arg3, listener4
+            Integer.valueOf(arg1), arg2, listener3
         ]);
     }
 
@@ -59,12 +59,12 @@ public class TableMarshaller extends InvocationMarshaller
     public static const CREATE_TABLE :int = 2;
 
     // from interface TableService
-    public function createTable (arg1 :Client, arg2 :TableConfig, arg3 :GameConfig, arg4 :InvocationService_ResultListener) :void
+    public function createTable (arg1 :TableConfig, arg2 :GameConfig, arg3 :InvocationService_ResultListener) :void
     {
-        var listener4 :InvocationMarshaller_ResultMarshaller = new InvocationMarshaller_ResultMarshaller();
+        var listener3 :InvocationMarshaller_ResultMarshaller = new InvocationMarshaller_ResultMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, CREATE_TABLE, [
+        sendRequest(CREATE_TABLE, [
-            arg2, arg3, listener4
+            arg1, arg2, listener3
         ]);
     }
 
@@ -72,12 +72,12 @@ public class TableMarshaller extends InvocationMarshaller
     public static const JOIN_TABLE :int = 3;
 
     // from interface TableService
-    public function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void
+    public function joinTable (arg1 :int, arg2 :int, arg3 :InvocationService_InvocationListener) :void
     {
-        var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, JOIN_TABLE, [
+        sendRequest(JOIN_TABLE, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
+            Integer.valueOf(arg1), Integer.valueOf(arg2), listener3
         ]);
     }
 
@@ -85,12 +85,12 @@ public class TableMarshaller extends InvocationMarshaller
     public static const LEAVE_TABLE :int = 4;
 
     // from interface TableService
-    public function leaveTable (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void
+    public function leaveTable (arg1 :int, arg2 :InvocationService_InvocationListener) :void
     {
-        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener2 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, LEAVE_TABLE, [
+        sendRequest(LEAVE_TABLE, [
-            Integer.valueOf(arg2), listener3
+            Integer.valueOf(arg1), listener2
         ]);
     }
 
@@ -98,12 +98,12 @@ public class TableMarshaller extends InvocationMarshaller
     public static const START_TABLE_NOW :int = 5;
 
     // from interface TableService
-    public function startTableNow (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void
+    public function startTableNow (arg1 :int, arg2 :InvocationService_InvocationListener) :void
     {
-        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener2 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, START_TABLE_NOW, [
+        sendRequest(START_TABLE_NOW, [
-            Integer.valueOf(arg2), listener3
+            Integer.valueOf(arg1), listener2
         ]);
     }
 }

src/as/com/threerings/whirled/client/SceneDirector.as

@@ -466,7 +466,7 @@ public class SceneDirector extends BasicDirector
 
         // issue a moveTo request
         log.info("Issuing moveTo(" + _pendingData.sceneId + ", " + sceneVers + ").");
-        _sservice.moveTo(_wctx.getClient(), _pendingData.sceneId, sceneVers, this);
+        _sservice.moveTo(_pendingData.sceneId, sceneVers, this);
     }
 
     /**

src/as/com/threerings/whirled/client/SceneService.as

@@ -30,6 +30,6 @@ import com.threerings.presents.client.InvocationService;
 public interface SceneService extends InvocationService
 {
     // from Java interface SceneService
-    function moveTo (arg1 :Client, arg2 :int, arg3 :int, arg4 :SceneService_SceneMoveListener) :void;
+    function moveTo (arg1 :int, arg2 :int, arg3 :SceneService_SceneMoveListener) :void;
 }
 }

src/as/com/threerings/whirled/data/SceneMarshaller.as

@@ -41,12 +41,12 @@ public class SceneMarshaller extends InvocationMarshaller
     public static const MOVE_TO :int = 1;
 
     // from interface SceneService
-    public function moveTo (arg1 :Client, arg2 :int, arg3 :int, arg4 :SceneService_SceneMoveListener) :void
+    public function moveTo (arg1 :int, arg2 :int, arg3 :SceneService_SceneMoveListener) :void
     {
-        var listener4 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
+        var listener3 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, MOVE_TO, [
+        sendRequest(MOVE_TO, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
+            Integer.valueOf(arg1), Integer.valueOf(arg2), listener3
         ]);
     }
 }

src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as

@@ -159,7 +159,7 @@ public class SpotSceneDirector extends BasicDirector
 
         // issue a traversePortal request
         log.info("Issuing traversePortal(" + sceneId + ", " + dest + ", " + sceneVer + ").");
-        _sservice.traversePortal(_wctx.getClient(), sceneId, portalId, sceneVer, _scdir);
+        _sservice.traversePortal(sceneId, portalId, sceneVer, _scdir);
         return true;
     }
 
@@ -226,7 +226,7 @@ public class SpotSceneDirector extends BasicDirector
                     listener.requestFailed(new Error(reason));
                 }
             });
-        _sservice.changeLocation(_wctx.getClient(), sceneId, loc, clist);
+        _sservice.changeLocation(sceneId, loc, clist);
     }
 
     /**
@@ -251,7 +251,7 @@ public class SpotSceneDirector extends BasicDirector
 
         log.info("Joining cluster [friend=" + froid + "].");
 
-        _sservice.joinCluster(_wctx.getClient(), froid, new ConfirmAdapter(
+        _sservice.joinCluster(froid, new ConfirmAdapter(
             function () :void {
                 if (listener != null) {
                     listener.requestCompleted(null);
@@ -291,7 +291,7 @@ public class SpotSceneDirector extends BasicDirector
 
         message = _chatdir.filter(message, null, true);
         if (message != null) {
-            _sservice.clusterSpeak(_wctx.getClient(), message, mode);
+            _sservice.clusterSpeak(message, mode);
         }
         return true;
     }

src/as/com/threerings/whirled/spot/client/SpotService.as

@@ -33,15 +33,15 @@ import com.threerings.whirled.spot.data.Location;
 public interface SpotService extends InvocationService
 {
     // from Java interface SpotService
-    function changeLocation (arg1 :Client, arg2 :int, arg3 :Location, arg4 :InvocationService_ConfirmListener) :void;
+    function changeLocation (arg1 :int, arg2 :Location, arg3 :InvocationService_ConfirmListener) :void;
 
     // from Java interface SpotService
-    function clusterSpeak (arg1 :Client, arg2 :String, arg3 :int) :void;
+    function clusterSpeak (arg1 :String, arg2 :int) :void;
 
     // from Java interface SpotService
-    function joinCluster (arg1 :Client, arg2 :int, arg3 :InvocationService_ConfirmListener) :void;
+    function joinCluster (arg1 :int, arg2 :InvocationService_ConfirmListener) :void;
 
     // from Java interface SpotService
-    function traversePortal (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :SceneService_SceneMoveListener) :void;
+    function traversePortal (arg1 :int, arg2 :int, arg3 :int, arg4 :SceneService_SceneMoveListener) :void;
 }
 }

src/as/com/threerings/whirled/spot/data/SpotMarshaller.as

@@ -45,12 +45,12 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const CHANGE_LOCATION :int = 1;
 
     // from interface SpotService
-    public function changeLocation (arg1 :Client, arg2 :int, arg3 :Location, arg4 :InvocationService_ConfirmListener) :void
+    public function changeLocation (arg1 :int, arg2 :Location, arg3 :InvocationService_ConfirmListener) :void
     {
-        var listener4 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
+        var listener3 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, CHANGE_LOCATION, [
+        sendRequest(CHANGE_LOCATION, [
-            Integer.valueOf(arg2), arg3, listener4
+            Integer.valueOf(arg1), arg2, listener3
         ]);
     }
 
@@ -58,10 +58,10 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const CLUSTER_SPEAK :int = 2;
 
     // from interface SpotService
-    public function clusterSpeak (arg1 :Client, arg2 :String, arg3 :int) :void
+    public function clusterSpeak (arg1 :String, arg2 :int) :void
     {
-        sendRequest(arg1, CLUSTER_SPEAK, [
+        sendRequest(CLUSTER_SPEAK, [
-            arg2, Byte.valueOf(arg3)
+            arg1, Byte.valueOf(arg2)
         ]);
     }
 
@@ -69,12 +69,12 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const JOIN_CLUSTER :int = 3;
 
     // from interface SpotService
-    public function joinCluster (arg1 :Client, arg2 :int, arg3 :InvocationService_ConfirmListener) :void
+    public function joinCluster (arg1 :int, arg2 :InvocationService_ConfirmListener) :void
     {
-        var listener3 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
+        var listener2 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, JOIN_CLUSTER, [
+        sendRequest(JOIN_CLUSTER, [
-            Integer.valueOf(arg2), listener3
+            Integer.valueOf(arg1), listener2
         ]);
     }
 
@@ -82,12 +82,12 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const TRAVERSE_PORTAL :int = 4;
 
     // from interface SpotService
-    public function traversePortal (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :SceneService_SceneMoveListener) :void
+    public function traversePortal (arg1 :int, arg2 :int, arg3 :int, arg4 :SceneService_SceneMoveListener) :void
     {
-        var listener5 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
+        var listener4 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
-        listener5.listener = arg5;
+        listener4.listener = arg4;
-        sendRequest(arg1, TRAVERSE_PORTAL, [
+        sendRequest(TRAVERSE_PORTAL, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
+            Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
         ]);
     }
 }

src/as/com/threerings/whirled/zone/client/ZoneService.as

@@ -30,6 +30,6 @@ import com.threerings.presents.client.InvocationService;
 public interface ZoneService extends InvocationService
 {
     // from Java interface ZoneService
-    function moveTo (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :ZoneService_ZoneMoveListener) :void;
+    function moveTo (arg1 :int, arg2 :int, arg3 :int, arg4 :ZoneService_ZoneMoveListener) :void;
 }
 }

src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as

@@ -41,12 +41,12 @@ public class ZoneMarshaller extends InvocationMarshaller
     public static const MOVE_TO :int = 1;
 
     // from interface ZoneService
-    public function moveTo (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :ZoneService_ZoneMoveListener) :void
+    public function moveTo (arg1 :int, arg2 :int, arg3 :int, arg4 :ZoneService_ZoneMoveListener) :void
     {
-        var listener5 :ZoneMarshaller_ZoneMoveMarshaller = new ZoneMarshaller_ZoneMoveMarshaller();
+        var listener4 :ZoneMarshaller_ZoneMoveMarshaller = new ZoneMarshaller_ZoneMoveMarshaller();
-        listener5.listener = arg5;
+        listener4.listener = arg4;
-        sendRequest(arg1, MOVE_TO, [
+        sendRequest(MOVE_TO, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
+            Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
         ]);
     }
 }