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/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();
-        listener4.listener = arg4;
-        sendRequest(arg1, MOVE_TO, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
+        var listener3 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
+        listener3.listener = arg3;
+        sendRequest(MOVE_TO, [
+            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();
-        listener4.listener = arg4;
-        sendRequest(arg1, CHANGE_LOCATION, [
-            Integer.valueOf(arg2), arg3, listener4
+        var listener3 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
+        listener3.listener = arg3;
+        sendRequest(CHANGE_LOCATION, [
+            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, [
-            arg2, Byte.valueOf(arg3)
+        sendRequest(CLUSTER_SPEAK, [
+            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();
-        listener3.listener = arg3;
-        sendRequest(arg1, JOIN_CLUSTER, [
-            Integer.valueOf(arg2), listener3
+        var listener2 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
+        listener2.listener = arg2;
+        sendRequest(JOIN_CLUSTER, [
+            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();
-        listener5.listener = arg5;
-        sendRequest(arg1, TRAVERSE_PORTAL, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
+        var listener4 :SceneMarshaller_SceneMoveMarshaller = new SceneMarshaller_SceneMoveMarshaller();
+        listener4.listener = arg4;
+        sendRequest(TRAVERSE_PORTAL, [
+            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();
-        listener5.listener = arg5;
-        sendRequest(arg1, MOVE_TO, [
-            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
+        var listener4 :ZoneMarshaller_ZoneMoveMarshaller = new ZoneMarshaller_ZoneMoveMarshaller();
+        listener4.listener = arg4;
+        sendRequest(MOVE_TO, [
+            Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
         ]);
     }
 }